From a91eb3d7bd2cc7c4fd5f9fdc8a81f493d79aabf3 Mon Sep 17 00:00:00 2001
From: LeRatierBretonnien <sylvain@lahiette.com>
Date: Thu, 29 Dec 2022 20:30:28 +0100
Subject: [PATCH] Fix powers

---
 modules/hero6-config.js                       | 21 +++++---
 packs/complications.db                        |  0
 packs/perks.db                                |  0
 packs/powers.db                               |  0
 styles/simple.css                             |  4 ++
 system.json                                   | 52 +++++++++----------
 template.json                                 | 12 ++---
 templates/items/item-advantage-sheet.hbs      | 10 ++--
 templates/items/item-complication-sheet.hbs   | 25 +++++----
 templates/items/item-limitation-sheet.hbs     | 10 ++--
 templates/items/item-perk-sheet.hbs           | 12 ++---
 templates/items/item-power-sheet.hbs          | 20 +++++--
 templates/items/item-skill-sheet.hbs          |  4 ++
 templates/items/item-talent-sheet.hbs         |  7 +--
 .../partials/partial-item-description.hbs     |  4 ++
 .../partials/partial-power-equipment-cost.hbs | 14 +++++
 16 files changed, 122 insertions(+), 73 deletions(-)
 create mode 100644 packs/complications.db
 create mode 100644 packs/perks.db
 create mode 100644 packs/powers.db

diff --git a/modules/hero6-config.js b/modules/hero6-config.js
index 4cc89b3..b12a5a4 100644
--- a/modules/hero6-config.js
+++ b/modules/hero6-config.js
@@ -19,14 +19,23 @@ export const Hero6_CONFIG = {
     "custom": "Custom"
   },
   powerEquipmentType: {
-    "adjustement": "Adjustement",
-    "attack": "Attack",
-    "bodyaffecting": "Bodyaffecting",
-    "defense": "Defense",
+    "adjustment": "Adjustment",
     "mental": "Mental",
     "movement": "Movement",
+    "size": "Size",
+    "special": "Special",
+    "standard": "Standard"
+  },
+  powerTypeModifiers : {
+    "none": "None",
+    "attack": "Attack",
+    "automaton": "Automaton",
+    "bodyaffecting": "Bodyaffecting",
+    "defense": "Defense",
+    "sensory": "Sensory"
+  },
+  powerSenseAffecting: {
+    "none": "None",
     "senseaffecting": "Senseaffecting",
-    "sensory": "Sensory",
-    "special": "Special"
   }
 }
\ No newline at end of file
diff --git a/packs/complications.db b/packs/complications.db
new file mode 100644
index 0000000..e69de29
diff --git a/packs/perks.db b/packs/perks.db
new file mode 100644
index 0000000..e69de29
diff --git a/packs/powers.db b/packs/powers.db
new file mode 100644
index 0000000..e69de29
diff --git a/styles/simple.css b/styles/simple.css
index 1cdd25f..57ea0f5 100644
--- a/styles/simple.css
+++ b/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%;
diff --git a/system.json b/system.json
index ff6eb20..316b0a8 100644
--- a/system.json
+++ b/system.json
@@ -21,15 +21,6 @@
   ],
   "license": "LICENSE.txt",
   "packs": [
-    {
-      "type": "Item",
-      "label": "Armors",
-      "name": "armor",
-      "path": "packs/armor.db",
-      "system": "fvtt-hero-system-6",
-      "private": false,
-      "flags": {}
-    },
     {
       "type": "Item",
       "label": "Equipments",
@@ -39,15 +30,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",
-      "name": "currency",
-      "path": "packs/currency.db",
+      "label": "Skills",
+      "name": "skills",
+      "path": "packs/skills.db",
       "system": "fvtt-hero-system-6",
       "private": false,
       "flags": {}
     },
     {
       "type": "Item",
-      "label": "Skills",
-      "name": "skills",
-      "path": "packs/skills.db",
+      "label": "Powers",
+      "name": "powers",
+      "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.3",
   "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.3.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/hro6_welcome_page.webp",
   "id": "fvtt-hero-system-6"
diff --git a/template.json b/template.json
index c23d06b..91fdbb0 100644
--- a/template.json
+++ b/template.json
@@ -192,11 +192,7 @@
       "advantage",
       "limitation",
       "complication",
-      "equipment",
-      "attack",
-      "defense",
-      "maneuver",
-      "movement"
+      "equipment"
     ],
     "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": {}
       }
     },
