From 20fc176cd927cdc9f1e78c19e7491f54b3e75354 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 5 Apr 2025 13:51:07 -0400
Subject: [PATCH] Colored duo/salvo/spectre bullets based on ammo

---
 core/src/mindustry/content/Blocks.java | 40 ++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 96db3e160a..90637218ea 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -3071,6 +3071,10 @@ public class Blocks{
                     height = 9f;
                     lifetime = 60f;
                     ammoMultiplier = 2;
+
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                    hitColor = backColor = trailColor = Color.valueOf("d39169");
+                    frontColor = Color.valueOf("eac1a8");
                 }},
                 Items.graphite, new BasicBulletType(3.5f, 18){{
                     width = 9f;
@@ -3079,6 +3083,7 @@ public class Blocks{
                     lifetime = 60f;
                     rangeChange = 16f;
 
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
                     hitColor = backColor = trailColor = Color.valueOf("858a9b");
                     frontColor = Color.valueOf("dae1ee");
                 }},
@@ -3093,6 +3098,7 @@ public class Blocks{
                     trailLength = 5;
                     trailWidth = 1.5f;
 
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
                     hitColor = backColor = trailColor = Color.valueOf("707594");
                     frontColor = Color.valueOf("999ba0");
                 }}
@@ -3503,13 +3509,22 @@ public class Blocks{
                     height = 9f;
                     lifetime = 60f;
                     ammoMultiplier = 2;
+
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                    hitColor = backColor = trailColor = Color.valueOf("d39169");
+                    frontColor = Color.valueOf("eac1a8");
                 }},
                 Items.graphite, new BasicBulletType(3.5f, 20){{
                     width = 9f;
                     height = 12f;
-                    reloadMultiplier = 0.6f;
                     ammoMultiplier = 4;
                     lifetime = 60f;
+
+                    rangeChange = 4f * 8f;
+
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                    hitColor = backColor = trailColor = Color.valueOf("858a9b");
+                    frontColor = Color.valueOf("dae1ee");
                 }},
                 Items.pyratite, new BasicBulletType(3.2f, 18){{
                     width = 10f;
@@ -3528,20 +3543,30 @@ public class Blocks{
                     lifetime = 60f;
                 }},
                 Items.silicon, new BasicBulletType(3f, 15, "bullet"){{
-                    width = 7f;
-                    height = 9f;
-                    homingPower = 0.1f;
+                    width = 8f;
+                    height = 10f;
+                    homingPower = 0.2f;
                     reloadMultiplier = 1.5f;
                     ammoMultiplier = 5;
                     lifetime = 60f;
+
+                    trailLength = 5;
+                    trailWidth = 1.5f;
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                    hitColor = backColor = trailColor = Color.valueOf("707594");
+                    frontColor = Color.valueOf("999ba0");
                 }},
                 Items.thorium, new BasicBulletType(4f, 29, "bullet"){{
-                    width = 10f;
+                    width = 8f;
                     height = 13f;
                     shootEffect = Fx.shootBig;
                     smokeEffect = Fx.shootBigSmoke;
                     ammoMultiplier = 4;
                     lifetime = 60f;
+
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                    backColor = hitColor = trailColor = Color.valueOf("f595be");
+                    frontColor = Color.white;
                 }}
             );
 
@@ -3950,6 +3975,10 @@ public class Blocks{
                     ammoMultiplier = 4;
                     reloadMultiplier = 1.7f;
                     knockback = 0.3f;
+
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                    hitColor = backColor = trailColor = Color.valueOf("858a9b");
+                    frontColor = Color.valueOf("dae1ee");
                 }},
                 Items.thorium, new BasicBulletType(8f, 80){{
                     hitSize = 5;
@@ -4319,7 +4348,6 @@ public class Blocks{
             requirements(Category.turret, with(Items.tungsten, 250, Items.silicon, 300, Items.thorium, 400));
 
             ammo(
-            //TODO another ammo type
             Items.thorium, new ArtilleryBulletType(2.5f, 350, "shell"){{
                 hitEffect = new MultiEffect(Fx.titanExplosion, Fx.titanSmoke);
                 despawnEffect = Fx.none;