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

4
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -227,8 +227,8 @@ public class Control extends Module{
player.weaponLeft = player.weaponRight = weapons.first();
if(debug){
weapons.add(Weapon.triblaster, Weapon.clustergun, Weapon.beam, Weapon.railgun);
weapons.add(Weapon.mortar);
weapons.add(Weapon.triblaster, Weapon.clustergun, Weapon.beam, Weapon.vulcan);
weapons.add(Weapon.shockgun);
player.weaponLeft = player.weaponRight = weapons.peek();
}

4
core/src/io/anuke/mindustry/entities/BulletType.java
View File

@@ -323,7 +323,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
DamageArea.damage(!(b.owner instanceof Enemy), b.x, b.y, 22f, damage);
}
},
rail = new BulletType(4.5f, 11) {
vulcan = new BulletType(4.5f, 11) {
{
lifetime = 50;
}
@@ -345,7 +345,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
}
},
shotgun = new BulletType(5.4f, 10) {
shockshell = new BulletType(5.4f, 10) {
{
drag = 0.03f;

6
core/src/io/anuke/mindustry/entities/effect/EMP.java
View File

@@ -56,7 +56,9 @@ public class EMP extends TimedEntity{
p.setPower(tile, 0f);
tile.entity.damage((int)(damage*1.5f)); //extra damage
}
if(tile == null) continue;
//entity may be null here, after the block is dead!
Effects.effect(Fx.empspark, tile.worldx(), tile.worldy());
if(tile.entity != null) tile.entity.damage(damage);
@@ -96,7 +98,7 @@ public class EMP extends TimedEntity{
float dx = Mathf.range(r),
dy = Mathf.range(r);
float frac = (float)(seg+1f)/joints;
float frac = (seg+1f)/joints;
float tx = (targetx - x)*frac + x + dx,
ty = (targety - y)*frac + y + dy;

4
core/src/io/anuke/mindustry/graphics/Fx.java
View File

@@ -372,13 +372,13 @@ public class Fx{
Draw.reset();
}),
railShoot = new Effect(8, e -> {
vulcanShoot = new Effect(8, e -> {
Draw.color(lighterOrange, lightOrange, e.ifract());
Draw.lineShot(e.x, e.y, e.rotation, 3, e.fract(), 10f, 2f, 0.7f);
Draw.reset();
}),
mortarShoot = new Effect(8, e -> {
shockShoot = new Effect(8, e -> {
Draw.color(Color.WHITE, Color.ORANGE, e.ifract());
Draw.lineShot(e.x, e.y, e.rotation, 3, e.fract(), 14f, 4f, 0.8f);
Draw.reset();

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;