diff --git a/images/icons/skill1.png b/images/icons/skill1.png deleted file mode 100644 index b336f45..0000000 Binary files a/images/icons/skill1.png and /dev/null differ diff --git a/images/icons/skill1.webp b/images/icons/skill1.webp new file mode 100644 index 0000000..86204e7 Binary files /dev/null and b/images/icons/skill1.webp differ diff --git a/images/icons/spell1.png b/images/icons/spell1.png deleted file mode 100644 index fc91124..0000000 Binary files a/images/icons/spell1.png and /dev/null differ diff --git a/images/icons/spell1.webp b/images/icons/spell1.webp new file mode 100644 index 0000000..ad496b9 Binary files /dev/null and b/images/icons/spell1.webp differ diff --git a/modules/avd12-item-sheet.js b/modules/avd12-item-sheet.js index 145628f..59b4ac8 100644 --- a/modules/avd12-item-sheet.js +++ b/modules/avd12-item-sheet.js @@ -16,7 +16,7 @@ export class Avd12ItemSheet extends ItemSheet { template: "systems/fvtt-avd12/templates/item-sheet.hbs", dragDrop: [{ dragSelector: null, dropSelector: null }], width: 620, - height: 550, + height: 'fit-content', tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }] }); } diff --git a/modules/avd12-roll-dialog.js b/modules/avd12-roll-dialog.js index 3b4ce26..531bdfc 100644 --- a/modules/avd12-roll-dialog.js +++ b/modules/avd12-roll-dialog.js @@ -5,7 +5,7 @@ export class Avd12RollDialog extends Dialog { /* -------------------------------------------- */ static async create(actor, rollData) { - let options = { classes: ["Avd12Dialog"], width: 540, height: 340, 'z-index': 99999 }; + let options = { classes: ["Avd12Dialog"], width: 540, height: 'fit-content', 'z-index': 99999 }; let html = await renderTemplate('systems/fvtt-avd12/templates/dialogs/roll-dialog-generic.html', rollData); return new CrucibleRollDialog(actor, rollData, html, options); diff --git a/modules/avd12-utility.js b/modules/avd12-utility.js index 019d6d4..1e0b438 100644 --- a/modules/avd12-utility.js +++ b/modules/avd12-utility.js @@ -152,12 +152,14 @@ export class Avd12Utility { 'systems/fvtt-avd12/templates/items/partial-item-nav.hbs', 'systems/fvtt-avd12/templates/items/partial-item-description.hbs', 'systems/fvtt-avd12/templates/items/partial-common-item-fields.hbs', + 'systems/fvtt-avd12/templates/items/partial-options-damage-types.hbs', 'systems/fvtt-avd12/templates/items/partial-options-weapon-types.hbs', 'systems/fvtt-avd12/templates/items/partial-options-weapon-categories.hbs', 'systems/fvtt-avd12/templates/items/partial-options-attributes.hbs', 'systems/fvtt-avd12/templates/items/partial-options-equipment-types.hbs', 'systems/fvtt-avd12/templates/items/partial-options-spell-types.hbs', 'systems/fvtt-avd12/templates/items/partial-options-spell-levels.hbs', + 'systems/fvtt-avd12/templates/items/partial-options-spell-schools.hbs', 'systems/fvtt-avd12/templates/items/partial-options-focus-bond.hbs', 'systems/fvtt-avd12/templates/items/partial-options-focus-treatment.hbs', 'systems/fvtt-avd12/templates/items/partial-options-focus-core.hbs', diff --git a/system.json b/system.json index 6e721d2..7043084 100644 --- a/system.json +++ b/system.json @@ -35,7 +35,7 @@ ], "title": "AnyVenture D12 RPG", "url": "https://www.uberwald.me/gitea/public/fvtt-avd12", - "version": "10.0.7", - "download": "https://www.uberwald.me/gitea/public/fvtt-avd12/archive/fvtt-avd12-v10.0.7.zip", + "version": "10.0.8", + "download": "https://www.uberwald.me/gitea/public/fvtt-avd12/archive/fvtt-avd12-v10.0.8.zip", "background": "systems/fvtt-avd12/images/ui/avd12_welcome_page.webp" } \ No newline at end of file diff --git a/template.json b/template.json index 81bfcd3..f323259 100644 --- a/template.json +++ b/template.json @@ -404,6 +404,15 @@ }, "spell": { "spelltype": "", + "actions": "", + "chargeeffect": "", + "school": "", + "damage": "", + "damagetype": "", + "range": 0, + "components": "", + "reaction": false, + "sustained": false, "level":"", "value": 0, "description": "" diff --git a/templates/items/item-module-sheet.hbs b/templates/items/item-module-sheet.hbs index 908ce26..ad6f281 100644 --- a/templates/items/item-module-sheet.hbs +++ b/templates/items/item-module-sheet.hbs @@ -44,8 +44,7 @@ {{#each choice.features as |feature id|}}
  • - - +
    diff --git a/templates/items/item-spell-sheet.hbs b/templates/items/item-spell-sheet.hbs index 4a52a7e..542fe38 100644 --- a/templates/items/item-spell-sheet.hbs +++ b/templates/items/item-spell-sheet.hbs @@ -25,7 +25,6 @@ {{> systems/fvtt-avd12/templates/items/partial-options-spell-types.hbs}} {{/select}} -
  • @@ -37,6 +36,59 @@
  • +
  • + + +
  • + +
  • + + +
  • + +
  • + + +
  • + +
  • + + +
  • + +
  • + + +
  • + +
  • + + +
  • + +
  • + + +
  • + +
  • + + +
  • + +
  • + + +
  • + diff --git a/templates/items/item-weapon-sheet.hbs b/templates/items/item-weapon-sheet.hbs index c58488c..ece1bc5 100644 --- a/templates/items/item-weapon-sheet.hbs +++ b/templates/items/item-weapon-sheet.hbs @@ -90,7 +90,11 @@
    - +
    diff --git a/templates/items/partial-options-damage-types.hbs b/templates/items/partial-options-damage-types.hbs new file mode 100644 index 0000000..9627d4c --- /dev/null +++ b/templates/items/partial-options-damage-types.hbs @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/templates/items/partial-options-spell-schools.hbs b/templates/items/partial-options-spell-schools.hbs new file mode 100644 index 0000000..6e58f8b --- /dev/null +++ b/templates/items/partial-options-spell-schools.hbs @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/templates/items/partial-options-spell-types.hbs b/templates/items/partial-options-spell-types.hbs index addf8d1..831151c 100644 --- a/templates/items/partial-options-spell-types.hbs +++ b/templates/items/partial-options-spell-types.hbs @@ -5,3 +5,4 @@ +