mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-09 23:37:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #8921

Browse Source
This commit is contained in:
Anuken
2023-08-12 13:09:21 -04:00
parent 7de33b335a
commit 2b05264093
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/type/Weapon.java
View File

@ -396,6 +396,7 @@ public class Weapon implements Cloneable{
//shoot if applicable //shoot if applicable
if(mount.shoot && //must be shooting if(mount.shoot && //must be shooting
can && //must be able to shoot can && //must be able to shoot
!(bullet.killShooter && mount.totalShots > 0) && //if the bullet kills the shooter, you should only ever be able to shoot once
(!useAmmo || unit.ammo > 0 || !state.rules.unitAmmo || unit.team.rules().infiniteAmmo) && //check ammo (!useAmmo || unit.ammo > 0 || !state.rules.unitAmmo || unit.team.rules().infiniteAmmo) && //check ammo
(!alternate || wasFlipped == flipSprite) && (!alternate || wasFlipped == flipSprite) &&
mount.warmup >= minWarmup && //must be warmed up mount.warmup >= minWarmup && //must be warmed up
@ -436,6 +437,9 @@ public class Weapon implements Cloneable{
} }
shoot.shoot(mount.barrelCounter, (xOffset, yOffset, angle, delay, mover) -> { shoot.shoot(mount.barrelCounter, (xOffset, yOffset, angle, delay, mover) -> {
//this is incremented immediately, as it is used for total bullet creation amount detection
mount.totalShots ++;
if(delay > 0f){ if(delay > 0f){
Time.run(delay, () -> bullet(unit, mount, xOffset, yOffset, angle, mover)); Time.run(delay, () -> bullet(unit, mount, xOffset, yOffset, angle, mover));
}else{ }else{
@ -478,7 +482,6 @@ public class Weapon implements Cloneable{
mount.recoils[mount.barrelCounter % recoils] = 1f; mount.recoils[mount.barrelCounter % recoils] = 1f;
} }
mount.heat = 1f; mount.heat = 1f;
mount.totalShots++;
} }
//override to do special things to a bullet after spawning //override to do special things to a bullet after spawning