MegaMek · WeaverThree · Oct 23, 2024 · Oct 24, 2024 · Oct 24, 2024 · Oct 24, 2024
diff --git a/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties b/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
@@ -115,6 +115,8 @@ allowCanonOnlyBox.text=Only allow canon units for purchase
 allowCanonOnlyBox.toolTipText=Just what it says
 allowCanonRefitOnlyBox.text=Only allow canon variants as refits
 allowCanonRefitOnlyBox.toolTipText=Just what it says
+allowRefitFromPartsBox.text=Allow using your own parts in refit kits
+allowRefitFromPartsBox.toolTipText=By default, refit kits are available as complete units only
 variableTechLevelBox.text=Variable tech level
 variableTechLevelBox.toolTipText=<html>If checked, the tech level for a part or unit will change depending on whether it is in <br>prototype stage (experimental), production (advanced), or common (standard).</html>
 factionIntroDateBox.text=Use faction intro dates

diff --git a/MekHQ/resources/mekhq/resources/ChooseRefitDialog.properties b/MekHQ/resources/mekhq/resources/ChooseRefitDialog.properties
@@ -1,8 +1,29 @@
-btnRefit.text=Acquire and Use Refit Kit
-btnCustomize.text=Customize to Model
+chkHideLeaves.text=Hide Leave-As-Is Steps
+btnGo-Refit.text=Refit
+btnGo-Customize.text=Customize
+btnGo-Omni.text=Reconfigure
+iWantTo.title=I want to...
+noRefitsLbl.text=No refits or customizations are available at this time under this ruleset.
+radRefit.text=Acquire and use a factory refit kit to change unit's model to:
+radCustomize.text=Customize unit to match specifications of model:
+radOmni.text=Reconfigure Omnipods to specification:
 btnClose.text=Cancel
 title.text=Available Refits for
 refitTable.title=Available Refits
-shoppingList.title=Parts Needed
+neededList.title=Parts Needed
+returnsList.title=Parts Returned
+stepsList.title=Refit Steps
 txtOldUnit.title=Current Unit
 txtNewUnit.title=Selected Refit
+tabUnitView.title=Unit Data
+tabItemsView.title=Items Needed/Returned
+stepsTable.title=Refit Steps
+neededTable.title=Parts Needed
+returnsTable.title=Parts to Return to Stock
+tabUnitView.title=Unit Comparison
+tabListView.title=Logistics Information
+totals.title=Refit Totals
+totals-baseTime.text=Total Base Time
+totals-refitClass.text=Overall Refit Class
+totals-multiplier.text=Time Multiplier
+totals-final.text=Final Refit Time
diff --git a/MekHQ/resources/mekhq/resources/Parts.properties b/MekHQ/resources/mekhq/resources/Parts.properties
@@ -22,3 +22,64 @@ PartRepairType.MEK_LOCATION.text=Locations
 PartRepairType.PHYSICAL_WEAPON.text=Physical Weapon
 PartRepairType.POD_SPACE.text=Pod
 PartRepairType.UNKNOWN_LOCATION.text=Error: Unknown Repair Type
