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

Added City Ruins when a city is razed (no effects, just game flavour)

Browse Source
This commit is contained in:
Yair Morgenstern 2018-09-23 11:03:03 +03:00
parent 5710001715
commit 7b2bf48e04
8 changed files with 228 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Credits.md
View File

@ -79,8 +79,11 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Pickaxe](https://thenounproject.com/term/pickaxe/175792/) By Creative Stall * [Pickaxe](https://thenounproject.com/term/pickaxe/175792/) By Creative Stall
* [Food stall](https://thenounproject.com/term/food-stall/1618358/) By I Putu Kharismayadi * [Food stall](https://thenounproject.com/term/food-stall/1618358/) By I Putu Kharismayadi
* [Road](https://thenounproject.com/term/road/1600491/) By REVA * [Road](https://thenounproject.com/term/road/1600491/) By REVA
* [Ruins](https://thenounproject.com/term/ruins/175277/) By Creative Stall
* [Ruins](https://thenounproject.com/term/ruins/3849/) By Paulo Volkova
## Buildings ## Buildings
* [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516 * [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516
* [Factory](https://thenounproject.com/term/factory/545906/) By icon 54 * [Factory](https://thenounproject.com/term/factory/545906/) By icon 54
* [Factory](https://thenounproject.com/term/factory/1624235/) By Maxim Kulikov * [Factory](https://thenounproject.com/term/factory/1624235/) By Maxim Kulikov

BIN
android/Images/ImprovementIcons/Ancient ruins.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
android/Images/ImprovementIcons/City ruins.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 859 B

0
android/Images/ImprovementIcons/Customs_house.png → android/Images/ImprovementIcons/Customs house.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

420
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: 638 KiB

After

Width:  |  Height:  |  Size: 642 KiB

7
android/assets/jsons/TileImprovements.json
View File

@ -126,5 +126,12 @@
gold:4, gold:4,
improvingTech:"Economics", improvingTech:"Economics",
improvingTechStats:{gold:1} improvingTechStats:{gold:1}
},
{
name:"Ancient ruins"
},
{
name:"City ruins"
} }
] ]

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

@ -186,6 +186,7 @@ class CityInfo {
fun destroyCity() { fun destroyCity() {
civInfo.cities.remove(this) civInfo.cities.remove(this)
getTiles().forEach { expansion.relinquishOwnership(it) } getTiles().forEach { expansion.relinquishOwnership(it) }
getCenterTile().improvement="City ruins"
} }
fun moveToCiv(newCivInfo: CivilizationInfo){ fun moveToCiv(newCivInfo: CivilizationInfo){