Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed unit pads hiding in PvP / Fixed recipes not deselecting in menu

Browse Source
This commit is contained in:
Anuken
2018-09-03 21:51:13 -04:00
parent 6ad70ceee3
commit dc00e22f13
4 changed files with 19 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/content/Recipes.java
+8 -45
View File
@@ -3,9 +3,9 @@ package io.anuke.mindustry.content;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.content.blocks.*;
import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.type.ContentList;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.Recipe;
import static io.anuke.mindustry.type.Category.*;
@@ -145,14 +145,14 @@ public class Recipes implements ContentList{
new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130));
new Recipe(units, UnitBlocks.fabricatorPad, 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)).setMode(GameMode.noWaves);
new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)).setMode(GameMode.noWaves);
new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)).setPad();
new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)).setPad();
new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)).setMode(GameMode.noWaves);
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)).setMode(GameMode.noWaves);
new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)).setPad();
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)).setPad();
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)).setMode(GameMode.noWaves);
new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)).setPad();
//LIQUIDS
new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(CraftingBlocks.smelter);
@@ -176,43 +176,6 @@ public class Recipes implements ContentList{
new Recipe(units, DebugBlocks.powerInfinite).setDebug();
}
static void init(Object... objects){
Category cat = null;
Block block = null;
ItemStack stack = null;
Array<ItemStack> arr = new Array<>();
for(Object object : objects){
if(object instanceof Category){
if(stack != null) throw new RuntimeException("Finish defining stack before beginning category");
if(block != null){
new Recipe(cat, block, arr.toArray(ItemStack.class));
block = null;
stack = null;
arr.clear();
}
cat = (Category) object;
}else if(object instanceof Block){
if(cat == null) throw new RuntimeException("Finish defining category before beginning blocks");
if(block != null){
new Recipe(cat, block, arr.toArray(ItemStack.class));
stack = null;
arr.clear();
}
block = (Block) object;
arr.clear();
}else if(object instanceof Item){
if(block == null) throw new RuntimeException("Finish defining block before defining item");
if(stack != null) throw new RuntimeException("Finish defining stack before defining another stack");
stack = new ItemStack((Item) object, 1);
}else if(object instanceof Integer){
if(stack == null) throw new RuntimeException("Finish defining item before defining item amount");
stack.amount = (Integer) object;
arr.add(stack);
stack = null;
}
}
}
@Override
public Array<? extends Content> getAll(){
return Recipe.all();