First iteration over items

2025-11-06 23:30:37 +01:00
parent 6b883f8126
commit 4a9f026a2a
109 changed files with 1535 additions and 715 deletions
@@ -18,37 +18,19 @@
    label="PRISMRPG.Label.armorType"
  }}

-  {{! Armor Class (AC) }}
-  {{formField
-    systemFields.defense
-    value=system.defense
-    label="PRISMRPG.Label.armorClass"
-  }}
-
  {{! Maximum Reduction Rating (MRR) }}
-  {{formField systemFields.mrr value=system.mrr label="PRISMRPG.Label.mrr"}}
-
-  {{! Movement Penalty }}
  {{formField
-    systemFields.maximumMovement
-    value=system.maximumMovement
-    label="PRISMRPG.Label.movementPenalty"
-  }}
-
-  {{! Armor Hit Points }}
-  {{formField systemFields.hp value=system.hp label="PRISMRPG.Label.armorHP"}}
-
-  {{! Damage Reduction }}
-  {{formField
-    systemFields.damageReduction
-    value=system.damageReduction
-    label="PRISMRPG.Label.damageReduction"
+    systemFields.mrr
+    value=system.mrr
+    localize=true
+    label="PRISMRPG.Label.mrr"
  }}

  {{! Encumbrance Load }}
  {{formField
    systemFields.encLoad
    value=system.encLoad
+    localize=true
    label="PRISMRPG.Label.encumbranceLoad"
  }}

@@ -56,11 +38,13 @@
  {{formField
    systemFields.isHelmet
    value=system.isHelmet
+    localize=true
    label="PRISMRPG.Label.isHelmet"
  }}
  {{formField
    systemFields.equipped
    value=system.equipped
+    localize=true
    label="PRISMRPG.Label.equipped"
  }}

@@ -70,18 +54,17 @@
    {{formField
      systemFields.passive
      value=system.passive
+      localize=true
      label="PRISMRPG.Label.passiveName"
    }}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.passiveDescription"}}</label>
-      {{formInput
-        systemFields.passiveDescription
-        enriched=enrichedPassiveDescription
-        value=system.passiveDescription
-        name="system.passiveDescription"
-        toggled=true
-      }}
-    </div>
+    <label>{{localize "PRISMRPG.Label.passiveDescription"}}</label>
+    {{formInput
+      systemFields.passiveDescription
+      enriched=enrichedPassiveDescription
+      value=system.passiveDescription
+      name="system.passiveDescription"
+      toggled=true
+    }}
  </fieldset>

  {{! Prism RPG: Armor Augment }}
@@ -90,22 +73,26 @@
    {{formField
      systemFields.augment
      value=system.augment
+      localize=true
      label="PRISMRPG.Label.augmentName"
    }}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.augmentDescription"}}</label>
-      {{formInput
-        systemFields.augmentDescription
-        enriched=enrichedAugmentDescription
-        value=system.augmentDescription
-        name="system.augmentDescription"
-        toggled=true
-      }}
-    </div>
+    <label>{{localize "PRISMRPG.Label.augmentDescription"}}</label>
+    {{formInput
+      systemFields.augmentDescription
+      enriched=enrichedAugmentDescription
+      value=system.augmentDescription
+      name="system.augmentDescription"
+      toggled=true
+    }}
  </fieldset>

  {{! Cost }}
