mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-01-31 18:04:21 +07:00
Disabled missile unit collisions
This commit is contained in:
parent
0b7d8f371e
commit
b3d2e7b0ca
@ -11,24 +11,22 @@ public class MissileAI extends AIController{
|
|||||||
|
|
||||||
if(target != null){
|
if(target != null){
|
||||||
unit.lookAt(target);
|
unit.lookAt(target);
|
||||||
|
|
||||||
var build = unit.buildOn();
|
|
||||||
|
|
||||||
//kill instantly on building contact
|
|
||||||
//TODO kill on target unit contact too
|
|
||||||
if(build != null && build == target){
|
|
||||||
unit.kill();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//move forward forever
|
//move forward forever
|
||||||
unit.moveAt(vec.trns(unit.rotation, unit.speed()));
|
unit.moveAt(vec.trns(unit.rotation, unit.speed()));
|
||||||
|
|
||||||
|
var build = unit.buildOn();
|
||||||
|
|
||||||
|
//kill instantly on enemy building contact
|
||||||
|
if(build != null && build.team != unit.team){
|
||||||
|
unit.kill();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean retarget(){
|
public boolean retarget(){
|
||||||
//more frequent retarget. TODO lag?
|
//more frequent retarget. TODO won't this lag?
|
||||||
return timer.get(timerTarget, 10f);
|
return timer.get(timerTarget, 10f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -36,9 +36,9 @@ public class PhysicsProcess implements AsyncProcess{
|
|||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
//find Unit without bodies and assign them
|
//find Units without bodies and assign them
|
||||||
for(Unit entity : group){
|
for(Unit entity : group){
|
||||||
if(entity == null || entity.type == null) continue;
|
if(entity == null || entity.type == null || !entity.type.physics) continue;
|
||||||
|
|
||||||
if(entity.physref == null){
|
if(entity.physref == null){
|
||||||
PhysicsBody body = new PhysicsBody();
|
PhysicsBody body = new PhysicsBody();
|
||||||
|
@ -2479,30 +2479,6 @@ public class UnitTypes{
|
|||||||
smokeEffect = Fx.shootBigSmoke;
|
smokeEffect = Fx.shootBigSmoke;
|
||||||
buildingDamageMultiplier = 0.4f;
|
buildingDamageMultiplier = 0.4f;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
//TODO REMOVE
|
|
||||||
/*
|
|
||||||
unitSpawned = new MissileUnitType("duo"){{
|
|
||||||
trailScl = 1.1f;
|
|
||||||
speed = 3f;
|
|
||||||
weapons.add(new Weapon(){{
|
|
||||||
shootOnDeath = true;
|
|
||||||
bullet = new BulletType(){{
|
|
||||||
collidesTiles = false;
|
|
||||||
collides = false;
|
|
||||||
hitSound = Sounds.explosion;
|
|
||||||
|
|
||||||
lifetime = 10f;
|
|
||||||
speed = 1f;
|
|
||||||
splashDamageRadius = 55f;
|
|
||||||
instantDisappear = true;
|
|
||||||
splashDamage = 90f;
|
|
||||||
killShooter = true;
|
|
||||||
hittable = false;
|
|
||||||
collidesAir = true;
|
|
||||||
}};
|
|
||||||
}});
|
|
||||||
}};*/
|
|
||||||
}});
|
}});
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ public class MissileUnitType extends UnitType{
|
|||||||
constructor = TimedKillUnit::create;
|
constructor = TimedKillUnit::create;
|
||||||
envEnabled = Env.any;
|
envEnabled = Env.any;
|
||||||
envDisabled = Env.none;
|
envDisabled = Env.none;
|
||||||
|
physics = false;
|
||||||
trailLength = 7;
|
trailLength = 7;
|
||||||
hidden = true;
|
hidden = true;
|
||||||
rotateSpeed = 2f;
|
rotateSpeed = 2f;
|
||||||
|
@ -131,6 +131,8 @@ public class UnitType extends UnlockableContent{
|
|||||||
public Color engineColorInner = Color.white;
|
public Color engineColorInner = Color.white;
|
||||||
public Seq<UnitEngine> engines = new Seq<>();
|
public Seq<UnitEngine> engines = new Seq<>();
|
||||||
public float strafePenalty = 0.5f;
|
public float strafePenalty = 0.5f;
|
||||||
|
/** If false, this unit does not physically collide with others. */
|
||||||
|
public boolean physics = true;
|
||||||
public float hitSize = 6f;
|
public float hitSize = 6f;
|
||||||
public float itemOffsetY = 3f;
|
public float itemOffsetY = 3f;
|
||||||
public float lightRadius = -1f, lightOpacity = 0.6f;
|
public float lightRadius = -1f, lightOpacity = 0.6f;
|
||||||
|
Loading…
Reference in New Issue
Block a user