From 6045e0d5a4494d0f3d2d4917c7210cceda440239 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 15 Apr 2021 12:50:30 +0300 Subject: [PATCH] "[] from every []" can accomodate specialist names --- android/assets/jsons/Civ V - Vanilla/Techs.json | 2 +- core/src/com/unciv/logic/city/CityStats.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/android/assets/jsons/Civ V - Vanilla/Techs.json b/android/assets/jsons/Civ V - Vanilla/Techs.json index a645a65dd6..49dae84d38 100644 --- a/android/assets/jsons/Civ V - Vanilla/Techs.json +++ b/android/assets/jsons/Civ V - Vanilla/Techs.json @@ -611,7 +611,7 @@ { "name": "Future Tech", "row": 5, - "prerequisites": ["Nanotechnology","Particle Physics","Satellites"], + "prerequisites": ["Nanotechnology","Particle Physics"], "uniques": ["Who knows what the future holds?", "Can be continually researched"], "quote": "'I think we agree, the past is over.' - George W. Bush" } diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 6ec967af68..be4b42f815 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -241,6 +241,9 @@ class CityStats { val stats = specialist.clone() for (unique in cityInfo.civInfo.getMatchingUniques("[] from every specialist")) stats.add(unique.stats) + for (unique in cityInfo.civInfo.getMatchingUniques("[] from every []")) + if (unique.params[1] == specialistName) + stats.add(unique.stats) return stats }