wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Solved promotion name-change bug

Browse source
This commit is contained in:
Yair Morgenstern 2019-10-26 20:44:32 +03:00
parent 4d285e972d
commit 232896665e
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/src/com/unciv/logic/GameInfo.kt
View file

@ -185,6 +185,19 @@ class GameInfo {
// will be done here, and not in CivInfo.setTransients or CityInfo
fun setTransients() {
tileMap.gameInfo = this
// Renames as of version 3.1.8, because of translation conflicts with the property "Range" and the difficulty "Immortal"
// Needs to be BEFORE tileMap.setTransients, because the units' setTransients is called from there
for(tile in tileMap.values)
for(unit in tile.getUnits()){
if(unit.name=="Immortal") unit.name="Persian Immortal"
if(unit.promotions.promotions.contains("Range")){
unit.promotions.promotions.remove("Range")
unit.promotions.promotions.add("Extended Range")
}
}
tileMap.setTransients()
if(currentPlayer=="") currentPlayer=civilizations.first { it.isPlayerCivilization() }.civName
@ -233,16 +246,6 @@ class GameInfo {
}
}
// Renames as of version 3.1.8, because of translation conflicts with the property "Range" and the difficulty "Immortal"
for(tile in tileMap.values)
for(unit in tile.getUnits()){
if(unit.name=="Immortal") unit.name="Persian Immortal"
if(unit.promotions.promotions.contains("Range")){
unit.promotions.promotions.remove("Range")
unit.promotions.promotions.add("Extended Range")
}
}
for (civInfo in civilizations) civInfo.setNationTransient()
for (civInfo in civilizations) civInfo.setTransients()