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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 DgLRTP literal 8485 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 J`4a`_0|3b&c~$@b diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index c9562dc7d2..d02836aedf 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -411,7 +411,7 @@ public class Blocks implements ContentList{ //region crafting graphitePress = new GenericCrafter("graphite-press"){{ - requirements(Category.crafting, ItemStack.with(Items.copper, 112, Items.lead, 45)); + requirements(Category.crafting, ItemStack.with(Items.copper, 75, Items.lead, 30)); craftEffect = Fx.pulverizeMedium; outputItem = new ItemStack(Items.graphite, 1); @@ -423,7 +423,7 @@ public class Blocks implements ContentList{ }}; multiPress = new GenericCrafter("multi-press"){{ - requirements(Category.crafting, ItemStack.with(Items.titanium, 150, Items.silicon, 37, Items.lead, 150, Items.graphite, 75)); + requirements(Category.crafting, ItemStack.with(Items.titanium, 100, Items.silicon, 25, Items.lead, 100, Items.graphite, 50)); craftEffect = Fx.pulverizeMedium; outputItem = new ItemStack(Items.graphite, 2); @@ -439,7 +439,7 @@ public class Blocks implements ContentList{ }}; siliconSmelter = new GenericSmelter("silicon-smelter"){{ - requirements(Category.crafting, ItemStack.with(Items.copper, 45, Items.lead, 37)); + requirements(Category.crafting, ItemStack.with(Items.copper, 30, Items.lead, 25)); craftEffect = Fx.smeltsmoke; outputItem = new ItemStack(Items.silicon, 1); craftTime = 40f; @@ -453,7 +453,7 @@ public class Blocks implements ContentList{ }}; kiln = new GenericSmelter("kiln"){{ - requirements(Category.crafting, ItemStack.with(Items.copper, 90, Items.graphite, 45, Items.lead, 45)); + requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.graphite, 30, Items.lead, 30)); craftEffect = Fx.smeltsmoke; outputItem = new ItemStack(Items.metaglass, 1); craftTime = 30f; @@ -466,7 +466,7 @@ public class Blocks implements ContentList{ }}; plastaniumCompressor = new GenericCrafter("plastanium-compressor"){{ - requirements(Category.crafting, ItemStack.with(Items.silicon, 120, Items.lead, 172, Items.graphite, 90, Items.titanium, 120)); + requirements(Category.crafting, ItemStack.with(Items.silicon, 80, Items.lead, 115, Items.graphite, 60, Items.titanium, 80)); hasItems = true; liquidCapacity = 60f; craftTime = 60f; @@ -495,7 +495,7 @@ public class Blocks implements ContentList{ }}; phaseWeaver = new GenericCrafter("phase-weaver"){{ - requirements(Category.crafting, ItemStack.with(Items.silicon, 195, Items.lead, 180, Items.thorium, 112)); + requirements(Category.crafting, ItemStack.with(Items.silicon, 130, Items.lead, 120, Items.thorium, 75)); craftEffect = Fx.smeltsmoke; outputItem = new ItemStack(Items.phasefabric, 1); craftTime = 120f; @@ -531,7 +531,7 @@ public class Blocks implements ContentList{ }}; surgeSmelter = new GenericSmelter("alloy-smelter"){{ - requirements(Category.crafting, ItemStack.with(Items.silicon, 120, Items.lead, 120, Items.thorium, 105)); + requirements(Category.crafting, ItemStack.with(Items.silicon, 80, Items.lead, 80, Items.thorium, 70)); craftEffect = Fx.smeltsmoke; outputItem = new ItemStack(Items.surgealloy, 1); craftTime = 75f; @@ -543,7 +543,7 @@ public class Blocks implements ContentList{ }}; cryofluidMixer = new LiquidConverter("cryofluidmixer"){{ - requirements(Category.crafting, ItemStack.with(Items.lead, 97, Items.silicon, 60, Items.titanium, 90)); + requirements(Category.crafting, ItemStack.with(Items.lead, 65, Items.silicon, 40, Items.titanium, 60)); outputLiquid = new LiquidStack(Liquids.cryofluid, 0.2f); craftTime = 120f; size = 2; @@ -581,7 +581,7 @@ public class Blocks implements ContentList{ }}; blastMixer = new GenericCrafter("blast-mixer"){{ - requirements(Category.crafting, ItemStack.with(Items.lead, 45, Items.titanium, 30)); + requirements(Category.crafting, ItemStack.with(Items.lead, 30, Items.titanium, 20)); hasItems = true; hasPower = true; outputItem = new ItemStack(Items.blastCompound, 1); @@ -592,7 +592,7 @@ public class Blocks implements ContentList{ }}; pyratiteMixer = new GenericSmelter("pyratite-mixer"){{ - requirements(Category.crafting, ItemStack.with(Items.copper, 75, Items.lead, 37)); + requirements(Category.crafting, ItemStack.with(Items.copper, 50, Items.lead, 25)); flameColor = Color.CLEAR; hasItems = true; hasPower = true; @@ -605,7 +605,7 @@ public class Blocks implements ContentList{ }}; melter = new GenericCrafter("melter"){{ - requirements(Category.crafting, ItemStack.with(Items.copper, 45, Items.lead, 52, Items.graphite, 67)); + requirements(Category.crafting, ItemStack.with(Items.copper, 30, Items.lead, 35, Items.graphite, 45)); health = 200; outputLiquid = new LiquidStack(Liquids.slag, 2f); craftTime = 10f; @@ -616,7 +616,7 @@ public class Blocks implements ContentList{ }}; separator = new Separator("separator"){{ - requirements(Category.crafting, ItemStack.with(Items.copper, 45, Items.titanium, 37)); + requirements(Category.crafting, ItemStack.with(Items.copper, 30, Items.titanium, 25)); results = ItemStack.with( Items.copper, 5, Items.lead, 3, @@ -636,7 +636,7 @@ public class Blocks implements ContentList{ }}; sporePress = new GenericCrafter("spore-press"){{ - requirements(Category.crafting, ItemStack.with(Items.lead, 52, Items.silicon, 45)); + requirements(Category.crafting, ItemStack.with(Items.lead, 35, Items.silicon, 30)); liquidCapacity = 60f; craftTime = 20f; outputLiquid = new LiquidStack(Liquids.oil, 6f); @@ -672,7 +672,7 @@ public class Blocks implements ContentList{ }}; pulverizer = new GenericCrafter("pulverizer"){{ - requirements(Category.crafting, ItemStack.with(Items.copper, 45, Items.lead, 37)); + requirements(Category.crafting, ItemStack.with(Items.copper, 30, Items.lead, 25)); outputItem = new ItemStack(Items.sand, 1); craftEffect = Fx.pulverize; craftTime = 40f; @@ -695,7 +695,7 @@ public class Blocks implements ContentList{ }}; coalCentrifuge = new GenericCrafter("coal-centrifuge"){{ - requirements(Category.crafting, ItemStack.with(Items.titanium, 30, Items.graphite, 60, Items.lead, 45)); + requirements(Category.crafting, ItemStack.with(Items.titanium, 20, Items.graphite, 40, Items.lead, 30)); craftEffect = Fx.smeltsmoke; outputItem = new ItemStack(Items.coal, 1); craftTime = 30f; @@ -707,7 +707,7 @@ public class Blocks implements ContentList{ }}; incinerator = new Incinerator("incinerator"){{ - requirements(Category.crafting, ItemStack.with(Items.graphite, 7, Items.lead, 22)); + requirements(Category.crafting, ItemStack.with(Items.graphite, 5, Items.lead, 15)); health = 90; consumes.power(0.50f); }}; @@ -773,7 +773,7 @@ public class Blocks implements ContentList{ }}; copperWall = new Wall("copper-wall"){{ - requirements(Category.defense, ItemStack.with(Items.copper, 9)); + requirements(Category.defense, ItemStack.with(Items.copper, 6)); health = 80 * wallHealthMultiplier; }}; @@ -784,7 +784,7 @@ public class Blocks implements ContentList{ }}; titaniumWall = new Wall("titanium-wall"){{ - requirements(Category.defense, ItemStack.with(Items.titanium, 9)); + requirements(Category.defense, ItemStack.with(Items.titanium, 6)); health = 110 * wallHealthMultiplier; }}; @@ -795,7 +795,7 @@ public class Blocks implements ContentList{ }}; thoriumWall = new Wall("thorium-wall"){{ - requirements(Category.defense, ItemStack.with(Items.thorium, 9)); + requirements(Category.defense, ItemStack.with(Items.thorium, 6)); health = 200 * wallHealthMultiplier; }}; @@ -806,7 +806,7 @@ public class Blocks implements ContentList{ }}; phaseWall = new DeflectorWall("phase-wall"){{ - requirements(Category.defense, ItemStack.with(Items.phasefabric, 9)); + requirements(Category.defense, ItemStack.with(Items.phasefabric, 6)); health = 150 * wallHealthMultiplier; }}; @@ -817,7 +817,7 @@ public class Blocks implements ContentList{ }}; surgeWall = new SurgeWall("surge-wall"){{ - requirements(Category.defense, ItemStack.with(Items.surgealloy, 9)); + requirements(Category.defense, ItemStack.with(Items.surgealloy, 6)); health = 230 * wallHealthMultiplier; }}; @@ -828,7 +828,7 @@ public class Blocks implements ContentList{ }}; door = new Door("door"){{ - requirements(Category.defense, ItemStack.with(Items.titanium, 9, Items.silicon, 6)); + requirements(Category.defense, ItemStack.with(Items.titanium, 6, Items.silicon, 4)); health = 100 * wallHealthMultiplier; }}; @@ -841,7 +841,7 @@ public class Blocks implements ContentList{ }}; mender = new MendProjector("mender"){{ - requirements(Category.effect, ItemStack.with(Items.lead, 45, Items.copper, 37)); + requirements(Category.effect, ItemStack.with(Items.lead, 30, Items.copper, 25)); consumes.power(0.3f); size = 1; reload = 200f; @@ -854,7 +854,7 @@ public class Blocks implements ContentList{ }}; mendProjector = new MendProjector("mend-projector"){{ - requirements(Category.effect, ItemStack.with(Items.lead, 150, Items.titanium, 37, Items.silicon, 60)); + requirements(Category.effect, ItemStack.with(Items.lead, 100, Items.titanium, 25, Items.silicon, 40)); consumes.power(1.5f); size = 2; reload = 250f; @@ -865,21 +865,21 @@ public class Blocks implements ContentList{ }}; overdriveProjector = new OverdriveProjector("overdrive-projector"){{ - requirements(Category.effect, ItemStack.with(Items.lead, 150, Items.titanium, 112, Items.silicon, 112, Items.plastanium, 45)); + requirements(Category.effect, ItemStack.with(Items.lead, 100, Items.titanium, 75, Items.silicon, 75, Items.plastanium, 30)); consumes.power(3.50f); size = 2; consumes.item(Items.phasefabric).boost(); }}; forceProjector = new ForceProjector("force-projector"){{ - requirements(Category.effect, ItemStack.with(Items.lead, 150, Items.titanium, 112, Items.silicon, 187)); + requirements(Category.effect, ItemStack.with(Items.lead, 100, Items.titanium, 75, Items.silicon, 125)); size = 3; consumes.item(Items.phasefabric).boost(); consumes.power(3f); }}; shockMine = new ShockMine("shock-mine"){{ - requirements(Category.effect, ItemStack.with(Items.lead, 37, Items.silicon, 18)); + requirements(Category.effect, ItemStack.with(Items.lead, 25, Items.silicon, 12)); hasShadow = false; health = 40; damage = 11; @@ -911,40 +911,40 @@ public class Blocks implements ContentList{ }}; itemBridge = new BufferedItemBridge("bridge-conveyor"){{ - requirements(Category.distribution, ItemStack.with(Items.lead, 6, Items.copper, 6)); + requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4)); range = 4; speed = 70f; bufferCapacity = 15; }}; phaseConveyor = new ItemBridge("phase-conveyor"){{ - requirements(Category.distribution, ItemStack.with(Items.phasefabric, 7, Items.silicon, 10, Items.lead, 15, Items.graphite, 15)); + requirements(Category.distribution, ItemStack.with(Items.phasefabric, 5, Items.silicon, 7, Items.lead, 10, Items.graphite, 10)); range = 12; hasPower = true; consumes.power(0.30f); }}; sorter = new Sorter("sorter"){{ - requirements(Category.distribution, ItemStack.with(Items.lead, 3, Items.copper, 3)); + requirements(Category.distribution, ItemStack.with(Items.lead, 2, Items.copper, 2)); }}; router = new Router("router"){{ - requirements(Category.distribution, ItemStack.with(Items.copper, 4)); + requirements(Category.distribution, ItemStack.with(Items.copper, 3)); }}; distributor = new Router("distributor"){{ - requirements(Category.distribution, ItemStack.with(Items.lead, 6, Items.copper, 6)); + requirements(Category.distribution, ItemStack.with(Items.lead, 4, Items.copper, 4)); size = 2; }}; overflowGate = new OverflowGate("overflow-gate"){{ - requirements(Category.distribution, ItemStack.with(Items.lead, 3, Items.copper, 6)); + requirements(Category.distribution, ItemStack.with(Items.lead, 2, Items.copper, 4)); }}; massDriver = new MassDriver("mass-driver"){{ - requirements(Category.distribution, ItemStack.with(Items.titanium, 187, Items.silicon, 112, Items.lead, 187, Items.thorium, 75)); + requirements(Category.distribution, ItemStack.with(Items.titanium, 125, Items.silicon, 75, Items.lead, 125, Items.thorium, 50)); size = 3; itemCapacity = 120; reloadTime = 200f; @@ -956,12 +956,12 @@ public class Blocks implements ContentList{ //region liquid mechanicalPump = new Pump("mechanical-pump"){{ - requirements(Category.liquid, ItemStack.with(Items.copper, 22, Items.lead, 15)); + requirements(Category.liquid, ItemStack.with(Items.copper, 15, Items.lead, 10)); pumpAmount = 0.1f; }}; rotaryPump = new Pump("rotary-pump"){{ - requirements(Category.liquid, ItemStack.with(Items.copper, 105, Items.lead, 75, Items.silicon, 30, Items.titanium, 52)); + requirements(Category.liquid, ItemStack.with(Items.copper, 70, Items.lead, 50, Items.silicon, 20, Items.titanium, 35)); pumpAmount = 0.8f; consumes.power(0.15f); liquidCapacity = 30f; @@ -970,7 +970,7 @@ public class Blocks implements ContentList{ }}; thermalPump = new Pump("thermal-pump"){{ - requirements(Category.liquid, ItemStack.with(Items.copper, 120, Items.lead, 97, Items.silicon, 45, Items.titanium, 60, Items.thorium, 52)); + requirements(Category.liquid, ItemStack.with(Items.copper, 80, Items.lead, 65, Items.silicon, 30, Items.titanium, 40, Items.thorium, 35)); pumpAmount = 1.5f; consumes.power(0.30f); liquidCapacity = 40f; @@ -991,29 +991,29 @@ public class Blocks implements ContentList{ }}; liquidRouter = new LiquidRouter("liquid-router"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 3, Items.metaglass, 3)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 2, Items.metaglass, 2)); liquidCapacity = 20f; }}; liquidTank = new LiquidTank("liquid-tank"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 37, Items.metaglass, 37)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 25, Items.metaglass, 25)); size = 3; liquidCapacity = 1500f; health = 500; }}; liquidJunction = new LiquidJunction("liquid-junction"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 3, Items.metaglass, 3)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 2, Items.metaglass, 2)); }}; bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 6, Items.metaglass, 6)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.metaglass, 4)); range = 4; hasPower = false; }}; phaseConduit = new LiquidBridge("phase-conduit"){{ - requirements(Category.liquid, ItemStack.with(Items.phasefabric, 7, Items.silicon, 10, Items.metaglass, 30, Items.titanium, 15)); + requirements(Category.liquid, ItemStack.with(Items.phasefabric, 5, Items.silicon, 7, Items.metaglass, 20, Items.titanium, 10)); range = 12; hasPower = true; consumes.power(0.30f); @@ -1023,51 +1023,51 @@ public class Blocks implements ContentList{ //region power powerNode = new PowerNode("power-node"){{ - requirements(Category.power, ItemStack.with(Items.copper, 1, Items.lead, 4)); + requirements(Category.power, ItemStack.with(Items.copper, 1, Items.lead, 3)); maxNodes = 20; laserRange = 6; }}; powerNodeLarge = new PowerNode("power-node-large"){{ - requirements(Category.power, ItemStack.with(Items.titanium, 7, Items.lead, 15, Items.silicon, 4)); + requirements(Category.power, ItemStack.with(Items.titanium, 5, Items.lead, 10, Items.silicon, 3)); size = 2; maxNodes = 30; laserRange = 9.5f; }}; surgeTower = new PowerNode("surge-tower"){{ - requirements(Category.power, ItemStack.with(Items.titanium, 10, Items.lead, 15, Items.silicon, 22, Items.surgealloy, 22)); + requirements(Category.power, ItemStack.with(Items.titanium, 7, Items.lead, 10, Items.silicon, 15, Items.surgealloy, 15)); size = 2; maxNodes = 2; laserRange = 30f; }}; battery = new Battery("battery"){{ - requirements(Category.power, ItemStack.with(Items.copper, 6, Items.lead, 30)); + requirements(Category.power, ItemStack.with(Items.copper, 4, Items.lead, 20)); consumes.powerBuffered(4000f); }}; batteryLarge = new Battery("battery-large"){{ - requirements(Category.power, ItemStack.with(Items.titanium, 30, Items.lead, 60, Items.silicon, 30)); + requirements(Category.power, ItemStack.with(Items.titanium, 20, Items.lead, 40, Items.silicon, 20)); size = 3; consumes.powerBuffered(50000f); }}; combustionGenerator = new BurnerGenerator("combustion-generator"){{ - requirements(Category.power, ItemStack.with(Items.copper, 37, Items.lead, 22)); + requirements(Category.power, ItemStack.with(Items.copper, 25, Items.lead, 15)); powerProduction = 1f; itemDuration = 120f; }}; thermalGenerator = new ThermalGenerator("thermal-generator"){{ - requirements(Category.power, ItemStack.with(Items.copper, 60, Items.graphite, 52, Items.lead, 75, Items.silicon, 52, Items.metaglass, 60)); + requirements(Category.power, ItemStack.with(Items.copper, 40, Items.graphite, 35, Items.lead, 50, Items.silicon, 35, Items.metaglass, 40)); powerProduction = 1.8f; generateEffect = Fx.redgeneratespark; size = 2; }}; turbineGenerator = new BurnerGenerator("turbine-generator"){{ - requirements(Category.power, ItemStack.with(Items.copper, 52, Items.graphite, 37, Items.lead, 60, Items.silicon, 45)); + requirements(Category.power, ItemStack.with(Items.copper, 35, Items.graphite, 25, Items.lead, 40, Items.silicon, 30)); powerProduction = 6f; itemDuration = 90f; consumes.liquid(Liquids.water, 0.05f); @@ -1076,7 +1076,7 @@ public class Blocks implements ContentList{ }}; differentialGenerator = new SingleTypeGenerator(true, false, "differential-generator"){{ - requirements(Category.power, ItemStack.with(Items.copper, 105, Items.titanium, 75, Items.lead, 150, Items.silicon, 97, Items.metaglass, 75)); + requirements(Category.power, ItemStack.with(Items.copper, 70, Items.titanium, 50, Items.lead, 100, Items.silicon, 65, Items.metaglass, 50)); powerProduction = 16f; itemDuration = 120f; hasLiquids = true; @@ -1087,25 +1087,25 @@ public class Blocks implements ContentList{ }}; rtgGenerator = new DecayGenerator("rtg-generator"){{ - requirements(Category.power, ItemStack.with(Items.lead, 150, Items.silicon, 112, Items.phasefabric, 37, Items.plastanium, 112, Items.thorium, 75)); + requirements(Category.power, ItemStack.with(Items.lead, 100, Items.silicon, 75, Items.phasefabric, 25, Items.plastanium, 75, Items.thorium, 50)); size = 2; powerProduction = 3f; itemDuration = 440f; }}; solarPanel = new SolarGenerator("solar-panel"){{ - requirements(Category.power, ItemStack.with(Items.lead, 15, Items.silicon, 22)); + requirements(Category.power, ItemStack.with(Items.lead, 10, Items.silicon, 15)); powerProduction = 0.06f; }}; largeSolarPanel = new SolarGenerator("solar-panel-large"){{ - requirements(Category.power, ItemStack.with(Items.lead, 150, Items.silicon, 217, Items.phasefabric, 22)); + requirements(Category.power, ItemStack.with(Items.lead, 100, Items.silicon, 145, Items.phasefabric, 15)); size = 3; powerProduction = 0.9f; }}; thoriumReactor = new NuclearReactor("thorium-reactor"){{ - requirements(Category.power, ItemStack.with(Items.lead, 450, Items.silicon, 300, Items.graphite, 225, Items.thorium, 225, Items.metaglass, 75)); + requirements(Category.power, ItemStack.with(Items.lead, 300, Items.silicon, 200, Items.graphite, 150, Items.thorium, 150, Items.metaglass, 50)); size = 3; health = 700; itemDuration = 360f; @@ -1116,7 +1116,7 @@ public class Blocks implements ContentList{ }}; impactReactor = new ImpactReactor("impact-reactor"){{ - requirements(Category.power, ItemStack.with(Items.lead, 750, Items.silicon, 450, Items.graphite, 600, Items.thorium, 150, Items.surgealloy, 375, Items.metaglass, 375)); + requirements(Category.power, ItemStack.with(Items.lead, 500, Items.silicon, 300, Items.graphite, 400, Items.thorium, 100, Items.surgealloy, 250, Items.metaglass, 250)); size = 4; health = 900; powerProduction = 130f; @@ -1130,7 +1130,7 @@ public class Blocks implements ContentList{ //region production mechanicalDrill = new Drill("mechanical-drill"){{ - requirements(Category.production, ItemStack.with(Items.copper, 18), true); + requirements(Category.production, ItemStack.with(Items.copper, 12), true); tier = 2; drillTime = 600; size = 2; @@ -1139,7 +1139,7 @@ public class Blocks implements ContentList{ }}; pneumaticDrill = new Drill("pneumatic-drill"){{ - requirements(Category.production, ItemStack.with(Items.copper, 25, Items.graphite, 10)); + requirements(Category.production, ItemStack.with(Items.copper, 18, Items.graphite, 10)); tier = 3; drillTime = 400; size = 2; @@ -1148,7 +1148,7 @@ public class Blocks implements ContentList{ }}; laserDrill = new Drill("laser-drill"){{ - requirements(Category.production, ItemStack.with(Items.copper, 52, Items.graphite, 45, Items.silicon, 45, Items.titanium, 30)); + requirements(Category.production, ItemStack.with(Items.copper, 35, Items.graphite, 30, Items.silicon, 30, Items.titanium, 20)); drillTime = 280; size = 3; hasPower = true; @@ -1161,7 +1161,7 @@ public class Blocks implements ContentList{ }}; blastDrill = new Drill("blast-drill"){{ - requirements(Category.production, ItemStack.with(Items.copper, 97, Items.silicon, 90, Items.titanium, 75, Items.thorium, 112)); + requirements(Category.production, ItemStack.with(Items.copper, 65, Items.silicon, 60, Items.titanium, 50, Items.thorium, 75)); drillTime = 280; size = 4; drawRim = true; @@ -1178,7 +1178,7 @@ public class Blocks implements ContentList{ }}; waterExtractor = new SolidPump("water-extractor"){{ - requirements(Category.production, ItemStack.with(Items.copper, 37, Items.graphite, 37, Items.lead, 30)); + requirements(Category.production, ItemStack.with(Items.copper, 25, Items.graphite, 25, Items.lead, 20)); result = Liquids.water; pumpAmount = 0.13f; size = 2; @@ -1190,7 +1190,7 @@ public class Blocks implements ContentList{ }}; cultivator = new Cultivator("cultivator"){{ - requirements(Category.production, ItemStack.with(Items.copper, 15, Items.lead, 37, Items.silicon, 15)); + requirements(Category.production, ItemStack.with(Items.copper, 10, Items.lead, 25, Items.silicon, 10)); outputItem = new ItemStack(Items.sporePod, 1); craftTime = 140; size = 2; @@ -1203,7 +1203,7 @@ public class Blocks implements ContentList{ }}; oilExtractor = new Fracker("oil-extractor"){{ - requirements(Category.production, ItemStack.with(Items.copper, 225, Items.graphite, 262, Items.lead, 172, Items.thorium, 172, Items.silicon, 112)); + requirements(Category.production, ItemStack.with(Items.copper, 150, Items.graphite, 175, Items.lead, 115, Items.thorium, 115, Items.silicon, 75)); result = Liquids.oil; updateEffect = Fx.pulverize; liquidCapacity = 50f; @@ -1222,7 +1222,7 @@ public class Blocks implements ContentList{ //region storage coreShard = new CoreBlock("core-shard"){{ - requirements(Category.effect, () -> 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