From 51bbf2becdd7b056bc7cf5ae2360910fb740dae2 Mon Sep 17 00:00:00 2001 From: Duwibi <86431918+Duwibi@users.noreply.github.com> Date: Fri, 4 Apr 2025 18:42:56 +0200 Subject: [PATCH] Fix difference in translation strings regarding the new Between Two Seas map (#416) ##Description: I renamed all instances of "TwoSeas" to "BetweenTwoSeas". That way it lowers the confusion but more importrantly - it removes the difference between the translation strings for the map. Please put your Discord username so you can be contacted if a bug or regression is found: --- resources/maps/{TwoSeas.bin => BetweenTwoSeas.bin} | 0 .../maps/{TwoSeas.json => BetweenTwoSeas.json} | 2 +- resources/maps/{TwoSeas.png => BetweenTwoSeas.png} | Bin .../{TwoSeasMini.bin => BetweenTwoSeasMini.bin} | 0 .../{TwoSeasThumb.webp => BetweenTwoSeasThumb.webp} | Bin src/client/components/Maps.ts | 2 +- src/client/utilities/Maps.ts | 6 +++--- src/core/configuration/DefaultConfig.ts | 8 +++++--- src/core/game/Game.ts | 2 +- src/core/game/TerrainMapFileLoader.ts | 2 +- src/scripts/generateTerrainMaps.ts | 2 +- src/server/MapPlaylist.ts | 2 +- 12 files changed, 14 insertions(+), 12 deletions(-) rename resources/maps/{TwoSeas.bin => BetweenTwoSeas.bin} (100%) rename resources/maps/{TwoSeas.json => BetweenTwoSeas.json} (98%) rename resources/maps/{TwoSeas.png => BetweenTwoSeas.png} (100%) rename resources/maps/{TwoSeasMini.bin => BetweenTwoSeasMini.bin} (100%) rename resources/maps/{TwoSeasThumb.webp => BetweenTwoSeasThumb.webp} (100%) diff --git a/resources/maps/TwoSeas.bin b/resources/maps/BetweenTwoSeas.bin similarity index 100% rename from resources/maps/TwoSeas.bin rename to resources/maps/BetweenTwoSeas.bin diff --git a/resources/maps/TwoSeas.json b/resources/maps/BetweenTwoSeas.json similarity index 98% rename from resources/maps/TwoSeas.json rename to resources/maps/BetweenTwoSeas.json index 38bdaa90d..ea35ffa16 100644 --- a/resources/maps/TwoSeas.json +++ b/resources/maps/BetweenTwoSeas.json @@ -1,5 +1,5 @@ { - "name": "TwoSeas", + "name": "BetweenTwoSeas", "width": 1778, "height": 1062, "nations": [ diff --git a/resources/maps/TwoSeas.png b/resources/maps/BetweenTwoSeas.png similarity index 100% rename from resources/maps/TwoSeas.png rename to resources/maps/BetweenTwoSeas.png diff --git a/resources/maps/TwoSeasMini.bin b/resources/maps/BetweenTwoSeasMini.bin similarity index 100% rename from resources/maps/TwoSeasMini.bin rename to resources/maps/BetweenTwoSeasMini.bin diff --git a/resources/maps/TwoSeasThumb.webp b/resources/maps/BetweenTwoSeasThumb.webp similarity index 100% rename from resources/maps/TwoSeasThumb.webp rename to resources/maps/BetweenTwoSeasThumb.webp diff --git a/src/client/components/Maps.ts b/src/client/components/Maps.ts index 1ff02fe1c..f4d419185 100644 --- a/src/client/components/Maps.ts +++ b/src/client/components/Maps.ts @@ -21,7 +21,7 @@ export const MapDescription: Record = { Australia: "Australia", Iceland: "Iceland", Japan: "Japan", - TwoSeas: "Between Two Seas", + BetweenTwoSeas: "Between Two Seas", KnownWorld: "Known World", }; diff --git a/src/client/utilities/Maps.ts b/src/client/utilities/Maps.ts index d3be87796..a616f7310 100644 --- a/src/client/utilities/Maps.ts +++ b/src/client/utilities/Maps.ts @@ -1,6 +1,7 @@ import africa from "../../../resources/maps/AfricaThumb.webp"; import asia from "../../../resources/maps/AsiaThumb.webp"; import australia from "../../../resources/maps/AustraliaThumb.webp"; +import betweenTwoSeas from "../../../resources/maps/BetweenTwoSeasThumb.webp"; import blackSea from "../../../resources/maps/BlackSeaThumb.webp"; import britannia from "../../../resources/maps/BritanniaThumb.webp"; import europe from "../../../resources/maps/EuropeThumb.webp"; @@ -14,7 +15,6 @@ import northAmerica from "../../../resources/maps/NorthAmericaThumb.webp"; import oceania from "../../../resources/maps/OceaniaThumb.webp"; import pangaea from "../../../resources/maps/PangaeaThumb.webp"; import southAmerica from "../../../resources/maps/SouthAmericaThumb.webp"; -import twoSeas from "../../../resources/maps/TwoSeasThumb.webp"; import world from "../../../resources/maps/WorldMapThumb.webp"; import { GameMapType } from "../../core/game/Game"; @@ -53,8 +53,8 @@ export function getMapsImage(map: GameMapType): string { return iceland; case GameMapType.Japan: return japan; - case GameMapType.TwoSeas: - return twoSeas; + case GameMapType.BetweenTwoSeas: + return betweenTwoSeas; case GameMapType.KnownWorld: return knownworld; default: diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts index b11aa63ec..0fa8f52b1 100644 --- a/src/core/configuration/DefaultConfig.ts +++ b/src/core/configuration/DefaultConfig.ts @@ -95,9 +95,11 @@ export abstract class DefaultServerConfig implements ServerConfig { } // Maps smaller than ~2 mil pixels if ( - [GameMapType.TwoSeas, GameMapType.BlackSea, GameMapType.Pangaea].includes( - map, - ) + [ + GameMapType.BetweenTwoSeas, + GameMapType.BlackSea, + GameMapType.Pangaea, + ].includes(map) ) { return Math.random() < 0.2 ? 60 : 35; } diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts index 002aeff18..f5e51c15c 100644 --- a/src/core/game/Game.ts +++ b/src/core/game/Game.ts @@ -60,7 +60,7 @@ export enum GameMapType { Australia = "Australia", Iceland = "Iceland", Japan = "Japan", - TwoSeas = "Between Two Seas", + BetweenTwoSeas = "Between Two Seas", KnownWorld = "Known World", } diff --git a/src/core/game/TerrainMapFileLoader.ts b/src/core/game/TerrainMapFileLoader.ts index db730de11..636709968 100644 --- a/src/core/game/TerrainMapFileLoader.ts +++ b/src/core/game/TerrainMapFileLoader.ts @@ -39,7 +39,7 @@ const MAP_FILE_NAMES: Record = { [GameMapType.Australia]: "Australia", [GameMapType.Iceland]: "Iceland", [GameMapType.Japan]: "Japan", - [GameMapType.TwoSeas]: "TwoSeas", + [GameMapType.BetweenTwoSeas]: "BetweenTwoSeas", [GameMapType.KnownWorld]: "KnownWorld", }; diff --git a/src/scripts/generateTerrainMaps.ts b/src/scripts/generateTerrainMaps.ts index a63dae382..7f83de7d1 100644 --- a/src/scripts/generateTerrainMaps.ts +++ b/src/scripts/generateTerrainMaps.ts @@ -19,7 +19,7 @@ const maps = [ "Australia", "Pangaea", "Iceland", - "TwoSeas", + "BetweenTwoSeas", "Japan", "KnownWorld", ]; diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts index 488d48aea..5fdd442f8 100644 --- a/src/server/MapPlaylist.ts +++ b/src/server/MapPlaylist.ts @@ -88,7 +88,7 @@ export class MapPlaylist { Pangaea: 1, Asia: 1, Mars: 1, - TwoSeas: 3, + BetweenTwoSeas: 3, Japan: 3, BlackSea: 1, };