From 6983f574591a4aeb6ba33b4110954bcd29546f74 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Dec 2020 13:31:31 -0500 Subject: [PATCH] circleTarget unit AI parameter --- core/assets/maps/fungalPass.msav | Bin 10885 -> 10885 bytes core/src/mindustry/ai/types/BuilderAI.java | 2 +- core/src/mindustry/ai/types/FlyingAI.java | 2 +- core/src/mindustry/content/UnitTypes.java | 2 ++ core/src/mindustry/core/Control.java | 2 -- core/src/mindustry/type/UnitType.java | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index 95c75030c102fffcc70f6d383410c39b6fa8b565..53dd6935f2bb5b55c853d9f543d998da6612de36 100644 GIT binary patch literal 10885 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 bi2b?s!zd|LT(~{s{pziE&L#gJGDHAPnJ`}E literal 10885 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 b5c|9J!zd|LoWFg<`_)@-olX8f1+xOXP9SMY diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java index a3c3d9070b..ce8b5ae92d 100644 --- a/core/src/mindustry/ai/types/BuilderAI.java +++ b/core/src/mindustry/ai/types/BuilderAI.java @@ -130,6 +130,6 @@ public class BuilderAI extends AIController{ @Override public boolean shouldShoot(){ - return !((Builderc)unit).isBuilding(); + return !unit.isBuilding(); } } diff --git a/core/src/mindustry/ai/types/FlyingAI.java b/core/src/mindustry/ai/types/FlyingAI.java index bf7367731d..6c2507ca5a 100644 --- a/core/src/mindustry/ai/types/FlyingAI.java +++ b/core/src/mindustry/ai/types/FlyingAI.java @@ -12,7 +12,7 @@ public class FlyingAI extends AIController{ @Override public void updateMovement(){ if(target != null && unit.hasWeapons() && command() == UnitCommand.attack){ - if(unit.type.weapons.first().rotate){ + if(unit.type.circleTarget){ moveTo(target, unit.range() * 0.8f); unit.lookAt(target); }else{ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index d371f63202..d1a771621e 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -918,6 +918,7 @@ public class UnitTypes implements ContentList{ range = 140f; targetAir = false; commandLimit = 4; + circleTarget = true; weapons.add(new Weapon(){{ y = 0f; @@ -950,6 +951,7 @@ public class UnitTypes implements ContentList{ armor = 3f; targetFlag = BlockFlag.factory; commandLimit = 5; + circleTarget = true; weapons.add(new Weapon(){{ minShootVelocity = 0.75f; diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 8eeb50200e..00d4096e78 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -335,8 +335,6 @@ public class Control implements ApplicationListener, Loadable{ state.wave = 1; //set up default wave time state.wavetime = state.rules.waveSpacing * 2f; - //slightly increase wave spacing as a handicap - state.rules.waveSpacing += 60f * 10; //reset captured state sector.info.wasCaptured = false; //re-enable waves diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index fc32ec7bbc..3b42f7b61a 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -46,7 +46,7 @@ public class UnitType extends UnlockableContent{ public float health = 200f, range = -1, armor = 0f, maxRange = -1f; public float crashDamageMultiplier = 1f; public boolean targetAir = true, targetGround = true; - public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false; + public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false, circleTarget = true; public boolean canBoost = false; public boolean destructibleWreck = true; public float groundLayer = Layer.groundUnit;