Item review and commit

Fix powers
Fixes perks
2023-01-04 22:43:01 +01:00 · 2022-12-29 20:30:28 +01:00 · 2022-12-28 10:31:07 +01:00 · 2022-12-28 10:30:56 +01:00
20 changed files with 260 additions and 111 deletions
--- a/modules/hero6-config.js
+++ b/modules/hero6-config.js
@ -4,10 +4,11 @@ export const Hero6_CONFIG = {
  rollCharac  : {
    "str": "Strength",
    "dex": "Dexterity",
-    "pre": "Presence",
-    "int": "Intelligence",
    "con": "Constitution",
-    "ego": "Ego"
+    "int": "Intelligence",
+    "ego": "Ego",
+    "pre": "Presence",
+    "manual": "Manual",
  },
  skillType: {
    "agility": "Agility",
@ -15,7 +16,26 @@ export const Hero6_CONFIG = {
    "intellect": "Intellect" ,
    "background": "Background" ,
    "combat": "Combat" ,
+    "custom": "Custom"
+  },
+  powerEquipmentType: {
+    "adjustment": "Adjustment",
+    "mental": "Mental",
+    "movement": "Movement",
+    "size": "Size",
+    "special": "Special",
+    "standard": "Standard"
+  },
+  powerTypeModifiers : {
+    "none": "None",
+    "attack": "Attack",
+    "automaton": "Automaton",
+    "bodyaffecting": "Body-Affecting",
+    "defense": "Defense",
+    "sensory": "Sensory"
+  },
+  powerSenseAffecting: {
+    "none": "None",
+    "senseaffecting": "Sense-Affecting",
  }
-
-
 }
--- a/modules/hero6-utility.js
+++ b/modules/hero6-utility.js
@ -40,7 +40,13 @@ export class Hero6Utility {
      return parseInt(a) * parseInt(b);
    })
    Handlebars.registerHelper('locationLabel', function (key) {
-      return __locationNames[key]
+      return __locationNames[key]      
+    })
+    Handlebars.registerHelper('isSkillCustom', function (key) {
+      if (key == "custom" || key == "background"  ) {
+        return true;
+      }
+      return false
    })
    

@ -149,7 +155,10 @@ export class Hero6Utility {
      'systems/fvtt-hero-system-6/templates/partials/partial-options-abilities.hbs',
      'systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs',
      'systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs',
-      'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs'
+      '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);
  }
