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

Resolved #1231 - can now aquire tiles from eighboring cities again, kudos @klondi

Browse Source
This commit is contained in:
Yair Morgenstern 2019-11-20 23:33:09 +02:00
parent 022b388d35
commit cbb5db2fb8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
View File

@ -101,7 +101,7 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo, tileSetStrin
center(this@CityTileGroup) center(this@CityTileGroup)
x += 20 // right x += 20 // right
} }
miscLayerGroup.addActor(this) miscLayerGroup.addActor(icons.populationIcon)
} }
} }

6
core/src/com/unciv/ui/utils/Tutorials.kt
View File

@ -48,11 +48,11 @@ class Tutorials{
val tutorials: LinkedHashMap<String, Array<Array<String>>> = val tutorials: LinkedHashMap<String, Array<Array<String>>> =
GameBasics.getFromJson(x.javaClass, "Tutorials/Tutorials_$language") GameBasics.getFromJson(x.javaClass, "Tutorials/Tutorials_$language")
val tutorialMap = HashMap<String, ArrayList<String>>() val tutorialMap = HashMap<String, ArrayList<String>>()
for (tut in tutorials){ for (tutorial in tutorials){
val list = ArrayList<String>() val list = ArrayList<String>()
for(paragraph in tut.value) for(paragraph in tutorial.value)
list += paragraph.joinToString("\n") list += paragraph.joinToString("\n")
tutorialMap[tut.key] = list tutorialMap[tutorial.key] = list
} }
return tutorialMap return tutorialMap
} }