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

Fixed certain turrets working without ammo

Browse Source
This commit is contained in:
Anuken
2022-01-15 23:08:54 -05:00
parent f91619e5da
commit 93cfa243bc
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/units/weapons/quell-missile.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 426 B

After

Width:  |  Height:  |  Size: 502 B

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

@@ -465,6 +465,8 @@ public class Turret extends ReloadTurret{
/** @return whether the turret has ammo. */ /** @return whether the turret has ammo. */
public boolean hasAmmo(){ public boolean hasAmmo(){
if(!cons.canConsume()) return false;
//skip first entry if it has less than the required amount of ammo //skip first entry if it has less than the required amount of ammo
if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot && ammo.get(ammo.size - 2).amount >= ammoPerShot){ if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot && ammo.get(ammo.size - 2).amount >= ammoPerShot){
totalAmmo -= ammo.pop().amount; totalAmmo -= ammo.pop().amount;