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

Multiple selected units are more obvious on-map

Browse Source
This commit is contained in:
Yair Morgenstern 2020-09-11 17:09:50 +03:00
parent f63005ad3c
commit 5a44d7e098
2 changed files with 72 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
View File

@ -307,9 +307,10 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
updateTilegroupsForSelectedCity(city, playerViewableTilePositions) updateTilegroupsForSelectedCity(city, playerViewableTilePositions)
} }
unitTable.selectedUnit != null -> { unitTable.selectedUnit != null -> {
val unit = unitTable.selectedUnit!! for (unit in unitTable.selectedUnits) {
updateTilegroupsForSelectedUnit(unit, playerViewableTilePositions) updateTilegroupsForSelectedUnit(unit, playerViewableTilePositions)
} }
}
unitActionOverlay != null -> { unitActionOverlay != null -> {
unitActionOverlay!!.remove() unitActionOverlay!!.remove()
unitActionOverlay = null unitActionOverlay = null

19
core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
View File

@ -107,6 +107,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
} }
if(selectedUnit!=null) { // set texts - this is valid even when it's the same unit, because movement points and health change if(selectedUnit!=null) { // set texts - this is valid even when it's the same unit, because movement points and health change
if(selectedUnits.size==1) { //single selected unit
separator.isVisible = true separator.isVisible = true
val unit = selectedUnit!! val unit = selectedUnit!!
var nameLabelText = unit.name.tr() var nameLabelText = unit.name.tr()
@ -116,7 +117,6 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
selectedUnitHasChanged = true // We need to reload the health bar of the unit in the icon - happens e.g. when picking the Heal Instantly promotion selectedUnitHasChanged = true // We need to reload the health bar of the unit in the icon - happens e.g. when picking the Heal Instantly promotion
} }
unitDescriptionTable.clear() unitDescriptionTable.clear()
unitDescriptionTable.defaults().pad(2f) unitDescriptionTable.defaults().pad(2f)
unitDescriptionTable.add(ImageGetter.getStatIcon("Movement")).size(20f) unitDescriptionTable.add(ImageGetter.getStatIcon("Movement")).size(20f)
@ -151,6 +151,12 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
if (unit.promotions.promotions.size != promotionsTable.children.size) // The unit has been promoted! Reload promotions! if (unit.promotions.promotions.size != promotionsTable.children.size) // The unit has been promoted! Reload promotions!
selectedUnitHasChanged = true selectedUnitHasChanged = true
} }
else { // multiple selected units
unitNameLabel.setText("")
unitDescriptionTable.clear()
}
}
else if (selectedCity != null) { else if (selectedCity != null) {
separator.isVisible=true separator.isVisible=true
val city = selectedCity!! val city = selectedCity!!
@ -178,6 +184,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
unitDescriptionTable.clearListeners() unitDescriptionTable.clearListeners()
if(selectedUnit!=null) { if(selectedUnit!=null) {
if(selectedUnits.size==1) { // single selected unit
unitIconHolder.add(UnitGroup(selectedUnit!!, 30f)).pad(5f) unitIconHolder.add(UnitGroup(selectedUnit!!, 30f)).pad(5f)
for (promotion in selectedUnit!!.promotions.promotions.sorted()) for (promotion in selectedUnit!!.promotions.promotions.sorted())
promotionsTable.add(ImageGetter.getPromotionIcon(promotion)) promotionsTable.add(ImageGetter.getPromotionIcon(promotion))
@ -187,7 +194,11 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
if (selectedUnit == null || selectedUnit!!.promotions.promotions.isEmpty()) return@onClick if (selectedUnit == null || selectedUnit!!.promotions.promotions.isEmpty()) return@onClick
UncivGame.Current.setScreen(PromotionPickerScreen(selectedUnit!!)) UncivGame.Current.setScreen(PromotionPickerScreen(selectedUnit!!))
} }
}
else { // multiple selected units
for (unit in selectedUnits)
unitIconHolder.add(UnitGroup(unit, 30f)).pad(5f)
}
} }
pack() pack()
@ -206,7 +217,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
fun tileSelected(selectedTile: TileInfo) { fun tileSelected(selectedTile: TileInfo) {
val previouslySelectedUnit = selectedUnit val previouslySelectedUnit = selectedUnit
val previousNumberOfSelectedUnits = selectedUnits.size
if (selectedTile.isCityCenter() if (selectedTile.isCityCenter()
&& (selectedTile.getOwner() == worldScreen.viewingCiv || worldScreen.viewingCiv.isSpectator())) { && (selectedTile.getOwner() == worldScreen.viewingCiv || worldScreen.viewingCiv.isSpectator())) {
@ -228,7 +239,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
isVisible = false isVisible = false
} }
if (selectedUnit != previouslySelectedUnit) if (selectedUnit != previouslySelectedUnit || selectedUnits.size != previousNumberOfSelectedUnits)
selectedUnitHasChanged = true selectedUnitHasChanged = true
} }