Index: ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml	(revision 27171)
+++ ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml	(revision 27172)
@@ -1,204 +1,204 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <styles>
 	<!--
 	==========================================
 	- DEFAULT STYLE: The style with the name 'default' is special, it will
 	- be called by every object before any other style is loaded.
 	==========================================
 	Note that the default z value is determined by GUI engine regardless of what is specified here.
 	-->
 	<style name="default"
 		absolute="false"
 		enabled="true"
 		ghost="false"
 		hidden="false"
 		size="0 0 100% 100%"
 		font="sans-14"
 		buffer_zone="5"
 	/>
 	<style name="ModernWindow"
 		sprite="ModernWindow"
 	/>
 	<style name="ModernDialog"
 		sprite="ModernDialog"
 	/>
 	<style name="ModernList"
 		buffer_zone="5"
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sprite="ModernDarkBox"
 		sprite_overlay="ModernDarkBoxBottomGold"
 		sprite_selectarea="ModernDarkBox"
 		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		textcolor="white"
 		textcolor_selected="white"
 		text_align="left"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernSortedList"
 		buffer_zone="5"
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sprite="ModernDarkBox"
 		sprite_overlay="ModernDarkBoxBottomGold"
 		sprite_selectarea="ModernDarkBox"
 		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		sprite_heading="ModernDarkBoxGoldNoBottom"
 		sprite_asc="ModernArrowUp"
 		sprite_desc="ModernArrowDown"
 		sprite_not_sorted="ModernNotSorted"
 		textcolor="white"
 		textcolor_selected="white"
 		text_align="left"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernDropDown"
 		dropdown_buffer="1"
 		font="sans-bold-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
 		button_width="16"
 		sprite="ModernDarkBox"
 		sprite_disabled="ModernDarkBoxDisabled"
 		sprite_overlay="ModernDarkBoxGoldBorder"
 		sprite_overlay_disabled="ModernDarkBoxGoldBorderDisabled"
 		sprite2="ModernDropDownArrow"
 		sprite2_disabled="ModernDropDownArrowDisabled"
 		sprite2_pressed="ModernDropDownArrowHighlight"
 		buffer_zone="8"
-		dropdown_size="225"
+		dropdown_size="440"
 		minimum_visible_items="3"
 		sprite_list="GrayBackground"
 		sprite_list_overlay="BlackBorder"
 		sprite_selectarea="ModernDarkBox"
 		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		textcolor_selected="white"
 		textcolor_disabled="140 140 140 255"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sound_opened="audio/interface/ui/ui_button_click.ogg"
 		sound_closed="audio/interface/ui/ui_button_click.ogg"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="center"
 		text_valign="center"
 	/>
 	<style name="ModernRightLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="right"
 		text_valign="center"
 	/>
 	<style name="ModernLeftLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="left"
 		text_valign="center"
 	/>
 	<style name="ModernTopLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		text_align="center"
 		text_valign="top"
 	/>
 	<style name="ModernLeftTopLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="top"
 	/>
 	<style name="ModernText"
 		font="sans-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="top"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 	/>
 	<style name="ModernTextPanel"
 		buffer_zone="8"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
 		sprite="ModernDarkBox"
 		sprite_overlay="ModernDarkBoxGoldBorder"
 	/>
 	<style name="ModernInput"
 		sprite="ModernDarkBox"
 		sprite_overlay="ModernDarkBoxGoldBorder"
 		sprite_selectarea="color:150 0 0"
 		textcolor="white"
 		textcolor_selected="white"
 		placeholder_color="gray"
 	/>
 	<style name="ModernTickBox"
 		sprite="ModernTickOff"
 		sprite2="ModernTickOn"
 		sprite_disabled="ModernTickDisabledOff"
 		sprite2_disabled="ModernTickDisabledOn"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernSlider"
 		sprite="ModernSliderButton"
 		sprite_disabled="ModernSliderButtonDisabled"
 		sprite_bar="ModernSliderLine"
 		sprite_bar_disabled="ModernSliderLineDisabled"
 		button_width="20"
 		tooltip_style="tooltipInstant"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernButtonRed"
 		sprite="ModernButtonRed"
 		sprite_disabled="ModernButtonRedDisabled"
 		sprite_over="ModernButtonRedOver"
 		sprite_pressed="ModernButtonRed"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="210 210 210 160"
 		text_align="center"
 		text_valign="center"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernProgressBarBackground"
 		sprite="ModernProgressBarBackground"
 	/>
 	<style name="ModernProgressBar"
 		sprite_bar="ModernProgressBar"
 		size="3 0 100%-3 100%"
 	/>
 	<style name="ModernProgressBarText"
 		font="sans-stroke-14"
 		textcolor="white"
 		text_align="center"
 		text_valign="center"
 	/>
 	<style name="ModernTabButtonHorizontal"
 		sprite="ModernTabHorizontalBackground"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernTabButtonVertical"
 		sprite="ModernTabVerticalBackground"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernChart"
 		axis_color="209 174 132 255"
 		axis_width="2"
 		buffer_zone="4"
 		font="sans-stroke-14"
 		format_x="DECIMAL2"
 		format_y="DECIMAL2"
 		text_align="left"
 	/>
 </styles>