+
+# RefitClass Enum
+RefitClass.NO_CHANGE.text=No Change
+RefitClass.CLASS_A.text=Class A (Field)
+RefitClass.CLASS_B.text=Class B (Field)
+RefitClass.CLASS_C.text=Class C (Maintenance)
+RefitClass.CLASS_D.text=Class D (Maintenance)
+RefitClass.CLASS_E.text=Class E (Factory)
+RefitClass.CLASS_F.text=Class F (Factory)
+RefitClass.OMNI_RECONFIG.text=OmniPod Reconfiguration
+RefitClass.PLEASE_REPAIR.text=Please Repair Unit Before Refit
+
+RefitClass.NO_CHANGE.shortText=N/C
+RefitClass.CLASS_A.shortText=A
+RefitClass.CLASS_B.shortText=B
+RefitClass.CLASS_C.shortText=C
+RefitClass.CLASS_D.shortText=D
+RefitClass.CLASS_E.shortText=E
+RefitClass.CLASS_F.shortText=F
+RefitClass.OMNI_RECONFIG.shortText=Omni
+RefitClass.PLEASE_REPAIR.shortText=Repair
+
+# RefitStepType Enum
+RefitStepType.LEAVE.text=Leave As Is
+RefitStepType.REMOVE.text=Remove
+RefitStepType.CHANGE_FACING.text=Change Facing
+RefitStepType.ADD.text=Add
+RefitStepType.MOVE.text=Move
+RefitSTepType.CHANGE.text=Change
+RefitStepType.UNLOAD.text=Unload
+RefitStepType.LOAD.text=Load
+RefitStepType.MOVE_AMMO.text=Move Ammo
+RefitStepType.REMOVE_ARMOR.text=Remove Armor
+RefitStepType.ADD_ARMOR.text=Add Armor
+RefitStepType.CHANGE_ARMOR_TYPE.text=Change Armor Type
+RefitStepType.REMOVE_UNTRACKED_SINKS.text=Remove Untracked Heat Sinks
+RefitStepType.ADD_UNTRACKED_SINKS.text=Add Untracked Heat Sinks
+RefitStepType.CHANGE_UNTRACKED_SINKS.text=Change Untracked Heat Sink Type
+RefitStepType.REMOVE_SCCS_SINKS.text=Remove Heat Sinks
+RefitStepType.ADD_SCCS_SINKS.text=Add Heat Sinks
+RefitStepType.CHANGE_SCCS_SINKS.text=Change Heat Sink Type
+RefitStepType.REMOVE_CASE.text=Remove CASE
+RefitStepType.ADD_CASE.text=Add CASE
+RefitStepType.REMOVE_TURRET.text=Remove Turret
+RefitStepType.ADD_TURRET.text=Add Turret
+RefitStepType.CHANGE_STRUCTURE_TYPE.text=Change Structure/Myomer
+RefitStepType.DETACH_OMNIPOD.text=Detach OmniPod
+RefitStepType.ATTACH_OMNIPOD.text=Attach OmniPod
+RefitStepType.MOVE_OMNIPOD.text=Move OmniPod
+RefitStepType.DETACH_AMMOPOD.text=Detach Ammo OmniPod
+RefitStepType.ATTACH_AMMOPOD.text=Attach Ammo OmniPod
+RefitStepType.MOVE_AMMOPOD.text=Move Ammo OmniPod
+RefitStepType.META.text=Meta Step
+RefitStepType.ERROR.text=Error/Invalid
+
+
+# Refit
+RefitError.BrokenLocation.text=Can't add part to missing or irreprable location that isn't getting replaced.
+
+# RefitSteps
+RefitStepError.OmniFixedRefit.text=Changing a fixed part on an omni unit is a Class F refit.
diff --git a/MekHQ/src/mekhq/campaign/CampaignOptions.java b/MekHQ/src/mekhq/campaign/CampaignOptions.java
@@ -177,6 +177,7 @@ public static String getTransitUnitName(final int unit) {
     private boolean allowISPurchases;
     private boolean allowCanonOnly;
     private boolean allowCanonRefitOnly;
+    private boolean allowRefitFromParts;
     private int techLevel;
     private boolean variableTechLevel;
     private boolean factionIntroDate;
@@ -709,6 +710,7 @@ public CampaignOptions() {
         allowISPurchases = true;
         allowCanonOnly = false;
         allowCanonRefitOnly = false;
+        allowRefitFromParts = false;
         techLevel = TECH_EXPERIMENTAL;
         variableTechLevel = false;
         factionIntroDate = false;
@@ -3824,6 +3826,14 @@ public void setAllowCanonRefitOnly(final boolean allowCanonRefitOnly) {
         this.allowCanonRefitOnly = allowCanonRefitOnly;
     }
 
+    public boolean isAllowRefitFromParts() {
+        return allowRefitFromParts;
+    }
+
+    public void setAllowRefitFromParts(final boolean allowRefitFromParts) {
+        this.allowRefitFromParts = allowRefitFromParts;
+    }
+
     public boolean isVariableTechLevel() {
         return variableTechLevel;
     }
@@ -4729,6 +4739,7 @@ public void writeToXml(final PrintWriter pw, int indent) {
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "allowISPurchases", allowISPurchases);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "allowCanonOnly", allowCanonOnly);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "allowCanonRefitOnly", allowCanonRefitOnly);
+        MHQXMLUtility.writeSimpleXMLTag(pw, indent, "allowRefitFromParts", allowRefitFromParts);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "variableTechLevel", variableTechLevel);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "factionIntroDate", factionIntroDate);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "useAmmoByType", useAmmoByType);
@@ -5409,6 +5420,8 @@ public static CampaignOptions generateCampaignOptionsFromXml(Node wn, Version ve
                     retVal.allowCanonOnly = Boolean.parseBoolean(wn2.getTextContent().trim());
                 } else if (wn2.getNodeName().equalsIgnoreCase("allowCanonRefitOnly")) {
                     retVal.allowCanonRefitOnly = Boolean.parseBoolean(wn2.getTextContent().trim());
+                } else if (wn2.getNodeName().equalsIgnoreCase("allowRefitFromParts")) {
+                    retVal.allowRefitFromParts = Boolean.parseBoolean(wn2.getTextContent().trim());
                 } else if (wn2.getNodeName().equalsIgnoreCase("useAmmoByType")) {
                     retVal.useAmmoByType = Boolean.parseBoolean(wn2.getTextContent().trim());
                 } else if (wn2.getNodeName().equalsIgnoreCase("variableTechLevel")) {

diff --git a/MekHQ/src/mekhq/campaign/parts/AeroLifeSupport.java b/MekHQ/src/mekhq/campaign/parts/AeroLifeSupport.java
@@ -209,7 +209,7 @@ public boolean isForFighter() {
 
     @Override
     public boolean isSamePartType(Part part) {
-        return part instanceof AeroLifeSupport && fighter == ((AeroLifeSupport) part).isForFighter()
+        return part instanceof AeroLifeSupport && (fighter == ((AeroLifeSupport) part).isForFighter())
                 && (getStickerPrice().equals(part.getStickerPrice()));
     }
 

diff --git a/MekHQ/src/mekhq/campaign/parts/Armor.java b/MekHQ/src/mekhq/campaign/parts/Armor.java
@@ -27,6 +27,7 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import megamek.common.Dropship;
 import megamek.common.Entity;
 import megamek.common.EquipmentType;
 import megamek.common.IArmorState;
@@ -408,12 +409,13 @@ public int getBaseTimeFor(Entity entity) {
         if (null != entity) {
             if (entity instanceof Tank) {
                 return 3;
-            }
-            // December 2017 errata, only large craft should return 15m/point.
-            else if (entity.hasETypeFlag(Entity.ETYPE_DROPSHIP) || entity.hasETypeFlag(Entity.ETYPE_JUMPSHIP)) {
+            } else if (entity instanceof Dropship) {
                 return 15;
-            }
+            } else if (entity.isCapitalScale()) {
+                return 120;
+            }   
         }
+        // Meks, protomeks, battle armor, and normal aerospace
         return 5;
     }