mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-20 09:17:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #685 - loading game would clear resistance counters

Browse Source
This commit is contained in:
Yair Morgenstern 2019-04-27 23:36:35 +03:00
parent fce52ec787
commit 292297e02d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/assets/jsons/Translations.json
View File

@ -8589,7 +8589,7 @@
Italian:"Sentinella"
German:"Wache"
French:"Sentinel"
Rusian:"Караул"
Russian:"Караул"
Simplified_Chinese:"警戒能力"
}
"Range":{
@ -8717,21 +8717,21 @@
Italian:"Incursione costiera I"
German:"Küstenräuber I"
French:"Commando Côtier I" //not very accurate
Russain:"Береговой налетчик I"
Russian:"Береговой налетчик I"
Simplified_Chinese:"海掠一级"
}
"Coastal Raider II":{
Italian:"Incursione costiera II"
German:"Küstenräuber II"
French:"Commando Côtier II"
Russain:"Береговой налетчик II"
Russian:"Береговой налетчик II"
Simplified_Chinese:"海掠二级"
}
"Coastal Raider III":{
Italian:"Incursione costiera III"
German:"Küstenräuber III"
French:"Commando Côtier III"
Russain:"Береговой налетчик III"
Russian:"Береговой налетчик III"
Simplified_Chinese:"海掠三级"
}
"Targeting I":{

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app"
minSdkVersion 14
targetSdkVersion 28
versionCode 231
versionName "2.15.0"
versionCode 232
versionName "2.15.0-patch1"
}
// Had to add this crap for Travis to build, it wanted to sign the app

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

@ -92,6 +92,7 @@ class CityInfo {
toReturn.isBeingRazed=isBeingRazed
toReturn.isConnectedToCapital = isConnectedToCapital
toReturn.attackedThisTurn = attackedThisTurn
toReturn.resistanceCounter = resistanceCounter
return toReturn
}