diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b26b418862..c11531fafc 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -412,14 +412,14 @@ public class UnitTypes implements ContentList{ mechStepShake = 0.15f; ammoType = AmmoTypes.powerHigh; - speed = 0.35f; + speed = 0.36f; boostMultiplier = 2.1f; engineOffset = 12f; engineSize = 6f; lowAltitude = true; - health = 7200f; - armor = 8f; + health = 7500f; + armor = 9f; canBoost = true; landShake = 4f; immunities = ObjectSet.with(StatusEffects.burning); @@ -443,8 +443,8 @@ public class UnitTypes implements ContentList{ cooldownTime = 200f; bullet = new ContinuousLaserBulletType(){{ - damage = 26f; - length = 170f; + damage = 28f; + length = 175f; hitEffect = Fx.hitMeltHeal; drawSize = 420f; lifetime = 160f; @@ -454,7 +454,7 @@ public class UnitTypes implements ContentList{ shootEffect = Fx.greenLaserChargeSmall; - incendChance = 0.08f; + incendChance = 0.09f; incendSpread = 5f; incendAmount = 1; diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index cc0b1ea934..504c07dfa3 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -338,7 +338,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ } }else if(floor != Blocks.basalt && floor != Blocks.ice && floor.asFloor().hasSurface()){ float noise = noise(x + 782, y, 5, 0.75f, 260f, 1f); - if(noise > 0.67f && !enemies.contains(e -> Mathf.within(x, y, e.x, e.y, 8))){ + if(noise > 0.67f && !roomseq.contains(e -> Mathf.within(x, y, e.x, e.y, 14))){ if(noise > 0.72f){ floor = noise > 0.78f ? Blocks.taintedWater : (floor == Blocks.sand ? Blocks.sandWater : Blocks.darksandTaintedWater); }else{