Merged with refactor/84-data-models-structure

templates/sheets/activeEffect/changes.hbs

@@ -0,0 +1,36 @@
+<section class="tab changes{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
+    <header>
+        <div class="key">{{localize "EFFECT.ChangeKey"}}</div>
+        <div class="mode">{{localize "EFFECT.ChangeMode"}}</div>
+        <div class="value">{{localize "EFFECT.ChangeValue"}}</div>
+        <div class="priority">{{localize "EFFECT.ChangePriority"}}</div>
+        <div class="controls"><a data-action="addChange"><i class="fa-regular fa-square-plus"></i></a></div>
+    </header>
+    <ol class="scrollable" data-changes>
+        {{#each source.changes as |change i|}}
+        {{#with ../fields.changes.element.fields as |changeFields|}}
+            <li data-index="{{i}}">
+                <div class="key">
+                    <input type="text" name="{{concat "changes." i ".key"}}" value="{{change.key}}" list="change-fields" />
+                    <datalist id="change-fields">
+                        {{#each @root.fieldPaths}}
+                            <option value="{{this}}">{{this}}</option>
+                        {{/each}}
+                    </datalist>
+                </div>
+                <div class="mode">
+                    {{formInput changeFields.mode name=(concat "changes." i ".mode") value=change.mode choices=@root.modes}}
+                </div>
+                <div class="value">
+                    {{formInput changeFields.value name=(concat "changes." i ".value") value=change.value}}
+                </div>
+                <div class="priority">
+                    {{formInput changeFields.priority name=(concat "changes." i ".priority") value=change.priority
+                        placeholder=(lookup ../../priorities change.mode)}}
+                </div>
+                <div class="controls"><a data-action="deleteChange"><i class="fa-solid fa-trash"></i></a></div>
+            </li>
+        {{/with}}
+        {{/each}}
+    </ol>
+</section>

templates/sheets/activeEffect/details.hbs

@@ -0,0 +1,14 @@
+<section class="tab scrollable{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
+    {{formGroup fields.tint value=source.tint rootId=rootId placeholder="#ffffff"}}
+    {{formGroup fields.description value=source.description rootId=rootId}}
+    {{formGroup fields.disabled value=source.disabled rootId=rootId}}
+
+    {{#if isActorEffect}}
+    {{formGroup fields.origin value=source.origin rootId=rootId disabled=true}}
+    {{/if}}
+    {{#if isItemEffect}}
+    {{formGroup fields.transfer value=source.transfer rootId=rootId label=legacyTransfer.label hint=legacyTransfer.hint}}
+    {{/if}}
+
+    {{formGroup fields.statuses value=source.statuses options=statuses rootId=rootId classes="statuses"}}
+</section>

templates/sheets/activeEffect/duration.hbs

@@ -0,0 +1,31 @@
+<section class="tab{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
+    <fieldset class="one-column">
+        {{formGroup fields.duration.fields.seconds value=source.duration.seconds rootId=rootId}}
+        {{formGroup fields.duration.fields.startTime value=source.duration.startTime rootId=rootId}}
+    </fieldset>
+
+    <fieldset class="one-column">
+        <div class="form-group">
+            <label>{{localize "EFFECT.DurationTurns"}}</label>
+            <div class="form-fields">
+                <label for="{{rootId}}-duration.rounds">{{localize "EFFECT.FIELDS.duration.rounds.label"}}</label>
+                {{formInput fields.duration.fields.rounds value=source.duration.rounds
+                    id=(concat rootId "-duration.rounds")}}
+                <label for="{{rootId}}-duration.turns">{{localize "EFFECT.FIELDS.duration.turns.label"}}</label>
+                {{formInput fields.duration.fields.turns value=source.duration.turns
+                    id=(concat rootId "-duration.turns")}}
+            </div>
+        </div>
+        <div class="form-group">
+            <label>{{localize "EFFECT.StartTurns"}}</label>
+            <div class="form-fields">
+                <label for="{{rootId}}-duration.startRound">{{localize "EFFECT.FIELDS.duration.startRound.label"}}</label>
+                {{formInput fields.duration.fields.startRound value=source.duration.startRound
+                    id=(concat rootId "-duration.startRound")}}
+                <label for="{{rootId}}-duration.startTurn">{{localize "EFFECT.FIELDS.duration.startTurn.label"}}</label>
+                {{formInput fields.duration.fields.startTurn value=source.duration.startTurn
+                    id=(concat rootId "-duration.startTurn")}}
+            </div>
+        </div>
+    </fieldset>
+</section>

templates/sheets/activeEffect/header.hbs

@@ -0,0 +1,7 @@
+<header class='item-sheet-header'>
+    <img class='profile' src="{{source.img}}" data-action="editImage" data-edit="img" alt="{{localize "EFFECT.FIELDS.img.label"}}">
+    <div class='item-info'>
+        <h1 class='item-name'><input name="name" type="text" value="{{source.name}}" placeholder="{{localize "EFFECT.FIELDS.name.label"}}"
+        aria-label="{{localize "EFFECT.FIELDS.name.label"}}"></h1>
+    </div>
+</header>

templates/sheets/actors/adversary/header.hbs

@@ -0,0 +1,9 @@
+<header class='item-card-header'>
+    <img class='profile' src='{{source.img}}' data-action='editImage' data-edit='img' />
+    <div class='item-info'>
+        <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
+        <div class='item-description'>
+            <h3>{{localize 'TYPES.Actor.adversary'}}</h3>
+        </div>
+    </div>
+</header>

templates/sheets/actors/adversary/information.hbs

@@ -0,0 +1,17 @@
+<section
+    class='tab {{tabs.information.cssClass}} {{tabs.information.id}}'
+    data-tab='{{tabs.information.id}}'
+    data-group='{{tabs.information.group}}'
+>
+    <fieldset>
+        <legend>{{localize "DAGGERHEART.Sheets.Adversary.Description" }}</legend>
+
+        {{formGroup systemFields.description value=source.system.description}}
+    </fieldset>
+
+    <fieldset>
+        <legend>{{localize "DAGGERHEART.Sheets.Adversary.MotivesAndTactics" }}</legend>
+
+        {{formGroup systemFields.motivesAndTactics value=source.system.motivesAndTactics}}
+    </fieldset>
+</section>

templates/sheets/actors/adversary/main.hbs

@@ -0,0 +1,60 @@
+<section
+    class='tab {{tabs.main.cssClass}} {{tabs.main.id}}'
+    data-tab='{{tabs.main.id}}'
+    data-group='{{tabs.main.group}}'
+>
+    <div class="adversary-container">
+        <fieldset class="two-columns even">
+            <legend>{{localize "DAGGERHEART.Sheets.Adversary.General"}}</legend>
+
+            {{formGroup systemFields.tier value=source.system.tier localize=true}}
+            {{formGroup systemFields.type value=source.system.type localize=true}}
+            <div class="full-width">{{formGroup systemFields.difficulty value=source.system.difficulty}}</div>
+
+            <fieldset>
+                <legend>{{localize "DAGGERHEART.Sheets.Adversary.DamageThresholds"}}</legend>
+
+                {{formGroup systemFields.damageThresholds.fields.major value=source.system.damageThresholds.major}}
+                {{formGroup systemFields.damageThresholds.fields.severe value=source.system.damageThresholds.severe}}
+            </fieldset>
+            
+            <fieldset>
+                <legend>{{localize "DAGGERHEART.Sheets.Adversary.HitPoints"}}</legend>
+
+                {{formGroup systemFields.resources.fields.hitPoints.fields.value value=source.system.resources.hitPoints.value}}
+                {{formGroup systemFields.resources.fields.hitPoints.fields.max value=source.system.resources.hitPoints.max}}
+            </fieldset>
+
+            <fieldset>
+                <legend>{{localize "DAGGERHEART.Sheets.Adversary.Stress"}}</legend>
+
+                {{formGroup systemFields.resources.fields.stress.fields.value value=source.system.resources.stress.value}}
+                {{formGroup systemFields.resources.fields.stress.fields.max value=source.system.resources.stress.max}}
+            </fieldset>
+
+            <fieldset>
+                <legend>{{localize "DAGGERHEART.Sheets.Adversary.Experiences"}} <a><i class="fa-solid fa-plus icon-button" data-action="addExperience"></i></a></legend>
+
+                {{#each source.system.experiences}}
+                    <fieldset class="one-column">
+                        <legend>{{this.name}} <a><i class="fa-solid fa-trash icon-button" data-action="removeExperience" data-experience="{{@key}}"></i></a></legend>
+
+                        {{formGroup @root.systemFields.experiences.element.fields.name name=(concat "system.experiences." @key ".name") value=this.name }}
+                        {{formGroup @root.systemFields.experiences.element.fields.value name=(concat "system.experiences." @key ".value") value=this.value }}
+                    </fieldset>
+                {{/each}}
+            </fieldset>
+        </fieldset>
+
+        <fieldset class="two-columns even">
+            <legend>{{localize "DAGGERHEART.Sheets.Adversary.Attack"}}</legend>
+
+            {{formGroup systemFields.attack.fields.name value=source.system.attack.name}}
+            <button data-action="attackRoll">Attack</button>
+            {{formGroup systemFields.attack.fields.modifier value=source.system.attack.modifier}}
+            {{formGroup systemFields.attack.fields.range value=source.system.attack.range localize=true}}
+            {{formGroup systemFields.attack.fields.damage.fields.value value=source.system.attack.damage.value}}
+            {{formGroup systemFields.attack.fields.damage.fields.type value=source.system.attack.damage.type localize=true}}
+        </fieldset> 
+    </div>
+</section>

templates/sheets/actors/environment/header.hbs

@@ -0,0 +1,9 @@
+<header class='item-card-header'>
+    <img class='profile' src='{{source.img}}' data-action='editImage' data-edit='img' />
+    <div class='item-info'>
+        <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
+        <div class='item-description'>
+            <h3>{{localize 'TYPES.Actor.environment'}}</h3>
+        </div>
+    </div>
+</header>

templates/sheets/actors/environment/information.hbs

@@ -0,0 +1,16 @@
+<section
+    class='tab {{tabs.information.cssClass}} {{tabs.information.id}}'
+    data-tab='{{tabs.information.id}}'
+    data-group='{{tabs.information.group}}'
+>
+    <fieldset>
+        <legend>{{localize "DAGGERHEART.Sheets.Environment.description"}}</legend>
+        
+        {{formInput systemFields.description value=source.system.description }}
+    </fieldset>
+    <fieldset>
+        <legend>{{localize "DAGGERHEART.Sheets.Environment.impulses"}}</legend>
+        
+        {{formInput systemFields.impulses value=source.system.impulses }}
+    </fieldset>
+</section>

templates/sheets/actors/environment/main.hbs

@@ -0,0 +1,37 @@
+<section
+    class='tab {{tabs.main.cssClass}} {{tabs.main.id}}'
+    data-tab='{{tabs.main.id}}'
+    data-group='{{tabs.main.group}}'
+>
+    <fieldset class="two-columns even">
+        <legend>{{localize "DAGGERHEART.Sheets.Environment.general"}}</legend>
+        
+        {{formGroup systemFields.tier value=source.system.tier localize=true }}
+        {{formGroup systemFields.type value=source.system.type localize=true }}
+        {{formGroup systemFields.difficulty value=source.system.difficulty localize=true }}
+    </fieldset>
+
+    <fieldset class="one-column">
+        <legend>{{localize "DAGGERHEART.Sheets.Environment.potentialAdversaries.label"}}<a><i class="fa-solid fa-plus icon-button" data-action="addAdversary"></i></a></legend>
+
+        {{#each source.system.potentialAdversaries}}
+            <fieldset class="potential-adversary-container" data-potential-adversary="{{@key}}">
+                <legend><input name="{{concat "system.potentialAdversaries." id ".label" }}" value="{{this.label}}" /><i class="fa-solid fa-trash" data-action="deleteProperty" data-path="system.potentialAdversaries" id={{@key}}></i></legend>
+                {{#if (eq (length this.adversaries) 0)}}
+                    <div class="adversary-placeholder">{{localize "DAGGERHEART.Sheets.Environment.potentialAdversaries.placeholder"}}</div>
+                {{else}}
+                    <div class="adversaries-container">
+                        {{#each this.adversaries as |adversary id|}}
+                            <div class="adversary-container" data-action="viewAdversary" data-potential-adversary="{{@../key}}" data-adversary="{{id}}">{{adversary.name}}</div>
+                        {{/each}}
+                    </div>
+                {{/if}}
+            </fieldset>
+        {{/each}}
+    </fieldset>
+
+    <fieldset class="one-column">
+        <legend>{{localize "DAGGERHEART.Sheets.Environment.features.label"}}<a><i class="fa-solid fa-plus icon-button" data-action="addFeature"></i></a></legend>
+
+    </fieldset>
+</section>

templates/sheets/character/character.hbs

@@ -47,7 +47,7 @@
                                     {{#if document.system.levelData.canLevelUp}}<div class="levelup-marker">*</div>{{/if}}
                                 </div>
                                 <img src="systems/daggerheart/assets/AttributeShield.svg" />
-                                <div class="level-title {{#if document.system.levelData.canLevelUp}}levelup{{/if}}">{{localize "DAGGERHEART.Sheets.PC.Level"}}</div>
+                                <div data-action="levelup" class="level-title {{#if document.system.levelData.canLevelUp}}levelup{{/if}}">{{localize "DAGGERHEART.Sheets.PC.Level"}}</div>
                             </div>
                         </div>
                         <div class="flexrow">
@@ -55,7 +55,7 @@
                                 <button data-action="selectCommunity" class="option-select deeper"><i class="fa-solid fa-house-chimney"></i></button>
                                 <button data-action="selectAncestry" class="option-select"><i class="fa-solid fa-user-large"></i></button>
                             {{/objectSelector}}
-                            {{#objectSelector title="Subclass" ids=(join document.system.subclass.uuid) values=(join document.system.subclass.name) titleFontSize=14}}
+                            {{#objectSelector title="Subclass" ids=(join document.system.class.subclass.uuid) values=(join document.system.class.subclass.name) titleFontSize=14}}
                                 <button data-action="selectSubclass" class="option-select" {{#if (not ../document.system.class.value)}}disabled{{/if}}><i class="fa-solid fa-fw fa-search"></i></button>
                             {{/objectSelector}}
                         </div>
@@ -87,7 +87,7 @@
                         </div>
                         <div class="body-section flex3">
                             {{> "systems/daggerheart/templates/sheets/parts/attributes.hbs" }}
-                            {{> "systems/daggerheart/templates/sheets/parts/weapons.hbs" weapons=document.system.equippedWeapons proficiency=document.system.proficiency.value }}
+                            {{> "systems/daggerheart/templates/sheets/parts/weapons.hbs" primaryWeapon=document.system.primaryWeapon secondaryWeapon=document.system.secondaryWeapon weaponBurden=document.system.getWeaponBurden proficiency=document.system.proficiency }}
                             {{> "systems/daggerheart/templates/sheets/parts/armor.hbs" armor=document.system.armor }}
                         </div>
                     </div>
@@ -95,10 +95,10 @@
             </div>
         </div>
         <div class="tab domain-card-tab {{this.tabs.primary.loadout.cssClass}}" data-group="primary" data-tab="loadout">
-            {{> "systems/daggerheart/templates/sheets/pc/sections/loadout.hbs" abilities=this.abilities actor=this.document config=this.config  }}
+            {{> "systems/daggerheart/templates/sheets/character/sections/loadout.hbs" abilities=this.abilities actor=this.document config=this.config  }}
         </div>
         <div class="tab {{this.tabs.primary.inventory.cssClass}}" data-group="primary" data-tab="inventory">
-            {{> "systems/daggerheart/templates/sheets/pc/sections/inventory.hbs" inventory=this.inventory }}
+            {{> "systems/daggerheart/templates/sheets/character/sections/inventory.hbs" inventory=this.inventory }}
         </div>
         <div class="tab {{this.tabs.primary.story.cssClass}}" data-group="primary" data-tab="story">
             <div class="flexcol" style="height: 100%;">

templates/sheets/character/sections/loadout.hbs

@@ -13,7 +13,7 @@
                 <div class="card-row">
                     <div class="heritage-card {{#if (not abilities.foundation.ancestry)}}outlined{{/if}}">
                         {{#if abilities.foundation.ancestry}}
-                            {{> "systems/daggerheart/templates/sheets/pc/parts/heritageCard.hbs" card=abilities.foundation.ancestry }}
+                            {{> "systems/daggerheart/templates/sheets/character/parts/heritageCard.hbs" card=abilities.foundation.ancestry }}
                         {{else}}
                             <div class="empty-ability-container">
                                 <div class="empty-ability-inner-container">
@@ -26,7 +26,7 @@
                     </div>
                     <div class="heritage-card {{#if (not abilities.foundation.community)}}outlined{{/if}}">
                         {{#if abilities.foundation.community}}
-                            {{> "systems/daggerheart/templates/sheets/pc/parts/heritageCard.hbs" card=abilities.foundation.community }}
+                            {{> "systems/daggerheart/templates/sheets/character/parts/heritageCard.hbs" card=abilities.foundation.community }}
                         {{else}}
                             <div class="empty-ability-container">
                                 <div class="empty-ability-inner-container">
@@ -41,7 +41,7 @@
                 <div class="card-row">
                     <div class="heritage-card {{#if (not abilities.foundation.advancement.foundation)}}outlined{{/if}}">
                         {{#if abilities.foundation.advancement.foundation}}
-                            {{> "systems/daggerheart/templates/sheets/pc/parts/advancementCard.hbs" card=abilities.foundation.advancement.foundation }}
+                            {{> "systems/daggerheart/templates/sheets/character/parts/advancementCard.hbs" card=abilities.foundation.advancement.foundation }}
                         {{else}}
                             <div class="empty-ability-container">
                                 <div class="empty-ability-inner-container">
@@ -54,7 +54,7 @@
                     </div>
                     <div class="heritage-card {{#if (not abilities.foundation.advancement.first)}}outlined{{/if}}">
                         {{#if abilities.foundation.advancement.first}}
-                            {{> "systems/daggerheart/templates/sheets/pc/parts/advancementCard.hbs" card=abilities.foundation.advancement.first }}
+                            {{> "systems/daggerheart/templates/sheets/character/parts/advancementCard.hbs" card=abilities.foundation.advancement.first }}
                         {{else}}
                             <div class="empty-ability-container">
                                 <div class="empty-ability-inner-container">
@@ -68,7 +68,7 @@
                     </div>
                     <div class="heritage-card {{#if (not abilities.foundation.advancement.second)}}outlined{{/if}}">
                         {{#if abilities.foundation.advancement.second}}
-                            {{> "systems/daggerheart/templates/sheets/pc/parts/advancementCard.hbs" card=abilities.foundation.advancement.second}}
+                            {{> "systems/daggerheart/templates/sheets/character/parts/advancementCard.hbs" card=abilities.foundation.advancement.second}}
                         {{else}}
                             <div class="empty-ability-container">
                                 <div class="empty-ability-inner-container">

templates/sheets/global/tabs/tab-form-footer.hbs

@@ -0,0 +1,3 @@
+<section class='tab-form-footer'>
+    <button type="submit"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button>
+</section>

templates/sheets/parts/attributes.hbs

@@ -12,10 +12,10 @@
             </div>
             <div class="attribute-image">
                 {{#if ../editAttributes}}
-                    <select class="attribute-value{{#if (lt attribute.base 0)}} negative{{/if}}{{#if (and (not attribute.base) (not ../abilityScoresFinished))}} unselected{{/if}}" data-attribute="{{key}}">
-                        {{#if (not (eq attribute.base 0))}}<option value="">{{attribute.base}}</option>{{/if}}
+                    <select class="attribute-value{{#if (lt attribute.value 0)}} negative{{/if}}{{#if (and (not attribute.value) (not ../abilityScoresFinished))}} unselected{{/if}}" data-attribute="{{key}}">
+                        {{#if (not (eq attribute.value 0))}}<option value="">{{attribute.value}}</option>{{/if}}
                         {{#each ../abilityScoreArray as |option|}}
-                            <option value="{{option.value}}"{{#if (eq option.value attribute.base)}} selected="selected"{{/if}}>{{option.name}}</option>
+                            <option value="{{option.value}}">{{option.name}}</option>
                         {{/each}}
                     </select>
                 {{else}}

templates/sheets/parts/defense.hbs

@@ -4,7 +4,7 @@
     <div class="defense-row">
         <div class="defense-section">
             <div class="defense-container">
-                <div class="defense-value">{{document.system.evasion.value}}</div>
+                <div class="defense-value">{{document.system.evasion}}</div>
                 <img src="systems/daggerheart/assets/AttributeShield.svg" />
                 <div class="defense-banner">{{localize "DAGGERHEART.Sheets.PC.Defense.Evasion"}}</div>
             </div>
@@ -16,16 +16,18 @@
                 <img src="systems/daggerheart/assets/AttributeShield.svg" />
                 <div class="defense-banner">{{localize "DAGGERHEART.Sheets.PC.Defense.Armor"}}</div>
             </div>
-            <div class="armor-marks">
-                {{#times (subtract 12 document.system.armorMarks.max)}}
-                    <input class="mark disabled-mark" type="checkbox" disabled />
-                {{/times}}
-                {{#times document.system.armorMarks.max}}
-                    {{#with (add this 1)}}
-                        <input class="mark" type="checkbox" data-action="toggleMarks" data-value="{{this}}" {{ checked (gte ../../document.system.armor.system.marks.value this) }} />
-                    {{/with}}
-                {{/times}}
-            </div>
+            {{#if document.system.armor.system.marks}}
+                <div class="armor-marks">
+                    {{#times (subtract 12 document.system.armor.system.marks.max)}}
+                        <input class="mark disabled-mark" type="checkbox" disabled />
+                    {{/times}}
+                    {{#times document.system.armor.system.marks.max}}
+                        {{#with (add this 1)}}
+                            <input class="mark" type="checkbox" data-action="toggleMarks" data-value="{{this}}" {{ checked (gte ../../document.system.armor.system.marks.value this) }} />
+                        {{/with}}
+                    {{/times}}
+                </div>
+            {{/if}}
         </div>
     </div>
 </fieldset>

templates/sheets/parts/experience.hbs

@@ -1,12 +1,12 @@
 <fieldset class="left-main-container experience-container">
     <legend class="legend">{{localize "DAGGERHEART.Sheets.PC.Experience.Title"}}</legend>
-    {{#each document.system.experiences as |experience index|}}
+    {{#each document.system.experiences as |experience id|}}
         <div class="experience-row">
-            <input class="experience-description" data-index={{index}} value="{{experience.description}}" type="text" />
-            <div class="experience-value">{{experience.value}}</div>
+            <input name="{{concat "system.experiences." id ".description"}}" data-experience={{id}} value="{{experience.description}}" type="text" />
+            <div name="{{concat "system.experiences." id ".value"}}" class="experience-value">{{experience.value}}</div>
         </div>
     {{/each}}
-    {{#times (subtract 5 document.system.experiences.length)}}
+    {{#times (subtract 5 (length document.system.experiences))}}
         <div class="experience-row">
             <input type="text" class="disabled-experience" disabled />
             <div class="experience-value empty"></div>

templates/sheets/parts/weapons.hbs

@@ -11,39 +11,39 @@
              <div class="proficiency-container-visual-element"></div>
         </div>
         <div class="weapons-burden">
-            <i class="fa-solid fa-hand weapons-burden-icon left {{#if (or (eq weapons.burden "oneHanded") (eq weapons.burden "twoHanded"))}}active{{/if}}"></i>
-            <i class="fa-solid fa-hand weapons-burden-icon right {{#if (eq weapons.burden "twoHanded")}}active{{/if}}"></i>
+            <i class="fa-solid fa-hand weapons-burden-icon left {{#if (or (eq weaponBurden "oneHanded") (eq weaponBurden "twoHanded"))}}active{{/if}}"></i>
+            <i class="fa-solid fa-hand weapons-burden-icon right {{#if (eq weaponBurden "twoHanded")}}active{{/if}}"></i>
         </div>
     </legend>
 
     <div class="active-item-container">
         <h2 class="weapons-label-row">
             {{localize "DAGGERHEART.Sheets.PC.Weapons.PrimaryTitle"}} 
-            {{#if weapons.primary}}
-                <img class="damage-roll" data-action="attackRoll" data-weapon="{{weapons.primary.uuid}}" src="icons/svg/d12-grey.svg" />
+            {{#if primaryWeapon}}
+                <img class="damage-roll" data-action="attackRoll" data-weapon="{{primaryWeapon.uuid}}" src="icons/svg/d12-grey.svg" />
             {{/if}}
         </h2>
         <div class="flexrow">
-            <input value="{{weapons.primary.name}}" type="text" />
-            <input value="{{localize weapons.primary.trait}}" type="text" />
-            <input value="{{localize weapons.primary.range.label}}" type="text" />
-            <input value="{{weapons.primary.damage.value}} {{#if weapons.primary}}({{localize weapons.primary.damage.type.abbreviation}}){{/if}}" type="text" />
+            <input value="{{primaryWeapon.name}}" type="text" />
+            <input value="{{localize primaryWeapon.trait}}" type="text" />
+            <input value="{{localize primaryWeapon.range.label}}" type="text" />
+            <input value="{{primaryWeapon.damage.value}} {{#if primaryWeapon}}({{localize primaryWeapon.damage.type.abbreviation}}){{/if}}" type="text" />
         </div>
-        <input value="{{localize weapons.primary.feature.label}} {{#if weapons.primary.feature}}({{localize weapons.primary.feature.description}}){{/if}}" type="text" />
+        <input value="{{localize primaryWeapon.feature.label}} {{#if primaryWeapon.feature}}({{localize primaryWeapon.feature.description}}){{/if}}" type="text" />
     </div>
     <div class="active-item-container">
         <h2 class="weapons-label-row">
             {{localize "DAGGERHEART.Sheets.PC.Weapons.SecondaryTitle"}}
-            {{#if weapons.secondary}}
-                <img class="damage-roll" data-action="damageRoll" data-value="{{weapons.secondary.damage.value}}" src="icons/svg/d12-grey.svg" />
+            {{#if secondaryWeapon}}
+                <img class="damage-roll" data-action="damageRoll" data-value="{{secondaryWeapon.damage.value}}" src="icons/svg/d12-grey.svg" />
             {{/if}}
         </h2>
         <div class="flexrow">
-            <input value="{{weapons.secondary.name}}" type="text" />
-            <input value="{{localize weapons.secondary.trait}}" type="text" />
-            <input value="{{localize weapons.secondary.range.label}}" type="text" />
-            <input value="{{weapons.secondary.damage.label}} {{#if weapons.secondary}}({{localize weapons.secondary.damage.type.abbreviation}}){{/if}}" type="text" />
+            <input value="{{secondaryWeapon.name}}" type="text" />
+            <input value="{{localize secondaryWeapon.trait}}" type="text" />
+            <input value="{{localize secondaryWeapon.range.label}}" type="text" />
+            <input value="{{secondaryWeapon.damage.label}} {{#if secondaryWeapon}}({{localize secondaryWeapon.damage.type.abbreviation}}){{/if}}" type="text" />
         </div>
-        <input value="{{localize weapons.secondary.feature.name}} {{#if weapons.secondary.feature}}({{localize weapons.secondary.feature.description}}){{/if}}" style="text-overflow: ellipsis;" type="text" />
+        <input value="{{localize secondaryWeapon.feature.name}} {{#if secondaryWeapon.feature}}({{localize secondaryWeapon.feature.description}}){{/if}}" style="text-overflow: ellipsis;" type="text" />
     </div>
 </fieldset>