Fix apv2, WIP

templates/actor/appv2/character-stories.hbs

@@ -35,14 +35,16 @@
   </section>
   <section class="flexcol ">
     <div>
-      <h4>{{ localize 'IDENTITY.notes'}}</h4>
-      {{editor system.identity.biography target="system.identity.biography"
-      button=true owner=owner editable=editable}}
+      <fieldset>
+        <legend><h4>{{ localize 'IDENTITY.notes'}}</h4></legend>
+        {{formInput systemFields.identity.fields.biography enriched=enrichedBiography value=system.identity.biography name="system.identity.biography" toggled=true}}
+      </fieldset>
     </div>
     <div>
-      <h4>{{ localize 'IDENTITY.relations'}}</h4>
-      {{editor system.identity.relations target="system.identity.relations"
-      button=true owner=owner editable=editable}}
+      <fieldset>
+        <legend><h4>{{ localize 'IDENTITY.relations'}}</h4></legend>
+        {{formInput systemFields.identity.fields.relations enriched=enrichedRelations value=system.identity.relations name="system.identity.relations" toggled=true}}
+      </fieldset>
     </div>
   </section>
 </div>

templates/actor/appv2/creature-info.hbs

@@ -39,8 +39,10 @@
   </div>
 
   <div class="grid-span-2">
-    <h4>{{ localize 'IDENTITY.notes' }}</h4>
-    {{editor system.identity.notes target="system.identity.notes" button=true owner=owner editable=editable}}
+    <fieldset>
+      <legend><h4>{{ localize 'IDENTITY.notes' }}</h4></legend>
+      {{formInput systemFields.identity.fields.notes enriched=enrichedNotes value=system.identity.notes name="system.identity.notes" toggled=true}}
+    </fieldset>
   </div>
 
   {{!-- Modes --}}

templates/actor/appv2/creature-main.hbs

