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

Added icons for the major unit types

Browse Source
This commit is contained in:
Yair Morgenstern
2019-10-13 14:06:18 +03:00
parent fb768682fe
commit 5473afbecf
10 changed files with 575 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -12,6 +12,7 @@ import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.RoadStatus
import com.unciv.logic.map.TileInfo
import com.unciv.models.gamebasics.unit.UnitType
import com.unciv.ui.utils.ImageGetter
import com.unciv.ui.utils.UnitGroup
import com.unciv.ui.utils.center
@ -39,6 +40,8 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
protected var terrainFeatureOverlayImage: Image? = null
protected var terrainFeature:String?=null
protected var cityImage: Image? = null
protected var pixelMilitaryUnitImageLocation=""
protected var pixelMilitaryUnitImage: Image? = null
protected var pixelCivilianUnitImage: Image? = null
@ -213,8 +216,10 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
updateTileImage(true)
updateTerrainBaseImage()
updateTerrainFeatureImage()
updatePixelMilitaryUnit(showMilitaryUnit)
updatePixelCivilianUnit()
updatePixelMilitaryUnit(tileIsViewable && showMilitaryUnit)
updatePixelCivilianUnit(tileIsViewable)
updateCityImage()
updateTileColor(tileIsViewable)
@ -401,36 +406,40 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
}
fun updatePixelMilitaryUnit(showMilitaryUnit: Boolean) {
if (tileInfo.militaryUnit==null || !showMilitaryUnit) {
if (pixelMilitaryUnitImage != null) {
pixelMilitaryUnitImage!!.remove()
pixelMilitaryUnitImage = null
}
} else {
if (pixelMilitaryUnitImage == null) {
var imageLocation = ""
var newImageLocation = ""
if (tileInfo.militaryUnit != null && showMilitaryUnit) {
val unitType = tileInfo.militaryUnit!!.type
val specificUnitIconLocation = tileSetStrings.unitsLocation+tileInfo.militaryUnit!!.name
if(ImageGetter.imageExists(specificUnitIconLocation))
imageLocation = specificUnitIconLocation
else if (tileInfo.militaryUnit!!.type.isLandUnit() && ImageGetter.imageExists(tileSetStrings.landUnit))
imageLocation = tileSetStrings.landUnit
else if (tileInfo.militaryUnit!!.type.isWaterUnit() && ImageGetter.imageExists(tileSetStrings.waterUnit))
imageLocation = tileSetStrings.waterUnit
newImageLocation = specificUnitIconLocation
else if(unitType == UnitType.Mounted) newImageLocation = tileSetStrings.unitsLocation+"Horseman"
else if(unitType == UnitType.Ranged) newImageLocation = tileSetStrings.unitsLocation+"Archer"
else if(unitType == UnitType.Armor) newImageLocation = tileSetStrings.unitsLocation+"Tank"
else if(unitType == UnitType.Siege) newImageLocation = tileSetStrings.unitsLocation+"Catapult"
else if (unitType.isLandUnit() && ImageGetter.imageExists(tileSetStrings.landUnit))
newImageLocation = tileSetStrings.landUnit
else if (unitType.isWaterUnit() && ImageGetter.imageExists(tileSetStrings.waterUnit))
newImageLocation = tileSetStrings.waterUnit
}
if (imageLocation != "") {
val pixelUnitImage = ImageGetter.getImage(imageLocation)
terrainFeatureLayerGroup.addActor(pixelUnitImage)
setHexagonImageSize(pixelUnitImage)// Treat this as A TILE, which gets overlayed on the base tile.
pixelMilitaryUnitImage=pixelUnitImage
}
if(pixelMilitaryUnitImageLocation != newImageLocation){
pixelMilitaryUnitImage?.remove()
pixelMilitaryUnitImage = null
pixelMilitaryUnitImageLocation = newImageLocation
if(newImageLocation!=""){
val pixelUnitImage = ImageGetter.getImage(newImageLocation)
terrainFeatureLayerGroup.addActor(pixelUnitImage)
setHexagonImageSize(pixelUnitImage)// Treat this as A TILE, which gets overlayed on the base tile.
pixelMilitaryUnitImage=pixelUnitImage
}
}
}
fun updatePixelCivilianUnit() {
if (tileInfo.civilianUnit==null) {
fun updatePixelCivilianUnit(tileIsViewable: Boolean) {
if (tileInfo.civilianUnit==null || !tileIsViewable) {
if (pixelCivilianUnitImage != null) {
pixelCivilianUnitImage!!.remove()
pixelCivilianUnitImage = null