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

Proper destruction notification for city states

Browse Source 
Added Fur resource image
This commit is contained in:
Yair Morgenstern 2020-01-13 00:09:09 +02:00
parent 0d889989c6
commit 9a426318ba
5 changed files with 177 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Tiles/Fur.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 328 B

341
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 884 KiB

After

Width:  |  Height:  |  Size: 884 KiB

BIN
android/assets/game2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 309 KiB

After

Width:  |  Height:  |  Size: 307 KiB

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

@ -469,8 +469,10 @@ class CivilizationInfo {
fun destroy(){ fun destroy(){
val destructionText = if(isMajorCiv()) "The civilization of [$civName] has been destroyed!"
else "The City-State of [$civName] has been destroyed!"
for(civ in gameInfo.civilizations) for(civ in gameInfo.civilizations)
civ.addNotification("The civilization of [$civName] has been destroyed!", null, Color.RED) civ.addNotification(destructionText, null, Color.RED)
getCivUnits().forEach { it.destroy() } getCivUnits().forEach { it.destroy() }
tradeRequests.clear() // if we don't do this then there could be resources taken by "pending" trades forever tradeRequests.clear() // if we don't do this then there could be resources taken by "pending" trades forever
for(diplomacyManager in diplomacy.values){ for(diplomacyManager in diplomacy.values){