trim conditionals in naming pattern

cadon · Dec 1, 2019 · 9221104 · 9221104
1 parent 8f9b6bb
commit 9221104
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ARKBreedingStats/uiControls/NamePatterns.cs b/ARKBreedingStats/uiControls/NamePatterns.cs
@@ -70,7 +70,7 @@ private static string ResolveConditions(Creature creature, string pattern)
         {
             // a conditional expression looks like {{#if:conditional-keyword|result if true|result if false}}, e.g. {{#if:IsTopHP|{HP}H}}
 
-            Regex r = new Regex(@"\{\{#if:(istop\w+) ?\| ?([^\|]+?)(?: ?\| ?(.+?))?\}\}");
+            Regex r = new Regex(@"\{\{#if: *(istop\w+) *\| *([^\|]+?)(?: *\| *(.+?))? *\}\}");
             return r.Replace(pattern.ToLower(), (m) => ResolveCondition(creature, m));
         }
 
@@ -229,7 +229,7 @@ public static Dictionary<string, string> CreateTokenDictionary(Creature creature
             var levelOrder = new List<Tuple<int, int>>(values.Values.STATS_COUNT);
             for (int si = 0; si < values.Values.STATS_COUNT; si++)
             {
-                if (si != (int)StatNames.Torpidity)
+                if (si != (int)StatNames.Torpidity && creature.Species.UsesStat(si))
                     levelOrder.Add(new Tuple<int, int>(si, creature.levelsWild[si]));
             }
             levelOrder = levelOrder.OrderByDescending(l => l.Item2).ToList();