Unique deprecation - "Receive free [unit] when you discover [tech]" replaced with trigger + condition, tested

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

@@ -31,14 +31,14 @@
 		"innerColor": [213,249,255],
 		"favoredReligion": "Islam",
 		"uniqueName": "Ingenuity",
-		"uniques": ["Receive free [Great Scientist] when you discover [Writing]", "[Great Scientist] is earned [50]% faster"],
+		"uniques": ["Free [Great Scientist] appears <upon discovering [Writing]>", "[Great Scientist] is earned [50]% faster"],
 		"cities": ["Babylon","Akkad","Dur-Kurigalzu","Nippur","Borsippa","Sippar","Opis","Mari","Shushan","Eshnunna",
 			"Ellasar","Erech","Kutha","Sirpurla","Neribtum","Ashur","Ninveh","Nimrud","Arbela","Nuzi",
 			"Arrapkha","Tutub","Shaduppum","Rapiqum","Mashkan Shapir","Tuttul","Ramad","Ana","Haradum","Agrab",
 			"Uqair","Gubba","Hafriyat","Nagar","Shubat Enlil","Urhai","Urkesh","Awan","Riblah","Tayma"],
         "spyNames": ["Rim-Sin II", "Smerdis", "Ilum-ma-ili", "Peshgaldaramesh", "Ur-zigurumaš", "Semiramis", "Em", "Ishtar", "Bilit Taauth", "Aruru"]
 	},
-	{
+    {
 		"name": "Greece",
 		"leaderName": "Alexander",
 		"adjective": ["Greek"],

android/assets/jsons/Civ V - Vanilla/Nations.json

@@ -30,7 +30,7 @@
 		"outerColor": [43,81,98],
 		"innerColor": [201,248,255],
 		"uniqueName": "Ingenuity",
-		"uniques": ["Receive free [Great Scientist] when you discover [Writing]", "[Great Scientist] is earned [50]% faster"],
+		"uniques": ["Free [Great Scientist] appears <upon discovering [Writing]>", "[Great Scientist] is earned [50]% faster"],
 		"cities": ["Babylon","Akkad","Dur-Kurigalzu","Nippur","Borsippa","Sippar","Opis","Mari","Shushan","Eshnunna",
 			"Ellasar","Erech","Kutha","Sirpurla","Neribtum","Ashur","Ninveh","Nimrud","Arbela","Nuzi",
 			"Arrapkha","Tutub","Shaduppum","Rapiqum","Mashkan Shapir","Tuttul","Ramad","Ana","Haradum","Agrab",

android/assets/jsons/translations/Japanese.properties

@@ -2307,7 +2307,7 @@ when above [amount] [resource] = [resource][amount]より多く
 when below [amount] [resource] = [resource][amount]未満で
 in this city = この都市で
 in cities with a [buildingFilter] = [buildingFilter]を持つ都市で
-in cities without a [buildingFilter] = [buindingFilter]が無い都市で
+in cities without a [buildingFilter] = [buildingFilter]が無い都市で
 in cities with at least [amount] [populationFilter] = [populationFilter]が[amount]以上いる都市で
 with a garrison = 駐屯地がある
 for [mapUnitFilter] units = [mapUnitFilter]のユニットに
@@ -2354,7 +2354,7 @@ Gain a free [beliefType] belief = 無償の[beliefType]信念を手に入れる
 Triggers voting for the Diplomatic Victory = 外交勝利のための投票が行なわれる
 Instantly consumes [amount] [stockpiledResource] = 即座に[amount]の[stockpiledResource]を消費する
 Instantly provides [amount] [stockpiledResource] = 即座に[amount]の[stockpiledResource]を供給する
-Gain [amount] [stat/resource] = [amount]の[stat/resouce]を手に入れる
+Gain [amount] [stat/resource] = [amount]の[stat/resource]を手に入れる
 Gain [amount]-[amount2] [stat] = [amount]-[amount2]の[stat]を手に入れる
 Gain enough Faith for a Pantheon = パンテオンに必要な信念を手に入れる
 Gain enough Faith for [amount]% of a Great Prophet = 偉大な預言者に必要な信念の[amount]%を手に入れる

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

@@ -89,8 +89,6 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
     FoodConsumptionBySpecialists("[relativeAmount]% Food consumption by specialists [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
 
     /// Happiness
-    @Deprecated("As of 4.7.3", ReplaceWith("[+100]% unhappiness from the number of cities"))
-    UnhappinessFromCitiesDoubled("Unhappiness from number of Cities doubled", UniqueTarget.Global),
     UnhappinessFromCitiesPercentage("[relativeAmount]% unhappiness from the number of cities", UniqueTarget.Global),
     // Todo: capitalization of 'Unhappiness' -> 'unhappiness'
     UnhappinessFromPopulationTypePercentageChange("[relativeAmount]% Unhappiness from [populationFilter] [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@@ -163,7 +161,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
     UnitSupplyPerCity("[amount] Unit Supply per city", UniqueTarget.Global),
     FreeUnits("[amount] units cost no maintenance", UniqueTarget.Global),
     UnitsInCitiesNoMaintenance("Units in cities cost no Maintenance", UniqueTarget.Global),
-    // ToDo: Replace with "Free [unit] appears <upon discovering [tech]>"
+    @Deprecated("As of 4.8.5", ReplaceWith("Free [unit] appears <upon discovering [tech]>"))
     ReceiveFreeUnitWhenDiscoveringTech("Receive free [unit] when you discover [tech]", UniqueTarget.Global),
 
     // Units entering Tiles
@@ -776,6 +774,8 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
 
     ///////////////////////////////////////////// region 99 DEPRECATED AND REMOVED /////////////////////////////////////////////
 
+    @Deprecated("As of 4.7.3", ReplaceWith("[+100]% unhappiness from the number of cities"), DeprecationLevel.ERROR)
+    UnhappinessFromCitiesDoubled("Unhappiness from number of Cities doubled", UniqueTarget.Global),
     @Deprecated("as of 4.6.4", ReplaceWith("[+1] Sight <for [Embarked] units>\" OR \"[+1] Sight <when [Embarked]>"), DeprecationLevel.ERROR)
     NormalVisionWhenEmbarked("Normal vision when embarked", UniqueTarget.Unit, UniqueTarget.Global),
     @Deprecated("as of 4.5.3", ReplaceWith("Empire enters a [amount]-turn Golden Age <by consuming this unit>"), DeprecationLevel.ERROR)

docs/Modders/uniques.md

@@ -555,11 +555,6 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
 ??? example  "Units in cities cost no Maintenance"
 	Applicable to: Global
 
-??? example  "Receive free [unit] when you discover [tech]"
-	Example: "Receive free [Musketman] when you discover [Agriculture]"
-
-	Applicable to: Global
-
 ??? example  "Enables embarkation for land units"
 	Applicable to: Global