more misc bugfixes

This commit is contained in:
Anuken
2022-05-09 12:51:05 -04:00
parent 4635aad335
commit 0b141b6eb0
3 changed files with 6 additions and 2 deletions

View File

@@ -72,7 +72,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
} }
boolean canPickupPayload(Payload pay){ boolean canPickupPayload(Payload pay){
return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity + 0.001f; return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity + 0.001f && (type.pickupUnits || !(pay instanceof UnitPayload));
} }
boolean hasPayload(){ boolean hasPayload(){

View File

@@ -162,6 +162,10 @@ public class MinimapRenderer{
//crisp pixels //crisp pixels
dynamicTex.setFilter(TextureFilter.nearest); dynamicTex.setFilter(TextureFilter.nearest);
if(worldSpace){
region.set(0f, 0f, 1f, 1f);
}
Tmp.tr1.set(dynamicTex); Tmp.tr1.set(dynamicTex);
Tmp.tr1.set(region.u, 1f - region.v, region.u2, 1f - region.v2); Tmp.tr1.set(region.u, 1f - region.v, region.u2, 1f - region.v2);

View File

@@ -19,7 +19,7 @@ public class MissileUnitType extends UnitType{
isEnemy = false; isEnemy = false;
useUnitCap = false; useUnitCap = false;
allowedInPayloads = false; allowedInPayloads = false;
aiController = MissileAI::new; controller = u -> new MissileAI();
flying = true; flying = true;
constructor = TimedKillUnit::create; constructor = TimedKillUnit::create;
envEnabled = Env.any; envEnabled = Env.any;