diff --git a/templates/items/item-advantage-sheet.hbs b/templates/items/item-advantage-sheet.hbs
index e30eba1..10e8d29 100644
--- a/templates/items/item-advantage-sheet.hbs
+++ b/templates/items/item-advantage-sheet.hbs
@@ -13,11 +13,11 @@
 
       {{> 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>
+        <li class="flexrow"><label class="generic-label">Cost</label>
+          <input type="text" class="" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
+        </li>
+      </div>
+      
     </section>
 </form>
diff --git a/templates/items/item-complication-sheet.hbs b/templates/items/item-complication-sheet.hbs
index e0969bb..05ca9c9 100644
--- a/templates/items/item-complication-sheet.hbs
+++ b/templates/items/item-complication-sheet.hbs
@@ -13,17 +13,20 @@
 
       {{> 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>
+        
+        <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}}
+
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+
+      </div>
     </section>
 </form>
diff --git a/templates/items/item-limitation-sheet.hbs b/templates/items/item-limitation-sheet.hbs
index 2dded9f..d7b032a 100644
--- a/templates/items/item-limitation-sheet.hbs
+++ b/templates/items/item-limitation-sheet.hbs
@@ -11,11 +11,11 @@
     {{!-- 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>
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
+
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+
+      </div>
     </section>
 </form>
diff --git a/templates/items/item-perk-sheet.hbs b/templates/items/item-perk-sheet.hbs
index 19aef08..df2ea45 100644
--- a/templates/items/item-perk-sheet.hbs
+++ b/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">
+        <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>
     </section>
 </form>
diff --git a/templates/items/item-power-sheet.hbs b/templates/items/item-power-sheet.hbs
index 09e183e..776c190 100644
--- a/templates/items/item-power-sheet.hbs
+++ b/templates/items/item-power-sheet.hbs
@@ -13,11 +13,21 @@
 
       {{> 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>
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.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>
+
+        {{#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}}
+
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+
+      </div>
     </section>
 </form>
diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs
index 4bdfe65..fd7bbc5 100644
--- a/templates/items/item-skill-sheet.hbs
+++ b/templates/items/item-skill-sheet.hbs
@@ -42,6 +42,10 @@
               {{/if}}
             {{/if}}
 
+            <li class="flexrow"><label class="item-field-label-long">Levels</label>
+              <input type="text" class="item-field-label-medium" name="system.levels" value="{{system.levels}}" data-dtype="Number"/>
+            </li>
+
             <li class="flexrow"><label class="item-field-label-long">Skill Roll points</label>
               <input type="text" class="item-field-label-medium" name="system.skillroll" value="{{system.skillroll}}" data-dtype="Number"/>
             </li>
diff --git a/templates/items/item-talent-sheet.hbs b/templates/items/item-talent-sheet.hbs
index 2dded9f..558ec48 100644
--- a/templates/items/item-talent-sheet.hbs
+++ b/templates/items/item-talent-sheet.hbs
@@ -13,9 +13,10 @@
 
       {{> 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>
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+
+      </div>
+  
     </section>
 </form>
diff --git a/templates/partials/partial-item-description.hbs b/templates/partials/partial-item-description.hbs
index 7853e6f..bbfe3e8 100644
--- a/templates/partials/partial-item-description.hbs
+++ b/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">
diff --git a/templates/partials/partial-power-equipment-cost.hbs b/templates/partials/partial-power-equipment-cost.hbs
index daf7565..eaf4de1 100644
--- a/templates/partials/partial-power-equipment-cost.hbs
+++ b/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>