From e3f40cd968194b2402b11bcb8164a839f169d1e5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 16 Jul 2020 14:32:38 -0400
Subject: [PATCH] Cleanup

---
 core/src/mindustry/content/Blocks.java    |  9 +++++-
 core/src/mindustry/content/Bullets.java   | 21 +-----------
 core/src/mindustry/content/UnitTypes.java | 39 +++++++++++++++++++++--
 core/src/mindustry/core/Control.java      |  5 ++-
 4 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 83f13e5dde..3a56609b84 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -870,8 +870,15 @@ public class Blocks implements ContentList{
         forceProjector = new ForceProjector("force-projector"){{
             requirements(Category.effect, with(Items.lead, 100, Items.titanium, 75, Items.silicon, 125));
             size = 3;
+            phaseRadiusBoost = 80f;
+            radius = 101.7f;
+            breakage = 750f;
+            cooldownNormal = 1.5f;
+            cooldownLiquid = 1.2f;
+            cooldownBrokenBase = 0.35f;
+
             consumes.item(Items.phasefabric).boost();
-            consumes.power(3f);
+            consumes.power(4f);
         }};
 
         shockMine = new ShockMine("shock-mine"){{
diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index f581ee9398..668b629168 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -27,7 +27,7 @@ public class Bullets implements ContentList{
     fragGlass, fragExplosive, fragPlastic, fragSurge, fragGlassFrag, fragPlasticFrag,
 
     //missiles
-    missileExplosive, missileIncendiary, missileSurge, missileSwarm,
+    missileExplosive, missileIncendiary, missileSurge,
 
     //standard
     standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary, standardMechSmall,
@@ -287,25 +287,6 @@ public class Bullets implements ContentList{
             lightningLength = 14;
         }};
 
-        missileSwarm = new MissileBulletType(2.7f, 12, "missile"){{
-            width = 8f;
-            height = 8f;
-            shrinkY = 0f;
-            drag = -0.003f;
-            homingRange = 60f;
-            keepVelocity = false;
-            splashDamageRadius = 25f;
-            splashDamage = 10f;
-            lifetime = 120f;
-            trailColor = Color.gray;
-            backColor = Pal.bulletYellowBack;
-            frontColor = Pal.bulletYellow;
-            hitEffect = Fx.blastExplosion;
-            despawnEffect = Fx.blastExplosion;
-            weaveScale = 8f;
-            weaveMag = 2f;
-        }};
-
         standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{
             width = 7f;
             height = 9f;
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 443b76df63..46d334a1bb 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -373,6 +373,7 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        //TODO implement
         arkyid = new UnitType("arkyid"){{
             drag = 0.1f;
             speed = 0.5f;
@@ -400,7 +401,24 @@ public class UnitTypes implements ContentList{
                 x = 4f;
                 rotate = true;
                 shake = 1f;
-                bullet = Bullets.missileSwarm;
+                bullet = new MissileBulletType(2.7f, 12, "missile"){{
+                    width = 8f;
+                    height = 8f;
+                    shrinkY = 0f;
+                    drag = -0.003f;
+                    homingRange = 60f;
+                    keepVelocity = false;
+                    splashDamageRadius = 25f;
+                    splashDamage = 10f;
+                    lifetime = 120f;
+                    trailColor = Color.gray;
+                    backColor = Pal.bulletYellowBack;
+                    frontColor = Pal.bulletYellow;
+                    hitEffect = Fx.blastExplosion;
+                    despawnEffect = Fx.blastExplosion;
+                    weaveScale = 8f;
+                    weaveMag = 2f;
+                }};
             }});
         }};
 
@@ -670,7 +688,24 @@ public class UnitTypes implements ContentList{
                 x = 0f;
                 rotate = true;
                 ejectEffect = Fx.shellEjectSmall;
-                bullet = Bullets.flakScrap;
+                bullet = new MissileBulletType(2.7f, 12, "missile"){{
+                    width = 8f;
+                    height = 8f;
+                    shrinkY = 0f;
+                    drag = -0.003f;
+                    homingRange = 60f;
+                    keepVelocity = false;
+                    splashDamageRadius = 25f;
+                    splashDamage = 10f;
+                    lifetime = 120f;
+                    trailColor = Color.gray;
+                    backColor = Pal.bulletYellowBack;
+                    frontColor = Pal.bulletYellow;
+                    hitEffect = Fx.blastExplosion;
+                    despawnEffect = Fx.blastExplosion;
+                    weaveScale = 8f;
+                    weaveMag = 2f;
+                }};
             }});
         }};
 
diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 3a2ddf5eb5..1fd8a248da 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -417,7 +417,10 @@ public class Control implements ApplicationListener, Loadable{
         //just a regular reminder
         if(!OS.prop("user.name").equals("anuke") && !OS.hasEnv("iknowwhatimdoing")){
             if(mobile){
-                ui.showInfo("[scarlet]6.0 doesn't work on mobile.[] Don't play it.");
+                Runnable[] run = {null};
+                run[0] = () -> {
+                    ui.showInfo("[scarlet]6.0 doesn't work on mobile.[] Don't play it.", run[0]);
+                };
             }else{
                 ui.showInfo("[scarlet]6.0 is not supposed to be played.[] Go do something else.");
             }