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

Added new recipes, fixed some bugs, changed names

Browse Source
This commit is contained in:
Anuken
2018-01-08 16:38:03 -05:00
parent 0e82a4491f
commit eba6c9bb8e
11 changed files with 106 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,11 +6,11 @@ import io.anuke.ucore.util.Mathf;
public class UpgradeRecipes {
private static final ObjectMap<Upgrade, ItemStack[]> recipes = Mathf.map(
Weapon.triblaster, list(stack(Item.iron, 40)),
Weapon.clustergun, list(stack(Item.iron, 60), stack(Item.steel, 20)),
Weapon.beam, list(stack(Item.steel, 60), stack(Item.iron, 120)),
Weapon.railgun, list(stack(Item.iron, 60), stack(Item.steel, 60)),
Weapon.mortar, list(stack(Item.titanium, 40), stack(Item.steel, 60))
Weapon.triblaster, list(stack(Item.iron, 40), stack(Item.steel, 40)),
Weapon.clustergun, list(stack(Item.iron, 60), stack(Item.steel, 80)),
Weapon.vulcan, list(stack(Item.iron, 60), stack(Item.steel, 120), stack(Item.titanium, 60)),
Weapon.beam, list(stack(Item.steel, 240), stack(Item.titanium, 120), stack(Item.dirium, 80)),
Weapon.shockgun, list(stack(Item.steel, 120), stack(Item.titanium, 120), stack(Item.dirium, 120))
);
private static final ItemStack[] empty = {};

11
core/src/io/anuke/mindustry/resource/Weapon.java
View File

@@ -45,21 +45,20 @@ public class Weapon extends Upgrade{
shake = 2f;
}
},
railgun = new Weapon("railgun", 5, BulletType.rail){
vulcan = new Weapon("vulcan", 5, BulletType.vulcan){
{
shootsound = "railgun";
effect = Fx.railShoot;
shootsound = "vulcan";
effect = Fx.vulcanShoot;
inaccuracy = 5;
roundrobin = true;
shake = 1f;
inaccuracy = 4f;
}
},
//TODO rename!
mortar = new Weapon("mortar", 36, BulletType.shotgun){
shockgun = new Weapon("shockgun", 36, BulletType.shockshell){
{
shootsound = "bigshot";
effect = Fx.mortarShoot;
effect = Fx.shockShoot;
shake = 2f;
roundrobin = true;
shots = 7;