Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draw size independent from puddle size. (#3826)

Browse Source 
* Draw size independent from puddle size.

* Apply change to Bullets
This commit is contained in:
MEEP of Faith
2020-12-23 07:29:26 -08:00
committed by GitHub
parent 986caa857e
commit a21f79ac6a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Bullets.java
View File

@@ -465,6 +465,7 @@ public class Bullets implements ContentList{
speed = 4f; speed = 4f;
knockback = 1.7f; knockback = 1.7f;
puddleSize = 8f; puddleSize = 8f;
orbSize = 8f;
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 0.4f; ammoMultiplier = 0.4f;
statusDuration = 60f * 4f; statusDuration = 60f * 4f;
@@ -476,6 +477,7 @@ public class Bullets implements ContentList{
speed = 4f; speed = 4f;
knockback = 1.3f; knockback = 1.3f;
puddleSize = 8f; puddleSize = 8f;
orbSize = 8f;
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 0.4f; ammoMultiplier = 0.4f;
statusDuration = 60f * 4f; statusDuration = 60f * 4f;
@@ -487,6 +489,7 @@ public class Bullets implements ContentList{
speed = 4f; speed = 4f;
knockback = 1.3f; knockback = 1.3f;
puddleSize = 8f; puddleSize = 8f;
orbSize = 8f;
damage = 4.75f; damage = 4.75f;
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 0.4f; ammoMultiplier = 0.4f;
@@ -498,6 +501,7 @@ public class Bullets implements ContentList{
speed = 4f; speed = 4f;
knockback = 1.3f; knockback = 1.3f;
puddleSize = 8f; puddleSize = 8f;
orbSize = 8f;
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 0.4f; ammoMultiplier = 0.4f;
statusDuration = 60f * 4f; statusDuration = 60f * 4f;

3
core/src/mindustry/entities/bullet/LiquidBulletType.java
View File

@@ -15,6 +15,7 @@ import static mindustry.Vars.*;
public class LiquidBulletType extends BulletType{ public class LiquidBulletType extends BulletType{
public Liquid liquid; public Liquid liquid;
public float puddleSize = 6f; public float puddleSize = 6f;
public float orbSize = 6f;
public LiquidBulletType(@Nullable Liquid liquid){ public LiquidBulletType(@Nullable Liquid liquid){
super(3.5f, 0); super(3.5f, 0);
@@ -64,7 +65,7 @@ public class LiquidBulletType extends BulletType{
public void draw(Bullet b){ public void draw(Bullet b){
Draw.color(liquid.color, Color.white, b.fout() / 100f); Draw.color(liquid.color, Color.white, b.fout() / 100f);
Fill.circle(b.x, b.y, puddleSize / 2); Fill.circle(b.x, b.y, orbSize / 2);
} }
@Override @Override