--- a/packs/complications.db
+++ b/packs/complications.db
--- a/packs/perks.db
+++ b/packs/perks.db
--- a/packs/powers.db
+++ b/packs/powers.db
--- 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%;
--- a/system.json
+++ b/system.json
@ -23,31 +23,13 @@
  "packs": [
    {
      "type": "Item",
-      "label": "Armors",
-      "name": "armor",
-      "path": "packs/armor.db",
-      "system": "fvtt-hero-system-6",
-      "private": false,
-      "flags": {}
-    },
-    {
-      "type": "Item",
-      "label": "Equipments",
+      "label": "Equipment",
      "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",
-      "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.1",
+  "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.1.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"
--- a/template.json
+++ b/template.json
@ -24,7 +24,9 @@
          "str": {
            "label": "Strength",
            "value": 10,
-            "base": 10
+            "base": 10,
+            "realcost": 0,
+            "activecost": 0
          },
          "dex": {
            "label": "Dexterity",
@ -91,12 +93,20 @@
          "pd": {
            "label": "PD",
            "value": 2,
-            "base": 2
+            "base": 2,
+            "pd_nonresistant_total": 0,
+            "pd_resistant_toal": 0,
+            "pd_resistant_primary": 0,
+            "pd_resistant_secondary": 0
          },
          "ed": {
            "label": "ED",
            "value": 2,
-            "base": 2
+            "base": 2,
+            "ed_nonresistant_total": 0,
+            "ed_resistant_toal": 0,
+            "ed_resistant_primary": 0,
+            "ed_resistant_secondary": 0
          },
          "rec": {
            "label": "REC",
@ -149,7 +159,11 @@
          "leaping": {
            "label": "Leaping",
            "value": 4,
-            "base": 4
+            "base": 4,
+            "leaping_horizontal_base": 0,
+            "leaping_horizontal_total": 0,
+            "leaping_vertical_base": 0,
+            "leaping_vertical_total": 0
          },
          "flying": {
            "label": "Flying",
@ -178,28 +192,33 @@
      "advantage",
      "limitation",
      "complication",
-      "equipment",
-      "attack",
-      "defense",
-      "maneuver",
-      "movement"
+      "equipment"
    ],
    "templates": {
      "common": {
+        "displayname": "",
        "description": "",
+        "notes": "",
        "effects": "",
        "cost": "",
+        "activecost": 0,
+        "basecost": 0,
        "value": 0,
        "modifiers": []
      },
      "power": {
-        "description": "",
-        "cost": "",
+        "displayname": "",
+        "petype": "",
+        "typemodifier": "",
+        "senseaffecting": false,
        "modifiers": [],
-        "type": "",
-        "effect": 0,
        "levels": 0,
-        "end": 0,
+        "quantity": 0,
+        "range": "",
+        "damage": "",
+        "endurance": 0,  
+        "hasroll": false,
+        "roll": 0,  
        "items": {}
      }
    },
@ -214,10 +233,10 @@
      ]
    },
    "skill": {
-      "skilltype": "",
+      "skilltype": "agility",
      "characteristic": "",
-      "base": 0,
-      "skillroll": 0,
+      "base": "",
+      "levelscost": 0,
      "levels": 0,
      "templates": [
        "common"
@ -226,14 +245,16 @@
    },
    "power": {
      "templates": [
+        "common",
        "power"
      ]
    },
    "equipment": {
      "templates": [
+        "common",
        "power"
      ],
-      "quantity": 1,
+      "value": 0,
      "weight": 0,
      "moneycost": 0
    },
@ -288,21 +309,31 @@
      "velValue": 0
    },
    "perk": {
+      "hasroll": false,
+      "roll": 0,
      "templates": [
        "common"
      ]
    },
    "talent": {
+      "hasroll": false,
+      "roll": 0,
      "templates": [
        "common"
      ]
    },
    "complication": {
+      "hasroll": false,
+      "roll": 0,
      "templates": [
        "common"
      ]
    },
    "martialart": {
+      "maneuver_phase": 0,
+      "maneuver_ocv": 0,
+      "maneuver_dcv": 0,
+      "maneuver_effect": "",
      "templates": [
        "common"
      ]
--- a/templates/items/item-advantage-sheet.hbs
+++ b/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>
--- a/templates/items/item-complication-sheet.hbs
+++ b/templates/items/item-complication-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>
+          {{> 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>
--- a/templates/items/item-equipment-sheet.hbs
+++ b/templates/items/item-equipment-sheet.hbs
@ -15,18 +15,22 @@

    <div class="tab details" data-group="primary" data-tab="details">
      <ul>
-          <li class="flexrow"><label class="generic-label">Equipped ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked system.equipped}}/></label>
+
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
+
+          <li class="flexrow"><label class="item-field-label-long">Equipped ?</label>
+            <label class="item-field-label-medium"><input type="checkbox" name="system.equipped" {{checked system.equipped}}/></label>
          </li>
-          <li class="flexrow"><label class="generic-label">Quantity</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
+
+          <li class="flexrow"><label class="item-field-label-long">Weight</label>
+            <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.weight" value="{{system.weight}}" data-dtype="Number"/>
          </li>
-          <li class="flexrow"><label class="generic-label">Weight</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.weight" value="{{system.weight}}" data-dtype="Number"/>
-          </li>
-          <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.moneycost" value="{{system.moneycost}}" data-dtype="Number"/>
+          <li class="flexrow"><label class="item-field-label-long">Value</label>
+            <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.value" value="{{system.value}}" data-dtype="Number"/>
          </li>
+
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+
      </ul>
    </div>

--- a/templates/items/item-limitation-sheet.hbs
+++ b/templates/items/item-limitation-sheet.hbs
@ -11,13 +11,13 @@
    {{!-- Sheet Body --}}
    <section class="sheet-body">

-      {{> 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>
+          {{> 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>
--- a/templates/items/item-perk-sheet.hbs
+++ b/templates/items/item-perk-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>
+         {{> 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>
--- a/templates/items/item-power-sheet.hbs
+++ b/templates/items/item-power-sheet.hbs
@ -13,11 +13,15 @@

      {{> 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>
+          {{> 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>
--- a/templates/items/item-skill-sheet.hbs
+++ b/templates/items/item-skill-sheet.hbs
@ -15,8 +15,8 @@

      <div class="tab details" data-group="primary" data-tab="details">
        <ul>
-            <li class="flexrow"><label class="generic-label">Type</label>
-              <select class="competence-base flexrow" type="text" name="system.skilltype" value="{{system.skilltype}}" data-dtype="String">
+            <li class="flexrow"><label class="item-field-label-long">Type</label>
+              <select class="item-field-label-medium" type="text" name="system.skilltype" value="{{system.skilltype}}" data-dtype="String">
                {{#select system.skilltype}}
                  {{#each config.skillType as |char key|}}
                  <option value="{{key}}">{{char}}</option>
@ -24,33 +24,35 @@
                {{/select}}
              </select> 
            </li>
-          
-            <li class="flexrow"><label class="generic-label">Base characteristic</label>
-              <select class="competence-base flexrow" type="text" name="system.characteristic" value="{{system.characteristic}}" data-dtype="String">
+
+            {{#if (isSkillCustom system.skilltype)}}
+            <li class="flexrow"><label class="item-field-label-long">Base characteristic</label>
+              <select class="item-field-label-medium" type="text" name="system.characteristic" value="{{system.characteristic}}" data-dtype="String">
                {{#select system.characteristic}}
                  {{#each config.rollCharac as |char key|}}
                  <option value="{{key}}">{{char}}</option>
                  {{/each}}
-                  <option value="manual">Manual</option>
                {{/select}}
              </select> 
            </li>
+              {{#if (eq system.characteristic "manual")}}
+                <li class="flexrow"><label class="item-field-label-long">Base value</label>
+                  <input type="text" class="item-field-label-medium" name="system.base" value="{{system.base}}" data-dtype="Number" {{#if (ne system.characteristic "manual")}}disabled{{/if}} />
+                </li>
+              {{/if}}
+            {{/if}}

-            <li class="flexrow"><label class="generic-label">Base value</label>
-              <input type="text" class="" name="system.base" value="{{system.base}}" data-dtype="Number" {{#if (ne system.characteristic "manual")}}disabled{{/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="generic-label">Skill Roll points</label>
-              <input type="text" class="" name="system.skillroll" value="{{system.skillroll}}" 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}}

-            <li class="flexrow"><label class="generic-label">Base cost</label>
-              <input type="text" class="" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">+1 cost</label>
-              <input type="text" class="" name="system.plusonecost" value="{{system.plusonecost}}" data-dtype="Number"/>
-            </li>
+            {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}

          </ul>
        </div>
--- a/templates/items/item-talent-sheet.hbs
+++ b/templates/items/item-talent-sheet.hbs
@ -13,11 +13,15 @@

      {{> 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>
+          {{> 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>
--- a/templates/partials/partial-item-cost.hbs
+++ b/templates/partials/partial-item-cost.hbs
@ -0,0 +1,10 @@
+      <li class="flexrow"><label class="item-field-label-long">Cost</label>
+        <input type="text" class="item-field-label-medium" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
+      </li>
+      <li class="flexrow"><label class="item-field-label-long">Active Cost</label>
+        <input type="text" class="item-field-label-medium" name="system.activecost" value="{{system.activecost}}" data-dtype="Number"/>
+      </li>
+      <li class="flexrow"><label class="item-field-label-long">Base Cost</label>
+        <input type="text" class="item-field-label-medium" name="system.basecost" value="{{system.basecost}}" data-dtype="Number"/>
+      </li>
+
--- a/templates/partials/partial-item-description.hbs
+++ b/templates/partials/partial-item-description.hbs
@ -1,8 +1,18 @@
 <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">
    {{editor description target="system.description" button=true owner=owner editable=editable}}
    </div>
  </div>
+  <div>
+    <label class="generic-label">Notes</label>
+    <div class="medium-editor item-text-long-line">
+    {{editor notes target="system.notes" button=true owner=owner editable=editable}}
+    </div>
+  </div>
 </div>
--- a/templates/partials/partial-item-hasroll.hbs
+++ b/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}}
--- a/templates/partials/partial-power-equipment-cost.hbs
+++ b/templates/partials/partial-power-equipment-cost.hbs
@ -0,0 +1,36 @@
+      <li class="flexrow"><label class="item-field-label-long">Type</label>
+        <select class="item-field-label-long" type="text" name="system.petype" value="{{system.petype}}" data-dtype="String">
+          {{#select system.petype}}
+            {{#each config.powerEquipmentType as |name key|}}
+              <option value="{{key}}">{{name}}</option>
+            {{/each}}
+          {{/select}}
+        </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>
+      <li class="flexrow"><label class="item-field-label-long">Damage</label>
+        <input type="text" class="item-field-label-medium" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
+      </li>
+      <li class="flexrow"><label class="item-field-label-long">Endurance</label>
+        <input type="text" class="item-field-label-short" name="system.endurance" value="{{system.endurance}}" data-dtype="Number"/>
+      </li>
+      <li class="flexrow"><label class="item-field-label-long">Quantity</label>
+        <input type="text" class="item-field-label-short" name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
+      </li>
Author	SHA1	Message	Date
LeRatierBretonnien	521d14c263	Item review and commit	2023-01-04 22:43:01 +01:00
LeRatierBretonnien	a91eb3d7bd	Fix powers	2022-12-29 20:30:28 +01:00
LeRatierBretonnien	73e1b1f68a	Fixes perks	2022-12-28 10:31:07 +01:00
LeRatierBretonnien	d49452efc5	Item descriptions	2022-12-28 10:30:56 +01:00