Removed unlockedOptions field from AgentState

planetarium · Mar 4, 2024 · 1437055 · 1437055
1 parent bd80350
commit 1437055
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/Lib9c/Action/AuraSummon.cs b/Lib9c/Action/AuraSummon.cs
@@ -300,7 +300,6 @@ SkillSheet skillSheet
                     var stat = CombinationEquipment5.GetStat(optionRow, random);
                     equipment.StatsMap.AddStatAdditionalValue(stat.StatType, stat.BaseValue);
                     equipment.optionCountFromCombination++;
-                    agentState.unlockedOptions.Add(optionRow.Id);
                 }
                 else
                 {
@@ -309,7 +308,6 @@ SkillSheet skillSheet
 
                     equipment.Skills.Add(skill);
                     equipment.optionCountFromCombination++;
-                    agentState.unlockedOptions.Add(optionRow.Id);
                 }
             }
         }

diff --git a/Lib9c/Action/CombinationEquipment.cs b/Lib9c/Action/CombinationEquipment.cs
@@ -685,7 +685,6 @@ SkillSheet skillSheet
                     equipment.StatsMap.AddStatAdditionalValue(stat.StatType, stat.BaseValue);
                     equipment.Update(equipment.RequiredBlockIndex + optionInfo.RequiredBlockIndex);
                     equipment.optionCountFromCombination++;
-                    agentState.unlockedOptions.Add(optionRow.Id);
                 }
                 else
                 {
@@ -695,7 +694,6 @@ SkillSheet skillSheet
                         equipment.Skills.Add(skill);
                         equipment.Update(equipment.RequiredBlockIndex + optionInfo.RequiredBlockIndex);
                         equipment.optionCountFromCombination++;
-                        agentState.unlockedOptions.Add(optionRow.Id);
                     }
                 }
             }
@@ -746,7 +744,6 @@ SkillSheet skillSheet
                     equipment.Skills.Add(skill);
                     equipment.Update(equipment.RequiredBlockIndex + optionInfo.RequiredBlockIndex);
                     equipment.optionCountFromCombination++;
-                    agentState.unlockedOptions.Add(optionRow.Id);
                 }
             }
         }

diff --git a/Lib9c/Model/State/AgentState.cs b/Lib9c/Model/State/AgentState.cs
@@ -17,7 +17,6 @@ public class AgentState : State, ICloneable
 
         public readonly Dictionary<int, Address> avatarAddresses;
 
-        public HashSet<int> unlockedOptions;
         public int MonsterCollectionRound { get; private set; }
 
         public int Version { get; private set; }
@@ -26,7 +25,6 @@ public AgentState(Address address) : base(address)
         {
             Version = CurrentVersion;
             avatarAddresses = new Dictionary<int, Address>();
-            unlockedOptions = new HashSet<int>();
         }
 
         public AgentState(Dictionary serialized)
@@ -41,9 +39,6 @@ public AgentState(Dictionary serialized)
                     kv => kv.Value.ToAddress()
                 );
 #pragma warning restore LAA1002
-            unlockedOptions = serialized.ContainsKey((IKey)(Text) "unlockedOptions")
-                ? serialized["unlockedOptions"].ToHashSet(StateExtensions.ToInteger)
-                : new HashSet<int>();
             MonsterCollectionRound = serialized.ContainsKey((IKey) (Text) MonsterCollectionRoundKey)
                 ? serialized[MonsterCollectionRoundKey].ToInteger()
                 : 0;
@@ -61,7 +56,6 @@ public AgentState(List serialized)
                     kv => kv.Value.ToAddress()
                 );
 #pragma warning restore LAA1002
-            unlockedOptions = serialized[3].ToHashSet(StateExtensions.ToInteger);
             MonsterCollectionRound = serialized[4].ToInteger();
         }
 
@@ -97,7 +91,7 @@ public override IValue SerializeList()
                             new KeyValuePair<IKey, IValue>(
                                 new Binary(BitConverter.GetBytes(kv.Key)),
                                 kv.Value.Serialize()))),
-                unlockedOptions.Select(i => i.Serialize()).Serialize(),
+                new List(), // A placeholder list for now removed unlockedOptions property.
 #pragma warning restore LAA1002
                 MonsterCollectionRound.Serialize());
         }