Merge branch 'master' into PR-equipment-clean

# Conflicts: # megamek/src/megamek/common/weapons/ACCaselessHandler.java # megamek/src/megamek/common/weapons/PrimitiveACWeaponHandler.java # megamek/src/megamek/common/weapons/PrototypeACWeaponHandler.java
MegaMek · Sep 22, 2024 · 393ef5b · 393ef5b
2 parents db1a9a3 + e049e37
commit 393ef5b
Show file tree

Hide file tree

Showing 14 changed files with 106 additions and 99 deletions.
diff --git a/megamek/data/images/hexes/saxarba/SMV_Seaport/SeaPort.tileinc b/megamek/data/images/hexes/saxarba/SMV_Seaport/SeaPort.tileinc
diff --git a/megamek/src/megamek/common/util/CityBuilder.java b/megamek/src/megamek/common/util/CityBuilder.java
@@ -51,7 +51,7 @@ public CityBuilder(MapSettings mapSettings, Board board) {
     /**
      * This function will generate a city with a grid lay out. 4 rounds running
      * North and South and 4 roads running east west
-     * 
+     *
      * @author Torren (Jason Tighe)
      * @return
      */
@@ -383,7 +383,7 @@ private void connectHexes(Coords src, Coords dest, int roadStyle) {
 
     /**
      * Build a bridge across an obstacle
-     * 
+     *
      * @todo: use a bridge not a road when bridges are working
      * @param start
      * @param direction
@@ -436,6 +436,11 @@ private void connectHexes(Coords src, Coords dest, int roadStyle) {
                     + Compute.randomInt(1 + mapSettings.getCityMaxCF()
                             - mapSettings.getCityMinCF());
 
+            if (cf == 0) {
+                // some city settings can lead to 0 CF bridges; use a default CF in this case
+                cf = 40;
+            }
+
             for (Enumeration<Coords> e = hexes.elements(); e.hasMoreElements();) {
                 Coords c = e.nextElement();
                 addBridge(board.getHex(c), exits, elev1, cf);
@@ -484,7 +489,7 @@ private void buildStraightRoad(Coords start, int direction, int roadStyle) {
 
     /**
      * Utility function for setting building type from CF table
-     * 
+     *
      * @param cf
      * @return building type
      */

diff --git a/megamek/src/megamek/common/weapons/AmmoWeaponHandler.java b/megamek/src/megamek/common/weapons/AmmoWeaponHandler.java
@@ -110,8 +110,8 @@ protected boolean doAmmoFeedProblemCheck(Vector<Report> vPhaseReport) {
         // don't have neg ammo feed problem quirk
         if (!weapon.hasQuirk(OptionsConstants.QUIRK_WEAP_NEG_AMMO_FEED_PROBLEMS)) {
             return false;
+        } else if ((roll.getIntValue() <= 2) && !ae.isConventionalInfantry()) {
             // attack roll was a 2, may explode
-        } else if (roll.getIntValue() <= 2) {
             Roll diceRoll = Compute.rollD6(2);
 
             Report r = new Report(3173);
@@ -140,8 +140,8 @@ protected boolean doAmmoFeedProblemCheck(Vector<Report> vPhaseReport) {
                 vPhaseReport.addElement(r);
                 return false;
             }
-            // attack roll was not 2, won't explode
         } else {
+            // attack roll was not 2, won't explode
             return false;
         }
 

diff --git a/megamek/src/megamek/common/weapons/HVACWeaponHandler.java b/megamek/src/megamek/common/weapons/HVACWeaponHandler.java
@@ -75,7 +75,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
             return true;
         }
 
-        if (roll.getIntValue() == 2) {
+        if ((roll.getIntValue() == 2) && !ae.isConventionalInfantry()) {
             Report r = new Report(3162);
             r.subject = subjectId;
             weapon.setJammed(true);

diff --git a/megamek/src/megamek/common/weapons/PrimitiveACWeaponHandler.java b/megamek/src/megamek/common/weapons/PrimitiveACWeaponHandler.java
@@ -45,7 +45,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
             return true;
         }
 
-        if (roll.getIntValue() == 2) {
+        if ((roll.getIntValue() == 2) && !ae.isConventionalInfantry()) {
             Report r = new Report(3161);
             r.subject = subjectId;
             r.newlines = 0;

diff --git a/megamek/src/megamek/common/weapons/PrototypeACWeaponHandler.java b/megamek/src/megamek/common/weapons/PrototypeACWeaponHandler.java
@@ -45,7 +45,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
             return true;
         }
 
-        if (roll.getIntValue() == 2) {
+        if ((roll.getIntValue() == 2) && !ae.isConventionalInfantry()) {
             Report r = new Report(3165);
             r.subject = subjectId;
             weapon.setJammed(true);

diff --git a/megamek/src/megamek/common/weapons/PrototypeCLUltraWeaponHandler.java b/megamek/src/megamek/common/weapons/PrototypeCLUltraWeaponHandler.java
@@ -46,6 +46,8 @@ public PrototypeCLUltraWeaponHandler(ToHitData t, WeaponAttackAction w, Game g,
     protected boolean doChecks(Vector<Report> vPhaseReport) {
         if (doAmmoFeedProblemCheck(vPhaseReport)) {
             return true;
+        } else if (ae.isConventionalInfantry()) {
+            return false;
         }
 
         if ((roll.getIntValue() <= 3) && (howManyShots == 2)) {

diff --git a/megamek/src/megamek/common/weapons/PrototypeGaussHandler.java b/megamek/src/megamek/common/weapons/PrototypeGaussHandler.java
@@ -53,8 +53,8 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
         if (doAmmoFeedProblemCheck(vPhaseReport)) {
             return true;
         }
-        
-        if (roll.getIntValue() == 2) {
+
+        if ((roll.getIntValue() == 2) && !ae.isConventionalInfantry()) {
             Report r = new Report(3165);
             r.subject = subjectId;
             weapon.setJammed(true);

diff --git a/megamek/src/megamek/common/weapons/PrototypeISUltraWeaponHandler.java b/megamek/src/megamek/common/weapons/PrototypeISUltraWeaponHandler.java
@@ -47,6 +47,8 @@ public PrototypeISUltraWeaponHandler(ToHitData t, WeaponAttackAction w, Game g,
     protected boolean doChecks(Vector<Report> vPhaseReport) {
         if (doAmmoFeedProblemCheck(vPhaseReport)) {
             return true;
+        } else if (ae.isConventionalInfantry()) {
+            return false;
         }
 
         if (((roll.getIntValue() <= 4) && (howManyShots == 2))

diff --git a/megamek/src/megamek/common/weapons/PrototypeLBXHandler.java b/megamek/src/megamek/common/weapons/PrototypeLBXHandler.java
@@ -84,7 +84,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
             return true;
         }
 
-        if (roll.getIntValue() == 2) {
+        if ((roll.getIntValue() == 2) && !ae.isConventionalInfantry()) {
             Report r = new Report(3165);
             r.subject = subjectId;
             weapon.setJammed(true);

diff --git a/megamek/src/megamek/common/weapons/RACHandler.java b/megamek/src/megamek/common/weapons/RACHandler.java
@@ -49,9 +49,7 @@ public RACHandler(ToHitData t, WeaponAttackAction w, Game g, TWGameManager m) {
     protected boolean doChecks(Vector<Report> vPhaseReport) {
         if (doAmmoFeedProblemCheck(vPhaseReport)) {
             return true;
-        }
-
-        if (ae instanceof Infantry) {
+        } else if (ae.isConventionalInfantry()) {
             return false;
         }
         boolean jams = false;

diff --git a/megamek/src/megamek/common/weapons/RapidfireACWeaponHandler.java b/megamek/src/megamek/common/weapons/RapidfireACWeaponHandler.java
@@ -52,7 +52,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
         if (kindRapidFire) {
             jamLevel = 2;
         }
-        if ((roll.getIntValue() <= jamLevel) && (howManyShots == 2) && !(ae instanceof Infantry)) {
+        if ((roll.getIntValue() <= jamLevel) && (howManyShots == 2) && !ae.isConventionalInfantry()) {
             if (roll.getIntValue() > 2 || kindRapidFire) {
                 Report r = new Report(3161);
                 r.subject = subjectId;

diff --git a/megamek/src/megamek/common/weapons/RapidfireHVACWeaponHandler.java b/megamek/src/megamek/common/weapons/RapidfireHVACWeaponHandler.java
@@ -77,7 +77,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
             return true;
         }
 
-        if (roll.getIntValue() == 2) {
+        if ((roll.getIntValue() == 2) && !ae.isConventionalInfantry()) {
             Report r = new Report(3162);
             r.subject = subjectId;
             weapon.setJammed(true);

diff --git a/megamek/src/megamek/common/weapons/UltraWeaponHandler.java b/megamek/src/megamek/common/weapons/UltraWeaponHandler.java
@@ -137,7 +137,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
             return true;
         }
 
-        if ((roll.getIntValue() == 2) && (howManyShots == 2) && !(ae instanceof Infantry)) {
+        if ((roll.getIntValue() == 2) && (howManyShots == 2) && !ae.isConventionalInfantry()) {
             Report r = new Report();
             r.subject = subjectId;
             weapon.setJammed(true);