diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png index 0ddae61f6a..39edc8651c 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 7b324eac49..c6bf597c7b 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3323,11 +3323,10 @@ public class Blocks{ speed = 8.5f; //width = 11f; //height = 19f; - width = height = 18; + width = height = 16; shrinkY = 0.3f; backSprite = "large-bomb-back"; sprite = "mine-bullet"; - trailColor = Pal.bulletYellowBack; velocityInaccuracy = 0.11f; collidesGround = false; collidesTiles = false; @@ -3335,10 +3334,13 @@ public class Blocks{ smokeEffect = Fx.shootBigSmoke2; frontColor = trailColor = Color.white; backColor = Color.valueOf("869cbe"); - trailInterval = 3; + //trailInterval = 3; + trailChance = 0.44f; lifetime = 34f; rotationOffset = 90f; + trailRotation = true; + trailEffect = Fx.disperseTrail; //spin = 360f; //controversial @@ -3350,9 +3352,10 @@ public class Blocks{ //TODO bullet. //recoilAmount = 1f; - reloadTime = 8f; - shootLength = 14f; + reloadTime = 9f; + shootLength = 15f; rotateSpeed = 5f; + shootCone = 30f; coolantUsage = 30f / 60f; coolantOverride = Liquids.water; diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 058b46659f..96cc76b8df 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -527,6 +527,19 @@ public class Fx{ Lines.circle(e.x, e.y, 2f + e.finpow() * 7f); }), + disperseTrail = new Effect(13, e -> { + color(Color.white, e.color, e.fin()); + stroke(0.6f + e.fout() * 1.7f); + rand.setSeed(e.id); + + for(int i = 0; i < 2; i++){ + float rot = e.rotation + rand.range(15f) + 180f; + v.trns(rot, rand.random(e.fin() * 27f)); + lineAngle(e.x + v.x, e.y + v.y, rot, e.fout() * rand.random(2f, 7f) + 1.5f); + } + }), + + hitBulletSmall = new Effect(14, e -> { color(Color.white, Pal.lightOrange, e.fin()); diff --git a/core/src/mindustry/graphics/FogRenderer.java b/core/src/mindustry/graphics/FogRenderer.java index 475016e231..1e7d74b5cc 100644 --- a/core/src/mindustry/graphics/FogRenderer.java +++ b/core/src/mindustry/graphics/FogRenderer.java @@ -89,7 +89,7 @@ public class FogRenderer implements CustomChunk{ //TODO slow and terrible Groups.unit.each(u -> { if(u.team == player.team()){ - Fill.circle(u.x, u.y, u.type.lightRadius); + Fill.circle(u.x, u.y, u.type.lightRadius * 1.5f); } });