Vanilla rewards will now appear in the spawner as locked, and unlock …

…in spawner when rewarded

Scripts/Loaders.cs

@@ -1005,6 +1005,7 @@ private ItemSpawnerID AddEntryToLegacySpawner(ItemSpawnerEntry entry)
                 IM.CD[itemSpawnerID.Category].Add(itemSpawnerID);
                 IM.SCD[itemSpawnerID.SubCategory].Add(itemSpawnerID);
                 IM.Instance.SpawnerIDDic[itemSpawnerID.MainObject.ItemID] = itemSpawnerID;
+                OtherLoader.SpawnerIDsByMainObject[itemSpawnerID.MainObject.ItemID] = itemSpawnerID;
 
                 return itemSpawnerID;
             }

Scripts/ObjectTemplates/UnlockedItemSaveData.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using UnityEngine;
 
 namespace OtherLoader
 {
@@ -13,7 +14,12 @@ public class UnlockedItemSaveData
         public ItemUnlockMode UnlockMode;
         public List<string> UnlockedItemIDs = new List<string>();
 
-        public UnlockedItemSaveData() { }
+        private RewardSystem rewardSystem = new RewardSystem();
+
+        public UnlockedItemSaveData() 
+        {
+            rewardSystem.InitializeFromSaveFile();
+        }
 
         public UnlockedItemSaveData(ItemUnlockMode unlockMode)
         {
@@ -23,6 +29,8 @@ public UnlockedItemSaveData(ItemUnlockMode unlockMode)
             {
                 AutoUnlockNonRewards = false;
             }
+
+            rewardSystem.InitializeFromSaveFile();
         }
 
         public bool IsItemUnlocked(string itemID)
@@ -43,7 +51,8 @@ public bool UnlockItem(string itemID)
 
         public bool ShouldAutoUnlockItem(ItemSpawnerID spawnerID)
         {
-            return spawnerID.MainObject == null || ShouldAutoUnlockItem(spawnerID.MainObject, spawnerID.IsReward);
+            return spawnerID.MainObject == null || 
+                ShouldAutoUnlockItem(spawnerID.MainObject, spawnerID.IsReward);
         }
 
         public bool ShouldAutoUnlockItem(ItemSpawnerEntry spawnerEntry)
@@ -56,7 +65,7 @@ public bool ShouldAutoUnlockItem(ItemSpawnerEntry spawnerEntry)
 
         public bool ShouldAutoUnlockItem(FVRObject item, bool isReward)
         {
-            if(!IsVanillaUnlocked(item.ItemID) || 
+            if((isReward && !IsVanillaUnlocked(item)) || 
                 (!AutoUnlockNonRewards && 
                 (item.Category == FVRObject.ObjectCategory.Firearm || 
                 item.Category == FVRObject.ObjectCategory.Thrown || 
@@ -68,12 +77,13 @@ public bool ShouldAutoUnlockItem(FVRObject item, bool isReward)
             return true;
         }
 
-        public bool IsVanillaUnlocked(string itemID)
+        public bool IsVanillaUnlocked(FVRObject item)
         {
             ItemSpawnerID spawnerID;
-            IM.Instance.SpawnerIDDic.TryGetValue(itemID, out spawnerID);
+            OtherLoader.SpawnerIDsByMainObject.TryGetValue(item.ItemID, out spawnerID);
 
-            return spawnerID == null || GM.Rewards.RewardUnlocks.IsRewardUnlocked(spawnerID);
+            //We must use our own version of reward system here because the GM does not always perform Awake before the IM
+            return spawnerID == null || rewardSystem.RewardUnlocks.IsRewardUnlocked(spawnerID.ItemID);
         }
     }
 

Scripts/OtherLoader.cs

@@ -33,6 +33,7 @@ public class OtherLoader : StratumPlugin
         public static Dictionary<string, EntryNode> SpawnerEntriesByPath = new Dictionary<string, EntryNode>();
         public static Dictionary<string, ItemSpawnerEntry> SpawnerEntriesByID = new Dictionary<string, ItemSpawnerEntry>();
         public static Dictionary<string, MediaPath> TutorialBlockVideos = new Dictionary<string, MediaPath>();
+        public static Dictionary<string, ItemSpawnerID> SpawnerIDsByMainObject = new Dictionary<string, ItemSpawnerID>();
         public static UnlockedItemSaveData UnlockSaveData;
         public static Sprite LockIcon;
 
@@ -367,13 +368,18 @@ public static bool UnlockInteractedItem(FVRPhysicalObject __instance)
 
 
         [HarmonyPatch(typeof(IM), "RegisterItemIntoMetaTagSystem")]
-        [HarmonyPostfix]
+        [HarmonyPostfix] 
         private static void MetaTagPatch(ItemSpawnerID ID)
         {
             //If this item is not a reward, unlock it by default
-            if(UnlockSaveData.ShouldAutoUnlockItem(ID))
+            if (ID.MainObject != null)
             {
-                UnlockSaveData.UnlockItem(ID.MainObject.ItemID);
+                SpawnerIDsByMainObject[ID.MainObject.ItemID] = ID;
+
+                if (UnlockSaveData.ShouldAutoUnlockItem(ID))
+                {
+                    UnlockSaveData.UnlockItem(ID.MainObject.ItemID);
+                }
             }
 
             //If this IDs items didn't get added, add it to the firearm page

Scripts/Patches/ItemSpawnerPatch.cs

@@ -37,6 +37,25 @@ private static bool StartPatch(ItemSpawnerUI __instance)
             return true;
         }
 
+        [HarmonyPatch(typeof(IM), "GetAvailableCountInSubCategory")]
+        [HarmonyPrefix]
+        private static bool SubCatCountPatch(ItemSpawnerUI __instance, ItemSpawnerID.ESubCategory subcat, ref int __result)
+        {
+            __result = IM.SCD[subcat].Count;
+
+            return false;
+        }
+
+        [HarmonyPatch(typeof(IM), "GetAvailableInSubCategory")]
+        [HarmonyPrefix]
+        private static bool SubCatPatch(ItemSpawnerUI __instance, ItemSpawnerID.ESubCategory subcat, ref List<ItemSpawnerID> __result)
+        {
+            __result = new List<ItemSpawnerID>();
+            __result.AddRange(IM.SCD[subcat]);
+
+            return false;
+        }
+
 
 
         [HarmonyPatch(typeof(ItemSpawnerUI), "SetMode_Home")]

Scripts/Patches/ItemSpawnerV2Patch.cs

@@ -406,10 +406,7 @@ private static bool RedrawDetailsCanvasPatch(ItemSpawnerV2 __instance)
                     }
 
                     ItemSpawnerEntry secondary = OtherLoader.SpawnerEntriesByID[entry.SecondaryObjectIDs[m]];
-                    if(!secondary.IsReward || GM.Rewards.RewardUnlocks.Rewards.Contains(secondary.MainObjectID))
-                    {
-                        secondaryEntries.Add(secondary);
-                    }
+                    secondaryEntries.Add(secondary);
                 }
 
 
@@ -865,7 +862,31 @@ private static void TagNamingPatch(ILContext ctx, MethodBase orig)
             //Now add our new call for setting the text
             c.Emit(OpCodes.Call, ((Action<Text, string, TagType>)CategoricalSetText).Method);
         }
-
+
+
+
+        [HarmonyPatch(typeof(IM), "GenerateItemDBs")]
+        [HarmonyILManipulator]
+        private static void DisableRewardCheckPatch(ILContext ctx, MethodBase orig)
+        {
+            ILCursor c = new ILCursor(ctx);
+
+            c.GotoNext(
+                i => i.MatchLdfld(AccessTools.Field(typeof(ItemSpawnerID), "MainObject"))
+            );
+
+            c.RemoveRange(17);
+
+            c.Emit(OpCodes.Call, ((Action<ItemSpawnerID>)RegisterItemSpawnerID).Method);
+
+            c.GotoNext(
+                i => i.MatchLdstr("SosigEnemyTemplates")
+            );
+
+            c.Emit(OpCodes.Call, ((Action)PopulateSpawnerEntries).Method);
+
+        }
+
 
 
         private static IEnumerator SpawnItems(ItemSpawnerV2 instance, ItemSpawnerEntry entry)
@@ -915,9 +936,15 @@ private static void CategoricalSetText(Text text, string value, TagType tagType)
             text.text = value;
         }
 
+        private static void RegisterItemSpawnerID(ItemSpawnerID spawnerID)
+        {
+            if(spawnerID.MainObject != null)
+            {
+                IM.RegisterItemIntoMetaTagSystem(spawnerID);
+            }
+        }
+
 
-        [HarmonyPatch(typeof(IM), "GenerateItemDBs")]
-        [HarmonyPostfix]
         private static void PopulateSpawnerEntries()
         {
             foreach(KeyValuePair<ItemSpawnerV2.PageMode,List<string>> PageLists in IM.Instance.PageItemLists)