First adaptation pass

templates/armor.hbs

@@ -1,30 +1,127 @@
 <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> 
+  </div>
 
-  {{formField systemFields.armorType value=system.armorType localize=true}}
-  {{formField systemFields.defense value=system.defense}}
-  {{formField systemFields.maximumMovement value=system.maximumMovement}}
-  {{formField systemFields.hp value=system.hp}}
-  {{formField systemFields.damageReduction value=system.damageReduction}}
-  {{formField systemFields.encLoad value=system.encLoad}}
+  {{! Armor Type (Light/Medium/Heavy) }}
+  {{formField
+    systemFields.armorType
+    value=system.armorType
+    localize=true
+    label="PRISMRPG.Label.armorType"
+  }}
 
-  {{formField systemFields.isHelmet value=system.isHelmet}}
-  {{formField systemFields.equipped value=system.equipped}}
+  {{! Armor Class (AC) }}
+  {{formField
+    systemFields.defense
+    value=system.defense
+    label="PRISMRPG.Label.armorClass"
+  }}
 
-  {{formField systemFields.cost value=system.cost}}
-  {{formField systemFields.money value=system.money localize=true}}
+  {{! 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"
+  }}
+
+  {{! Encumbrance Load }}
+  {{formField
+    systemFields.encLoad
+    value=system.encLoad
+    label="PRISMRPG.Label.encumbranceLoad"
+  }}
+
+  {{! Equipment Status }}
+  {{formField
+    systemFields.isHelmet
+    value=system.isHelmet
+    label="PRISMRPG.Label.isHelmet"
+  }}
+  {{formField
+    systemFields.equipped
+    value=system.equipped
+    label="PRISMRPG.Label.equipped"
+  }}
+
+  {{! Prism RPG: Armor Passive }}
+  <fieldset class="armor-passive">
+    <legend>{{localize "PRISMRPG.Label.armorPassive"}}</legend>
+    {{formField
+      systemFields.passive
+      value=system.passive
+      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>
+  </fieldset>
+
+  {{! Prism RPG: Armor Augment }}
+  <fieldset class="armor-augment">
+    <legend>{{localize "PRISMRPG.Label.armorAugment"}}</legend>
+    {{formField
+      systemFields.augment
+      value=system.augment
+      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>
+  </fieldset>
+
+  {{! Cost }}
+  {{formField systemFields.cost value=system.cost label="PRISMRPG.Label.cost"}}
+  {{formField
+    systemFields.money
+    value=system.money
+    localize=true
+    label="PRISMRPG.Label.currency"
+  }}
+
+  {{! Description }}
   <fieldset>
     <legend>{{localize "PRISMRPG.Label.description"}}</legend>
     {{formInput
-    systemFields.description
-    enriched=enrichedDescription
-    value=system.description
-    name="system.description"
-    toggled=true
+      systemFields.description
+      enriched=enrichedDescription
+      value=system.description
+      name="system.description"
+      toggled=true
     }}
   </fieldset>
 </section>

templates/character-main.hbs

@@ -436,21 +436,25 @@
         type="number"
       }}
     </div>
-    <div class="character-characteristic">
-      <span>{{localize "PRISMRPG.Label.luc"}}</span>
-      {{formField
-        systemFields.characteristics.fields.luc.fields.value
-        value=system.characteristics.luc.value
-        disabled=isPlayMode
-        data-char-id="luc"
-      }}
+  </fieldset>
 
-      {{formField
-        systemFields.characteristics.fields.luc.fields.percent
-        value=system.characteristics.luc.percent
-        disabled=isPlayMode
-        type="number"
-      }}
+  {{!-- Sub-Attributes (Prism RPG) --}}
+  <fieldset
+    class="character-subattributes character-subattributes-{{ifThen
+        isPlayMode
+        'play'
+        'edit'
+      }}"
+  >
+    <legend>{{localize "PRISMRPG.Label.subAttributes"}}</legend>
+    <div class="subattributes-grid">
+      {{#each config.SUB_ATTRIBUTES as |subAttr|}}
+        <div class="character-subattribute" data-tooltip="{{localize subAttr.description}}">
+          <span class="subattr-label">{{localize subAttr.label}}</span>
+          <span class="subattr-value">{{lookup (lookup ../system.subAttributes subAttr.id) 'value'}}</span>
+          <span class="subattr-parents">({{#each subAttr.parents}}{{localize (concat "PRISMRPG.Label." this)}}{{#unless @last}}/{{/unless}}{{/each}})</span>
+        </div>
+      {{/each}}
     </div>
   </fieldset>
 

templates/character-skills.hbs

@@ -1,21 +1,90 @@
 <section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="skills" data-group="sheet">
   <div class="main-div">
 
+  {{!-- Core Skill Selection (Prism RPG) --}}
+  <fieldset class="core-skill-selection">
+    <legend data-tooltip="{{localize 'PRISMRPG.Tooltip.coreSkill'}}" data-tooltip-direction="UP">
+      {{localize "PRISMRPG.Label.coreSkill"}}
+    </legend>
+    <div class="core-skill-info">
+      {{#if system.coreSkill.skill}}
+        <div class="selected-core-skill">
+          <span class="core-skill-name">{{localize (concat "PRISMRPG.CoreSkill." system.coreSkill.skill)}}</span>
+          <span class="core-skill-bonus">+5 {{localize "PRISMRPG.Label.basicChecks"}}</span>
+          {{#if system.coreSkill.attributeChoice}}
+            <span class="attribute-bonus">+2 {{localize (concat "PRISMRPG.Label." system.coreSkill.attributeChoice)}}</span>
+          {{/if}}
+          <span class="advanced-checks">{{localize "PRISMRPG.Label.advancedChecksEnabled"}}</span>
+        </div>
+      {{else}}
+        <div class="no-core-skill">
+          <p>{{localize "PRISMRPG.Message.selectCoreSkill"}}</p>
+          <select name="system.coreSkill.skill" {{#if isPlayMode}}disabled{{/if}}>
+            <option value="">{{localize "PRISMRPG.Label.chooseSkill"}}</option>
+            {{#each config.CORE_SKILLS as |skill skillId|}}
+              <option value="{{skillId}}">{{localize skill.label}}</option>
+            {{/each}}
+          </select>
+        </div>
+      {{/if}}
+    </div>
+  </fieldset>
+
+  {{!-- Available Core Skills Reference --}}
+  <fieldset class="core-skills-list">
+    <legend data-tooltip="{{localize 'PRISMRPG.Tooltip.coreSkills'}}" data-tooltip-direction="UP">
+      {{localize "PRISMRPG.Label.availableCoreSkills"}}
+    </legend>
+    <div class="skills-grid">
+      {{#each config.CORE_SKILLS as |skill skillId|}}
+        <div class="core-skill-item {{#if (eq ../system.coreSkill.skill skillId)}}selected{{/if}}"
+             data-skill-id="{{skillId}}">
+          <div class="skill-header">
+            <span class="skill-name">{{localize skill.label}}</span>
+            {{#if (eq ../system.coreSkill.skill skillId)}}
+              <span class="badge-core">{{localize "PRISMRPG.Label.yourCoreSkill"}}</span>
+            {{/if}}
+          </div>
+          <div class="skill-attributes">
+            <span class="attribute-choices-label">{{localize "PRISMRPG.Label.attributeChoices"}}:</span>
+            {{#each skill.attributeChoices as |attr|}}
+              <span class="attribute-choice {{#if (eq ../../system.coreSkill.attributeChoice attr)}}chosen{{/if}}">
+                {{localize (concat "PRISMRPG.Label." attr)}}
+              </span>
+              {{#unless @last}}/{{/unless}}
+            {{/each}}
+          </div>
+        </div>
+      {{/each}}
+    </div>
+  </fieldset>
+
+  {{!-- Skills Items (if any) --}}
   <fieldset>
-    <legend data-tooltip="{{localize " PRISMRPG.Tooltip.skills"}}" data-tooltip-direction="UP">{{localize
-      "PRISMRPG.Label.skills"}}</legend>
+    <legend data-tooltip="{{localize 'PRISMRPG.Tooltip.skills'}}" data-tooltip-direction="UP">
+      {{localize "PRISMRPG.Label.customSkills"}}
+    </legend>
     <div class="skills">
       {{#each skills as |item|}}
-      <div class="skill " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+      <div class="skill {{#if item.system.isCoreSkill}}is-core-skill{{/if}}"
+           data-item-id="{{item.id}}"
+           data-item-uuid="{{item.uuid}}">
         <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
         <div class="name">
           <a class="rollable" data-roll-type="skill" data-roll-key="{{item.id}}">
-              <i class="lf-roll-small fa-duotone fa-solid fa-dice-d10"></i>
+            <i class="lf-roll-small fa-duotone fa-solid fa-dice-d10"></i>
             {{item.name}}
           </a>
         </div>
         <div class="score">
-          +{{item.system.skillTotal}}
+          {{#if item.system.isCoreSkill}}
+            +{{item.system.modifier}}
+            {{#if item.system.canAdvancedCheck}}
+              <span class="advanced-icon" data-tooltip="{{localize 'PRISMRPG.Tooltip.advancedChecks'}}">★</span>
+            {{/if}}
+          {{else}}
+            +0
+          {{/if}}
         </div>
         <div class="controls">
           <a data-tooltip="{{localize 'PRISMRPG.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
@@ -29,8 +98,9 @@
   </fieldset>
 
   <fieldset>
-    <legend data-tooltip="{{localize " PRISMRPG.Tooltip.gifts"}}" data-tooltip-direction="UP">{{localize
-      "PRISMRPG.Label.gifts"}}</legend>
+    <legend data-tooltip="{{localize 'PRISMRPG.Tooltip.gifts'}}" data-tooltip-direction="UP">
+      {{localize "PRISMRPG.Label.gifts"}}
+    </legend>
     <div class="gifts">
       {{#each gifts as |item|}}
       <div class="gift " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
@@ -50,8 +120,9 @@
   </fieldset>
 
   <fieldset>
-    <legend data-tooltip="{{localize " PRISMRPG.Tooltip.vulnerabilities"}}" data-tooltip-direction="UP">{{localize
-      "PRISMRPG.Label.vulnerabilities"}}</legend>
+    <legend data-tooltip="{{localize 'PRISMRPG.Tooltip.vulnerabilities'}}" data-tooltip-direction="UP">
+      {{localize "PRISMRPG.Label.vulnerabilities"}}
+    </legend>
     <div class="vulnerabilities">
       {{#each vulnerabilities as |item|}}
       <div class="vulnerability " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">

templates/miracle.hbs

@@ -1,38 +1,144 @@
 <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.miracleType value=system.miracleType}}
-  {{formField systemFields.level value=system.level}}
-
-  <label>Components</label>
-  <div class="shift-right">
-    {{formField systemFields.components.fields.verbal value=system.components.verbal}}
-    {{formField systemFields.components.fields.somatic value=system.components.somatic}}
-    {{formField systemFields.components.fields.material value=system.components.material}}
-    {{formField systemFields.components.fields.catalyst value=system.components.catalyst}}
-    {{formField systemFields.components.fields.religious value=system.components.religious}}
   </div>
 
-  {{formField systemFields.materialComponent value=system.materialComponent}}
-  {{formField systemFields.catalyst value=system.catalyst}}
+  {{! Prism RPG: Miracle Type }}
+  {{formField
+    systemFields.miracleType
+    value=system.miracleType
+    label="PRISMRPG.Label.miracleType"
+  }}
 
-  <!-- {{formField systemFields.attackRoll value=system.attackRoll}}
-  {{formField systemFields.powerRoll value=system.powerRoll}}-->
+  {{! Prism RPG: APC (Action Point Cost) }}
+  {{formField systemFields.apc value=system.apc label="PRISMRPG.Label.apc"}}
 
-  {{formField systemFields.prayerTime value=system.prayerTime}}
-  {{formField systemFields.miracleRange value=system.miracleRange}}
-  {{formField systemFields.areaAffected value=system.areaAffected}}
-  {{formField systemFields.duration value=system.duration}}
-  {{formField systemFields.savingThrow value=system.savingThrow}}
+  {{! Prism RPG: Faith Cost }}
+  {{formField
+    systemFields.faithCost
+    value=system.faithCost
+    label="PRISMRPG.Label.faithCost"
+  }}
 
+  {{! Prism RPG: Divine Favor }}
+  {{formField
+    systemFields.divineFavor
+    value=system.divineFavor
+    label="PRISMRPG.Label.divineFavor"
+  }}
+
+  {{! Prism RPG: Miracle Augment }}
+  <fieldset class="miracle-augment">
+    <legend>{{localize "PRISMRPG.Label.miracleAugment"}}</legend>
+    {{formField
+      systemFields.augment
+      value=system.augment
+      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>
+  </fieldset>
+
+  {{! Miracle Components (includes Religious) }}
+  <fieldset class="miracle-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"
+      }}
+      {{formField
+        systemFields.components.fields.religious
+        value=system.components.religious
+        label="PRISMRPG.Label.religious"
+      }}
+    </div>
+    {{formField
+      systemFields.materialComponent
+      value=system.materialComponent
+      label="PRISMRPG.Label.materialComponent"
+    }}
+    {{formField
+      systemFields.catalyst
+      value=system.catalyst
+      label="PRISMRPG.Label.catalystDetails"
+    }}
+  </fieldset>
+
+  {{! Miracle Properties }}
+  {{formField
+    systemFields.prayerTime
+    value=system.prayerTime
+    label="PRISMRPG.Label.prayerTime"
+  }}
+  {{formField
+    systemFields.miracleRange
+    value=system.miracleRange
+    label="PRISMRPG.Label.range"
+  }}
+  {{formField
+    systemFields.areaAffected
+    value=system.areaAffected
+    label="PRISMRPG.Label.areaAffected"
+  }}
+  {{formField
+    systemFields.duration
+    value=system.duration
+    label="PRISMRPG.Label.duration"
+  }}
+  {{formField
+    systemFields.savingThrow
+    value=system.savingThrow
+    label="PRISMRPG.Label.savingThrow"
+  }}
+
+  {{! Legacy Level field }}
+  {{formField
+    systemFields.level
+    value=system.level
+    label="PRISMRPG.Label.level"
+  }}
 
-  
   <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>

templates/shield.hbs

@@ -1,67 +1,126 @@
 <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>
 
   <div class="flexrow">
     <div class="align-top">
-      {{formField systemFields.defense value=system.defense}}
 
-      <div class="shift-right">&nbsp;
-      </div>
+      {{! Prism RPG: Shield Type (Buckler/Light/Heavy/Tower) }}
+      {{formField
+        systemFields.shieldType
+        value=system.shieldType
+        localize=true
+        label="PRISMRPG.Label.shieldType"
+      }}
 
-      {{formField systemFields.hascover value=system.hascover}}
+      {{! Prism RPG: Block APC (Action Point Cost) }}
+      {{formField
+        systemFields.apc
+        value=system.apc
+        label="PRISMRPG.Label.blockAPC"
+      }}
+
+      {{! Prism RPG: Shield Rating (SR) }}
+      {{formField
+        systemFields.sr
+        value=system.sr
+        label="PRISMRPG.Label.shieldRating"
+      }}
+
+      {{! Defense Bonus }}
+      {{formField
+        systemFields.defense
+        value=system.defense
+        label="PRISMRPG.Label.defenseBonus"
+      }}
+
+      {{formField
+        systemFields.equipped
+        value=system.equipped
+        label="PRISMRPG.Label.equipped"
+      }}
 
-      {{#if system.hascover}}
-      <label>Cover vs ranged attacks</label>
-      <div class="shift-right">
-        <label>Standing </label>
-        <div class="flexrow">{{formField systemFields.standing.fields.min value=system.standing.min}} &nbsp;...&nbsp;30
-        </div>
-      </div>
-      <div class="shift-right">
-        <label>Crouching</label>
-        <div class="flexrow">{{formField systemFields.crouching.fields.min value=system.crouching.min}}
-          &nbsp;...&nbsp;30</div>
-      </div>
-      {{/if}}
     </div>
 
     <div class="align-top">
-      <!-- <label>Destruction</label>
-      <div class="shift-right">
-        {{formField systemFields.destruction.fields.bashing value=system.destruction.bashing}}
-        {{formField systemFields.destruction.fields.slashing value=system.destruction.slashing}}
-        {{formField systemFields.destruction.fields.piercing value=system.destruction.piercing}}
-      </div>
 
-      <label>Auto-Destruction</label>
-      <div class="shift-right">
-        {{formField systemFields.autodestruction.fields.bashing value=system.autodestruction.bashing}}
-        {{formField systemFields.autodestruction.fields.slashing value=system.autodestruction.slashing}}
-        {{formField systemFields.autodestruction.fields.piercing value=system.autodestruction.piercing}}
-      </div> -->
+      {{formField
+        systemFields.encLoad
+        value=system.encLoad
+        label="PRISMRPG.Label.encumbranceLoad"
+      }}
 
-      {{formField systemFields.equipped value=system.equipped}}
-
-      {{formField systemFields.encLoad value=system.encLoad}}
-
-      {{formField systemFields.cost value=system.cost}}
-      {{formField systemFields.money value=system.money localize=true}}
+      {{formField
+        systemFields.cost
+        value=system.cost
+        label="PRISMRPG.Label.cost"
+      }}
+      {{formField
+        systemFields.money
+        value=system.money
+        localize=true
+        label="PRISMRPG.Label.currency"
+      }}
 
     </div>
   </div>
 
+  {{! Prism RPG: Block Augment }}
+  <fieldset class="shield-block-augment">
+    <legend>{{localize "PRISMRPG.Label.blockAugment"}}</legend>
+    {{formField
+      systemFields.blockAugment
+      value=system.blockAugment
+      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"
+    }}
+    <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>
     <legend>{{localize "PRISMRPG.Label.description"}}</legend>
     {{formInput
-    systemFields.description
-    enriched=enrichedDescription
-    value=system.description
-    name="system.description"
-    toggled="false"
+      systemFields.description
+      enriched=enrichedDescription
+      value=system.description
+      name="system.description"
+      toggled="false"
     }}
   </fieldset>
 </section>

templates/skill.hbs

@@ -2,32 +2,68 @@
   <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.category value=system.category localize=true}}
-  {{formField systemFields.base value=system.base}}
-  {{formField systemFields.bonus value=system.bonus}}
-
-  {{formField systemFields.classesCost.fields.fighter value=system.classesCost.fighter}}
-  {{formField systemFields.classesCost.fields.rogue value=system.classesCost.rogue}}
-  {{formField systemFields.classesCost.fields.ranger value=system.classesCost.ranger}}
-  {{formField systemFields.classesCost.fields.cleric value=system.classesCost.cleric}}
-  {{formField systemFields.classesCost.fields.magicuser value=system.classesCost.magicuser}}
-  
-  {{#if (eq system.category "weapon")}}
-    {{formField systemFields.weaponClass value=system.weaponClass localize=true}}
-    <span class="flexrow">
-      <span><strong>Available Bonus : {{system.availableBonus}}</strong></span>
-    </span>
-    {{formField systemFields.weaponBonus.fields.attack value=system.weaponBonus.attack}}
-    {{formField systemFields.weaponBonus.fields.defense value=system.weaponBonus.defense}}
-    {{formField systemFields.weaponBonus.fields.damage value=system.weaponBonus.damage}}
-  {{/if}}
-  
-  <div class="total flexrow">
-    <legend>{{localize "PRISMRPG.Label.total"}}</legend>
-    {{system.skillTotal}}
   </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>
+    <input type="checkbox" name="system.isCoreSkill" {{checked system.isCoreSkill}} />
+    <p class="hint">{{localize "PRISMRPG.Hint.isCoreSkill"}}</p>
+  </div>
+
+  {{#if system.isCoreSkill}}
+    {{!-- Attribute Bonus Selection --}}
+    <div class="form-group">
+      <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}}
+      </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 --}}
+  <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}}

templates/spell.hbs

@@ -1,40 +1,171 @@
 <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.level value=system.level}}
-  {{formField systemFields.cost value=system.cost}}
-
-  <label>Components</label>
-  <div class="shift-right">
-    {{formField systemFields.components.fields.verbal value=system.components.verbal}}
-    {{formField systemFields.components.fields.somatic value=system.components.somatic}}
-    {{formField systemFields.components.fields.material value=system.components.material}}
-    {{formField systemFields.components.fields.catalyst value=system.components.catalyst}}
   </div>
 
-  {{formField systemFields.materialComponent value=system.materialComponent}}
-  {{formField systemFields.catalyst value=system.catalyst}}
+  {{! Prism RPG: Mana Cost }}
+  {{formField
+    systemFields.manaCost
+    value=system.manaCost
+    label="PRISMRPG.Label.manaCost"
+  }}
 
-  <!-- {{formField systemFields.attackRoll value=system.attackRoll}}
-  {{formField systemFields.powerRoll value=system.powerRoll}} -->
+  {{! Prism RPG: Mana Upkeep }}
+  {{formField
+    systemFields.manaUpkeep
+    value=system.manaUpkeep
+    label="PRISMRPG.Label.manaUpkeep"
+  }}
 
-  {{formField systemFields.memorized value=system.memorized}}
+  {{! Prism RPG: APC (Action Point Cost) }}
+  {{formField systemFields.apc value=system.apc label="PRISMRPG.Label.apc"}}
 
-  {{formField systemFields.castingTime value=system.castingTime}}
-  {{formField systemFields.spellRange value=system.spellRange}}
-  {{formField systemFields.areaAffected value=system.areaAffected}}
-  {{formField systemFields.duration value=system.duration}}
-  {{formField systemFields.savingThrow value=system.savingThrow}}
-  {{formField systemFields.extraAetherPoints value=system.extraAetherPoints}}
-  {{formField systemFields.criticalType value=system.criticalType}}
+  {{! Prism RPG: Prism Color }}
+  {{formField
+    systemFields.color
+    value=system.color
+    localize=true
+    label="PRISMRPG.Label.prismColor"
+  }}
 
+  {{! 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>
+  </fieldset>
+
+  {{! Prism RPG: Spell Ascension }}
+  <fieldset class="spell-ascension">
+    <legend>{{localize "PRISMRPG.Label.spellAscension"}}</legend>
+    <div class="form-group">
+      <label>{{localize "PRISMRPG.Label.canAscend"}}</label>
+      <input
+        type="checkbox"
+        name="system.canAscend"
+        {{checked system.canAscend}}
+      />
+      <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>
+    {{/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
+    label="PRISMRPG.Label.memorized"
+  }}
+  {{formField
+    systemFields.castingTime
+    value=system.castingTime
+    label="PRISMRPG.Label.castingTime"
+  }}
+  {{formField
+    systemFields.spellRange
+    value=system.spellRange
+    label="PRISMRPG.Label.range"
+  }}
+  {{formField
+    systemFields.areaAffected
+    value=system.areaAffected
+    label="PRISMRPG.Label.areaAffected"
+  }}
+  {{formField
+    systemFields.duration
+    value=system.duration
+    label="PRISMRPG.Label.duration"
+  }}
+  {{formField
+    systemFields.savingThrow
+    value=system.savingThrow
+    label="PRISMRPG.Label.savingThrow"
+  }}
+  {{formField
+    systemFields.keywords
+    value=system.keywords
+    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 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>

templates/weapon.hbs

@@ -1,70 +1,109 @@
 <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>
 
   <div class="flexrow">
     <div class="align-top">
 
-      {{formField systemFields.weaponType value=system.weaponType localize=true}}
-      {{formField systemFields.weaponClass value=system.weaponClass localize=true}}
-      
-      <label>Damage Type</label>
+      {{! Prism RPG: Weapon Type (Light/One-Handed/Heavy/Projectile) }}
+      {{formField
+        systemFields.weaponType
+        value=system.weaponType
+        localize=true
+        label="PRISMRPG.Label.weaponType"
+      }}
+
+      {{! Prism RPG: Weapon Group (6 groups) }}
+      {{formField
+        systemFields.weaponGroup
+        value=system.weaponGroup
+        localize=true
+        label="PRISMRPG.Label.weaponGroup"
+      }}
+
+      {{! Prism RPG: APC (Action Point Cost) }}
+      {{formField systemFields.apc value=system.apc label="PRISMRPG.Label.apc"}}
+
+      {{! Damage }}
+      {{formField
+        systemFields.damage
+        value=system.damage
+        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}}
-        {{formField systemFields.damageType.fields.typeB value=system.damageType.typeB}}
-        {{formField systemFields.damageType.fields.typeS value=system.damageType.typeS}}
+        {{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>
 
-      <label>Damage</label>
-      <div class="shift-right">
-        {{formField systemFields.damage.fields.damageS value=system.damage.damageS}}
-        {{formField systemFields.damage.fields.damageM value=system.damage.damageM}}
-      </div>
+      {{formField
+        systemFields.applyStrengthDamageBonus
+        value=system.applyStrengthDamageBonus
+        localize=true
+      }}
 
-      {{formField systemFields.applyStrengthDamageBonus value=system.applyStrengthDamageBonus localize=true}}
-    
       {{formField systemFields.hands value=system.hands localize=true}}
-
-      {{#if (eq system.weaponType "melee")}}
-        {{formField systemFields.isAgile value=system.isAgile localize=true}}
-        {{formField systemFields.defenseMax value=system.defenseMax}}
-        {{formField systemFields.combatProgressionDice value=system.combatProgressionDice}}
-       {{/if}}
-
-      {{#if (eq system.weaponType "ranged")}}
-        <label>Speed</label>
-        <div class="shift-right">
-          {{formField systemFields.speed.fields.simpleAim value=system.speed.simpleAim}}
-          {{formField systemFields.speed.fields.carefulAim value=system.speed.carefulAim}}
-          {{formField systemFields.speed.fields.focusedAim value=system.speed.focusedAim}}
-        </div>
-      {{/if}}
-    </div>
-    <div class="align-top">
-      {{#if (eq system.weaponType "ranged")}}
-
-        {{formField systemFields.defense value=system.defense}}
-
-        <label>Range</label>
-        <div class="shift-right">
-          {{formField systemFields.weaponRange.fields.pointBlank value=system.weaponRange.pointBlank}}
-          {{formField systemFields.weaponRange.fields.short value=system.weaponRange.short}}
-          {{formField systemFields.weaponRange.fields.medium value=system.weaponRange.medium}}
-          {{formField systemFields.weaponRange.fields.long value=system.weaponRange.long}}
-          {{formField systemFields.weaponRange.fields.extreme value=system.weaponRange.extreme}}
-          {{formField systemFields.weaponRange.fields.outOfSkill value=system.weaponRange.outOfSkill}}
-        </div>
-      {{/if}}
-
       {{formField systemFields.equipped value=system.equipped}}
 
-      <label>Bonuses</label>
+    </div>
+    <div class="align-top">
+
+      {{! Prism RPG: Projectile Properties }}
+      {{#if system.isProjectile}}
+        {{formField
+          systemFields.isProjectile
+          value=system.isProjectile
+          label="PRISMRPG.Label.isProjectile"
+        }}
+        {{formField
+          systemFields.range
+          value=system.range
+          label="PRISMRPG.Label.range"
+        }}
+        {{formField
+          systemFields.reloadAPC
+          value=system.reloadAPC
+          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}}
+        {{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}}
@@ -74,14 +113,89 @@
     </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
+      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>
+  </fieldset>
+
+  {{! Prism RPG: Weapon Maneuver }}
+  <fieldset class="weapon-maneuver">
+    <legend>{{localize "PRISMRPG.Label.weaponManeuver"}}</legend>
+    {{formField
+      systemFields.maneuver
+      value=system.maneuver
+      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"
+    }}
+    <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>
     <legend>{{localize "PRISMRPG.Label.description"}}</legend>
     {{formInput
-    systemFields.description
-    enriched=enrichedDescription
-    value=system.description
-    name="system.description"
-    toggled=true
+      systemFields.description
+      enriched=enrichedDescription
+      value=system.description
+      name="system.description"
+      toggled=true
     }}
   </fieldset>
 </section>