real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Tech tree cleanup.

Browse Source 
Newlines.
Eliminate deprecated for each.
One or two simplifications.

This was SVN commit r18392.
This commit is contained in:
elexis 2016-06-16 20:26:36 +00:00
parent a874b3c1c3
commit 7c9c715ddc
4 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
binaries/data/mods/public/gui/structree/draw.js
View File

@ -15,7 +15,7 @@ function draw()
let defMargin = 4;
let phaseList = g_ParsedData.phaseList;
Engine.GetGUIObjectByName("civEmblem").sprite = "stretched:"+g_CivData[g_SelectedCiv].Emblem;
Engine.GetGUIObjectByName("civEmblem").sprite = "stretched:" + g_CivData[g_SelectedCiv].Emblem;
Engine.GetGUIObjectByName("civName").caption = g_CivData[g_SelectedCiv].Name;
Engine.GetGUIObjectByName("civHistory").caption = g_CivData[g_SelectedCiv].History;
@ -30,16 +30,24 @@ function draw()
let thisEle = Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]");
if (thisEle === undefined)
{
error("\""+g_SelectedCiv+"\" has more structures in phase "+pha+" than can be supported by the current GUI layout");
error("\""+g_SelectedCiv+"\" has more structures in phase " +
pha + " than can be supported by the current GUI layout");
break;
}
let c = 0;
let rowCounts = [];
stru = g_ParsedData.structures[stru];
Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_icon").sprite = "stretched:session/portraits/"+stru.icon;
Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_icon").tooltip = assembleTooltip(stru);
Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_name").caption = translate(stru.name.specific);
Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_icon").sprite =
"stretched:session/portraits/"+stru.icon;
Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_icon").tooltip =
assembleTooltip(stru);
Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_name").caption =
translate(stru.name.specific);
thisEle.hidden = false;
for (let r in g_DrawLimits[pha].prodQuant)
@ -47,8 +55,8 @@ function draw()
let p = 0;
r = +r; // force int
let prod_pha = phaseList[phaseList.indexOf(pha) + r];
if (stru.production.units[prod_pha])
{
for (let prod of stru.production.units[prod_pha])
{
prod = g_ParsedData.units[prod];
@ -56,32 +64,37 @@ function draw()
break;
p++;
}
}
if (stru.wallset && prod_pha == pha)
{
for (let prod of [stru.wallset.gate, stru.wallset.tower])
{
if (!drawProdIcon(i, s, r, p, prod))
break;
p++;
}
}
if (stru.production.technology[prod_pha])
{
for (let prod of stru.production.technology[prod_pha])
{
prod = clone(depath(prod).slice(0,5) == "phase" ? g_ParsedData.phases[prod] : g_ParsedData.techs[prod]);
prod = clone(depath(prod).slice(0,5) == "phase" ?
g_ParsedData.phases[prod] :
g_ParsedData.techs[prod]);
for (let res in stru.techCostMultiplier)
if (prod.cost[res])
prod.cost[res] *= stru.techCostMultiplier[res];
if (!drawProdIcon(i, s, r, p, prod))
break;
p++;
++p;
}
}
rowCounts[r] = p;
if (p>c)
c = p;
hideRemaining("phase["+i+"]_struct["+s+"]_row["+r+"]_prod[", p, "]");
}
@ -152,7 +165,7 @@ function draw()
hideRemaining("trainer["+t+"]_prod[", p, "]");
let size = thisEle.size;
size.right = size.left + ((p*24 < defWidth)?defWidth:p*24)+4;
size.right = size.left + Math.max(p*24, defWidth) + 4;
thisEle.size = size;
let eleWidth = size.right - size.left;
@ -175,12 +188,14 @@ function draw()
function drawProdIcon(pha, s, r, p, prod)
{
let prodEle = Engine.GetGUIObjectByName("phase["+pha+"]_struct["+s+"]_row["+r+"]_prod["+p+"]");
if (pha === null)
prodEle = Engine.GetGUIObjectByName("trainer["+s+"]_prod["+p+"]");
if (prodEle === undefined)
{
error("The "+(pha === null ? "trainer units" : "structures")+" of \""+g_SelectedCiv+"\" have more production icons than can be supported by the current GUI layout");
error("The "+(pha === null ? "trainer units" : "structures") + " of \"" + g_SelectedCiv +
"\" have more production icons than can be supported by the current GUI layout");
return false;
}
@ -205,12 +220,12 @@ function getPositionOffset(idx)
function hideRemaining(prefix, idx, suffix)
{
let obj = Engine.GetGUIObjectByName(prefix+idx+suffix);
let obj = Engine.GetGUIObjectByName(prefix + idx + suffix);
while (obj)
{
obj.hidden = true;
++idx;
obj = Engine.GetGUIObjectByName(prefix+idx+suffix);
obj = Engine.GetGUIObjectByName(prefix + idx + suffix);
}
}
@ -233,7 +248,7 @@ function predraw()
{
let offset = getPositionOffset(i);
// Align the phase row
Engine.GetGUIObjectByName("phase["+i+"]").size = "8 16+"+offset+" 100% 100%";
Engine.GetGUIObjectByName("phase["+i+"]").size = "8 16+" + offset + " 100% 100%";
// Set phase icon
let phaseIcon = Engine.GetGUIObjectByName("phase["+i+"]_phase");

7
binaries/data/mods/public/gui/structree/helper.js
View File

@ -63,14 +63,15 @@ function fetchValue(templateName, keypath)
var keys = keypath.split("/");
var template = loadTemplate(templateName);
let k = 0;
for (; k < keys.length-1; ++k)
let k;
for (k = 0; k < keys.length - 1; ++k)
{
if (template[keys[k]] === undefined)
return [];
template = template[keys[k]];
}
if (template[keys[k]] === undefined)
return [];
@ -93,7 +94,7 @@ function fetchTokens(templateName, keypath)
function depath(path)
{
return path.slice(path.lastIndexOf("/")+1);
return path.slice(path.lastIndexOf("/") + 1);
}
/**

3
binaries/data/mods/public/gui/structree/load.js
View File

@ -116,6 +116,7 @@ function loadStructure(templateName)
"technology": [],
"units": []
};
if (template.ProductionQueue)
{
if (template.ProductionQueue.Entities && template.ProductionQueue.Entities._string)
@ -266,7 +267,7 @@ function loadTechnologyPair(pairCode)
return {
"techs": [ pairInfo.top, pairInfo.bottom ],
"req": (pairInfo.supersedes !== undefined) ? pairInfo.supersedes : ""
"req": pairInfo.supersedes || ""
};
}

36
binaries/data/mods/public/gui/structree/structree.js
View File

@ -1,9 +1,10 @@
var g_ParsedData = {
units: {},
structures: {},
techs: {},
phases: {}
"units": {},
"structures": {},
"techs": {},
"phases": {}
};
var g_Lists = {};
var g_CivData = {};
var g_SelectedCiv = "";
@ -16,15 +17,14 @@ function init(data = {})
{
g_CivData = loadCivData(true);
if (!Object.keys(g_CivData).length)
let civList = Object.keys(g_CivData).map(civ => ({
"name": g_CivData[civ].Name,
"code": civ,
})).sort(sortNameIgnoreCase);
if (!civList.length)
return;
var civList = [ { "name": civ.Name, "code": civ.Code } for each (civ in g_CivData) ];
// Alphabetically sort the list, ignoring case
civList.sort(sortNameIgnoreCase);
// Set civ control
var civSelection = Engine.GetGUIObjectByName("civSelection");
civSelection.list = civList.map(c => c.name);
civSelection.list_data = civList.map(c => c.code);
@ -55,9 +55,11 @@ function selectCiv(civCode)
return;
}
g_Lists.units = [];
g_Lists.structures = [];
g_Lists.techs = [];
g_Lists = {
"units": [],
"structures": [],
"techs": []
};
// get initial units
var startStructs = [];
@ -207,11 +209,14 @@ function selectCiv(civCode)
phase = req;
}
if (depath(phase).slice(0,5) !== "phase" || g_ParsedData.phaseList.indexOf(phase) < structPhaseIdx)
if (depath(phase).slice(0,5) !== "phase" ||
g_ParsedData.phaseList.indexOf(phase) < structPhaseIdx)
{
if (structInfo.phase !== false)
phase = structInfo.phase;
else
phase = g_ParsedData.phaseList[0];
}
if (!(phase in newProdTech))
newProdTech[phase] = [];
@ -295,7 +300,6 @@ function selectCiv(civCode)
g_CivData[g_SelectedCiv].buildList = buildList;
g_CivData[g_SelectedCiv].trainList = trainerList;
// Draw tree
draw();
}