advanced stripping remove weapon attachments

Author: ajkroeg

IRTweaks/IRTweaks/IRTweaks.csproj

@@ -26,8 +26,8 @@
     <AssemblyTitle>IRTweaks</AssemblyTitle>
     <Product>IRTweaks</Product>
     <Copyright>Copyright © 2023</Copyright>
-    <AssemblyVersion>2.2.2</AssemblyVersion>
-    <FileVersion>2.2.2</FileVersion>
+    <AssemblyVersion>2.2.3</AssemblyVersion>
+    <FileVersion>2.2.3</FileVersion>
     <LangVersion>11</LangVersion>
   </PropertyGroup>
 
@@ -66,6 +66,10 @@
     <Reference Include="AttackImprovementMod">
       <HintPath>$(DeployedModPath)\..\CustomAmmoCategories\AttackImprovementMod.dll</HintPath>
       <Private>False</Private>
+    </Reference>
+	<Reference Include="CustomComponents">
+      <HintPath>$(DeployedModPath)\..\CustomComponents\CustomComponents.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="CustomAmmoCategories">
       <HintPath>$(DeployedModPath)\..\CustomAmmoCategories\CustomAmmoCategories.dll</HintPath>

IRTweaks/IRTweaks/Modules/UI/MechBayChanges.cs

@@ -1,8 +1,10 @@
 using BattleTech.UI.TMProWrapper;
+using CustomComponents;
 using HBS;
 using Localize;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
@@ -186,7 +188,7 @@ internal static void AdvancedStripping(this MechLabLocationWidget widget, MechLa
             for (int i = loclInv.Count - 1; i >= 0; i--)
             {
                 MechLabItemSlotElement mechLabItemSlotElement = loclInv[i];
-                if (!mechLabItemSlotElement.ComponentRef.IsFixed && (mechLabItemSlotElement.ComponentRef.Def is WeaponDef || mechLabItemSlotElement.ComponentRef.Def is AmmunitionBoxDef))
+                if (!mechLabItemSlotElement.ComponentRef.IsFixed && (mechLabItemSlotElement.ComponentRef.Def is WeaponDef || mechLabItemSlotElement.ComponentRef.Def is AmmunitionBoxDef || mechLabItemSlotElement.componentRef.Def.GetComponents<Category>().Any(c => c.CategoryID == "WeaponAttachment")))
                 {
                     widget.OnRemoveItem(mechLabItemSlotElement, true);
                     panel.ForceItemDrop(mechLabItemSlotElement);