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

Fix some inconsistent newline characters from 902fc4a541 in unit_commands.js via unix2dos. Refs #1432

Browse Source 
This was SVN commit r12779.
This commit is contained in:
fcxSanya 2012-10-23 20:42:03 +00:00
parent a21e01150a
commit c98a97924d
1 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
binaries/data/mods/public/gui/session/unit_commands.js
View File

@ -347,20 +347,20 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
case GATE:
var tooltip = item.tooltip;
if (item.template)
{
{
var template = GetTemplateData(item.template);
tooltip += "\n" + getEntityCostTooltip(template);
var affordableMask = getGUIObjectByName("unitGateUnaffordable["+i+"]");
tooltip += "\n" + getEntityCostTooltip(template);
var affordableMask = getGUIObjectByName("unitGateUnaffordable["+i+"]");
affordableMask.hidden = true;
var neededResources = Engine.GuiInterfaceCall("GetNeededResources", template.cost);
if (neededResources)
{
affordableMask.hidden = false;
tooltip += getNeededResourcesTooltip(neededResources);
}
}
var neededResources = Engine.GuiInterfaceCall("GetNeededResources", template.cost);
if (neededResources)
{
affordableMask.hidden = false;
tooltip += getNeededResourcesTooltip(neededResources);
}
}
break;
case STANCE:
@ -444,8 +444,8 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
// Button
var button = getGUIObjectByName("unit"+guiName+"Button["+i+"]");
var button1 = getGUIObjectByName("unit"+guiName+"Button["+(i+rowLength)+"]");
var affordableMask = getGUIObjectByName("unit"+guiName+"Unaffordable["+i+"]");
var affordableMask1 = getGUIObjectByName("unit"+guiName+"Unaffordable["+(i+rowLength)+"]");
var affordableMask = getGUIObjectByName("unit"+guiName+"Unaffordable["+i+"]");
var affordableMask1 = getGUIObjectByName("unit"+guiName+"Unaffordable["+(i+rowLength)+"]");
var icon = getGUIObjectByName("unit"+guiName+"Icon["+i+"]");
var selection = getGUIObjectByName("unit"+guiName+"Selection["+i+"]");
var pair = getGUIObjectByName("unit"+guiName+"Pair["+i+"]");
@ -583,85 +583,85 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
if (guiName == RESEARCH)
{
// Check resource requirements for first button
affordableMask.hidden = true;
var neededResources = Engine.GuiInterfaceCall("GetNeededResources", template.cost);
if (neededResources)
{
if (button.enabled !== false)
{
button.enabled = false;
affordableMask.hidden = false;
}
button.tooltip += getNeededResourcesTooltip(neededResources);
}
// Check resource requirements for first button
affordableMask.hidden = true;
var neededResources = Engine.GuiInterfaceCall("GetNeededResources", template.cost);
if (neededResources)
{
if (button.enabled !== false)
{
button.enabled = false;
affordableMask.hidden = false;
}
button.tooltip += getNeededResourcesTooltip(neededResources);
}
if (item.pair)
{
grayscale = "";
button1.enabled = true;
if (!Engine.GuiInterfaceCall("CheckTechnologyRequirements", entType1))
if (!Engine.GuiInterfaceCall("CheckTechnologyRequirements", entType1))
{
button1.enabled = false;
button1.tooltip += "\n" + GetTechnologyData(entType1).requirementsTooltip;
grayscale = "grayscale:";
}
icon1.sprite = "stretched:" + grayscale + "session/portraits/" +template1.icon;
// Check resource requirements for second button
affordableMask1.hidden = true;
neededResources = Engine.GuiInterfaceCall("GetNeededResources", template.cost);
if (neededResources)
{
if (button1.enabled !== false)
{
button1.enabled = false;
affordableMask1.hidden = false;
}
button1.tooltip += getNeededResourcesTooltip(neededResources);
}
// Check resource requirements for second button
affordableMask1.hidden = true;
neededResources = Engine.GuiInterfaceCall("GetNeededResources", template.cost);
if (neededResources)
{
if (button1.enabled !== false)
{
button1.enabled = false;
affordableMask1.hidden = false;
}
button1.tooltip += getNeededResourcesTooltip(neededResources);
}
}
else
{
pair.hidden = true;
button1.hidden = true;
affordableMask1.hidden = true;
}
}
else if (guiName == CONSTRUCTION || guiName == TRAINING)
{
affordableMask.hidden = true;
var totalCosts = {};
var trainNum = 1;
if (Engine.HotkeyIsPressed("session.batchtrain") && guiName == TRAINING)
{
var [batchSize, batchIncrement] = getTrainingBatchStatus(unitEntState.id, entType);
trainNum = batchSize + batchIncrement;
affordableMask1.hidden = true;
}
}
else if (guiName == CONSTRUCTION || guiName == TRAINING)
{
affordableMask.hidden = true;
var totalCosts = {};
var trainNum = 1;
if (Engine.HotkeyIsPressed("session.batchtrain") && guiName == TRAINING)
{
var [batchSize, batchIncrement] = getTrainingBatchStatus(unitEntState.id, entType);
trainNum = batchSize + batchIncrement;
}
// Walls have no cost defined.
// Walls have no cost defined.
if (template.cost !== undefined)
for (var r in template.cost)
totalCosts[r] = Math.floor(template.cost[r] * trainNum);
var neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCosts);
if (neededResources)
var neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCosts);
if (neededResources)
{
var totalCost = 0;
if (button.enabled !== false)
var totalCost = 0;
if (button.enabled !== false)
{
for each (var resource in neededResources)
totalCost += resource;
button.enabled = false;
affordableMask.hidden = false;
var alpha = 75 + totalCost/6;
alpha = alpha > 150 ? 150 : alpha;
affordableMask.sprite = "colour: 255 0 0 " + (alpha);
}
button.tooltip += getNeededResourcesTooltip(neededResources);
}
button.enabled = false;
affordableMask.hidden = false;
var alpha = 75 + totalCost/6;
alpha = alpha > 150 ? 150 : alpha;
affordableMask.sprite = "colour: 255 0 0 " + (alpha);
}
button.tooltip += getNeededResourcesTooltip(neededResources);
}
}
}
else