AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move border below icons (#7452)

Browse Source
This commit is contained in:
OptimizedForDensity 2022-07-14 19:27:26 -04:00 committed by GitHub
parent cb6160c4a8
commit ecf9de6cfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/ui/map/TileGroupMap.kt
View File

@ -108,6 +108,7 @@ class TileGroupMap<T: TileGroup>(
val baseLayers = ArrayList<ActionlessGroup>() val baseLayers = ArrayList<ActionlessGroup>()
val featureLayers = ArrayList<ActionlessGroup>() val featureLayers = ArrayList<ActionlessGroup>()
val borderLayers = ArrayList<ActionlessGroup>()
val miscLayers = ArrayList<ActionlessGroup>() val miscLayers = ArrayList<ActionlessGroup>()
val pixelUnitLayers = ArrayList<ActionlessGroup>() val pixelUnitLayers = ArrayList<ActionlessGroup>()
val circleFogCrosshairLayers = ArrayList<ActionlessGroup>() val circleFogCrosshairLayers = ArrayList<ActionlessGroup>()
@ -120,6 +121,7 @@ class TileGroupMap<T: TileGroup>(
// now, we steal the subgroups from all the tilegroups, that's how we form layers! // now, we steal the subgroups from all the tilegroups, that's how we form layers!
baseLayers.add(group.baseLayerGroup.apply { setPosition(group.x,group.y) }) baseLayers.add(group.baseLayerGroup.apply { setPosition(group.x,group.y) })
featureLayers.add(group.terrainFeatureLayerGroup.apply { setPosition(group.x,group.y) }) featureLayers.add(group.terrainFeatureLayerGroup.apply { setPosition(group.x,group.y) })
borderLayers.add(group.borderLayerGroup.apply { setPosition(group.x,group.y) })
miscLayers.add(group.miscLayerGroup.apply { setPosition(group.x,group.y) }) miscLayers.add(group.miscLayerGroup.apply { setPosition(group.x,group.y) })
pixelUnitLayers.add(group.pixelMilitaryUnitGroup.apply { setPosition(group.x,group.y) }) pixelUnitLayers.add(group.pixelMilitaryUnitGroup.apply { setPosition(group.x,group.y) })
pixelUnitLayers.add(group.pixelCivilianUnitGroup.apply { setPosition(group.x,group.y) }) pixelUnitLayers.add(group.pixelCivilianUnitGroup.apply { setPosition(group.x,group.y) })
@ -132,6 +134,7 @@ class TileGroupMap<T: TileGroup>(
for (mirrorTile in mirrorTileGroups[group.tileInfo]!!.toList()) { for (mirrorTile in mirrorTileGroups[group.tileInfo]!!.toList()) {
baseLayers.add(mirrorTile.baseLayerGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) }) baseLayers.add(mirrorTile.baseLayerGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) })
featureLayers.add(mirrorTile.terrainFeatureLayerGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) }) featureLayers.add(mirrorTile.terrainFeatureLayerGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) })
borderLayers.add(mirrorTile.borderLayerGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) })
miscLayers.add(mirrorTile.miscLayerGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) }) miscLayers.add(mirrorTile.miscLayerGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) })
pixelUnitLayers.add(mirrorTile.pixelMilitaryUnitGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) }) pixelUnitLayers.add(mirrorTile.pixelMilitaryUnitGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) })
pixelUnitLayers.add(mirrorTile.pixelCivilianUnitGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) }) pixelUnitLayers.add(mirrorTile.pixelCivilianUnitGroup.apply { setPosition(mirrorTile.x,mirrorTile.y) })
@ -144,6 +147,7 @@ class TileGroupMap<T: TileGroup>(
} }
for (group in baseLayers) addActor(group) for (group in baseLayers) addActor(group)
for (group in featureLayers) addActor(group) for (group in featureLayers) addActor(group)
for (group in borderLayers) addActor(group)
for (group in miscLayers) addActor(group) for (group in miscLayers) addActor(group)
for (group in pixelUnitLayers) addActor(group) for (group in pixelUnitLayers) addActor(group)
for (group in circleFogCrosshairLayers) addActor(group) for (group in circleFogCrosshairLayers) addActor(group)

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

@ -85,6 +85,7 @@ open class TileGroup(
class MiscLayerGroupClass(groupSize: Float) : ActionlessGroup(groupSize) { class MiscLayerGroupClass(groupSize: Float) : ActionlessGroup(groupSize) {
override fun draw(batch: Batch?, parentAlpha: Float) = super.draw(batch, parentAlpha) override fun draw(batch: Batch?, parentAlpha: Float) = super.draw(batch, parentAlpha)
} }
val borderLayerGroup = MiscLayerGroupClass(groupSize)
val miscLayerGroup = MiscLayerGroupClass(groupSize) val miscLayerGroup = MiscLayerGroupClass(groupSize)
var tileYieldGroupInitialized = false var tileYieldGroupInitialized = false
@ -195,6 +196,7 @@ open class TileGroup(
this.setSize(groupSize, groupSize) this.setSize(groupSize, groupSize)
this.addActor(baseLayerGroup) this.addActor(baseLayerGroup)
this.addActor(terrainFeatureLayerGroup) this.addActor(terrainFeatureLayerGroup)
this.addActor(borderLayerGroup)
this.addActor(miscLayerGroup) this.addActor(miscLayerGroup)
this.addActor(pixelMilitaryUnitGroup) this.addActor(pixelMilitaryUnitGroup)
this.addActor(pixelCivilianUnitGroup) this.addActor(pixelCivilianUnitGroup)
@ -562,7 +564,7 @@ open class TileGroup(
val innerBorderImage = ImageGetter.getImage( val innerBorderImage = ImageGetter.getImage(
tileSetStrings.orFallback { getBorder(borderShapeString,"Inner") } tileSetStrings.orFallback { getBorder(borderShapeString,"Inner") }
) )
miscLayerGroup.addActor(innerBorderImage) borderLayerGroup.addActor(innerBorderImage)
images.add(innerBorderImage) images.add(innerBorderImage)
setHexagonImageSize(innerBorderImage) setHexagonImageSize(innerBorderImage)
innerBorderImage.rotateBy(angle) innerBorderImage.rotateBy(angle)
@ -571,7 +573,7 @@ open class TileGroup(
val outerBorderImage = ImageGetter.getImage( val outerBorderImage = ImageGetter.getImage(
tileSetStrings.orFallback { getBorder(borderShapeString, "Outer") } tileSetStrings.orFallback { getBorder(borderShapeString, "Outer") }
) )
miscLayerGroup.addActor(outerBorderImage) borderLayerGroup.addActor(outerBorderImage)
images.add(outerBorderImage) images.add(outerBorderImage)
setHexagonImageSize(outerBorderImage) setHexagonImageSize(outerBorderImage)
outerBorderImage.rotateBy(angle) outerBorderImage.rotateBy(angle)