diff --git a/resources/maps/BlackSea.json b/resources/maps/BlackSea.json index ae90b80cb..3b2e42087 100644 --- a/resources/maps/BlackSea.json +++ b/resources/maps/BlackSea.json @@ -52,4 +52,4 @@ "flag": "am" } ] -} +} \ No newline at end of file diff --git a/resources/maps/Europe.json b/resources/maps/Europe.json index f7df916c4..be6b6c0ff 100644 --- a/resources/maps/Europe.json +++ b/resources/maps/Europe.json @@ -1,193 +1,193 @@ { - "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": "United Kingdom", - "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": "Czech Republic", - "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": "Turkey", - "strength": 1, - "flag": "TR" - }, - { - "coordinates": [525, 955], - "name": "Morocco", - "strength": 1, - "flag": "MA" - }, - { - "coordinates": [1674, 449], - "name": "Russian Federation", - "strength": 3, - "flag": "RU" - }, - { - "coordinates": [1750, 950], - "name": "Syrian Arab Republic", - "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": "United Kingdom", + "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": "Czech Republic", + "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": "Turkey", + "strength": 1, + "flag": "tr" + }, + { + "coordinates": [525, 955], + "name": "Morocco", + "strength": 1, + "flag": "ma" + }, + { + "coordinates": [1674, 449], + "name": "Russian Federation", + "strength": 3, + "flag": "ru" + }, + { + "coordinates": [1750, 950], + "name": "Syrian Arab Republic", + "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 b7288180b..25cd3ddf7 100644 --- a/resources/maps/WorldMap.json +++ b/resources/maps/WorldMap.json @@ -7,265 +7,265 @@ "coordinates": [375, 272], "name": "United States", "strength": 3, - "flag": "US" + "flag": "us" }, { "coordinates": [372, 136], "name": "Canada", "strength": 2, - "flag": "CA" + "flag": "ca" }, { "coordinates": [375, 374], "name": "Mexico", "strength": 1, - "flag": "MX" + "flag": "mx" }, { "coordinates": [500, 378], "name": "Cuba", "strength": 1, - "flag": "CU" + "flag": "cu" }, { "coordinates": [524, 474], "name": "Colombia", "strength": 1, - "flag": "CO" + "flag": "co" }, { "coordinates": [593, 473], "name": "Venezuela", "strength": 1, - "flag": "VE" + "flag": "ve" }, { "coordinates": [596, 705], "name": "Argentina", "strength": 1, - "flag": "AR" + "flag": "ar" }, { "coordinates": [637, 567], "name": "Brazil", "strength": 1, - "flag": "BR" + "flag": "br" }, { "coordinates": [1280, 975], "name": "Antarctica", "strength": 3, - "flag": "AQ" + "flag": "aq" }, { "coordinates": [709, 57], "name": "Greenland", "strength": 2, - "flag": "GL" + "flag": "gl" }, { "coordinates": [831, 112], "name": "Iceland", "strength": 1, - "flag": "IS" + "flag": "is" }, { "coordinates": [925, 186], "name": "United Kingdom", "strength": 3, - "flag": "GB" + "flag": "gb" }, { "coordinates": [887, 183], "name": "Ireland", "strength": 1, - "flag": "IE" + "flag": "ie" }, { "coordinates": [908, 264], "name": "Spain", "strength": 1, - "flag": "ES" + "flag": "es" }, { "coordinates": [1004, 250], "name": "Italy", "strength": 1, - "flag": "IT" + "flag": "it" }, { "coordinates": [958, 220], "name": "France", "strength": 2, - "flag": "FR" + "flag": "fr" }, { "coordinates": [997, 205], "name": "Germany", "strength": 1, - "flag": "DE" + "flag": "de" }, { "coordinates": [1064, 101], "name": "Sweden", "strength": 1, - "flag": "SE" + "flag": "se" }, { "coordinates": [1046, 193], "name": "Poland", "strength": 1, - "flag": "PL" + "flag": "pl" }, { "coordinates": [1061, 188], "name": "Belarus", "strength": 1, - "flag": "BY" + "flag": "by" }, { "coordinates": [1073, 243], "name": "Romania", "strength": 1, - "flag": "RO" + "flag": "ro" }, { "coordinates": [1161, 274], "name": "Turkey", "strength": 1, - "flag": "TR" + "flag": "tr" }, { "coordinates": [969, 133], "name": "Norway", "strength": 1, - "flag": "NO" + "flag": "no" }, { "coordinates": [1062, 133], "name": "Finland", "strength": 1, - "flag": "FI" + "flag": "fi" }, { "coordinates": [1099, 211], "name": "Ukraine", "strength": 1, - "flag": "UA" + "flag": "ua" }, { "coordinates": [1344, 136], "name": "Russian Federation", "strength": 3, - "flag": "RU" + "flag": "ru" }, { "coordinates": [1537, 186], "name": "Mongolia", "strength": 1, - "flag": "MN" + "flag": "mn" }, { "coordinates": [1524, 328], "name": "China", "strength": 3, - "flag": "CN" + "flag": "cn" }, { "coordinates": [1368, 373], "name": "India", "strength": 2, - "flag": "IN" + "flag": "in" }, { "coordinates": [1276, 239], "name": "Kazakhstan", "strength": 1, - "flag": "KZ" + "flag": "kz" }, { "coordinates": [1238, 309], "name": "Iran, Islamic Republic Of", "strength": 1, - "flag": "IR" + "flag": "ir" }, { "coordinates": [1178, 351], "name": "Saudi Arabia", "strength": 1, - "flag": "SA" + "flag": "sa" }, { "coordinates": [1679, 657], "name": "Australia", "strength": 2, - "flag": "AU" + "flag": "au" }, { "coordinates": [1890, 775], "name": "New Zealand", "strength": 0.5, - "flag": "NZ" + "flag": "nz" }, { "coordinates": [918, 342], "name": "Algeria", "strength": 1, - "flag": "DZ" + "flag": "dz" }, { "coordinates": [1030, 332], "name": "Libyan Arab Jamahiriya", "strength": 1, - "flag": "LY" + "flag": "ly" }, { "coordinates": [1092, 335], "name": "Egypt", "strength": 1, - "flag": "EG" + "flag": "eg" }, { "coordinates": [963, 410], "name": "Niger", "strength": 1, - "flag": "NE" + "flag": "ne" }, { "coordinates": [1112, 406], "name": "Sudan", "strength": 1, - "flag": "SD" + "flag": "sd" }, { "coordinates": [1074, 508], "name": "Congo, The Democratic Republic of the", "strength": 1, - "flag": "CD" + "flag": "cd" }, { "coordinates": [1154, 443], "name": "Ethiopia", "strength": 1, - "flag": "ET" + "flag": "et" }, { "coordinates": [1075, 707], "name": "South Africa", "strength": 1, - "flag": "ZA" + "flag": "za" }, { "coordinates": [1194, 627], "name": "Madagascar", "strength": 0.5, - "flag": "MG" + "flag": "mg" }, { "coordinates": [1052, 420], "name": "Chad", "strength": 1, - "flag": "TD" + "flag": "td" } ] -} +} \ No newline at end of file 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) { 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: [