mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-07 00:41:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Can now see when city contains air units

Browse Source
This commit is contained in:
Yair Morgenstern
2019-07-03 23:32:17 +03:00
parent c01c9b96bf
commit 185ec10f10
9 changed files with 596 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -201,6 +201,9 @@ class MapUnit {
* DOES NOT designate whether we can reach that tile in the current turn
*/
fun canMoveTo(tile: TileInfo): Boolean {
if(type.isAirUnit())
return tile.airUnits.size<6 && tile.isCityCenter() && tile.getCity()?.civInfo==civInfo
if(!canPassThrough(tile)) return false
if (type.isCivilian())
@ -410,15 +413,24 @@ class MapUnit {
fun moveToTile(otherTile: TileInfo) {
if(otherTile==getTile()) return // already here!
val distanceToTiles = getDistanceToTiles()
class YouCantGetThereFromHereException(msg: String) : Exception(msg)
if (!distanceToTiles.containsKey(otherTile))
throw YouCantGetThereFromHereException("$this can't get from ${currentTile.position} to ${otherTile.position}.")
class CantEnterThisTileException(msg: String) : Exception(msg)
if(!canMoveTo(otherTile))
throw CantEnterThisTileException("$this can't enter $otherTile")
if(type.isAirUnit()){ // they move differently from all other units
action=null
removeFromTile()
putInTile(otherTile)
currentMovement=0f
return
}
val distanceToTiles = getDistanceToTiles()
class YouCantGetThereFromHereException(msg: String) : Exception(msg)
if (!distanceToTiles.containsKey(otherTile))
throw YouCantGetThereFromHereException("$this can't get from ${currentTile.position} to ${otherTile.position}.")
if(otherTile.isCityCenter() && otherTile.getOwner()!=civInfo)
throw Exception("This is an enemy city, you can't go here!")
@ -453,15 +465,20 @@ class MapUnit {
}
fun removeFromTile(){
if (type.isCivilian()) getTile().civilianUnit=null
else getTile().militaryUnit=null
when {
type.isAirUnit() -> currentTile.airUnits.remove(this)
type.isCivilian() -> getTile().civilianUnit=null
else -> getTile().militaryUnit=null
}
}
fun putInTile(tile:TileInfo){
if(!canMoveTo(tile)) throw Exception("I can't go there!")
if(type.isCivilian())
tile.civilianUnit=this
else tile.militaryUnit=this
when {
!canMoveTo(tile) -> throw Exception("I can't go there!")
type.isAirUnit() -> tile.airUnits.add(this)
type.isCivilian() -> tile.civilianUnit=this
else -> tile.militaryUnit=this
}
currentTile = tile
if(tile.improvement==Constants.ancientRuins && civInfo.isMajorCiv())
getAncientRuinBonus()

1
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -23,6 +23,7 @@ open class TileInfo {
var militaryUnit:MapUnit?=null
var civilianUnit:MapUnit?=null
var airUnits=ArrayList<MapUnit>()
var position: Vector2 = Vector2.Zero
lateinit var baseTerrain: String

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

@ -28,6 +28,8 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
setButtonActions()
addAirUnitTable()
if (isCityViewable && city.health < city.getMaxHealth().toFloat()) {
val healthBar = ImageGetter.getHealthBar(city.health.toFloat(), city.getMaxHealth().toFloat(), 100f)
add(healthBar).row()
@ -41,6 +43,20 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
centerX(tileGroup)
}
private fun addAirUnitTable() {
if (!tileGroup.tileInfo.airUnits.isNotEmpty()) return
val secondarycolor = city.civInfo.getNation().getSecondaryColor()
val airUnitTable = Table().apply { defaults().pad(5f) }
airUnitTable.background = ImageGetter.getDrawable("OtherIcons/civTableBackground.png")
.tint(city.civInfo.getNation().getColor())
val aircraftImage = ImageGetter.getImage("OtherIcons/Aircraft")
aircraftImage.color = secondarycolor
airUnitTable.add(aircraftImage).size(15f)
airUnitTable.add(tileGroup.tileInfo.airUnits.size.toString().toLabel()
.setFontColor(secondarycolor).setFontSize(15))
add(airUnitTable).row()
}
private fun setButtonActions() {
val unitTable = tileGroup.worldScreen.bottomBar.unitTable