Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions map-generator/assets/maps/taiwanstrait/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
{
"name": "Taiwan Strait",
"nations": [
{
"coordinates": [900, 32],
"name": "Fuzhou",
"flag": "cn"
},
{
"coordinates": [789, 282],
"name": "Putian",
"flag": "cn"
},
{
"coordinates": [641, 447],
"name": "Quanzhou",
"flag": "cn"
},
{
"coordinates": [430, 275],
"name": "Chinese Military Base",
"flag": "cn"
},
{
"coordinates": [499, 590],
"name": "Xiamen",
"flag": "cn"
},
{
"coordinates": [340, 550],
"name": "Zhangzhou",
"flag": "cn"
},
{
"coordinates": [206, 449],
"name": "Longyan",
"flag": "cn"
},
{
"coordinates": [107, 898],
"name": "Shantou",
"flag": "cn"
},
{
"coordinates": [7, 836],
"name": "Chaozhou",
"flag": "cn"
},
{
"coordinates": [21, 319],
"name": "Giant Pandas",
"flag": "cn"
},
{
"coordinates": [593, 607],
"name": "Kinmen Island",
"flag": "tw"
},
{
"coordinates": [975, 913],
"name": "Penghu",
"flag": "tw"
},
{
"coordinates": [1252, 1244],
"name": "Kaohsiung",
"flag": "tw"
},
{
"coordinates": [1210, 1079],
"name": "Tainan",
"flag": "tw"
},
{
"coordinates": [1491, 1152],
"name": "Taitung",
"flag": "tw"
},
{
"coordinates": [1643, 702],
"name": "Hualien",
"flag": "tw"
},
{
"coordinates": [1249, 911],
"name": "Chiayi",
"flag": "tw"
},
{
"coordinates": [1272, 697],
"name": "Taichung City",
"flag": "tw"
},
{
"coordinates": [1752, 284],
"name": "Keelung",
"flag": "tw"
},
{
"coordinates": [1655, 255],
"name": "Taipei",
"flag": "tw"
},
{
"coordinates": [1542, 290],
"name": "Taoyuan",
"flag": "tw"
},
{
"coordinates": [1464, 353],
"name": "Hsinchu",
"flag": "tw"
},
{
"coordinates": [1351, 473],
"name": "Miaoli",
"flag": "tw"
},
{
"coordinates": [1629, 1433],
"name": "Lanyu",
"flag": "tw"
},
{
"coordinates": [41, 602],
"name": "Meizhou",
"flag": "cn"
},
{
"coordinates": [619, 89],
"name": "Sanming",
"flag": "cn"
},
{
"coordinates": [225, 84],
"name": "Tea Plantations",
"flag": "cn"
}
]
}
Comment thread
RickD004 marked this conversation as resolved.
1 change: 1 addition & 0 deletions map-generator/main.go
Comment thread
evanpelle marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ var maps = []struct {
{Name: "antarctica"},
{Name: "archipelagosea"},
{Name: "bajacalifornia"},
{Name: "taiwanstrait"},
{Name: "big_plains", IsTest: true},
{Name: "half_land_half_ocean", IsTest: true},
{Name: "ocean_and_land", IsTest: true},
Expand Down
3 changes: 2 additions & 1 deletion resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,8 @@
"beringsea": "Bering Sea",
"antarctica": "Antarctica",
"archipelagosea": "Archipelago Sea",
"bajacalifornia": "Baja California"
"bajacalifornia": "Baja California",
"taiwanstrait": "Taiwan Strait"
},
"map_categories": {
"featured": "Featured",
Expand Down
155 changes: 155 additions & 0 deletions resources/maps/taiwanstrait/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
{
"map": {
"height": 1508,
"num_land_tiles": 1107518,
"width": 1800
},
"map16x": {
"height": 377,
"num_land_tiles": 67799,
"width": 450
},
"map4x": {
"height": 754,
"num_land_tiles": 274583,
"width": 900
},
"name": "Taiwan Strait",
"nations": [
{
"coordinates": [900, 32],
"flag": "cn",
"name": "Fuzhou"
},
{
"coordinates": [789, 282],
"flag": "cn",
"name": "Putian"
},
{
"coordinates": [641, 447],
"flag": "cn",
"name": "Quanzhou"
},
{
"coordinates": [430, 275],
"flag": "cn",
"name": "Chinese Military Base"
},
{
"coordinates": [499, 590],
"flag": "cn",
"name": "Xiamen"
},
{
"coordinates": [340, 550],
"flag": "cn",
"name": "Zhangzhou"
},
{
"coordinates": [206, 449],
"flag": "cn",
"name": "Longyan"
},
{
"coordinates": [107, 898],
"flag": "cn",
"name": "Shantou"
},
{
"coordinates": [7, 836],
"flag": "cn",
"name": "Chaozhou"
},
{
"coordinates": [21, 319],
"flag": "cn",
"name": "Giant Pandas"
},
{
"coordinates": [593, 607],
"flag": "tw",
"name": "Kinmen Island"
},
{
"coordinates": [975, 913],
"flag": "tw",
"name": "Penghu"
},
{
"coordinates": [1252, 1244],
"flag": "tw",
"name": "Kaohsiung"
},
{
"coordinates": [1210, 1079],
"flag": "tw",
"name": "Tainan"
},
{
"coordinates": [1491, 1152],
"flag": "tw",
"name": "Taitung"
},
{
"coordinates": [1643, 702],
"flag": "tw",
"name": "Hualien"
},
{
"coordinates": [1249, 911],
"flag": "tw",
"name": "Chiayi"
},
{
"coordinates": [1272, 697],
"flag": "tw",
"name": "Taichung City"
},
{
"coordinates": [1752, 284],
"flag": "tw",
"name": "Keelung"
},
{
"coordinates": [1655, 255],
"flag": "tw",
"name": "Taipei"
},
{
"coordinates": [1542, 290],
"flag": "tw",
"name": "Taoyuan"
},
{
"coordinates": [1464, 353],
"flag": "tw",
"name": "Hsinchu"
},
{
"coordinates": [1351, 473],
"flag": "tw",
"name": "Miaoli"
},
{
"coordinates": [1629, 1433],
"flag": "tw",
"name": "Lanyu"
},
{
"coordinates": [41, 602],
"flag": "cn",
"name": "Meizhou"
},
{
"coordinates": [619, 89],
"flag": "cn",
"name": "Sanming"
},
{
"coordinates": [225, 84],
"flag": "cn",
"name": "Tea Plantations"
}
]
}
1 change: 1 addition & 0 deletions resources/maps/taiwanstrait/map.bin

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions resources/maps/taiwanstrait/map16x.bin

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions resources/maps/taiwanstrait/map4x.bin

Large diffs are not rendered by default.

Binary file added resources/maps/taiwanstrait/thumbnail.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/core/game/Game.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ export enum GameMapType {
ArchipelagoSea = "ArchipelagoSea",
BajaCalifornia = "Baja California",
MiddleEast = "Middle East",
TaiwanStrait = "Taiwan Strait",
}

export type GameMapName = keyof typeof GameMapType;
Expand Down Expand Up @@ -232,6 +233,7 @@ export const mapCategories: Record<string, GameMapType[]> = {
GameMapType.ArchipelagoSea,
GameMapType.BajaCalifornia,
GameMapType.MiddleEast,
GameMapType.TaiwanStrait,
],
fantasy: [
GameMapType.Pangaea,
Expand Down
1 change: 1 addition & 0 deletions src/server/MapPlaylist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ const frequency: Partial<Record<GameMapName, number>> = {
ArchipelagoSea: 3,
BajaCalifornia: 4,
MiddleEast: 8,
TaiwanStrait: 5,
};

const TEAM_WEIGHTS: { config: TeamCountConfig; weight: number }[] = [
Expand Down
Loading