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

Fixed #9055

Browse Source
This commit is contained in:
Anuken
2023-09-14 14:34:00 -04:00
parent 73e9ed4919
commit de773ce406
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
@Override @Override
public boolean hasAmmo(){ public boolean hasAmmo(){
return hasCorrectAmmo() && ammoTypes.get(liquids.current()) != null && liquids.currentAmount() >= 1f / ammoTypes.get(liquids.current()).ammoMultiplier; return hasCorrectAmmo() && ammoTypes.get(liquids.current()) != null && liquids.currentAmount() > 0f;
} }
public boolean hasCorrectAmmo(){ public boolean hasCorrectAmmo(){

3
core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
View File

@@ -51,7 +51,6 @@ public class ContinuousTurret extends Turret{
@Override @Override
public boolean hasAmmo(){ public boolean hasAmmo(){
//TODO update ammo in unit so it corresponds to liquids
return canConsume(); return canConsume();
} }
@@ -112,7 +111,7 @@ public class ContinuousTurret extends Turret{
entry.bullet.aimY = Tmp.v1.y; entry.bullet.aimY = Tmp.v1.y;
if(isShooting() && hasAmmo()){ if(isShooting() && hasAmmo()){
entry.bullet.time = entry.bullet.lifetime * entry.bullet.type.optimalLifeFract * shootWarmup; entry.bullet.time = entry.bullet.lifetime * entry.bullet.type.optimalLifeFract * Math.min(shootWarmup, efficiency);
entry.bullet.keepAlive = true; entry.bullet.keepAlive = true;
} }
} }