diff --git a/core/assets-raw/sprites/blocks/power/powerinfinite.png b/core/assets-raw/sprites/blocks/power/powerinfinite.png index 442501f0fb..836a02813a 100644 Binary files a/core/assets-raw/sprites/blocks/power/powerinfinite.png and b/core/assets-raw/sprites/blocks/power/powerinfinite.png differ diff --git a/core/assets-raw/sprites/blocks/power/powervoid.png b/core/assets-raw/sprites/blocks/power/powervoid.png index 85644c900e..3aaed1ab1c 100644 Binary files a/core/assets-raw/sprites/blocks/power/powervoid.png and b/core/assets-raw/sprites/blocks/power/powervoid.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 3202437499..ba940c15cf 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 6ffa4f8cd9..9719c26bc0 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -13,6 +13,13 @@ public class Recipes implements ContentList{ @Override public void load(){ + //DEBUG + new Recipe(distribution, DebugBlocks.itemSource).setMode(GameMode.sandbox).setHidden(true); + new Recipe(distribution, DebugBlocks.itemVoid).setMode(GameMode.sandbox).setHidden(true); + new Recipe(liquid, DebugBlocks.liquidSource).setMode(GameMode.sandbox).setHidden(true); + new Recipe(power, DebugBlocks.powerVoid).setMode(GameMode.sandbox).setHidden(true); + new Recipe(power, DebugBlocks.powerInfinite).setMode(GameMode.sandbox).setHidden(true); + //DEFENSE //walls @@ -181,13 +188,6 @@ public class Recipes implements ContentList{ new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 20)).setDependencies(CraftingBlocks.smelter); new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.copper, 140), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 70)); new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.copper, 160), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 80), new ItemStack(Items.thorium, 70)); - - //DEBUG - new Recipe(units, DebugBlocks.itemSource).setMode(GameMode.sandbox).setHidden(true); - new Recipe(units, DebugBlocks.itemVoid).setMode(GameMode.sandbox).setHidden(true); - new Recipe(units, DebugBlocks.liquidSource).setMode(GameMode.sandbox).setHidden(true); - new Recipe(units, DebugBlocks.powerVoid).setMode(GameMode.sandbox).setHidden(true); - new Recipe(units, DebugBlocks.powerInfinite).setMode(GameMode.sandbox).setHidden(true); } @Override diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java index d2df1d0d3d..abaaaf2a0c 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java @@ -10,6 +10,7 @@ import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; +import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.PowerBlock; @@ -39,6 +40,13 @@ public class DebugBlocks extends BlockList implements ContentList{ powerVoid = new PowerBlock("powervoid"){ { powerCapacity = Float.MAX_VALUE; + shadow = "shadow-round-1"; + } + + @Override + public void setBars(){ + super.setBars(); + bars.remove(BarType.power); } }; @@ -47,6 +55,9 @@ public class DebugBlocks extends BlockList implements ContentList{ powerCapacity = 10000f; powerSpeed = 100f; maxNodes = 100; + outputsPower = true; + consumesPower = false; + shadow = "shadow-round-1"; } @Override