Various fixes and changes based on tester feedback

templates/actor/character-combat.hbs

@@ -1,21 +1,8 @@
 <section data-tab="combat" data-group="{{tab.group}}" class="tab {{tab.cssClass}}">
-  <fieldset>
-    <legend>{{localize "OATHHAMMER.Label.Defense"}}</legend>
-    <div class="flexrow">
-      <div class="form-group">
-        <label>{{localize "OATHHAMMER.Label.DefenseValue"}}</label>
-        <input type="text" value="{{system.defense.value}}" disabled />
-      </div>
-      <div class="form-group">
-        <label>{{localize "OATHHAMMER.Label.ArmorRating"}}</label>
-        {{formInput systemFields.defense.fields.armorRating value=system.defense.armorRating name="system.defense.armorRating" disabled=isPlayMode}}
-      </div>
-      <div class="form-group">
-        <label>{{localize "OATHHAMMER.Label.DefenseBonus"}}</label>
-        {{formInput systemFields.defense.fields.bonus value=system.defense.bonus name="system.defense.bonus" disabled=isPlayMode}}
-      </div>
-    </div>
-  </fieldset>
+  <div class="slots-counter">
+    <span class="slots-label">{{localize "OATHHAMMER.Label.ItemSlots"}}</span>
+    <span class="slots-value {{#if slotsOver}}slots-over{{/if}}">{{slotsUsed}} / {{slotsMax}}</span>
+  </div>
   <fieldset>
     <legend>{{localize "OATHHAMMER.Label.Weapons"}}
       {{#unless isPlayMode}}<a data-action="createWeapon" class="create-btn"><i class="fa-solid fa-plus"></i></a>{{/unless}}
@@ -41,10 +28,11 @@
         <span class="item-detail">{{#if weapon.system.ap}}{{weapon.system.ap}}{{else}}—{{/if}}</span>
         <span class="item-magic">{{#if weapon._isMagic}}<i class="fa-solid fa-wand-sparkles"></i>{{/if}}</span>
         <div class="item-equipped">
-          <input type="checkbox" class="item-equipped-cb" data-item-id="{{weapon.id}}" {{checked weapon.system.equipped}} {{#if ../isPlayMode}}disabled{{/if}}>
+          <input type="checkbox" class="item-equipped-cb" data-item-id="{{weapon.id}}" {{checked weapon.system.equipped}}>
         </div>
         <div class="item-actions">
           <a data-action="attackWeapon" data-item-id="{{weapon.id}}" title="{{localize "OATHHAMMER.Dialog.Attack"}}"><i class="fa-solid fa-khanda"></i></a>
+          <a data-action="defendWeapon" data-item-id="{{weapon.id}}" title="{{localize "OATHHAMMER.Dialog.RollDefense"}}"><i class="fa-solid fa-shield-halved"></i></a>
           <a data-action="damageWeapon" data-item-id="{{weapon.id}}" title="{{localize "OATHHAMMER.Dialog.Damage"}}"><i class="fa-solid fa-burst"></i></a>
           <a data-action="edit" data-item-id="{{weapon.id}}" data-item-uuid="{{weapon.uuid}}"><i class="fa-solid fa-edit"></i></a>
           <a data-action="delete" data-item-id="{{weapon.id}}" data-item-uuid="{{weapon.uuid}}"><i class="fa-solid fa-trash"></i></a>
@@ -80,9 +68,10 @@
         <span class="item-detail">{{#if armor.system.penalty}}{{armor.system.penalty}}{{else}}—{{/if}}</span>
         <span class="item-magic">{{#if armor._isMagic}}<i class="fa-solid fa-wand-sparkles"></i>{{/if}}</span>
         <div class="item-equipped">
-          <input type="checkbox" class="item-equipped-cb" data-item-id="{{armor.id}}" {{checked armor.system.equipped}} {{#if ../isPlayMode}}disabled{{/if}}>
+          <input type="checkbox" class="item-equipped-cb" data-item-id="{{armor.id}}" {{checked armor.system.equipped}}>
         </div>
         <div class="item-actions">
+          <a data-action="rollArmorSave" data-item-id="{{armor.id}}" title="{{localize 'OATHHAMMER.Dialog.RollArmor'}}"><i class="fa-solid fa-shield armor-roll-icon"></i></a>
           <a data-action="edit" data-item-id="{{armor.id}}" data-item-uuid="{{armor.uuid}}"><i class="fa-solid fa-edit"></i></a>
           <a data-action="delete" data-item-id="{{armor.id}}" data-item-uuid="{{armor.uuid}}"><i class="fa-solid fa-trash"></i></a>
         </div>

templates/actor/character-equipment.hbs

@@ -1,4 +1,8 @@
 <section data-tab="equipment" data-group="{{tab.group}}" class="tab {{tab.cssClass}}">
+  <div class="slots-counter">
+    <span class="slots-label">{{localize "OATHHAMMER.Label.ItemSlots"}}</span>
+    <span class="slots-value {{#if slotsOver}}slots-over{{/if}}">{{slotsUsed}} / {{slotsMax}}</span>
+  </div>
   <fieldset class="currency-bar">
     <legend>{{localize "OATHHAMMER.Label.Currency"}}</legend>
     <div class="flexrow">

templates/actor/character-identity.hbs

@@ -3,9 +3,11 @@
     <legend>{{localize "OATHHAMMER.Label.Background"}}</legend>
     {{formInput systemFields.background enriched=enrichedBackground value=system.background name="system.background" toggled=true}}
   </fieldset>
-  {{#if traits.length}}
   <fieldset>
-    <legend>{{localize "OATHHAMMER.Label.Traits"}}</legend>
+    <legend>{{localize "OATHHAMMER.Label.Traits"}}
+      {{#unless isPlayMode}}<a data-action="createTrait" class="create-btn"><i class="fa-solid fa-plus"></i></a>{{/unless}}
+    </legend>
+    {{#if traits.length}}
     <ul class="item-list item-list--trait">
       <li class="item-list-header">
         <span></span>
@@ -15,7 +17,7 @@
         <span></span>
       </li>
       {{#each traits as |trait|}}
-      <li class="item-entry" data-item-id="{{trait.id}}" data-item-uuid="{{trait.uuid}}">
+      <li class="item-entry" data-item-id="{{trait.id}}" data-item-uuid="{{trait.uuid}}" data-drag="true">
         <img src="{{trait.img}}" class="item-img" />
         <span class="item-name">{{trait.name}}</span>
         <span class="item-type">{{trait._typeLabel}}</span>
@@ -27,8 +29,10 @@
       </li>
       {{/each}}
     </ul>
+    {{else}}
+    <p class="no-items">{{localize "OATHHAMMER.Label.NoTraits"}}</p>
+    {{/if}}
   </fieldset>
-  {{/if}}
   {{#if oaths.length}}
   <fieldset>
     <legend>{{localize "OATHHAMMER.Label.Oaths"}}</legend>

templates/actor/character-magic.hbs

@@ -43,8 +43,15 @@
     <legend>{{localize "OATHHAMMER.Label.Miracles"}}
       {{#unless isPlayMode}}<a data-action="createMiracle" class="create-btn"><i class="fa-solid fa-plus"></i></a>{{/unless}}
     </legend>
+    {{#if system.miracleBlocked}}
+    <div class="miracle-blocked-banner">
+      <i class="fa-solid fa-ban"></i>
+      <span>{{localize "OATHHAMMER.Label.MiracleBlocked"}}</span>
+      <a data-action="resetMiracleBlocked" title="{{localize 'OATHHAMMER.Action.ResetMiracleBlocked'}}"><i class="fa-solid fa-sun"></i> {{localize "OATHHAMMER.Action.NewDay"}}</a>
+    </div>
+    {{/if}}
     {{#if miracles.length}}
-    <ul class="item-list item-list--miracle">
+    <ul class="item-list item-list--miracle {{#if system.miracleBlocked}}miracles-blocked{{/if}}">
       <li class="item-list-header">
         <span></span>
         <span class="col-name">{{localize "OATHHAMMER.Label.Name"}}</span>