From b25f8751e60808b67c06a3b8b580d9b562cb8459 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Wed, 5 Dec 2018 23:42:18 +0800 Subject: [PATCH 1/2] Free culture building now generates culture. Add map size option. --- core/src/com/unciv/logic/city/CityConstructions.kt | 6 ++++-- core/src/com/unciv/ui/NewGameScreen.kt | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index e8ace5a19a..6b3258a171 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -188,9 +188,11 @@ class CityConstructions { fun addCultureBuilding() { val cultureBuildingToBuild = listOf("Monument", "Temple", "Opera House", "Museum").firstOrNull { !builtBuildings.contains(it) } if (cultureBuildingToBuild == null) return - builtBuildings.add(cultureBuildingToBuild) - if (currentConstruction == cultureBuildingToBuild) + getConstruction(cultureBuildingToBuild).postBuildEvent(this) + if (currentConstruction == cultureBuildingToBuild) { + currentConstruction="" Automation().chooseNextConstruction(this) + } } fun chooseNextConstruction() { diff --git a/core/src/com/unciv/ui/NewGameScreen.kt b/core/src/com/unciv/ui/NewGameScreen.kt index 4c30b1a188..de622a4c7e 100644 --- a/core/src/com/unciv/ui/NewGameScreen.kt +++ b/core/src/com/unciv/ui/NewGameScreen.kt @@ -112,7 +112,8 @@ class NewGameScreen: PickerScreen(){ newGameOptionsTable.add("{World size}:".tr()) val worldSizeToRadius = LinkedHashMap() - worldSizeToRadius["Small"] = 10 + worldSizeToRadius["Tiny"] = 10 + worldSizeToRadius["Small"] = 15 worldSizeToRadius["Medium"] = 20 worldSizeToRadius["Large"] = 30 worldSizeToRadius["Huge"] = 40 From fc5fc48f7d7170879f0c79e92b46c58510d7f0e4 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Thu, 6 Dec 2018 11:17:35 +0800 Subject: [PATCH 2/2] Better addCultureBuilding. --- core/src/com/unciv/logic/city/CityConstructions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index 6b3258a171..d346599da1 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -188,7 +188,7 @@ class CityConstructions { fun addCultureBuilding() { val cultureBuildingToBuild = listOf("Monument", "Temple", "Opera House", "Museum").firstOrNull { !builtBuildings.contains(it) } if (cultureBuildingToBuild == null) return - getConstruction(cultureBuildingToBuild).postBuildEvent(this) + addBuilding(cultureBuildingToBuild) if (currentConstruction == cultureBuildingToBuild) { currentConstruction="" Automation().chooseNextConstruction(this)