From 9c2618f2e879d90d21b2a6d7c36dcf088a9bf765 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 28 Dec 2021 21:07:27 -0500
Subject: [PATCH] Regen projection recolor

---
 .../blocks/defense/regen-projector.png        | Bin 2989 -> 2093 bytes
 core/src/mindustry/content/Blocks.java        |  12 +++++++-----
 core/src/mindustry/content/Fx.java            |   2 +-
 core/src/mindustry/graphics/Pal.java          |   2 ++
 .../world/blocks/defense/RegenProjector.java  |   8 ++++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/defense/regen-projector.png b/core/assets-raw/sprites/blocks/defense/regen-projector.png
index 3d610ed2aec33e27418c31e927d4760cad1f7205..f18e5bb857d60b45c63b13917ec8c64b47d2f2c2 100644
GIT binary patch
delta 2081
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
LNkvXXu0mjfFjB|3

literal 2989
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
S*fIh<h64<Drdus7nD;+x0%Pd_

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 2c514cc703..d9fab5facd 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1545,28 +1545,30 @@ public class Blocks{
             buildSpeed = 1.5f;
         }};
 
-        //TODO green looks bad switch to orange
-        //TODO orange also looks bad hhhh
         regenProjector = new RegenProjector("regen-projector"){{
             requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 30, Items.beryllium, 80));
             size = 3;
             consumes.power(1f);
             range = 28;
+            baseColor = Pal.regen;
 
             consumes.liquid(Liquids.hydrogen, 1f / 60f);
 
             healPercent = 4f / 60f;
 
+            Color col = Color.valueOf("8ca9e8");
+
             drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.hydrogen, 9f / 4f), new DrawBlock(), new DrawGlowRegion(){{
-                color = Color.orange;//Color.valueOf("1eff21");
+                color = Color.sky;
             }}, new DrawPulseShape(false){{
-                //radiusScl = 0.95f;
                 layer = Layer.effect;
+                color = col;
             }}, new DrawShape(){{
                 layer = Layer.effect;
                 radius = 3.5f;
                 useWarmupRadius = true;
                 timeScl = 2f;
+                color = col;
             }});
         }};
 
@@ -2338,7 +2340,7 @@ public class Blocks{
 
             //TODO different requirements
             consumes.power(6f);
-            consumes.liquids(LiquidStack.with(Liquids.water, 0.5f, Liquids.hydrogen, 4f / 60f));
+            consumes.liquids(LiquidStack.with(Liquids.water, 0.4f, Liquids.hydrogen, 4f / 60f));
         }};
 
         //endregion
diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index 15351573db..36b054e87e 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -1467,7 +1467,7 @@ public class Fx{
     }),
 
     regenParticle = new Effect(100f, e -> {
-        color(Pal.accent);
+        color(Pal.regen);
 
         Fill.square(e.x, e.y, e.fslope() * 1.5f + 0.14f, 45f);
     }),
diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java
index 58ebf19794..0d72059161 100644
--- a/core/src/mindustry/graphics/Pal.java
+++ b/core/src/mindustry/graphics/Pal.java
@@ -16,6 +16,8 @@ public class Pal{
     sapBullet = Color.valueOf("bf92f9"),
     sapBulletBack = Color.valueOf("6d56bf"),
 
+    regen = Color.valueOf("d1efff"),
+
     reactorPurple = Color.valueOf("bf92f9"),
     reactorPurple2 = Color.valueOf("8a73c6"),
 
diff --git a/core/src/mindustry/world/blocks/defense/RegenProjector.java b/core/src/mindustry/world/blocks/defense/RegenProjector.java
index 470fc27cdd..95c3df59ac 100644
--- a/core/src/mindustry/world/blocks/defense/RegenProjector.java
+++ b/core/src/mindustry/world/blocks/defense/RegenProjector.java
@@ -30,7 +30,7 @@ public class RegenProjector extends Block{
 
     public DrawBlock drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawSideRegion(true));
 
-    public float effectChance = 0.013f;
+    public float effectChance = 0.003f;
     public Color baseColor = Pal.accent;
     public Effect effect = Fx.regenParticle;
 
@@ -53,7 +53,7 @@ public class RegenProjector extends Block{
         x *= tilesize;
         y *= tilesize;
 
-        Drawf.dashSquare(Pal.accent, x, y, range * tilesize);
+        Drawf.dashSquare(baseColor, x, y, range * tilesize);
         indexer.eachBlock(Vars.player.team(), Tmp.r1.setCentered(x, y, range * tilesize), b -> true, t -> {
             Drawf.selected(t, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f)));
         });
@@ -111,7 +111,7 @@ public class RegenProjector extends Block{
 
             if(consValid()){
                 //use Math.max to prevent stacking
-                for(Building build : targets){
+                for(var build : targets){
                     if(!build.damaged() || build.isHealSuppressed()) continue;
 
                     didRegen = true;
@@ -121,7 +121,7 @@ public class RegenProjector extends Block{
                     float value = mendMap.get(pos);
                     mendMap.put(pos, Math.min(Math.max(value, healPercent * edelta() * build.block.health / 100f), build.block.health - build.health));
 
-                    if(Mathf.chanceDelta(effectChance)){
+                    if(value <= 0 && Mathf.chanceDelta(effectChance * build.block.size * build.block.size)){
                         effect.at(build.x + Mathf.range(build.block.size * tilesize/2f - 1f), build.y + Mathf.range(build.block.size * tilesize/2f - 1f));
                     }
                 }