NotSalvagable fix, coloring fix

BattletechModders · Jul 24, 2018 · 3388dbb · 3388dbb
1 parent fc8240f
commit 3388dbb
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 38 deletions.
diff --git a/source/CCLight/Database.cs b/source/CCLight/Database.cs
@@ -71,23 +71,23 @@ internal static IEnumerable<T> GetCustomComponents<T>(MechComponentDef def)
         internal static T GetCustomComponent<T>(MechComponentRef cref)
         {
 
-            //if (cref.Def == null)
-            //{
-            //    if (cref.DataManager == null)
-            //    {
-            //        if (game.DataManager != null)
-            //        {
-            //            cref.DataManager = game.DataManager;
-            //            cref.RefreshComponentDef();
-            //        }
-            //        else
-            //        {
-            //            Control.Logger.Log("No datamanager found!");
-            //        }
-            //    }
-            //    else
-            //        cref.RefreshComponentDef();
-            //}
+            if (cref.Def == null)
+            {
+                if (cref.DataManager == null)
+                {
+                    if (DataManager != null)
+                    {
+                        cref.DataManager = DataManager;
+                        cref.RefreshComponentDef();
+                    }
+                    else
+                    {
+                        Control.Logger.LogError("No datamanager found!");
+                    }
+                }
+                else
+                    cref.RefreshComponentDef();
+            }
 
             return GetCustomComponent<T>(Key(cref));
 

diff --git a/source/CCLight/Factories/SimpleCustomComponent.cs b/source/CCLight/Factories/SimpleCustomComponent.cs
@@ -14,13 +14,13 @@ public class SimpleCustomComponent : ICustomComponent
         private string id;
 
        [JsonIgnore]
-        public MechComponentDef Def
+        public MechComponentDef Def// { get; internal set; }
         {
             get
             {
                 if (_def == null)
                     return null;
-                if(!_def.IsAlive)
+                if (!_def.IsAlive)
                 {
                     var def = Database.RefreshDef(id, type);
                     if (def == null)
@@ -37,7 +37,7 @@ internal set
                     _def = null;
                     id = "";
                     type = ComponentType.NotSet;
-                } 
+                }
                 else
                 {
                     _def = new WeakReference(value);

diff --git a/source/Control.cs b/source/Control.cs
@@ -48,7 +48,7 @@ public static void Init(string directory, string settingsJSON)
                 Validator.RegisterMechValidator(CategoryController.ValidateMech, CategoryController.ValidateMechCanBeFielded);
 
 
-                Logger.Log("Loaded CustomComponents v0.5.5.4.3");
+                Logger.Log("Loaded CustomComponents v0.6.0.0.4");
                 Logger.Log($"DataManager is null: {Database.DataManager == null}");
 #if CCDEBUG
                 Logger.LogDebug("Loading Categories");

diff --git a/source/Helpers/DefaultHelper.cs b/source/Helpers/DefaultHelper.cs
@@ -61,7 +61,6 @@ public static void AddInventory(string defaultID, MechDef mech, ChassisLocations
         public static MechLabItemSlotElement CreateSlot(string id, ComponentType type, MechLabPanel mechLab)
         {
             var component_ref = new MechComponentRef(id, string.Empty, type, ChassisLocations.None);
-            component_ref.DataManager = mechLab.dataManager;
 
             if (!component_ref.IsDefault())
             {

diff --git a/source/Patches/Contract_AddToFilnaSalvagePatch.cs b/source/Patches/Contract_AddToFilnaSalvagePatch.cs
@@ -13,13 +13,11 @@ public static bool Prefix(SalvageDef def)
             if (def.ComponentType == ComponentType.MechPart)
                 return true;
 
-            if (def.MechComponentDef == null)
-            {
-                Control.Logger.Log($"AddToFinalSalvage: Def is null {def}");
-                return true;
-            }
+            var flags = Database.GetCustomComponent<Flags>(def.Description.Id);
+
+            //Control.Logger.LogDebug($"AddToFinalSalvage: {def.Description.Id}, Salvagable:{flags == null || !flags.NotSalvagable}");
 
-            return !(def.MechComponentDef.Is<Flags>(out var f) && f.NotSalvagable);
+            return flags == null || !flags.NotSalvagable;
         }
     }
 
@@ -28,8 +26,9 @@ internal static class Contract_AddMechComponentToSalvage
     {
         public static bool Prefix(MechComponentDef def)
         {
-            Control.Logger.LogDebug(def.Description.Id);
-            return !(def.Is<Flags>(out var f) && f.NotSalvagable);
+            var flags = def.GetComponent<Flags>();
+            //Control.Logger.LogDebug($"salvage: {def.Description.Id}   Flags null:{flags == null}  Default:{flags!= null && flags.Default}  Salvagabe:{flags != null && flags.NotSalvagable}");
+            return !(flags!= null && flags.NotSalvagable);
         }
     }
 }
diff --git a/source/Patches/ListElementController_SalvageGear_NotListView_RefreshItemColor_Patch.cs b/source/Patches/ListElementController_SalvageGear_NotListView_RefreshItemColor_Patch.cs
@@ -9,11 +9,13 @@ public static class ListElementController_SalvageGear_NotListView_RefreshItemCol
     {
         public static bool Prefix(InventoryItemElement theWidget, ListElementController_SalvageGear_NotListView __instance)
         {
-            if (__instance.salvageDef.MechComponentDef == null)
+            if (__instance.salvageDef.MechComponentDef == null || __instance.salvageDef.Description == null)
                 return true;
             try
             {
-                if (__instance.salvageDef.MechComponentDef.Is<ColorComponent>(out var color))
+                var color = Database.GetCustomComponent<ColorComponent>(__instance.salvageDef.Description.Id);
+
+                if (color != null)
                 {
                     var uicolor = color.UIColor;
                     foreach (UIColorRefTracker uicolorRefTracker in theWidget.iconBGColors)

diff --git a/source/Patches/ListElementController_SalvageGear_RefreshItemColor_Patch.cs b/source/Patches/ListElementController_SalvageGear_RefreshItemColor_Patch.cs
@@ -1,4 +1,5 @@
-using BattleTech.UI;
+using System;
+using BattleTech.UI;
 using Harmony;
 
 namespace CustomComponents
@@ -8,16 +9,60 @@ public static class ListElementController_SalvageGear_RefreshItemColor_Patch
     {
         public static bool Prefix(InventoryItemElement theWidget, ListElementController_SalvageGear __instance)
         {
-            if (__instance.salvageDef.MechComponentDef.Is<ColorComponent>(out var color))
+            if (__instance.salvageDef.MechComponentDef == null || __instance.salvageDef.Description == null)
+                return true;
+            try
             {
-                var uicolor = color.UIColor;
-                foreach (UIColorRefTracker uicolorRefTracker in theWidget.iconBGColors)
+                var color = Database.GetCustomComponent<ColorComponent>(__instance.salvageDef.Description.Id);
+
+                if (color != null)
                 {
-                    uicolorRefTracker.SetUIColor(uicolor);
+                    var uicolor = color.UIColor;
+                    foreach (UIColorRefTracker uicolorRefTracker in theWidget.iconBGColors)
+                    {
+                        uicolorRefTracker.SetUIColor(uicolor);
+                    }
+
+                    return false;
                 }
+            }
+            catch (Exception e)
+            {
+                Control.Logger.LogError("Salvage coloring problem!", e);
+            }
+
+            return true;
+        }
+    }
+
 
-                return false;
+    [HarmonyPatch(typeof(ListElementController_ShopGear), "RefreshItemColor")]
+    public static class ListElementController_ShopGear_RefreshItemColor_Patch
+    {
+        public static bool Prefix(InventoryItemElement theWidget, ListElementController_ShopGear __instance)
+        {
+            if (__instance.componentDef == null )
+                return true;
+            try
+            {
+                var color = Database.GetCustomComponent<ColorComponent>(__instance.componentDef.Description.Id);
+
+                if (color != null)
+                {
+                    var uicolor = color.UIColor;
+                    foreach (UIColorRefTracker uicolorRefTracker in theWidget.iconBGColors)
+                    {
+                        uicolorRefTracker.SetUIColor(uicolor);
+                    }
+
+                    return false;
+                }
             }
+            catch (Exception e)
+            {
+                Control.Logger.LogError("Salvage coloring problem!", e);
+            }
+
             return true;
         }
     }