Merge pull request #5788 from Sleet01/Hotfix_let_Princess_bomb_again

Revert unnecessary change that broke Princess bombing; add safety around diveBombing plans
MegaMek · Jul 24, 2024 · 98bbd37 · 98bbd37
2 parents a04b96c + d101f3c
commit 98bbd37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/megamek/src/megamek/client/bot/princess/FireControl.java b/megamek/src/megamek/client/bot/princess/FireControl.java
@@ -1933,9 +1933,10 @@ private FiringPlan getDiveBombPlan(final Entity shooter,
                                                                     guess,
                                                                     bombPayloads);
                 diveBombPlan.add(diveBomb);
+                //To prevent adding more than one dive bomb action to the plan
+                break;
             }
         }
-
         return diveBombPlan;
     }
 

diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -4313,7 +4313,7 @@ protected void resetBombAttacks() {
         weaponBayList.removeAll(bombAttacksToRemove);
 
         boolean foundSpaceBomb = false;
-        int numGroundBombs = 0;
+        int addedBombAttacks = 0;
 
         for (BombMounted m : getBombs()) {
             // Add the space bomb attack
@@ -4338,7 +4338,7 @@ && isBomber()
                     && m.getType().hasFlag(AmmoType.F_GROUND_BOMB)
                     && !((this instanceof LandAirMech)
                             && (getConversionMode() == LandAirMech.CONV_MODE_MECH))) {
-                if (numGroundBombs <= 1) {
+                if (addedBombAttacks < 1) {
                     try {
                         WeaponMounted bomb = (WeaponMounted) addEquipment(diveBomb, m.getLocation(), false);
                         if (hasETypeFlag(ETYPE_FIGHTER_SQUADRON)) {
@@ -4350,7 +4350,7 @@ && isBomber()
                     }
                 }
 
-                if ((numGroundBombs <= 10) && isBomber()) {
+                if ((addedBombAttacks < 10) && isBomber()) {
                     try {
                         WeaponMounted bomb = (WeaponMounted) addEquipment(altBomb, m.getLocation(), false);
                         if (hasETypeFlag(ETYPE_FIGHTER_SQUADRON)) {
@@ -4361,7 +4361,7 @@ && isBomber()
 
                     }
                 }
-                numGroundBombs++;
+                addedBombAttacks++;
             }
         }
     }