diff --git a/build.gradle b/build.gradle index 967b692d78..6fc22e7088 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = '8749ac785424beee126198f5769dc6672587eca1' + uCoreVersion = '39d511523f61b8464d7187a3bcd93ea17550712d' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 5d92c9a0c6..adfa391de8 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -598,12 +598,13 @@ block.solidifer.name=Solidifer block.solar-panel.name=Solar Panel block.solar-panel-large.name=Large Solar Panel block.oil-extractor.name=Oil Extractor -block.spirit-factory.name=Spirit Drone Pad -block.phantom-factory.name=Phantom Drone Pad -block.wraith-factory.name=Wraith Fighter Pad -block.ghoul-factory.name=Ghoul Bomber Pad -block.dagger-factory.name=Dagger Pad -block.titan-factory.name=Titan Pad +block.spirit-factory.name=Spirit Drone Factory +block.phantom-factory.name=Phantom Drone Factory +block.wraith-factory.name=Wraith Fighter Factory +block.ghoul-factory.name=Ghoul Bomber Factory +block.dagger-factory.name=Dagger Factory +block.titan-factory.name=Titan Factory +block.revenant-factory.name=Revenant Factory block.repair-point.name=Repair Point block.resupply-point.name=Resupply Point block.pulse-conduit.name=Pulse Conduit diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 019f9dc0c6..6ffa4f8cd9 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -155,14 +155,15 @@ public class Recipes implements ContentList{ new Recipe(units, UpgradeBlocks.omegaPad, new ItemStack(Items.lead, 450), new ItemStack(Items.densealloy, 550), new ItemStack(Items.silicon, 650), new ItemStack(Items.thorium, 600), new ItemStack(Items.surgealloy, 240)).setDesktop(); //actual unit related stuff - new Recipe(units, UnitBlocks.spiritPad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); - new Recipe(units, UnitBlocks.phantomPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); + new Recipe(units, UnitBlocks.spiritFactory, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); + new Recipe(units, UnitBlocks.phantomFactory, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); - new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)); - new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)); + new Recipe(units, UnitBlocks.daggerFactory, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)); + new Recipe(units, UnitBlocks.titanFactory, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)); - new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)); - new Recipe(units, UnitBlocks.monsoonPad, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)); + new Recipe(units, UnitBlocks.wraithFactory, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)); + new Recipe(units, UnitBlocks.ghoulFactory, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)); + new Recipe(units, UnitBlocks.revenantFactory, new ItemStack(Items.plastanium, 300), new ItemStack(Items.titanium, 400), new ItemStack(Items.lead, 300), new ItemStack(Items.silicon, 400), new ItemStack(Items.surgealloy, 100)); new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30)); new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)); diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index c6d43f4a23..708b045bff 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -9,14 +9,14 @@ import io.anuke.mindustry.world.blocks.units.*; public class UnitBlocks extends BlockList implements ContentList{ public static Block - spiritPad, phantomPad, - interceptorPad, monsoonPad, revenantPad, - daggerPad, titanPad, + spiritFactory, phantomFactory, + wraithFactory, ghoulFactory, revenantFactory, + daggerFactory, titanFactory, reconstructor, repairPoint, commandCenter; @Override public void load(){ - spiritPad = new UnitFactory("spirit-factory"){{ + spiritFactory = new UnitFactory("spirit-factory"){{ type = UnitTypes.spirit; produceTime = 5700; size = 2; @@ -24,7 +24,7 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)}); }}; - phantomPad = new UnitFactory("phantom-factory"){{ + phantomFactory = new UnitFactory("phantom-factory"){{ type = UnitTypes.phantom; produceTime = 7300; size = 2; @@ -32,7 +32,7 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)}); }}; - interceptorPad = new UnitFactory("wraith-factory"){{ + wraithFactory = new UnitFactory("wraith-factory"){{ type = UnitTypes.wraith; produceTime = 1800; size = 2; @@ -40,7 +40,7 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)}); }}; - monsoonPad = new UnitFactory("ghoul-factory"){{ + ghoulFactory = new UnitFactory("ghoul-factory"){{ type = UnitTypes.ghoul; produceTime = 3600; size = 3; @@ -49,16 +49,16 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)}); }}; - revenantPad = new UnitFactory("revenant-factory"){{ + revenantFactory = new UnitFactory("revenant-factory"){{ type = UnitTypes.revenant; - produceTime = 3600; + produceTime = 8000; size = 4; - consumes.power(0.2f); + consumes.power(0.3f); shadow = "shadow-round-3"; - consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)}); + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 80), new ItemStack(Items.plastanium, 50)}); }}; - daggerPad = new UnitFactory("dagger-factory"){{ + daggerFactory = new UnitFactory("dagger-factory"){{ type = UnitTypes.dagger; produceTime = 1700; size = 2; @@ -66,7 +66,7 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.copper, 10)}); }}; - titanPad = new UnitFactory("titan-factory"){{ + titanFactory = new UnitFactory("titan-factory"){{ type = UnitTypes.titan; produceTime = 3400; size = 3; diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index ca5794fe63..ade08e36b0 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -169,16 +169,16 @@ public class FortressGenerator{ seeder.get(DefenseBlocks.mendProjector, tile -> tile.block() instanceof PowerGenerator && gen.random.chance(0.03)), //unit pads (assorted) - seeder.get(UnitBlocks.daggerPad, tile -> tile.block() instanceof MendProjector && gen.random.chance(0.3)), + seeder.get(UnitBlocks.daggerFactory, tile -> tile.block() instanceof MendProjector && gen.random.chance(0.3)), //unit pads (assorted) - seeder.get(UnitBlocks.interceptorPad, tile -> tile.block() instanceof MendProjector && gen.random.chance(0.3)), + seeder.get(UnitBlocks.wraithFactory, tile -> tile.block() instanceof MendProjector && gen.random.chance(0.3)), //unit pads (assorted) - seeder.get(UnitBlocks.titanPad, tile -> tile.block() instanceof MendProjector && gen.random.chance(0.23)), + seeder.get(UnitBlocks.titanFactory, tile -> tile.block() instanceof MendProjector && gen.random.chance(0.23)), //unit pads (assorted) - seeder.get(UnitBlocks.monsoonPad, tile -> tile.block() instanceof MendProjector && gen.random.chance(0.23)), + seeder.get(UnitBlocks.ghoulFactory, tile -> tile.block() instanceof MendProjector && gen.random.chance(0.23)), //power turrets seeder.get(powerTurret, tile -> tile.block() instanceof PowerGenerator && gen.random.chance(0.04)),