Character factories follow mod reloads

src/Factories/ActionCharacterFactory.cs

@@ -56,12 +56,13 @@ namespace Cthangover.Core.Factories.Impls
         /// </summary>
         private Dictionary<string, ActionCharacterInfo> EnsureInfos()
         {
-            if (_allInfos != null)
+            // The resolver's dictionary identity is the data snapshot (see CharacterFactory.EnsureInfos).
-                return _allInfos;
-
             var infos = Entities.Collect<ActionCharacterInfo>();
-            if (ModManager.Instance.IsInitialized)
+            if (!ReferenceEquals(infos, _allInfos))
+            {
                 _allInfos = infos;
+                _cache.Clear();
+            }
             return infos;
         }
 

src/Factories/CharacterFactory.cs

@@ -64,16 +64,17 @@ namespace Cthangover.Core.Factories.Impls
         /// </summary>
         private Dictionary<string, CharacterInfo> EnsureInfos()
         {
-            if (_allInfos != null)
+            // Entities.Collect is cached by the entity resolver until the next
-                return _allInfos;
+            // mod reload, so its dictionary identity is the data snapshot: a new
-
+            // one (reload, data edit, game switch with this mod kept) drops the
-            GameLogger.Log("FACTORY", $"CharacterFactory.EnsureInfos: START, ModRegistry.IsInitialized={ModRegistry.Instance.IsInitialized}, mods count={ModRegistry.Instance.Mods?.Count ?? 0}", LogLevel.Debug);
+            // built templates instead of serving the previous mod set's data.
-
             var infos = Entities.Collect<CharacterInfo>();
-            if (ModManager.Instance.IsInitialized)
+            if (ReferenceEquals(infos, _allInfos))
-                _allInfos = infos;
+                return infos;
 
-            GameLogger.Log("FACTORY", $"CharacterFactory.EnsureInfos: END, loaded {infos?.Count ?? 0} infos", LogLevel.Debug);
+            _allInfos = infos;
+            _cache.Clear();
+            GameLogger.Log("FACTORY", $"CharacterFactory.EnsureInfos: {infos?.Count ?? 0} infos (new data snapshot)", LogLevel.Debug);
             return infos;
         }