diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java index b626033490..3666c39c0d 100644 --- a/core/src/io/anuke/mindustry/content/Items.java +++ b/core/src/io/anuke/mindustry/content/Items.java @@ -8,18 +8,12 @@ import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemType; public class Items implements ContentList{ - public static Item stone, tungsten, lead, coal, carbide, titanium, thorium, silicon, plastanium, phasematter, surgealloy, + public static Item stone, lead, coal, carbide, titanium, thorium, silicon, plastanium, phasematter, surgealloy, biomatter, sand, blastCompound, pyratite; @Override public void load(){ - tungsten = new Item("tungsten", Color.valueOf("a0b0c8")){{ - type = ItemType.material; - hardness = 1; - cost = 0.75f; - }}; - lead = new Item("lead", Color.valueOf("8e85a2")){{ type = ItemType.material; hardness = 1; @@ -71,16 +65,9 @@ public class Items implements ContentList{ cost = 1.5f; }}; - surgealloy = new Item("surge-alloy", Color.valueOf("b4d5c7")){ - { - type = ItemType.material; - } - - @Override - public boolean isHidden(){ - return true; - } - }; + surgealloy = new Item("surge-alloy", Color.valueOf("b4d5c7")){{ + type = ItemType.material; + }}; biomatter = new Item("biomatter", Color.valueOf("648b55")){{ flammability = 0.4f; diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 92d447acaf..1036d675e2 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -24,6 +24,9 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.thoriumWall, new ItemStack(Items.thorium, 12)); new Recipe(defense, DefenseBlocks.thoriumWallLarge, new ItemStack(Items.thorium, 12 * 4)); + new Recipe(defense, DefenseBlocks.phaseWall, new ItemStack(Items.phasematter, 12)); + new Recipe(defense, DefenseBlocks.phaseWallLarge, new ItemStack(Items.phasematter, 12 * 4)); + new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.carbide, 12), new ItemStack(Items.silicon, 8)); new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.carbide, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); @@ -143,8 +146,7 @@ public class Recipes implements ContentList{ new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.carbide, 100), new ItemStack(Items.silicon, 200)).setMode(GameMode.noWaves); //LIQUIDS - new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)) - .setDependencies(CraftingBlocks.smelter); + new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(CraftingBlocks.smelter); new Recipe(liquid, LiquidBlocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.lead, 1)); new Recipe(liquid, LiquidBlocks.phaseConduit, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 20)); @@ -153,8 +155,7 @@ public class Recipes implements ContentList{ new Recipe(liquid, LiquidBlocks.liquidJunction, new ItemStack(Items.carbide, 4), new ItemStack(Items.lead, 4)); new Recipe(liquid, LiquidBlocks.bridgeConduit, new ItemStack(Items.carbide, 8), new ItemStack(Items.lead, 8)); - new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.tungsten, 30), new ItemStack(Items.lead, 20)) - .setDependencies(CraftingBlocks.smelter); + new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.tungsten, 30), new ItemStack(Items.lead, 20)).setDependencies(CraftingBlocks.smelter); new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.tungsten, 140), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 70)); new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.tungsten, 160), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 80), new ItemStack(Items.thorium, 70)); @@ -164,121 +165,6 @@ public class Recipes implements ContentList{ new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.carbide, 10)).setDebug(); new Recipe(units, DebugBlocks.powerVoid, new ItemStack(Items.carbide, 10)).setDebug(); new Recipe(units, DebugBlocks.powerInfinite, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)).setDebug(); - //new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)); - - /* - new Recipe(production, ProductionBlocks.nucleardrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.plasmadrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));*/ - - - - /* - - new Recipe(defense, DefenseBlocks.steelwall, new ItemStack(Items.carbide, 12)); - new Recipe(defense, DefenseBlocks.titaniumwall, new ItemStack(Items.titanium, 12)); - new Recipe(defense, DefenseBlocks.diriumwall, new ItemStack(Items.surgealloy, 12)); - new Recipe(defense, DefenseBlocks.steelwalllarge, new ItemStack(Items.carbide, 12 * 4)); - new Recipe(defense, DefenseBlocks.titaniumwalllarge, new ItemStack(Items.titanium, 12 * 4)); - new Recipe(defense, DefenseBlocks.diriumwall, new ItemStack(Items.surgealloy, 12 * 4)); - new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3 * 4)); - new Recipe(defense, DefenseBlocks.largedoor, new ItemStack(Items.carbide, 3 * 4), new ItemStack(Items.tungsten, 3 * 4 * 4)); - new Recipe(defense, DefenseBlocks.deflectorwall, new ItemStack(Items.titanium, 1)); - new Recipe(defense, DefenseBlocks.deflectorwalllarge, new ItemStack(Items.titanium, 1)); - new Recipe(defense, DefenseBlocks.phasewall, new ItemStack(Items.titanium, 1)); - new Recipe(defense, DefenseBlocks.phasewalllarge, new ItemStack(Items.titanium, 1)); - - new Recipe(weapon, TurretBlocks.wave, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.arc, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.fuse, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.cyclone, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.spectre, new ItemStack(Items.tungsten, 1)); - new Recipe(weapon, TurretBlocks.meltdown, new ItemStack(Items.tungsten, 1)); - - new Recipe(crafting, CraftingBlocks.alloysmelter, new ItemStack(Items.titanium, 50), new ItemStack(Items.carbide, 50)); - new Recipe(crafting, CraftingBlocks.alloyfuser, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30)); - - new Recipe(crafting, CraftingBlocks.phaseWeaver, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30)); - new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30)); - new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30)); - new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30)); - new Recipe(crafting, CraftingBlocks.oilRefinery, new ItemStack(Items.carbide, 15), new ItemStack(Items.tungsten, 15)); - new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.carbide, 15), new ItemStack(Items.tungsten, 15)); - new Recipe(crafting, CraftingBlocks.plastaniumCompressor, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15)); - new Recipe(crafting, CraftingBlocks.cryofluidmixer, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15)); - new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.carbide, 10), new ItemStack(Items.tungsten, 10)); - new Recipe(crafting, CraftingBlocks.stoneFormer, new ItemStack(Items.carbide, 10), new ItemStack(Items.tungsten, 10)); - new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15)); - new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.carbide, 60), new ItemStack(Items.tungsten, 60)); - - new Recipe(production, ProductionBlocks.tungstenDrill, new ItemStack(Items.tungsten, 25)); - new Recipe(production, ProductionBlocks.reinforcedDrill, new ItemStack(Items.tungsten, 25)); - new Recipe(production, ProductionBlocks.carbideDrill, new ItemStack(Items.tungsten, 25)); - new Recipe(production, ProductionBlocks.titaniumDrill, new ItemStack(Items.tungsten, 25)); - new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.nucleardrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.plasmadrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40)); - - new Recipe(power, PowerBlocks.powerNode, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3)); - new Recipe(power, PowerBlocks.powerNodeLarge, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3)); - new Recipe(power, PowerBlocks.battery, new ItemStack(Items.carbide, 5), new ItemStack(Items.tungsten, 5)); - new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.carbide, 5), new ItemStack(Items.tungsten, 5)); - new Recipe(power, PowerBlocks.combustionGenerator, new ItemStack(Items.tungsten, 1)); - - new Recipe(power, PowerBlocks.turbineGenerator, new ItemStack(Items.tungsten, 1)); - new Recipe(power, PowerBlocks.thermalGenerator, new ItemStack(Items.carbide, 1)); - new Recipe(power, PowerBlocks.rtgGenerator, new ItemStack(Items.titanium, 1), new ItemStack(Items.carbide, 1)); - new Recipe(power, PowerBlocks.solarPanel, new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 20)); - new Recipe(power, PowerBlocks.largeSolarPanel, new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 20)); - new Recipe(power, PowerBlocks.nuclearReactor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40), new ItemStack(Items.carbide, 50)); - new Recipe(power, PowerBlocks.fusionReactor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40), new ItemStack(Items.carbide, 50)); - - new Recipe(distribution, PowerBlocks.warpGate, new ItemStack(Items.carbide, 1)); - - new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.carbide, 1)); - new Recipe(liquid, LiquidBlocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.carbide, 1)); - new Recipe(liquid, LiquidBlocks.liquidRouter, new ItemStack(Items.carbide, 2)); - new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.carbide, 2)); - new Recipe(liquid, LiquidBlocks.liquidJunction, new ItemStack(Items.carbide, 2)); - new Recipe(liquid, LiquidBlocks.bridgeConduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.carbide, 2)); - new Recipe(liquid, LiquidBlocks.phaseConduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.carbide, 2)); - - new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.carbide, 10)); - new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)); - new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)); - - new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.carbide, 10)); - new Recipe(units, UnitBlocks.dropPoint, new ItemStack(Items.carbide, 10)); - new Recipe(units, UnitBlocks.resupplyPoint, new ItemStack(Items.carbide, 10)); - - new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.tungsten, 50)); - new Recipe(units, UnitBlocks.reconstructor, new ItemStack(Items.tungsten, 1)); - - new Recipe(units, UnitBlocks.overdriveProjector, new ItemStack(Items.tungsten, 1)); - new Recipe(units, UnitBlocks.shieldProjector, new ItemStack(Items.tungsten, 1)); - - new Recipe(units, UpgradeBlocks.omegaFactory, new ItemStack(Items.tungsten, 1)); - new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.tungsten, 1)); - new Recipe(units, UpgradeBlocks.tauFactory, new ItemStack(Items.tungsten, 1)); - - new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.tungsten, 1)); - new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.tungsten, 1)); - new Recipe(units, UpgradeBlocks.halberdFactory, new ItemStack(Items.tungsten, 1)); - - new Recipe(units, DebugBlocks.itemSource, new ItemStack(Items.carbide, 10)).setDebug(); - new Recipe(units, DebugBlocks.itemVoid, new ItemStack(Items.carbide, 10)).setDebug(); - new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.carbide, 10)).setDebug(); - new Recipe(units, DebugBlocks.powerVoid, new ItemStack(Items.carbide, 10)).setDebug(); - new Recipe(units, DebugBlocks.powerInfinite, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)).setDebug();*/ } @Override diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java index ca40928d80..7201166079 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java @@ -10,7 +10,7 @@ import io.anuke.mindustry.world.blocks.defense.PhaseWall; public class DefenseBlocks extends BlockList implements ContentList{ public static Block tungstenWall, tungstenWallLarge, carbideWall, carbideWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, deflectorwall, deflectorwalllarge, - phasewall, phasewalllarge; + phaseWall, phaseWallLarge; @Override public void load(){ @@ -52,11 +52,11 @@ public class DefenseBlocks extends BlockList implements ContentList{ size = 2; }}; - phasewall = new PhaseWall("phase-wall"){{ + phaseWall = new PhaseWall("phase-wall"){{ health = 150 * wallHealthMultiplier; }}; - phasewalllarge = new PhaseWall("phase-wall-large"){{ + phaseWallLarge = new PhaseWall("phase-wall-large"){{ health = 150 * 4 * wallHealthMultiplier; size = 2; regenSpeed = 0.5f;