Fix skills and multiple maneuvers per weapons

templates/skill.hbs

@@ -17,13 +17,11 @@
       <label>{{localize "PRISMRPG.Label.attributeBonusChoice"}}</label>
       <select name="system.attributeBonus">
         <option value="">{{localize "PRISMRPG.Label.selectAttribute"}}</option>
-        {{#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}}
+        {{#each config.CHARACTERISTICS}}
+          <option value="{{@key}}" {{#if (eq ../system.attributeBonus @key)}}selected{{/if}}>
+            {{localize this.label}}
+          </option>
+        {{/each}}
       </select>
       <p class="hint">{{localize "PRISMRPG.Hint.attributeBonus"}}</p>
     </div>

templates/weapon.hbs

@@ -113,23 +113,42 @@
     }}
   </fieldset>
 
-  {{! Prism RPG: Weapon Maneuver }}
-  <fieldset class="weapon-maneuver">
-    <legend>{{localize "PRISMRPG.Label.weaponManeuver"}}</legend>
-    {{formField
-      systemFields.maneuver
-      value=system.maneuver
-      localize=true
-      label="PRISMRPG.Label.maneuverName"
-    }}
-    <label>{{localize "PRISMRPG.Label.maneuverDescription"}}</label>
-    {{formInput
-      systemFields.maneuverDescription
-      enriched=enrichedManeuverDescription
-      value=system.maneuverDescription
-      name="system.maneuverDescription"
-      toggled=true
-    }}
+  {{! Prism RPG: Weapon Maneuvers }}
+  <fieldset class="weapon-maneuvers">
+    <legend>
+      {{localize "PRISMRPG.Label.weaponManeuvers"}}
+      <button type="button" data-action="add-maneuver" data-tooltip="{{localize 'PRISMRPG.Label.addManeuver'}}">
+        <i class="fas fa-plus"></i>
+      </button>
+    </legend>
+
+    {{#each enrichedManeuvers}}
+      <div class="maneuver-item" data-maneuver-index="{{@index}}">
+        <div class="maneuver-header">
+          {{formInput
+            ../systemFields.maneuvers.element.fields.name
+            value=this.name
+            name=(concat "system.maneuvers." @index ".name")
+            placeholder=(localize "PRISMRPG.Label.maneuverName")
+          }}
+          <button type="button" data-action="delete-maneuver" data-tooltip="{{localize 'PRISMRPG.Label.deleteManeuver'}}">
+            <i class="fas fa-trash"></i>
+          </button>
+        </div>
+        <label>{{localize "PRISMRPG.Label.maneuverDescription"}}</label>
+        {{formInput
+          ../systemFields.maneuvers.element.fields.description
+          enriched=this.enrichedDescription
+          value=this.description
+          name=(concat "system.maneuvers." @index ".description")
+          toggled=true
+        }}
+      </div>
+    {{/each}}
+
+    {{#unless enrichedManeuvers.length}}
+      <p class="hint">{{localize "PRISMRPG.Hint.noManeuvers"}}</p>
+    {{/unless}}
   </fieldset>
 
   <fieldset>