From fc5c7235c5c019e20183eae21791c31f823dbd56 Mon Sep 17 00:00:00 2001
From: Duan Tao <duantao@live.cn>
Date: Wed, 25 Sep 2019 23:27:55 +0800
Subject: [PATCH] Minor code reorg. Adjust tech trade value with game speed.

---
 core/src/com/unciv/logic/city/CityInfo.kt         | 9 ++++-----
 core/src/com/unciv/logic/trade/TradeEvaluation.kt | 4 +++-
 core/src/com/unciv/ui/cityscreen/CityScreen.kt    | 8 +-------
 core/src/com/unciv/ui/worldscreen/AlertPopup.kt   | 6 ++++--
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt
index e3973308bd..1ce46fa341 100644
--- a/core/src/com/unciv/logic/city/CityInfo.kt
+++ b/core/src/com/unciv/logic/city/CityInfo.kt
@@ -271,10 +271,8 @@ class CityInfo {
         getCenterTile().improvement="City ruins"
     }
 
-    fun annexCity(conqueringCiv: CivilizationInfo) {
-        puppetCity(conqueringCiv)
-
-        if(!conqueringCiv.policies.isAdopted("Police State")) {
+    fun annexCity() {
+        if(!civInfo.policies.isAdopted("Police State")) {
             expansion.cultureStored = 0
             expansion.reset()
         }
@@ -327,7 +325,8 @@ class CityInfo {
     /* Liberating is returning a city to its founder - makes you LOSE warmongering points **/
     fun liberateCity(conqueringCiv: CivilizationInfo) {
         if (foundingCiv == "") { // this should never happen but just in case...
-            annexCity(conqueringCiv)
+            puppetCity(conqueringCiv)
+            annexCity()
             return
         }
 
diff --git a/core/src/com/unciv/logic/trade/TradeEvaluation.kt b/core/src/com/unciv/logic/trade/TradeEvaluation.kt
index f9b7aaffc8..1a6d559896 100644
--- a/core/src/com/unciv/logic/trade/TradeEvaluation.kt
+++ b/core/src/com/unciv/logic/trade/TradeEvaluation.kt
@@ -117,7 +117,9 @@ class TradeEvaluation{
                 return 50 * amountToBuyInOffer
             }
 
-            TradeType.Technology -> return sqrt(GameBasics.Technologies[offer.name]!!.cost.toDouble()).toInt()*20
+            TradeType.Technology ->
+                return (sqrt(GameBasics.Technologies[offer.name]!!.cost.toDouble())
+                        * civInfo.gameInfo.gameParameters.gameSpeed.getModifier()).toInt()*20
             TradeType.Introduction -> return 250
             TradeType.WarDeclaration -> {
                 val nameOfCivToDeclareWarOn = offer.name.removePrefix("Declare war on ")
diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt
index 135e227773..c9ab311838 100644
--- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt
@@ -168,13 +168,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
             val annexCityButton = TextButton("Annex city".tr(), skin)
             annexCityButton.labelCell.pad(10f)
             annexCityButton.onClick {
-                if(!city.civInfo.policies.isAdopted("Police State")) {
-                    city.expansion.cultureStored = 0
-                    city.expansion.reset()
-                }
-
-                city.isPuppet=false
-                city.isBeingRazed=false
+                city.annexCity()
                 update()
             }
             razeCityButtonHolder.add(annexCityButton).colspan(cityPickerTable.columns)
diff --git a/core/src/com/unciv/ui/worldscreen/AlertPopup.kt b/core/src/com/unciv/ui/worldscreen/AlertPopup.kt
index feb9099ced..8460ef580a 100644
--- a/core/src/com/unciv/ui/worldscreen/AlertPopup.kt
+++ b/core/src/com/unciv/ui/worldscreen/AlertPopup.kt
@@ -72,7 +72,8 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu
                     }).row()
                 }
                 add(TextButton("Annex".tr(), skin).onClick {
-                    city.annexCity(conqueringCiv)
+                    city.puppetCity(conqueringCiv)
+                    city.annexCity()
                     worldScreen.shouldUpdate=true
                     close()
                 }).row()
@@ -82,7 +83,8 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu
                     close()
                 }).row()
                 add(TextButton("Raze".tr(), skin).onClick {
-                    city.annexCity(conqueringCiv)
+                    city.puppetCity(conqueringCiv)
+                    city.annexCity()
                     city.isBeingRazed = true
                     worldScreen.shouldUpdate=true
                     close()