Ticket #1908: exponential-armor.patch

binaries/data/mods/public/simulation/components/Armour.js

@@ -47 +47 @@
     if (this.invulnerable) 
         return { "killed": false };
 
-    // Adjust damage values based on armour
+    // Adjust damage values based on armour; exponential armour: damage = attack * 0.9^armour
     var armourStrengths = this.GetArmourStrengths();
-    var adjHack = Math.max(0, hack - armourStrengths.hack);
-    var adjPierce = Math.max(0, pierce - armourStrengths.pierce);
-    var adjCrush = Math.max(0, crush - armourStrengths.crush);
+    var adjHack = hack * Math.pow(0.9, armourStrengths.hack);
+    var adjPierce = pierce * Math.pow(0.9, armourStrengths.pierce);
+    var adjCrush = crush * Math.pow(0.9, armourStrengths.crush);
 
     // Total is sum of individual damages, with minimum damage 1
     //  Round to nearest integer, since HP is integral

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

@@ -192 +192 @@
     // 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);
-    getGUIObjectByName("attackAndArmorStats").tooltip = attack + "\n[font=\"serif-bold-13\"]Armor:[/font] " + damageTypeDetails(entState.armour);
+    getGUIObjectByName("attackAndArmorStats").tooltip = attack + "\n[font=\"serif-bold-13\"]Armor:[/font] " + armorTypeDetails(entState.armour);
 
     // Icon Tooltip
     var iconTooltip = "";

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

@@ -176 +176 @@
     }
 }
 
+// Converts an armor level into the actual reduction percentage
+function armorLevelToPercentage(level)
+{
+    return 100 - Math.round(Math.pow(0.9, level) * 100);
+}
+
+// Also for the unit details panel
+function armorTypeDetails(dmg)
+{
+    if (dmg)
+    {
+        var dmgArray = [];
+        if (dmg.hack)
+        {
+            dmgArray.push(dmg.hack + "[font=\"sans-10\"][color=\"orange\"] Hack[/color][/font] " +
+                " [font=\"sans-10\"](" + armorLevelToPercentage(dmg.hack) + "%)[/font]");
+        }
+        if (dmg.pierce)
+        {
+            dmgArray.push(dmg.pierce + "[font=\"sans-10\"][color=\"orange\"] Pierce[/color][/font] " +
+                " [font=\"sans-10\"](" + armorLevelToPercentage(dmg.pierce) + "%)[/font]");
+        }
+        if (dmg.crush)
+        {
+            dmgArray.push(dmg.crush + "[font=\"sans-10\"][color=\"orange\"] Crush[/color][/font] " +
+                " [font=\"sans-10\"](" + armorLevelToPercentage(dmg.crush) + "%)[/font]");
+        }
+
+        return dmgArray.join(", ");
+    }
+    else
+    {
+        return "[font=\"serif-12\"](None)[/font]";
+    }
+}
+
 // For the training tooltip
 function damageTypesToText(dmg)
 {
@@ -197 +233 @@
     return dmgArray.join("[font=\"serif-12\"], [/font]");
 }
 
