From f32f4de3a9105aa7a359033ea330a6c2d1739702 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Thu, 26 Sep 2019 22:25:38 +0800 Subject: [PATCH 1/2] Fixed : Liberated city remain in puppet status. --- core/src/com/unciv/logic/city/CityInfo.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 144632c8..56819192 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -279,7 +279,6 @@ class CityInfo { } isPuppet=false - UnCivGame.Current.worldScreen.shouldUpdate=true } @@ -342,7 +341,7 @@ class CityInfo { reassignWorkers() if(foundingCiv.cities.size == 1) cityConstructions.addBuilding("Palace") // Resurrection! - + isPuppet = false UnCivGame.Current.worldScreen.shouldUpdate=true } From df2faee2a8f890046d1fd9b5feda16d30fdf97d6 Mon Sep 17 00:00:00 2001 From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com> Date: Thu, 26 Sep 2019 23:17:43 +0800 Subject: [PATCH 2/2] fix that the rightsidebutton will change into another words when you touch tech button in tech tree switching from victorystatus screen. (#1122) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * systemProp * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * fix that researched tech can be picked when we pick a free tech * update to master * update * Update TechPickerScreen.kt * delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align. * update * language polish is wrong to be writing "polski" * 显示教程 * update * update * update * update * update * update * update * viewport * update * update * update * update * update * update * update --- core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index f8c818e7..eddea747 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -72,7 +72,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc val techButton = TechButton(tech.name,civTech,false) techNameToButton[tech.name] = techButton - techButton.onClick { selectTechnology(tech) } + techButton.onClick { selectTechnology(tech, false, switchfromWorldScreen) } topTable.add(techButton) } } @@ -115,10 +115,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc // and possibly select it to show description, // which is very helpful when just discovered and clicking the notification val tech = if (centerOnTech != null) centerOnTech else civInfo.tech.currentTechnology() - if (tech != null && switchfromWorldScreen) { + if (tech != null) { // select only if there it doesn't mess up tempTechsToResearch if (civInfo.tech.isResearched(tech.name) || civInfo.tech.techsToResearch.size <= 1) - selectTechnology(tech, true) + selectTechnology(tech, true, switchfromWorldScreen) else centerOnTechnology(tech) }