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

Disabled city-state notifications when the city state is defeated

Browse Source
This commit is contained in:
Yair Morgenstern
2020-04-17 14:13:18 +03:00
parent f9e7411569
commit ffe8691df9
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Tiles/Hill+Terrace Farm.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

1
android/assets/GameSettingsOld.json
View File

@ -1 +0,0 @@
{showResourcesAndImprovements:false,tutorialsShown:[World_Map,Unit_Selected,Slow_Start,_City_Founded,First_Steps,Injured_Units,Workers,_OtherCivEncountered,_BarbarianEncountered,Roads_and_Railroads,Golden_Age,Idle_Units,Contact_Me,Luxury_Resource,Strategic_Resource,Enemy_City,Apollo_Program,Embarking,Tile_Clicked,Technology,Culture_and_Policies,City_Range,Cities,Next_Turn,Siege_Units,Happiness,Unhappiness,New_Game,_GameCrashed],missionsCompleted:[Move unit,Found city,Enter city screen,Found city,Enter city screen,Enter city screen,Found city,Pick technology,Enter city screen,Pick construction,Found city,Enter city screen,Enter city screen,Pass a turn,Enter city screen,Enter city screen,Reassign worked tiles,Pass a turn,Meet another civilization,Open the options table,Pass a turn,Pass a turn,Meet another civilization,Pass a turn,Pick technology,Pass a turn,Pass a turn,Move unit],soundEffectsVolume:1,musicVolume:0,showPixelUnits:true,nuclearWeaponEnabled:true,userId:8d2cbffc-2b96-4617-aa49-0c68f6fe15c4}

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

@ -300,12 +300,14 @@ class DiplomacyManager() {
influence = min(restingPoint, influence + increment)
else influence = restingPoint
val civCapitalLocation = if(civInfo.cities.isNotEmpty()) civInfo.getCapital().location else null
if (getTurnsToRelationshipChange() == 1)
otherCiv().addNotification("Your relationship with [${civInfo.civName}] is about to degrade", civCapitalLocation, Color.GOLD)
if(!civInfo.isDefeated()) { // don't display city state relationship notifications when the city state is currently defeated
val civCapitalLocation = if (civInfo.cities.isNotEmpty()) civInfo.getCapital().location else null
if (getTurnsToRelationshipChange() == 1)
otherCiv().addNotification("Your relationship with [${civInfo.civName}] is about to degrade", civCapitalLocation, Color.GOLD)
if (initialRelationshipLevel >= RelationshipLevel.Friend && initialRelationshipLevel != relationshipLevel())
otherCiv().addNotification("Your relationship with [${civInfo.civName}] degraded", civCapitalLocation, Color.GOLD)
if (initialRelationshipLevel >= RelationshipLevel.Friend && initialRelationshipLevel != relationshipLevel())
otherCiv().addNotification("Your relationship with [${civInfo.civName}] degraded", civCapitalLocation, Color.GOLD)
}
}
private fun nextTurnFlags() {