From 6b5a50555eaa856f1b48f70e7341a1fa1bc4463f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 11 Feb 2022 16:40:03 -0500
Subject: [PATCH] Tweaks

---
 .../blocks/turrets/disperse/disperse.png      | Bin 2064 -> 4357 bytes
 core/src/mindustry/content/Blocks.java        |  13 ++++++++-----
 core/src/mindustry/content/Fx.java            |  13 +++++++++++++
 core/src/mindustry/graphics/FogRenderer.java  |   2 +-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png
index 0ddae61f6a60ab846b026d9e4fed83e9bb4c21fa..39edc8651c7df428547d6765584ebdfdfbb72cfd 100644
GIT binary patch
literal 4357
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
VYES2V1b=S;#}2y^8|+E+{{YM1ts(#b

delta 2051
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

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);
             }
         });