This commit is contained in:
Anuken
2020-09-21 12:05:24 -04:00
parent 74fadfe603
commit 45e77fe3b4
3 changed files with 10 additions and 6 deletions

View File

@@ -409,7 +409,11 @@ public class TechTree implements ContentList{
node(mono, () -> { node(mono, () -> {
node(poly, () -> { node(poly, () -> {
node(mega, () -> { node(mega, () -> {
node(quad, () -> {
node(oct, () -> {
});
});
}); });
}); });
}); });

View File

@@ -1145,11 +1145,11 @@ public class UnitTypes implements ContentList{
accel = 0.04f; accel = 0.04f;
drag = 0.018f; drag = 0.018f;
flying = true; flying = true;
engineOffset = 24f; engineOffset = 46f;
engineSize = 9f; engineSize = 7.8f;
rotateShooting = false; rotateShooting = false;
hitsize = 60f; hitsize = 60f;
payloadCapacity = (4 * 4) * (8 * 8); payloadCapacity = (4.5f * 4.5f) * (8 * 8);
buildSpeed = 3.5f; buildSpeed = 3.5f;
abilities.add(new ForceFieldAbility(140f, 4f, 6000f, 60f * 8), new HealFieldAbility(130f, 60f * 2, 140f)); abilities.add(new ForceFieldAbility(140f, 4f, 6000f, 60f * 8), new HealFieldAbility(130f, 60f * 2, 140f));

View File

@@ -25,15 +25,15 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
} }
boolean canPickup(Unit unit){ boolean canPickup(Unit unit){
return payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity; return payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity + 0.001f;
} }
boolean canPickup(Building build){ boolean canPickup(Building build){
return payloadUsed() + build.block.size * build.block.size * Vars.tilesize * Vars.tilesize <= type.payloadCapacity; return payloadUsed() + build.block.size * build.block.size * Vars.tilesize * Vars.tilesize <= type.payloadCapacity + 0.001f;
} }
boolean canPickupPayload(Payload pay){ boolean canPickupPayload(Payload pay){
return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity; return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity + 0.001f;
} }
boolean hasPayload(){ boolean hasPayload(){