Index: ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerColor.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerColor.js	(revision 27171)
+++ ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerColor.js	(revision 27172)
@@ -1,191 +1,192 @@
 /**
  * Stores player color for all players.
  */
 GameSettings.prototype.Attributes.PlayerColor = class PlayerColor extends GameSetting
 {
 	init()
 	{
 		this.defaultColors = g_Settings.PlayerDefaults.slice(1).map(pData => pData.Color);
 
 		this.watch(() => this.maybeUpdate(), ["available"]);
 		this.settings.playerCount.watch(() => this.maybeUpdate(), ["nbPlayers"]);
 		this.settings.map.watch(() => this.onMapChange(), ["map"]);
 
 		// NB: watchers aren't auto-triggered when modifying array elements.
 		this.values = [];
 		this.locked = [];
 		this._updateAvailable();
 	}
 
 	toInitAttributes(attribs)
 	{
 		if (!attribs.settings.PlayerData)
 			attribs.settings.PlayerData = [];
 		while (attribs.settings.PlayerData.length < this.values.length)
 			attribs.settings.PlayerData.push({});
 		for (let i in this.values)
 			if (this.values[i])
 				attribs.settings.PlayerData[i].Color = this.values[i];
 	}
 
 	fromInitAttributes(attribs)
 	{
 		if (!this.getLegacySetting(attribs, "PlayerData"))
 			return;
 		const pData = this.getLegacySetting(attribs, "PlayerData");
 		for (let i = 0; i < this.values.length; ++i)
 			if (pData[i] && pData[i].Color)
 				this.setColor(i, pData[i].Color);
 	}
 
 	_resize(nb)
 	{
 		while (this.values.length > nb)
 		{
 			this.values.pop();
 			this.locked.pop();
 		}
 		while (this.values.length < nb)
 		{
 			this.values.push(undefined);
 			this.locked.push(false);
 		}
 	}
 
 	onMapChange()
 	{
 		// Reset.
 		this.locked = this.locked.map(x => this.settings.map.type == "scenario");
 		this.trigger("locked");
 		if (this.settings.map.type === "scenario")
 			this._resize(0);
 		this._updateAvailable();
 		this.maybeUpdate();
 	}
 
 	maybeUpdate()
 	{
 		this._resize(this.settings.playerCount.nbPlayers);
 
 		this.values.forEach((c, i) => this._set(i, c));
 		this.trigger("values");
 	}
 
 	_set(playerIndex, color)
 	{
 		let inUse = this.values.findIndex((otherColor, i) =>
 			color && otherColor &&
 			sameColor(color, otherColor));
 		if (inUse != -1 && inUse != playerIndex)
 		{
 			// Swap colors.
 			let col = this.values[playerIndex];
 			this.values[playerIndex] = undefined;
 			this._set(inUse, col);
 		}
 		if (!color || this.available.indexOf(color) == -1)
 		{
 			this.values[playerIndex] = color ?
 				this._findClosestColor(color, this.available) :
 				this._getUnusedColor();
 		}
 		else
 			this.values[playerIndex] = color;
 	}
 
 	get(playerIndex)
 	{
 		if (playerIndex >= this.values.length)
 			return undefined;
 		return this.values[playerIndex];
 	}
 
 	setColor(playerIndex, color)
 	{
 		this._set(playerIndex, color);
 		this.trigger("values");
 	}
 
 	swap(sourceIndex, targetIndex)
 	{
 		[this.values[sourceIndex], this.values[targetIndex]] = [this.values[targetIndex], this.values[sourceIndex]];
 		[this.locked[sourceIndex], this.locked[targetIndex]] = [this.locked[targetIndex], this.locked[sourceIndex]];
 		this.trigger("values");
 	}
 
 	_getMapData(i)
 	{
 		let data = this.settings.map.data;
 		if (!data || !data.settings || !data.settings.PlayerData)
 			return undefined;
 		if (data.settings.PlayerData.length <= i)
 			return undefined;
 		return data.settings.PlayerData[i].Color;
 	}
 
 	_updateAvailable()
 	{
 		// Pick colors that the map specifies, add most unsimilar default colors
-		// Provide the access to g_MaxPlayers different colors, regardless of current playercount.
+		// Provide the access to all the colors defined in simulation/data/settings/player_defaults.json,
+		// regardless of current playercount.
 		let values = [];
 		let mapColors = false;
-		for (let i = 0; i < g_MaxPlayers; ++i)
+		for (let i = 0; i < this.defaultColors.length; ++i)
 		{
 			let col = this._getMapData(i);
 			if (col)
 				mapColors = true;
 			if (mapColors)
 				values.push(col || this._findFarthestUnusedColor(values));
 			else
 				values.push(this.defaultColors[i]);
 		}
 		this.available = values;
 	}
 
 	_findClosestColor(targetColor, colors)
 	{
 		let closestColor;
 		let closestColorDistance = 0;
 		for (let color of colors)
 		{
 			let dist = colorDistance(targetColor, color);
 			if (!closestColor || dist < closestColorDistance)
 			{
 				closestColor = color;
 				closestColorDistance = dist;
 			}
 		}
 		return closestColor;
 	}
 
 	_findFarthestUnusedColor(values)
 	{
 		let farthestColor;
 		let farthestDistance = 0;
 
 		for (let defaultColor of this.defaultColors)
 		{
 			let smallestDistance = Infinity;
 			for (let usedColor of values)
 			{
 				let distance = colorDistance(usedColor, defaultColor);
 				if (distance < smallestDistance)
 					smallestDistance = distance;
 			}
 
 			if (smallestDistance >= farthestDistance)
 			{
 				farthestColor = defaultColor;
 				farthestDistance = smallestDistance;
 			}
 		}
 		return farthestColor;
 	}
 
 	_getUnusedColor()
 	{
 		return this.available.find(color => {
 			return this.values.every(otherColor => !otherColor || !sameColor(color, otherColor));
 		});
 	}
 };