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:

<Nikola123>
This commit is contained in:
Duwibi
2025-04-04 18:42:56 +02:00
committed by GitHub
parent c700b7956f
commit 51bbf2becd
12 changed files with 14 additions and 12 deletions
@@ -1,5 +1,5 @@
{
"name": "TwoSeas",
"name": "BetweenTwoSeas",
"width": 1778,
"height": 1062,
"nations": [

Before

Width:  |  Height:  |  Size: 7.2 MiB

After

Width:  |  Height:  |  Size: 7.2 MiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

+1 -1
View File
@@ -21,7 +21,7 @@ export const MapDescription: Record<keyof typeof GameMapType, string> = {
Australia: "Australia",
Iceland: "Iceland",
Japan: "Japan",
TwoSeas: "Between Two Seas",
BetweenTwoSeas: "Between Two Seas",
KnownWorld: "Known World",
};
+3 -3
View File
@@ -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:
+5 -3
View File
@@ -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;
}
+1 -1
View File
@@ -60,7 +60,7 @@ export enum GameMapType {
Australia = "Australia",
Iceland = "Iceland",
Japan = "Japan",
TwoSeas = "Between Two Seas",
BetweenTwoSeas = "Between Two Seas",
KnownWorld = "Known World",
}
+1 -1
View File
@@ -39,7 +39,7 @@ const MAP_FILE_NAMES: Record<GameMapType, string> = {
[GameMapType.Australia]: "Australia",
[GameMapType.Iceland]: "Iceland",
[GameMapType.Japan]: "Japan",
[GameMapType.TwoSeas]: "TwoSeas",
[GameMapType.BetweenTwoSeas]: "BetweenTwoSeas",
[GameMapType.KnownWorld]: "KnownWorld",
};
+1 -1
View File
@@ -19,7 +19,7 @@ const maps = [
"Australia",
"Pangaea",
"Iceland",
"TwoSeas",
"BetweenTwoSeas",
"Japan",
"KnownWorld",
];
+1 -1
View File
@@ -88,7 +88,7 @@ export class MapPlaylist {
Pangaea: 1,
Asia: 1,
Mars: 1,
TwoSeas: 3,
BetweenTwoSeas: 3,
Japan: 3,
BlackSea: 1,
};