Merge pull request #4762 from Sleet01/fix_1152_RFE_add_ada_air_defens…

…e_arrow_IV_munition Welp, off we go. Fix #1552
MegaMek · Sep 16, 2023 · 99ac2dd · 99ac2dd
2 parents 7c1f8bf + edc52fb
commit 99ac2dd
Show file tree

Hide file tree

Showing 81 changed files with 2,359 additions and 1,989 deletions.
diff --git a/megamek/data/mechfiles/infantry/Field Gunners/Clan Field Artillery (ArrowIV).blk b/megamek/data/mechfiles/infantry/Field Gunners/Clan Field Artillery (ArrowIV).blk
@@ -27,8 +27,6 @@ Auto Rifle
 <Field Guns Equipment>
 CLArrowIV
 CLArrowIV Ammo
-CLArrowIV
-CLArrowIV Ammo
 </Field Guns Equipment>
 <type>
 Clan Level 3
@@ -46,4 +44,4 @@ Intro date is based on when the weapon becomes an Advanced weapon. Since MM can'
 
 <armorKit>
 GenericKit
-</armorKit>
+</armorKit>
diff --git a/megamek/i18n/megamek/client/messages.properties b/megamek/i18n/megamek/client/messages.properties
@@ -3924,6 +3924,7 @@ WeaponAttackAction.LegBlockedByTerrain=Nearby terrain blocks leg weapons.
 WeaponAttackAction.MinimumAlt1=attacker must be at least at elevation 1
 WeaponAttackAction.NoAeroDirectArty=Airborne aerospace units cannot make direct-fire artillery attacks.
 WeaponAttackAction.FlakOnGroundedAero=Grounded aerospace/vtol units are not valid Flak targets.
+WeaponAttackAction.ADARangeBracket=ADA range brackets (+0/+2/+4)
 WeaponAttackAction.NoAttacker=Invalid Attacker!
 WeaponAttackAction.NoBombInMechMode=Cannot launch bomb in mech mode.
 WeaponAttackAction.NoFiringSolution=no firing solution to target.

diff --git a/megamek/mmconf/serialkiller.xml b/megamek/mmconf/serialkiller.xml
@@ -10,6 +10,7 @@
         <regexps>
             <regexp>\[C$</regexp>
             <regexp>\[I$</regexp>
+            <regexp>\[Ljava\.lang.Enum;$</regexp>
             <regexp>java\.io\.File$</regexp>
             <regexp>java\.lang\.Boolean$</regexp>
             <regexp>java\.lang\.Enum$</regexp>
@@ -31,6 +32,7 @@
             <regexp>java\.util\.concurrent\.locks\.ReentrantLock\$Sync$</regexp>
             <regexp>java\.util\.UUID$</regexp>
             <regexp>java\.util\.EnumMap$</regexp>
+            <regexp>java\.util\.EnumSet.*</regexp>
             <regexp>java\.util\.HashMap$</regexp>
             <regexp>java\.util\.HashSet$</regexp>
             <regexp>java\.util\.Hashtable$</regexp>

diff --git a/megamek/src/megamek/client/bot/BotClient.java b/megamek/src/megamek/client/bot/BotClient.java
@@ -676,10 +676,10 @@ protected List<Coords> getStartingCoordsArray(Entity deployed_ent) {
             if (atype.getAmmoType() == AmmoType.T_ATM) {
                 weapon_count++;
                 av_range += 15.0;
-                if (atype.getMunitionType() == AmmoType.M_HIGH_EXPLOSIVE) {
+                if (atype.getMunitionType().contains(AmmoType.Munitions.M_HIGH_EXPLOSIVE)) {
                     av_range -= 6;
                 }
-                if (atype.getMunitionType() == AmmoType.M_EXTENDED_RANGE) {
+                if (atype.getMunitionType().contains(AmmoType.Munitions.M_EXTENDED_RANGE)) {
                     av_range += 12.0;
                 }
             } else if (atype.getAmmoType() == AmmoType.T_MML) {