Item review and commit

modules/hero6-config.js

@@ -19,14 +19,23 @@ export const Hero6_CONFIG = {
     "custom": "Custom"
   },
   powerEquipmentType: {
-    "adjustement": "Adjustement",
+    "adjustment": "Adjustment",
-    "attack": "Attack",
-    "bodyaffecting": "Bodyaffecting",
-    "defense": "Defense",
     "mental": "Mental",
     "movement": "Movement",
-    "senseaffecting": "Senseaffecting",
+    "size": "Size",
-    "sensory": "Sensory",
+    "special": "Special",
-    "special": "Special"
+    "standard": "Standard"
+  },
+  powerTypeModifiers : {
+    "none": "None",
+    "attack": "Attack",
+    "automaton": "Automaton",
+    "bodyaffecting": "Body-Affecting",
+    "defense": "Defense",
+    "sensory": "Sensory"
+  },
+  powerSenseAffecting: {
+    "none": "None",
+    "senseaffecting": "Sense-Affecting",
   }
 }

modules/hero6-utility.js

@@ -43,7 +43,7 @@ export class Hero6Utility {
       return __locationNames[key]      
     })
     Handlebars.registerHelper('isSkillCustom', function (key) {
-      if (key == "custom" || key == "background" || key == "combat" ) {
+      if (key == "custom" || key == "background"  ) {
         return true;
       }
       return false
@@ -158,6 +158,7 @@ export class Hero6Utility {
       'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs',
     ]
     return loadTemplates(templatePaths);
   }

styles/simple.css

@@ -259,6 +259,10 @@ table { border: 1px solid #7a7971;}
   object-position: 50% 0;
 }
 
+form .form-group label {
+  color: rgba(66, 66, 64, 0.95);
+}
+
 .button-img {
   vertical-align: baseline;
   width: 8%;

system.json

@@ -23,31 +23,13 @@
   "packs": [
     {
       "type": "Item",
-      "label": "Armors",
+      "label": "Equipment",
-      "name": "armor",
-      "path": "packs/armor.db",
-      "system": "fvtt-hero-system-6",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Equipments",
       "name": "equipment",
       "path": "packs/equipment.db",
       "system": "fvtt-hero-system-6",
       "private": false,
       "flags": {}
     },
-    {
-      "type": "Item",
-      "label": "Shields",
-      "name": "shields",
-      "path": "packs/shields.db",
-      "system": "fvtt-hero-system-6",
-      "private": false,
-      "flags": {}
-    },
     {
       "type": "Item",
       "label": "Weapons",
@@ -59,18 +41,36 @@
     },
     {
       "type": "Item",
-      "label": "Currency",
+      "label": "Skills",
-      "name": "currency",
+      "name": "skills",
-      "path": "packs/currency.db",
+      "path": "packs/skills.db",
       "system": "fvtt-hero-system-6",
       "private": false,
       "flags": {}
     },
     {
       "type": "Item",
-      "label": "Skills",
+      "label": "Powers",
-      "name": "skills",
+      "name": "powers",
-      "path": "packs/skills.db",
+      "path": "packs/powers.db",
+      "system": "fvtt-hero-system-6",
+      "private": false,
+      "flags": {}
+    },
+    {
+      "type": "Item",
+      "label": "Complications",
+      "name": "complications",
+      "path": "packs/complications.db",
+      "system": "fvtt-hero-system-6",
+      "private": false,
+      "flags": {}
+    },
+    {
+      "type": "Item",
+      "label": "Perks",
+      "name": "perks",
+      "path": "packs/perks.db",
       "system": "fvtt-hero-system-6",
       "private": false,
       "flags": {}
@@ -82,7 +82,7 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.2",
+  "version": "10.0.4",
   "compatibility": {
     "minimum": "10",
     "verified": "10",
@@ -90,7 +90,7 @@
   },
   "title": "Hero System v6 for FoundrtVTT (Official)",
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.2.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.4.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/hro6_welcome_page.webp",
   "id": "fvtt-hero-system-6"

template.json

@@ -192,11 +192,7 @@
       "advantage",
       "limitation",
       "complication",
-      "equipment",
+      "equipment"
-      "attack",
-      "defense",
-      "maneuver",
-      "movement"
     ],
     "templates": {
       "common": {
@@ -212,13 +208,17 @@
       },
       "power": {
         "displayname": "",
-        "modifiers": [],
         "petype": "",
+        "typemodifier": "",
+        "senseaffecting": false,
+        "modifiers": [],
         "levels": 0,
         "quantity": 0,
         "range": "",
         "damage": "",
         "endurance": 0,  
+        "hasroll": false,
+        "roll": 0,  
         "items": {}
       }
     },
@@ -236,7 +236,7 @@
       "skilltype": "agility",
       "characteristic": "",
       "base": "",
-      "skillroll": 0,
+      "levelscost": 0,
       "levels": 0,
       "templates": [
         "common"
@@ -309,12 +309,14 @@
       "velValue": 0
     },
     "perk": {
+      "hasroll": false,
       "roll": 0,
       "templates": [
         "common"
       ]
     },
     "talent": {
+      "hasroll": false,
       "roll": 0,
       "templates": [
         "common"

templates/items/item-advantage-sheet.hbs

@@ -13,11 +13,13 @@
 
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
-      <li class="flexrow"><label class="generic-label">Cost</label>
-        <input type="text" class="" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
-      </li>
-
       <div class="tab details" data-group="primary" data-tab="details">
-        </div>
+        <ul>
+          <li class="flexrow"><label class="generic-label">Cost</label>
+            <input type="text" class="" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
+          </li>
+        </ul>
+      </div>
+      
     </section>
 </form>

templates/items/item-complication-sheet.hbs

@@ -13,17 +13,13 @@
 
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
-      <li class="flexrow"><label class="item-field-label-long">Has Roll ?</label>
-        <label class="item-field-label-medium"><input type="checkbox" name="system.hasroll" {{checked system.hasroll}}/></label>
-      </li>
-
-      <li class="flexrow"><label class="item-field-label-long">Roll</label>
-        <input type="text" class="item-field-label-medium" name="system.roll" value="{{system.roll}}" data-dtype="Number"/>
-      </li>
-
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
-
       <div class="tab details" data-group="primary" data-tab="details">
-        </div>
+        
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
+      </div>
     </section>
 </form>

templates/items/item-limitation-sheet.hbs

@@ -11,11 +11,13 @@
     {{!-- Sheet Body --}}
     <section class="sheet-body">
 
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
-
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
-
       <div class="tab details" data-group="primary" data-tab="details">
-        </div>
+        
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
+        
+      </div>
     </section>
 </form>

templates/items/item-perk-sheet.hbs

@@ -13,13 +13,13 @@
 
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
-      <li class="flexrow"><label class="item-field-label-long">Roll</label>
-        <input type="text" class="item-field-label-medium" name="system.roll" value="{{system.roll}}" data-dtype="Number"/>
-      </li>
-
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
-
       <div class="tab details" data-group="primary" data-tab="details">
-        </div>
+
+        <ul>
+         {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
+      </div>
     </section>
 </form>

templates/items/item-power-sheet.hbs

@@ -13,11 +13,15 @@
 
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
-
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
-
       <div class="tab details" data-group="primary" data-tab="details">
-        </div>
+
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
+
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
+      </div>
     </section>
 </form>

templates/items/item-skill-sheet.hbs

@@ -42,10 +42,16 @@
               {{/if}}
             {{/if}}
 
-            <li class="flexrow"><label class="item-field-label-long">Skill Roll points</label>
+            <li class="flexrow"><label class="item-field-label-long">Levels</label>
-              <input type="text" class="item-field-label-medium" name="system.skillroll" value="{{system.skillroll}}" data-dtype="Number"/>
+              <input type="text" class="item-field-label-medium" name="system.levels" value="{{system.levels}}" data-dtype="Number"/>
             </li>
 
+            {{#if (ne system.skilltype "combat")}}
+              <li class="flexrow"><label class="item-field-label-long">Levels Cost</label>
+                <input type="text" class="item-field-label-medium" name="system.levelscost" value="{{system.levelscost}}" data-dtype="Number"/>
+              </li>
+            {{/if}}
+
             {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
 
           </ul>

templates/items/item-talent-sheet.hbs

@@ -13,9 +13,15 @@
 
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
-
       <div class="tab details" data-group="primary" data-tab="details">
-        </div>
+
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+          
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
+
+      </div>
+  
     </section>
 </form>

templates/partials/partial-item-description.hbs

@@ -1,4 +1,8 @@
 <div class="tab description" data-group="primary" data-tab="description">
+  <div class="flexrow">
+    <label class="item-field-label-medium">Display name</label>
+    <input type="text" class="" name="system.displayname" value="{{system.displayname}}" data-dtype="string"/>
+  </div>
   <div>
     <label class="generic-label">Description</label>
     <div class="medium-editor item-text-long-line">

templates/partials/partial-item-hasroll.hbs

@@ -0,0 +1,9 @@
+        <li class="flexrow"><label class="item-field-label-long">Has Roll ?</label>
+          <label class="item-field-label-medium"><input type="checkbox" name="system.hasroll" {{checked system.hasroll}}/></label>
+        </li>
+
+        {{#if system.hasroll}}
+        <li class="flexrow"><label class="item-field-label-long">Roll</label>
+          <input type="text" class="item-field-label-medium" name="system.roll" value="{{system.roll}}" data-dtype="Number"/>
+        </li>
+        {{/if}}

templates/partials/partial-power-equipment-cost.hbs

@@ -8,6 +8,20 @@
         </select> 
       </li>
 
+      <li class="flexrow"><label class="item-field-label-long">Type Modifier</label>
+        <select class="item-field-label-long" type="text" name="system.typemodifier" value="{{system.typemodifier}}" data-dtype="String">
+          {{#select system.typemodifier}}
+            {{#each config.powerTypeModifiers as |name key|}}
+              <option value="{{key}}">{{name}}</option>
+            {{/each}}
+          {{/select}}
+        </select> 
+      </li>
+
+      <li class="flexrow"><label class="item-field-label-long">Is sense affecting ?</label>
+        <label class="item-field-label-medium"><input type="checkbox" name="system.senseaffecting" {{checked system.senseaffecting}}/></label>
+      </li>
+
       <li class="flexrow"><label class="item-field-label-long">Range</label>
         <input type="text" class="item-field-label-medium" name="system.range" value="{{system.range}}" data-dtype="String"/>
       </li>