Fix for weapon priority not working for units that can snipe (FAForev…

…er#4379)
ANIALLATOR114 · Nov 9, 2022 · 109c66e · 109c66e
1 parent dc68c4b
commit 109c66e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lua/WeaponPriorities.lua b/lua/WeaponPriorities.lua
@@ -31,7 +31,7 @@ function ParseTableOfCategories(inputString)
             full = { }
             for k, category in categories do
                 if not (category == '') then
-                    local parsed = cachedTablePriorities[category] or ParseEntityCategory(category)
+                    local parsed = cachedTablePriorities[category] or ParseEntityCategoryProperly(category)
                     cachedTablePriorities[category] = parsed
                     if parsed then
                         table.insert(full, parsed)

diff --git a/lua/sim/CategoryUtils.lua b/lua/sim/CategoryUtils.lua
@@ -50,6 +50,12 @@ function ParseEntityCategoryProperly(categoryExpression)
             currentIdentifier = currentIdentifier .. c
         end
     end)
+
+    -- gsub tokenizer stops before end of string character, without a chance to add the last currentidentifier as a token. So need to check once at the end if there is a remaining identifier.
+    if currentIdentifier ~= "" then
+        table.insert(tokens, currentIdentifier)
+    end
+
 
     local numTokens = table.getn(tokens)