Merge pull request #4748 from kuronekochomusuke/bvMatchingAlphaStrike…

…Filter correct issue with bv matching alpha strike filter not applying
MegaMek · Sep 8, 2023 · b3bf607 · b3bf607
2 parents 14e1b38 + d93fb02
commit b3bf607
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/megamek/src/megamek/common/util/RandomArmyCreator.java b/megamek/src/megamek/common/util/RandomArmyCreator.java
@@ -252,12 +252,18 @@ public static List<MechSummary> generateArmy(Parameters p, StringBuilder sbMech,
             }
 
             //ignoring infantry, BA and Proto for advancedSearch filter
-            if (((!m.getUnitType().equals(UnitType.getTypeName(UnitType.INFANTRY)))
-                    && (!m.getUnitType().equals(UnitType.getTypeName(UnitType.PROTOMEK)))
-                    && (!m.getUnitType().equals(UnitType.getTypeName(UnitType.BATTLE_ARMOR))))
-                    && (p.advancedSearchFilter != null && !MechSearchFilter.isMatch(m, p.advancedSearchFilter))
-                    && p.asPanel.matches(m))
-            {
+            if (!m.getUnitType().equals(UnitType.getTypeName(UnitType.INFANTRY))
+                    && !m.getUnitType().equals(UnitType.getTypeName(UnitType.PROTOMEK))
+                    && !m.getUnitType().equals(UnitType.getTypeName(UnitType.BATTLE_ARMOR))
+                    && (p.advancedSearchFilter != null && !MechSearchFilter.isMatch(m, p.advancedSearchFilter))) {
+                continue;
+            }
+
+            //ignoring infantry, BA and Proto for AS filter
+            if (!m.getUnitType().equals(UnitType.getTypeName(UnitType.INFANTRY))
+                && !m.getUnitType().equals(UnitType.getTypeName(UnitType.PROTOMEK))
+                && !m.getUnitType().equals(UnitType.getTypeName(UnitType.BATTLE_ARMOR))
+                && !p.asPanel.matches(m)) {
                 continue;
             }