glob

Author: MEEPofFaith

assets/sprites/bullets/sludge-glob.png

@@ -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");
         }};
     }
 }

src/progressed/content/PMLiquids.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){

src/progressed/content/blocks/PMModules.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){

src/progressed/entities/bullet/pseudo3d/ArcBoltBulletType.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");

src/progressed/graphics/PMPal.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;
         }
     }
 }