From 0b7c7907775f3edea3d839466857befe857fe6c2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 14 Feb 2023 15:08:24 -0500 Subject: [PATCH] turret status fix --- core/src/mindustry/content/UnitTypes.java | 4 ++++ core/src/mindustry/world/blocks/units/RepairTurret.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index c74beaca1d..87d3900ea9 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -3848,6 +3848,7 @@ public class UnitTypes{ armor = 9f; hitSize = 46f; payloadCapacity = Mathf.sqr(6f) * tilePayload; + targetAir = false; engineSize = 6f; engineOffset = 25.25f; @@ -3913,8 +3914,10 @@ public class UnitTypes{ shake = 1f; speed = 0f; keepVelocity = false; + collidesAir = false; spawnUnit = new MissileUnitType("disrupt-missile"){{ + targetAir = false; speed = 4.6f; maxRange = 5f; outlineColor = Pal.darkOutline; @@ -3953,6 +3956,7 @@ public class UnitTypes{ reload = 1f; shootOnDeath = true; bullet = new ExplosionBulletType(140f, 25f){{ + collidesAir = false; suppressionRange = 140f; shootEffect = new ExplosionEffect(){{ lifetime = 50f; diff --git a/core/src/mindustry/world/blocks/units/RepairTurret.java b/core/src/mindustry/world/blocks/units/RepairTurret.java index bb00ba768d..814152b6ff 100644 --- a/core/src/mindustry/world/blocks/units/RepairTurret.java +++ b/core/src/mindustry/world/blocks/units/RepairTurret.java @@ -209,7 +209,7 @@ public class RepairTurret extends Block{ @Override public BlockStatus status(){ - return Mathf.equal(efficiency, 0f, 0.01f) ? BlockStatus.noInput : super.status(); + return Mathf.equal(potentialEfficiency, 0f, 0.01f) ? BlockStatus.noInput : super.status(); } @Override