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

New resources, blocks, core no longer accepts fuel materials

Browse Source
This commit is contained in:
Anuken
2018-02-22 20:12:20 -05:00
parent eae07c15a7
commit 81de9875d3
29 changed files with 497 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/resource/Item.java
+26 -5
View File
@@ -11,20 +11,41 @@ public class Item{
public static final Item
stone = new Item("stone"),
iron = new Item("iron"),
coal = new Item("coal"),
coal = new Item("coal"){
{
explosiveness = 0.2f;
flammability = 0.5f;
material = false;
}
},
steel = new Item("steel"),
titanium = new Item("titanium"),
dirium = new Item("dirium"),
uranium = new Item("uranium"),
sand = new Item("sand");
/*glass = new Item("glass"),
silicon = new Item("silicon");*/
uranium = new Item("uranium"){
{
explosiveness = 0.1f;
material = false;
}
},
quartz = new Item("quartz") {
{
material = false;
}
},
glass = new Item("glass"),
silicon = new Item("silicon"){
{
material = false;
}
};
public final int id;
public final String name;
public TextureRegion region;
public float explosiveness = 0f;
public float flammability = 0f;
public boolean material = true;
public Item(String name) {
this.id = items.size;
core/src/io/anuke/mindustry/resource/Recipes.java
+5 -2
View File
@@ -51,6 +51,8 @@ public class Recipes {
new Recipe(crafting, ProductionBlocks.oilrefinery, stack(Item.steel, 15), stack(Item.iron, 15)),
new Recipe(crafting, ProductionBlocks.stoneformer, stack(Item.steel, 10), stack(Item.iron, 10)),
new Recipe(crafting, ProductionBlocks.lavasmelter, stack(Item.steel, 30), stack(Item.titanium, 15)),
new Recipe(crafting, ProductionBlocks.pulverizer, stack(Item.steel, 30), stack(Item.titanium, 15)),
new Recipe(crafting, ProductionBlocks.siliconextractor, stack(Item.steel, 30), stack(Item.titanium, 15)),
new Recipe(crafting, ProductionBlocks.weaponFactory, stack(Item.steel, 60), stack(Item.iron, 60)).setDesktop(),
new Recipe(production, ProductionBlocks.stonedrill, stack(Item.stone, 12)),
@@ -58,6 +60,7 @@ public class Recipes {
new Recipe(production, ProductionBlocks.coaldrill, stack(Item.stone, 25), stack(Item.iron, 40)),
new Recipe(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 50), stack(Item.steel, 50)),
new Recipe(production, ProductionBlocks.uraniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)),
new Recipe(production, ProductionBlocks.quartzextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)),
new Recipe(production, ProductionBlocks.omnidrill, stack(Item.titanium, 40), stack(Item.dirium, 40)),
new Recipe(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30), stack(Item.stone, 20)),
@@ -82,8 +85,8 @@ public class Recipes {
new Recipe(liquid, DistributionBlocks.liquidrouter, stack(Item.steel, 2)),
new Recipe(liquid, DistributionBlocks.liquidjunction, stack(Item.steel, 2)),
new Recipe(production, ProductionBlocks.pump, stack(Item.steel, 10)),
new Recipe(production, ProductionBlocks.fluxpump, stack(Item.steel, 10), stack(Item.dirium, 5)),
new Recipe(liquid, ProductionBlocks.pump, stack(Item.steel, 10)),
new Recipe(liquid, ProductionBlocks.fluxpump, stack(Item.steel, 10), stack(Item.dirium, 5)),
new Recipe(units, DebugBlocks.powerVoid, stack(Item.steel, 10)).setDebug(),
new Recipe(units, DebugBlocks.powerInfinite, stack(Item.steel, 10), stack(Item.dirium, 5)).setDebug()