Fix deck loading bug

finol-digital · Jul 8, 2024 · cc7ff5c · cc7ff5c
1 parent aeb8988
commit cc7ff5c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Assets/Scripts/FinolDigital.Cgs.CardGameDef.Unity/UnityDeck.cs b/Assets/Scripts/FinolDigital.Cgs.CardGameDef.Unity/UnityDeck.cs
@@ -216,14 +216,16 @@ private void LoadTxt(string line)
                     tokens.RemoveAt(0);
                 }
 
-                if (tokens.Count > 0 && tokens[^1].StartsWith("(") &&
-                    tokens[^1].EndsWith(")"))
+                if (tokens.Count > 0 && line.Contains("(") && line.EndsWith(")"))
                 {
-                    var inParens = tokens[^1].Substring(1, tokens[^1].Length - 2);
+                    var indexOfParens = line.LastIndexOf("(", StringComparison.Ordinal);
+                    var inParens = line.Substring(indexOfParens + 1, line.Length - (indexOfParens + 2));
                     if (((UnityCardGame) SourceGame).Sets.ContainsKey(inParens))
                     {
                         cardSet = inParens;
-                        tokens.RemoveAt(tokens.Count - 1);
+                        var cardSetTokenCount = cardSet.Count(f => f == ' ') + 1;
+                        for (var i = 0; i < cardSetTokenCount; i++)
+                            tokens.RemoveAt(tokens.Count - 1);
                     }
                 }