AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 11:34:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: single use of GUI in city button to get viewing civ

Browse Source
This commit is contained in:
Yair Morgenstern 2023-02-21 23:53:09 +02:00
parent cb8d75d23b
commit 7a0f1e4a26
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/com/unciv/ui/components/tilegroups/CityButton.kt
View File

@ -18,12 +18,6 @@ import com.unciv.logic.city.PerpetualConstruction
import com.unciv.logic.civilization.diplomacy.RelationshipLevel import com.unciv.logic.civilization.diplomacy.RelationshipLevel
import com.unciv.models.TutorialTrigger import com.unciv.models.TutorialTrigger
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.screens.cityscreen.CityReligionInfoTable
import com.unciv.ui.screens.cityscreen.CityScreen
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popups.Popup
import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen
import com.unciv.ui.screens.basescreen.BaseScreen
import com.unciv.ui.components.BorderedTable import com.unciv.ui.components.BorderedTable
import com.unciv.ui.components.Fonts import com.unciv.ui.components.Fonts
import com.unciv.ui.components.extensions.center import com.unciv.ui.components.extensions.center
@ -33,7 +27,12 @@ import com.unciv.ui.components.extensions.darken
import com.unciv.ui.components.extensions.onClick import com.unciv.ui.components.extensions.onClick
import com.unciv.ui.components.extensions.toGroup import com.unciv.ui.components.extensions.toGroup
import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toLabel
import com.unciv.ui.screens.worldscreen.WorldScreen import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popups.Popup
import com.unciv.ui.screens.basescreen.BaseScreen
import com.unciv.ui.screens.cityscreen.CityReligionInfoTable
import com.unciv.ui.screens.cityscreen.CityScreen
import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen
import kotlin.math.max import kotlin.math.max
import kotlin.math.min import kotlin.math.min
@ -403,6 +402,8 @@ class CityButton(val city: City, private val tileGroup: TileGroup): Table(BaseSc
private var isButtonMoved = false private var isButtonMoved = false
private var isViewable = true private var isViewable = true
val viewingPlayer = GUI.getViewingPlayer()
fun isMoved(): Boolean { fun isMoved(): Boolean {
return isButtonMoved return isButtonMoved
} }
@ -429,8 +430,8 @@ class CityButton(val city: City, private val tileGroup: TileGroup): Table(BaseSc
add(cityTable).row() add(cityTable).row()
// If city state - add influence bar // If city state - add influence bar
if (city.civ.isCityState() && city.civ.knows(GUI.getViewingPlayer())) { if (city.civ.isCityState() && city.civ.knows(viewingPlayer)) {
val diplomacyManager = city.civ.getDiplomacyManager(GUI.getViewingPlayer()) val diplomacyManager = city.civ.getDiplomacyManager(viewingPlayer)
add(InfluenceTable(diplomacyManager.getInfluence(), diplomacyManager.relationshipLevel())).padTop(1f).row() add(InfluenceTable(diplomacyManager.getInfluence(), diplomacyManager.relationshipLevel())).padTop(1f).row()
} }
@ -479,13 +480,13 @@ class CityButton(val city: City, private val tileGroup: TileGroup): Table(BaseSc
(tile.civilianUnit != null) && direction.epsilonEquals(0f, 1f) -> (tile.civilianUnit != null) && direction.epsilonEquals(0f, 1f) ->
insertHiddenUnitMarker(HiddenUnitMarkerPosition.Left) insertHiddenUnitMarker(HiddenUnitMarkerPosition.Left)
// detect military under the city // detect military under the city
(tile.militaryUnit != null && !tile.hasEnemyInvisibleUnit(GUI.getViewingPlayer())) && direction.epsilonEquals(1f, 1f) -> (tile.militaryUnit != null && !tile.hasEnemyInvisibleUnit(viewingPlayer)) && direction.epsilonEquals(1f, 1f) ->
insertHiddenUnitMarker(HiddenUnitMarkerPosition.Center) insertHiddenUnitMarker(HiddenUnitMarkerPosition.Center)
// detect civilian right-below the city // detect civilian right-below the city
(tile.civilianUnit != null) && direction.epsilonEquals(1f, 0f) -> (tile.civilianUnit != null) && direction.epsilonEquals(1f, 0f) ->
insertHiddenUnitMarker(HiddenUnitMarkerPosition.Right) insertHiddenUnitMarker(HiddenUnitMarkerPosition.Right)
} }
} else if (tile.militaryUnit != null && !tile.hasEnemyInvisibleUnit(GUI.getViewingPlayer())) { } else if (tile.militaryUnit != null && !tile.hasEnemyInvisibleUnit(viewingPlayer)) {
when { when {
// detect military left from the city // detect military left from the city
direction.epsilonEquals(0f, 1f) -> direction.epsilonEquals(0f, 1f) ->
@ -516,7 +517,7 @@ class CityButton(val city: City, private val tileGroup: TileGroup): Table(BaseSc
listOfHiddenUnitMarkers.add(indicator) listOfHiddenUnitMarkers.add(indicator)
} }
private fun belongsToViewingCiv() = city.civ == GUI.getViewingPlayer() private fun belongsToViewingCiv() = city.civ == viewingPlayer
private fun setButtonActions() { private fun setButtonActions() {
@ -529,13 +530,12 @@ class CityButton(val city: City, private val tileGroup: TileGroup): Table(BaseSc
// clicking swings the button a little down to allow selection of units there. // clicking swings the button a little down to allow selection of units there.
// this also allows to target selected units to move to the city tile from elsewhere. // this also allows to target selected units to move to the city tile from elsewhere.
if (isButtonMoved) { if (isButtonMoved) {
val viewingCiv = GUI.getViewingPlayer()
// second tap on the button will go to the city screen // second tap on the button will go to the city screen
// if this city belongs to you and you are not iterating though the air units // if this city belongs to you and you are not iterating though the air units
if (GUI.isDebugMapVisible() || viewingCiv.isSpectator() if (GUI.isDebugMapVisible() || viewingPlayer.isSpectator()
|| (belongsToViewingCiv() && !tileGroup.tile.airUnits.contains(unitTable.selectedUnit))) { || (belongsToViewingCiv() && !tileGroup.tile.airUnits.contains(unitTable.selectedUnit))) {
GUI.pushScreen(CityScreen(city)) GUI.pushScreen(CityScreen(city))
} else if (viewingCiv.knows(city.civ)) { } else if (viewingPlayer.knows(city.civ)) {
foreignCityInfoPopup() foreignCityInfoPopup()
} }
} else { } else {
@ -582,7 +582,7 @@ class CityButton(val city: City, private val tileGroup: TileGroup): Table(BaseSc
private fun foreignCityInfoPopup() { private fun foreignCityInfoPopup() {
fun openDiplomacy() { fun openDiplomacy() {
// If city doesn't belong to you, go directly to its owner's diplomacy screen. // If city doesn't belong to you, go directly to its owner's diplomacy screen.
GUI.pushScreen(DiplomacyScreen(GUI.getViewingPlayer(), city.civ)) GUI.pushScreen(DiplomacyScreen(viewingPlayer, city.civ))
} }
// If there's nothing to display cuz no Religion - skip popup // If there's nothing to display cuz no Religion - skip popup