fix something

Author: AutumnPizazz

core/src/com/unciv/models/ruleset/unique/Countables.kt

@@ -91,7 +91,7 @@ object Countables {
 
     private fun parseExpression(expression: String): List<String> {
         val regex = Regex(
-            "(?:^|(?<=]))\\s*(\\[[^\\[\\]]*(?:\\[[^\\[\\]]*][^\\[\\]]*)*])|([+\\-*/%^()])|(\\d+)"
+            "(\\[[^\\[\\]]*(?:\\[[^\\[\\]]*][^\\[\\]]*)*])|([+\\-*/%^()])|(\\d+)"
         )
         val matches = regex.findAll(expression)
         val tokens = mutableListOf<String>()
@@ -104,8 +104,10 @@ object Countables {
                 tokens.add(token)
             }
         }
+        println("tokens: $tokens")
         return tokens
     }
+    
     private fun calculateExpression(tokens: List<String>, stateForConditionals: StateForConditionals): Int? {
         val outputQueue = mutableListOf<String>()
         val operatorStack = mutableListOf<String>()
@@ -115,8 +117,7 @@ object Countables {
                 outputQueue.add(token)
             } else if (token.startsWith("[") && token.endsWith("]")) {
                 val innerToken = token.substring(1, token.length - 1)
-                val value = simpleCountableAmount(innerToken, stateForConditionals)
-                if (value == null) return null
+                val value = simpleCountableAmount(innerToken, stateForConditionals) ?: return null
                 outputQueue.add(value.toString())
             } else if (token == "(") {
                 operatorStack.add(token)

docs/Modders/Unique-parameters.md

@@ -356,12 +356,12 @@ This can make a difference for e.g. local resources, which are counted per city.
 Allowed *complex* values:
 - `[complex value]`
 - `[complex value] + [complex value]` - such as `[Cities] + 1`
-- `[complex value] - [complex value]` - such as `[Cities] - 1`
-- `[complex value] * [complex value]` - such as `[Cities] * 2`
-- `[complex value] / [complex value]` - such as `[Cities] / 2`
-- `[complex value] % [complex value]` - such as `[Cities] % 2`
-- `[complex value] ^ [complex value]` - such as `[Cities] ^ 2`
+- `[complex value] - [complex value]`
+- `[complex value] * [complex value]`
+- `[complex value] / [complex value]`
+- `[complex value] % [complex value]`
+- `[complex value] ^ [complex value]`
 
-In addition, complex nested expressions can also be used, such as: `([Cities] + [turns]) * 2 + [Units]`. Note that the precedence of the five operations follows mathematical intuition: exponentiation has the highest precedence, followed by multiplication, division, and modulus, and then addition and subtraction have the lowest precedence. If you need to adjust the precedence, please use parentheses.
+In addition, complex nested expressions can also be used, such as: `([Cities] + [turns]) * 2 + [Units]`. Note that the precedence of the 6 operations follows mathematical intuition: exponentiation(`^`) has the highest precedence, followed by multiplication(`*`), division(`/`), and modulus(`%`), and then addition(`+`) and subtraction(`-`) have the lowest precedence. If you need to adjust the precedence, please use parentheses.
 
-Specifically, when calculating n/0 or n%0 , although these operations are meaningless, we still compute them as 0.
+Specifically, when calculating `n/0` or `n%0` , although these operations are meaningless, we still compute them as `0`.