Ticket #1785: AttackIcons.patch

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

@@ -191 +191 @@
     attack = "[font=\"serif-bold-13\"]"+type+"Attack:[/font] " + damageTypeDetails(entState.attack);
     // Show max attack range if ranged attack, also convert to tiles (4m per tile)
     if (entState.attack && entState.attack.type == "Ranged")
-        attack += ", [font=\"serif-bold-13\"]Range:[/font] " + Math.round(entState.attack.maxRange/4);
+        attack += " " + Math.round(entState.attack.maxRange/4) + getAtkComponentDisplayName("range");
     getGUIObjectByName("attackAndArmorStats").tooltip = attack + "\n[font=\"serif-bold-13\"]Armor:[/font] " + damageTypeDetails(entState.armour);
 
     // Icon Tooltip

binaries/data/mods/public/gui/session/setup.xml

@@ -26 +26 @@
           sprite="stretched:session/icons/resources/time_small.png"
           size="16 16"
     />
+    <icon name="iconHack"
+          sprite="stretched:session/icons/damagetypes/hack.png"
+          size="16 16"
+    />
+    <icon name="iconPierce"
+          sprite="stretched:session/icons/damagetypes/pierce.png"
+          size="16 16"
+    />
+    <icon name="iconCrush"
+          sprite="stretched:session/icons/damagetypes/crush.png"
+          size="16 16"
+    />
+    <icon name="iconRange"
+          sprite="stretched:session/icons/damagetypes/range.png"
+          size="16 16"
+    />
 </setup>

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

@@ -12 +12 @@
     "time": "[icon=\"iconTime\"]"
 };
 
+const ATTACK_DISPLAY_NAMES = {
+    "hack": "[icon=\"iconHack\"]",
+    "pierce": "[icon=\"iconPierce\"]",
+    "crush": "[icon=\"iconCrush\"]",
+    "range": "[icon=\"iconRange\"]"
+};
 //-------------------------------- -------------------------------- --------------------------------
 // Utility functions
 //-------------------------------- -------------------------------- --------------------------------
@@ -164 +170 @@
     if (dmg)
     {
         var dmgArray = [];
-        if (dmg.hack) dmgArray.push(dmg.hack + "[font=\"sans-10\"][color=\"orange\"] Hack[/color][/font]");
-        if (dmg.pierce) dmgArray.push(dmg.pierce + "[font=\"sans-10\"][color=\"orange\"] Pierce[/color][/font]");
-        if (dmg.crush) dmgArray.push(dmg.crush + "[font=\"sans-10\"][color=\"orange\"] Crush[/color][/font]");
+        if (dmg.hack) dmgArray.push(dmg.hack + getAtkComponentDisplayName("hack"));//"[font=\"sans-10\"][color=\"orange\"] Hack[/color][/font]");
+        if (dmg.pierce) dmgArray.push(dmg.pierce + getAtkComponentDisplayName("pierce")); //"[font=\"sans-10\"][color=\"orange\"] Pierce[/color][/font]");
+        if (dmg.crush) dmgArray.push(dmg.crush + getAtkComponentDisplayName("crush")); //"[font=\"sans-10\"][color=\"orange\"] Crush[/color][/font]");
 
-        return dmgArray.join(", ");
+        return dmgArray.join(" ");
     }
     else
     {
@@ -182 +188 @@
     if (!dmg)
         return "[font=\"serif-12\"](None)[/font]";
 
-    var hackLabel = "[font=\"serif-12\"] Hack[/font]";
-    var pierceLabel = "[font=\"serif-12\"] Pierce[/font]";
-    var crushLabel = "[font=\"serif-12\"] Crush[/font]";
+    var hackLabel = getAtkComponentDisplayName("hack");
+    var pierceLabel = getAtkComponentDisplayName("pierce");
+    var crushLabel = getAtkComponentDisplayName("crush");
     var hackDamage = dmg.hack;
     var pierceDamage = dmg.pierce;
     var crushDamage = dmg.crush;
@@ -194 +200 @@
     if (pierceDamage) dmgArray.push(pierceDamage + pierceLabel);
     if (crushDamage) dmgArray.push(crushDamage + crushLabel);
 
-    return dmgArray.join("[font=\"serif-12\"], [/font]");
+    return dmgArray.join("[font=\"serif-12\"] [/font]");
 }
 
 function getEntityCommandsList(entState)
@@ -260 +266 @@
 }
 
 /**
+ * Translates an attack identifier as they are used internally (e.g. "hack", "pierce", etc.) to proper
+ * display names.
+ */
+function getAtkComponentDisplayName(attackComponentName)
+{
+    return ATTACK_DISPLAY_NAMES[attackComponentName];
+}
+/**
  * Helper function for getEntityCostTooltip.
  */
 function getEntityCostComponentsTooltipString(template, trainNum, entity)
@@ -425 +439 @@
             var attack = "[font=\"serif-bold-13\"]" + type + " Attack:[/font] " + damageTypesToText(template.attack[type]);
             // Show max attack range if ranged attack, also convert to tiles (4m per tile)
             if (type == "Ranged")
-                attack += ", [font=\"serif-bold-13\"]Range:[/font] "+Math.round(template.attack[type].maxRange/4);
+                attack += " " + Math.round(template.attack[type].maxRange/4) + getAtkComponentDisplayName("range");
             attacks.push(attack);
         }
     }