Ticket #1201: hasClass.patch

binaries/data/mods/public/gui/session/input.js

@@ -255 +255 @@
         switch (action)
         {
         case "garrison":
-            if (isUnit(entState) && targetState.garrisonHolder && playerOwned)
+            if (hasClass(entState, "Unit") && targetState.garrisonHolder && playerOwned)
             {
                 var allowedClasses = targetState.garrisonHolder.allowedClasses;
                 for each (var unitClass in entState.identity.classes)
@@ -474 +474 @@
         var entState = GetEntityState(ent);
         if (!entState)
             continue;
-        if (isUnit(entState))
+        if (hasClass(entState, "Unit"))
             preferredEnts.push(ent);
 
         entStateList.push(entState);
@@ -483 +483 @@
     // If there are no units, check if there are defensive entities in the selection
     if (!preferredEnts.length)
         for (var i = 0; i < ents.length; i++)
-            if (isDefensive(entStateList[i]))
+            if (hasClass(entStateList[i], "Defensive"))
                 preferredEnts.push(ents[i]);
 
     return preferredEnts;
@@ -496 +496 @@
     for each (var ent in ents)
     {
         var entState = GetEntityState(ent);
-        if (!isSupport(entState))
+        if (!hasClass(entState, "Support"))
             militaryEnts.push(ent);
     }
     return militaryEnts;
@@ -1355 +1355 @@
     if (entity)
     {
         var entState = GetEntityState(entity);
-        if (entState && isUnit(entState))
+        if (entState && hasClass(entState, "Unit"))
         {
             Engine.CameraFollow(entity);
             return;

binaries/data/mods/public/gui/session/unit_commands.js

@@ -512 +512 @@
         }
 
         var formations = getEntityFormationsList(entState);
-        if (isUnit(entState) && !isAnimal(entState) && !entState.garrisonHolder && formations.length)
+        if (hasClass(entState, "Unit") && !hasClass(entState, "Animal") && !entState.garrisonHolder && formations.length)
         {
             setupUnitPanel("Formation", usedPanels, entState, formations,
                 function (item) { performFormation(entState.id, item); } );
@@ -521 +521 @@
         // TODO: probably should load the stance list from a data file,
         // and/or vary depending on what units are selected
         var stances = ["violent", "aggressive", "passive", "defensive", "stand"];
-        if (isUnit(entState) && !isAnimal(entState) && !entState.garrisonHolder && stances.length)
+        if (hasClass(entState, "Unit") && !hasClass(entState, "Animal") && !entState.garrisonHolder && stances.length)
         {
             setupUnitPanel("Stance", usedPanels, entState, stances,
                 function (item) { performStance(entState.id, item); } );

binaries/data/mods/public/gui/session/utility_functions.js

@@ -94 +94 @@
     return false;
 }
 
-function isUnit(entState)
-{
-    if (entState.identity)
-    {
-        var classes = entState.identity.classes;
-        if (classes && classes.length)
-            return (classes.indexOf("Unit") != -1);
-    }
-    return false;
-}
-
-function isAnimal(entState)
-{
-    if (entState.identity)
-    {
-        var classes = entState.identity.classes;
-        if (classes && classes.length)
-            return (classes.indexOf("Animal") != -1);
-    }
-    return false;
-}
-
-function isStructure(entState)
-{
-    if (entState.identity)
-    {
-        var classes = entState.identity.classes;
-        if (classes && classes.length)
-            return (classes.indexOf("Structure") != -1);
-    }
-    return false;
-}
-
-function isDefensive(entState)
-{
-    if (entState.identity)
-    {
-        var classes = entState.identity.classes;
-        if (classes && classes.length)
-            return (classes.indexOf("Defensive") != -1);
-    }
-    return false;
-}
-
-function isSupport(entState)
-{
-    if (entState.identity)
-    {
-        var classes = entState.identity.classes;
-        if (classes && classes.length)
-            return (classes.indexOf("Support") != -1);
-    }
-    return false;
-}
-
 function damageTypesToTextStacked(dmg)
 {
     if (!dmg)
@@ -253 +198 @@
         "icon": "kill_small.png"
     });
     
-    if (isUnit(entState))
+    if (hasClass(entState, "Unit"))
     {
         commands.push({
             "name": "garrison",