aiStrategicBombs_6718 #15

ProCombatMoveAi.java -determineBestBombingAttackForBomber: sameTargetBombers as Set<>; cleansing
triplea-game · Jun 28, 2022 · be6e069 · be6e069
1 parent 6344dd9
commit be6e069
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProCombatMoveAi.java b/game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProCombatMoveAi.java
@@ -1214,20 +1214,18 @@ private void determineBestBombingAttackForBomber(
         int neededDamageUnits = 0;
         int sameTargetBombersCount = 0;
         final List<Unit> existingAttackingBombers = attackMap.get(t).getBombers();
-        if (!Properties.getDamageFromBombingDoneToUnitsInsteadOfTerritories(data.getProperties())) {
-          sameTargetBombersCount = existingAttackingBombers.size();
-        } else {
-          final List<Unit> sameTargetBombers = new ArrayList<>();
+        if (Properties.getDamageFromBombingDoneToUnitsInsteadOfTerritories(data.getProperties())) {
+          final Set<Unit> sameTargetBombers = new HashSet<>();
           for (final Unit target : targetUnits) {
             neededDamageUnits += target.getHowMuchMoreDamageCanThisUnitTake(t);
-            for (final Unit existingBomber : existingAttackingBombers) {
-              if (!sameTargetBombers.contains(existingBomber)
-                  && Matches.unitIsLegalBombingTargetBy(existingBomber).test(target)) {
-                sameTargetBombers.add(existingBomber);
-              }
-            }
+            final Predicate<Unit> canBombTarget =
+                u -> Matches.unitIsLegalBombingTargetBy(u).test(target);
+            sameTargetBombers.addAll(
+                CollectionUtils.getMatches(existingAttackingBombers, canBombTarget));
           }
           sameTargetBombersCount = sameTargetBombers.size();
+        } else {
+          sameTargetBombersCount = existingAttackingBombers.size();
         }
         // assume each other bomber causes a damage of 3
         final int remainingDamagePotential =