@@ -25,9 +25,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.pattern.value" id="system.pattern.value" data-dtype="Number">
-              {{#each ../config.creaturePatternLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.pattern.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each patternOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.pattern.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -41,9 +41,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.role.value" id="system.role.value" data-dtype="Number">
-              {{#each ../config.creatureRoleLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.role.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each roleOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.role.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -59,8 +59,8 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.size.value" id="system.size.value" data-dtype="Number">
-              {{#each ../config.creatureSizeLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.size.value}}selected{{/ife}}>
+              {{#each sizeOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.size.value}}selected{{/ife}}>
                   {{@key}}
                 </option>
               {{/each}}
@@ -76,9 +76,9 @@
             {{#if isEditMode}}
             <select name="system.pack.value" id="system.pack.value" data-dtype="Number">
               <option value="0">{{localize 'VERMINE.none'}}</option>
-              {{#each ../config.creaturePackLevels}}
+              {{#each packOptions}}
                 {{#if @key}}
-                  <option value="{{@key}}" {{#ife @key ../system.pack.value}}selected{{/ife}}>
+                  <option value="{{@key}}" {{#ife @key @root.system.pack.value}}selected{{/ife}}>
                     {{@key}}
                   </option>
                 {{/if}}

templates/actor/appv2/group-info.hbs

@@ -28,8 +28,10 @@
 
     {{!-- Group Notes --}}
     <div class="grid-span-2">
-      <h4>{{ localize 'IDENTITY.notes' }}</h4>
-      {{editor system.identity.notes target="system.identity.notes" button=true owner=owner editable=editable}}
+      <fieldset>
+        <legend><h4>{{ localize 'IDENTITY.notes' }}</h4></legend>
+        {{formInput systemFields.identity.fields.notes enriched=enrichedNotes value=system.identity.notes name="system.identity.notes" toggled=true}}
+      </fieldset>
     </div>
 
     {{!-- Group Abilities (from items) --}}

templates/actor/appv2/npc-main.hbs

@@ -27,9 +27,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.threat.value" id="system.threat.value" data-dtype="Number">
-              {{#each ../config.npcThreatLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.threat.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each npcThreatOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.threat.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -44,9 +44,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.experience.value" id="system.experience.value" data-dtype="Number">
-              {{#each ../config.npcExperienceLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.experience.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each npcExperienceOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.experience.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -61,9 +61,9 @@
           <div class="resource-content">
             {{#if isEditMode}}
             <select name="system.role.value" id="system.role.value" data-dtype="Number">
-              {{#each ../config.npcRoleLevels}}
-                <option value="{{@key}}" {{#ife @key ../system.role.value}}selected{{/ife}}>
-                  {{localize this.label}} ({{@key}})
+              {{#each npcRoleOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.role.value}}selected{{/ife}}>
+                  {{localize label}} ({{@key}})
                 </option>
               {{/each}}
             </select>
@@ -82,8 +82,8 @@
             {{#if isEditMode}}
             <select name="system.identity.totem" id="system.identity.totem" data-dtype="String">
               <option value="">{{ localize 'NONE' }}</option>
-              {{#each ../config.totems}}
-                <option value="{{@key}}" {{#ife @key ../system.identity.totem}}selected{{/ife}}>
+              {{#each totemOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.identity.totem}}selected{{/ife}}>
                   {{localize this}}
                 </option>
               {{/each}}
@@ -99,8 +99,8 @@
             {{#if isEditMode}}
             <select name="system.identity.origin" id="system.identity.origin" data-dtype="String">
               <option value="">{{ localize 'NONE' }}</option>
-              {{#each ../config.origins}}
-                <option value="{{@key}}" {{#ife @key ../system.identity.origin}}selected{{/ife}}>
+              {{#each originOptions}}
+                <option value="{{@key}}" {{#ife @key @root.system.identity.origin}}selected{{/ife}}>
                   {{this}}
                 </option>
               {{/each}}

templates/actor/appv2/npc-notes.hbs

@@ -18,5 +18,8 @@
       {{/if}}
     </div>
   </div>
-  {{editor system.identity.notes target="system.identity.notes" button=true owner=owner editable=editable}}
+  <fieldset>
+    <legend>{{ localize 'IDENTITY.notes' }}</legend>
+    {{formInput systemFields.identity.fields.notes enriched=enrichedNotes value=system.identity.notes name="system.identity.notes" toggled=true}}
+  </fieldset>
 </div>

templates/actor/group/group-vehicles.hbs

@@ -6,24 +6,24 @@
     <div class="item-reliability">{{ localize 'VERMINE.reliability'}}</div>
     <div class="item-controls">
       <a class="item-control item-create" title="Create item"
-        data-type="vehicle"><i class="fas fa-plus"></i></a>
+        data-type="vehicle" data-action="create"><i class="fas fa-plus"></i></a>
     </div>
   </li>
   {{#each vehicles as |item id|}}
   <li class="item flexrow flex-group-center" data-item-id="{{item._id}}">
     <div class="item-name" style="flex:4;">
       <div class="item-image">
-        <a class="item-control item-edit" data-roll-type="item"><img
+        <a data-action="edit"><img
             src="{{item.img}}" title="{{item.name}}" width="24"
             height="24" /></a>
       </div>
-      <a class="item-control item-edit" title="Edit Item">{{item.name}}</a>
+      <a data-action="edit" title="Edit Item">{{item.name}}</a>
     </div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.mobility}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.reliability}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.mobility}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.reliability}}</a></div>
     <div class="item-controls">
-      <a class="item-control item-delete" title="Delete Item"><i
+      <a data-action="delete" title="Delete Item"><i
           class="fas fa-trash"></i></a>
     </div>
   </li>

templates/actor/parts/actor-defenses.hbs

@@ -13,6 +13,7 @@
         class="item-control item-create"
         title="Create item"
         data-type="defense"
+        data-action="create"
       ><i class="fas fa-plus"></i></a>
     </div>
   </li>
@@ -25,28 +26,28 @@
         class="item-name"
         style="flex:4;"
       >
-        <div class="item-image item-control item-roll">
-          <a data-roll-type="item"><img
+        <div class="item-image">
+          <a data-action="roll"><img
               src="{{item.img}}"
               title="{{item.name}}"
               width="24"
               height="24"
             /></a>
         </div>
-        <a title="Edit Item">{{item.name}}</a>
+        <a data-action="edit" title="Edit Item">{{item.name}}</a>
       </div>
-      <div><a class="item-control item-edit" title="Edit Item">{{item.system.level}}</a></div>
-      <div><a class="item-control item-edit" title="Edit Item">{{item.system.mobility}}</a></div>
-      <div><a class="item-control item-edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
-      <div><a class="item-control item-edit" title="Edit Item">{{item.system.reliability}}</a></div>
+      <div><a data-action="edit" title="Edit Item">{{item.system.level}}</a></div>
+      <div><a data-action="edit" title="Edit Item">{{item.system.mobility}}</a></div>
+      <div><a data-action="edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
+      <div><a data-action="edit" title="Edit Item">{{item.system.reliability}}</a></div>
       <div class="item-controls">
         <a
-          class="item-control item-delete"
+          data-action="delete"
           title="Delete Item"
         ><i class="fas fa-trash"></i></a>
         <a
-          class="item-control item-edit"
-          title="Delete Item"
+          data-action="edit"
+          title="Edit Item"
         ><i class="fas fa-edit"></i></a>
       </div>
     </li>

templates/actor/parts/actor-weapons.hbs

@@ -8,7 +8,7 @@
     <div class="item-reliability">{{ localize 'VERMINE.reliability_sm'}}</div>
     <div class="item-controls">
       <a class="item-control item-create" title="Create item"
-        data-type="weapon"><i class="fas fa-plus"></i></a>
+        data-type="weapon" data-action="create"><i class="fas fa-plus"></i></a>
     </div>
   </li>
   {{#each weapons as |item id|}}
@@ -16,32 +16,31 @@
     data-item-id="{{item._id}}">
     <div class="item-name flexrow" style="flex:4;">
       <div class="item-image">
-        <a class="item-control" data-roll-type="item"><img
+        <a data-action="roll"><img
             src="{{item.img}}" title="{{item.name}}" width="24"
             height="24" /></a>
       </div>
-      <a class="item-control item-roll">{{item.name}}</a>
+      <a data-action="roll">{{item.name}}</a>
     </div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.min_range}} /
+    <div><a data-action="edit" title="Edit Item">{{item.system.min_range}} /
         {{item.system.max_range}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">
+    <div><a data-action="edit" title="Edit Item">
         {{#if item.system.damage.addVigor}}
         vigueur+
         {{/if}}
         {{item.system.damage.value}}
         ({{item.system.damage.type}})
       </a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.ammo}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.rarity}}</a></div>
-    <div><a class="item-control item-edit" title="Edit Item">{{item.system.reliability}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.ammo}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
+    <div><a data-action="edit" title="Edit Item">{{item.system.reliability}}</a></div>
     <div class="item-controls">
-      <a class="item-control item-delete" title="Delete Item"><i
+      <a data-action="delete" title="Delete Item"><i
           class="fas fa-trash"></i></a>
-      <a class="item-control item-edit" title="Edit Item"><i
+      <a data-action="edit" title="Edit Item"><i
           class="fas fa-edit"></i></a>
-      <a class="item-control item-roll" title="Roll Item"><i
+      <a data-action="roll" title="Roll Item"><i
           class="fas fa-dice"></i></a>
-
     </div>
   </li>
   {{/each}}