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

Turn killable from variable to method (#11146)

Browse Source 
* Turn killable from variable to method

* Update UnitType.java

* Update UnitComp.java
This commit is contained in:
Moreperbullet
2025-08-17 22:26:00 +08:00
committed by GitHub
parent d1222fe8f1
commit 0fd46cf057
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -532,6 +532,10 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
return type.targetable(self(), targeter); return type.targetable(self(), targeter);
} }
public boolean killable(){
return type.killable(self());
}
public boolean hittable(){ public boolean hittable(){
return type.hittable(self()); return type.hittable(self());
} }
@@ -832,7 +836,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
/** Actually destroys the unit, removing it and creating explosions. **/ /** Actually destroys the unit, removing it and creating explosions. **/
public void destroy(){ public void destroy(){
if(!isAdded() || !type.killable) return; if(!isAdded() || !killable()) return;
float explosiveness = 2f + item().explosiveness * stack().amount * 1.53f; float explosiveness = 2f + item().explosiveness * stack().amount * 1.53f;
float flammability = item().flammability * stack().amount / 1.9f; float flammability = item().flammability * stack().amount / 1.9f;
@@ -937,7 +941,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
@Override @Override
@Replace @Replace
public void kill(){ public void kill(){
if(dead || net.client() || !type.killable) return; if(dead || net.client() || !killable()) return;
//deaths are synced; this calls killed() //deaths are synced; this calls killed()
Call.unitDeath(id); Call.unitDeath(id);

4
core/src/mindustry/type/UnitType.java
View File

@@ -593,6 +593,10 @@ public class UnitType extends UnlockableContent implements Senseable{
return targetable || (vulnerableWithPayloads && unit instanceof Payloadc p && p.hasPayload()); return targetable || (vulnerableWithPayloads && unit instanceof Payloadc p && p.hasPayload());
} }
public boolean killable(Unit unit){
return killable;
}
public boolean hittable(Unit unit){ public boolean hittable(Unit unit){
return hittable || (vulnerableWithPayloads && unit instanceof Payloadc p && p.hasPayload()); return hittable || (vulnerableWithPayloads && unit instanceof Payloadc p && p.hasPayload());
} }