mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-01 11:13:27 +00:00
Restructured PR for Britannia Remastered Addition (#2813)
## Description: Adds a new detailed Britannia map featuring modern UK, Ireland, and northern France regions. The previous Britannia map has been preserved as "Britannia Classic". <img width="4096" height="5031" alt="United Kingdom" src="https://github.com/user-attachments/assets/8a6ca3ab-bc91-438f-8ca7-7fdf7c5260b8" /> <img width="4096" height="5031" alt="United Kingdom_debug" src="https://github.com/user-attachments/assets/a9a7bcd2-1dc5-40c6-a547-a7a79e636060" /> Changes Added new Britannia map with modern county/region divisions Renamed existing Britannia map to "Britannia Classic" Added map-generator source assets for both maps Updated GameMapType enum with BritanniaClassic Configured player counts: 50/30/20 for both maps Added playlist frequencies: Britannia (5), Britannia Classic (4) Updated language translations New Britannia Nations (partial list) Ireland: Mayo, Kerry, Clare, Meath, and more Scotland: Highland, Argyll and Bute, and more England: North Yorkshire, and more France: Pas-de-Calais Britannia Classic The original Britannia map with historical kingdoms (Dumnonia, Dyfed, Gwent, Gwynedd, Powys, Strathclyde, Dalriata, Wessex, Sussex, Kent, etc.) is now available as "Britannia Classic". ## 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: TSProphet --------- Co-authored-by: Harry <Harry.bath94@gmail.com> Co-authored-by: iamlewis <lewismmmm@gmail.com>
This commit is contained in:
TsProphet94
Binary file not shown.
|
Before Width: | Height: | Size: 644 KiB After Width: | Height: | Size: 2.7 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 644 KiB |
@@ -0,0 +1,120 @@
|
||||
{
|
||||
"name": "Britannia Classic",
|
||||
"nations": [
|
||||
{
|
||||
"coordinates": [960, 1258],
|
||||
"name": "Dumnonia",
|
||||
"flag": "1_Dumnonia"
|
||||
},
|
||||
{
|
||||
"coordinates": [918, 1088],
|
||||
"name": "Dyfed",
|
||||
"flag": "1_Dyfed"
|
||||
},
|
||||
{
|
||||
"coordinates": [1114, 1108],
|
||||
"name": "Gwent",
|
||||
"flag": "1_Gwent"
|
||||
},
|
||||
{
|
||||
"coordinates": [1048, 936],
|
||||
"name": "Gwynedd",
|
||||
"flag": "1_Gwynedd"
|
||||
},
|
||||
{
|
||||
"coordinates": [1108, 986],
|
||||
"name": "Powys",
|
||||
"flag": "1_Powys"
|
||||
},
|
||||
{
|
||||
"coordinates": [952, 536],
|
||||
"name": "Strathclyde",
|
||||
"flag": "1_Strathclyde"
|
||||
},
|
||||
{
|
||||
"coordinates": [748, 556],
|
||||
"name": "Dalriata",
|
||||
"flag": "1_Dalriata"
|
||||
},
|
||||
{
|
||||
"coordinates": [1228, 1176],
|
||||
"name": "Wessex",
|
||||
"flag": "1_Wessex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1442, 1226],
|
||||
"name": "Sussex",
|
||||
"flag": "1_Sussex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1600, 1188],
|
||||
"name": "Kent",
|
||||
"flag": "1_Kent"
|
||||
},
|
||||
{
|
||||
"coordinates": [1621, 1085],
|
||||
"name": "Essex",
|
||||
"flag": "1_Essex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1707, 1018],
|
||||
"name": "East Anglia",
|
||||
"flag": "1_East Anglia"
|
||||
},
|
||||
{
|
||||
"coordinates": [1370, 1002],
|
||||
"name": "Mercia",
|
||||
"flag": "1_Mercia"
|
||||
},
|
||||
{
|
||||
"coordinates": [1298, 724],
|
||||
"name": "Northumbria",
|
||||
"flag": "1_Northumbria"
|
||||
},
|
||||
{
|
||||
"coordinates": [962, 366],
|
||||
"name": "Fortriu",
|
||||
"flag": "1_Fortriu"
|
||||
},
|
||||
{
|
||||
"coordinates": [272, 1041],
|
||||
"name": "Munster",
|
||||
"flag": "1_Munster"
|
||||
},
|
||||
{
|
||||
"coordinates": [264, 830],
|
||||
"name": "Connacht",
|
||||
"flag": "1_Connacht"
|
||||
},
|
||||
{
|
||||
"coordinates": [608, 975],
|
||||
"name": "Laigin",
|
||||
"flag": "1_Laigin"
|
||||
},
|
||||
{
|
||||
"coordinates": [564, 845],
|
||||
"name": "Southern Uí Néill",
|
||||
"flag": "1_Southern Ui Neill"
|
||||
},
|
||||
{
|
||||
"coordinates": [639, 680],
|
||||
"name": "Ulaid",
|
||||
"flag": "1_Ulaid"
|
||||
},
|
||||
{
|
||||
"coordinates": [509, 759],
|
||||
"name": "Airgialla",
|
||||
"flag": "1_Airgialla"
|
||||
},
|
||||
{
|
||||
"coordinates": [416, 678],
|
||||
"name": "Northern Uí Néill",
|
||||
"flag": "1_Northern Ui Neill"
|
||||
},
|
||||
{
|
||||
"coordinates": [1869, 1308],
|
||||
"name": "Franks",
|
||||
"flag": "1_Franks"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -31,6 +31,7 @@ var maps = []struct {
|
||||
{Name: "betweentwoseas"},
|
||||
{Name: "blacksea"},
|
||||
{Name: "britannia"},
|
||||
{Name: "britanniaclassic"},
|
||||
{Name: "deglaciatedantarctica"},
|
||||
{Name: "eastasia"},
|
||||
{Name: "europe"},
|
||||
|
||||
@@ -222,6 +222,7 @@
|
||||
"asia": "Asia",
|
||||
"mars": "Mars",
|
||||
"southamerica": "South America",
|
||||
"britanniaclassic": "Britannia (Classic)",
|
||||
"britannia": "Britannia",
|
||||
"gatewaytotheatlantic": "Gateway to the Atlantic",
|
||||
"australia": "Australia",
|
||||
|
||||
@@ -1,135 +1,120 @@
|
||||
{
|
||||
"map": {
|
||||
"height": 1396,
|
||||
"num_land_tiles": 933571,
|
||||
"width": 2000
|
||||
"height": 2514,
|
||||
"num_land_tiles": 1669657,
|
||||
"width": 2048
|
||||
},
|
||||
"map16x": {
|
||||
"height": 349,
|
||||
"num_land_tiles": 54975,
|
||||
"width": 500
|
||||
"height": 628,
|
||||
"num_land_tiles": 99515,
|
||||
"width": 512
|
||||
},
|
||||
"map4x": {
|
||||
"height": 698,
|
||||
"num_land_tiles": 228849,
|
||||
"width": 1000
|
||||
"height": 1257,
|
||||
"num_land_tiles": 410570,
|
||||
"width": 1024
|
||||
},
|
||||
"name": "Britannia",
|
||||
"name": "britannia",
|
||||
"nations": [
|
||||
{
|
||||
"coordinates": [960, 1258],
|
||||
"flag": "1_Dumnonia",
|
||||
"name": "Dumnonia"
|
||||
"coordinates": [1969, 2305],
|
||||
"flag": "fr",
|
||||
"name": "Pas-de-Calais"
|
||||
},
|
||||
{
|
||||
"coordinates": [918, 1088],
|
||||
"flag": "1_Dyfed",
|
||||
"name": "Dyfed"
|
||||
"coordinates": [274, 1494],
|
||||
"flag": "ie",
|
||||
"name": "Mayo"
|
||||
},
|
||||
{
|
||||
"coordinates": [1114, 1108],
|
||||
"flag": "1_Gwent",
|
||||
"name": "Gwent"
|
||||
"coordinates": [242, 1931],
|
||||
"flag": "ie",
|
||||
"name": "Kerry"
|
||||
},
|
||||
{
|
||||
"coordinates": [1048, 936],
|
||||
"flag": "1_Gwynedd",
|
||||
"name": "Gwynedd"
|
||||
"coordinates": [328, 1754],
|
||||
"flag": "ie",
|
||||
"name": "Clare"
|
||||
},
|
||||
{
|
||||
"coordinates": [1108, 986],
|
||||
"flag": "1_Powys",
|
||||
"coordinates": [675, 1559],
|
||||
"flag": "ie",
|
||||
"name": "Meath"
|
||||
},
|
||||
{
|
||||
"coordinates": [900, 518],
|
||||
"flag": "gb-sct",
|
||||
"name": "Highland"
|
||||
},
|
||||
{
|
||||
"coordinates": [782, 830],
|
||||
"flag": "gb-sct",
|
||||
"name": "Argyll and Bute"
|
||||
},
|
||||
{
|
||||
"coordinates": [1431, 1447],
|
||||
"flag": "gb-eng",
|
||||
"name": "North Yorkshire"
|
||||
},
|
||||
{
|
||||
"coordinates": [1243, 622],
|
||||
"flag": "gb-sct",
|
||||
"name": "Aberdeenshire"
|
||||
},
|
||||
{
|
||||
"coordinates": [1218, 1309],
|
||||
"flag": "gb-eng",
|
||||
"name": "Cumbria"
|
||||
},
|
||||
{
|
||||
"coordinates": [1082, 1202],
|
||||
"flag": "gb-sct",
|
||||
"name": "Dumfries and Galloway"
|
||||
},
|
||||
{
|
||||
"coordinates": [1096, 808],
|
||||
"flag": "gb-sct",
|
||||
"name": "Perthshire and Kinross"
|
||||
},
|
||||
{
|
||||
"coordinates": [1626, 1688],
|
||||
"flag": "gb-eng",
|
||||
"name": "Lincolnshire"
|
||||
},
|
||||
{
|
||||
"coordinates": [1110, 2266],
|
||||
"flag": "gb-eng",
|
||||
"name": "Devon"
|
||||
},
|
||||
{
|
||||
"coordinates": [1345, 1138],
|
||||
"flag": "gb-eng",
|
||||
"name": "Northumberland"
|
||||
},
|
||||
{
|
||||
"coordinates": [1792, 1799],
|
||||
"flag": "gb-eng",
|
||||
"name": "Norfolk"
|
||||
},
|
||||
{
|
||||
"coordinates": [1154, 1888],
|
||||
"flag": "gb-wls",
|
||||
"name": "Powys"
|
||||
},
|
||||
{
|
||||
"coordinates": [952, 536],
|
||||
"flag": "1_Strathclyde",
|
||||
"name": "Strathclyde"
|
||||
"coordinates": [1801, 1905],
|
||||
"flag": "gb-eng",
|
||||
"name": "Suffolk"
|
||||
},
|
||||
{
|
||||
"coordinates": [748, 556],
|
||||
"flag": "1_Dalriata",
|
||||
"name": "Dalriata"
|
||||
"coordinates": [1469, 2190],
|
||||
"flag": "gb-eng",
|
||||
"name": "Hampshire"
|
||||
},
|
||||
{
|
||||
"coordinates": [1228, 1176],
|
||||
"flag": "1_Wessex",
|
||||
"name": "Wessex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1442, 1226],
|
||||
"flag": "1_Sussex",
|
||||
"name": "Sussex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1600, 1188],
|
||||
"flag": "1_Kent",
|
||||
"name": "Kent"
|
||||
},
|
||||
{
|
||||
"coordinates": [1621, 1085],
|
||||
"flag": "1_Essex",
|
||||
"name": "Essex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1707, 1018],
|
||||
"flag": "1_East Anglia",
|
||||
"name": "East Anglia"
|
||||
},
|
||||
{
|
||||
"coordinates": [1370, 1002],
|
||||
"flag": "1_Mercia",
|
||||
"name": "Mercia"
|
||||
},
|
||||
{
|
||||
"coordinates": [1298, 724],
|
||||
"flag": "1_Northumbria",
|
||||
"name": "Northumbria"
|
||||
},
|
||||
{
|
||||
"coordinates": [962, 366],
|
||||
"flag": "1_Fortriu",
|
||||
"name": "Fortriu"
|
||||
},
|
||||
{
|
||||
"coordinates": [272, 1041],
|
||||
"flag": "1_Munster",
|
||||
"name": "Munster"
|
||||
},
|
||||
{
|
||||
"coordinates": [264, 830],
|
||||
"flag": "1_Connacht",
|
||||
"name": "Connacht"
|
||||
},
|
||||
{
|
||||
"coordinates": [608, 975],
|
||||
"flag": "1_Laigin",
|
||||
"name": "Laigin"
|
||||
},
|
||||
{
|
||||
"coordinates": [564, 845],
|
||||
"flag": "1_Southern Ui Neill",
|
||||
"name": "Southern Uí Néill"
|
||||
},
|
||||
{
|
||||
"coordinates": [639, 680],
|
||||
"flag": "1_Ulaid",
|
||||
"name": "Ulaid"
|
||||
},
|
||||
{
|
||||
"coordinates": [509, 759],
|
||||
"flag": "1_Airgialla",
|
||||
"name": "Airgialla"
|
||||
},
|
||||
{
|
||||
"coordinates": [416, 678],
|
||||
"flag": "1_Northern Ui Neill",
|
||||
"name": "Northern Uí Néill"
|
||||
},
|
||||
{
|
||||
"coordinates": [1869, 1308],
|
||||
"flag": "1_Franks",
|
||||
"name": "Franks"
|
||||
"coordinates": [516, 1379],
|
||||
"flag": "gb",
|
||||
"name": "Fermanagh"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
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.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 26 KiB |
@@ -0,0 +1,135 @@
|
||||
{
|
||||
"map": {
|
||||
"height": 1396,
|
||||
"num_land_tiles": 933571,
|
||||
"width": 2000
|
||||
},
|
||||
"map16x": {
|
||||
"height": 349,
|
||||
"num_land_tiles": 54975,
|
||||
"width": 500
|
||||
},
|
||||
"map4x": {
|
||||
"height": 698,
|
||||
"num_land_tiles": 228849,
|
||||
"width": 1000
|
||||
},
|
||||
"name": "britanniaclassic",
|
||||
"nations": [
|
||||
{
|
||||
"coordinates": [960, 1258],
|
||||
"flag": "1_Dumnonia",
|
||||
"name": "Dumnonia"
|
||||
},
|
||||
{
|
||||
"coordinates": [918, 1088],
|
||||
"flag": "1_Dyfed",
|
||||
"name": "Dyfed"
|
||||
},
|
||||
{
|
||||
"coordinates": [1114, 1108],
|
||||
"flag": "1_Gwent",
|
||||
"name": "Gwent"
|
||||
},
|
||||
{
|
||||
"coordinates": [1048, 936],
|
||||
"flag": "1_Gwynedd",
|
||||
"name": "Gwynedd"
|
||||
},
|
||||
{
|
||||
"coordinates": [1108, 986],
|
||||
"flag": "1_Powys",
|
||||
"name": "Powys"
|
||||
},
|
||||
{
|
||||
"coordinates": [952, 536],
|
||||
"flag": "1_Strathclyde",
|
||||
"name": "Strathclyde"
|
||||
},
|
||||
{
|
||||
"coordinates": [748, 556],
|
||||
"flag": "1_Dalriata",
|
||||
"name": "Dalriata"
|
||||
},
|
||||
{
|
||||
"coordinates": [1228, 1176],
|
||||
"flag": "1_Wessex",
|
||||
"name": "Wessex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1442, 1226],
|
||||
"flag": "1_Sussex",
|
||||
"name": "Sussex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1600, 1188],
|
||||
"flag": "1_Kent",
|
||||
"name": "Kent"
|
||||
},
|
||||
{
|
||||
"coordinates": [1621, 1085],
|
||||
"flag": "1_Essex",
|
||||
"name": "Essex"
|
||||
},
|
||||
{
|
||||
"coordinates": [1707, 1018],
|
||||
"flag": "1_East Anglia",
|
||||
"name": "East Anglia"
|
||||
},
|
||||
{
|
||||
"coordinates": [1370, 1002],
|
||||
"flag": "1_Mercia",
|
||||
"name": "Mercia"
|
||||
},
|
||||
{
|
||||
"coordinates": [1298, 724],
|
||||
"flag": "1_Northumbria",
|
||||
"name": "Northumbria"
|
||||
},
|
||||
{
|
||||
"coordinates": [962, 366],
|
||||
"flag": "1_Fortriu",
|
||||
"name": "Fortriu"
|
||||
},
|
||||
{
|
||||
"coordinates": [272, 1041],
|
||||
"flag": "1_Munster",
|
||||
"name": "Munster"
|
||||
},
|
||||
{
|
||||
"coordinates": [264, 830],
|
||||
"flag": "1_Connacht",
|
||||
"name": "Connacht"
|
||||
},
|
||||
{
|
||||
"coordinates": [608, 975],
|
||||
"flag": "1_Laigin",
|
||||
"name": "Laigin"
|
||||
},
|
||||
{
|
||||
"coordinates": [564, 845],
|
||||
"flag": "1_Southern Ui Neill",
|
||||
"name": "Southern Uí Néill"
|
||||
},
|
||||
{
|
||||
"coordinates": [639, 680],
|
||||
"flag": "1_Ulaid",
|
||||
"name": "Ulaid"
|
||||
},
|
||||
{
|
||||
"coordinates": [509, 759],
|
||||
"flag": "1_Airgialla",
|
||||
"name": "Airgialla"
|
||||
},
|
||||
{
|
||||
"coordinates": [416, 678],
|
||||
"flag": "1_Northern Ui Neill",
|
||||
"name": "Northern Uí Néill"
|
||||
},
|
||||
{
|
||||
"coordinates": [1869, 1308],
|
||||
"flag": "1_Franks",
|
||||
"name": "Franks"
|
||||
}
|
||||
]
|
||||
}
|
||||
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: 11 KiB |
@@ -23,6 +23,7 @@ export const MapDescription: Record<keyof typeof GameMapType, string> = {
|
||||
Asia: "Asia",
|
||||
Mars: "Mars",
|
||||
SouthAmerica: "South America",
|
||||
BritanniaClassic: "Britannia Classic",
|
||||
Britannia: "Britannia",
|
||||
GatewayToTheAtlantic: "Gateway to the Atlantic",
|
||||
Australia: "Australia",
|
||||
|
||||
@@ -57,6 +57,7 @@ const numPlayersConfig = {
|
||||
[GameMapType.BetweenTwoSeas]: [70, 50, 40],
|
||||
[GameMapType.BlackSea]: [50, 30, 30],
|
||||
[GameMapType.Britannia]: [50, 30, 20],
|
||||
[GameMapType.BritanniaClassic]: [50, 30, 20],
|
||||
[GameMapType.DeglaciatedAntarctica]: [50, 40, 30],
|
||||
[GameMapType.EastAsia]: [50, 30, 20],
|
||||
[GameMapType.Europe]: [100, 70, 50],
|
||||
|
||||
@@ -82,6 +82,7 @@ export enum GameMapType {
|
||||
Pangaea = "Pangaea",
|
||||
Asia = "Asia",
|
||||
Mars = "Mars",
|
||||
BritanniaClassic = "Britannia Classic",
|
||||
Britannia = "Britannia",
|
||||
GatewayToTheAtlantic = "Gateway to the Atlantic",
|
||||
Australia = "Australia",
|
||||
@@ -134,8 +135,9 @@ export const mapCategories: Record<string, GameMapType[]> = {
|
||||
GameMapType.Oceania,
|
||||
],
|
||||
regional: [
|
||||
GameMapType.BlackSea,
|
||||
GameMapType.BritanniaClassic,
|
||||
GameMapType.Britannia,
|
||||
GameMapType.BlackSea,
|
||||
GameMapType.GatewayToTheAtlantic,
|
||||
GameMapType.BetweenTwoSeas,
|
||||
GameMapType.Iceland,
|
||||
|
||||
@@ -30,6 +30,7 @@ const frequency: Partial<Record<GameMapName, number>> = {
|
||||
BetweenTwoSeas: 5,
|
||||
BlackSea: 6,
|
||||
Britannia: 5,
|
||||
BritanniaClassic: 4,
|
||||
DeglaciatedAntarctica: 4,
|
||||
EastAsia: 5,
|
||||
Europe: 3,
|
||||
|
||||
Reference in New Issue
Block a user