- Fixes to restrict bulk scrapping to only MechBay

BattletechModders · Nov 22, 2020 · ddaf23f · ddaf23f
1 parent 344150b
commit ddaf23f
Showing 1 changed file with 35 additions and 5 deletions.
diff --git a/IRTweaks/IRTweaks/Modules/UI/BulkScrapping.cs b/IRTweaks/IRTweaks/Modules/UI/BulkScrapping.cs
@@ -119,8 +119,14 @@ static class BulkScrapping_MechBayMechStorageWidget_Filter_WeightAll
     {
         static bool Prepare() => Mod.Config.Fixes.BulkScrapping;
 
-        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory)
+        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory, IMechLabDropTarget ___parentDropTarget)
         {
+            if (___parentDropTarget == null || !(___parentDropTarget is MechBayPanel mechBayPanel))
+            {
+                Mod.Log.Info?.Write("Parent is not MechBay, skipping.");
+                return;
+            }
+
             if (___inventory != null && ___inventory.Count > 0 && 
                 Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt))
             {
@@ -142,8 +148,14 @@ static class BulkScrapping_MechBayMechStorageWidget_Filter_WeightAssault
     {
         static bool Prepare() => Mod.Config.Fixes.BulkScrapping;
 
-        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory)
+        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory, IMechLabDropTarget ___parentDropTarget)
         {
+            if (___parentDropTarget == null || !(___parentDropTarget is MechBayPanel mechBayPanel))
+            {
+                Mod.Log.Info?.Write("Parent is not MechBay, skipping.");
+                return;
+            }
+
             if (___inventory != null && ___inventory.Count > 0 &&
                 Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt))
             {
@@ -166,8 +178,14 @@ static class BulkScrapping_MechBayMechStorageWidget_Filter_WeightHeavy
     {
         static bool Prepare() => Mod.Config.Fixes.BulkScrapping;
 
-        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory)
+        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory, IMechLabDropTarget ___parentDropTarget)
         {
+            if (___parentDropTarget == null || !(___parentDropTarget is MechBayPanel mechBayPanel))
+            {
+                Mod.Log.Info?.Write("Parent is not MechBay, skipping.");
+                return;
+            }
+
             if (___inventory != null && ___inventory.Count > 0 &&
                 Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt))
             {
@@ -190,8 +208,14 @@ static class BulkScrapping_MechBayMechStorageWidget_Filter_WeightLight
     {
         static bool Prepare() => Mod.Config.Fixes.BulkScrapping;
 
-        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory)
+        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory, IMechLabDropTarget ___parentDropTarget)
         {
+            if (___parentDropTarget == null || !(___parentDropTarget is MechBayPanel mechBayPanel))
+            {
+                Mod.Log.Info?.Write("Parent is not MechBay, skipping.");
+                return;
+            }
+
             if (___inventory != null && ___inventory.Count > 0 &&
                 Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt))
             {
@@ -214,8 +238,14 @@ static class BulkScrapping_MechBayMechStorageWidget_Filter_WeightMedium
     {
         static bool Prepare() => Mod.Config.Fixes.BulkScrapping;
 
-        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory)
+        static void Postfix(MechBayMechStorageWidget __instance, List<IMechLabDraggableItem> ___inventory, IMechLabDropTarget ___parentDropTarget)
         {
+            if (___parentDropTarget == null || !(___parentDropTarget is MechBayPanel mechBayPanel))
+            {
+                Mod.Log.Info?.Write("Parent is not MechBay, skipping.");
+                return;
+            }
+
             if (___inventory != null && ___inventory.Count > 0 &&
                 Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt))
             {