From 130f32f3cd98da54078a83792247d055e000255b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 18 Aug 2021 17:38:30 -0400
Subject: [PATCH] Dormany cyst item

---
 .../sprites/items/item-dormant-cyst.png       | Bin 0 -> 317 bytes
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 2872 -> 2886 bytes
 core/src/mindustry/content/Items.java         |   8 ++++--
 core/src/mindustry/content/Liquids.java       |  24 +++++++++++++-----
 .../mindustry/entities/comp/PuddleComp.java   |  10 +++++++-
 core/src/mindustry/type/Liquid.java           |   5 ++++
 7 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 core/assets-raw/sprites/items/item-dormant-cyst.png

diff --git a/core/assets-raw/sprites/items/item-dormant-cyst.png b/core/assets-raw/sprites/items/item-dormant-cyst.png
new file mode 100644
index 0000000000000000000000000000000000000000..93ea5b41c4b8da18eb31dc0bce46f5583b90c1cc
GIT binary patch
literal 317
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VEFFo
z;usRq`gV#U-ys8uR(Y1AlFQ1Nb>vQR8gK}`J7_5|BU6V{PQ{#|`6laz*-DbBe}BiF
z=HRT}R{y&;_rKVS%g^r{2dLZhtv+RLHZS+-*Cm`{HepSAX%7sALKZTGt2VhB7Puze
z5S`N-{y@5bL85f)hq_vaiRt>YBVyj?hkpue{1h|mvFp6hbuBklPMK~w=)c=LJ2&`H
zj?*{IpJjHjeoe)`jM;@{HjxLKmK<VS$eEn5PcEZv*W=r1djC0nn1h(kZ$D!)g^QnS
zhkWO3Gfh^$3BE77xq}}%JmQSlxL}LJ8W!&5EFqk%e%u>`v|@xfJdYgs{l_J1(~IH*
V!oN-mFfcGMc)I$ztaD0e0su=^dP)EQ

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 113007bf7c..9e72e38042 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -401,3 +401,4 @@
 63308=beryllium|item-beryllium-ui
 63307=fissile-matter|item-fissile-matter-ui
 63306=neoplasm|liquid-neoplasm-ui
+63305=dormant-cyst|item-dormant-cyst-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index c8913b1956a2e2048589a0a8ce8c9f8b8c71a1f2..d3592e0fede5848c070781018cbdd676fe6b2508 100644
GIT binary patch
delta 31
mcmdlXc1&zTC>Nvf<S?#XygVuSMY)N2CA!I##U+#ZxitZ)#0pOU

delta 17
YcmX>mwnJ<~C>Nv9<S?#XljXQI05(kpUH||9

diff --git a/core/src/mindustry/content/Items.java b/core/src/mindustry/content/Items.java
index 05633d50a8..5314187d72 100644
--- a/core/src/mindustry/content/Items.java
+++ b/core/src/mindustry/content/Items.java
@@ -8,7 +8,7 @@ public class Items implements ContentList{
     public static Item
     scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium,
     phaseFabric, surgeAlloy, sporePod, sand, blastCompound, pyratite, metaglass,
-    beryllium, fissileMatter;
+    beryllium, fissileMatter, dormantCyst;
 
     @Override
     public void load(){
@@ -94,7 +94,7 @@ public class Items implements ContentList{
         }};
 
         beryllium = new Item("beryllium", Color.valueOf("3a8f64")){{
-            hardness = 4;
+            hardness = 5;
             cost = 1.3f;
         }};
 
@@ -102,5 +102,9 @@ public class Items implements ContentList{
             hardness = 4;
             radioactivity = 1.5f;
         }};
+
+        dormantCyst = new Item("dormant-cyst", Color.valueOf("a5221c")){{
+            flammability = 0.1f;
+        }};
     }
 }
diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java
index 67a65757c6..4ee5e28b2b 100644
--- a/core/src/mindustry/content/Liquids.java
+++ b/core/src/mindustry/content/Liquids.java
@@ -1,11 +1,17 @@
 package mindustry.content;
 
 import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.math.*;
 import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.graphics.*;
 import mindustry.type.*;
 
+import static arc.graphics.g2d.Draw.*;
+
 public class Liquids implements ContentList{
-    public static Liquid water, slag, oil, cryofluid, neoplasm, rovazide;
+    public static Liquid water, slag, oil, cryofluid, neoplasm;
 
     @Override
     public void load(){
@@ -44,11 +50,17 @@ public class Liquids implements ContentList{
             temperature = 0.54f;
             viscosity = 0.65f;
             flammability = 0.1f;
-        }};
 
-        //rovazide = new Liquid("rovafuel", Color.valueOf("9dde68")){{
-        //    flammability = 1.5f;
-        //    explosiveness = 3f;
-        //}};
+            Color from = Color.valueOf("f98f4a"), to = Color.valueOf("9e172c");
+
+            //TODO could probably be improved...
+            particleSpacing = 65f;
+            particleEffect = new Effect(40f, e -> {
+                e.lifetime = Mathf.randomSeed(e.id + 2, 80f, 200f) * 3.2f;
+                color(from, to, Mathf.randomSeed(e.id, 1f));
+
+                Fill.circle(e.x, e.y, e.fslope() * Mathf.randomSeed(e.id + 1, 0.6f, 2.4f));
+            }).layer(Layer.debris - 0.5f);
+        }};
     }
 }
diff --git a/core/src/mindustry/entities/comp/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java
index c14c49a826..34dd4541c8 100644
--- a/core/src/mindustry/entities/comp/PuddleComp.java
+++ b/core/src/mindustry/entities/comp/PuddleComp.java
@@ -42,7 +42,7 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
     @Import float x, y;
     @Import boolean added;
 
-    transient float accepting, updateTime, lastRipple = Time.time + Mathf.random(40f);
+    transient float accepting, updateTime, lastRipple = Time.time + Mathf.random(40f), effectTime = Mathf.random(50f);
     float amount;
     Tile tile;
     Liquid liquid;
@@ -101,6 +101,14 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
             updateTime = 40f;
         }
 
+        if(!headless && liquid.particleEffect != Fx.none){
+            if((effectTime += Time.delta) >= liquid.particleSpacing){
+                float size = Mathf.clamp(amount / (maxLiquid / 1.5f)) * 4f;
+                liquid.particleEffect.at(x + Mathf.range(size), y + Mathf.range(size));
+                effectTime = 0f;
+            }
+        }
+
         updateTime -= Time.delta;
     }
 
diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java
index e62805e60b..bc283b27b9 100644
--- a/core/src/mindustry/type/Liquid.java
+++ b/core/src/mindustry/type/Liquid.java
@@ -4,6 +4,7 @@ import arc.graphics.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
+import mindustry.entities.*;
 import mindustry.world.meta.*;
 
 public class Liquid extends UnlockableContent{
@@ -25,6 +26,10 @@ public class Liquid extends UnlockableContent{
     public float explosiveness;
     /** The associated status effect. */
     public StatusEffect effect = StatusEffects.none;
+    /** Effect shown in puddles. */
+    public Effect particleEffect = Fx.none;
+    /** Particle effect rate spacing in ticks. */
+    public float particleSpacing = 60f;
 
     public Liquid(String name, Color color){
         super(name);