Latest fixes for Oath Hammer

templates/actor/character-combat.hbs

@@ -25,17 +25,21 @@
       <li class="item-list-header">
         <span></span>
         <span class="col-name">{{localize "OATHHAMMER.Label.Name"}}</span>
+        <span>{{localize "OATHHAMMER.Label.Group"}}</span>
         <span>{{localize "OATHHAMMER.Label.Damage"}}</span>
-        <span>AP</span>
+        <span title="Armor Penetration">AP</span>
+        <span title="{{localize "OATHHAMMER.Label.Magic"}}"><i class="fa-solid fa-wand-sparkles"></i></span>
         <span title="{{localize "OATHHAMMER.Label.Equipped"}}"><i class="fa-solid fa-shield-halved"></i></span>
         <span></span>
       </li>
       {{#each weapons as |weapon|}}
       <li class="item-entry" data-item-id="{{weapon.id}}" data-item-uuid="{{weapon.uuid}}">
         <img src="{{weapon.img}}" class="item-img" />
-        <span class="item-name">{{weapon.name}}</span>
+        <span class="item-name" {{#if weapon._traitsTooltip}}title="{{weapon._traitsTooltip}}"{{/if}}>{{weapon.name}}</span>
+        <span class="item-group">{{weapon._groupLabel}}</span>
         <span class="item-detail">{{weapon.system.damageLabel}}</span>
-        <span class="item-detail">{{weapon.system.ap}}</span>
+        <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}}>
         </div>
@@ -60,17 +64,21 @@
       <li class="item-list-header">
         <span></span>
         <span class="col-name">{{localize "OATHHAMMER.Label.Name"}}</span>
+        <span>{{localize "OATHHAMMER.Label.Type"}}</span>
         <span>AV</span>
         <span>{{localize "OATHHAMMER.Label.Penalty"}}</span>
+        <span title="{{localize "OATHHAMMER.Label.Magic"}}"><i class="fa-solid fa-wand-sparkles"></i></span>
         <span title="{{localize "OATHHAMMER.Label.Equipped"}}"><i class="fa-solid fa-shield-halved"></i></span>
         <span></span>
       </li>
       {{#each armors as |armor|}}
       <li class="item-entry" data-item-id="{{armor.id}}" data-item-uuid="{{armor.uuid}}">
         <img src="{{armor.img}}" class="item-img" />
-        <span class="item-name">{{armor.name}}</span>
+        <span class="item-name" {{#if armor._traitsTooltip}}title="{{armor._traitsTooltip}}"{{/if}}>{{armor.name}}</span>
+        <span class="item-type">{{armor._typeLabel}}</span>
         <span class="item-detail">{{armor.system.armorValue}}</span>
         <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}}>
         </div>

templates/actor/character-identity.hbs

@@ -3,25 +3,27 @@
     <legend>{{localize "OATHHAMMER.Label.Background"}}</legend>
     {{formInput systemFields.background enriched=enrichedBackground value=system.background name="system.background" toggled=true}}
   </fieldset>
-  {{#if abilities.length}}
+  {{#if traits.length}}
   <fieldset>
-    <legend>{{localize "OATHHAMMER.Label.Abilities"}}</legend>
-    <ul class="item-list item-list--ability">
+    <legend>{{localize "OATHHAMMER.Label.Traits"}}</legend>
+    <ul class="item-list item-list--trait">
       <li class="item-list-header">
         <span></span>
         <span class="col-name">{{localize "OATHHAMMER.Label.Name"}}</span>
         <span>{{localize "OATHHAMMER.Label.Type"}}</span>
+        <span>{{localize "OATHHAMMER.Label.Usage"}}</span>
         <span></span>
       </li>
-      {{#each abilities as |ability|}}
-      <li class="item-entry" data-item-id="{{ability.id}}" data-item-uuid="{{ability.uuid}}">
-        <img src="{{ability.img}}" class="item-img" />
-        <span class="item-name">{{ability.name}}</span>
-        <span class="item-type">{{localize ability.system.abilityType}}</span>
+      {{#each traits as |trait|}}
+      <li class="item-entry" data-item-id="{{trait.id}}" data-item-uuid="{{trait.uuid}}">
+        <img src="{{trait.img}}" class="item-img" />
+        <span class="item-name">{{trait.name}}</span>
+        <span class="item-type">{{trait._typeLabel}}</span>
+        <span class="item-usage">{{trait._usageLabel}}</span>
         <div class="item-actions">
           {{#unless ../isPlayMode}}
-          <a data-action="edit" data-item-id="{{ability.id}}" data-item-uuid="{{ability.uuid}}"><i class="fa-solid fa-edit"></i></a>
-          <a data-action="delete" data-item-id="{{ability.id}}" data-item-uuid="{{ability.uuid}}"><i class="fa-solid fa-trash"></i></a>
+          <a data-action="edit" data-item-id="{{trait.id}}" data-item-uuid="{{trait.uuid}}"><i class="fa-solid fa-edit"></i></a>
+          <a data-action="delete" data-item-id="{{trait.id}}" data-item-uuid="{{trait.uuid}}"><i class="fa-solid fa-trash"></i></a>
           {{/unless}}
         </div>
       </li>
@@ -37,13 +39,15 @@
         <span></span>
         <span class="col-name">{{localize "OATHHAMMER.Label.Name"}}</span>
         <span>{{localize "OATHHAMMER.Label.Type"}}</span>
+        <span>{{localize "OATHHAMMER.Label.Violated"}}</span>
         <span></span>
       </li>
       {{#each oaths as |oath|}}
-      <li class="item-entry" data-item-id="{{oath.id}}" data-item-uuid="{{oath.uuid}}">
+      <li class="item-entry {{#if oath._violated}}oath--violated{{/if}}" data-item-id="{{oath.id}}" data-item-uuid="{{oath.uuid}}">
         <img src="{{oath.img}}" class="item-img" />
         <span class="item-name">{{oath.name}}</span>
-        <span class="item-type">{{localize oath.system.oathType}}</span>
+        <span class="item-type">{{oath._typeLabel}}</span>
+        <span class="item-violated">{{#if oath._violated}}<i class="fa-solid fa-circle-xmark"></i>{{else}}<i class="fa-regular fa-circle-check"></i>{{/if}}</span>
         <div class="item-actions">
           {{#unless ../isPlayMode}}
           <a data-action="edit" data-item-id="{{oath.id}}" data-item-uuid="{{oath.uuid}}"><i class="fa-solid fa-edit"></i></a>

templates/item/building-sheet.hbs

@@ -0,0 +1,32 @@
+<section class="item-sheet-common">
+  <div class="header">
+    <img class="item-img" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}" />
+    {{formInput fields.name value=source.name}}
+  </div>
+
+  <div class="building-meta flexrow">
+    <div class="building-col">
+      {{formField systemFields.skillCheck value=system.skillCheck name="system.skillCheck" localize=true}}
+      {{formField systemFields.cost value=system.cost name="system.cost"}}
+      {{formField systemFields.buildTime value=system.buildTime name="system.buildTime"}}
+      {{formField systemFields.settlement value=system.settlement name="system.settlement"}}
+    </div>
+    <div class="building-col">
+      {{formField systemFields.taxRevenue value=system.taxRevenue name="system.taxRevenue"}}
+      <div class="form-group building-constructed">
+        <label>{{localize "OATHHAMMER.Building.FIELDS.constructed.label"}}</label>
+        {{formInput systemFields.constructed value=system.constructed name="system.constructed"}}
+      </div>
+    </div>
+  </div>
+
+  <fieldset>
+    <legend>{{localize "OATHHAMMER.Label.Description"}}</legend>
+    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+  </fieldset>
+
+  <fieldset>
+    <legend>{{localize "OATHHAMMER.Label.Notes"}}</legend>
+    {{formInput systemFields.notes enriched=enrichedNotes value=system.notes name="system.notes" toggled=true}}
+  </fieldset>
+</section>

templates/item/trait-sheet.hbs

@@ -5,7 +5,7 @@
   </div>
   <div class="flexrow">
     <div class="align-top">
-      {{formField systemFields.abilityType value=system.abilityType name="system.abilityType" localize=true}}
+      {{formField systemFields.traitType value=system.traitType name="system.traitType" localize=true}}
       {{formField systemFields.source value=system.source name="system.source"}}
       {{formField systemFields.usagePeriod value=system.usagePeriod name="system.usagePeriod" localize=true}}
       {{#unless (eq system.usagePeriod "none")}}