From 3e7bbce9fec55a07b5e619edab87cf7cd192f0e8 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Mon, 29 Jul 2024 15:24:17 +0300 Subject: [PATCH] Fixed tests, since "1 radius with world wrap" does not fit 1-radius map tests --- core/src/com/unciv/logic/map/MapParameters.kt | 2 +- tests/src/com/unciv/testing/TestGame.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/map/MapParameters.kt b/core/src/com/unciv/logic/map/MapParameters.kt index 62e7cb904a..8f6e768d6f 100644 --- a/core/src/com/unciv/logic/map/MapParameters.kt +++ b/core/src/com/unciv/logic/map/MapParameters.kt @@ -7,9 +7,9 @@ import com.unciv.models.metadata.BaseRuleset object MapShape { + const val rectangular = "Rectangular" const val hexagonal = "Hexagonal" const val flatEarth = "Flat Earth Hexagonal" - const val rectangular = "Rectangular" } object MapGeneratedMainType { diff --git a/tests/src/com/unciv/testing/TestGame.kt b/tests/src/com/unciv/testing/TestGame.kt index 44dd51c9fd..4c5c9d500f 100644 --- a/tests/src/com/unciv/testing/TestGame.kt +++ b/tests/src/com/unciv/testing/TestGame.kt @@ -85,7 +85,7 @@ class TestGame { * Removes all existing tiles. All new tiles have terrain [baseTerrain] */ fun makeHexagonalMap(newRadius: Int, baseTerrain: String = Constants.desert) { - val newTileMap = TileMap(newRadius, ruleset, tileMap.mapParameters.worldWrap) + val newTileMap = TileMap(newRadius, ruleset, false) newTileMap.mapParameters.mapSize = MapSize(newRadius) for (row in tileMap.tileMatrix)