From 96beed4b3e5e6a7dad90beda6d08e7812d49bb21 Mon Sep 17 00:00:00 2001 From: will-ca Date: Tue, 4 Jan 2022 10:18:13 -0800 Subject: [PATCH] Add `tileScale` in `TileSetConfig`. (#5874) * Add `tileScale` in `TileSetConfig`. * Right, KDoc. --- core/src/com/unciv/models/tilesets/TileSetConfig.kt | 2 ++ core/src/com/unciv/ui/tilegroups/TileGroup.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/models/tilesets/TileSetConfig.kt b/core/src/com/unciv/models/tilesets/TileSetConfig.kt index 67369138a1..2ef68a73ba 100644 --- a/core/src/com/unciv/models/tilesets/TileSetConfig.kt +++ b/core/src/com/unciv/models/tilesets/TileSetConfig.kt @@ -8,6 +8,8 @@ class TileSetConfig { var fogOfWarColor: Color = Color.BLACK /** Name of the tileset to use when this one is missing images. Null to disable. */ var fallbackTileSet: String? = "FantasyHex" + /** Scale factor for hex images, with hex center as origin. */ + var tileScale: Float = 1f var ruleVariants: HashMap> = HashMap() fun updateConfig(other: TileSetConfig){ diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 2391e75e58..ba1f6e1116 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -246,11 +246,11 @@ open class TileGroup(var tileInfo: TileInfo, val tileSetStrings:TileSetStrings, /** Used for: Underlying tile, unit overlays, border images, perhaps for other things in the future. Parent should already be set when calling. */ private fun setHexagonImageSize(hexagonImage: Image) { - // Using "scale" can get really confusing when positioning, how about no hexagonImage.setSize(hexagonImageWidth, hexagonImage.height * hexagonImageWidth / hexagonImage.width) hexagonImage.setOrigin(hexagonImageOrigin.first, hexagonImageOrigin.second) hexagonImage.x = hexagonImagePosition.first hexagonImage.y = hexagonImagePosition.second + hexagonImage.setScale(tileSetStrings.tileSetConfig.tileScale) } private fun updateTileImage(viewingCiv: CivilizationInfo?) {