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

Misc cleanup & target/hit movements

Browse Source
This commit is contained in:
Anuken
2022-05-03 20:39:54 -04:00
parent 8b9eb0b466
commit 7640fa0bf0
8 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/entities/comp/PayloadComp.java
View File

@@ -61,18 +61,6 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
}
}
@Override
@Replace
public boolean targetable(){
return type.targetable || (type.vulnerableWithPayloads && hasPayload());
}
@Override
@Replace
public boolean hittable(){
return type.hittable || (type.vulnerableWithPayloads && hasPayload());
}
float payloadUsed(){
return payloads.sumf(p -> p.size() * p.size());
}

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

@@ -355,12 +355,12 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
}
}
public boolean targetable(){
return type.targetable;
public boolean targetable(Team targeter){
return type.targetable(self(), targeter);
}
public boolean hittable(){
return type.hittable;
return type.hittable(self());
}
@Override