Merge pull request MegaMek#1698 from Sleet01/Fix_1696_non_VTL_tech_av…

…ailability_is_broken_or_at_least_unintuitive_MML Fix for Introductory tech level also showing Standard equipment in non-VTL mode.
Sleet01 · Jan 19, 2025 · 4dcf73d · 4dcf73d
2 parents 2fa5233 + a493832
commit 4dcf73d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java b/megameklab/src/megameklab/ui/generalUnit/BasicInfoView.java
@@ -409,7 +409,7 @@ public void setTechBase(boolean clan, boolean mixed) {
     @Override
     public SimpleTechLevel getTechLevel() {
         try {
-            return SimpleTechLevel.valueOf(((String) cbTechLevel.getSelectedItem()).toUpperCase());
+            return SimpleTechLevel.parse((String) cbTechLevel.getSelectedItem());
         } catch (Exception e) {
             return SimpleTechLevel.STANDARD;
         }

diff --git a/megameklab/src/megameklab/ui/util/AbstractEquipmentDatabaseView.java b/megameklab/src/megameklab/ui/util/AbstractEquipmentDatabaseView.java
@@ -555,6 +555,9 @@ private void setupRowFilter() {
             public boolean include(Entry<? extends EquipmentTableModel, ? extends Integer> entry) {
                 EquipmentTableModel equipModel = entry.getModel();
                 EquipmentType etype = equipModel.getType(entry.getIdentifier());
+                // Note: append `&& eSource.getTechManager().getGameYear() >= etype.getProductionDate()`
+                // or `etype.getCommonDate()` in case we wish to change the availability start year from
+                // the prototype/introduction date to something later.
                 return shouldShow(etype);
             }
         };