mirror of
https://github.com/yairm210/Unciv.git
synced 2025-09-26 13:27:22 -04:00
Resolved #449 - added "go to unit" button in unit overview
This commit is contained in:
parent
0788141054
commit
748e84f265
@ -21,7 +21,7 @@ android {
|
|||||||
applicationId "com.unciv.app"
|
applicationId "com.unciv.app"
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
versionCode 201
|
versionCode 202
|
||||||
versionName "2.13.3"
|
versionName "2.13.3"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
||||||
classpath 'com.android.tools.build:gradle:3.3.0'
|
classpath 'com.android.tools.build:gradle:3.3.1'
|
||||||
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
|
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,18 +13,4 @@ class ScienceVictoryManager {
|
|||||||
requiredParts.add("SS Engine", 1)
|
requiredParts.add("SS Engine", 1)
|
||||||
requiredParts.add("SS Stasis Chamber", 1)
|
requiredParts.add("SS Stasis Chamber", 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun clone(): ScienceVictoryManager {
|
|
||||||
val toReturn = ScienceVictoryManager()
|
|
||||||
toReturn.currentParts.putAll(currentParts)
|
|
||||||
return toReturn
|
|
||||||
}
|
|
||||||
|
|
||||||
fun unconstructedParts(): Counter<String> {
|
|
||||||
val counter = requiredParts.clone()
|
|
||||||
counter.remove(currentParts)
|
|
||||||
return counter
|
|
||||||
}
|
|
||||||
|
|
||||||
fun hasWon() = requiredParts.equals(currentParts)
|
|
||||||
}
|
}
|
||||||
|
@ -136,7 +136,7 @@ class TileMap {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun setTransients() {
|
fun setTransients() {
|
||||||
if(tiles.any()) //
|
if(tiles.any())
|
||||||
tileList.addAll(tiles.values)
|
tileList.addAll(tiles.values)
|
||||||
|
|
||||||
val topY= tileList.asSequence().map { it.position.y.toInt() }.max()!!
|
val topY= tileList.asSequence().map { it.position.y.toInt() }.max()!!
|
||||||
|
@ -262,6 +262,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
|
|||||||
table.add("Ranged strength".tr())
|
table.add("Ranged strength".tr())
|
||||||
table.add("Movement".tr())
|
table.add("Movement".tr())
|
||||||
table.add("Closest city".tr())
|
table.add("Closest city".tr())
|
||||||
|
table.add("Go to unit".tr())
|
||||||
table.row()
|
table.row()
|
||||||
table.addSeparator()
|
table.addSeparator()
|
||||||
|
|
||||||
@ -273,6 +274,12 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
|
|||||||
table.add(DecimalFormat("0.#").format(unit.currentMovement)+"/"+unit.getMaxMovement())
|
table.add(DecimalFormat("0.#").format(unit.currentMovement)+"/"+unit.getMaxMovement())
|
||||||
val closestCity = unit.getTile().getTilesInDistance(3).firstOrNull{it.isCityCenter()}
|
val closestCity = unit.getTile().getTilesInDistance(3).firstOrNull{it.isCityCenter()}
|
||||||
if (closestCity!=null) table.add(closestCity.getCity()!!.name) else table.add()
|
if (closestCity!=null) table.add(closestCity.getCity()!!.name) else table.add()
|
||||||
|
val goToUnitButton = TextButton("Go to unit".tr(),skin)
|
||||||
|
goToUnitButton.onClick {
|
||||||
|
UnCivGame.Current.setWorldScreen()
|
||||||
|
UnCivGame.Current.worldScreen.tileMapHolder.setCenterPosition(unit.currentTile.position)
|
||||||
|
}
|
||||||
|
table.add(goToUnitButton)
|
||||||
table.row()
|
table.row()
|
||||||
}
|
}
|
||||||
table.pack()
|
table.pack()
|
||||||
|
@ -34,10 +34,6 @@ class TechButton(techName:String, val techManager: TechManager) : Table(CameraSt
|
|||||||
val techEnabledIcons = Table()
|
val techEnabledIcons = Table()
|
||||||
techEnabledIcons.defaults().pad(5f)
|
techEnabledIcons.defaults().pad(5f)
|
||||||
|
|
||||||
val units = GameBasics.Units.values.filter { it.requiredTech==techName }
|
|
||||||
.filter { it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName }
|
|
||||||
|
|
||||||
|
|
||||||
for(unit in GameBasics.Units.values.filter { it.requiredTech==techName
|
for(unit in GameBasics.Units.values.filter { it.requiredTech==techName
|
||||||
&& (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) })
|
&& (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) })
|
||||||
techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(30f))
|
techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(30f))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user