diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 5270acfef8..ad2e3a133c 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1302,8 +1302,8 @@ public class Blocks implements ContentList{ Items.scrap, Bullets.flakScrap, Items.lead, Bullets.flakLead ); - reload = 15f; - range = 180f; + reload = 16f; + range = 175f; size = 2; burstSpacing = 5f; shots = 2; @@ -1502,7 +1502,7 @@ public class Blocks implements ContentList{ ammo(Items.graphite, Bullets.fuseShot); reload = 40f; shootShake = 4f; - range = 80f; + range = 110f; recoil = 5f; restitution = 0.1f; size = 3; diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index 9119ed9575..feefe33d8f 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -579,11 +579,12 @@ public class Bullets implements ContentList{ fuseShot = new BulletType(0.01f, 70){ int rays = 3; - float rayLength = 80f; + float rayLength = 120f; { hitEffect = Fx.hitFuse; - lifetime = 13f; + shootEffect = smokeEffect = Fx.none; + lifetime = 10f; despawnEffect = Fx.none; pierce = true; } @@ -599,14 +600,15 @@ public class Bullets implements ContentList{ public void draw(Bullet b){ super.draw(b); Draw.color(Color.WHITE, Pal.surge, b.fin()); + //Draw.alpha(b.fout()); for(int i = 0; i < 7; i++){ Tmp.v1.trns(b.rot(), i * 8f); float sl = Mathf.clamp(b.fout() - 0.5f) * (80f - i * 10); Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90); Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90); } - Shapes.tri(b.x, b.y, 13f, (rayLength + 50) * b.fout(), b.rot()); - Shapes.tri(b.x, b.y, 13f, 10f * b.fout(), b.rot() + 180f); + Shapes.tri(b.x, b.y, 20f * b.fout(), (rayLength + 50), b.rot()); + Shapes.tri(b.x, b.y, 20f * b.fout(), 10f, b.rot() + 180f); Draw.reset(); } }; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 74cab96a45..e98de25d6e 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -51,10 +51,6 @@ public class Mechs implements ContentList{ player.healBy(Time.delta() * 0.09f); } - @Override - public boolean alwaysUnlocked(){ - return true; - } }; delta = new Mech("delta-mech", false){ @@ -240,6 +236,11 @@ public class Mechs implements ContentList{ bullet = Bullets.standardCopper; }}; } + + @Override + public boolean alwaysUnlocked(){ + return true; + } }; javelin = new Mech("javelin-ship", true){ diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index c2518cf5a7..efbc52f8af 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -559,7 +559,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ updateShooting(); //server simulates player shooting } return; - }else{ + }else if(world.isZone()){ //unlock mech when used data.unlockContent(mech); }