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

Added river rendering, river effects not implemented yet

Browse Source
This commit is contained in:
Yair Morgenstern
2019-10-18 09:16:08 +03:00
parent e71bc978b9
commit 397d9ccec3
4 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,10 @@ open class TileInfo {
var roadStatus = RoadStatus.None
var turnsToImprovement: Int = 0
var hasBottomRightRiver = false
var hasBottomRiver = false
var hasBottomLeftRiver = false
fun clone(): TileInfo {
val toReturn = TileInfo()
if(militaryUnit!=null) toReturn.militaryUnit=militaryUnit!!.clone()

4
core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
View File

@ -31,6 +31,10 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
var clearImprovement=false
var selectedImprovement:TileImprovement?=null
var toggleBottomRightRiver=false
var toggleBottomRiver=false
var toggleBottomLeftRiver=false
val editorPickTable = Table()
private var currentHex: Actor = Group()

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

@ -182,6 +182,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
val showMilitaryUnit = viewingCiv == null || showMilitaryUnit(viewingCiv)
updateTileImage(true)
updateRivers(tileInfo.hasBottomRightRiver, tileInfo.hasBottomRiver, tileInfo.hasBottomLeftRiver)
updateTerrainBaseImage()
updateTerrainFeatureImage()
@ -398,7 +399,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
pixelMilitaryUnitImage = null
pixelMilitaryUnitImageLocation = newImageLocation
if (newImageLocation != "") {
if (newImageLocation != "" && ImageGetter.imageExists(newImageLocation)) {
val pixelUnitImage = ImageGetter.getImage(newImageLocation)
terrainFeatureLayerGroup.addActor(pixelUnitImage)
setHexagonImageSize(pixelUnitImage)// Treat this as A TILE, which gets overlayed on the base tile.
@ -425,7 +426,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
pixelCivilianUnitImage = null
pixelCivilianUnitImageLocation = newImageLocation
if (newImageLocation != "") {
if (newImageLocation != "" && ImageGetter.imageExists(newImageLocation)) {
val pixelUnitImage = ImageGetter.getImage(newImageLocation)
terrainFeatureLayerGroup.addActor(pixelUnitImage)
setHexagonImageSize(pixelUnitImage)// Treat this as A TILE, which gets overlayed on the base tile.
@ -435,6 +436,30 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
}
var bottomRightRiverImage :Image?=null
var bottomRiverImage :Image?=null
var bottomLeftRiverImage :Image?=null
fun updateRivers(displayBottomRight:Boolean,displayBottom:Boolean,displayBottomLeft:Boolean){
bottomRightRiverImage = updateRiver(bottomRightRiverImage,displayBottomRight,tileSetStrings.bottomRightRiver)
bottomRiverImage = updateRiver(bottomRiverImage, displayBottom, tileSetStrings.bottomRiver)
bottomLeftRiverImage = updateRiver(bottomLeftRiverImage,displayBottomLeft,tileSetStrings.bottomLeftRiver)
}
fun updateRiver(currentImage:Image?, shouldDisplay:Boolean,imageName:String): Image? {
if(!shouldDisplay){
currentImage?.remove()
return null
}
else{
if(currentImage!=null) return currentImage
if(!ImageGetter.imageExists(imageName)) return null // Old "Default" tileset gets no rivers.
val newImage = ImageGetter.getImage(imageName)
baseLayerGroup.addActor(newImage)
setHexagonImageSize(newImage)
return newImage
}
}
fun showCircle(color: Color, alpha: Float = 0.3f) {
circleImage.isVisible = true
@ -444,4 +469,4 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
fun hideCircle() {
circleImage.isVisible = false
}
}
}

3
core/src/com/unciv/ui/tilegroups/TileSetStrings.kt
View File

@ -14,6 +14,9 @@ class TileSetStrings {
val tilesLocation = tileSetLocation+"Tiles/"
val cityTile = tilesLocation+"City"
val bottomRightRiver = tilesLocation+"River-BottomRight"
val bottomRiver = tilesLocation+"River-Bottom"
val bottomLeftRiver = tilesLocation+"River-BottomLeft"
val unitsLocation = tileSetLocation+"Units/"
val landUnit = unitsLocation+"LandUnit"