diff --git a/modules/pegasus-actor-sheet.js b/modules/pegasus-actor-sheet.js index 95e2fc7..fd08915 100644 --- a/modules/pegasus-actor-sheet.js +++ b/modules/pegasus-actor-sheet.js @@ -4,7 +4,6 @@ */ import { PegasusUtility } from "./pegasus-utility.js"; -import { PegasusItemSheet } from "./pegasus-item-sheet.js"; import { PegasusRollDialog } from "./pegasus-roll-dialog.js"; /* -------------------------------------------- */ @@ -18,7 +17,7 @@ export class PegasusActorSheet extends ActorSheet { template: "systems/fvtt-pegasus-rpg/templates/actor-sheet.html", width: 920, height: 720, - tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }], + tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "combat" }], dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }], editScore: false }); diff --git a/modules/pegasus-item-sheet.js b/modules/pegasus-item-sheet.js index 60ff8d8..49f89d0 100644 --- a/modules/pegasus-item-sheet.js +++ b/modules/pegasus-item-sheet.js @@ -14,8 +14,8 @@ export class PegasusItemSheet extends ItemSheet { template: "systems/fvtt-pegasus-rpg/templates/item-sheet.html", dragDrop: [{ dragSelector: null, dropSelector: null }], width: 620, - height: 550 - //tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] + height: 550, + tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] }); } diff --git a/modules/pegasus-utility.js b/modules/pegasus-utility.js index 4c28783..c07444a 100644 --- a/modules/pegasus-utility.js +++ b/modules/pegasus-utility.js @@ -208,7 +208,9 @@ export class PegasusUtility { 'systems/fvtt-pegasus-rpg/templates/partial-options-equipment-types.html', 'systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html', 'systems/fvtt-pegasus-rpg/templates/partial-actor-stat-block.html', - 'systems/fvtt-pegasus-rpg/templates/partial-actor-status.html' + 'systems/fvtt-pegasus-rpg/templates/partial-actor-status.html', + 'systems/fvtt-pegasus-rpg/templates/partial-item-nav.html', + 'systems/fvtt-pegasus-rpg/templates/partial-item-description.html', ] return loadTemplates(templatePaths); } diff --git a/system.json b/system.json index eea1697..2a7a74d 100644 --- a/system.json +++ b/system.json @@ -183,6 +183,6 @@ "templateVersion": 86, "title": "Pegasus RPG", "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg", - "version": "0.5.1", + "version": "0.5.2", "background" : "./images/ui/pegasus_welcome_page.webp" } diff --git a/templates/item-ability-sheet.html b/templates/item-ability-sheet.html index b666729..b9be0ce 100644 --- a/templates/item-ability-sheet.html +++ b/templates/item-ability-sheet.html @@ -6,10 +6,15 @@ + {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}} + {{!-- Sheet Body --}}
- + + +
+ \ No newline at end of file diff --git a/templates/item-race-sheet.html b/templates/item-race-sheet.html index 4059f4b..226cd10 100644 --- a/templates/item-race-sheet.html +++ b/templates/item-race-sheet.html @@ -1,114 +1,134 @@
-
- -
-

-
-
+
+ +
+

+
+
+ {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}} - {{!-- Sheet Body --}} -
+ {{!-- Sheet Body --}} +
-
-
    -
  • -
    • -
      -
    • -
      • - {{#each data.abilities as |ability idx|}} -
    • - -
      - -
      -
      • - {{/each}} -
    -
+
-
    -
  • - -
    • - {{#if data.selectablestats}} -
  • - -
    • -
  • - -
    • - {{/if}} -
- -
    -
  • - -
    • + +
    + {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} +
    + +
    + {{editor content=data.environment target="data.environment" button=true owner=owner editable=editable}} +
    + +
    + {{editor content=data.society_culture target="data.society_culture" button=true owner=owner editable=editable}} +
    + +
    + {{editor content=data.outlook target="data.outlook" button=true owner=owner editable=editable}} +
    +
-
  • -
    • -
      -
    • -
      • - {{#each data.optionnalabilities as |ability idx|}} -
    • - -
      - -
      -
      • - {{/each}} -
    - +
    +
      +
    • +
      • +
        +
      • +
        +
        • + {{#each data.abilities as |ability idx|}} +
      • + +
        + +
        +
        • + {{/each}} +
      +
    -
      -
    • - -
      • - {{#if data.perksgained}} -
    • - -
      • -
    • - -
      • - {{#if data.perksall}} - {{else}} -
        -
      • -
        • - {{#each data.perks as |perk idx|}} -
      • - -
        - -
        -
        • - {{/each}} -
      - {{/if}} - {{/if}} -
    +
      +
    • + +
      • + {{#if data.selectablestats}} +
    • + +
      • +
    • + +
      • + {{/if}} +
    +
      +
    • + +
      • - -
      - {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
      - -
      - {{editor content=data.environment target="data.environment" button=true owner=owner editable=editable}} -
      - -
      - {{editor content=data.society_culture target="data.society_culture" button=true owner=owner editable=editable}} -
      - -
      - {{editor content=data.outlook target="data.outlook" button=true owner=owner editable=editable}} -
      -
    +
  • +
    • +
      +
    • +
      +
      • + {{#each data.optionnalabilities as |ability idx|}} +
    • + +
      + +
      +
      • + {{/each}} +
    + -
    - + + + + +
    + \ No newline at end of file diff --git a/templates/item-role-sheet.html b/templates/item-role-sheet.html index b3b624b..a88d120 100644 --- a/templates/item-role-sheet.html +++ b/templates/item-role-sheet.html @@ -7,12 +7,15 @@ + {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}} {{!-- Sheet Body --}}
    -
    -