From 8c6723a035096cd4a6530601b4bc464ec5bc957c Mon Sep 17 00:00:00 2001 From: TJ Date: Wed, 10 Feb 2021 16:16:47 -0600 Subject: [PATCH] Start splitting force/tech sheets --- module/item/entity.js | 20 +++ module/templates.js | 3 +- .../actors/newActor/character-sheet.html | 6 +- .../newActor/expanded-limited-sheet.html | 5 +- templates/actors/newActor/npc-sheet.html | 5 +- ...erbook.html => swalt-force-powerbook.html} | 38 +---- .../newActor/parts/swalt-tech-powerbook.html | 141 ++++++++++++++++++ 7 files changed, 184 insertions(+), 34 deletions(-) rename templates/actors/newActor/parts/{swalt-powerbook.html => swalt-force-powerbook.html} (84%) create mode 100644 templates/actors/newActor/parts/swalt-tech-powerbook.html diff --git a/module/item/entity.js b/module/item/entity.js index 8b35bcc5..3ddab49e 100644 --- a/module/item/entity.js +++ b/module/item/entity.js @@ -55,6 +55,26 @@ export default class Item5e extends Item { /* -------------------------------------------- */ + /** + * Is the Item a force power + * @type {boolean} + */ + get isForcePower() { + return ["lgt", "drk", "uni"].includes(this.data.data.school); + } + + /* -------------------------------------------- */ + + /** + * Is the Item a tech power + * @type {boolean} + */ + get isTechPower() { + return ["tec"].includes(this.data.data.school); + } + + /* -------------------------------------------- */ + /** * Does the Item implement an attack roll as part of its usage * @type {boolean} diff --git a/module/templates.js b/module/templates.js index af337996..764463f3 100644 --- a/module/templates.js +++ b/module/templates.js @@ -21,7 +21,8 @@ export const preloadHandlebarsTemplates = async function() { "systems/sw5e/templates/actors/newActor/parts/swalt-active-effects.html", "systems/sw5e/templates/actors/newActor/parts/swalt-features.html", "systems/sw5e/templates/actors/newActor/parts/swalt-inventory.html", - "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html", + "systems/sw5e/templates/actors/newActor/parts/swalt-force-powerbook.html", + "systems/sw5e/templates/actors/newActor/parts/swalt-tech-powerbook.html", "systems/sw5e/templates/actors/newActor/parts/swalt-resources.html", "systems/sw5e/templates/actors/newActor/parts/swalt-traits.html", diff --git a/templates/actors/newActor/character-sheet.html b/templates/actors/newActor/character-sheet.html index 58de5c48..a53cc6bc 100644 --- a/templates/actors/newActor/character-sheet.html +++ b/templates/actors/newActor/character-sheet.html @@ -132,7 +132,11 @@ {{!-- Powerbook Tab --}}
- {{> "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html"}} + {{> "systems/sw5e/templates/actors/newActor/parts/swalt-force-powerbook.html"}} +
+ +
+ {{> "systems/sw5e/templates/actors/newActor/parts/swalt-tech-powerbook.html"}}
{{!-- Effects Tab --}}
diff --git a/templates/actors/newActor/expanded-limited-sheet.html b/templates/actors/newActor/expanded-limited-sheet.html index be0f84ab..7f8337fc 100644 --- a/templates/actors/newActor/expanded-limited-sheet.html +++ b/templates/actors/newActor/expanded-limited-sheet.html @@ -128,7 +128,10 @@
{{!-- Powerbook Tab --}}
- {{> "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html"}} + {{> "systems/sw5e/templates/actors/newActor/parts/swalt-force-powerbook.html"}} +
+
+ {{> "systems/sw5e/templates/actors/newActor/parts/swalt-tech-powerbook.html"}}
{{!-- Biography Tab --}}
diff --git a/templates/actors/newActor/npc-sheet.html b/templates/actors/newActor/npc-sheet.html index 037f64de..a3b8ed7e 100644 --- a/templates/actors/newActor/npc-sheet.html +++ b/templates/actors/newActor/npc-sheet.html @@ -173,7 +173,10 @@ {{!-- Powerbook Tab --}}
- {{> "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html"}} + {{> "systems/sw5e/templates/actors/newActor/parts/swalt-force-powerbook.html"}} +
+
+ {{> "systems/sw5e/templates/actors/newActor/parts/swalt-tech-powerbook.html"}}
{{!-- Effects Tab --}} diff --git a/templates/actors/newActor/parts/swalt-powerbook.html b/templates/actors/newActor/parts/swalt-force-powerbook.html similarity index 84% rename from templates/actors/newActor/parts/swalt-powerbook.html rename to templates/actors/newActor/parts/swalt-force-powerbook.html index adf7a022..d7bfbd6b 100644 --- a/templates/actors/newActor/parts/swalt-powerbook.html +++ b/templates/actors/newActor/parts/swalt-force-powerbook.html @@ -1,27 +1,11 @@
-

- Force Points -

-
- - / - -
-
+

Force Points

-
-

- Tech Points -

- + / - +
@@ -54,18 +38,16 @@
  • {{localize "SW5E.Reaction"}}
  • {{localize "SW5E.AbbreviationConc"}}
  • {{localize "SW5E.Ritual"}}
  • -
  • {{localize "SW5E.Prepared"}}{{#if preparedPowers}} - ({{preparedPowers}}){{/if}}
  • +
  • {{localize "SW5E.Prepared"}}{{#if preparedPowers}}({{preparedPowers}}){{/if}}
  • -
    {{localize "SW5E.PowerSchool"}}
    {{localize "SW5E.PowerUsage"}}
    {{localize "SW5E.PowerTarget"}}
    -
    +
      {{#each powerbook as |section|}}
    1. @@ -99,6 +81,7 @@
        {{#each section.powers as |item i|}} + {{#if item.data.isForcePower }}
      1. @@ -110,12 +93,7 @@ Uses {{item.data.uses.value}} / {{item.data.uses.max}} {{/if}}
        - - +
        {{labels.school}}
        {{labels.activation}}
        @@ -125,7 +103,6 @@ {{/if}}
        - {{#if ../../owner}}
        {{#if section.canPrepare}} @@ -137,6 +114,7 @@
        {{/if}}
      2. + {{/if}} {{/each}}
    2. diff --git a/templates/actors/newActor/parts/swalt-tech-powerbook.html b/templates/actors/newActor/parts/swalt-tech-powerbook.html new file mode 100644 index 00000000..84df6e67 --- /dev/null +++ b/templates/actors/newActor/parts/swalt-tech-powerbook.html @@ -0,0 +1,141 @@ +
      +
      +

      Tech Points

      + +
      + + / + +
      +
      +
      + +
      +
      + + {{#if isNPC}} + + {{/if}} +

      {{localize "SW5E.PowerDC"}} {{data.attributes.powerdc}}

      +
      + +
        +
      • {{localize "SW5E.Filter"}}
      • +
      • {{localize "SW5E.Action"}}
      • +
      • {{localize "SW5E.BonusAction"}}
      • +
      • {{localize "SW5E.Reaction"}}
      • +
      • {{localize "SW5E.AbbreviationConc"}}
      • +
      • {{localize "SW5E.Ritual"}}
      • +
      • {{localize "SW5E.Prepared"}}{{#if preparedPowers}}({{preparedPowers}}){{/if}}
      • +
      + +
      +
      +
      {{localize "SW5E.PowerSchool"}}
      +
      {{localize "SW5E.PowerUsage"}}
      +
      {{localize "SW5E.PowerTarget"}}
      +
      + +
        + {{#each powerbook as |section|}} +
      1. +
        +
        +

        {{section.label}}

        + {{#if section.canCreate}} + + {{localize "SW5E.Add"}} + + {{/if}} +
        + +
        + {{#if section.usesSlots}} + + / + + {{{section.slots}}} + {{#if ../editable}} + + + + {{/if}} + {{ else }} + {{{section.uses}}} / {{{section.slots}}} + {{/if}} +
        +
        +
          + {{#each section.powers as |item i|}} + {{#if item.data.isTechPower }} +
        1. +
          +
          +

          {{item.name}}

          +
          + +
          + {{#if item.data.uses.per }} + Uses {{item.data.uses.value}} / {{item.data.uses.max}} + {{/if}} +
          + +
          {{labels.school}}
          +
          {{labels.activation}}
          +
          + {{#if labels.target}} + {{labels.target}} + {{else}}None + {{/if}} +
          + + {{#if ../../owner}} +
          + {{#if section.canPrepare}} + + {{/if}} + + +
          + {{/if}} +
        2. + {{/if}} + {{/each}} +
        +
      2. + {{else}} + {{#if owner}} + {{#if filters.powerbook.size}} +
      3. +

        {{localize "SW5E.FilterNoPowers"}}

        +
      4. + {{else}} +
      5. + +
      6. +
      7. +

        {{localize "SW5E.NoPowerLevels"}}

        +
      8. + {{/if}} + {{/if}} + {{/each}} +
      +
      \ No newline at end of file