Merge pull request #4182 from SJuliez/AS_Errata_Fixes

AS conversion fixes & errata
MegaMek · Feb 17, 2023 · 7531016 · 7531016
2 parents b4b2ec6 + 225e843
commit 7531016
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASDamageConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASDamageConverter.java
@@ -980,7 +980,9 @@ protected int weaponHeat(Mounted weapon, boolean onlyRear, boolean onlyLongRange
     }
 
     private static int getJumpHeat(Entity entity, AlphaStrikeElement element) {
-        if ((entity.getJumpType() == Mech.JUMP_IMPROVED)
+        if (entity.getJumpType() == Mech.JUMP_PROTOTYPE_IMPROVED) {
+            return Math.max(3, element.getJumpMove());
+        } else if ((entity.getJumpType() == Mech.JUMP_IMPROVED)
                 && (entity.getEngine().getEngineType() == Engine.XXL_ENGINE)) {
             return Math.max(3, element.getJumpMove() / 2);
         } else if (entity.getJumpType() == Mech.JUMP_IMPROVED) {

diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASMekSpecialAbilityConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASMekSpecialAbilityConverter.java
@@ -104,6 +104,10 @@ protected void processUnitFeatures() {
         if (element.isBattleMek()) {
             assign("BattleMek", SOA);
         }
+
+        if (entity.getWeight() > 100) {
+            assign("Superheavy Mek", LG);
+        }
     }
 
     @Override

diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASPointValueConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASPointValueConverter.java
@@ -173,6 +173,7 @@ protected void processOffensiveSUAMods() {
         processOffensiveBT();
         processOffensiveSUAMod(IATM, e -> (double) ((ASDamageVector) element.getSUA(IATM)).L.damage);
         processOffensiveSUAMod(OVL, e -> 0.25 * element.getOV());
+        processOffensiveSUAMod(BOMB, e -> (double) (int) element.getSUA(BOMB));
         processOffensiveSUAMod(HT, e -> {
             ASDamageVector ht = element.getHT();
             return Math.max(ht.S.damage, Math.max(ht.M.damage, ht.L.damage)) + ((ht.M.damage > 0) ? 0.5 : 0);