From 3a07fe266a88b921b7e3964cfdcd673914e35773 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Fri, 15 Nov 2024 17:40:35 -0800
Subject: [PATCH] glob

---
 assets/sprites/bullets/sludge-glob.png        | Bin 0 -> 503 bytes
 src/progressed/content/PMLiquids.java         |   3 ++
 src/progressed/content/blocks/PMModules.java  |  27 +++++++++++++++++-
 .../bullet/pseudo3d/ArcBoltBulletType.java    |   4 +--
 src/progressed/graphics/PMPal.java            |   2 +-
 .../modules/MortarLiquidTurretModule.java     |   8 +++---
 6 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 assets/sprites/bullets/sludge-glob.png

diff --git a/assets/sprites/bullets/sludge-glob.png b/assets/sprites/bullets/sludge-glob.png
new file mode 100644
index 0000000000000000000000000000000000000000..2999c434288180df2296d8094b292474dacdff0c
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px$u}MThRA_<im_1GdF%U*)5fTjribR2sIKmbjfF}3g3^_{9z&&Vk0E!$T5~4tg
zC}>hafxL3O-kGs8;|<dHq-{1E+iz!f{6ho)00000001>~a}Pkn%gx<Sdhhw`LpAoZ
z7tF~8G?KFmzCJA`1>Uz;;{PSd%Zf2ov0Xh3BK>;TablLZ3&vvcz0bFA@2-i6=)$w{
zoLu1c@ml=<eSZ+2kut$ekdrHclMKIclGR0qYg7{*A|mTFU2gUxpW<)OsyMXz2GtQP
z72~4lDVIi(ji5&<Zxy+~NYF9`Llj#}#T<pR)#O`BZbidY*EmgwY2rW0araXO!CZ-z
zIu4f?7HuC*^jgWZV-HD9o0?}vD;Y`h)ReJC>Nh)0#FFRwZBCH}NL-69H~TJJ(zBLP
z)GV|$6fL$(3(=`qNEYuVxE-|BTd!?17l5jWaECzBH=A3dYF0W^=^tLeRCZOTT#)1<
zn#xMss8Uf$j;O(*Q!J_3Czh^TrMlpLCKCo=J>6&vp6i)RjAaEbX{-6UsB~7trD)Ad
tn&sekO0r+?W<Q7q00000004kLegP1Vz3X+sAAJA-002ovPDHLkV1mqc*6{!U

literal 0
HcmV?d00001

diff --git a/src/progressed/content/PMLiquids.java b/src/progressed/content/PMLiquids.java
index bbddde66..a294c0e1 100644
--- a/src/progressed/content/PMLiquids.java
+++ b/src/progressed/content/PMLiquids.java
@@ -30,6 +30,9 @@ public static void load() {
             canStayOn.addAll(Liquids.water, Liquids.oil, Liquids.cryofluid);
             hideDetails = false;
             hidden = true;
+
+            colorFrom = Color.valueOf("d2701e");
+            colorTo = Color.valueOf("a21019");
         }};
     }
 }
diff --git a/src/progressed/content/blocks/PMModules.java b/src/progressed/content/blocks/PMModules.java
index 1a62f433..42812fd2 100644
--- a/src/progressed/content/blocks/PMModules.java
+++ b/src/progressed/content/blocks/PMModules.java
@@ -15,6 +15,7 @@
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.consumers.*;
+import progressed.content.*;
 import progressed.content.effects.*;
 import progressed.entities.bullet.energy.*;
 import progressed.entities.bullet.physical.*;
@@ -43,7 +44,6 @@ public class PMModules{
 
     //Large
     firestorm, wasteland, judgement;
-    //TODO? wasteland: a neoplasm artillery cannon. splits out globs that stick to enemies then explode
     //TODO judgement: 3 large beams
 
     public static void load(){
@@ -325,6 +325,31 @@ Items.tungsten, new AntiMissileRailBulletType(){{
                 shotDelay = 8f;
             }};
         }};
