Issue 6252: Allow princess to unjam weapon-crits for offboard artillery

MegaMek · Dec 19, 2024 · 22efef7 · 22efef7
1 parent c307bf0
commit 22efef7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/megamek/src/megamek/client/bot/princess/FireControl.java b/megamek/src/megamek/client/bot/princess/FireControl.java
@@ -3560,6 +3560,9 @@ public Vector<EntityAction> getUnjamWeaponPlan(Entity shooter) {
             if (weaponDamage == WeaponType.DAMAGE_BY_CLUSTERTABLE) {
                 weaponDamage = ((WeaponType) mounted.getType()).getRackSize();
             }
+            if (weaponDamage == WeaponType.DAMAGE_ARTILLERY){
+                weaponDamage = 1; //Set it to something
+            }
 
             if (weaponDamage > maxJammedDamage) {
                 maxDamageWeaponID = shooter.getEquipmentNum(mounted);

diff --git a/megamek/src/megamek/client/bot/princess/Princess.java b/megamek/src/megamek/client/bot/princess/Princess.java
@@ -1057,7 +1057,15 @@ protected void calculateTargetingOffBoardTurn() {
 
         FiringPlan firingPlan = getArtilleryTargetingControl().calculateIndirectArtilleryPlan(entityToFire, getGame(), this);
 
-        sendAttackData(entityToFire.getId(), firingPlan.getEntityActionVector());
+        if (!firingPlan.getEntityActionVector().isEmpty()) {
+            sendAttackData(entityToFire.getId(), firingPlan.getEntityActionVector());
+        }
+        else {
+            if (this.fireControls == null) {
+                initializeFireControls();
+            }
+            sendAttackData(entityToFire.getId(), getFireControl(entityToFire).getUnjamWeaponPlan(entityToFire));
+        }
         sendDone(true);
     }