From b7b7b2d99dce5a8dfab48e7d1a029a138d396049 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Mon, 16 Oct 2023 01:28:55 -0400 Subject: [PATCH] Fix formatting --- .../src/mindustry/client/utils/ServerUtils.kt | 205 +++++------------- 1 file changed, 52 insertions(+), 153 deletions(-) diff --git a/core/src/mindustry/client/utils/ServerUtils.kt b/core/src/mindustry/client/utils/ServerUtils.kt index 27132c4a34..79644f74d0 100644 --- a/core/src/mindustry/client/utils/ServerUtils.kt +++ b/core/src/mindustry/client/utils/ServerUtils.kt @@ -172,160 +172,59 @@ enum class CustomMode { override fun enable() { super.enable() - overwrites( - // This system is awful but it (mostly) works and it wasn't hard to implement. - UnitTypes.pulsar, - "abilities", - Seq(0), // Pulsar shield regen field removed - UnitTypes.crawler, - "health", - 100f, - UnitTypes.crawler, - "speed", - 1.5f, - UnitTypes.crawler, - "accel", - 0.08f, - UnitTypes.crawler, - "drag", - 0.016f, - UnitTypes.crawler, - "flying", - true, - UnitTypes.atrax, - "speed", - 0.5f, - UnitTypes.spiroct, - "speed", - 0.4f, - UnitTypes.spiroct, - "targetAir", - false, - UnitTypes.arkyid, - "speed", - 0.5f, - UnitTypes.arkyid, - "targetAir", - false, - UnitTypes.toxopid, - "targetAir", - false, - UnitTypes.flare, - "health", - 275, - UnitTypes.flare, - "range", - 140, - UnitTypes.horizon, - "itemCapacity", - 20, // Horizons can pick up items in flood, this just allows the items to draw correctly - UnitTypes.horizon, - "health", - 440, - UnitTypes.horizon, - "speed", - 1.7f, - UnitTypes.zenith, - "health", - 1400, - UnitTypes.zenith, - "speed", - 1.8f, - UnitTypes.oct, - "abilities", - Seq.with(ForceFieldAbility(140f, 16f, 15000f, 60f * 8)), // Oct heal removed, force field buff - UnitTypes.bryde, - "abilities", - Seq(0), // Bryde shield regen field removed - - Blocks.surgeWall, - "lightningChance", - 0f, - Blocks.reinforcedSurgeWall, - "lightningChance", - 0f, - Blocks.mender, - "healAmount", - 6f, - Blocks.mender, - "phaseBoost", - 2f, - Blocks.mendProjector, - "phaseBoost", - 12f, - Blocks.mendProjector, - "phaseBoost", - 2f, - Blocks.forceProjector, - "shieldHealth", - 2500f, - Blocks.forceProjector, - "coolantConsumer", - ConsumeCoolant(.1f), // FINISHME: This one probably breaks things, also it wont display correctly in the stats page - Blocks.radar, - "health", - 500, - Blocks.regenProjector, - "healPercent", - 12f, // Nice balance, a casual 180x buff - Blocks.shockwaveTower, - "health", - 2000, + overwrites( // This system is awful but it (mostly) works and it wasn't hard to implement. + UnitTypes.pulsar, "abilities", Seq(0), // Pulsar shield regen field removed + UnitTypes.crawler, "health", 100f, + UnitTypes.crawler, "speed", 1.5f, + UnitTypes.crawler, "accel", 0.08f, + UnitTypes.crawler, "drag", 0.016f, + UnitTypes.crawler, "flying", true, + UnitTypes.atrax, "speed", 0.5f, + UnitTypes.spiroct, "speed", 0.4f, + UnitTypes.spiroct, "targetAir", false, + UnitTypes.arkyid, "speed", 0.5f , + UnitTypes.arkyid, "targetAir", false, + UnitTypes.toxopid, "targetAir", false, + UnitTypes.flare, "health", 275, + UnitTypes.flare, "range", 140, + UnitTypes.horizon, "itemCapacity", 20, // Horizons can pick up items in flood, this just allows the items to draw correctly + UnitTypes.horizon, "health", 440, + UnitTypes.horizon, "speed", 1.7f, + UnitTypes.zenith, "health", 1400, + UnitTypes.zenith, "speed", 1.8f, + UnitTypes.oct, "abilities", Seq.with(ForceFieldAbility(140f, 16f, 15000f, 60f * 8)), // Oct heal removed, force field buff + UnitTypes.bryde, "abilities", Seq(0), // Bryde shield regen field removed + + Blocks.surgeWall, "lightningChance", 0f, + Blocks.reinforcedSurgeWall, "lightningChance", 0f, + Blocks.mender, "healAmount", 6f, + Blocks.mender, "phaseBoost", 2f, + Blocks.mendProjector, "phaseBoost", 12f, + Blocks.mendProjector, "phaseBoost", 2f, + Blocks.forceProjector, "shieldHealth", 2500f, + Blocks.forceProjector, "coolantConsumer", ConsumeCoolant(.1f), // FINISHME: This one probably breaks things, also it wont display correctly in the stats page + Blocks.radar, "health", 500, + Blocks.regenProjector, "healPercent", 12f, // Nice balance, a casual 180x buff + Blocks.shockwaveTower, "health", 2000, // Blocks.shockwaveTower, "consumeLiquids", Blocks.shockwaveTower.consumeLiquids(*LiquidStack.with(Liquids.cyanogen, 1f / 60f)) // FINISHME: This one too, consumers are annoying - Blocks.plastaniumConveyor, - "absorbLasers", - true, - Blocks.plastaniumConveyor, - "health", - 225, - Blocks.thoriumReactor, - "health", - 1400, - (Blocks.lancer as PowerTurret).shootType, - "damage", - 10, - (Blocks.arc as PowerTurret).shootType, - "damage", - 4, - (Blocks.arc as PowerTurret).shootType, - "lightningLength", - 15, - (Blocks.swarmer as ItemTurret).shoot, - "shots", - 5, - (Blocks.swarmer as ItemTurret).shoot, - "shotDelay", - 4f, - Blocks.segment, - "range", - 160f, - Blocks.segment, - "reload", - 9f, - Blocks.tsunami, - "reload", - 2f, - (Blocks.fuse as ItemTurret).ammoTypes.get(Items.titanium), - "pierce", - false, - (Blocks.fuse as ItemTurret).ammoTypes.get(Items.titanium), - "damage", - 10f, - (Blocks.fuse as ItemTurret).ammoTypes.get(Items.thorium), - "pierce", - false, - (Blocks.fuse as ItemTurret).ammoTypes.get(Items.thorium), - "damage", - 20f, - Blocks.breach, - "targetUnderBlocks", - true, - Blocks.diffuse, - "targetUnderBlocks", - true, - Blocks.scathe, - "targetUnderBlocks", - true, + Blocks.plastaniumConveyor, "absorbLasers", true, + Blocks.plastaniumConveyor, "health", 225, + Blocks.thoriumReactor, "health", 1400, + (Blocks.lancer as PowerTurret).shootType, "damage", 10, + (Blocks.arc as PowerTurret).shootType, "damage", 4, + (Blocks.arc as PowerTurret).shootType, "lightningLength", 15, + (Blocks.swarmer as ItemTurret).shoot, "shots", 5, + (Blocks.swarmer as ItemTurret).shoot, "shotDelay", 4f, + Blocks.segment, "range", 160f, + Blocks.segment, "reload", 9f, + Blocks.tsunami, "reload", 2f, + (Blocks.fuse as ItemTurret).ammoTypes.get(Items.titanium), "pierce", false, + (Blocks.fuse as ItemTurret).ammoTypes.get(Items.titanium), "damage", 10f, + (Blocks.fuse as ItemTurret).ammoTypes.get(Items.thorium), "pierce", false, + (Blocks.fuse as ItemTurret).ammoTypes.get(Items.thorium), "damage", 20f, + Blocks.breach, "targetUnderBlocks", true, + Blocks.diffuse, "targetUnderBlocks", true, + Blocks.scathe, "targetUnderBlocks", true, ) val fsAmmo = (Blocks.foreshadow as ItemTurret).ammoTypes