mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-30 14:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor code reorg. Adjust tech trade value with game speed.

Browse Source
This commit is contained in:
Duan Tao
2019-09-25 23:27:55 +08:00
committed by Yair Morgenstern
parent 4ca32a0523
commit fc5c7235c5
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -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
}

4
core/src/com/unciv/logic/trade/TradeEvaluation.kt
View File

@ -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 ")

8
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -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)

6
core/src/com/unciv/ui/worldscreen/AlertPopup.kt
View File

@ -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()