From 6635ed5be9eaa56470cdbcb95e01e39da42f4ec9 Mon Sep 17 00:00:00 2001 From: Jack Rainy Date: Sat, 18 Apr 2020 20:59:29 +0300 Subject: [PATCH 1/3] Hotfix: city-state must get at least 1 starting technology (#2450) --- core/src/com/unciv/logic/GameStarter.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/com/unciv/logic/GameStarter.kt b/core/src/com/unciv/logic/GameStarter.kt index c6a2d638..5ef4ef4c 100644 --- a/core/src/com/unciv/logic/GameStarter.kt +++ b/core/src/com/unciv/logic/GameStarter.kt @@ -89,6 +89,8 @@ object GameStarter { for (cityStateName in availableCityStatesNames.take(newGameParameters.numberOfCityStates)) { val civ = CivilizationInfo(cityStateName) gameInfo.civilizations.add(civ) + for(tech in ruleset.technologies.values.filter { it.uniques.contains("Starting tech") }) + civ.tech.techsResearched.add(tech.name) // can't be .addTechnology because the civInfo isn't assigned yet } } From 1b4cd9c3b391a9d077792fcaacd0a6d2a39c6f32 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 18 Apr 2020 21:10:39 +0300 Subject: [PATCH 2/3] Fixed replacing obsolete units for new queue --- core/src/com/unciv/logic/civilization/TechManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt index fe6d9411..38662741 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/TechManager.kt @@ -260,7 +260,7 @@ class TechManager { for (city in civInfo.cities) for(constructionName in city.cityConstructions.constructionQueue.toList()){ // copy, since we're changing the queue if(constructionName !in obsoleteUnits) continue - val constructionUnit = city.cityConstructions.getCurrentConstruction() as BaseUnit + val constructionUnit = city.cityConstructions.getConstruction(constructionName) as BaseUnit city.cityConstructions.constructionQueue.replaceAll { if(it==constructionName) constructionUnit.upgradesTo!! else it } } From 47e2f00816d1d8be45a7bd790da236d95dacc871 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 18 Apr 2020 21:15:13 +0300 Subject: [PATCH 3/3] 3.7.5-patch1 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7c7587c7..bd4d2c3c 100644 --- a/build.gradle +++ b/build.gradle @@ -33,8 +33,8 @@ allprojects { version = '1.0.1' ext { appName = "Unciv" - appCodeNumber = 411 - appVersion = "3.7.5" + appCodeNumber = 412 + appVersion = "3.7.5-patch1" gdxVersion = '1.9.10' roboVMVersion = '2.3.1'