From 2726ebe191f61a636164cb1c81e6a98bb940f5ce Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 3 Aug 2019 00:04:33 -0400 Subject: [PATCH] Re-balanced starting item amount --- core/assets/maps/fortress.msav | Bin 8485 -> 8477 bytes .../io/anuke/mindustry/content/Blocks.java | 206 +++++++++--------- core/src/io/anuke/mindustry/game/Rules.java | 2 +- .../mindustry/maps/filters/OreFilter.java | 2 +- .../ui/dialogs/CustomRulesDialog.java | 2 +- 5 files changed, 106 insertions(+), 106 deletions(-) diff --git a/core/assets/maps/fortress.msav b/core/assets/maps/fortress.msav index 25f2c10835e4a367db28317e796dc4093d643ae3..c5f58e0380f6c0805e474c907fb756354e37dc66 100644 GIT binary patch literal 8477 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 z false, ItemStack.with(Items.titanium, 1500)); + requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 1000)); alwaysUnlocked = true; health = 1100; @@ -1231,7 +1231,7 @@ public class Blocks implements ContentList{ }}; coreFoundation = new CoreBlock("core-foundation"){{ - requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 2250, Items.silicon, 1500)); + requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 1500, Items.silicon, 1000)); health = 2000; itemCapacity = 9000; @@ -1239,7 +1239,7 @@ public class Blocks implements ContentList{ }}; coreNucleus = new CoreBlock("core-nucleus"){{ - requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 6000, Items.silicon, 3000, Items.surgealloy, 1500)); + requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000, Items.surgealloy, 1000)); health = 4000; itemCapacity = 13000; @@ -1247,24 +1247,24 @@ public class Blocks implements ContentList{ }}; vault = new Vault("vault"){{ - requirements(Category.effect, ItemStack.with(Items.titanium, 375, Items.thorium, 187)); + requirements(Category.effect, ItemStack.with(Items.titanium, 250, Items.thorium, 125)); size = 3; itemCapacity = 1000; }}; container = new Vault("container"){{ - requirements(Category.effect, ItemStack.with(Items.titanium, 150)); + requirements(Category.effect, ItemStack.with(Items.titanium, 100)); size = 2; itemCapacity = 300; }}; unloader = new Unloader("unloader"){{ - requirements(Category.effect, ItemStack.with(Items.titanium, 37, Items.silicon, 45)); + requirements(Category.effect, ItemStack.with(Items.titanium, 25, Items.silicon, 30)); speed = 7f; }}; launchPad = new LaunchPad("launch-pad"){{ - requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.copper, 375, Items.silicon, 112, Items.lead, 150)); + requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.copper, 250, Items.silicon, 75, Items.lead, 100)); size = 3; itemCapacity = 100; launchTime = 60f * 16; @@ -1273,7 +1273,7 @@ public class Blocks implements ContentList{ }}; launchPadLarge = new LaunchPad("launch-pad-large"){{ - requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.titanium, 300, Items.silicon, 225, Items.lead, 375, Items.plastanium, 112)); + requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75)); size = 4; itemCapacity = 250; launchTime = 60f * 14; @@ -1286,7 +1286,7 @@ public class Blocks implements ContentList{ //region turrets duo = new DoubleTurret("duo"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 52), true); + requirements(Category.turret, ItemStack.with(Items.copper, 35), true); ammo( Items.copper, Bullets.standardCopper, Items.graphite, Bullets.standardDense, @@ -1304,7 +1304,7 @@ public class Blocks implements ContentList{ }}; scatter = new BurstTurret("scatter"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 127, Items.lead, 67)); + requirements(Category.turret, ItemStack.with(Items.copper, 85, Items.lead, 45)); ammo( Items.scrap, Bullets.flakScrap, Items.lead, Bullets.flakLead @@ -1325,7 +1325,7 @@ public class Blocks implements ContentList{ }}; scorch = new ItemTurret("scorch"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 37, Items.graphite, 33)); + requirements(Category.turret, ItemStack.with(Items.copper, 25, Items.graphite, 22)); ammo( Items.coal, Bullets.basicFlame, Items.pyratite, Bullets.pyraFlame @@ -1340,7 +1340,7 @@ public class Blocks implements ContentList{ }}; hail = new ArtilleryTurret("hail"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 60, Items.graphite, 25)); + requirements(Category.turret, ItemStack.with(Items.copper, 40, Items.graphite, 17)); ammo( Items.graphite, Bullets.artilleryDense, Items.silicon, Bullets.artilleryHoming, @@ -1355,7 +1355,7 @@ public class Blocks implements ContentList{ }}; wave = new LiquidTurret("wave"){{ - requirements(Category.turret, ItemStack.with(Items.metaglass, 67, Items.lead, 112)); + requirements(Category.turret, ItemStack.with(Items.metaglass, 45, Items.lead, 75)); ammo( Liquids.water, Bullets.waterShot, Liquids.slag, Bullets.slagShot, @@ -1382,7 +1382,7 @@ public class Blocks implements ContentList{ }}; lancer = new ChargeTurret("lancer"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 37, Items.lead, 75, Items.silicon, 67)); + requirements(Category.turret, ItemStack.with(Items.copper, 25, Items.lead, 50, Items.silicon, 45)); range = 155f; chargeTime = 50f; chargeMaxDelay = 30f; @@ -1404,7 +1404,7 @@ public class Blocks implements ContentList{ }}; arc = new PowerTurret("arc"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 52, Items.lead, 52)); + requirements(Category.turret, ItemStack.with(Items.copper, 35, Items.lead, 35)); shootType = Bullets.arc; reload = 24f; shootCone = 40f; @@ -1420,7 +1420,7 @@ public class Blocks implements ContentList{ }}; swarmer = new BurstTurret("swarmer"){{ - requirements(Category.turret, ItemStack.with(Items.graphite, 52, Items.titanium, 52, Items.plastanium, 67, Items.silicon, 45)); + requirements(Category.turret, ItemStack.with(Items.graphite, 35, Items.titanium, 35, Items.plastanium, 45, Items.silicon, 30)); ammo( Items.blastCompound, Bullets.missileExplosive, Items.pyratite, Bullets.missileIncendiary, @@ -1437,7 +1437,7 @@ public class Blocks implements ContentList{ }}; salvo = new BurstTurret("salvo"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 157, Items.graphite, 142, Items.titanium, 90)); + requirements(Category.turret, ItemStack.with(Items.copper, 105, Items.graphite, 95, Items.titanium, 60)); ammo( Items.copper, Bullets.standardCopper, Items.graphite, Bullets.standardDense, @@ -1461,7 +1461,7 @@ public class Blocks implements ContentList{ }}; fuse = new ItemTurret("fuse"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 337, Items.graphite, 337, Items.thorium, 150)); + requirements(Category.turret, ItemStack.with(Items.copper, 225, Items.graphite, 225, Items.thorium, 100)); reload = 35f; shootShake = 4f; @@ -1513,7 +1513,7 @@ public class Blocks implements ContentList{ }}; ripple = new ArtilleryTurret("ripple"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 225, Items.graphite, 202, Items.titanium, 90)); + requirements(Category.turret, ItemStack.with(Items.copper, 150, Items.graphite, 135, Items.titanium, 60)); ammo( Items.graphite, Bullets.artilleryDense, Items.silicon, Bullets.artilleryHoming, @@ -1538,7 +1538,7 @@ public class Blocks implements ContentList{ }}; cyclone = new ItemTurret("cyclone"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 300, Items.titanium, 187, Items.plastanium, 120)); + requirements(Category.turret, ItemStack.with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80)); ammo( Items.blastCompound, Bullets.flakExplosive, Items.plastanium, Bullets.flakPlastic, @@ -1557,7 +1557,7 @@ public class Blocks implements ContentList{ }}; spectre = new DoubleTurret("spectre"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 525, Items.graphite, 450, Items.surgealloy, 375, Items.plastanium, 262, Items.thorium, 375)); + requirements(Category.turret, ItemStack.with(Items.copper, 350, Items.graphite, 300, Items.surgealloy, 250, Items.plastanium, 175, Items.thorium, 250)); ammo( Items.graphite, Bullets.standardDenseBig, Items.pyratite, Bullets.standardIncendiaryBig, @@ -1582,7 +1582,7 @@ public class Blocks implements ContentList{ }}; meltdown = new LaserTurret("meltdown"){{ - requirements(Category.turret, ItemStack.with(Items.copper, 375, Items.lead, 525, Items.graphite, 450, Items.surgealloy, 487, Items.silicon, 487)); + requirements(Category.turret, ItemStack.with(Items.copper, 250, Items.lead, 350, Items.graphite, 300, Items.surgealloy, 325, Items.silicon, 325)); shootType = Bullets.meltdownLaser; shootEffect = Fx.shootBigSmoke2; shootCone = 40f; @@ -1603,7 +1603,7 @@ public class Blocks implements ContentList{ //region units draugFactory = new UnitFactory("draug-factory"){{ - requirements(Category.units, ItemStack.with(Items.copper, 45, Items.lead, 105)); + requirements(Category.units, ItemStack.with(Items.copper, 30, Items.lead, 70)); type = UnitTypes.draug; produceTime = 2500; size = 2; @@ -1613,7 +1613,7 @@ public class Blocks implements ContentList{ }}; spiritFactory = new UnitFactory("spirit-factory"){{ - requirements(Category.units, ItemStack.with(Items.metaglass, 52, Items.lead, 82, Items.silicon, 67)); + requirements(Category.units, ItemStack.with(Items.metaglass, 35, Items.lead, 55, Items.silicon, 45)); type = UnitTypes.spirit; produceTime = 2850; size = 2; @@ -1623,7 +1623,7 @@ public class Blocks implements ContentList{ }}; phantomFactory = new UnitFactory("phantom-factory"){{ - requirements(Category.units, ItemStack.with(Items.titanium, 67, Items.thorium, 60, Items.lead, 82, Items.silicon, 157)); + requirements(Category.units, ItemStack.with(Items.titanium, 45, Items.thorium, 40, Items.lead, 55, Items.silicon, 105)); type = UnitTypes.phantom; produceTime = 3650; size = 2; @@ -1633,7 +1633,7 @@ public class Blocks implements ContentList{ }}; wraithFactory = new UnitFactory("wraith-factory"){{ - requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 45, Items.lead, 60, Items.silicon, 67)); + requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 30, Items.lead, 40, Items.silicon, 45)); type = UnitTypes.wraith; produceTime = 750; size = 2; @@ -1642,7 +1642,7 @@ public class Blocks implements ContentList{ }}; ghoulFactory = new UnitFactory("ghoul-factory"){{ - requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 112, Items.lead, 97, Items.silicon, 165)); + requirements(Category.units, padVisible, ItemStack.with(Items.titanium, 75, Items.lead, 65, Items.silicon, 110)); type = UnitTypes.ghoul; produceTime = 1150; size = 3; @@ -1651,7 +1651,7 @@ public class Blocks implements ContentList{ }}; revenantFactory = new UnitFactory("revenant-factory"){{ - requirements(Category.units, padVisible, ItemStack.with(Items.plastanium, 75, Items.titanium, 225, Items.lead, 225, Items.silicon, 300)); + requirements(Category.units, padVisible, ItemStack.with(Items.plastanium, 50, Items.titanium, 150, Items.lead, 150, Items.silicon, 200)); type = UnitTypes.revenant; produceTime = 2000; size = 4; @@ -1660,7 +1660,7 @@ public class Blocks implements ContentList{ }}; daggerFactory = new UnitFactory("dagger-factory"){{ - requirements(Category.units, padVisible, ItemStack.with(Items.lead, 82, Items.silicon, 52)); + requirements(Category.units, padVisible, ItemStack.with(Items.lead, 55, Items.silicon, 35)); type = UnitTypes.dagger; produceTime = 850; size = 2; @@ -1669,7 +1669,7 @@ public class Blocks implements ContentList{ }}; crawlerFactory = new UnitFactory("crawler-factory"){{ - requirements(Category.units, padVisible, ItemStack.with(Items.lead, 37, Items.silicon, 60)); + requirements(Category.units, padVisible, ItemStack.with(Items.lead, 25, Items.silicon, 40)); type = UnitTypes.crawler; produceTime = 250; size = 2; @@ -1679,7 +1679,7 @@ public class Blocks implements ContentList{ }}; titanFactory = new UnitFactory("titan-factory"){{ - requirements(Category.units, padVisible, ItemStack.with(Items.graphite, 75, Items.lead, 75, Items.silicon, 67)); + requirements(Category.units, padVisible, ItemStack.with(Items.graphite, 50, Items.lead, 50, Items.silicon, 45)); type = UnitTypes.titan; produceTime = 1050; size = 3; @@ -1688,7 +1688,7 @@ public class Blocks implements ContentList{ }}; fortressFactory = new UnitFactory("fortress-factory"){{ - requirements(Category.units, padVisible, ItemStack.with(Items.thorium, 60, Items.lead, 165, Items.silicon, 112)); + requirements(Category.units, padVisible, ItemStack.with(Items.thorium, 40, Items.lead, 110, Items.silicon, 75)); type = UnitTypes.fortress; produceTime = 2000; size = 3; @@ -1698,7 +1698,7 @@ public class Blocks implements ContentList{ }}; repairPoint = new RepairPoint("repair-point"){{ - requirements(Category.units, ItemStack.with(Items.lead, 22, Items.copper, 22, Items.silicon, 22)); + requirements(Category.units, ItemStack.with(Items.lead, 15, Items.copper, 15, Items.silicon, 15)); repairSpeed = 0.3f; powerUse = 1f; }}; @@ -1707,49 +1707,49 @@ public class Blocks implements ContentList{ //region upgrades dartPad = new MechPad("dart-mech-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 150, Items.graphite, 75, Items.copper, 112)); + requirements(Category.upgrade, ItemStack.with(Items.lead, 100, Items.graphite, 50, Items.copper, 75)); mech = Mechs.alpha; size = 2; consumes.power(0.5f); }}; deltaPad = new MechPad("delta-mech-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 262, Items.titanium, 262, Items.copper, 300, Items.silicon, 337, Items.thorium, 225)); + requirements(Category.upgrade, ItemStack.with(Items.lead, 175, Items.titanium, 175, Items.copper, 200, Items.silicon, 225, Items.thorium, 150)); mech = Mechs.delta; size = 2; consumes.power(0.7f); }}; tauPad = new MechPad("tau-mech-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 187, Items.titanium, 187, Items.copper, 187, Items.silicon, 187)); + requirements(Category.upgrade, ItemStack.with(Items.lead, 125, Items.titanium, 125, Items.copper, 125, Items.silicon, 125)); mech = Mechs.tau; size = 2; consumes.power(1f); }}; omegaPad = new MechPad("omega-mech-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 337, Items.graphite, 412, Items.silicon, 487, Items.thorium, 450, Items.surgealloy, 180)); + requirements(Category.upgrade, ItemStack.with(Items.lead, 225, Items.graphite, 275, Items.silicon, 325, Items.thorium, 300, Items.surgealloy, 120)); mech = Mechs.omega; size = 3; consumes.power(1.2f); }}; javelinPad = new MechPad("javelin-ship-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 262, Items.silicon, 337, Items.titanium, 375, Items.plastanium, 300, Items.phasefabric, 150)); + requirements(Category.upgrade, ItemStack.with(Items.lead, 175, Items.silicon, 225, Items.titanium, 250, Items.plastanium, 200, Items.phasefabric, 100)); mech = Mechs.javelin; size = 2; consumes.power(0.8f); }}; tridentPad = new MechPad("trident-ship-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 187, Items.copper, 187, Items.silicon, 187, Items.titanium, 225, Items.plastanium, 150)); + requirements(Category.upgrade, ItemStack.with(Items.lead, 125, Items.copper, 125, Items.silicon, 125, Items.titanium, 150, Items.plastanium, 100)); mech = Mechs.trident; size = 2; consumes.power(1f); }}; glaivePad = new MechPad("glaive-ship-pad"){{ - requirements(Category.upgrade, ItemStack.with(Items.lead, 337, Items.silicon, 487, Items.titanium, 525, Items.plastanium, 450, Items.surgealloy, 150)); + requirements(Category.upgrade, ItemStack.with(Items.lead, 225, Items.silicon, 325, Items.titanium, 350, Items.plastanium, 300, Items.surgealloy, 100)); mech = Mechs.glaive; size = 3; consumes.power(1.2f); diff --git a/core/src/io/anuke/mindustry/game/Rules.java b/core/src/io/anuke/mindustry/game/Rules.java index 7361a634c6..a07c0b6396 100644 --- a/core/src/io/anuke/mindustry/game/Rules.java +++ b/core/src/io/anuke/mindustry/game/Rules.java @@ -66,7 +66,7 @@ public class Rules{ /** Whether this is the editor gamemode. */ public boolean editor = false; /** Starting items put in cores */ - public Array loadout = Array.with(ItemStack.with(Items.copper, 150)); + public Array loadout = Array.with(ItemStack.with(Items.copper, 100)); /** Copies this ruleset exactly. Not very efficient at all, do not use often. */ public Rules copy(){ diff --git a/core/src/io/anuke/mindustry/maps/filters/OreFilter.java b/core/src/io/anuke/mindustry/maps/filters/OreFilter.java index 7af1591c18..e04f9935a4 100644 --- a/core/src/io/anuke/mindustry/maps/filters/OreFilter.java +++ b/core/src/io/anuke/mindustry/maps/filters/OreFilter.java @@ -8,7 +8,7 @@ import static io.anuke.mindustry.maps.filters.FilterOption.BlockOption; import static io.anuke.mindustry.maps.filters.FilterOption.oresOnly; public class OreFilter extends GenerateFilter{ - public float scl = 24, threshold = 0.812f, octaves = 2f, falloff = 0.3f; + public float scl = 23, threshold = 0.811f, octaves = 2f, falloff = 0.3f; public Block ore = Blocks.oreCopper; { diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java index f391912fb0..e306ecdea3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java @@ -70,7 +70,7 @@ public class CustomRulesDialog extends FloatingDialog{ () -> rules.loadout, () -> { rules.loadout.clear(); - rules.loadout.add(new ItemStack(Items.copper, 200)); + rules.loadout.add(new ItemStack(Items.copper, 100)); }, () -> {}, () -> {}, item -> item.type == ItemType.material