-  {{formField systemFields.cost value=system.cost label="PRISMRPG.Label.cost"}}
+  {{formField
+    systemFields.cost
+    value=system.cost
+    localize=true
+    label="PRISMRPG.Label.cost"
+  }}
  {{formField
    systemFields.money
    value=system.money
@@ -140,15 +140,12 @@
          <div class="name" data-tooltip="{{item.system.description}}">
            {{item.name}}
          </div>
-          <div class="item-detail" data-tooltip="Defense">
-            <a class="rollable" data-roll-type="shield-roll" data-roll-key="{{item.id}}" data-tooltip="Shield Defense">
-              <i class="lf-roll-small fa-solid fa-shield" data-roll-type="shield-roll" data-roll-key="{{item.id}}"></i>
-              {{upperFirst item.system.defense}}
-            </a>
-
+          <div class="item-detail" data-tooltip="Block APC">
+            <i class="fa-solid fa-hand"></i> {{item.system.apc}} APC
+          </div>
+          <div class="item-detail" data-tooltip="Shield Rating">
+            <i class="fa-solid fa-shield"></i> {{item.system.sr}}
          </div>
-          <div class="item-detail" data-tooltip="Movement reduction">{{item.system.movementreduction}}</div>
-          <div class="item-detail" data-tooltip="Has cover">{{#if item.system.hascover}}Cover{{/if}}</div>

          <div class="controls">
            <a data-tooltip="{{localize 'PRISMRPG.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
@@ -98,12 +98,12 @@
  </fieldset>

  <fieldset>
-    <legend data-tooltip="{{localize 'PRISMRPG.Tooltip.gifts'}}" data-tooltip-direction="UP">
-      {{localize "PRISMRPG.Label.gifts"}}
+    <legend data-tooltip="{{localize 'PRISMRPG.Tooltip.racialAbilities'}}" data-tooltip-direction="UP">
+      {{localize "PRISMRPG.Label.racialAbilities"}}
    </legend>
-    <div class="gifts">
-      {{#each gifts as |item|}}
-      <div class="gift " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+    <div class="racial-abilities">
+      {{#each racialAbilities as |item|}}
+      <div class="racial-ability " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
        <div class="name" data-tooltip="{{{item.description}}}<br><br>{{item.path}}" data-tooltip-direction="UP">
          {{item.name}}
@@ -0,0 +1,93 @@
+<section>
+  <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="flexrow">
+    <div class="align-top">
+
+      {{! Class Type and Archetype }}
+      {{formField systemFields.archetype value=system.archetype localize=true}}
+
+      {{formField systemFields.classType value=system.classType localize=true}}
+
+      {{#if (eq system.classType "continental")}}
+        {{formField systemFields.continent value=system.continent}}
+      {{/if}}
+
+      {{formField systemFields.level value=system.level}}
+
+    </div>
+    <div class="align-top">
+
+      {{! Proficiencies }}
+      {{formField systemFields.weaponProficiencies value=system.weaponProficiencies}}
+
+      {{formField systemFields.armorProficiencies value=system.armorProficiencies}}
+
+      {{! Spellcasting }}
+      {{formField systemFields.spellcasting value=system.spellcasting}}
+
+      {{#if system.spellcasting}}
+        {{formField systemFields.spellcastingType value=system.spellcastingType localize=true}}
+      {{/if}}
+
+    </div>
+  </div>
+
+  {{! Attribute Bonuses }}
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.attributeBonuses"}}</legend>
+    {{formInput
+      systemFields.attributeBonuses
+      enriched=enrichedAttributeBonuses
+      value=system.attributeBonuses
+      name="system.attributeBonuses"
+      toggled=true
+    }}
+  </fieldset>
+
+  {{! Class Features }}
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.classFeatures"}}</legend>
+
+    {{#each system.features as |feature level|}}
+      <div class="form-group">
+        <label>{{localize "PRISMRPG.Label.level"}} {{inc @key}}</label>
+        {{formInput
+          (lookup ../systemFields.features.fields @key)
+          enriched=(lookup ../enrichedFeatures @key)
+          value=feature
+          name=(concat "system.features." @key)
+          toggled=true
+        }}
+      </div>
+    {{/each}}
+  </fieldset>
+
+  {{! Notes }}
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.notes"}}</legend>
+    {{formInput
+      systemFields.notes
+      enriched=enrichedNotes
+      value=system.notes
+      name="system.notes"
+      toggled=true
+    }}
+  </fieldset>
+
+  {{! Description }}
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.description"}}</legend>
+    {{formInput
+      systemFields.description
+      enriched=enrichedDescription
+      value=system.description
+      name="system.description"
+      toggled=true
+    }}
+  </fieldset>
+
+</section>
@@ -1,15 +1,27 @@
 <section>
  <div class="header">
-    <img class="item-img" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}" />
+    <img
+      class="item-img"
+      src="{{item.img}}"
+      data-edit="img"
+      data-action="editImage"
+      data-tooltip="{{item.name}}"
+    />
    {{formInput fields.name value=source.name}}
-  </div>  
-  {{formField systemFields.encLoad value=system.encLoad}}
-  {{formField systemFields.cost value=system.cost}}
+  </div>
+  {{formField systemFields.encLoad value=system.encLoad localize=true}}
+  {{formField systemFields.cost value=system.cost localize=true}}
  {{formField systemFields.money value=system.money localize=true}}

  <fieldset>
    <legend>{{localize "PRISMRPG.Label.description"}}</legend>
-    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+    {{formInput
+      systemFields.description
+      enriched=enrichedDescription
+      value=system.description
+      name="system.description"
+      toggled=true
+    }}
  </fieldset>

 </section>
@@ -1,13 +0,0 @@
-<section>
-  <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>  
-  {{formField systemFields.cost value=system.cost}}
-
-  <fieldset>
-    <legend>{{localize "PRISMRPG.Label.description"}}</legend>
-    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
-  </fieldset>
-
-</section>
@@ -14,16 +14,23 @@
  {{formField
    systemFields.miracleType
    value=system.miracleType
+    localize=true
    label="PRISMRPG.Label.miracleType"
  }}

  {{! Prism RPG: APC (Action Point Cost) }}
-  {{formField systemFields.apc value=system.apc label="PRISMRPG.Label.apc"}}
+  {{formField
+    systemFields.apc
+    value=system.apc
+    localize=true
+    label="PRISMRPG.Label.apc"
+  }}

  {{! Prism RPG: Faith Cost }}
  {{formField
    systemFields.faithCost
    value=system.faithCost
+    localize=true
    label="PRISMRPG.Label.faithCost"
  }}

@@ -31,6 +38,7 @@
  {{formField
    systemFields.divineFavor
    value=system.divineFavor
+    localize=true
    label="PRISMRPG.Label.divineFavor"
  }}

@@ -40,6 +48,7 @@
    {{formField
      systemFields.augment
      value=system.augment
+      localize=true
      label="PRISMRPG.Label.augmentName"
    }}
    <div class="form-group">
@@ -61,37 +70,44 @@
      {{formField
        systemFields.components.fields.verbal
        value=system.components.verbal
+        localize=true
        label="PRISMRPG.Label.verbal"
      }}
      {{formField
        systemFields.components.fields.somatic
        value=system.components.somatic
+        localize=true
        label="PRISMRPG.Label.somatic"
      }}
      {{formField
        systemFields.components.fields.material
        value=system.components.material
+        localize=true
        label="PRISMRPG.Label.material"
      }}
      {{formField
        systemFields.components.fields.catalyst
        value=system.components.catalyst
+        localize=true
        label="PRISMRPG.Label.catalyst"
      }}
      {{formField
        systemFields.components.fields.religious
        value=system.components.religious
+        localize=true
        label="PRISMRPG.Label.religious"
      }}
    </div>
    {{formField
      systemFields.materialComponent
      value=system.materialComponent
+      localize=true
      label="PRISMRPG.Label.materialComponent"
    }}
    {{formField
      systemFields.catalyst
      value=system.catalyst
+      localize=true
      label="PRISMRPG.Label.catalystDetails"
    }}
  </fieldset>
@@ -100,26 +116,31 @@
  {{formField
    systemFields.prayerTime
    value=system.prayerTime
+    localize=true
    label="PRISMRPG.Label.prayerTime"
  }}
  {{formField
    systemFields.miracleRange
    value=system.miracleRange
+    localize=true
    label="PRISMRPG.Label.range"
  }}
  {{formField
    systemFields.areaAffected
    value=system.areaAffected
+    localize=true
    label="PRISMRPG.Label.areaAffected"
  }}
  {{formField
    systemFields.duration
    value=system.duration
+    localize=true
    label="PRISMRPG.Label.duration"
  }}
  {{formField
    systemFields.savingThrow
    value=system.savingThrow
+    localize=true
    label="PRISMRPG.Label.savingThrow"
  }}

@@ -127,6 +148,7 @@
  {{formField
    systemFields.level
    value=system.level
+    localize=true
    label="PRISMRPG.Label.level"
  }}

@@ -0,0 +1,91 @@
+<section>
+  <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="flexrow">
+    <div class="align-top">
+
+      {{! Basic Information }}
+      {{formField systemFields.senses value=system.senses}}
+
+      {{formField systemFields.size value=system.size localize=true}}
+
+      {{formField
+        systemFields.ageCategory
+        value=system.ageCategory
+        localize=true
+      }}
+
+      {{formField systemFields.language value=system.language}}
+
+    </div>
+    <div class="align-top">
+
+      {{! Racial Passive }}
+      {{formField systemFields.racialPassive value=system.racialPassive}}
+
+      {{! Sub-race }}
+      {{formField systemFields.subrace value=system.subrace}}
+
+      {{formField systemFields.subraceAbility value=system.subraceAbility}}
+
+    </div>
+  </div>
+
+  {{! Racial Passive Description }}
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.racialPassive"}}</legend>
+    {{formInput
+      systemFields.racialPassiveDescription
+      enriched=enrichedRacialPassiveDescription
+      value=system.racialPassiveDescription
+      name="system.racialPassiveDescription"
+      toggled=true
+    }}
+  </fieldset>
+
+  {{! Sub-race Ability Description }}
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.subraceAbility"}}</legend>
+    {{formInput
+      systemFields.subraceAbilityDescription
+      enriched=enrichedSubraceAbilityDescription
+      value=system.subraceAbilityDescription
+      name="system.subraceAbilityDescription"
+      toggled=true
+    }}
+  </fieldset>
+
+  {{! Notes }}
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.notes"}}</legend>
+    {{formInput
+      systemFields.notes
+      enriched=enrichedNotes
+      value=system.notes
+      name="system.notes"
+      toggled=true
+    }}
+  </fieldset>
+
+  {{! Description }}
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.description"}}</legend>
+    {{formInput
+      systemFields.description
+      enriched=enrichedDescription
+      value=system.description
+      name="system.description"
+      toggled=true
+    }}
+  </fieldset>
+
+</section>
@@ -0,0 +1,24 @@
+<section>
+  <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>
+
+  <fieldset>
+    <legend>{{localize "PRISMRPG.Label.description"}}</legend>
+    {{formInput
+      systemFields.description
+      enriched=enrichedDescription
+      value=system.description
+      name="system.description"
+      toggled=true
+    }}
+  </fieldset>
+
+</section>
@@ -25,6 +25,7 @@
      {{formField
        systemFields.apc
        value=system.apc
+        localize=true
        label="PRISMRPG.Label.blockAPC"
      }}

@@ -32,19 +33,14 @@
      {{formField
        systemFields.sr
        value=system.sr
+        localize=true
        label="PRISMRPG.Label.shieldRating"
      }}

-      {{! Defense Bonus }}
-      {{formField
-        systemFields.defense
-        value=system.defense
-        label="PRISMRPG.Label.defenseBonus"
-      }}
-
      {{formField
        systemFields.equipped
        value=system.equipped
+        localize=true
        label="PRISMRPG.Label.equipped"
      }}

@@ -55,12 +51,14 @@
      {{formField
        systemFields.encLoad
        value=system.encLoad
+        localize=true
        label="PRISMRPG.Label.encumbranceLoad"
      }}

      {{formField
        systemFields.cost
        value=system.cost
+        localize=true
        label="PRISMRPG.Label.cost"
      }}
      {{formField
@@ -79,38 +77,17 @@
    {{formField
      systemFields.blockAugment
      value=system.blockAugment
+      localize=true
      label="PRISMRPG.Label.blockAugmentName"
    }}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.blockAugmentDescription"}}</label>
-      {{formInput
-        systemFields.blockAugmentDescription
-        enriched=enrichedBlockAugmentDescription
-        value=system.blockAugmentDescription
-        name="system.blockAugmentDescription"
-        toggled=true
-      }}
-    </div>
-  </fieldset>
-
-  {{! Prism RPG: Shield Augment }}
-  <fieldset class="shield-augment">
-    <legend>{{localize "PRISMRPG.Label.shieldAugment"}}</legend>
-    {{formField
-      systemFields.augment
-      value=system.augment
-      label="PRISMRPG.Label.augmentName"
+    <label>{{localize "PRISMRPG.Label.blockAugmentDescription"}}</label>
+    {{formInput
+      systemFields.blockAugmentDescription
+      enriched=enrichedBlockAugmentDescription
+      value=system.blockAugmentDescription
+      name="system.blockAugmentDescription"
+      toggled=true
    }}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.augmentDescription"}}</label>
-      {{formInput
-        systemFields.augmentDescription
-        enriched=enrichedAugmentDescription
-        value=system.augmentDescription
-        name="system.augmentDescription"
-        toggled=true
-      }}
-    </div>
  </fieldset>

  <fieldset>
@@ -120,7 +97,8 @@
      enriched=enrichedDescription
      value=system.description
      name="system.description"
-      toggled="false"
+      toggled=true
    }}
  </fieldset>
+
 </section>
@@ -4,9 +4,6 @@
    {{formInput fields.name value=source.name}}
  </div>

-  {{!-- Core Skill Selection --}}
-  {{formField systemFields.coreSkill value=system.coreSkill localize=true label="PRISMRPG.Label.coreSkillType"}}
-
  {{!-- Is this the character's Core Skill? --}}
  <div class="form-group">
    <label>{{localize "PRISMRPG.Label.isCoreSkill"}}</label>
@@ -20,41 +17,17 @@
      <label>{{localize "PRISMRPG.Label.attributeBonusChoice"}}</label>
      <select name="system.attributeBonus">
        <option value="">{{localize "PRISMRPG.Label.selectAttribute"}}</option>
-        {{#each (lookup config.CORE_SKILLS system.coreSkill).attributeChoices as |attr|}}
-          <option value="{{attr}}" {{selected system.attributeBonus attr}}>
-            {{localize (concat "PRISMRPG.Label." attr)}}
-          </option>
-        {{/each}}
+        {{#with (lookup config.CORE_SKILLS system.coreSkill)}}
+          {{#each attributeChoices}}
+            <option value="{{this}}" {{#if (eq ../../system.attributeBonus this)}}selected{{/if}}>
+              {{localize (concat "PRISMRPG.Label." this)}}
+            </option>
+          {{/each}}
+        {{/with}}
      </select>
      <p class="hint">{{localize "PRISMRPG.Hint.attributeBonus"}}</p>
    </div>

-    {{!-- Modifier Display --}}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.modifier"}}</label>
-      <div class="modifier-display">
-        <span class="basic-bonus">+{{system.modifier}} {{localize "PRISMRPG.Label.basicChecks"}}</span>
-        {{#if system.attributeBonus}}
-          <span class="attribute-bonus">+2 {{localize (concat "PRISMRPG.Label." system.attributeBonus)}}</span>
-        {{/if}}
-      </div>
-    </div>
-
-    {{!-- Advanced Checks --}}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.advancedChecks"}}</label>
-      <span class="{{#if system.canAdvancedCheck}}enabled{{else}}disabled{{/if}}">
-        {{#if system.canAdvancedCheck}}
-          ✓ {{localize "PRISMRPG.Label.enabled"}}
-        {{else}}
-          ✗ {{localize "PRISMRPG.Label.disabled"}}
-        {{/if}}
-      </span>
-      <p class="hint">{{localize "PRISMRPG.Hint.advancedChecks"}}</p>
-    </div>
-
-    {{!-- Core Skill Class --}}
-    {{formField systemFields.coreSkillClass value=system.coreSkillClass label="PRISMRPG.Label.coreSkillClass"}}
  {{/if}}

  {{!-- Notes --}}
@@ -14,6 +14,7 @@
  {{formField
    systemFields.manaCost
    value=system.manaCost
+    localize=true
    label="PRISMRPG.Label.manaCost"
  }}

@@ -21,11 +22,17 @@
  {{formField
    systemFields.manaUpkeep
    value=system.manaUpkeep
+    localize=true
    label="PRISMRPG.Label.manaUpkeep"
  }}

  {{! Prism RPG: APC (Action Point Cost) }}
-  {{formField systemFields.apc value=system.apc label="PRISMRPG.Label.apc"}}
+  {{formField
+    systemFields.apc
+    value=system.apc
+    localize=true
+    label="PRISMRPG.Label.apc"
+  }}

  {{! Prism RPG: Prism Color }}
  {{formField
@@ -38,15 +45,13 @@
  {{! Prism RPG: Color Effect }}
  <fieldset class="spell-color-effect">
    <legend>{{localize "PRISMRPG.Label.colorEffect"}}</legend>
-    <div class="form-group">
-      {{formInput
-        systemFields.colorEffect
-        enriched=enrichedColorEffect
-        value=system.colorEffect
-        name="system.colorEffect"
-        toggled=true
-      }}
-    </div>
+    {{formInput
+      systemFields.colorEffect
+      enriched=enrichedColorEffect
+      value=system.colorEffect
+      name="system.colorEffect"
+      toggled=true
+    }}
  </fieldset>

  {{! Prism RPG: Spell Ascension }}
@@ -62,101 +67,79 @@
      <p class="hint">{{localize "PRISMRPG.Hint.spellAscension"}}</p>
    </div>
    {{#if system.canAscend}}
-      <div class="form-group">
-        <label>{{localize "PRISMRPG.Label.ascensionEffect"}}</label>
-        {{formInput
-          systemFields.ascensionEffect
-          enriched=enrichedAscensionEffect
-          value=system.ascensionEffect
-          name="system.ascensionEffect"
-          toggled=true
-        }}
-      </div>
+      <label>{{localize "PRISMRPG.Label.ascensionEffect"}}</label>
+      {{formInput
+        systemFields.ascensionEffect
+        enriched=enrichedAscensionEffect
+        value=system.ascensionEffect
+        name="system.ascensionEffect"
+        toggled=true
+      }}
    {{/if}}
  </fieldset>

-  {{! Spell Components }}
-  <fieldset class="spell-components">
-    <legend>{{localize "PRISMRPG.Label.components"}}</legend>
-    <div class="shift-right">
-      {{formField
-        systemFields.components.fields.verbal
-        value=system.components.verbal
-        label="PRISMRPG.Label.verbal"
-      }}
-      {{formField
-        systemFields.components.fields.somatic
-        value=system.components.somatic
-        label="PRISMRPG.Label.somatic"
-      }}
-      {{formField
-        systemFields.components.fields.material
-        value=system.components.material
-        label="PRISMRPG.Label.material"
-      }}
-      {{formField
-        systemFields.components.fields.catalyst
-        value=system.components.catalyst
-        label="PRISMRPG.Label.catalyst"
-      }}
-    </div>
-    {{formField
-      systemFields.materialComponent
-      value=system.materialComponent
-      label="PRISMRPG.Label.materialComponent"
-    }}
-    {{formField
-      systemFields.catalyst
-      value=system.catalyst
-      label="PRISMRPG.Label.catalystDetails"
-    }}
-  </fieldset>
-
  {{! Spell Properties }}
  {{formField
    systemFields.memorized
    value=system.memorized
+    localize=true
    label="PRISMRPG.Label.memorized"
  }}
+  {{formField
+    systemFields.level
+    value=system.level
+    localize=true
+    label="PRISMRPG.Label.level"
+  }}
+  {{formField
+    systemFields.targets
+    value=system.targets
+    localize=true
+    label="PRISMRPG.Label.targets"
+  }}
+  {{formField
+    systemFields.resolve
+    value=system.resolve
+    localize=true
+    label="PRISMRPG.Label.resolve"
+  }}
  {{formField
    systemFields.castingTime
    value=system.castingTime
+    localize=true
    label="PRISMRPG.Label.castingTime"
  }}
  {{formField
    systemFields.spellRange
    value=system.spellRange
+    localize=true
    label="PRISMRPG.Label.range"
  }}
  {{formField
    systemFields.areaAffected
    value=system.areaAffected
+    localize=true
    label="PRISMRPG.Label.areaAffected"
  }}
  {{formField
    systemFields.duration
    value=system.duration
+    localize=true
    label="PRISMRPG.Label.duration"
  }}
  {{formField
    systemFields.savingThrow
    value=system.savingThrow
+    localize=true
    label="PRISMRPG.Label.savingThrow"
  }}
  {{formField
    systemFields.keywords
    value=system.keywords
+    localize=true
    label="PRISMRPG.Label.keywords"
  }}

-  {{! Legacy fields }}
-  {{formField
-    systemFields.level
-    value=system.level
-    label="PRISMRPG.Label.level"
-  }}
-  {{formField systemFields.cost value=system.cost label="PRISMRPG.Label.cost"}}
-
  <fieldset>
    <legend>{{localize "PRISMRPG.Label.description"}}</legend>
    {{formInput
@@ -30,44 +30,28 @@
      }}

      {{! Prism RPG: APC (Action Point Cost) }}
-      {{formField systemFields.apc value=system.apc label="PRISMRPG.Label.apc"}}
+      {{formField
+        systemFields.apc
+        value=system.apc
+        localize=true
+        label="PRISMRPG.Label.apc"
+      }}

      {{! Damage }}
      {{formField
        systemFields.damage
        value=system.damage
+        localize=true
        label="PRISMRPG.Label.damage"
      }}

-      {{! Damage Type }}
-      <label>{{localize "PRISMRPG.Label.damageType"}}</label>
-      <div class="shift-right">
-        {{formField
-          systemFields.damageType.fields.typeP
-          value=system.damageType.typeP
-          label="PRISMRPG.Label.piercing"
-        }}
-        {{formField
-          systemFields.damageType.fields.typeB
-          value=system.damageType.typeB
-          label="PRISMRPG.Label.bludgeoning"
-        }}
-        {{formField
-          systemFields.damageType.fields.typeS
-          value=system.damageType.typeS
-          label="PRISMRPG.Label.slashing"
-        }}
-      </div>
-
      {{formField
-        systemFields.applyStrengthDamageBonus
-        value=system.applyStrengthDamageBonus
+        systemFields.equipped
+        value=system.equipped
        localize=true
+        label="PRISMRPG.Label.equipped"
      }}

-      {{formField systemFields.hands value=system.hands localize=true}}
-      {{formField systemFields.equipped value=system.equipped}}
-
    </div>
    <div class="align-top">

@@ -76,76 +60,57 @@
        {{formField
          systemFields.isProjectile
          value=system.isProjectile
+          localize=true
          label="PRISMRPG.Label.isProjectile"
        }}
        {{formField
          systemFields.range
          value=system.range
+          localize=true
          label="PRISMRPG.Label.range"
        }}
        {{formField
          systemFields.reloadAPC
          value=system.reloadAPC
+          localize=true
          label="PRISMRPG.Label.reloadAPC"
        }}
      {{/if}}

-      <label>{{localize "PRISMRPG.Label.bonuses"}}</label>
-      <div class="shift-right">
-        {{formField
-          systemFields.bonuses.fields.attackBonus
-          value=system.bonuses.attackBonus
-        }}
-        {{formField
-          systemFields.bonuses.fields.defenseBonus
-          value=system.bonuses.defenseBonus
-        }}
-        {{formField
-          systemFields.bonuses.fields.damageBonus
-          value=system.bonuses.damageBonus
-        }}
-      </div>
+      {{formField
+        systemFields.encLoad
+        value=system.encLoad
+        localize=true
+        label="PRISMRPG.Label.encumbranceLoad"
+      }}

-      {{formField systemFields.encLoad value=system.encLoad}}
-
-      {{formField systemFields.cost value=system.cost}}
+      {{formField
+        systemFields.cost
+        value=system.cost
+        localize=true
+        label="PRISMRPG.Label.cost"
+      }}
      {{formField systemFields.money value=system.money localize=true}}
    </div>
  </div>

-  {{! Prism RPG: Group Passive }}
-  <fieldset class="weapon-group-passive">
-    <legend>{{localize "PRISMRPG.Label.groupPassive"}}</legend>
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.groupPassiveName"}}</label>
-      <input
-        type="text"
-        name="system.groupPassive"
-        value="{{system.groupPassive}}"
-        readonly
-      />
-      <p class="hint">{{localize "PRISMRPG.Hint.groupPassive"}}</p>
-    </div>
-  </fieldset>
-
  {{! Prism RPG: Weapon Passive }}
  <fieldset class="weapon-passive">
    <legend>{{localize "PRISMRPG.Label.weaponPassive"}}</legend>
    {{formField
      systemFields.passive
      value=system.passive
+      localize=true
      label="PRISMRPG.Label.passiveName"
    }}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.passiveDescription"}}</label>
-      {{formInput
-        systemFields.passiveDescription
-        enriched=enrichedPassiveDescription
-        value=system.passiveDescription
-        name="system.passiveDescription"
-        toggled=true
-      }}
-    </div>
+    <label>{{localize "PRISMRPG.Label.passiveDescription"}}</label>
+    {{formInput
+      systemFields.passiveDescription
+      enriched=enrichedPassiveDescription
+      value=system.passiveDescription
+      name="system.passiveDescription"
+      toggled=true
+    }}
  </fieldset>

  {{! Prism RPG: Weapon Maneuver }}
@@ -154,38 +119,17 @@
    {{formField
      systemFields.maneuver
      value=system.maneuver
+      localize=true
      label="PRISMRPG.Label.maneuverName"
    }}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.maneuverDescription"}}</label>
-      {{formInput
-        systemFields.maneuverDescription
-        enriched=enrichedManeuverDescription
-        value=system.maneuverDescription
-        name="system.maneuverDescription"
-        toggled=true
-      }}
-    </div>
-  </fieldset>
-
-  {{! Prism RPG: Weapon Augment }}
-  <fieldset class="weapon-augment">
-    <legend>{{localize "PRISMRPG.Label.weaponAugment"}}</legend>
-    {{formField
-      systemFields.augment
-      value=system.augment
-      label="PRISMRPG.Label.augmentName"
+    <label>{{localize "PRISMRPG.Label.maneuverDescription"}}</label>
+    {{formInput
+      systemFields.maneuverDescription
+      enriched=enrichedManeuverDescription
+      value=system.maneuverDescription
+      name="system.maneuverDescription"
+      toggled=true
    }}
-    <div class="form-group">
-      <label>{{localize "PRISMRPG.Label.augmentDescription"}}</label>
-      {{formInput
-        systemFields.augmentDescription
-        enriched=enrichedAugmentDescription
-        value=system.augmentDescription
-        name="system.augmentDescription"
-        toggled=true
-      }}
-    </div>
  </fieldset>

  <fieldset>