forked from 0ad/0ad
Only show formation icons for units
This was SVN commit r8407.
This commit is contained in:
parent
43f2be44ba
commit
937769035a
@ -362,7 +362,7 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
|
||||
|
||||
|
||||
var formations = getEntityFormationsList(entState);
|
||||
if (formations.length)
|
||||
if (isUnit(entState) && !isAnimal(entState) && formations.length)
|
||||
setupUnitPanel("Formation", usedPanels, entState, formations,
|
||||
function (item) { performFormation(entState.id, item); } );
|
||||
|
||||
|
@ -73,12 +73,38 @@ function isUnit(entState)
|
||||
var classes = entState.identity.classes;
|
||||
if (classes && classes.length)
|
||||
for (var i = 0; i < classes.length; i++)
|
||||
if ((classes[i] == "Organic") || (classes[i] == "Mechanical"))
|
||||
if (classes[i] == "Unit")
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function isAnimal(entState)
|
||||
{
|
||||
if (entState.identity)
|
||||
{
|
||||
var classes = entState.identity.classes;
|
||||
if (classes && classes.length)
|
||||
for (var i = 0; i < classes.length; i++)
|
||||
if (classes[i] == "Animal")
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function isStructure(entState)
|
||||
{
|
||||
if (entState.identity)
|
||||
{
|
||||
var classes = entState.identity.classes;
|
||||
if (classes && classes.length)
|
||||
for (var i = 0; i < classes.length; i++)
|
||||
if (classes[i] == "Structure")
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function isDefensive(entState)
|
||||
{
|
||||
if (entState.identity)
|
||||
|
@ -60,12 +60,14 @@ Identity.prototype.Schema =
|
||||
"<list>" +
|
||||
"<zeroOrMore>" +
|
||||
"<choice>" +
|
||||
"<value>Organic</value>" +
|
||||
"<value>Unit</value>" +
|
||||
"<value>Foot</value>" +
|
||||
"<value>Mounted</value>" +
|
||||
"<value>Mechanical</value>" +
|
||||
"<value>Super</value>" +
|
||||
"<value>Hero</value>" +
|
||||
"<value>Animal</value>" +
|
||||
"<value>Organic</value>" +
|
||||
"<value>Structure</value>" +
|
||||
"<value>Civic</value>" +
|
||||
"<value>Economic</value>" +
|
||||
|
@ -2,10 +2,7 @@
|
||||
<Entity parent="template_entity_full">
|
||||
<Identity>
|
||||
<GenericName>Structure</GenericName>
|
||||
<Classes datatype="tokens">
|
||||
Structure
|
||||
ConquestCritical
|
||||
</Classes>
|
||||
<Classes datatype="tokens">Structure ConquestCritical</Classes>
|
||||
<IconSheet>snPortraitSheetBuildings</IconSheet>
|
||||
</Identity>
|
||||
<BuildRestrictions>
|
||||
|
@ -2,9 +2,7 @@
|
||||
<Entity parent="template_entity_full">
|
||||
<Identity>
|
||||
<GenericName>Unit</GenericName>
|
||||
<Classes datatype="tokens">
|
||||
ConquestCritical
|
||||
</Classes>
|
||||
<Classes datatype="tokens">Unit ConquestCritical</Classes>
|
||||
</Identity>
|
||||
<Minimap>
|
||||
<Type>unit</Type>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<Entity parent="template_unit">
|
||||
<Identity>
|
||||
<GenericName>Fauna</GenericName>
|
||||
<Classes datatype="tokens">Organic</Classes>
|
||||
<Classes datatype="tokens">Animal Organic</Classes>
|
||||
<IconSheet>snPortraitSheetAnimalGaia</IconSheet>
|
||||
<IconCell>0</IconCell>
|
||||
</Identity>
|
||||
|
Loading…
Reference in New Issue
Block a user