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/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;