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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2025-12-18 17:27:42 -05:00
parent 8e7eeb2573 8e907f714a
commit b8c7c2f740
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/content/Blocks.java
View File

@@ -3270,6 +3270,7 @@ public class Blocks{
height = 12f; height = 12f;
ammoMultiplier = 4; ammoMultiplier = 4;
lifetime = 60f; lifetime = 60f;
reloadMultiplier = 0.8f;
rangeChange = 16f; rangeChange = 16f;
hitEffect = despawnEffect = Fx.hitBulletColor; hitEffect = despawnEffect = Fx.hitBulletColor;
@@ -3319,6 +3320,7 @@ public class Blocks{
inaccuracy = 2f; inaccuracy = 2f;
rotateSpeed = 10f; rotateSpeed = 10f;
coolant = consumeCoolant(0.1f); coolant = consumeCoolant(0.1f);
coolantMultiplier = 10f;
researchCostMultiplier = 0.05f; researchCostMultiplier = 0.05f;
limitRange(5f); limitRange(5f);
@@ -3514,6 +3516,7 @@ public class Blocks{
health = 260; health = 260;
shootSound = Sounds.shootArtillerySmall; shootSound = Sounds.shootArtillerySmall;
coolant = consumeCoolant(0.1f); coolant = consumeCoolant(0.1f);
coolantMultiplier = 10f;
limitRange(0f); limitRange(0f);
}}; }};

1
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -183,6 +183,7 @@ public class Turret extends ReloadTurret{
stats.add(Stat.targetsGround, targetGround); stats.add(Stat.targetsGround, targetGround);
if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot); if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot);
if(heatRequirement > 0) stats.add(Stat.input, heatRequirement, StatUnit.heatUnits); if(heatRequirement > 0) stats.add(Stat.input, heatRequirement, StatUnit.heatUnits);
if(maxHeatEfficiency > 0) stats.add(Stat.maxEfficiency, (int)(maxHeatEfficiency * 100f), StatUnit.percent);
} }
@Override @Override