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

Turret reload 'fix' moved to PowerTurret

Browse Source
This commit is contained in:
Anuken
2026-02-28 00:05:22 -05:00
parent 5a2a1658ce
commit d0005aea7f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
View File

@@ -47,6 +47,13 @@ public class PowerTurret extends Turret{
return shootType; return shootType;
} }
@Override
public boolean shouldConsume(){
//when the block is first placed, it shouldn't consume power/liquid just to "cool down" from the initial reload
//thus, it should only consume once it has actually shot at something
return isShooting() || (reloadCounter < reload && totalShots > 0);
}
@Override @Override
public boolean hasAmmo(){ public boolean hasAmmo(){
//you can always rotate, but never shoot if there's no power //you can always rotate, but never shoot if there's no power

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

@@ -351,9 +351,7 @@ public class Turret extends ReloadTurret{
@Override @Override
public boolean shouldConsume(){ public boolean shouldConsume(){
//when the block is first placed, it shouldn't consume power/liquid just to "cool down" from the initial reload return isShooting() || reloadCounter < reload;
//thus, it should only consume once it has actually shot at something
return isShooting() || (reloadCounter < reload && totalShots > 0);
} }
@Override @Override