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 e7e43313d1..0000000000 Binary files a/core/assets-raw/sprites/units/effect-drone.png and /dev/null differ 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