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

Ibrushed up on the rules and there are ways to have influence decrease in quantities less than 1, so you were right, it is a float

Browse Source
This commit is contained in:
Yair Morgenstern 2019-04-30 20:45:09 +03:00
parent de9ae3da54
commit 0eb6b91957
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/UnCivGame.kt
View File

@ -17,7 +17,7 @@ class UnCivGame(val version: String) : Game() {
* This exists so that when debugging we can see the entire map.
* Remember to turn this to false before commit and upload!
*/
val viewEntireMapForDebug = true
val viewEntireMapForDebug = false
// For when you need to test something in an advanced game and don't have time to faff around
val superchargedForDebug = false

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -147,7 +147,7 @@ class CivilizationInfo {
for (otherCivName in diplomacy.keys) {
val otherCiv = gameInfo.getCivilization(otherCivName)
if (otherCiv.isCityState() && otherCiv.diplomacy[civName]!!.influence > 60) {
var cultureBonus = Stats()
val cultureBonus = Stats()
cultureBonus.add(Stat.Culture, 5.0f * getEra().ordinal)
if (statMap.containsKey("City States"))
statMap["City States"] = statMap["City States"]!! + cultureBonus

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

@ -28,7 +28,7 @@ class DiplomacyManager() {
* The JSON serialize/deserialize REFUSES to deserialize hashmap keys as Enums, so I'm forced to use strings instead =(
* This is so sad Alexa play Despacito */
var flagsCountdown = HashMap<String,Int>()
var influence: Int = 0 // For city states
var influence = 0f // For city states
fun clone(): DiplomacyManager {
val toReturn = DiplomacyManager()
@ -145,11 +145,11 @@ class DiplomacyManager() {
if(flagsCountdown[flag]==0) flagsCountdown.remove(flag)
}
if (influence > 0) {
if (influence > 1) {
influence -= 1
} else if (influence < 0) {
} else if (influence < 1) {
influence += 1
}
} else influence = 0f
}