Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Use JuBot by default.

Browse Source 
Fixes #774.

This was SVN commit r9507.
This commit is contained in:
Ykkrosh 2011-05-12 23:55:35 +00:00
parent b741feafb1
commit 123c00763a
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -84,14 +84,7 @@ function initMain()
// Get default player data - remove gaia
g_DefaultPlayerData = initPlayerDefaults();
g_DefaultPlayerData.shift();
// Copy default player data to settings
g_GameAttributes.settings.PlayerData = [];
for (var i = 0; i < g_DefaultPlayerData.length; ++i)
{
g_GameAttributes.settings.PlayerData[i] = g_DefaultPlayerData[i];
}
// Init civs
initCivNameList();
@ -542,13 +535,17 @@ function selectNumPlayers(num)
// Update player data
var pData = g_GameAttributes.settings.PlayerData;
if (pData && num < pData.length)
{ // Remove extra player data
{
// Remove extra player data
g_GameAttributes.settings.PlayerData = pData.slice(0, num);
}
else
{ // Add player data from defaults
{
// Add player data from defaults
for (var i = pData.length; i < num; ++i)
{
g_GameAttributes.settings.PlayerData.push(g_DefaultPlayerData[i]);
}
}
updateGameAttributes();
@ -647,7 +644,7 @@ function selectMap(name)
}
var mapData = loadMapData(name);
var mapSettings = (mapData && mapData.settings ? mapData.settings : {});
var mapSettings = (mapData && mapData.settings ? deepcopy(mapData.settings) : {});
// Copy any new settings
g_GameAttributes.map = name;
@ -657,6 +654,15 @@ function selectMap(name)
g_GameAttributes.settings[prop] = mapSettings[prop];
}
// Use default AI if the map doesn't specify any explicitly
for (var i = 0; i < g_GameAttributes.settings.PlayerData.length; ++i)
{
if (!('AI' in g_GameAttributes.settings.PlayerData[i]))
{
g_GameAttributes.settings.PlayerData[i].AI = g_DefaultPlayerData[i].AI;
}
}
// Reset player assignments on map change
if (!g_IsNetworked)
{ // Slot 1
@ -941,7 +947,7 @@ function updatePlayerList()
var configButton = getGUIObjectByName("playerConfig["+i+"]");
configButton.hidden = true;
// Look for valid player slots
if (playerSlot < g_GameAttributes.settings.PlayerData.length)
{

14
binaries/data/mods/public/simulation/data/player_defaults.json
View File

@ -17,43 +17,43 @@
"Name": "Player 2",
"Civ": "hele",
"Colour": { "r": 150, "g": 20, "b": 20 },
"AI": ""
"AI": "jubot"
},
{
"Name": "Player 3",
"Civ": "hele",
"Colour": { "r": 50, "g": 165, "b": 5 },
"AI": ""
"AI": "jubot"
},
{
"Name": "Player 4",
"Civ": "hele",
"Colour": { "r": 230, "g": 230, "b": 75 },
"AI": ""
"AI": "jubot"
},
{
"Name": "Player 5",
"Civ": "hele",
"Colour": { "r": 50, "g": 170, "b": 170 },
"AI": ""
"AI": "jubot"
},
{
"Name": "Player 6",
"Civ": "hele",
"Colour": { "r": 160, "g": 80, "b": 200 },
"AI": ""
"AI": "jubot"
},
{
"Name": "Player 7",
"Civ": "hele",
"Colour": { "r": 235, "g": 120, "b": 20 },
"AI": ""
"AI": "jubot"
},
{
"Name": "Player 8",
"Civ": "hele",
"Colour": { "r": 64, "g": 64, "b": 64 },
"AI": ""
"AI": "jubot"
}
]
}