From dd0d40efc8413fd37439a3bf1b6c6d0a772d8b55 Mon Sep 17 00:00:00 2001 From: sladecraven Date: Tue, 25 Jan 2022 09:14:32 +0100 Subject: [PATCH] Minor fixes --- modules/pegasus-actor.js | 50 +++++++++++++++++++--------------- modules/pegasus-roll-dialog.js | 1 - system.json | 2 +- templates/actor-sheet.html | 10 +++---- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/modules/pegasus-actor.js b/modules/pegasus-actor.js index 87b055b..46d92be 100644 --- a/modules/pegasus-actor.js +++ b/modules/pegasus-actor.js @@ -198,7 +198,7 @@ export class PegasusActor extends Actor { await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity } } - + /* -------------------------------------------- */ async activatePower(itemId) { let item = this.data.items.find(item => item.id == itemId); @@ -488,16 +488,16 @@ export class PegasusActor extends Actor { } /* -------------------------------------------- */ getShieldDice() { - let shields = this.data.items.filter( item => item.type == "shield" && item.data.data.equipped) + let shields = this.data.items.filter(item => item.type == "shield" && item.data.data.equipped) let def = 0 - for ( let sh of shields) { + for (let sh of shields) { def += sh.data.data.level } return def } /* -------------------------------------------- */ - rollPool(statKey, useShield=false) { + rollPool(statKey, useShield = false) { let stat = this.getStat(statKey); if (stat) { let rollData = this.getCommonRollData() @@ -505,7 +505,7 @@ export class PegasusActor extends Actor { rollData.specList = this.getRelevantSpec(statKey) rollData.selectedSpec = "0" rollData.stat = stat; - + if (useShield) { rollData.otherDicesLevel = this.getShieldDice() } @@ -572,9 +572,9 @@ export class PegasusActor extends Actor { rollData.mode = "MR" rollData.stat = mr rollData.activePerks = duplicate(this.getActivePerks()), - rollData.specList = this.getRelevantSpec('mr'), + rollData.specList = this.getRelevantSpec('mr'), - this.startRoll(rollData); + this.startRoll(rollData); } else { ui.notifications.warn("MR not found !"); } @@ -596,7 +596,7 @@ export class PegasusActor extends Actor { /* -------------------------------------------- */ async computeNRGHealth() { - if ( this.isOwner || game.user.isGM) { + if (this.isOwner || game.user.isGM) { let updates = {} let phyDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.phy.value) + this.data.data.secondary.health.bonus + this.data.data.statistics.phy.mod; if (phyDiceValue != this.data.data.secondary.health.max) { @@ -608,18 +608,18 @@ export class PegasusActor extends Actor { updates['data.secondary.delirium.max'] = mndDiceValue updates['data.secondary.delirium.value'] = mndDiceValue } - let stlDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.stl.value) + this.data.data.secondary.stealthhealth.bonus + this.data.data.statistics.stl.mod; + let stlDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.stl.value) + this.data.data.secondary.stealthhealth.bonus + this.data.data.statistics.stl.mod; if (stlDiceValue != this.data.data.secondary.stealthhealth.max) { - updates['data.secondary.stealthhealth.max'] = stlDiceValue - updates['data.secondary.stealthhealth.value'] = stlDiceValue + updates['data.secondary.stealthhealth.max'] = stlDiceValue + updates['data.secondary.stealthhealth.value'] = stlDiceValue } - + let socDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.soc.value) + this.data.data.secondary.socialhealth.bonus + this.data.data.statistics.soc.mod; if (socDiceValue != this.data.data.secondary.socialhealth.max) { updates['data.secondary.socialhealth.max'] = socDiceValue - updates['data.secondary.socialhealth.value'] = socDiceValue + updates['data.secondary.socialhealth.value'] = socDiceValue } - + let nrgValue = PegasusUtility.getDiceValue(this.data.data.statistics.foc.value) + this.data.data.nrg.mod + this.data.data.statistics.foc.mod; if (nrgValue != this.data.data.nrg.max) { updates['data.nrg.max'] = nrgValue @@ -627,21 +627,27 @@ export class PegasusActor extends Actor { } nrgValue = PegasusUtility.getDiceValue(this.data.data.statistics.foc.value) + this.data.data.statistics.foc.mod; if (nrgValue != this.data.data.combat.stunthreshold) { - updates['data.combat.stunthreshold'] = nrgValue + updates['data.combat.stunthreshold'] = nrgValue } - + let momentum = PegasusUtility.getDiceValue(this.data.data.statistics.foc.value) + this.data.data.statistics.foc.mod if (momentum != this.data.data.momentum.max) { - updates['data.momentum.value'] = momentum - updates['data.momentum.max'] = momentum + updates['data.momentum.value'] = 0 + updates['data.momentum.max'] = momentum + } + + let mrLevel = (this.data.data.statistics.agi.value + this.data.data.statistics.str.value) - this.data.data.statistics.phy.value + mrLevel = (mrLevel < 1) ? 1 : mrLevel; + if (mrLevel != this.data.data.mr.value) { + updates['data.mr.value'] = mrLevel } let race = this.getRace() - if ( race && race.name && (race.name != this.data.data.biodata.racename) ) { + if (race && race.name && (race.name != this.data.data.biodata.racename)) { updates['data.biodata.racename'] = race.name } let role = this.getRole() - if ( role && role.name && (role.name != this.data.data.biodata.rolename)) { + if (role && role.name && (role.name != this.data.data.biodata.rolename)) { updates['data.biodata.rolename'] = role.name } //console.log("UPD", updates, this.data.data.biodata) @@ -844,7 +850,7 @@ export class PegasusActor extends Actor { rollData.specList = this.getRelevantSpec(weapon.data.statistic) rollData.activePerks = duplicate(this.getActivePerks()) if (damage) { - rollData.stat = this.getStat(weapon.data.damagestatistic) + rollData.stat = this.getStat(weapon.data.damagestatistic) rollData.isDamage = true; rollData.otherDicesLevel = weapon.data.damage } else { @@ -878,5 +884,5 @@ export class PegasusActor extends Actor { ui.notifications.warn("Power not found !", powerId); } } - + } diff --git a/modules/pegasus-roll-dialog.js b/modules/pegasus-roll-dialog.js index 58ae288..d64bce2 100644 --- a/modules/pegasus-roll-dialog.js +++ b/modules/pegasus-roll-dialog.js @@ -41,7 +41,6 @@ export class PegasusRollDialog extends Dialog { label: "Cancel", callback: () => { this.close() } } }, - default: "roll", close: close } diff --git a/system.json b/system.json index 1ea885e..d300992 100644 --- a/system.json +++ b/system.json @@ -163,6 +163,6 @@ "templateVersion": 63, "title": "Pegasus RPG", "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg", - "version": "0.1.12", + "version": "0.1.13", "background" : "./images/ui/pegasus_welcome_page.webp" } diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 9c65e97..bca9f1c 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -79,7 +79,7 @@

  • {{data.nrg.label}}

     Act -  Val +  Cur  Mod  Max
    • @@ -169,7 +169,7 @@

  • {{data.nrg.label}}

     Act -  Val +  Cur  Mod  Max
    • @@ -179,7 +179,7 @@

    {{stat2.label}}

     - Val + Cur  Bonus  Max @@ -187,7 +187,7 @@ {{/each}}

  • {{data.momentum.label}}

     - Val + Cur  Max
    • @@ -326,7 +326,7 @@

  • {{data.nrg.label}}

     Act -  Val +  Cur  Mod  Max