Power-based ammo / Refactoring / IP kicks / Fixes

core/src/mindustry/world/blocks/power/Battery.java

@@ -2,8 +2,10 @@ package mindustry.world.blocks.power;
 
 import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.struct.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.tilesize;
 
@@ -17,6 +19,7 @@ public class Battery extends PowerDistributor{
         super(name);
         outputsPower = true;
         consumesPower = true;
+        flags = EnumSet.of(BlockFlag.powerResupply);
     }
 
     public class BatteryBuild extends Building{

core/src/mindustry/world/blocks/units/ResupplyPoint.java

@@ -5,6 +5,7 @@ import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.type.AmmoTypes.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
@@ -53,10 +54,10 @@ public class ResupplyPoint extends Block{
     public static boolean resupply(Building tile, float range, int ammoAmount, Color ammoColor){
         if(!state.rules.unitAmmo) return false;
 
-        Unit unit = Units.closest(tile.team, tile.x, tile.y, range, u -> u.ammo() <= u.type().ammoCapacity - ammoAmount);
+        Unit unit = Units.closest(tile.team, tile.x, tile.y, range, u -> u.type().ammoType instanceof ItemAmmoType && u.ammo <= u.type().ammoCapacity - ammoAmount);
         if(unit != null){
             Fx.itemTransfer.at(tile.x, tile.y, ammoAmount / 2f, ammoColor, unit);
-            unit.ammo(Math.min(unit.ammo() + ammoAmount, unit.type().ammoCapacity));
+            unit.ammo = Math.min(unit.ammo + ammoAmount, unit.type().ammoCapacity);
             return true;
         }
 

core/src/mindustry/world/meta/BlockFlag.java

@@ -12,6 +12,8 @@ public enum BlockFlag{
     repair,
     /** Rally point. */
     rally,
+    /** Block that stored power for resupply. */
+    powerResupply,
     /** Any block that boosts unit capacity. */
     unitModifier;