Weapon refactor / New units with edgy names / Spritesheet cleanup

core/src/io/anuke/mindustry/game/SpawnGroup.java

@@ -1,11 +1,9 @@
 package io.anuke.mindustry.game;
 
 import io.anuke.mindustry.entities.type.BaseUnit;
-import io.anuke.mindustry.entities.type.GroundUnit;
-import io.anuke.mindustry.type.UnitType;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.StatusEffect;
-import io.anuke.mindustry.type.Weapon;
+import io.anuke.mindustry.type.UnitType;
 
 /**
  * A spawn group defines spawn information for a specific type of unit, with optional extra information like
@@ -27,8 +25,6 @@ public class SpawnGroup{
     protected float unitScaling = 9999f;
     /**Amount of enemies spawned initially, with no scaling*/
     protected int unitAmount = 1;
-    /**Weapon used by the spawned unit. Null to disable. Only applicable to ground units.*/
-    protected Weapon weapon;
     /**Status effect applied to the spawned unit. Null to disable.*/
     protected StatusEffect effect;
     /**Items this unit spawns with. Null to disable.*/
@@ -57,10 +53,6 @@ public class SpawnGroup{
     public BaseUnit createUnit(Team team){
         BaseUnit unit = type.create(team);
 
-        if(unit instanceof GroundUnit && weapon != null){
-            ((GroundUnit) unit).setWeapon(weapon);
-        }
-
         if(effect != null){
             unit.applyEffect(effect, 999999f);
         }
@@ -82,7 +74,6 @@ public class SpawnGroup{
         ", max=" + max +
         ", unitScaling=" + unitScaling +
         ", unitAmount=" + unitAmount +
-        ", weapon=" + weapon +
         ", effect=" + effect +
         ", items=" + items +
         '}';

core/src/io/anuke/mindustry/game/Waves.java

@@ -4,7 +4,6 @@ import io.anuke.arc.collection.Array;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.content.UnitTypes;
-import io.anuke.mindustry.content.Weapons;
 import io.anuke.mindustry.type.ItemStack;
 
 public class Waves{
@@ -50,7 +49,6 @@ public class Waves{
                 begin = 28;
                 spacing = 3;
                 unitScaling = 2;
-                weapon = Weapons.flamethrower;
                 end = 40;
             }},
 
@@ -58,7 +56,6 @@ public class Waves{
                 begin = 45;
                 spacing = 3;
                 unitScaling = 2;
-                weapon = Weapons.flamethrower;
                 effect = StatusEffects.overdrive;
             }},
 
@@ -67,7 +64,6 @@ public class Waves{
                 spacing = 2;
                 unitScaling = 3;
                 unitAmount = 5;
-                weapon = Weapons.flakgun;
                 effect = StatusEffects.overdrive;
             }},
 
@@ -181,10 +177,6 @@ public class Waves{
                 if(a > 0){
                     System.out.print(a + "x" + spawn.type.name);
 
-                    if(spawn.weapon != null){
-                        System.out.print(":" + spawn.weapon.name);
-                    }
-
                     System.out.print(" ");
                 }
             }