Ravage turret cleanup

core/src/mindustry/content/Blocks.java

@@ -4431,9 +4431,12 @@ public class Blocks{
             ammo(
             //this is really lazy
             Items.surgeAlloy, new BasicBulletType(7f, 250){{
-                width = 16f;
+                sprite = "large-orb";
+                width = 17f;
+                height = 21f;
                 hitSize = 7f;
-                height = 20f;
+                hitSize = 8f;
+
                 shootEffect = new MultiEffect(Fx.shootTitan, Fx.colorSparkBig, new WaveEffect(){{
                     colorFrom = colorTo = Pal.accent;
                     lifetime = 12f;
@@ -4450,9 +4453,19 @@ public class Blocks{
                 frontColor = Color.white;
                 trailWidth = 2.8f;
                 trailLength = 9;
-                hitEffect = despawnEffect = Fx.hitBulletColor;
+                hitEffect = Fx.hitBulletColor;
                 buildingDamageMultiplier = 0.3f;
 
+                despawnEffect = new MultiEffect(Fx.hitBulletColor, new WaveEffect(){{
+                    sizeTo = 30f;
+                    colorFrom = colorTo = Pal.accent;
+                    lifetime = 12f;
+                }});
+
+                trailRotation = true;
+                trailEffect = Fx.disperseTrail;
+                trailInterval = 3f;
+
                 //TODO
                 intervalBullet = new LightningBulletType(){{
                     damage = 30;
@@ -4481,11 +4494,13 @@ public class Blocks{
             }}
             );
 
-            shoot = new ShootAlternate(){{
-                spread = 3.3f;
-                barrels = 9;
-                shots = 9;
-            }};
+            shoot = new ShootMulti(new ShootAlternate(){{
+                spread = 3.3f * 1.9f;
+                shots = barrels = 5;
+            }}, new ShootHelix(){{
+                scl = 4f;
+                mag = 3f;
+            }});
 
             minWarmup = 0.99f;
             coolantMultiplier = 6f;
@@ -4678,7 +4693,7 @@ public class Blocks{
             limitRange();
         }};
 
-        //TODO 2 more turrets.
+        //TODO 1 more turret
 
         //endregion
         //region units

core/src/mindustry/world/meta/StatValues.java

@@ -321,7 +321,7 @@ public class StatValues{
                 }
 
                 //no point in displaying unit icon twice
-                if(!compact && !(t instanceof PowerTurret)){
+                if(!compact && !(t instanceof Turret)){
                     table.image(icon(t)).size(3 * 8).padRight(4).right().top();
                     table.add(t.localizedName).padRight(10).left().top();
                 }

gradle.properties

@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=e252d01585
+archash=5c2fe62224