From c1732f47042a2192fd07d75650eb2b6e76184a6e Mon Sep 17 00:00:00 2001 From: NewHappyRabbit <31893343+NewHappyRabbit@users.noreply.github.com> Date: Wed, 12 Feb 2025 01:15:15 +0200 Subject: [PATCH 1/3] Added clean up of /out before building in webpack --- webpack.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/webpack.config.js b/webpack.config.js index ad157f846..a79503565 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -15,6 +15,7 @@ export default (env, argv) => { output: { filename: 'bundle.js', path: path.resolve(__dirname, 'out'), + clean: true }, module: { rules: [ From 1f1a07113c4685ce61adfe86e9bee4b8d9b7c48a Mon Sep 17 00:00:00 2001 From: NewHappyRabbit <31893343+NewHappyRabbit@users.noreply.github.com> Date: Wed, 12 Feb 2025 02:21:46 +0200 Subject: [PATCH 2/3] Fixed creative mode not working in private lobby --- src/core/configuration/Config.ts | 1 + src/server/GameServer.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/core/configuration/Config.ts b/src/core/configuration/Config.ts index 09cd5644a..93fe1826d 100644 --- a/src/core/configuration/Config.ts +++ b/src/core/configuration/Config.ts @@ -71,6 +71,7 @@ export interface Config { numBots(): number; spawnNPCs(): boolean; spawnBots(): boolean; + creativeMode(): boolean; numSpawnPhaseTurns(): number; startManpower(playerInfo: PlayerInfo): number; diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts index a69acaaa6..ddf0b5b87 100644 --- a/src/server/GameServer.ts +++ b/src/server/GameServer.ts @@ -63,6 +63,9 @@ export class GameServer { if (gameConfig.disableNPCs != null) { this.gameConfig.disableNPCs = gameConfig.disableNPCs; } + if (gameConfig.creativeMode != null) { + this.gameConfig.creativeMode = gameConfig.creativeMode; + } } public addClient(client: Client, lastTurn: number) { From aac149569cf677fb99e87f4fbfc1e69d91ba5dd4 Mon Sep 17 00:00:00 2001 From: NewHappyRabbit <31893343+NewHappyRabbit@users.noreply.github.com> Date: Wed, 12 Feb 2025 02:28:55 +0200 Subject: [PATCH 3/3] Fixed bots flags not working --- resources/maps/BlackSea.json | 154 +++++----- resources/maps/Europe.json | 475 ++++++++++++++++++------------ resources/maps/WorldMap.json | 553 ++++++++++++++++++----------------- 3 files changed, 645 insertions(+), 537 deletions(-) diff --git a/resources/maps/BlackSea.json b/resources/maps/BlackSea.json index b63603c68..2a17e64ae 100644 --- a/resources/maps/BlackSea.json +++ b/resources/maps/BlackSea.json @@ -1,79 +1,79 @@ { - "name": "BlackSea", - "width": 1500, - "height": 1100, - "nations": [ - { - "coordinates": [ - 122, - 647 - ], - "name": "Bulgaria", - "strength": 1, - "flag": "BG" - }, - { - "coordinates": [ - 513, - 929 - ], - "name": "Turkiye", - "strength": 2, - "flag": "TR" - }, - { - "coordinates": [ - 123, - 237 - ], - "name": "Romania", - "strength": 1, - "flag": "RO" - }, - { - "coordinates": [ - 300, - 188 - ], - "name": "Maldova", - "strength": 1, - "flag": "MD" - }, - { - "coordinates": [ - 737, - 120 - ], - "name": "Ukraine", - "strength": 1, - "flag": "UA" - }, - { - "coordinates": [ - 1180, - 354 - ], - "name": "Russia", - "strength": 3, - "flag": "RU" - }, - { - "coordinates": [ - 1362, - 722 - ], - "name": "Georgia", - "strength": 1, - "flag": "GE" - }, - { - "coordinates": [ - 1382, - 943 - ], - "name": "Armenia", - "strength": 1, - "flag": "AM" - } - ] + "name": "BlackSea", + "width": 1500, + "height": 1100, + "nations": [ + { + "coordinates": [ + 122, + 647 + ], + "name": "Bulgaria", + "strength": 1, + "flag": "bg" + }, + { + "coordinates": [ + 513, + 929 + ], + "name": "Turkiye", + "strength": 2, + "flag": "tr" + }, + { + "coordinates": [ + 123, + 237 + ], + "name": "Romania", + "strength": 1, + "flag": "ro" + }, + { + "coordinates": [ + 300, + 188 + ], + "name": "Maldova", + "strength": 1, + "flag": "md" + }, + { + "coordinates": [ + 737, + 120 + ], + "name": "Ukraine", + "strength": 1, + "flag": "ua" + }, + { + "coordinates": [ + 1180, + 354 + ], + "name": "Russia", + "strength": 3, + "flag": "ru" + }, + { + "coordinates": [ + 1362, + 722 + ], + "name": "Georgia", + "strength": 1, + "flag": "ge" + }, + { + "coordinates": [ + 1382, + 943 + ], + "name": "Armenia", + "strength": 1, + "flag": "am" + } + ] } \ No newline at end of file diff --git a/resources/maps/Europe.json b/resources/maps/Europe.json index 7f1de6115..9900f1401 100644 --- a/resources/maps/Europe.json +++ b/resources/maps/Europe.json @@ -1,193 +1,286 @@ { - "name": "Europe", - "width": 2000, - "height": 1000, - "nations": [ - { - "coordinates": [171, 171], - "name": "Iceland 🇮🇸", - "strength": 1, - "flag": "IS" - }, - { - "coordinates": [477, 473], - "name": "Ireland 🇮🇪", - "strength": 1, - "flag": "IE" - }, - { - "coordinates": [650, 500], - "name": "England 🇬🇧", - "strength": 3, - "flag": "GB" - }, - { - "coordinates": [560, 800], - "name": "Spain 🇪🇸", - "strength": 2, - "flag": "ES" - }, - { - "coordinates": [726, 616], - "name": "France 🇫🇷", - "strength": 2, - "flag": "FR" - }, - { - "coordinates": [1050, 745], - "name": "Italy 🇮🇹", - "strength": 1, - "flag": "IT" - }, - { - "coordinates": [872, 634], - "name": "Switzerland 🇨🇭", - "strength": 1, - "flag": "CH" - }, - { - "coordinates": [960, 271], - "name": "Norway 🇳🇴", - "strength": 1, - "flag": "NO" - }, - { - "coordinates": [1095, 336], - "name": "Sweden 🇸🇪", - "strength": 1, - "flag": "SE" - }, - { - "coordinates": [1403, 235], - "name": "Finland 🇫🇮", - "strength": 1, - "flag": "FI" - }, - { - "coordinates": [775, 541], - "name": "Belgium 🇧🇪", - "strength": 1, - "flag": "BE" - }, - { - "coordinates": [868, 487], - "name": "Netherlands 🇳🇱", - "strength": 1, - "flag": "NL" - }, - { - "coordinates": [1000, 480], - "name": "Germany 🇩🇪", - "strength": 1, - "flag": "DE" - }, - { - "coordinates": [1017, 628], - "name": "Austria 🇦🇹", - "strength": 1, - "flag": "AT" - }, - { - "coordinates": [1120, 477], - "name": "Poland 🇵🇱", - "strength": 1, - "flag": "PL" - }, - { - "coordinates": [1060, 530], - "name": "Czechia 🇨🇿", - "strength": 1, - "flag": "CZ" - }, - { - "coordinates": [1540, 602], - "name": "Ukraine 🇺🇦", - "strength": 1, - "flag": "UA" - }, - { - "coordinates": [1500, 440], - "name": "Belarus 🇧🇾", - "strength": 1, - "flag": "BY" - }, - { - "coordinates": [1400, 670], - "name": "Romania 🇷🇴", - "strength": 1, - "flag": "RO" - }, - { - "coordinates": [1580, 834], - "name": "Turkiye 🇹🇷", - "strength": 1, - "flag": "TR" - }, - { - "coordinates": [525, 955], - "name": "Morocco 🇲🇦", - "strength": 1, - "flag": "MA" - }, - { - "coordinates": [1674, 449], - "name": "Russia 🇷🇺", - "strength": 3, - "flag": "RU" - }, - { - "coordinates": [1750, 950], - "name": "Syria 🇸🇾", - "strength": 1, - "flag": "SY" - }, - { - "coordinates": [1930, 950], - "name": "Iraq 🇮🇶", - "strength": 1, - "flag": "IQ" - }, - { - "coordinates": [1900, 720], - "name": "Georgia 🇬🇪", - "strength": 1, - "flag": "GE" - }, - { - "coordinates": [950, 930], - "name": "Tunisia 🇹🇳", - "strength": 1, - "flag": "TN" - }, - { - "coordinates": [740, 940], - "name": "Algeria 🇩🇿", - "strength": 1, - "flag": "DZ" - }, - { - "coordinates": [460, 830], - "name": "Portugal 🇵🇹", - "strength": 1, - "flag": "PT" - }, - { - "coordinates": [1300, 830], - "name": "Greece 🇬🇷", - "strength": 1, - "flag": "GR" - }, - { - "coordinates": [1270, 700], - "name": "Serbia 🇷🇸", - "strength": 1, - "flag": "RS" - }, - { - "coordinates": [1200, 630], - "name": "Hungary 🇭🇺", - "strength": 1, - "flag": "HU" - } - ] + "name": "Europe", + "width": 2000, + "height": 1000, + "nations": [ + { + "coordinates": [ + 171, + 171 + ], + "name": "Iceland 🇮🇸", + "strength": 1, + "flag": "is" + }, + { + "coordinates": [ + 477, + 473 + ], + "name": "Ireland 🇮🇪", + "strength": 1, + "flag": "ie" + }, + { + "coordinates": [ + 650, + 500 + ], + "name": "England 🇬🇧", + "strength": 3, + "flag": "gb" + }, + { + "coordinates": [ + 560, + 800 + ], + "name": "Spain 🇪🇸", + "strength": 2, + "flag": "es" + }, + { + "coordinates": [ + 726, + 616 + ], + "name": "France 🇫🇷", + "strength": 2, + "flag": "fr" + }, + { + "coordinates": [ + 1050, + 745 + ], + "name": "Italy 🇮🇹", + "strength": 1, + "flag": "it" + }, + { + "coordinates": [ + 872, + 634 + ], + "name": "Switzerland 🇨🇭", + "strength": 1, + "flag": "ch" + }, + { + "coordinates": [ + 960, + 271 + ], + "name": "Norway 🇳🇴", + "strength": 1, + "flag": "no" + }, + { + "coordinates": [ + 1095, + 336 + ], + "name": "Sweden 🇸🇪", + "strength": 1, + "flag": "se" + }, + { + "coordinates": [ + 1403, + 235 + ], + "name": "Finland 🇫🇮", + "strength": 1, + "flag": "fi" + }, + { + "coordinates": [ + 775, + 541 + ], + "name": "Belgium 🇧🇪", + "strength": 1, + "flag": "be" + }, + { + "coordinates": [ + 868, + 487 + ], + "name": "Netherlands 🇳🇱", + "strength": 1, + "flag": "nl" + }, + { + "coordinates": [ + 1000, + 480 + ], + "name": "Germany 🇩🇪", + "strength": 1, + "flag": "de" + }, + { + "coordinates": [ + 1017, + 628 + ], + "name": "Austria 🇦🇹", + "strength": 1, + "flag": "at" + }, + { + "coordinates": [ + 1120, + 477 + ], + "name": "Poland 🇵🇱", + "strength": 1, + "flag": "pl" + }, + { + "coordinates": [ + 1060, + 530 + ], + "name": "Czechia 🇨🇿", + "strength": 1, + "flag": "cz" + }, + { + "coordinates": [ + 1540, + 602 + ], + "name": "Ukraine 🇺🇦", + "strength": 1, + "flag": "ua" + }, + { + "coordinates": [ + 1500, + 440 + ], + "name": "Belarus 🇧🇾", + "strength": 1, + "flag": "by" + }, + { + "coordinates": [ + 1400, + 670 + ], + "name": "Romania 🇷🇴", + "strength": 1, + "flag": "ro" + }, + { + "coordinates": [ + 1580, + 834 + ], + "name": "Turkiye 🇹🇷", + "strength": 1, + "flag": "tr" + }, + { + "coordinates": [ + 525, + 955 + ], + "name": "Morocco 🇲🇦", + "strength": 1, + "flag": "ma" + }, + { + "coordinates": [ + 1674, + 449 + ], + "name": "Russia 🇷🇺", + "strength": 3, + "flag": "ru" + }, + { + "coordinates": [ + 1750, + 950 + ], + "name": "Syria 🇸🇾", + "strength": 1, + "flag": "sy" + }, + { + "coordinates": [ + 1930, + 950 + ], + "name": "Iraq 🇮🇶", + "strength": 1, + "flag": "iq" + }, + { + "coordinates": [ + 1900, + 720 + ], + "name": "Georgia 🇬🇪", + "strength": 1, + "flag": "ge" + }, + { + "coordinates": [ + 950, + 930 + ], + "name": "Tunisia 🇹🇳", + "strength": 1, + "flag": "tn" + }, + { + "coordinates": [ + 740, + 940 + ], + "name": "Algeria 🇩🇿", + "strength": 1, + "flag": "dz" + }, + { + "coordinates": [ + 460, + 830 + ], + "name": "Portugal 🇵🇹", + "strength": 1, + "flag": "pt" + }, + { + "coordinates": [ + 1300, + 830 + ], + "name": "Greece 🇬🇷", + "strength": 1, + "flag": "gr" + }, + { + "coordinates": [ + 1270, + 700 + ], + "name": "Serbia 🇷🇸", + "strength": 1, + "flag": "rs" + }, + { + "coordinates": [ + 1200, + 630 + ], + "name": "Hungary 🇭🇺", + "strength": 1, + "flag": "hu" + } + ] } \ No newline at end of file diff --git a/resources/maps/WorldMap.json b/resources/maps/WorldMap.json index 4bfd542b8..9900f1401 100644 --- a/resources/maps/WorldMap.json +++ b/resources/maps/WorldMap.json @@ -1,271 +1,286 @@ { - "name": "World", - "width": 2000, - "height": 1000, - "nations": [ - { - "coordinates": [375, 272], - "flag": "US", - "name": "USA 🇺🇸", - "strength": 3 - }, - { - "coordinates": [372, 136], - "flag": "CA", - "name": "Canada 🇨🇦", - "strength": 2 - }, - { - "coordinates": [375, 374], - "flag": "MX", - "name": "Mexico 🇲🇽", - "strength": 1 - }, - { - "coordinates": [500, 378], - "flag": "CU", - "name": "Cuba 🇨🇺", - "strength": 1 - }, - { - "coordinates": [524, 474], - "flag": "CO", - "name": "Colombia 🇨🇴", - "strength": 1 - }, - { - "coordinates": [593, 473], - "flag": "VE", - "name": "Venezuela 🇻🇪", - "strength": 1 - }, - { - "coordinates": [596, 705], - "flag": "AR", - "name": "Argentina 🇦🇷", - "strength": 1 - }, - { - "coordinates": [637, 567], - "flag": "BR", - "name": "Brazil 🇧🇷", - "strength": 1 - }, - { - "coordinates": [1280, 975], - "flag": "AQ", - "name": "Antartica 🇦🇶", - "strength": 3 - }, - { - "coordinates": [709, 57], - "flag": "GL", - "name": "Greenland 🇬🇱", - "strength": 2 - }, - { - "coordinates": [831, 112], - "flag": "IS", - "name": "Iceland 🇮🇸", - "strength": 1 - }, - { - "coordinates": [925, 186], - "flag": "GB", - "name": "England 🇬🇧", - "strength": 3 - }, - { - "coordinates": [887, 183], - "flag": "IE", - "name": "Ireland 🇮🇪", - "strength": 1 - }, - { - "coordinates": [908, 264], - "flag": "ES", - "name": "Spain 🇪🇸", - "strength": 1 - }, - { - "coordinates": [1004, 250], - "flag": "IT", - "name": "Italy 🇮🇹", - "strength": 1 - }, - { - "coordinates": [958, 220], - "flag": "FR", - "name": "France 🇫🇷", - "strength": 2 - }, - { - "coordinates": [997, 205], - "flag": "DE", - "name": "Germany 🇩🇪", - "strength": 1 - }, - { - "coordinates": [1064, 101], - "flag": "SE", - "name": "Sweden 🇸🇪", - "strength": 1 - }, - { - "coordinates": [1046, 193], - "flag": "PL", - "name": "Poland 🇵🇱", - "strength": 1 - }, - { - "coordinates": [1061, 188], - "flag": "BY", - "name": "Belarus 🇧🇾", - "strength": 1 - }, - { - "coordinates": [1073, 243], - "flag": "RO", - "name": "Romania 🇷🇴", - "strength": 1 - }, - { - "coordinates": [1161, 274], - "flag": "TR", - "name": "Turkiye 🇹🇷", - "strength": 1 - }, - { - "coordinates": [969, 133], - "flag": "NO", - "name": "Norway 🇳🇴", - "strength": 1 - }, - { - "coordinates": [1062, 133], - "flag": "FI", - "name": "Finland 🇫🇮", - "strength": 1 - }, - { - "coordinates": [1099, 211], - "flag": "UA", - "name": "Ukraine 🇺🇦", - "strength": 1 - }, - { - "coordinates": [1344, 136], - "flag": "RU", - "name": "Russia 🇷🇺", - "strength": 3 - }, - { - "coordinates": [1537, 186], - "flag": "MN", - "name": "Mongolia 🇲🇳", - "strength": 1 - }, - { - "coordinates": [1524, 328], - "flag": "CN", - "name": "China 🇨🇳", - "strength": 3 - }, - { - "coordinates": [1368, 373], - "flag": "IN", - "name": "India 🇮🇳", - "strength": 2 - }, - { - "coordinates": [1276, 239], - "flag": "KZ", - "name": "Kazakhstan 🇰🇿", - "strength": 1 - }, - { - "coordinates": [1238, 309], - "flag": "IR", - "name": "Iran 🇮🇷", - "strength": 1 - }, - { - "coordinates": [1178, 351], - "flag": "SA", - "name": "Saudi Arabia 🇸🇦", - "strength": 1 - }, - { - "coordinates": [1679, 657], - "flag": "AU", - "name": "Australia 🇦🇺", - "strength": 2 - }, - { - "coordinates": [1890, 775], - "flag": "NZ", - "name": "New Zealand 🇳🇿", - "strength": 0.5 - }, - { - "coordinates": [918, 342], - "flag": "DZ", - "name": "Algeria 🇩🇿", - "strength": 1 - }, - { - "coordinates": [1030, 332], - "flag": "LY", - "name": "Libya 🇱🇾", - "strength": 1 - }, - { - "coordinates": [1092, 335], - "flag": "EG", - "name": "Egypt 🇪🇬", - "strength": 1 - }, - { - "coordinates": [963, 410], - "flag": "NE", - "name": "Niger 🇳🇪", - "strength": 1 - }, - { - "coordinates": [1112, 406], - "flag": "SD", - "name": "Sudan 🇸🇩", - "strength": 1 - }, - { - "coordinates": [1074, 508], - "flag": "CD", - "name": "DRC 🇨🇩", - "strength": 1 - }, - { - "coordinates": [1154, 443], - "flag": "ET", - "name": "Ethiopia 🇪🇹", - "strength": 1 - }, - { - "coordinates": [1075, 707], - "flag": "ZA", - "name": "South Africa 🇿🇦", - "strength": 1 - }, - { - "coordinates": [1194, 627], - "flag": "MG", - "name": "Madagascar 🇲🇬", - "strength": 0.5 - }, - { - "coordinates": [1052, 420], - "flag": "TD", - "name": "Chad 🇹🇩", - "strength": 1 - } - ] + "name": "Europe", + "width": 2000, + "height": 1000, + "nations": [ + { + "coordinates": [ + 171, + 171 + ], + "name": "Iceland 🇮🇸", + "strength": 1, + "flag": "is" + }, + { + "coordinates": [ + 477, + 473 + ], + "name": "Ireland 🇮🇪", + "strength": 1, + "flag": "ie" + }, + { + "coordinates": [ + 650, + 500 + ], + "name": "England 🇬🇧", + "strength": 3, + "flag": "gb" + }, + { + "coordinates": [ + 560, + 800 + ], + "name": "Spain 🇪🇸", + "strength": 2, + "flag": "es" + }, + { + "coordinates": [ + 726, + 616 + ], + "name": "France 🇫🇷", + "strength": 2, + "flag": "fr" + }, + { + "coordinates": [ + 1050, + 745 + ], + "name": "Italy 🇮🇹", + "strength": 1, + "flag": "it" + }, + { + "coordinates": [ + 872, + 634 + ], + "name": "Switzerland 🇨🇭", + "strength": 1, + "flag": "ch" + }, + { + "coordinates": [ + 960, + 271 + ], + "name": "Norway 🇳🇴", + "strength": 1, + "flag": "no" + }, + { + "coordinates": [ + 1095, + 336 + ], + "name": "Sweden 🇸🇪", + "strength": 1, + "flag": "se" + }, + { + "coordinates": [ + 1403, + 235 + ], + "name": "Finland 🇫🇮", + "strength": 1, + "flag": "fi" + }, + { + "coordinates": [ + 775, + 541 + ], + "name": "Belgium 🇧🇪", + "strength": 1, + "flag": "be" + }, + { + "coordinates": [ + 868, + 487 + ], + "name": "Netherlands 🇳🇱", + "strength": 1, + "flag": "nl" + }, + { + "coordinates": [ + 1000, + 480 + ], + "name": "Germany 🇩🇪", + "strength": 1, + "flag": "de" + }, + { + "coordinates": [ + 1017, + 628 + ], + "name": "Austria 🇦🇹", + "strength": 1, + "flag": "at" + }, + { + "coordinates": [ + 1120, + 477 + ], + "name": "Poland 🇵🇱", + "strength": 1, + "flag": "pl" + }, + { + "coordinates": [ + 1060, + 530 + ], + "name": "Czechia 🇨🇿", + "strength": 1, + "flag": "cz" + }, + { + "coordinates": [ + 1540, + 602 + ], + "name": "Ukraine 🇺🇦", + "strength": 1, + "flag": "ua" + }, + { + "coordinates": [ + 1500, + 440 + ], + "name": "Belarus 🇧🇾", + "strength": 1, + "flag": "by" + }, + { + "coordinates": [ + 1400, + 670 + ], + "name": "Romania 🇷🇴", + "strength": 1, + "flag": "ro" + }, + { + "coordinates": [ + 1580, + 834 + ], + "name": "Turkiye 🇹🇷", + "strength": 1, + "flag": "tr" + }, + { + "coordinates": [ + 525, + 955 + ], + "name": "Morocco 🇲🇦", + "strength": 1, + "flag": "ma" + }, + { + "coordinates": [ + 1674, + 449 + ], + "name": "Russia 🇷🇺", + "strength": 3, + "flag": "ru" + }, + { + "coordinates": [ + 1750, + 950 + ], + "name": "Syria 🇸🇾", + "strength": 1, + "flag": "sy" + }, + { + "coordinates": [ + 1930, + 950 + ], + "name": "Iraq 🇮🇶", + "strength": 1, + "flag": "iq" + }, + { + "coordinates": [ + 1900, + 720 + ], + "name": "Georgia 🇬🇪", + "strength": 1, + "flag": "ge" + }, + { + "coordinates": [ + 950, + 930 + ], + "name": "Tunisia 🇹🇳", + "strength": 1, + "flag": "tn" + }, + { + "coordinates": [ + 740, + 940 + ], + "name": "Algeria 🇩🇿", + "strength": 1, + "flag": "dz" + }, + { + "coordinates": [ + 460, + 830 + ], + "name": "Portugal 🇵🇹", + "strength": 1, + "flag": "pt" + }, + { + "coordinates": [ + 1300, + 830 + ], + "name": "Greece 🇬🇷", + "strength": 1, + "flag": "gr" + }, + { + "coordinates": [ + 1270, + 700 + ], + "name": "Serbia 🇷🇸", + "strength": 1, + "flag": "rs" + }, + { + "coordinates": [ + 1200, + 630 + ], + "name": "Hungary 🇭🇺", + "strength": 1, + "flag": "hu" + } + ] } \ No newline at end of file