Removed 2 old maps + modular weapon sprites

TeamOct · Apr 20, 2024 · ec1dda9 · ec1dda9
1 parent aea1824
commit ec1dda9
Show file tree

Hide file tree

Showing 32 changed files with 2 additions and 6 deletions.
diff --git a/res/maps/beginning.msav b/res/maps/beginning.msav
diff --git a/res/maps/siloTerminal.msav b/res/maps/siloTerminal.msav
diff --git a/res/sprites/units/core/legionnaire-cell.png → ...sprites/units/bosses/legionnaire-cell.png b/res/sprites/units/core/legionnaire-cell.png → ...sprites/units/bosses/legionnaire-cell.png
diff --git a/...s/units/core/legionnaire-replica-cell.png → ...units/bosses/legionnaire-replica-cell.png b/...s/units/core/legionnaire-replica-cell.png → ...units/bosses/legionnaire-replica-cell.png
diff --git a/...prites/units/core/legionnaire-replica.png → ...ites/units/bosses/legionnaire-replica.png b/...prites/units/core/legionnaire-replica.png → ...ites/units/bosses/legionnaire-replica.png
diff --git a/res/sprites/units/core/legionnaire.png → res/sprites/units/bosses/legionnaire.png b/res/sprites/units/core/legionnaire.png → res/sprites/units/bosses/legionnaire.png
diff --git a/res/sprites/units/king-foot.png → res/sprites/units/core/king-foot.png b/res/sprites/units/king-foot.png → res/sprites/units/core/king-foot.png
diff --git a/res/sprites/units/king-joint-base.png → res/sprites/units/core/king-joint-base.png b/res/sprites/units/king-joint-base.png → res/sprites/units/core/king-joint-base.png
diff --git a/res/sprites/units/king-joint.png → res/sprites/units/core/king-joint.png b/res/sprites/units/king-joint.png → res/sprites/units/core/king-joint.png
diff --git a/res/sprites/units/king-leg-base.png → res/sprites/units/core/king-leg-base.png b/res/sprites/units/king-leg-base.png → res/sprites/units/core/king-leg-base.png
diff --git a/res/sprites/units/king-leg.png → res/sprites/units/core/king-leg.png b/res/sprites/units/king-leg.png → res/sprites/units/core/king-leg.png
diff --git a/res/sprites/units/king.png → res/sprites/units/core/king.png b/res/sprites/units/king.png → res/sprites/units/core/king.png
diff --git a/res/sprites/units/lord-foot.png → res/sprites/units/core/lord-foot.png b/res/sprites/units/lord-foot.png → res/sprites/units/core/lord-foot.png
diff --git a/res/sprites/units/lord-joint-base.png → res/sprites/units/core/lord-joint-base.png b/res/sprites/units/lord-joint-base.png → res/sprites/units/core/lord-joint-base.png
diff --git a/res/sprites/units/lord-joint.png → res/sprites/units/core/lord-joint.png b/res/sprites/units/lord-joint.png → res/sprites/units/core/lord-joint.png
diff --git a/res/sprites/units/lord-leg-base.png → res/sprites/units/core/lord-leg-base.png b/res/sprites/units/lord-leg-base.png → res/sprites/units/core/lord-leg-base.png
diff --git a/res/sprites/units/lord-leg.png → res/sprites/units/core/lord-leg.png b/res/sprites/units/lord-leg.png → res/sprites/units/core/lord-leg.png
diff --git a/res/sprites/units/lord.png → res/sprites/units/core/lord.png b/res/sprites/units/lord.png → res/sprites/units/core/lord.png
diff --git a/res/sprites/units/assault/assault-cell.png → ...sprites/units/destroyers/assault-cell.png b/res/sprites/units/assault/assault-cell.png → ...sprites/units/destroyers/assault-cell.png
diff --git a/res/sprites/units/assault/assault-full.png → ...sprites/units/destroyers/assault-full.png b/res/sprites/units/assault/assault-full.png → ...sprites/units/destroyers/assault-full.png
diff --git a/res/sprites/units/assault/assault.png → res/sprites/units/destroyers/assault.png b/res/sprites/units/assault/assault.png → res/sprites/units/destroyers/assault.png
diff --git a/res/sprites/units/weapons/modular/shotgun-mount1.png b/res/sprites/units/weapons/modular/shotgun-mount1.png
diff --git a/res/sprites/units/weapons/modular/shotgun-mount2.png b/res/sprites/units/weapons/modular/shotgun-mount2.png
diff --git a/res/sprites/units/weapons/modular/shotgun-mount3.png b/res/sprites/units/weapons/modular/shotgun-mount3.png
diff --git a/...s/units/weapons/standard-weapon1-heat.png → ...weapons/modular/standard-weapon1-heat.png b/...s/units/weapons/standard-weapon1-heat.png → ...weapons/modular/standard-weapon1-heat.png
diff --git a/...prites/units/weapons/standard-weapon1.png → ...nits/weapons/modular/standard-weapon1.png b/...prites/units/weapons/standard-weapon1.png → ...nits/weapons/modular/standard-weapon1.png
diff --git a/res/sprites/units/weapons/modular/standard-weapon2.png b/res/sprites/units/weapons/modular/standard-weapon2.png
diff --git a/res/sprites/units/weapons/modular/standard-weapon3.png b/res/sprites/units/weapons/modular/standard-weapon3.png
diff --git a/res/sprites/units/weapons/standard-weapon2.png b/res/sprites/units/weapons/standard-weapon2.png
diff --git a/res/sprites/units/weapons/standard-weapon5-heat.png b/res/sprites/units/weapons/standard-weapon5-heat.png
diff --git a/res/sprites/units/weapons/standard-weapon5.png b/res/sprites/units/weapons/standard-weapon5.png
diff --git a/src/fos/type/content/WeaponSet.java b/src/fos/type/content/WeaponSet.java
@@ -47,17 +47,13 @@ public WeaponSet(String name, Seq<Ability> abilities) {
     @Override
     public void init() {
         super.init();
-
-        for (Weapon weapon : weapons)
-            weapon.init();
+        weapons.each(Weapon::init);
     }
 
     @Override
     public void load() {
         super.load();
-
-        for (Weapon weapon : weapons)
-            weapon.load();
+        weapons.each(Weapon::load);
 
         fullIcon = uiIcon = weapons.first().region;
     }