Index: binaries/data/mods/public/gamesettings/attributes/PlayerColor.js =================================================================== --- binaries/data/mods/public/gamesettings/attributes/PlayerColor.js +++ binaries/data/mods/public/gamesettings/attributes/PlayerColor.js @@ -1,11 +1,31 @@ /** * Stores player color for all players. */ + +const defaultColorsData =[ + { "r": 10, "g": 10, "b": 190 }, + { "r": 230, "g": 10, "b": 10 }, + { "r": 125 , "g": 235, "b": 15 }, + { "r": 255, "g": 255, "b": 55 }, + { "r": 130, "g": 0, "b": 230 }, + { "r": 255, "g": 130, "b": 0 }, + { "r": 10, "g": 230, "b": 230 }, + { "r": 20, "g": 80, "b": 60 }, + { "r": 220, "g": 160, "b": 220 }, + { "r": 80, "g": 255, "b": 190 }, + { "r": 50, "g": 150, "b": 255 }, + { "r": 100, "g": 150, "b": 30 }, + { "r": 100, "g": 60, "b": 30 }, + { "r": 128, "g": 0, "b": 64 }, + { "r": 255, "g": 200, "b": 140 }, + { "r": 80, "g": 80, "b": 80 } +] + GameSettings.prototype.Attributes.PlayerColor = class PlayerColor extends GameSetting { init() { - this.defaultColors = g_Settings.PlayerDefaults.slice(1).map(pData => pData.Color); + this.defaultColors = defaultColorsData; this.watch(() => this.maybeUpdate(), ["available"]); this.settings.playerCount.watch(() => this.maybeUpdate(), ["nbPlayers"]); Index: binaries/data/mods/public/simulation/data/settings/player_defaults.json =================================================================== --- binaries/data/mods/public/simulation/data/settings/player_defaults.json +++ binaries/data/mods/public/simulation/data/settings/player_defaults.json @@ -12,7 +12,7 @@ { "Name": "Player 1", "Civ": "athen", - "Color": { "r": 21, "g": 55, "b": 149 }, + "Color": { "r": 10, "g": 10, "b": 190 }, "AI": "petra", "AIDiff": 3, "AIBehavior": "random" @@ -20,7 +20,7 @@ { "Name": "Player 2", "Civ": "cart", - "Color": { "r": 150, "g": 20, "b": 20 }, + "Color": { "r": 230, "g": 10, "b": 10 }, "AI": "petra", "AIDiff": 3, "AIBehavior": "random" @@ -28,7 +28,7 @@ { "Name": "Player 3", "Civ": "gaul", - "Color": { "r": 86 , "g": 180, "b": 31 }, + "Color": { "r": 125 , "g": 235, "b": 15 }, "AI": "petra", "AIDiff": 3, "AIBehavior": "random" @@ -36,7 +36,7 @@ { "Name": "Player 4", "Civ": "iber", - "Color": { "r": 231, "g": 200, "b": 5 }, + "Color": { "r": 255, "g": 255, "b": 55 }, "AI": "petra", "AIDiff": 3, "AIBehavior": "random" @@ -44,7 +44,7 @@ { "Name": "Player 5", "Civ": "mace", - "Color": { "r": 50, "g": 170, "b": 170 }, + "Color": { "r": 130, "g": 0, "b": 230 }, "AI": "petra", "AIDiff": 3, "AIBehavior": "random" @@ -52,7 +52,7 @@ { "Name": "Player 6", "Civ": "maur", - "Color": { "r": 160, "g": 80, "b": 200 }, + "Color": { "r": 255, "g": 130, "b": 0 }, "AI": "petra", "AIDiff": 3, "AIBehavior": "random" @@ -60,7 +60,7 @@ { "Name": "Player 7", "Civ": "pers", - "Color": { "r": 220, "g": 115, "b": 16 }, + "Color": { "r": 10, "g": 230, "b": 230 }, "AI": "petra", "AIDiff": 3, "AIBehavior": "random" @@ -68,7 +68,7 @@ { "Name": "Player 8", "Civ": "rome", - "Color": { "r": 64, "g": 64, "b": 64 }, + "Color": { "r": 20, "g": 80, "b": 60 }, "AI": "petra", "AIDiff": 3, "AIBehavior": "random"