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

Fixed crash in new diplomatic relations and unified DiplomacyManager.getModifier()

Browse Source
This commit is contained in:
Yair Morgenstern
2019-06-03 22:06:35 +03:00
parent f49662b22e
commit 527288b886
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

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

24
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -224,7 +224,7 @@ class DiplomacyManager() {
updateHasOpenBorders() updateHasOpenBorders()
if(diplomaticStatus==DiplomaticStatus.Peace) { if(diplomaticStatus==DiplomaticStatus.Peace) {
if(diplomaticModifiers[DiplomaticModifiers.YearsOfPeace.name]!! < 30) if(getModifier(DiplomaticModifiers.YearsOfPeace)< 30)
addModifier(DiplomaticModifiers.YearsOfPeace, 0.5f) addModifier(DiplomaticModifiers.YearsOfPeace, 0.5f)
} }
else revertToZero(DiplomaticModifiers.YearsOfPeace,-0.5f) // war makes you forget the good ol' days else revertToZero(DiplomaticModifiers.YearsOfPeace,-0.5f) // war makes you forget the good ol' days
@ -318,31 +318,35 @@ class DiplomacyManager() {
unit.movementAlgs().teleportToClosestMoveableTile() unit.movementAlgs().teleportToClosestMoveableTile()
} }
fun hasFlag(flag:DiplomacyFlags) = flagsCountdown.containsKey(flag.toString()) fun hasFlag(flag:DiplomacyFlags) = flagsCountdown.containsKey(flag.name)
fun setFlag(flag: DiplomacyFlags, amount: Int){ flagsCountdown[flag.toString()]=amount} fun setFlag(flag: DiplomacyFlags, amount: Int){ flagsCountdown[flag.name]=amount}
fun removeFlag(flag: DiplomacyFlags){ flagsCountdown.remove(flag.toString())} fun removeFlag(flag: DiplomacyFlags){ flagsCountdown.remove(flag.name)}
fun addModifier(modifier: DiplomaticModifiers, amount:Float){ fun addModifier(modifier: DiplomaticModifiers, amount:Float){
val modifierString = modifier.toString() val modifierString = modifier.name
if(!hasModifier(modifier)) setModifier(modifier,0f) if(!hasModifier(modifier)) setModifier(modifier,0f)
diplomaticModifiers[modifierString] = diplomaticModifiers[modifierString]!!+amount diplomaticModifiers[modifierString] = diplomaticModifiers[modifierString]!!+amount
if(diplomaticModifiers[modifierString]==0f) diplomaticModifiers.remove(modifierString) if(diplomaticModifiers[modifierString]==0f) diplomaticModifiers.remove(modifierString)
} }
fun setModifier(modifier: DiplomaticModifiers, amount: Float){ fun setModifier(modifier: DiplomaticModifiers, amount: Float){
val modifierString = modifier.toString() diplomaticModifiers[modifier.name] = amount
diplomaticModifiers[modifierString] = amount }
fun getModifier(modifier: DiplomaticModifiers): Float {
if(!hasModifier(modifier)) return 0f
return diplomaticModifiers[modifier.name]!!
} }
fun removeModifier(modifier: DiplomaticModifiers) = fun removeModifier(modifier: DiplomaticModifiers) =
diplomaticModifiers.remove(modifier.toString()) diplomaticModifiers.remove(modifier.name)
fun hasModifier(modifier: DiplomaticModifiers) = diplomaticModifiers.containsKey(modifier.toString()) fun hasModifier(modifier: DiplomaticModifiers) = diplomaticModifiers.containsKey(modifier.name)
/** @param amount always positive, so you don't need to think about it */ /** @param amount always positive, so you don't need to think about it */
fun revertToZero(modifier: DiplomaticModifiers, amount: Float){ fun revertToZero(modifier: DiplomaticModifiers, amount: Float){
if(!hasModifier(modifier)) return if(!hasModifier(modifier)) return
val currentAmount = diplomaticModifiers[modifier.toString()]!! val currentAmount = getModifier(modifier)
if(currentAmount > 0) addModifier(modifier,-amount) if(currentAmount > 0) addModifier(modifier,-amount)
else addModifier(modifier,amount) else addModifier(modifier,amount)
} }