mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed power debug blocks not working / Moved debug recipes

Browse Source
This commit is contained in:
Anuken 2018-09-20 08:47:58 -04:00
parent 6e6f5714dd
commit ecad5772d2
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/power/powerinfinite.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 259 B

BIN
core/assets-raw/sprites/blocks/power/powervoid.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 B

After

Width:  |  Height:  |  Size: 252 B

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

14
core/src/io/anuke/mindustry/content/Recipes.java
View File

@ -13,6 +13,13 @@ public class Recipes implements ContentList{
@Override @Override
public void load(){ 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 //DEFENSE
//walls //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.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.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)); 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 @Override

11
core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
View File

@ -10,6 +10,7 @@ import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.type.Liquid;
import io.anuke.mindustry.world.BarType;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.PowerBlock; import io.anuke.mindustry.world.blocks.PowerBlock;
@ -39,6 +40,13 @@ public class DebugBlocks extends BlockList implements ContentList{
powerVoid = new PowerBlock("powervoid"){ powerVoid = new PowerBlock("powervoid"){
{ {
powerCapacity = Float.MAX_VALUE; 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; powerCapacity = 10000f;
powerSpeed = 100f; powerSpeed = 100f;
maxNodes = 100; maxNodes = 100;
outputsPower = true;
consumesPower = false;
shadow = "shadow-round-1";
} }
@Override @Override