mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-07 11:25:58 +00:00
Add Faroe Islands map (#441)
## Description: This PR adds the new "Faroe Islands" map that is based on the real islands. It has 6 nations - the 6 regions of the Feroe Islands. Fixes #460 ## Please complete the following: - [ ] I have added screenshots for all UI updates - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: Nikola123
This commit is contained in:
@@ -120,7 +120,8 @@
|
||||
"pangaea": "Pangaea",
|
||||
"japan": "Japan and Neighbors",
|
||||
"betweentwoseas": "Between Two Seas",
|
||||
"knownworld": "Known World"
|
||||
"knownworld": "Known World",
|
||||
"faroeislands": "Faroe Islands"
|
||||
},
|
||||
"private_lobby": {
|
||||
"title": "Join Private Lobby",
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,43 @@
|
||||
{
|
||||
"name": "Faroe Islands",
|
||||
"width": 1600,
|
||||
"height": 2000,
|
||||
"nations": [
|
||||
{
|
||||
"coordinates": [920, 1780],
|
||||
"name": "Suduroy Region",
|
||||
"strength": 2,
|
||||
"flag": "fo"
|
||||
},
|
||||
{
|
||||
"coordinates": [880, 1070],
|
||||
"name": "Sandoy Region",
|
||||
"strength": 2,
|
||||
"flag": "fo"
|
||||
},
|
||||
{
|
||||
"coordinates": [480, 630],
|
||||
"name": "Vagar Region",
|
||||
"strength": 1,
|
||||
"flag": "fo"
|
||||
},
|
||||
{
|
||||
"coordinates": [735, 580],
|
||||
"name": "Streymoy Region",
|
||||
"strength": 2,
|
||||
"flag": "fo"
|
||||
},
|
||||
{
|
||||
"coordinates": [815, 375],
|
||||
"name": "Eysturoy Region",
|
||||
"strength": 2,
|
||||
"flag": "fo"
|
||||
},
|
||||
{
|
||||
"coordinates": [1115, 265],
|
||||
"name": "Nordoyar Region",
|
||||
"strength": 2,
|
||||
"flag": "fo"
|
||||
}
|
||||
]
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 663 KiB |
File diff suppressed because one or more lines are too long
Binary file not shown.
|
After Width: | Height: | Size: 9.5 KiB |
@@ -23,6 +23,7 @@ export const MapDescription: Record<keyof typeof GameMapType, string> = {
|
||||
Japan: "Japan",
|
||||
BetweenTwoSeas: "Between Two Seas",
|
||||
KnownWorld: "Known World",
|
||||
FaroeIslands: "Faroe Islands",
|
||||
};
|
||||
|
||||
@customElement("map-display")
|
||||
|
||||
@@ -5,6 +5,7 @@ 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";
|
||||
import faroeislands from "../../../resources/maps/FaroeIslandsThumb.webp";
|
||||
import gatewayToTheAtlantic from "../../../resources/maps/GatewayToTheAtlanticThumb.webp";
|
||||
import iceland from "../../../resources/maps/IcelandThumb.webp";
|
||||
import japan from "../../../resources/maps/JapanThumb.webp";
|
||||
@@ -57,6 +58,8 @@ export function getMapsImage(map: GameMapType): string {
|
||||
return betweenTwoSeas;
|
||||
case GameMapType.KnownWorld:
|
||||
return knownworld;
|
||||
case GameMapType.FaroeIslands:
|
||||
return faroeislands;
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
|
||||
@@ -89,6 +89,7 @@ export abstract class DefaultServerConfig implements ServerConfig {
|
||||
GameMapType.Mars,
|
||||
GameMapType.Oceania,
|
||||
GameMapType.Japan, // Japan at this level because its 2/3 water
|
||||
GameMapType.FaroeIslands,
|
||||
].includes(map)
|
||||
) {
|
||||
return Math.random() < 0.2 ? 70 : 40;
|
||||
|
||||
@@ -67,6 +67,7 @@ export enum GameMapType {
|
||||
Japan = "Japan",
|
||||
BetweenTwoSeas = "Between Two Seas",
|
||||
KnownWorld = "Known World",
|
||||
FaroeIslands = "FaroeIslands",
|
||||
}
|
||||
|
||||
export enum GameType {
|
||||
|
||||
@@ -41,6 +41,7 @@ const MAP_FILE_NAMES: Record<GameMapType, string> = {
|
||||
[GameMapType.Japan]: "Japan",
|
||||
[GameMapType.BetweenTwoSeas]: "BetweenTwoSeas",
|
||||
[GameMapType.KnownWorld]: "KnownWorld",
|
||||
[GameMapType.FaroeIslands]: "FaroeIslands",
|
||||
};
|
||||
|
||||
class GameMapLoader {
|
||||
|
||||
@@ -22,6 +22,7 @@ const maps = [
|
||||
"BetweenTwoSeas",
|
||||
"Japan",
|
||||
"KnownWorld",
|
||||
"FaroeIslands",
|
||||
];
|
||||
|
||||
const removeSmall = true;
|
||||
|
||||
@@ -101,6 +101,7 @@ export class MapPlaylist {
|
||||
BetweenTwoSeas: 3,
|
||||
Japan: 3,
|
||||
BlackSea: 1,
|
||||
FaroeIslands: 2,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user