Use new roll dice, select casualties, and remove casualties steps (#8087

)

The Fire and FireAa classes are no longer used in building the 3 fire
sub steps.

The AirVsNonSubs step is removed because that firing group is now named
and will be displayed in the battle ui when it fires, selects, and
removes.

game-core/src/main/java/games/strategy/triplea/delegate/battle/AbstractBattle.java

@@ -12,7 +12,6 @@
 import games.strategy.engine.delegate.IDelegateBridge;
 import games.strategy.engine.player.Player;
 import games.strategy.triplea.ai.weak.WeakAi;
-import games.strategy.triplea.attachments.UnitAttachment;
 import games.strategy.triplea.delegate.Matches;
 import games.strategy.triplea.delegate.TerritoryEffectHelper;
 import games.strategy.triplea.delegate.TransportTracker;
@@ -345,19 +344,6 @@ static GamePlayer findPlayerWithMostUnits(final Collection<Unit> units) {
     return player;
   }
 
-  /**
-   * The maximum number of hits that this collection of units can sustain, taking into account units
-   * with two hits, and accounting for existing damage.
-   */
-  static int getMaxHits(final Collection<Unit> units) {
-    int count = 0;
-    for (final Unit unit : units) {
-      count += UnitAttachment.get(unit.getType()).getHitPoints();
-      count -= unit.getHits();
-    }
-    return count;
-  }
-
   void markDamaged(final Collection<Unit> damaged, final IDelegateBridge bridge) {
     BattleDelegate.markDamaged(damaged, bridge, battleSite);
   }

game-core/src/main/java/games/strategy/triplea/delegate/battle/BattleActions.java

@@ -8,17 +8,10 @@
 import games.strategy.triplea.ai.weak.WeakAi;
 import games.strategy.triplea.delegate.battle.MustFightBattle.ReturnFire;
 import java.util.Collection;
-import java.util.function.Predicate;
 
 /** Actions that can occur in a battle that require interaction with {@link IDelegateBridge} */
 public interface BattleActions {
 
-  void fireOffensiveAaGuns();
-
-  void fireDefensiveAaGuns();
-
-  void fireNavalBombardment(IDelegateBridge bridge);
-
   void removeNonCombatants(IDelegateBridge bridge);
 
   void clearWaitingToDieAndDamagedChangesInto(IDelegateBridge bridge);
@@ -28,17 +21,6 @@ void removeCasualties(
 
   void endBattle(IBattle.WhoWon whoWon, IDelegateBridge bridge);
 
-  void findTargetGroupsAndFire(
-      ReturnFire returnFire,
-      String stepName,
-      boolean defending,
-      GamePlayer firingPlayer,
-      Predicate<Unit> firingUnitPredicate,
-      Collection<Unit> firingUnits,
-      Collection<Unit> firingUnitsWaitingToDie,
-      Collection<Unit> enemyUnits,
-      Collection<Unit> enemyUnitsWaitingToDie);
-
   void remove(
       Collection<Unit> killedUnits,
       IDelegateBridge bridge,

game-core/src/main/java/games/strategy/triplea/delegate/battle/BattleState.java

@@ -92,8 +92,6 @@ public boolean isFirstRound() {
 
   void retreatUnits(Side side, Collection<Unit> units);
 
-  Collection<Unit> getAa(Side... sides);
-
   Collection<Unit> getBombardingUnits();
 
   GamePlayer getPlayer(Side side);

game-core/src/main/java/games/strategy/triplea/delegate/battle/BattleStepStrings.java

@@ -5,8 +5,9 @@ public interface BattleStepStrings {
 
   String AA_GUNS_FIRE_SUFFIX = " fire";
   String FIRE_SUFFIX = " fire";
+  String FIRST_STRIKE_UNITS_FIRE_SUFFIX = " first strike units fire";
   String SELECT_PREFIX = " select ";
-  String REMOVE_PREFIX = " remove ";
+  String NOTIFY_PREFIX = " notify ";
   String CASUALTIES_SUFFIX = " casualties";
   String CASUALTIES_WITHOUT_SPACE_SUFFIX = "casualties";
   String LAND_PARATROOPS = "Land Paratroopers";
@@ -21,8 +22,6 @@ public interface BattleStepStrings {
   String UNITS = "units";
   String FIRST_STRIKE_UNITS = "first strike units";
   String REMOVE_SNEAK_ATTACK_CASUALTIES = "Remove sneak attack casualties";
-  String FIRE = " fire";
-  String FIRST_STRIKE_UNITS_FIRE = " first strike units fire";
   String SELECT_FIRST_STRIKE_CASUALTIES = " select first strike casualties";
   String SELECT_CASUALTIES = " select casualties";
   String REMOVE_CASUALTIES = "Remove casualties";