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

Better warmup for Erekir turrets

Browse Source
This commit is contained in:
Anuken
2024-09-27 14:23:48 -04:00
parent b2041194da
commit 339af6b3cc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4227,6 +4227,7 @@ public class Blocks{
newTargetInterval = 40f; newTargetInterval = 40f;
shootWarmupSpeed = 0.07f; shootWarmupSpeed = 0.07f;
warmupMaintainTime = 120f;
coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f)); coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f));
coolantMultiplier = 1.5f; coolantMultiplier = 1.5f;
@@ -4950,7 +4951,7 @@ public class Blocks{
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
size = 5; size = 5;
envEnabled |= Env.space; envEnabled |= Env.space;
warmupMaintainTime = 30f; warmupMaintainTime = 120f;
reload = 100f; reload = 100f;
recoil = 2f; recoil = 2f;
range = 300; range = 300;
@@ -5277,7 +5278,7 @@ public class Blocks{
velocityRnd = 0.15f; velocityRnd = 0.15f;
heatRequirement = 90f; heatRequirement = 90f;
maxHeatEfficiency = 2f; maxHeatEfficiency = 2f;
warmupMaintainTime = 30f; warmupMaintainTime = 120f;
consumePower(10f); consumePower(10f);
shoot = new ShootSummon(0f, 0f, circleRad, 48f); shoot = new ShootSummon(0f, 0f, circleRad, 48f);

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

@@ -371,7 +371,7 @@ public class Turret extends ReloadTurret{
if(!validateTarget()) target = null; if(!validateTarget()) target = null;
float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f; float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f;
if(warmupTarget > 0 && shootWarmup >= minWarmup && !isControlled()){ if(warmupTarget > 0 && !isControlled()){
warmupHold = 1f; warmupHold = 1f;
} }
if(warmupHold > 0f){ if(warmupHold > 0f){