Fixed payload calculations not using squares

This commit is contained in:
Anuken
2020-09-06 22:19:30 -04:00
parent 010a1594fa
commit 93d1904978
3 changed files with 7 additions and 7 deletions
@@ -21,19 +21,19 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
Seq<Payload> payloads = new Seq<>();
float payloadUsed(){
return payloads.sumf(Payload::size);
return payloads.sumf(p -> p.size() * p.size());
}
boolean canPickup(Unit unit){
return payloadUsed() + unit.hitSize <= type.payloadCapacity;
return payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity;
}
boolean canPickup(Building build){
return payloadUsed() + build.block.size * Vars.tilesize <= type.payloadCapacity;
return payloadUsed() + build.block.size * build.block.size * Vars.tilesize * Vars.tilesize <= type.payloadCapacity;
}
boolean canPickupPayload(Payload pay){
return payloadUsed() + pay.size() <= type.payloadCapacity;
return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity;
}
boolean hasPayload(){