From ad8827c6f52092d81851e41c86ae6cbc37c3299b Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sun, 16 Jan 2022 16:39:32 +0100
Subject: [PATCH] Fix blesse

---
 module/system/helpers.js                      |   1 +
 template2.json                                | 193 ------------------
 templates/actor/parts/tabs/actor-actions.hbs  |   2 +-
 .../actor/parts/tabs/actor-equipment.hbs      |  10 +-
 4 files changed, 10 insertions(+), 196 deletions(-)
 delete mode 100644 template2.json

diff --git a/module/system/helpers.js b/module/system/helpers.js
index c7dadb5..5c3cb0c 100644
--- a/module/system/helpers.js
+++ b/module/system/helpers.js
@@ -112,6 +112,7 @@ export const registerHandlebarsHelpers = function () {
         return eval(expr);
     });
 
+    
 
 
 }
\ No newline at end of file
diff --git a/template2.json b/template2.json
deleted file mode 100644
index 699a1c7..0000000
--- a/template2.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "Actor": {
-    "types": [
-      "character",
-      "encounter"
-    ],
-    "templates": {
-      "base": {
-        "details": {
-          "biography": "",
-          "notes": "",
-          "languages": []
-        },
-        "prot": {
-          "key": "prot",
-          "label": "BOL.aptitudes.prot",
-          "base": 0,
-          "value": 0,
-          "bonus": 0
-        },
-        "attributes": {
-          "vigor": {
-            "key": "vigor",
-            "label": "BOL.attributes.vigor",
-            "base": 0,
-            "value": 0,
-            "min": -1,
-            "max": 5,
-            "bonus": 0
-          },
-          "agility": {
-            "key": "agility",
-            "label": "BOL.attributes.agility",
-            "base": 0,
-            "value": 0,
-            "min": -1,
-            "max": 5,
-            "bonus": 0
-          },
-          "mind": {
-            "key": "mind",
-            "label": "BOL.attributes.mind",
-            "base": 0,
-            "value": 0,
-            "min": -1,
-            "max": 5,
-            "bonus": 0
-          },
-          "appeal": {
-            "key": "appeal",
-            "label": "BOL.attributes.appeal",
-            "base": 0,
-            "value": 0,
-            "bonus": 0
-          }
-        },
-        "aptitudes": {
-          "init": {
-            "key": "init",
-            "label": "BOL.aptitudes.init",
-            "base": 0,
-            "value": 0,
-            "bonus": 0
-          },
-          "melee": {
-            "key": "melee",
-            "label": "BOL.aptitudes.melee",
-            "base": 0,
-            "value": 0,
-            "bonus": 0
-          },
-          "ranged": {
-            "key": "ranged",
-            "label": "BOL.aptitudes.ranged",
-            "base": 0,
-            "value": 0,
-            "bonus": 0
-          },
-          "def": {
-            "key": "def",
-            "label": "BOL.aptitudes.def",
-            "base": 0,
-            "value": 0,
-            "bonus": 0
-          }
-        },
-        "resources": {
-          "hp": {
-            "key": "hp",
-            "label": "BOL.resources.hp",
-            "base": 0,
-            "value": 0,
-            "bonus": 0,
-            "max": 0
-          },
-          "hero": {
-            "key": "hero",
-            "label": "BOL.resources.hero",
-            "value": 5,
-            "max": 5
-          },
-          "faith": {
-            "key": "faith",
-            "label": "BOL.resources.faith",
-            "value": 0,
-            "max": 0
-          },
-          "power": {
-            "key": "power",
-            "label": "BOL.resources.power",
-            "value": 0,
-            "max": 0
-          }
-        }
-      }
-    },
-    "character": {
-      "templates": [ "base" ],
-      "type": "npc",
-      "villainy": false,
-      "xp": {
-        "key": "xp",
-        "label": "BOL.traits.xp",
-        "total": 0,
-        "spent": 0
-      },
-      "creation": {
-        "key": "creation",
-        "label": "BOL.resources.creation",
-        "value": 0,
-        "max": 0
-      }
-    },
-    "encounter": {
-      "templates": [ "base" ],
-      "type": "tough",
-      "size": "",
-      "environment": ""
-    }
-  },
-  "Item": {
-    "types": [
-      "item",
-      "feature"
-    ],
-    "templates": {
-      "base": {
-        "category": null,
-        "subtype": "default",
-        "description": "",
-        "properties": {}
-      },
-      "equipment": {
-        "quantity": 1,
-        "weight": 0,
-        "price": 0,
-        "worn": false,
-        "properties": {
-          "ranged": false,
-          "melee": false,
-          "spell": false,
-          "protection": false,
-          "weapon": false,
-          "armor": false,
-          "helm": false,
-          "shield": false,
-          "equipable": false,
-          "consumable": false,
-          "magical": false,
-          "2H": false,
-          "reloadable": false,
-          "bow": false,
-          "crossbow": false,
-          "throwing": false
-        }
-      }
-    },
-    "item": {
-      "templates": [
-        "base",
-        "equipment"
-      ]
-    },
-    "feature": {
-      "rank": 0,
-      "templates": [
-        "base"
-      ],
-      "properties": {}
-    }
-  }
-}
-
diff --git a/templates/actor/parts/tabs/actor-actions.hbs b/templates/actor/parts/tabs/actor-actions.hbs
index e6c0974..5c8f145 100644
--- a/templates/actor/parts/tabs/actor-actions.hbs
+++ b/templates/actor/parts/tabs/actor-actions.hbs
@@ -11,7 +11,7 @@
                 <li class="item flexrow" data-item-id="{{item._id}}">
                     <div class="item-image" ><img src="{{item.img}}" title="{{item.name}}"/></div>
                     <h4 class="item-name flex2">{{#if ../weapon}}<a class="rollable" data-roll-type="weapon">{{/if}}{{item.name}}{{#if ../weapon}}</a>{{/if}}</h4>
-                    {{#if ../protection}}<div class="item-field">{{item.data.properties.soak.value}}</div>{{/if}}
+                    {{#if ../protection}}<div class="item-field">{{item.data.properties.soak.formula}} / {{item.data.properties.soak.value}}</div>{{/if}}
                     {{#if ../blocking}}<div class="item-field">{{item.data.properties.blocking.malus}}</div>{{/if}}
                     {{#if ../weapon}}<div class="item-field">{{item.data.properties.damage}}</div>{{/if}}
                     {{#if ../ranged}}<div class="item-field">{{item.data.properties.range}}</div>{{else}}<div class="item-field"></div>{{/if}}
diff --git a/templates/actor/parts/tabs/actor-equipment.hbs b/templates/actor/parts/tabs/actor-equipment.hbs
index d5bfe61..d6d72a3 100644
--- a/templates/actor/parts/tabs/actor-equipment.hbs
+++ b/templates/actor/parts/tabs/actor-equipment.hbs
@@ -15,9 +15,9 @@
             <a class="item-edit">{{item.name}}</a>
         </h4>
         <div class="item-field flex2 center">
-    {{#if item.data.properties.equipable}}
+        {{#if item.data.properties.equipable}}
             <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
-    {{/if}}
+       {{/if}}
         </div>
         <div class="item-field group-btns flex1 center">
         {{#if item.data.properties.stackable}}
@@ -50,6 +50,7 @@
     <li class="item flexrow item-header">
         <div class="item-name flex4 left">{{localize "BOL.ui.protections"}}</div>
         <div class="item-field flex2 center">{{localize "BOL.ui.slot"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.protection"}}</div>
         <div class="item-field flex1 center">{{localize "BOL.ui.qty"}}</div>
         <div class="item-field flex1 center">{{localize "BOL.ui.price"}}</div>
         <div class="item-field flex1 center">{{localize "BOL.ui.equip"}}</div>
@@ -66,6 +67,11 @@
                     <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
                 {{/if}}
             </div>
+            <div class="item-field flex2 center">
+                {{#if item.data.properties.equipable}}
+                    <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{data.properties.soak.formula}}</span>
+                {{/if}}
+            </div>            
             <div class="item-field group-btns flex1 center">
                 {{#if item.data.properties.stackable}}
                     <a class="inc-dec-btns" data-operator="minus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-minus-square"></i></a>&nbsp;