Optimize loot function

Author: dragitz

Patches/LootItems.cs

@@ -90,30 +90,16 @@ static bool FillLootDropListPatch(ArrayList _arrayList, int _playerCount, FTK_en
                 Debug.Log("##### init");
                 FTK_itembase item2_stats = FTK_itemsDB.GetDB()?.GetEntry(item2);
 
-                while (
-                    entry == null ||
-                    entry.m_MaxLevel > ((int)GameFlow.Instance.AveragePlayerLevel) ||
-                    entry._goldValue > 20 * Math.Max((int)GameFlow.Instance.AveragePlayerLevel, 1) ||   // 90, 40, 20 -> bug fix + max level-> 20
-                    FOUND_ITEMS.Contains(item_id)
-                    )
-                {
-                    item_id = (FTK_itembase.ID)values.GetValue(rand.Next(values.Length));
-                    entry = FTK_itemsDB.GetDB()?.GetEntry(item_id);
-                }
-                FOUND_ITEMS.Add(item_id);
-
-                Debug.Log("##### random done");
-                Debug.Log("valid item id:: " + item2.ToString());
                 if (
                     item2_stats == null ||
-                    //entry.m_MinLevel <= ((int)GameFlow.Instance.AveragePlayerLevel) || // game might become too easy and not fun on the long run
-
                     item2_stats.m_ItemRarity == FTK_itemRarityLevel.ID.quest ||
                     item2_stats.m_ItemRarity == FTK_itemRarityLevel.ID.lore ||
                     item2_stats.m_ItemRarity == FTK_itemRarityLevel.ID.artifact)
                 {
-                    Debug.Log("##### item normal mod");
+                    Debug.Log("##### item normal mod"); // If you see this in console, it means the item did not get replaced
                     _arrayList.Add(item2.ToString());
+                    
+                    FOUND_ITEMS.Add(item2); // ensure we can not find unmodded items
                 }
                 else
                 {
@@ -134,8 +120,12 @@ static bool FillLootDropListPatch(ArrayList _arrayList, int _playerCount, FTK_en
 
                             // FTK_itembase.ID.reapersplume still goes through
                             !entry.m_Dropable ||
-                            entry.m_FilterDebug
+                            entry.m_FilterDebug ||
                             // now it seems to be properly fixed
+                            
+                            entry.m_MaxLevel > Math.Max((int)GameFlow.Instance.AveragePlayerLevel, 1) ||
+                            entry._goldValue > 20 * Math.Max((int)GameFlow.Instance.AveragePlayerLevel, 1) ||
+                            FOUND_ITEMS.Contains(item_id) // The same drop should not happen twice
                             )
                         {
                             item_id = (FTK_itembase.ID)values.GetValue(rand.Next(values.Length));
@@ -146,10 +136,13 @@ static bool FillLootDropListPatch(ArrayList _arrayList, int _playerCount, FTK_en
 
 
                         if (entry._goldValue > 1)
+                        {
+                            FOUND_ITEMS.Add(item_id);
                             break;
+                        }
                     }
                     Debug.Log("##### item super mod");
-                    Debug.Log("new item id: " + item_id.ToString());
+                    Debug.Log("new item id: " + item_id.ToString()); // item got replaced
                     _arrayList.Add(item_id.ToString());
                 }
 

Patches/RandomizeAllItemStats.cs

@@ -47,6 +47,7 @@ static bool Prefix(FTK_weaponStats2DB __instance, ref FTK_weaponStats2 __result,
                     // Weighted random selection
                     // but for now I'm going to use a simple random
 
+                    // Randomze the rolls too lol
                     if(__result.m_IsWeapon)
                         __result._slots = rand.Next(1, 5);
 

Patches/RandomizeDItemEffects.cs

@@ -12,21 +12,14 @@ namespace FTKRandomizer.Patches
     class RandomizeDItemEffects
     {
 
-        // TODO: ensure mobs do not get randomized too? perhaps it's a feature
-        // TODO: prevent bad skills from being selected (debug, wip, remove immunities from mobs, kraken attack, ecc..) ..how?
-        //              ^-- we swap a skill with another of the same
-        //              ProficiencyBase.Category
-        //              The idea is that it should naturally eliminate the ones that don't make sense
-        //
-        //              Or we swap it with same weapon skills (if bow, then I can use any skill dedicated to bows)
-
         // WeaponID:ProficiencyID
         public static Dictionary<FTK_proficiencyTable.ID, FTK_proficiencyTable.ID> ProfDB = new Dictionary<FTK_proficiencyTable.ID, FTK_proficiencyTable.ID>();
         public static List<FTK_proficiencyTable.ID> UsedProf = new List<FTK_proficiencyTable.ID>();
 
 
         static bool Prefix(Weapon __instance, ref List<FTK_proficiencyTable.ID> __result)
         {
+            // Default behavior when gamelogic does not exist
             List<FTK_proficiencyTable.ID> list = new List<FTK_proficiencyTable.ID>();
             if (GameLogic.Instance == null)
             {
@@ -41,11 +34,11 @@ static bool Prefix(Weapon __instance, ref List<FTK_proficiencyTable.ID> __result
                 return false;
             }
 
+            // Some mobs will have randomized skills too, you may even get a bat that protects itself, good luck!
+
             int MapSeed = GameLogic.Instance.m_MapGenRandomSeed;
             int SEED = MapSeed;
 
-
-
             if (__instance.m_ProficiencyEffects != null)
             {
                 foreach (ProficiencyID key in __instance.m_ProficiencyEffects.Keys)
@@ -57,9 +50,23 @@ static bool Prefix(Weapon __instance, ref List<FTK_proficiencyTable.ID> __result
                 SEED += (int)__instance.m_WeaponType;
                 SEED += (int)__instance.m_WeaponSubType;
                 SEED += (int)__instance.m_WeaponMaterial;
+                
+                
+                /*
+                Since I haven't found a way to get the specific item id of the weapon,
+
+                I'm storing the original proficiency id and its replacement into a dictionary
+                
+                I need to keep things as simple as possible, because of sync
+
+                Eg. this one can not be used:
+                    SEED += ProfDB.Count;
+                
+                even a simple delay caused by lag, will make things out of sync ! Meaning players may see different proficiencies (weapon skills)
+                Which is fun, but when you want to share your weapon with a friend, if not in sync, they will see other stats, rendering the trade (potentially) useless
+                */
 
 
-                //SEED += ProfDB.Count;
                 System.Random rand = new System.Random(SEED);
 
 
@@ -80,7 +87,7 @@ static bool Prefix(Weapon __instance, ref List<FTK_proficiencyTable.ID> __result
                             var uno = FTK_proficiencyTableDB.Get(assign);
 
 
-                            // Assuming FTK_proficiencyTable has a default constructor
+                            // Assuming FTK_proficiencyTable has a default constructor (spoiler, it does)
                             var instance = new FTK_proficiencyTable();
                             var method = instance.GetType().GetMethod("GetCategoryDescription", BindingFlags.NonPublic | BindingFlags.Instance);
                             string result = (string)method.Invoke(instance, null);

Plugin.cs

@@ -36,7 +36,7 @@ void Awake()
             harmony.PatchAll(typeof(RandomizeDShopItems));
             harmony.PatchAll(typeof(RandomizeDInitialStats));
             harmony.PatchAll(typeof(RandomizeAllItemStats));
-            harmony.PatchAll(typeof(TownEE));
+            //harmony.PatchAll(typeof(TownEE));
 
             harmony.PatchAll(typeof(LootItems));
             harmony.PatchAll(typeof(RandomizeDItemEffects));