diff --git a/modules/pegasus-actor.js b/modules/pegasus-actor.js index 97a31f6..7e9935c 100644 --- a/modules/pegasus-actor.js +++ b/modules/pegasus-actor.js @@ -556,25 +556,26 @@ export class PegasusActor extends Actor { effect = duplicate(effect) if ( !effect.data.hindrance && effect.data.stataffected != "notapplicable" - && effect.data.stataffected != "special" - && effect.data.stataffected != "all") { + && effect.data.stataffected != "special") { rollData.effectsList.push( { label: effect.name, type: "effect", applied: false, effect: effect, value: effect.data.effectlevel } ) } } } /* -------------------------------------------- */ - addArmorsShields( rollData) { + addArmorsShields( rollData, useShield = false) { let armors = this.getArmors() let armorLevel = 0 for (let armor of armors) { armorLevel += armor.data.resistance } rollData.armorsList.push( {label: 'Total armor level', type: "other", applied: false, value: armorLevel } ) - rollData.armorsList.push( {label: 'Shield level', type: "other", applied: false, value: this.getShieldValue() } ) + if (useShield ) { + rollData.armorsList.push( {label: 'Shield level', type: "other", applied: false, value: this.getShieldValue() } ) + } } /* -------------------------------------------- */ - getCommonRollData(statKey = undefined) { + getCommonRollData(statKey = undefined, useShield = false) { let rollData = PegasusUtility.getBasicRollData() rollData.alias = this.name rollData.actorImg = this.img @@ -592,7 +593,7 @@ export class PegasusActor extends Actor { } this.addEffects( rollData) - this.addArmorsShields(rollData) + this.addArmorsShields(rollData, useShield) return rollData } @@ -611,7 +612,7 @@ export class PegasusActor extends Actor { rollPool(statKey, useShield = false) { let stat = this.getStat(statKey); if (stat) { - let rollData = this.getCommonRollData(statKey) + let rollData = this.getCommonRollData(statKey, useShield) rollData.mode = "stat" this.startRoll(rollData) @@ -657,7 +658,8 @@ export class PegasusActor extends Actor { rollData.mode = "spec" rollData.title = `Spec. : ${spec.name} ` rollData.specList = [ spec ] - + rollData.selectedSpec = spec._id + rollData.specDicesLevel = spec.data.level this.startRoll(rollData) } else { ui.notifications.warn("Specialisation not found !"); diff --git a/modules/pegasus-main.js b/modules/pegasus-main.js index 8d71322..f07c123 100644 --- a/modules/pegasus-main.js +++ b/modules/pegasus-main.js @@ -78,14 +78,13 @@ function welcomeMessage() { content: `
Welcome to the Pegasus Engine CORE RPG.
Created by GMD Online -

The Pegasus Engine is a available for free on our website. It is also available as a PDF and in Print format at an affordable price on our website.

-

It is thanks to all my Official GMD Members and Patreon Members that have made this project possible and allowed for this interface to be provided for free.

+

The Pegasus Engine is a available for free on our website. It is also available as a PDF and in Print format at an affordable price.

+

This project has been made possible thanks to all the Official GMD Members and Patreon Members that have supported me and as a result made it possible to supply this interface for free.

In return I have made available a fully detailed Compendium for FREE for all members, which can be obtained from the Members page on my website.

- You too can become a supporter for future projects. -
Sign up Here: - https://www.gmdonline.co.uk/gmdmemberspage/ -

GMD Online, GMD CORE RPG logo are © 2018 CORE Worlds and Game Rules © 2001. Interface © 2021 All rights reserved.

-

Enjoy and become the hero you were born to be!

+

You too can become a supporter for future projects and enjoy amazing rewards. +
Sign up Here: https://www.gmdonline.co.uk/gmdmemberspage/

+

GMD Online, GMD CORE RPG logo are © 2018 CORE Worlds and Game Rules © 2001. Interface © 2021 All rights reserved.

+

Enjoy and become the hero you were born to be!

` }); } diff --git a/modules/pegasus-roll-dialog.js b/modules/pegasus-roll-dialog.js index 3df005e..a23e954 100644 --- a/modules/pegasus-roll-dialog.js +++ b/modules/pegasus-roll-dialog.js @@ -131,6 +131,8 @@ export class PegasusRollDialog extends Dialog { if ( spec) { this.rollData.specDiceLevel = spec.data.level $('#specDicesLevel').val(this.rollData.specDiceLevel) + } else { + $('#specDicesLevel').val(0) } }); html.find('#statDicesLevel').change((event) => { diff --git a/packs/specialisations.db b/packs/specialisations.db index 16b9e3f..40f5095 100644 --- a/packs/specialisations.db +++ b/packs/specialisations.db @@ -81,7 +81,7 @@ {"_id":"iBdtbvylkhVl0eU0","name":"Astrogation [MND]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"mnd","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"

See Pegasus Engine CORE RPG

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.u87qu06ijxKcku7W"}}} {"_id":"iJ0U3nDmEI6yoSNm","name":"2-H Crushing [COM]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"com","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"

See Pegasus Engine CORE RPG

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.91Coi2zt8i74ULdP"}}} {"_id":"irT5gNk4TBpbDez5","name":"Chemistry [MND]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"mnd","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"

See Pegasus Engine CORE RPG

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.k6Q9TBqFpxgCAypY"}}} -{"_id":"jKNmPQJtjCNOstwt","name":"Initiative [MR]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"agi","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"

See Pegasus Engine CORE RPG

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.e13r56dJ1LYnUHve"}}} +{"_id":"jKNmPQJtjCNOstwt","name":"Initiative [MR]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"mr","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"

See Pegasus Engine CORE RPG

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.e13r56dJ1LYnUHve"}}} {"_id":"jvxMDUisjP8mi1Fi","name":"Culture [MND]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"mnd","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"

See Pegasus Engine CORE RPG

\n

Create a Different Lore for each Lore Specialisations

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.LGbXIAnyCvSYJjKJ"}}} {"_id":"l92nudtJI1cedk4q","name":"Cryptography [MND]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"mnd","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"

See Pegasus Engine CORE RPG

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.k6Q9TBqFpxgCAypY"}}} {"_id":"lJNPLMRHTK9bsX21","name":"Track [PER]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"per","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"

See Pegasus Engine CORE RPG

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.h65ID9PFleXY2iXJ"}}} diff --git a/system.json b/system.json index b452deb..af98eca 100644 --- a/system.json +++ b/system.json @@ -183,6 +183,6 @@ "templateVersion": 63, "title": "Pegasus RPG", "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg", - "version": "0.2.0", + "version": "0.2.1", "background" : "./images/ui/pegasus_welcome_page.webp" } diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index 3169b78..f911ea2 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -47,10 +47,6 @@ {{/if}} {{/if}} - {{#if linkedRollId}} -
    • - {{/if}} - diff --git a/templates/partial-roll-common-dices.html b/templates/partial-roll-common-dices.html deleted file mode 100644 index e69de29..0000000 diff --git a/templates/partial-roll-select-effects.html b/templates/partial-roll-select-effects.html index 21c116f..4608a26 100644 --- a/templates/partial-roll-select-effects.html +++ b/templates/partial-roll-select-effects.html @@ -1,6 +1,17 @@