AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 15:30:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #1405 - upgrading Spearman to Landsknecht no longer gives you gold

Browse Source
This commit is contained in:
Yair Morgenstern 2019-12-02 22:01:16 +02:00
parent 650ac66ff6
commit 7a9fd14b13
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,6 +326,7 @@ class CityInfo {
} }
isPuppet=false isPuppet=false
cityConstructions.inProgressConstructions.clear() // undo all progress of the previous civ on units etc.
cityStats.update() cityStats.update()
UncivGame.Current.worldScreen.shouldUpdate=true UncivGame.Current.worldScreen.shouldUpdate=true
} }

1
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -238,6 +238,7 @@ class MapUnit {
goldCostOfUpgrade = (goldCostOfUpgrade * 0.66f).toInt() goldCostOfUpgrade = (goldCostOfUpgrade * 0.66f).toInt()
if(civInfo.containsBuildingUnique("Gold cost of upgrading military units reduced by 33%")) if(civInfo.containsBuildingUnique("Gold cost of upgrading military units reduced by 33%"))
goldCostOfUpgrade = (goldCostOfUpgrade * 0.66f).toInt() goldCostOfUpgrade = (goldCostOfUpgrade * 0.66f).toInt()
if(goldCostOfUpgrade<0) return 0 // For instance, Landsknecht costs less than Spearman, so upgrading would cost negative gold
return goldCostOfUpgrade return goldCostOfUpgrade
} }