From 55f084592c6c7b4b38c7169bdda3690f2937bed7 Mon Sep 17 00:00:00 2001 From: TJ Date: Sun, 14 Feb 2021 21:59:51 -0600 Subject: [PATCH 1/4] Smaller font size --- less/update/components/actor-global.less | 3 ++- module/actor/sheets/newSheet/base.js | 14 -------------- sw5e-global.css | 3 ++- .../newActor/parts/swalt-tech-powerbook.html | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/less/update/components/actor-global.less b/less/update/components/actor-global.less index 63d99f48..4a26de29 100644 --- a/less/update/components/actor-global.less +++ b/less/update/components/actor-global.less @@ -917,13 +917,14 @@ .resource-items { display: grid; grid-template-columns: repeat(5, 1fr); + column-gap: 24px; .resource { h1 { border: none; margin: 0; font-family: "Russo One"; - font-size: 16px; + font-size: 14px; font-weight: 400; text-align: center; margin-bottom: 4px; diff --git a/module/actor/sheets/newSheet/base.js b/module/actor/sheets/newSheet/base.js index ec747f5d..efd35ca8 100644 --- a/module/actor/sheets/newSheet/base.js +++ b/module/actor/sheets/newSheet/base.js @@ -231,7 +231,6 @@ export default class ActorSheet5e extends ActorSheet { const sections = { "atwill": -20, "innate": -10, - "pact": 0.5 }; // Label power slot uses headers @@ -275,19 +274,6 @@ export default class ActorSheet5e extends ActorSheet { } } - // Pact magic users have cantrips and a pact magic section - if ( levels.pact && levels.pact.max ) { - if ( !powerbook["0"] ) registerSection("power0", 0, CONFIG.SW5E.powerLevels[0]); - const l = levels.pact; - const config = CONFIG.SW5E.powerPreparationModes.pact; - registerSection("pact", sections.pact, config, { - prepMode: "pact", - value: l.value, - max: l.max, - override: l.override - }); - } - // Iterate over every power item, adding powers to the powerbook by section powers.forEach(power => { const mode = power.data.preparation.mode || "prepared"; diff --git a/sw5e-global.css b/sw5e-global.css index f348bc3d..90ad7429 100644 --- a/sw5e-global.css +++ b/sw5e-global.css @@ -1542,13 +1542,14 @@ input[type="reset"]:disabled { .sw5e.sheet.actor .swalt-sheet .tab.tech-powerbook .resource-items { display: grid; grid-template-columns: repeat(5, 1fr); + column-gap: 24px; } .sw5e.sheet.actor .swalt-sheet .tab.force-powerbook .resource-items .resource h1, .sw5e.sheet.actor .swalt-sheet .tab.tech-powerbook .resource-items .resource h1 { border: none; margin: 0; font-family: "Russo One"; - font-size: 16px; + font-size: 14px; font-weight: 400; text-align: center; margin-bottom: 4px; diff --git a/templates/actors/newActor/parts/swalt-tech-powerbook.html b/templates/actors/newActor/parts/swalt-tech-powerbook.html index a483bbdf..3f64a9bd 100644 --- a/templates/actors/newActor/parts/swalt-tech-powerbook.html +++ b/templates/actors/newActor/parts/swalt-tech-powerbook.html @@ -11,7 +11,7 @@
-

Universal Power DC

+

Tech Power DC

From 74414e2257910fa5b5040b84efdb23b801d74442 Mon Sep 17 00:00:00 2001 From: TJ Date: Mon, 15 Feb 2021 14:01:08 -0600 Subject: [PATCH 2/4] Fixes for NPC display --- less/original/npc.less | 2 +- less/update/components/actor-global.less | 2 +- module/actor/sheets/newSheet/npc.js | 18 +++++++----- sw5e-global.css | 2 +- sw5e.css | 2 +- templates/actors/newActor/npc-sheet.html | 16 ++++++----- .../newActor/parts/swalt-force-powerbook.html | 17 +++++------ .../newActor/parts/swalt-tech-powerbook.html | 28 +++++++++++++++---- 8 files changed, 55 insertions(+), 32 deletions(-) diff --git a/less/original/npc.less b/less/original/npc.less index dada8bad..506bf8de 100644 --- a/less/original/npc.less +++ b/less/original/npc.less @@ -4,7 +4,7 @@ /* Basic Structure */ /* ----------------------------------------- */ .sw5e.sheet.actor.npc { - min-width: 600px; + min-width: 872px; min-height: 680px; .header-exp { diff --git a/less/update/components/actor-global.less b/less/update/components/actor-global.less index 4a26de29..29255f6b 100644 --- a/less/update/components/actor-global.less +++ b/less/update/components/actor-global.less @@ -1071,7 +1071,7 @@ } } nav.sheet-navigation { - grid-template-columns: repeat(4, 1fr); + grid-template-columns: repeat(6, 1fr); } .tab.attributes { .traits-resources { diff --git a/module/actor/sheets/newSheet/npc.js b/module/actor/sheets/newSheet/npc.js index da67f782..46a28467 100644 --- a/module/actor/sheets/newSheet/npc.js +++ b/module/actor/sheets/newSheet/npc.js @@ -42,24 +42,27 @@ export default class ActorSheet5eNPCNew extends ActorSheet5e { }; // Start by classifying items into groups for rendering - let [powers, other] = data.items.reduce((arr, item) => { + let [forcepowers, techpowers, other] = data.items.reduce((arr, item) => { item.img = item.img || DEFAULT_TOKEN; item.isStack = Number.isNumeric(item.data.quantity) && (item.data.quantity !== 1); item.hasUses = item.data.uses && (item.data.uses.max > 0); item.isOnCooldown = item.data.recharge && !!item.data.recharge.value && (item.data.recharge.charged === false); item.isDepleted = item.isOnCooldown && (item.data.uses.per && (item.data.uses.value > 0)); item.hasTarget = !!item.data.target && !(["none",""].includes(item.data.target.type)); - if ( item.type === "power" ) arr[0].push(item); - else arr[1].push(item); + if ( item.type === "power" && ["lgt", "drk", "uni"].includes(item.data.school) ) arr[0].push(item); + else if ( item.type === "power" && ["tec"].includes(item.data.school) ) arr[1].push(item); + else arr[2].push(item); return arr; - }, [[], []]); + }, [[], [], []]); // Apply item filters - powers = this._filterItems(powers, this._filters.powerbook); + forcepowers = this._filterItems(forcepowers, this._filters.forcePowerbook); + techpowers = this._filterItems(techpowers, this._filters.techPowerbook); other = this._filterItems(other, this._filters.features); // Organize Powerbook - const powerbook = this._preparePowerbook(data, powers); + const forcePowerbook = this._preparePowerbook(data, forcepowers); + const techPowerbook = this._preparePowerbook(data, techpowers); // Organize Features for ( let item of other ) { @@ -73,7 +76,8 @@ export default class ActorSheet5eNPCNew extends ActorSheet5e { // Assign and return data.features = Object.values(features); - data.powerbook = powerbook; + data.forcePowerbook = forcePowerbook; + data.techPowerbook = techPowerbook; } diff --git a/sw5e-global.css b/sw5e-global.css index 90ad7429..57684e7a 100644 --- a/sw5e-global.css +++ b/sw5e-global.css @@ -1698,7 +1698,7 @@ input[type="reset"]:disabled { display: block; } .sw5e.sheet.actor.npc .swalt-sheet nav.sheet-navigation { - grid-template-columns: repeat(4, 1fr); + grid-template-columns: repeat(6, 1fr); } .sw5e.sheet.actor.npc .swalt-sheet .tab.attributes .traits-resources { display: block; diff --git a/sw5e.css b/sw5e.css index 476b0eff..556d0642 100644 --- a/sw5e.css +++ b/sw5e.css @@ -1827,7 +1827,7 @@ /* Basic Structure */ /* ----------------------------------------- */ .sw5e.sheet.actor.npc { - min-width: 600px; + min-width: 872px; min-height: 680px; } .sw5e.sheet.actor.npc .header-exp { diff --git a/templates/actors/newActor/npc-sheet.html b/templates/actors/newActor/npc-sheet.html index a3b8ed7e..dbc8e859 100644 --- a/templates/actors/newActor/npc-sheet.html +++ b/templates/actors/newActor/npc-sheet.html @@ -74,7 +74,8 @@ @@ -82,7 +83,7 @@ {{!-- NPC Sheet Body --}}
-
+
{{!-- Ability Scores --}}

Ability Scores

@@ -171,13 +172,14 @@ {{> "systems/sw5e/templates/actors/newActor/parts/swalt-features.html" sections=features}}
- {{!-- Powerbook Tab --}} -
+ {{!-- Powerbook Tabs --}} +
{{> "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-force-powerbook.html b/templates/actors/newActor/parts/swalt-force-powerbook.html index c780e25c..5b655620 100644 --- a/templates/actors/newActor/parts/swalt-force-powerbook.html +++ b/templates/actors/newActor/parts/swalt-force-powerbook.html @@ -43,23 +43,24 @@
+ {{#if isNPC}} +

{{localize "SW5E.PowercasterLevel"}}

+ +
+
+ +
+ {{else}}

Powers Known

{{data.attributes.force.known.max}}
+ {{/if}}
- {{#if isNPC}} -
- -
- {{/if}} -
+ +
@@ -18,15 +23,25 @@ {{data.attributes.powerTechDC}}
- - {{#if isNPC}} -
-