wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resource toggle button is consistent with population toggle - by @lishaoxia1985

Browse source 
#2809
This commit is contained in:
Yair Morgenstern 2020-07-08 19:31:32 +03:00
parent 1fe8d704a0
commit ddf12b743c
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/src/com/unciv/ui/worldscreen/Minimap.kt
View file

@ -30,18 +30,18 @@ class Minimap(val mapHolder: WorldMapHolder) : ScrollPane(null){
scrollPercentY = mapHolder.scrollPercentY scrollPercentY = mapHolder.scrollPercentY
} }
init{ init {
setScrollingDisabled(true,true) setScrollingDisabled(true, true)
var topX = 0f var topX = 0f
var topY = 0f var topY = 0f
var bottomX = 0f var bottomX = 0f
var bottomY = 0f var bottomY = 0f
fun hexRow(vector2: Vector2) = vector2.x+vector2.y fun hexRow(vector2: Vector2) = vector2.x + vector2.y
val maxHexRow = mapHolder.tileMap.values.asSequence().map { hexRow(it.position) }.max()!! val maxHexRow = mapHolder.tileMap.values.asSequence().map { hexRow(it.position) }.max()!!
val minHexRow = mapHolder.tileMap.values.asSequence().map { hexRow(it.position) }.min()!! val minHexRow = mapHolder.tileMap.values.asSequence().map { hexRow(it.position) }.min()!!
val totalHexRows = maxHexRow-minHexRow val totalHexRows = maxHexRow - minHexRow
for (tileInfo in mapHolder.tileMap.values) { for (tileInfo in mapHolder.tileMap.values) {
val hex = ImageGetter.getImage("OtherIcons/Hexagon") val hex = ImageGetter.getImage("OtherIcons/Hexagon")
@ -49,8 +49,8 @@ class Minimap(val mapHolder: WorldMapHolder) : ScrollPane(null){
val positionalVector = HexMath.hex2WorldCoords(tileInfo.position) val positionalVector = HexMath.hex2WorldCoords(tileInfo.position)
val groupSize = 400f/totalHexRows val groupSize = 400f / totalHexRows
hex.setSize(groupSize,groupSize) hex.setSize(groupSize, groupSize)
hex.setPosition(positionalVector.x * 0.5f * groupSize, hex.setPosition(positionalVector.x * 0.5f * groupSize,
positionalVector.y * 0.5f * groupSize) positionalVector.y * 0.5f * groupSize)
hex.onClick { hex.onClick {
@ -77,7 +77,7 @@ class Minimap(val mapHolder: WorldMapHolder) : ScrollPane(null){
actor = allTiles actor = allTiles
layout() layout()
updateVisualScroll() updateVisualScroll()
mapHolder.addListener(object : InputListener(){ mapHolder.addListener(object : InputListener() {
override fun handle(e: Event?): Boolean { override fun handle(e: Event?): Boolean {
setScrollTomapHolder() setScrollTomapHolder()
return true return true
@ -155,7 +155,10 @@ class MinimapHolder(mapHolder: WorldMapHolder): Table(){
} }
toggleIconTable.add(populationImage).row() toggleIconTable.add(populationImage).row()
val resourceImage = ImageGetter.getImage("ResourceIcons/Cattle").surroundWithCircle(40f) val resourceImage = ImageGetter.getImage("ResourceIcons/Cattle")
.surroundWithCircle(30f).apply { circle.color = Color.GREEN }
.surroundWithCircle(40f,false).apply { circle.color = Color.BLACK }
resourceImage.actor.color.a = if(settings.showResourcesAndImprovements) 1f else 0.5f resourceImage.actor.color.a = if(settings.showResourcesAndImprovements) 1f else 0.5f
resourceImage.onClick { resourceImage.onClick {
settings.showResourcesAndImprovements = !settings.showResourcesAndImprovements settings.showResourcesAndImprovements = !settings.showResourcesAndImprovements