From 705b4197990e23d06875f4e4bcde40e33b6fe4a5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 4 May 2022 17:02:05 -0400
Subject: [PATCH] Removed some unused content

---
 .../assets-raw/sprites/units/effect-drone.png | Bin 475 -> 0 bytes
 core/src/mindustry/content/Blocks.java        |  16 ---------------
 core/src/mindustry/content/UnitTypes.java     |  19 +-----------------
 gradle.properties                             |   2 +-
 4 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 core/assets-raw/sprites/units/effect-drone.png

diff --git a/core/assets-raw/sprites/units/effect-drone.png b/core/assets-raw/sprites/units/effect-drone.png
deleted file mode 100644
index e7e43313d18521775f7a2f053185ac24a1a2e565..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px$l}SWFR9J=Wm$6R6Kn#WrGg3#kPU#Y<50JeufCNH_31*Z>iaNJbRUwdI0QNjU
zr7X?F#)#CtOpY9%<GWs>(4zaN=zO-n-nr*HfS{nDf2wRc+h)_*wyStYt`jdVZ>ywl
zugjVr2TC6wYIe=H6&MZ76Ev+7!fC#(z@)&atLq!p_vQJi(Po2FjcuS%zHrA*(V3#r
z7>c5_&MS%%qS4qV#qMA<kp@R?K5!}+Uur4AW-xIY<G!{Uv#uBhkZNj}qy`9nqm2q<
zbn>qRs2>TqMLhA@`6&PZe7t|x#=r6m0081Rs>b*^=LII6Q+%rs3dP}0em;%3HaOL&
zwHSosP#jKza)E0!xb(f`?q0R$i@7aCBb?Vc)`t#nD>b-3FMbKGuj9h0#;_67HiHRK
z`C@JqJDr2RT2rUm>DnW;q+ya8TeTTX3~&H|a=og)TeT#9?V*8DQvFC{+*i9&S-~XH
z1hj6rs7?AoHhG<6<$9$;q2f65f&w_yt2JsbA0rZ6AJ4bW)b)cmC@5&(^b3tb?sS<;
R%sc=9002ovPDHLkV1mhf)@T3#

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b9329b8612..1ee4152a92 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -146,15 +146,10 @@ public class Blocks{
     //tankReconstructor, shipReconstructor, mechReconstructor,
 
     tankAssembler, shipAssembler, mechAssembler,
-    //TODO maybe making it 5x5 would be more appropriate, seems kinda cheap.
     basicAssemblerModule,
 
-    //TODO
     unitRepairTower,
 
-    //TODO remove
-    droneCenter,
-
     //payloads
     payloadConveyor, payloadRouter, reinforcedPayloadConveyor, reinforcedPayloadRouter, payloadMassDriver, payloadPropulsionTower, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader,
     
@@ -4367,17 +4362,6 @@ public class Blocks{
             size = 5;
         }};
 
-        //TODO setup, sprite, balance... or just scrap it completely.
-        if(false)
-        droneCenter = new DroneCenter("drone-center"){{
-            requirements(Category.units, with(Items.graphite, 10));
-
-            size = 3;
-            consumePower(3f);
-
-            droneType = UnitTypes.effectDrone;
-        }};
-
         unitRepairTower = new RepairTower("unit-repair-tower"){{
             requirements(Category.units, with(Items.graphite, 90, Items.silicon, 90, Items.tungsten, 80));
 
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 6b475277cc..0a90142a6c 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -77,7 +77,7 @@ public class UnitTypes{
     public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
 
     //special tethered (has payload capability, because it's necessary sometimes)
-    public static @EntityDef({Unitc.class, BuildingTetherc.class, Payloadc.class}) UnitType manifold, assemblyDrone, effectDrone;
+    public static @EntityDef({Unitc.class, BuildingTetherc.class, Payloadc.class}) UnitType manifold, assemblyDrone;
 
     //tank
     public static @EntityDef({Unitc.class, Tankc.class}) UnitType stell, locus, precept, vanquish, conquer;
@@ -4218,23 +4218,6 @@ public class UnitTypes{
             envDisabled = Env.none;
         }};
 
-        effectDrone = new ErekirUnitType("effect-drone"){{
-            flying = true;
-            drag = 0.08f;
-            speed = 3f;
-            drawCell = false;
-            logicControllable = playerControllable = allowedInPayloads = isEnemy = false;
-            hidden = true;
-
-            engineSize = 0f;
-            float es = 2.5f, ew = 14.5f / 4f;
-
-            setEnginesMirror(
-            new UnitEngine(ew, ew, es, 45f),
-            new UnitEngine(ew, -ew, es, 315f)
-            );
-        }};
-
         //endregion
     }
 }
diff --git a/gradle.properties b/gradle.properties
index d4777b5ec7..e012c127c1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=f77ad872f8
+archash=de2c33931c