From 677abf4924d9dfffb8c0de10cbf66b91f1ba5e94 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 27 Dec 2021 15:54:09 -0500 Subject: [PATCH] 3x3 breach --- .../sprites/blocks/turrets/breach.png | Bin 787 -> 2413 bytes core/assets/bundles/bundle.properties | 1 + core/src/mindustry/content/Blocks.java | 34 +++++++++--------- core/src/mindustry/content/Liquids.java | 2 +- .../mindustry/entities/bullet/BulletType.java | 2 ++ core/src/mindustry/type/Liquid.java | 4 +++ .../blocks/defense/turrets/BaseTurret.java | 2 +- .../blocks/defense/turrets/ItemTurret.java | 3 +- .../world/blocks/defense/turrets/Turret.java | 12 ++++++- .../world/consumers/ConsumeCoolant.java | 2 +- core/src/mindustry/world/meta/StatValues.java | 4 +++ 11 files changed, 45 insertions(+), 21 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/breach.png b/core/assets-raw/sprites/blocks/turrets/breach.png index 03284ae8d3a3da5dba187bd308c0505a03853638..affd6b4599f8a08bd3d049795635b8f847e2b994 100644 GIT binary patch literal 2413 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 V(*K=4%)r3F;OXk;vd$@?2>|!uQNsWL literal 787 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z;xEr z#WAE}&fD4cdBTn&?e*Oj3|mY@EJRPSE?DYNI7LmTUnoT{P*NLZ>siwuANtFJTI2nxsB)MQCUF5cUh=)Ft$5_6V{%K_%b=?yMUA~pgs%oajQ4;vS9oMK(0mylEK!esQv zcann81a)`w%t)Np$Ka%tujXBTgN z?kcv4-DYn^#{F3j{_ObQedm5O^R`GQd7A?=tlI*a*yRMyFmLl@5|CYE`^dNv9&tTrlZgymL52ydCTVU|ZlLxq>l z(w5`T^}AeOp4)E!X!6r7inoJIJ}jR8zw5Ue|2;9wlX4$wf9I__Ppj&ez}Be4EmfQN+5fCrUH%5*liqal%LGiNi12yd_8T4ZCv$(SH=Hd_dMIrx=QZA z#04{r^!0zwUj8?^^_S3xNdk=g5?2|rIRig5BnobsB*4ipz%*-_Vtnk*U!MY18=311 t?TmHzJv*GRwx#p{zob#hiF42GtsVqES+eEjR|W !e.dead() && !e.isGrounded(), unitSort); }else{ @@ -553,7 +563,7 @@ public class Turret extends ReloadTurret{ } protected void bullet(BulletType type, float angle){ - float lifeScl = type.scaleVelocity ? Mathf.clamp(Mathf.dst(x + bulletOffset.x, y + bulletOffset.y, targetPos.x, targetPos.y) / type.range(), minRange / type.range(), range / type.range()) : 1f; + float lifeScl = type.scaleVelocity ? Mathf.clamp(Mathf.dst(x + bulletOffset.x, y + bulletOffset.y, targetPos.x, targetPos.y) / type.range(), minRange / type.range(), range() / type.range()) : 1f; type.create(this, team, x + bulletOffset.x, y + bulletOffset.y, angle, 1f + Mathf.range(velocityInaccuracy), lifeScl); } diff --git a/core/src/mindustry/world/consumers/ConsumeCoolant.java b/core/src/mindustry/world/consumers/ConsumeCoolant.java index a71f6fdb55..fddb4b914b 100644 --- a/core/src/mindustry/world/consumers/ConsumeCoolant.java +++ b/core/src/mindustry/world/consumers/ConsumeCoolant.java @@ -5,7 +5,7 @@ public class ConsumeCoolant extends ConsumeLiquidFilter{ public float maxTemp = 0.5f, maxFlammability = 0.1f; public ConsumeCoolant(float amount){ - this.filter = liquid -> liquid.temperature <= maxTemp && liquid.flammability < maxFlammability; + this.filter = liquid -> liquid.coolant && liquid.temperature <= maxTemp && liquid.flammability < maxFlammability; this.amount = amount; } diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index e292f5bf33..cbfcbac5e7 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -305,6 +305,10 @@ public class StatValues{ sep(bt, Core.bundle.format("bullet.buildingdamage", (int)(type.buildingDamageMultiplier * 100))); } + if(type.rangeChange != 0 && !compact){ + sep(bt, Core.bundle.format("bullet.range", (type.rangeChange > 0 ? "+" : "-") + Strings.autoFixed(type.rangeChange / tilesize, 1))); + } + if(type.splashDamage > 0){ sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1))); }