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

Changed icons to the new and non-suable version!

Browse Source
This commit is contained in:
Yair Morgenstern
2018-08-27 14:35:49 +03:00
parent e078590933
commit 4932c627aa
7 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/AndroidManifest.xml
View File

@ -6,7 +6,7 @@
<application <application
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/uncivicon" android:icon="@drawable/uncivicon2"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/GdxTheme" > android:theme="@style/GdxTheme" >
<activity <activity

BIN
android/res/drawable-hdpi/uncivicon2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
android/res/drawable-mdpi/uncivicon2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
android/res/drawable-xhdpi/uncivicon2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
android/res/drawable-xxhdpi/uncivicon2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
android/res/drawable-xxxhdpi/uncivicon2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 366 KiB

7
core/src/com/unciv/logic/city/CityExpansionManager.kt
View File

@ -49,7 +49,6 @@ class CityExpansionManager {
for(tile in cityInfo.tiles.map { cityInfo.tileMap[it] }) for(tile in cityInfo.tiles.map { cityInfo.tileMap[it] })
relinquishOwnership(tile) relinquishOwnership(tile)
// cityInfo.tiles.clear() // this should be deleted after we change systems
cityInfo.getCenterTile().getTilesInDistance(1).forEach { takeOwnership(it) } cityInfo.getCenterTile().getTilesInDistance(1).forEach { takeOwnership(it) }
} }
@ -69,13 +68,9 @@ class CityExpansionManager {
tileInfo.owningCity=null tileInfo.owningCity=null
} }
fun takeOwnership(tileInfo: TileInfo){ private fun takeOwnership(tileInfo: TileInfo){
if(tileInfo.getCity()!=null) tileInfo.getCity()!!.expansion.relinquishOwnership(tileInfo) if(tileInfo.getCity()!=null) tileInfo.getCity()!!.expansion.relinquishOwnership(tileInfo)
// this shuold be deleted ater we move to the new caching system
// for(city in cityInfo.civInfo.gameInfo.civilizations.flatMap { it.cities }) // Remove this tile from any other cities - should stop SO many problems!
// cityInfo.tiles.remove(tileInfo.position)
cityInfo.tiles.add(tileInfo.position) cityInfo.tiles.add(tileInfo.position)
tileInfo.owningCity = cityInfo tileInfo.owningCity = cityInfo
cityInfo.population.autoAssignPopulation() cityInfo.population.autoAssignPopulation()