Fix: Use all of the friendly units for support calculation in OOL

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

@@ -40,6 +40,7 @@ static class Parameters {
     @Nonnull Collection<Unit> targetsToPickFrom;
     @Nonnull GamePlayer player;
     @Nonnull Collection<Unit> enemyUnits;
+    @Nonnull Collection<Unit> friendlyUnits;
     @Nonnull Territory battlesite;
     @Nonnull IntegerMap<UnitType> costs;
     @Nonnull CombatModifiers combatModifiers;
@@ -107,7 +108,7 @@ List<Unit> sortUnitsForCasualtiesWithSupport(final Parameters parameters) {
         TotalPowerAndTotalRolls.getUnitPowerAndRollsForNormalBattles(
             sortedUnitsList,
             new ArrayList<>(parameters.enemyUnits),
-            sortedUnitsList,
+            new ArrayList<>(parameters.friendlyUnits),
             parameters.combatModifiers.isDefending(),
             parameters.data,
             parameters.battlesite,

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

@@ -121,6 +121,7 @@ public static CasualtyDetails selectCasualties(
             defending,
             player,
             enemyUnits,
+            friendlyUnits,
             battlesite,
             costs,
             territoryEffects,
@@ -281,6 +282,7 @@ private static Tuple<CasualtyList, List<Unit>> getDefaultCasualties(
       final boolean defending,
       final GamePlayer player,
       final Collection<Unit> enemyUnits,
+      final Collection<Unit> friendlyUnits,
       final Territory battlesite,
       final IntegerMap<UnitType> costs,
       final Collection<TerritoryEffect> territoryEffects,
@@ -295,6 +297,7 @@ private static Tuple<CasualtyList, List<Unit>> getDefaultCasualties(
                 .targetsToPickFrom(targetsToPickFrom)
                 .player(player)
                 .enemyUnits(enemyUnits)
+                .friendlyUnits(friendlyUnits)
                 .combatModifiers(
                     CombatModifiers.builder()
                         .territoryEffects(territoryEffects)

game-core/src/test/java/games/strategy/triplea/delegate/battle/casualty/CasualtyOrderOfLossesTest.java

@@ -78,6 +78,7 @@ private CasualtyOrderOfLosses.Parameters withFakeParameters() {
                 .build())
         .player(player)
         .enemyUnits(List.of())
+        .friendlyUnits(List.of())
         .battlesite(territory)
         .costs(IntegerMap.of(Map.of()))
         .data(gameData)

game-core/src/test/java/games/strategy/triplea/delegate/battle/casualty/CasualtyOrderOfLossesTestOnBigWorldV3.java

@@ -65,6 +65,7 @@ private CasualtyOrderOfLosses.Parameters amphibAssault(final Collection<Unit> am
             CombatModifiers.builder().defending(false).territoryEffects(List.of()).build())
         .player(testData.british)
         .enemyUnits(List.of())
+        .friendlyUnits(amphibUnits)
         .battlesite(testData.france)
         .costs(testData.costMap)
         .data(testData.gameData)
@@ -193,6 +194,7 @@ void nonAmphibiousMarineWithAmphibiousAssault() {
                     CombatModifiers.builder().defending(false).territoryEffects(List.of()).build())
                 .player(testData.british)
                 .enemyUnits(List.of())
+                .friendlyUnits(attackingUnits)
                 .battlesite(testData.france)
                 .costs(testData.costMap)
                 .data(testData.gameData)
@@ -241,6 +243,7 @@ void amphibiousAndNonAmphibiousCaching() {
                     CombatModifiers.builder().defending(false).territoryEffects(List.of()).build())
                 .player(testData.british)
                 .enemyUnits(List.of())
+                .friendlyUnits(attackingUnits)
                 .battlesite(testData.france)
                 .costs(testData.costMap)
                 .data(testData.gameData)
@@ -260,6 +263,7 @@ void amphibiousAndNonAmphibiousCaching() {
                     CombatModifiers.builder().defending(false).territoryEffects(List.of()).build())
                 .player(testData.british)
                 .enemyUnits(List.of())
+                .friendlyUnits(attackingUnits.subList(0, 3))
                 .battlesite(testData.france)
                 .costs(testData.costMap)
                 .data(testData.gameData)

game-core/src/test/java/games/strategy/triplea/delegate/battle/casualty/CasualtyOrderOfLossesTestOnGlobal.java

@@ -135,6 +135,7 @@ private CasualtyOrderOfLosses.Parameters attackingWith(final Collection<Unit> un
             CombatModifiers.builder().defending(false).territoryEffects(List.of()).build())
         .player(BRITISH)
         .enemyUnits(List.of())
+        .friendlyUnits(units)
         .battlesite(FRANCE)
         .costs(COST_MAP)
         .data(data)
@@ -218,6 +219,7 @@ private CasualtyOrderOfLosses.Parameters amphibAssault(final Collection<Unit> am
             CombatModifiers.builder().defending(false).territoryEffects(List.of()).build())
         .player(BRITISH)
         .enemyUnits(List.of())
+        .friendlyUnits(amphibUnits)
         .battlesite(FRANCE)
         .costs(COST_MAP)
         .data(data)
@@ -298,6 +300,7 @@ private CasualtyOrderOfLosses.Parameters defendingWith(final Collection<Unit> un
             CombatModifiers.builder().defending(true).territoryEffects(List.of()).build())
         .player(BRITISH)
         .enemyUnits(List.of())
+        .friendlyUnits(units)
         .battlesite(FRANCE)
         .costs(COST_MAP)
         .data(data)

game-core/src/test/java/games/strategy/triplea/delegate/battle/casualty/CasualtyOrderOfLossesTestOnNapoleonic.java

@@ -94,6 +94,7 @@ private CasualtyOrderOfLosses.Parameters attackingWith(final Collection<Unit> un
             CombatModifiers.builder().defending(false).territoryEffects(List.of()).build())
         .player(BRITISH)
         .enemyUnits(List.of())
+        .friendlyUnits(units)
         .battlesite(NORMANDY)
         .costs(COST_MAP)
         .data(data)