From d355ea9d0c3721a4475ad520191fb84c61bf438e Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 15 Jan 2025 00:03:05 -0500 Subject: [PATCH] Scathe inconsistency fix --- core/src/mindustry/ai/types/MissileAI.java | 2 +- core/src/mindustry/content/Blocks.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/ai/types/MissileAI.java b/core/src/mindustry/ai/types/MissileAI.java index b88ae5c58b..082c445048 100644 --- a/core/src/mindustry/ai/types/MissileAI.java +++ b/core/src/mindustry/ai/types/MissileAI.java @@ -12,7 +12,7 @@ public class MissileAI extends AIController{ @Override protected void resetTimers(){ - timer.reset(timerTarget, Mathf.random(3f)); + timer.reset(timerTarget, 5f); } @Override diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 0865cadf56..3034423924 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -4513,7 +4513,7 @@ public class Blocks{ lightningLength = 4; lightningDamage = 18f; lightningLengthRand = 3; - speed = 7f; + speed = 6f; width = height = 16; shrinkY = 0.3f; backSprite = "large-bomb-back"; @@ -4538,6 +4538,8 @@ public class Blocks{ bulletInterval = 4f; intervalBullet = new BulletType(){{ + collidesGround = false; + collidesTiles = false; lightningLengthRand = 4; lightningLength = 2; lightningCone = 30f; @@ -5009,7 +5011,8 @@ public class Blocks{ weapons.add(new Weapon(){{ shootCone = 360f; - mirror = false; + rotate = true; + rotationLimit = rotateSpeed = 0f; reload = 1f; deathExplosionEffect = Fx.massiveExplosion; shootOnDeath = true; @@ -5178,7 +5181,6 @@ public class Blocks{ requirements(Category.turret, with(Items.oxide, 200, Items.surgeAlloy, 400, Items.silicon, 800, Items.carbide, 500, Items.phaseFabric, 300)); ammo( - //this is really lazy Items.surgeAlloy, new BasicBulletType(7f, 250){{ sprite = "large-orb"; width = 17f;