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

Get dropsites' accepting resources from simulation instead of hardcoding them in tooltips.

Browse Source 
Differential Revision: D2980
Reviewed by: @Angen.
Tested and comments by: @Nescio.
This was SVN commit r24045.
This commit is contained in:
Freagarach 2020-09-16 15:28:44 +00:00
parent 61d6885ec2
commit a330d4c7d7
10 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binaries/data/mods/public/globalscripts/Templates.js
View File

@ -347,6 +347,11 @@ function GetTemplateDataHelper(template, player, auraTemplates, modifiers = {})
ret.resourceGatherRates[type] = getEntityValue("ResourceGatherer/Rates/"+ type) * baseSpeed;
}
if (template.ResourceDropsite)
ret.resourceDropsite = {
"types": template.ResourceDropsite.Types.split(" ")
};
if (template.ResourceTrickle)
{
ret.resourceTrickle = {

12
binaries/data/mods/public/gui/common/tooltips.js
View File

@ -927,6 +927,7 @@ function getEntityNames(template)
});
}
function getEntityNamesFormatted(template)
{
if (!template.name.specific)
@ -990,6 +991,17 @@ function getLootTooltip(template)
});
}
function getResourceDropsiteTooltip(template)
{
if (!template || !template.resourceDropsite || !template.resourceDropsite.types)
return "";
return sprintf(translate("%(label)s %(icons)s"), {
"label": headerFont(translate("Dropsite for:")),
"icons": template.resourceDropsite.types.map(type => resourceIcon(type)).join(" ")
});
}
function showTemplateViewerOnRightClickTooltip()
{
// Translation: Appears in a tooltip to indicate that right-clicking the corresponding GUI element will open the Template Details GUI page.

1
binaries/data/mods/public/gui/reference/common/ReferencePage.js
View File

@ -51,6 +51,7 @@ ReferencePage.prototype.IconPath = "session/portraits/";
* The functions listed are defined in gui/common/tooltips.js
*/
ReferencePage.prototype.StatsFunctions = [
getResourceDropsiteTooltip,
getHealthTooltip,
getAttackTooltip,
getHealerTooltip,

4
binaries/data/mods/public/gui/session/selection_panels.js
View File

@ -245,6 +245,7 @@ g_SelectionPanels.Construction = {
].map(func => func(template));
tooltips.push(
getEntityCostTooltip(template, data.player),
getResourceDropsiteTooltip(template),
getGarrisonTooltip(template),
getPopulationBonusTooltip(template),
showTemplateViewerOnRightClickTooltip(template)
@ -987,7 +988,8 @@ g_SelectionPanels.Training = {
getResistanceTooltip,
getGarrisonTooltip,
getProjectilesTooltip,
getSpeedTooltip
getSpeedTooltip,
getResourceDropsiteTooltip
].map(func => func(template)));
tooltips.push(showTemplateViewerOnRightClickTooltip());

2
binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml
View File

@ -12,7 +12,7 @@
<Civ>brit</Civ>
<GenericName>Island Settlement</GenericName>
<SpecificName>Cranogion</SpecificName>
<Tooltip>Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Dropsite for food, wood, stone, and metal. Train Citizens, construct Ships, and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
<Tooltip>Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Train Citizens, construct Ships, and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
<VisibleClasses datatype="tokens">Naval</VisibleClasses>
<Icon>structures/crannog.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>

2
binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
View File

@ -77,7 +77,7 @@
<Identity>
<GenericName>Civic Center</GenericName>
<SelectionGroupName>template_structure_civic_civil_centre</SelectionGroupName>
<Tooltip>Build in own or neutral territory. Acquire large tracts of territory. Territory root. Dropsite for food, wood, stone, and metal. Train Citizens and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
<Tooltip>Build in own or neutral territory. Acquire large tracts of territory. Territory root. Train Citizens and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
<Classes datatype="tokens">CivCentre</Classes>
<VisibleClasses datatype="tokens">Defensive CivilCentre</VisibleClasses>
<Icon>structures/civic_centre.png</Icon>

2
binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
View File

@ -28,7 +28,7 @@
<Identity>
<GenericName>Farmstead</GenericName>
<SelectionGroupName>template_structure_economic_farmstead</SelectionGroupName>
<Tooltip>Dropsite for food. Research food gathering technologies.</Tooltip>
<Tooltip>Research food gathering technologies.</Tooltip>
<Classes datatype="tokens">DropsiteFood</Classes>
<VisibleClasses datatype="tokens">Village Farmstead</VisibleClasses>
<Icon>structures/farmstead.png</Icon>

2
binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
View File

@ -29,7 +29,7 @@
<Identity>
<GenericName>Storehouse</GenericName>
<SelectionGroupName>template_structure_economic_storehouse</SelectionGroupName>
<Tooltip>Dropsite for wood, stone, and metal. Research gathering technologies.</Tooltip>
<Tooltip>Research gathering technologies.</Tooltip>
<Classes datatype="tokens">DropsiteWood DropsiteMetal DropsiteStone</Classes>
<VisibleClasses datatype="tokens">Village Storehouse</VisibleClasses>
<Icon>structures/storehouse.png</Icon>

2
binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
View File

@ -24,7 +24,7 @@
<Identity>
<GenericName>Dock</GenericName>
<SelectionGroupName>template_structure_military_dock</SelectionGroupName>
<Tooltip>Build upon a shoreline in own, neutral, or allied territory. Dropsite for food, wood, stone, and metal. Establish trade routes. Construct Ships and research Ship technologies.</Tooltip>
<Tooltip>Build upon a shoreline in own, neutral, or allied territory. Establish trade routes. Construct Ships and research Ship technologies.</Tooltip>
<VisibleClasses datatype="tokens">Economic Naval Trade Village Dock</VisibleClasses>
<Icon>structures/dock.png</Icon>
</Identity>

3
binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
View File

@ -18,11 +18,10 @@
</Health>
<Identity>
<Civ>maur</Civ>
<VisibleClasses datatype="tokens">Elephant</VisibleClasses>
<GenericName>Worker Elephant</GenericName>
<SpecificName>Karmākara Gaja</SpecificName>
<VisibleClasses datatype="tokens">Elephant</VisibleClasses>
<Icon>units/maur_support_elephant.png</Icon>
<Tooltip>Mobile dropsite for food, wood, stone, and metal.</Tooltip>
<Formations disable=""/>
</Identity>
<Loot>