Loosened parser restrictions for Agent. Fixes #687

jrossignol · Jul 3, 2020 · a7cd1b2 · a7cd1b2
1 parent 37f5b0a
commit a7cd1b2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,5 @@
-Contract Configurator 1.29.0
-- Support for KSP 1.9
+Contract Configurator 1.28.2
+- Allowed a wider range of Agent names to be parsed by the AgentParser (thanks Morphisor244).
 - Add ModuleManager patch to fix old Agent definitions with a missing title (thanks Tonka Crash).
 
 Contract Configurator 1.28.1

diff --git a/GameData/ContractConfigurator/CC_RemoteTech.dll b/GameData/ContractConfigurator/CC_RemoteTech.dll
diff --git a/GameData/ContractConfigurator/ContractConfigurator.dll b/GameData/ContractConfigurator/ContractConfigurator.dll
diff --git a/GameData/ContractConfigurator/KerKonConConExt.dll b/GameData/ContractConfigurator/KerKonConConExt.dll
diff --git a/source/ContractConfigurator/ExpressionParser/Parsers/Classes/AgentParser.cs b/source/ContractConfigurator/ExpressionParser/Parsers/Classes/AgentParser.cs
@@ -45,7 +45,7 @@ public override U ConvertType<U>(Agent value)
         public override Agent ParseIdentifier(Token token)
         {
             // Try to parse more, as Agent names can have spaces
-            Match m = Regex.Match(expression, @"^((?>\s*[\w\d]+)+).*");
+            Match m = Regex.Match(expression, @"^((?>\s*[\w\d-+/*,!@#$%^&*()]+)+).*");
             string identifier = m.Groups[1].Value;
             expression = (expression.Length > identifier.Length ? expression.Substring(identifier.Length) : "");
             identifier = token.sval + identifier;