+// Also for the training tooltip
+function armorTypesToText(dmg)
+{
+    if (!dmg)
+        return "[font=\"serif-12\"](None)[/font]";
+
+    var hackDamage = dmg.hack;
+    var pierceDamage = dmg.pierce;
+    var crushDamage = dmg.crush;
+    var hackLabel = "[font=\"serif-12\"] Hack (" + armorLevelToPercentage(hackDamage) + "%)[/font]";
+    var pierceLabel = "[font=\"serif-12\"] Pierce (" + armorLevelToPercentage(pierceDamage) + "%)[/font]";
+    var crushLabel = "[font=\"serif-12\"] Crush (" + armorLevelToPercentage(crushDamage) + "%)[/font]";
+
+    var dmgArray = [];
+    if (hackDamage) dmgArray.push(hackDamage + hackLabel);
+    if (pierceDamage) dmgArray.push(pierceDamage + pierceLabel);
+    if (crushDamage) dmgArray.push(crushDamage + crushLabel);
+
+    return dmgArray.join("[font=\"serif-12\"], [/font]");
+}
+
 function getEntityCommandsList(entState)
 {
     var commands = [];

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

@@ -455 +455 @@
                 if (template.health)
                     tooltip += "\n[font=\"serif-bold-13\"]Health:[/font] " + template.health;
                 if (template.armour)
-                    tooltip += "\n[font=\"serif-bold-13\"]Armour:[/font] " + damageTypesToText(template.armour);
+                    tooltip += "\n[font=\"serif-bold-13\"]Armour:[/font] " + armorTypesToText(template.armour);
                 if (template.attack)
                     tooltip += "\n" + getEntityAttack(template);
                 if (template.speed)

binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json

@@ -7 +7 @@
     "supersedes": "armor_ship_hypozomata",
     "icon": "armor_ship_gold.png",
     "researchTime": 20,
-    "tooltip": "Lead sheathing protects ship hulls. Adds +2 to all ship armor types.",
+    "tooltip": "Lead sheathing protects ship hulls. +2 levels to all ship armor types.",
     "modifications": [
         {"value": "Armour/Hack", "add": 2.0},
         {"value": "Armour/Pierce", "add": 2.0},

binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json

@@ -13 +13 @@
     "requirementsTooltip": "Unlocked in City Phase.",
     "icon": "armor_plates_cavalry.png",
     "researchTime": 20,
-    "tooltip": "Equip your cavalry mounts with armour. All Cavalry +1 Hack Armour.",
+    "tooltip": "Equip your cavalry mounts with armor. All Cavalry +1 Hack armor level.",
     "modifications": [{"value": "Armour/Hack", "add": 1.0}],
     "affects": ["Cavalry"]
 }
+ No newline at end of file

binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json

@@ -6 +6 @@
     "requirementsTooltip": "Unlocked in Village Phase.",
     "icon": "armor_ship_bronze.png",
     "researchTime": 20,
-    "tooltip": "Wooden reinforcement beams for hulls. Adds +2 to all ship armor types.",
+    "tooltip": "Wooden reinforcement beams for hulls. +2 levels to all ship armor types.",
     "modifications": [
         {"value": "Armour/Hack", "add": 2.0},
         {"value": "Armour/Pierce", "add": 2.0},

binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json

@@ -7 +7 @@
     "supersedes": "armor_ship_reinforcedhull",
     "icon": "armor_ship_silver.png",
     "researchTime": 20,
-    "tooltip": "The hypozomata braces the ship's structure. Adds +2 to all ship armor types.",
+    "tooltip": "The hypozomata braces the ship's structure. +2 levels to all ship armor types.",
     "modifications": [
         {"value": "Armour/Hack", "add": 2.0},
         {"value": "Armour/Pierce", "add": 2.0},

binaries/data/mods/public/simulation/data/technologies/armor_trade_convoys.json

@@ -6 +6 @@
     "requirementsTooltip": "Unlocked in City Phase.",
     "icon": "wheel.png",
     "researchTime": 20,
-    "tooltip": "Traders +2 Hack and Pierce Armour",
+    "tooltip": "Traders +2 Hack and Pierce armor levels.",
     "modifications": [
         {"value": "Armour/Hack", "add": 2.0},
         {"value": "Armour/Pierce", "add": 2.0}],

binaries/data/mods/public/simulation/data/technologies/siege_armor.json

@@ -6 +6 @@
     "requirementsTooltip": "Unlocked in City Phase.",
     "icon": "armor_plates_gold.png",
     "researchTime": 30,
-    "tooltip": "All Siege weapons +2 Hack Armour",
+    "tooltip": "All Siege weapons +2 Hack armor levels.",
     "modifications": [{"value": "Armour/Hack", "add": 5.0}],
     "affects": ["Siege"]
 }
+ No newline at end of file