Skip to content

Commit 269335e

Browse files
committed
Added settings for circles vs hexagons for movable tiles, since it's a close one
1 parent 2025d2a commit 269335e

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

Diff for: android/assets/jsons/translations/template.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ Experimental Demographics scoreboard =
831831
Unit movement button =
832832
Unit actions menu =
833833
Never close popups by clicking outside =
834-
834+
Use circles to indicate movable tiles =
835835
Size of Unitset art in Civilopedia =
836836

837837
### Visual Hints subgroup

Diff for: core/src/com/unciv/models/metadata/GameSettings.kt

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ class GameSettings {
8989
var useDemographics: Boolean = false
9090
var showZoomButtons: Boolean = false
9191
var forbidPopupClickBehindToClose: Boolean = false
92+
var useCirclesToIndicateMovableTiles: Boolean = false
9293

9394
var unitMovementButtonAnimation: Boolean = false
9495
var unitActionsTableAnimation: Boolean = false

Diff for: core/src/com/unciv/ui/popups/options/DisplayTab.kt

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ fun displayTab(
7575
addResetTutorials(this, settings)
7676
optionsPopup.addCheckbox(this, "Show zoom buttons in world screen", settings.showZoomButtons, true) { settings.showZoomButtons = it }
7777
optionsPopup.addCheckbox(this, "Never close popups by clicking outside", settings.forbidPopupClickBehindToClose, false) { settings.forbidPopupClickBehindToClose = it }
78+
optionsPopup.addCheckbox(this, "Use circles to indicate movable tiles", settings.useCirclesToIndicateMovableTiles, true) { settings.useCirclesToIndicateMovableTiles = it }
7879
addPediaUnitArtSizeSlider(this, settings, optionsPopup.selectBoxMinWidth)
7980

8081
addSeparator()

Diff for: core/src/com/unciv/ui/screens/worldscreen/worldmap/WorldMapTileUpdater.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,12 @@ object WorldMapTileUpdater {
151151
if (unit.movement.canMoveTo(tile) ||
152152
unit.movement.isUnknownTileWeShouldAssumeToBePassable(tile) && !unit.baseUnit.movesLikeAirUnits
153153
) {
154-
group.layerMisc.overlayTerrain(moveTileOverlayColor, 0.5f)
154+
if (UncivGame.Current.settings.useCirclesToIndicateMovableTiles) {
155+
val alpha = if (UncivGame.Current.settings.singleTapMove) 0.7f else 0.3f
156+
group.layerOverlay.showHighlight(moveTileOverlayColor, alpha)
157+
}
158+
159+
else group.layerMisc.overlayTerrain(moveTileOverlayColor, 0.4f)
155160
}
156161

157162
}

0 commit comments

Comments
 (0)