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

Better turret ammo entry search

Browse Source
This commit is contained in:
Anuken
2026-01-09 20:20:24 -05:00
parent ac2401daf1
commit 8ab249b815
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -673,8 +673,13 @@ public class Turret extends ReloadTurret{
/** @return whether the turret has ammo. */ /** @return whether the turret has ammo. */
public boolean hasAmmo(){ public boolean hasAmmo(){
//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.swap(ammo.size - 1, ammo.size - 2); for(int i = 0; i < ammo.size; i ++){
if(ammo.get(i).amount >= ammoPerShot){
ammo.swap(ammo.size - 1, i);
break;
}
}
} }
//used for "side-ammo" like gas in some turrets //used for "side-ammo" like gas in some turrets