Parser: Fixed an issue where Ensemble cleanup could randomly cause a …

…concurrency exception when debugging

Parser: Fixed an issue where Ensemble-Sourced items were receiving a 'races' field instead of the 'r' field for the whole Faction (this is likely the cause of why many TWW pre-patch 'Recruit' items were not being properly flagged as collected in Unique mode from their matching Faction-restricted BFA Ensemble shared appearances) (fixes #1717)

.contrib/Source Code/Parser/Export/Export (Compressed Lua).cs

@@ -22,6 +22,7 @@ partial class Export
             new [] { @";[\s]*", @";" },
             new [] { @",[\s]*", @"," },
             new [] { @"[\s]+=[\s]+", @"=" },
+            new [] { @"[\s]+==[\s]+", @"==" },
             new [] { @"[\s]+>=[\s]+", @">=" },
             new [] { @"[\s]+<=[\s]+", @"<=" },
             new [] { @"[\s]+>[\s]+", @">" },

.contrib/Source Code/Parser/Framework/Framework.Processing.cs

@@ -2,6 +2,7 @@
 using ATT.DB.Types;
 using ATT.FieldTypes;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using static ATT.Export;
@@ -576,7 +577,7 @@ private static bool Process(IDictionary<string, object> data)
 
         private static void CaptureDebugDBData(IDictionary<string, object> data)
         {
-            foreach (KeyValuePair<string, SortedDictionary<decimal, IDictionary<string, object>>> dbKeyDatas in DebugDBs)
+            foreach (KeyValuePair<string, ConcurrentDictionary<decimal, IDictionary<string, object>>> dbKeyDatas in DebugDBs)
             {
                 if (data.TryGetValue(dbKeyDatas.Key, out decimal keyValue) || dbKeyDatas.Key == "questID" && (
                     data.TryGetValue("questIDA", out keyValue) || data.TryGetValue("questIDA", out keyValue)) && keyValue > 0)
@@ -830,6 +831,7 @@ private static void DoConditionalDataMerging(IDictionary<string, object> data)
 
             // ensure the FilterID for this data is double-checked after merging in the shared data
             Objects.AssignFilterID(data);
+            Objects.AssignFactionID(data);
 
             // Currently, this merges in data from actual Recipes to other non-Recipe Items which are linked to the same SpellID
             // i.e. /att i:200037 causing them to magically become Recipes!

.contrib/Source Code/Parser/Framework/Framework.cs

@@ -1,6 +1,7 @@
 using ATT.DB;
 using ATT.FieldTypes;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -488,8 +489,8 @@ public static ParseStage CurrentParseStage
         /// A Dictionary of key-ID types and the respective objects which contain the specified key which will be captured and output during Debug runs</para>
         /// NOTE: Each key name/value may contain multiple sets of data due to duplication of individual listings
         /// </summary>
-        public static Dictionary<string, SortedDictionary<decimal, IDictionary<string, object>>> DebugDBs { get; }
-                = new Dictionary<string, SortedDictionary<decimal, IDictionary<string, object>>>();
+        public static ConcurrentDictionary<string, ConcurrentDictionary<decimal, IDictionary<string, object>>> DebugDBs { get; }
+                = new ConcurrentDictionary<string, ConcurrentDictionary<decimal, IDictionary<string, object>>>();
 
         /// <summary>
         /// A collection of named format strings for logging messages
@@ -653,7 +654,7 @@ public static void ApplyConfigSettings()
             {
                 foreach (string key in configDebugDBs)
                 {
-                    DebugDBs[key] = new SortedDictionary<decimal, IDictionary<string, object>>();
+                    DebugDBs[key] = new ConcurrentDictionary<decimal, IDictionary<string, object>>();
                 }
             }
             ImportConfiguredObjectTypes(Config["ObjectTypes"]);
@@ -1700,9 +1701,10 @@ public static void Export()
                         // Export custom Debug DB data to the Debugging folder. (as JSON for simplicity)
                         var culture = Thread.CurrentThread.CurrentCulture;
                         Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
-                        foreach (KeyValuePair<string, SortedDictionary<decimal, IDictionary<string, object>>> dbKeyDatas in DebugDBs)
+                        foreach (KeyValuePair<string, ConcurrentDictionary<decimal, IDictionary<string, object>>> dbKeyDatas in DebugDBs)
                         {
-                            File.WriteAllText(Path.Combine(debugFolder.FullName, dbKeyDatas.Key + "_DebugDB.json"), ToJSON(dbKeyDatas.Value), Encoding.UTF8);
+                            File.WriteAllText(Path.Combine(debugFolder.FullName, dbKeyDatas.Key + "_DebugDB.json"),
+                                ToJSON(new SortedDictionary<decimal, IDictionary<string, object>>(dbKeyDatas.Value)), Encoding.UTF8);
                         }
                         Thread.CurrentThread.CurrentCulture = culture;