Tag Text, Fixes for customsalvage mod

BattletechModders · May 18, 2019 · 19e3ab4 · 19e3ab4
1 parent 1578190
commit 19e3ab4
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 2 deletions.
diff --git a/source/CCLight/Patches/JSONSerializationUtility_RehydrateObjectFromDictionary_Patch.cs b/source/CCLight/Patches/JSONSerializationUtility_RehydrateObjectFromDictionary_Patch.cs
@@ -3,6 +3,7 @@
 using System.Reflection;
 using BattleTech;
 using Harmony;
+using HBS.Collections;
 using HBS.Extensions;
 using HBS.Util;
 
@@ -51,6 +52,7 @@ public static void Prefix(object target, Dictionary<string, object> values)
                 }
         }
 
+
         public static void Postfix(object target, Dictionary<string, object> values)
         {
             Registry.ProcessCustomFactories(target, values);
@@ -73,7 +75,13 @@ public static void Postfix(object target, Dictionary<string, object> values)
                     var trav = new Traverse(def.Description).Property<string>("Details");
                     trav.Value = def.Description.Details + "\n" + description;
                 }
+
+                TagRestrictionsHandler.Shared.ProcessDescription(def.ComponentTags, def.Description);
             }
+            else if(target is MechDef mdef)
+                TagRestrictionsHandler.Shared.ProcessDescription(mdef.MechTags, mdef.Description);
+            else if (target is ChassisDef cdef)
+                TagRestrictionsHandler.Shared.ProcessDescription(cdef.ChassisTags, cdef.Description);
         }
     }
 }
diff --git a/source/Control.cs b/source/Control.cs
@@ -55,7 +55,7 @@ public static void Init(string directory, string settingsJSON)
                 Registry.RegisterSimpleCustomComponents(Assembly.GetExecutingAssembly());
                 Validator.RegisterMechValidator(CategoryController.Shared.ValidateMech, CategoryController.Shared.ValidateMechCanBeFielded);
 
-                Logger.Log("Loaded CustomComponents v0.9.6.0 for bt 1.5.1");
+                Logger.Log("Loaded CustomComponents v0.9.7.0 for bt 1.5.1");
 
                 Validator.RegisterMechValidator(TagRestrictionsHandler.Shared.ValidateMech, TagRestrictionsHandler.Shared.ValidateMechCanBeFielded);
                 Validator.RegisterDropValidator(pre: TagRestrictionsHandler.Shared.ValidateDrop);

diff --git a/source/CustomComponentSettings.cs b/source/CustomComponentSettings.cs
@@ -123,6 +123,7 @@ public class CustomComponentSettings
         public float SalvageLegWeight = 0.75f;
         public float SalvageTorsoWeight = 1f;
         public float SalvageHeadWeight = 0.5f;
+
 
         public bool RunAutofixer = true;
         public bool FixDeletedComponents = true;
@@ -131,6 +132,7 @@ public class CustomComponentSettings
         public bool TagRestrictionDropValidateRequiredTags = false;
         public bool TagRestrictionDropValidateIncompatibleTags = true;
         public bool CheckCriticalComponent = true;
+        public bool AddTagsToDescription = true;
 
         public bool UseDefaultFixedColor = false;
         public UIColor DefaultFlagBackgroundColor = UIColor.UpgradeColor;
@@ -139,6 +141,7 @@ public class CustomComponentSettings
         public CCColor PreinstalledOverlayCColor = new CCColor() { A = 12, R = 255, B = 180, G = 180 };
         public CCColor DefaultFlagOverlayCColor = new CCColor() { A = 12, R = 180, B = 180, G = 255 };
         public string CategoryDescriptionColor = "#008000";
+        public string ShortTagsColor = "#008000";
 
         [JsonIgnore] public Color PreinstalledOverlayColor;
         [JsonIgnore] public Color DefaultFlagOverlayColor;

diff --git a/source/Salvage/Contract_GenerateSalvage.cs b/source/Salvage/Contract_GenerateSalvage.cs
@@ -10,7 +10,7 @@ namespace CustomComponents
     [HarmonyPatch(typeof(Contract), "GenerateSalvage")]
     public static class Contract_GenerateSalvage
     {
-        private static bool IsDestroyed(MechDef mech)
+        public static bool IsDestroyed(MechDef mech)
         {
             if (mech.IsDestroyed)
                 return true;
@@ -23,6 +23,7 @@ private static bool IsDestroyed(MechDef mech)
         }
 
         [HarmonyPrefix]
+        [HarmonyPriority(Priority.Low)]
         public static bool GenerateSalvage(List<UnitResult> enemyMechs, List<VehicleDef> enemyVehicles,
             List<UnitResult> lostUnits, bool logResults,
             Contract __instance, ref List<SalvageDef> ___finalPotentialSalvage)

diff --git a/source/TagRestrictions/TagRestrictions.cs b/source/TagRestrictions/TagRestrictions.cs
@@ -8,6 +8,10 @@ public class TagRestrictions
         public string[] RequiredAnyTags;
         public string[] IncompatibleTags;
 
+        public string ShortText = null;
+        public string FullText = null;
+
+
         //public class SearchOptions
         //{
         //    public bool IncludeComponentTags = true;

diff --git a/source/TagRestrictions/TagRestrictionsHandler.cs b/source/TagRestrictions/TagRestrictionsHandler.cs
@@ -3,6 +3,8 @@
 using System.Linq;
 using BattleTech;
 using BattleTech.UI;
+using Harmony;
+using HBS.Collections;
 using Localize;
 
 namespace CustomComponents
@@ -317,5 +319,41 @@ private static string NameForTag(string tag)
             return tag;
         }
 
+        public void ProcessDescription(TagSet tags, DescriptionDef description)
+        {
+            string fulltags = "";
+            string shorttags = "";
+
+            foreach (var tag in Restrictions.Values)
+            {
+                if (tags.Contains(tag.Tag))
+                {
+                    if (!string.IsNullOrEmpty(tag.ShortText))
+                        shorttags += tag.ShortText + ", ";
+                    if (!string.IsNullOrEmpty(tag.FullText))
+                        fulltags += "\n" + tag.FullText;
+                }
+            }
+
+            if (shorttags != "" || fulltags != "")
+            {
+                var trav = new Traverse(description).Property<string>("Details");
+
+                if (shorttags != "")
+                {
+                    shorttags = shorttags.Substring(0, shorttags.Length - 2);
+                    shorttags = "\n<b><color=" + Control.Settings.ShortTagsColor + ">[" + shorttags + "]</b></color>";
+                    trav.Value = description.Details + shorttags;
+                    ;
+
+                }
+
+                if (fulltags != "")
+                {
+                    trav.Value = description.Details + fulltags;
+                }
+            }
+
+        }
     }
 }