Revert "Better countables - phase 1"

This reverts commit 7165c62573.

android/assets/jsons/Civ V - Gods & Kings/Events.json

@@ -8,7 +8,7 @@
             {"text":"Click on a unit → Click on a destination → Click the arrow popup."},
 		],
         "uniques": [
-            "Only available <if tutorials are enabled> <when number of [units] is greater than [0]>",
+            "Only available <if tutorials are enabled> <when number of [Units] is greater than [0]>",
             "Unavailable <if tutorial [Move unit] is completed>"
         ]
     },
@@ -34,7 +34,7 @@
             {"text":"Click the city button twice."},
 		],
         "uniques": [
-            "Only available <if tutorials are enabled> <when number of [cities] is greater than [0]>",
+            "Only available <if tutorials are enabled> <when number of [Cities] is greater than [0]>",
             "Unavailable <if tutorial [Enter city screen] is completed>"
         ]
     },
@@ -60,7 +60,7 @@
             {"text":"Enter city screen → Click on a unit or building → Click 'add to queue'."},
 		],
         "uniques": [
-            "Only available <if tutorials are enabled> <when number of [cities] is greater than [0]>",
+            "Only available <if tutorials are enabled> <when number of [Cities] is greater than [0]>",
             "Unavailable <if tutorial [Pick construction] is completed>"
         ]
     },
@@ -86,7 +86,7 @@
             {"text":"Enter city screen → Click the assigned tile to unassign → Click an unassigned tile to assign population."},
 		],
         "uniques": [
-            "Only available <if tutorials are enabled> <when number of [cities] is greater than [0]>",
+            "Only available <if tutorials are enabled> <when number of [Cities] is greater than [0]>",
             "Unavailable <if tutorial [Reassign worked tiles] is completed>"
         ]
     },
@@ -131,7 +131,7 @@
             {"text":"Construct a Worker unit → Move it to a Plains or Grassland tile → Click 'Construct improvement' → Choose the farm → Leave the worker there until it's finished."},
 		],
         "uniques": [
-            "Only available <if tutorials are enabled> <when number of [cities] is greater than [0]>",
+            "Only available <if tutorials are enabled> <when number of [Cities] is greater than [0]>",
             "Unavailable <if tutorial [Construct an improvement] is completed>"
         ]
     },
@@ -144,7 +144,7 @@
             {"text":"Construct roads between your capital and another city. Or, automate your worker and let him get to that eventually."},
 		],
         "uniques": [
-            "Only available <if tutorials are enabled> <when number of [cities] is greater than [1]>",
+            "Only available <if tutorials are enabled> <when number of [Cities] is greater than [1]>",
             "Unavailable <if tutorial [Create a trade route] is completed>"
         ]
     },

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

@@ -17,8 +17,8 @@ object Countables {
 
         val civInfo = stateForConditionals.relevantCiv ?: return null
 
-        if (countable == "cities") return civInfo.cities.size
-        if (countable == "units") return civInfo.units.getCivUnitsSize()
+        if (countable == "Cities") return civInfo.cities.size
+        if (countable == "Units") return civInfo.units.getCivUnitsSize()
         if (countable == "Air units") return civInfo.units.getCivUnits().count { it.baseUnit.movesLikeAirUnits() }
 
         if (gameInfo.ruleset.tileResources.containsKey(countable))

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

@@ -65,7 +65,7 @@ enum class UniqueParameterType(
     Countable("countable", "1000", "This indicates a number or a numeric variable") {
         // todo add more countables
         private val knownValues = setOf(
-            "year", "turns", "cities", "units"
+            "year", "turns", "Cities", "Units"
         )
 
         override fun isKnownValue(parameterText: String, ruleset: Ruleset) = when {
@@ -75,8 +75,7 @@ enum class UniqueParameterType(
             parameterText in ruleset.tileResources -> true
             parameterText in ruleset.units -> true
             parameterText.removeSuffix(" units").removeSurrounding("[", "]") in ruleset.unitTypes -> true
-            parameterText in ruleset.buildings -> true
-            else -> false
+            else -> parameterText in ruleset.buildings
         }
     },
 

docs/Modders/Unique-parameters.md

@@ -287,10 +287,8 @@ Allowed values are:
 Indicates *something that can be counted*, used both for comparisons and for multiplying uniques
 
 Allowed values:
-
-- `year`
-- `turns`
-- `cities`, `units`, `Air units` - these count your total number
+- `year`, `turns`
+- `Cities`, `Units`, `Air units` - these count your total number
 - Unit name (counts your existing units)
 - `<unit type> units` (e.g. `Mounted units`) - counts your units by their type (this is not a filter, use the unitType verbatim)
 - Building name (counts your existing buildings)