mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 09:30:45 +00:00
Add new Bering Sea map, reduce Strait rotation (#3706)
## Description: Re-submission of older PR: https://github.com/openfrontio/OpenFrontIO/pull/3617 <img width="612" height="396" alt="image" src="https://github.com/user-attachments/assets/955a0b2e-1df9-4fa3-a389-235f46a90f69" /> Regarding Bering Sea and Bering strait maps: <img width="576" height="87" alt="image" src="https://github.com/user-attachments/assets/f57031eb-f9c0-4e1e-83ff-204df51bb6c2" /> <img width="589" height="93" alt="image" src="https://github.com/user-attachments/assets/629e71ba-489f-41cf-b67e-2476af8704f2" /> Because of mixed opinions about replacing the maps, i propose at least this temporary compromise: Bering Sea gets added as a new map and Bering Strait gets its rotation lowered to a small number. Since the classic maps are probably being taken off rotation, we should have some small breathing space for the 2 maps. In the near future we should discuss between mapmakers in the dev server whether we keep, replace or completely take Bering Strait off rotation, and/or a community poll. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: tri.star1011
This commit is contained in:
@@ -44,6 +44,11 @@ Licensed under [Open Data Commons Open Database License (ODbL)](https://opendata
|
||||
Copernicus Global Digital Elevation Models distributed by OpenTopography.
|
||||
Copyright © opentopography.org. All Rights Reserved. [Terms of Use](https://opentopography.org/usageterms)
|
||||
|
||||
### NASA
|
||||
|
||||
[NASA Earth Observatory](https://science.nasa.gov/earth/earth-observatory/blue-marble-next-generation/topography-bathymetry-maps/)
|
||||
[Public Domain](https://www.nasa.gov/nasa-brand-center/images-and-media/)
|
||||
|
||||
### Hawaii Relief Map
|
||||
|
||||
[USA Hawaii relief location map](https://commons.wikimedia.org/wiki/File:USA_Hawaii_relief_location_map.svg) by NordNordWest
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.8 MiB |
@@ -0,0 +1,125 @@
|
||||
{
|
||||
"name": "Bering Sea",
|
||||
"nations": [
|
||||
{
|
||||
"coordinates": [1043, 121],
|
||||
"name": "Polar Bears",
|
||||
"flag": "polar_bears"
|
||||
},
|
||||
{
|
||||
"coordinates": [1725, 158],
|
||||
"name": "Utqiaġvik",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [2152, 270],
|
||||
"name": "Prudhoe Bay",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [1973, 828],
|
||||
"name": "Anchorage",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [2389, 1070],
|
||||
"name": "Juneau",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [2381, 800],
|
||||
"name": "Whitehorse",
|
||||
"flag": "ca"
|
||||
},
|
||||
{
|
||||
"coordinates": [1561, 452],
|
||||
"name": "Kotzebue",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [1491, 621],
|
||||
"name": "Nome",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [1609, 918],
|
||||
"name": "Bethel",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [1820, 1084],
|
||||
"name": "Kodiak",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [1979, 625],
|
||||
"name": "Fairbanks",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [2062, 468],
|
||||
"name": "Fort Yukon",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [1425, 1283],
|
||||
"name": "Unalaska",
|
||||
"flag": "Alaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [375, 1298],
|
||||
"name": "Petropavlovsk-Kamchatsky",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [479, 1107],
|
||||
"name": "Ust-Kamchatsk",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [965, 710],
|
||||
"name": "Anadyr",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [583, 749],
|
||||
"name": "Kamenskoye",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [1192, 588],
|
||||
"name": "Provideniya",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [718, 366],
|
||||
"name": "Bilibino",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [1048, 493],
|
||||
"name": "Egvekinot",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [410, 275],
|
||||
"name": "Chersky",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [254, 417],
|
||||
"name": "Srednekolymsk",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [127, 565],
|
||||
"name": "Zyryanka",
|
||||
"flag": "ru"
|
||||
},
|
||||
{
|
||||
"coordinates": [161, 917],
|
||||
"name": "Magadan",
|
||||
"flag": "ru"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -91,6 +91,7 @@ var maps = []struct {
|
||||
{Name: "luna"},
|
||||
{Name: "conakry"},
|
||||
{Name: "caucasus"},
|
||||
{Name: "beringsea"},
|
||||
{Name: "big_plains", IsTest: true},
|
||||
{Name: "half_land_half_ocean", IsTest: true},
|
||||
{Name: "ocean_and_land", IsTest: true},
|
||||
|
||||
@@ -360,7 +360,8 @@
|
||||
"straitofmalacca": "Strait Of Malacca",
|
||||
"luna": "Luna",
|
||||
"conakry": "Conakry",
|
||||
"caucasus": "Caucasus"
|
||||
"caucasus": "Caucasus",
|
||||
"beringsea": "Bering Sea"
|
||||
},
|
||||
"map_categories": {
|
||||
"featured": "Featured",
|
||||
|
||||
@@ -0,0 +1,140 @@
|
||||
{
|
||||
"map": {
|
||||
"height": 1600,
|
||||
"num_land_tiles": 1615723,
|
||||
"width": 2500
|
||||
},
|
||||
"map16x": {
|
||||
"height": 400,
|
||||
"num_land_tiles": 96268,
|
||||
"width": 625
|
||||
},
|
||||
"map4x": {
|
||||
"height": 800,
|
||||
"num_land_tiles": 397269,
|
||||
"width": 1250
|
||||
},
|
||||
"name": "Bering Sea",
|
||||
"nations": [
|
||||
{
|
||||
"coordinates": [1043, 121],
|
||||
"flag": "polar_bears",
|
||||
"name": "Polar Bears"
|
||||
},
|
||||
{
|
||||
"coordinates": [1725, 158],
|
||||
"flag": "Alaska",
|
||||
"name": "Utqiaġvik"
|
||||
},
|
||||
{
|
||||
"coordinates": [2152, 270],
|
||||
"flag": "Alaska",
|
||||
"name": "Prudhoe Bay"
|
||||
},
|
||||
{
|
||||
"coordinates": [1973, 828],
|
||||
"flag": "Alaska",
|
||||
"name": "Anchorage"
|
||||
},
|
||||
{
|
||||
"coordinates": [2389, 1070],
|
||||
"flag": "Alaska",
|
||||
"name": "Juneau"
|
||||
},
|
||||
{
|
||||
"coordinates": [2381, 800],
|
||||
"flag": "ca",
|
||||
"name": "Whitehorse"
|
||||
},
|
||||
{
|
||||
"coordinates": [1561, 452],
|
||||
"flag": "Alaska",
|
||||
"name": "Kotzebue"
|
||||
},
|
||||
{
|
||||
"coordinates": [1491, 621],
|
||||
"flag": "Alaska",
|
||||
"name": "Nome"
|
||||
},
|
||||
{
|
||||
"coordinates": [1609, 918],
|
||||
"flag": "Alaska",
|
||||
"name": "Bethel"
|
||||
},
|
||||
{
|
||||
"coordinates": [1820, 1084],
|
||||
"flag": "Alaska",
|
||||
"name": "Kodiak"
|
||||
},
|
||||
{
|
||||
"coordinates": [1979, 625],
|
||||
"flag": "Alaska",
|
||||
"name": "Fairbanks"
|
||||
},
|
||||
{
|
||||
"coordinates": [2062, 468],
|
||||
"flag": "Alaska",
|
||||
"name": "Fort Yukon"
|
||||
},
|
||||
{
|
||||
"coordinates": [1425, 1283],
|
||||
"flag": "Alaska",
|
||||
"name": "Unalaska"
|
||||
},
|
||||
{
|
||||
"coordinates": [375, 1298],
|
||||
"flag": "ru",
|
||||
"name": "Petropavlovsk-Kamchatsky"
|
||||
},
|
||||
{
|
||||
"coordinates": [479, 1107],
|
||||
"flag": "ru",
|
||||
"name": "Ust-Kamchatsk"
|
||||
},
|
||||
{
|
||||
"coordinates": [965, 710],
|
||||
"flag": "ru",
|
||||
"name": "Anadyr"
|
||||
},
|
||||
{
|
||||
"coordinates": [583, 749],
|
||||
"flag": "ru",
|
||||
"name": "Kamenskoye"
|
||||
},
|
||||
{
|
||||
"coordinates": [1192, 588],
|
||||
"flag": "ru",
|
||||
"name": "Provideniya"
|
||||
},
|
||||
{
|
||||
"coordinates": [718, 366],
|
||||
"flag": "ru",
|
||||
"name": "Bilibino"
|
||||
},
|
||||
{
|
||||
"coordinates": [1048, 493],
|
||||
"flag": "ru",
|
||||
"name": "Egvekinot"
|
||||
},
|
||||
{
|
||||
"coordinates": [410, 275],
|
||||
"flag": "ru",
|
||||
"name": "Chersky"
|
||||
},
|
||||
{
|
||||
"coordinates": [254, 417],
|
||||
"flag": "ru",
|
||||
"name": "Srednekolymsk"
|
||||
},
|
||||
{
|
||||
"coordinates": [127, 565],
|
||||
"flag": "ru",
|
||||
"name": "Zyryanka"
|
||||
},
|
||||
{
|
||||
"coordinates": [161, 917],
|
||||
"flag": "ru",
|
||||
"name": "Magadan"
|
||||
}
|
||||
]
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
@@ -151,6 +151,7 @@ export enum GameMapType {
|
||||
Luna = "Luna",
|
||||
Conakry = "Conakry",
|
||||
Caucasus = "Caucasus",
|
||||
BeringSea = "Bering Sea",
|
||||
}
|
||||
|
||||
export type GameMapName = keyof typeof GameMapType;
|
||||
@@ -207,6 +208,7 @@ export const mapCategories: Record<string, GameMapType[]> = {
|
||||
GameMapType.StraitOfMalacca,
|
||||
GameMapType.Conakry,
|
||||
GameMapType.Caucasus,
|
||||
GameMapType.BeringSea,
|
||||
],
|
||||
fantasy: [
|
||||
GameMapType.Pangaea,
|
||||
|
||||
@@ -72,7 +72,7 @@ const frequency: Partial<Record<GameMapName, number>> = {
|
||||
Didier: 1,
|
||||
AmazonRiver: 3,
|
||||
BosphorusStraits: 3,
|
||||
BeringStrait: 4,
|
||||
BeringStrait: 2,
|
||||
Sierpinski: 10,
|
||||
TheBox: 3,
|
||||
Yenisei: 6,
|
||||
@@ -91,6 +91,7 @@ const frequency: Partial<Record<GameMapName, number>> = {
|
||||
Luna: 6,
|
||||
Conakry: 3,
|
||||
Caucasus: 5,
|
||||
BeringSea: 5,
|
||||
};
|
||||
|
||||
const TEAM_WEIGHTS: { config: TeamCountConfig; weight: number }[] = [
|
||||
|
||||
Reference in New Issue
Block a user