+
+        wasteland = new MortarLiquidTurretModule("wasteland"){{
+            requirements(Category.units, PMBlocks.incompleteVisibility(), with());
+            moduleSize = ModuleSize.large;
+            size = 3;
+            outlineColor = Pal.darkOutline;
+
+            ammo(Liquids.neoplasm, new ArcBoltBulletType(3, 0, "prog-mats-sludge-glob"){{
+                bloomSprite = false;
+
+                gravity = 0.05f;
+
+                splashDamage = 100f;
+                splashDamageRadius = 12f * tilesize;
+                status = PMStatusEffects.sludgeIncineration;
+
+                puddles = 3;
+                puddleAmount = 30;
+                puddleLiquid = PMLiquids.sludge;
+            }});
+
+            reload = 90f;
+            minRange = 5 * tilesize;
+            range = 24 * tilesize;
+        }};
     }
 
     public static void setClip(float newClip){
diff --git a/src/progressed/entities/bullet/pseudo3d/ArcBoltBulletType.java b/src/progressed/entities/bullet/pseudo3d/ArcBoltBulletType.java
index e59435da..a9fc2020 100644
--- a/src/progressed/entities/bullet/pseudo3d/ArcBoltBulletType.java
+++ b/src/progressed/entities/bullet/pseudo3d/ArcBoltBulletType.java
@@ -11,12 +11,12 @@
 public class ArcBoltBulletType extends ArcBasicBulletType{
     public ArcBoltBulletType(float speed, float damage, String sprite){
         super(speed, damage, sprite);
+
+        spinShade = drawZone = drawTarget = drawProgress = false;
     }
 
     public ArcBoltBulletType(float speed, float damage){
         this(speed, damage, "bullet");
-
-        spinShade = drawZone = drawTarget = drawProgress = false;
     }
 
     public ArcBoltBulletType(float speed){
diff --git a/src/progressed/graphics/PMPal.java b/src/progressed/graphics/PMPal.java
index e7d6e988..89827f8a 100644
--- a/src/progressed/graphics/PMPal.java
+++ b/src/progressed/graphics/PMPal.java
@@ -25,7 +25,7 @@ public class PMPal{
     missileFrag = valueOf("9CB664"),
     nukeEmp = valueOf("a1b0ff"),
 
-    sludge = valueOf("ad510a"),
+    sludge = valueOf("bd3e12"),
 
     nexusLaser = valueOf("da89fa"),
     nexusLaserDark = valueOf("cf6aec");
diff --git a/src/progressed/world/blocks/defence/turret/payload/modular/modules/MortarLiquidTurretModule.java b/src/progressed/world/blocks/defence/turret/payload/modular/modules/MortarLiquidTurretModule.java
index ebfb270a..6974df73 100644
--- a/src/progressed/world/blocks/defence/turret/payload/modular/modules/MortarLiquidTurretModule.java
+++ b/src/progressed/world/blocks/defence/turret/payload/modular/modules/MortarLiquidTurretModule.java
@@ -19,7 +19,7 @@ protected void bullet(BulletType type, float xOffset, float yOffset, float angle
             queuedBullets--;
             if(dead || (!consumeAmmoOnce && !hasAmmo())) return;
 
-            ArcMissileBulletType m = (ArcMissileBulletType)type;
+            ArcBulletType m = (ArcBulletType)type;
             Vec2 inacc = Math3D.inaccuracy(inaccuracy);
 
             float
@@ -60,11 +60,11 @@ protected void bullet(BulletType type, float xOffset, float yOffset, float angle
 
         protected float shootAngle(ArcBulletType b){
             float[] angs = Math3D.shootAngle(Math.min(dst(targetPos), range()), b.gravity, b.speed);
+            float a = angs[0];
             if(angs.length == 2){
-                return angs[1];
-            }else{
-                return angs[0];
+                a = angs[1];
             }
+            return a * Mathf.radDeg;
         }
     }
 }