From d49452efc515100d677e86fa94c02a7f5a6f9006 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Wed, 28 Dec 2022 10:30:56 +0100 Subject: [PATCH] Item descriptions --- modules/hero6-config.js | 21 ++++++-- modules/hero6-utility.js | 12 ++++- system.json | 4 +- template.json | 53 ++++++++++++++----- templates/items/item-complication-sheet.hbs | 10 +++- templates/items/item-equipment-sheet.hbs | 22 ++++---- templates/items/item-limitation-sheet.hbs | 4 +- templates/items/item-perk-sheet.hbs | 6 ++- templates/items/item-power-sheet.hbs | 6 +-- templates/items/item-skill-sheet.hbs | 34 ++++++------ templates/items/item-talent-sheet.hbs | 4 +- .../partials/partial-item-description.hbs | 6 +++ 12 files changed, 120 insertions(+), 62 deletions(-) diff --git a/modules/hero6-config.js b/modules/hero6-config.js index 1e04044..4cc89b3 100644 --- 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,17 @@ export const Hero6_CONFIG = { "intellect": "Intellect" , "background": "Background" , "combat": "Combat" , + "custom": "Custom" + }, + powerEquipmentType: { + "adjustement": "Adjustement", + "attack": "Attack", + "bodyaffecting": "Bodyaffecting", + "defense": "Defense", + "mental": "Mental", + "movement": "Movement", + "senseaffecting": "Senseaffecting", + "sensory": "Sensory", + "special": "Special" } - - } \ No newline at end of file diff --git a/modules/hero6-utility.js b/modules/hero6-utility.js index dc2efec..cfeb2eb 100644 --- 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" || key == "combat" ) { + return true; + } + return false }) @@ -149,7 +155,9 @@ 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', ] return loadTemplates(templatePaths); } diff --git a/system.json b/system.json index dbc2ef1..ff6eb20 100644 --- a/system.json +++ b/system.json @@ -82,7 +82,7 @@ "styles": [ "styles/simple.css" ], - "version": "10.0.1", + "version": "10.0.2", "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.2.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 ec5d5f8..c23d06b 100644 --- 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", @@ -186,20 +200,25 @@ ], "templates": { "common": { + "displayname": "", "description": "", + "notes": "", "effects": "", "cost": "", + "activecost": 0, + "basecost": 0, "value": 0, "modifiers": [] }, "power": { - "description": "", - "cost": "", + "displayname": "", "modifiers": [], - "type": "", - "effect": 0, + "petype": "", "levels": 0, - "end": 0, + "quantity": 0, + "range": "", + "damage": "", + "endurance": 0, "items": {} } }, @@ -214,9 +233,9 @@ ] }, "skill": { - "skilltype": "", + "skilltype": "agility", "characteristic": "", - "base": 0, + "base": "", "skillroll": 0, "levels": 0, "templates": [ @@ -226,14 +245,16 @@ }, "power": { "templates": [ + "common", "power" ] }, "equipment": { "templates": [ + "common", "power" ], - "quantity": 1, + "value": 0, "weight": 0, "moneycost": 0 }, @@ -288,21 +309,29 @@ "velValue": 0 }, "perk": { + "roll": 0, "templates": [ "common" ] }, "talent": { + "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" ] diff --git a/templates/items/item-complication-sheet.hbs b/templates/items/item-complication-sheet.hbs index e30eba1..e0969bb 100644 --- a/templates/items/item-complication-sheet.hbs +++ b/templates/items/item-complication-sheet.hbs @@ -13,10 +13,16 @@ {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}} -
  • - +
  • +
    • +
  • + +
    • + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}} +
    diff --git a/templates/items/item-equipment-sheet.hbs b/templates/items/item-equipment-sheet.hbs index 3bbc4df..c5435b2 100644 --- a/templates/items/item-equipment-sheet.hbs +++ b/templates/items/item-equipment-sheet.hbs @@ -15,18 +15,22 @@
    diff --git a/templates/items/item-limitation-sheet.hbs b/templates/items/item-limitation-sheet.hbs index e30eba1..2dded9f 100644 --- a/templates/items/item-limitation-sheet.hbs +++ b/templates/items/item-limitation-sheet.hbs @@ -13,9 +13,7 @@ {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}} -
  • - -
    • + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
    diff --git a/templates/items/item-perk-sheet.hbs b/templates/items/item-perk-sheet.hbs index e30eba1..19aef08 100644 --- a/templates/items/item-perk-sheet.hbs +++ b/templates/items/item-perk-sheet.hbs @@ -13,10 +13,12 @@ {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}} -
  • - +
  • +
    • + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}} +
    diff --git a/templates/items/item-power-sheet.hbs b/templates/items/item-power-sheet.hbs index e30eba1..09e183e 100644 --- a/templates/items/item-power-sheet.hbs +++ b/templates/items/item-power-sheet.hbs @@ -13,9 +13,9 @@ {{> 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}}
    diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs index 956065b..4bdfe65 100644 --- a/templates/items/item-skill-sheet.hbs +++ b/templates/items/item-skill-sheet.hbs @@ -15,8 +15,8 @@
    diff --git a/templates/items/item-talent-sheet.hbs b/templates/items/item-talent-sheet.hbs index e30eba1..2dded9f 100644 --- a/templates/items/item-talent-sheet.hbs +++ b/templates/items/item-talent-sheet.hbs @@ -13,9 +13,7 @@ {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}} -
  • - -
    • + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
    diff --git a/templates/partials/partial-item-description.hbs b/templates/partials/partial-item-description.hbs index 26c9623..7853e6f 100644 --- a/templates/partials/partial-item-description.hbs +++ b/templates/partials/partial-item-description.hbs @@ -5,4 +5,10 @@ {{editor description target="system.description" button=true owner=owner editable=editable}} +
    + +
    + {{editor notes target="system.notes" button=true owner=owner editable=editable}} +
    +