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

Add shootOnDeath to weapons (#6149)

Browse Source 
* Update Weapon.java

* Add files via upload
This commit is contained in:
Ilya246
2021-10-14 17:50:57 +04:00
committed by GitHub
parent a2f40a5565
commit 095cc27ea6
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -38,6 +38,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
@Import int id; @Import int id;
@Import @Nullable Tile mineTile; @Import @Nullable Tile mineTile;
@Import Vec2 vel; @Import Vec2 vel;
@Import WeaponMount[] mounts;
private UnitController controller; private UnitController controller;
UnitType type; UnitType type;
@@ -496,6 +497,14 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
Events.fire(Trigger.suicideBomb); Events.fire(Trigger.suicideBomb);
} }
for(WeaponMount mount : mounts){
if(mount.weapon.shootOnDeath && !(mount.weapon.bullet.killShooter && mount.shoot)){
mount.reload = 0f;
mount.shoot = true;
mount.weapon.update(self(), mount);
}
}
//if this unit crash landed (was flying), damage stuff in a radius //if this unit crash landed (was flying), damage stuff in a radius
if(type.flying && !spawnedByCore){ if(type.flying && !spawnedByCore){
Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f, true, false, true); Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f, true, false, true);

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

@@ -117,6 +117,8 @@ public class Weapon implements Cloneable{
public Func<Weapon, WeaponMount> mountType = WeaponMount::new; public Func<Weapon, WeaponMount> mountType = WeaponMount::new;
/** status effect duration when shot */ /** status effect duration when shot */
public float shootStatusDuration = 60f * 5f; public float shootStatusDuration = 60f * 5f;
/** whether this weapon should fire when its owner dies */
public boolean shootOnDeath = false;
public Weapon(String name){ public Weapon(String name){
this.name = name; this.name = name;