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

More reorganization, implemented multiblock drills, API changes

Browse Source
This commit is contained in:
Anuken
2018-03-04 22:00:32 -05:00
parent 099d88ba7b
commit 292dbf101b
70 changed files with 606 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
core/src/io/anuke/mindustry/resource/Item.java
View File

@@ -9,35 +9,37 @@ public class Item{
private static final Array<Item> items = new Array<>();
public static final Item
stone = new Item("stone"),
iron = new Item("iron"),
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"){
{
explosiveness = 0.1f;
material = false;
}
},
quartz = new Item("quartz") {
{
material = false;
}
},
glass = new Item("glass"),
silicon = new Item("silicon"){
{
material = false;
}
};
stone = new Item("stone"),
iron = new Item("iron"),
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"){
{
explosiveness = 0.1f;
material = false;
}
},
quartz = new Item("quartz") {
{
material = false;
}
},
glass = new Item("glass"),
silicon = new Item("silicon"),
biomatter = new Item("biomatter"){
{
material = false;
flammability = 0.4f;
}
};
public final int id;
public final String name;
@@ -55,7 +57,7 @@ public class Item{
}
public void init(){
this.region = Draw.region("icon-" + name);
this.region = Draw.region("item-" + name);
}
public String localizedName(){

2
core/src/io/anuke/mindustry/resource/ItemStack.java
View File

@@ -9,7 +9,7 @@ public class ItemStack{
this.item = item;
this.amount = amount;
}
public boolean equals(ItemStack other){
return other != null && other.item == item && other.amount == amount;
}

10
core/src/io/anuke/mindustry/resource/Recipes.java
View File

@@ -34,16 +34,14 @@ public class Recipes {
new Recipe(distribution, DistributionBlocks.vault, stack(Item.steel, 50)),
new Recipe(distribution, DistributionBlocks.unloader, stack(Item.steel, 5)),
//new Recipe(weapon, WeaponBlocks.turret, stack(Item.stone, 4)),
new Recipe(weapon, WeaponBlocks.doubleturret, stack(Item.stone, 7)),
new Recipe(weapon, WeaponBlocks.machineturret, stack(Item.iron, 8), stack(Item.stone, 10)),
//new Recipe(weapon, WeaponBlocks.shotgunturret, stack(Item.iron, 10), stack(Item.stone, 10)),
new Recipe(weapon, WeaponBlocks.gatlingturret, stack(Item.iron, 8), stack(Item.stone, 10)),
new Recipe(weapon, WeaponBlocks.flameturret, stack(Item.iron, 12), stack(Item.steel, 9)),
new Recipe(weapon, WeaponBlocks.sniperturret, stack(Item.iron, 15), stack(Item.steel, 10)),
new Recipe(weapon, WeaponBlocks.railgunturret, stack(Item.iron, 15), stack(Item.steel, 10)),
new Recipe(weapon, WeaponBlocks.laserturret, stack(Item.steel, 12), stack(Item.titanium, 12)),
new Recipe(weapon, WeaponBlocks.mortarturret, stack(Item.steel, 25), stack(Item.titanium, 15)),
new Recipe(weapon, WeaponBlocks.flakturret, stack(Item.steel, 25), stack(Item.titanium, 15)),
new Recipe(weapon, WeaponBlocks.teslaturret, stack(Item.steel, 20), stack(Item.titanium, 25), stack(Item.dirium, 15)),
//new Recipe(weapon, WeaponBlocks.plasmaturret, stack(Item.steel, 10), stack(Item.titanium, 20), stack(Item.dirium, 15)),
new Recipe(weapon, WeaponBlocks.magmaturret, stack(Item.steel, 80), stack(Item.titanium, 70), stack(Item.dirium, 60)),
new Recipe(weapon, WeaponBlocks.chainturret, stack(Item.steel, 50), stack(Item.titanium, 25), stack(Item.dirium, 40)),
new Recipe(weapon, WeaponBlocks.titanturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)),