uberwald/fvtt-pegasus-rpg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 44 Wiki Activity

MDL/ADRL fixes + MR fixes

Browse Source
This commit is contained in:
LeRatierBretonnien 2023-09-19 13:52:09 +02:00
parent 552ff9564a
commit bbf0f31d4c
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/pegasus-actor.js
View File

@ -764,17 +764,17 @@ export class PegasusActor extends Actor {
/* -------------------------------------------- */
modifyStun(incDec) {
if ( incDec < 0 && (this.system.secondary.confidence.status == "anxious" || this.system.secondary.confidence.status == "lostface") ) {
if (incDec < 0 && (this.system.secondary.confidence.status == "anxious" || this.system.secondary.confidence.status == "lostface")) {
ui.notifications.warn("Unable to recover STUN because of Confidence status : " + this.system.secondary.confidence.status)
return
}
let myself = this
let combat = duplicate(myself.system.combat)
combat.stunlevel += incDec
let daze = this.effects.find( e => e.label == "Daze")
let daze = this.effects.find(e => e.label == "Daze")
if (daze && combat.stunlevel == 0) {
this.deleteEmbeddedDocuments("ActiveEffect", [ daze.id ] )
this.deleteEmbeddedDocuments("ActiveEffect", [daze.id])
}
if (combat.stunlevel >= 0) {
myself.update({ 'system.combat': combat })
@ -811,7 +811,7 @@ export class PegasusActor extends Actor {
/* -------------------------------------------- */
modifyMomentum(incDec) {
if ( this.system.combat.stunlevel > 0 ) {
if (this.system.combat.stunlevel > 0) {
ui.notifications.warn("Unable to gain/use Momentum while stunned")
return
}
@ -1467,7 +1467,7 @@ export class PegasusActor extends Actor {
updates['system.momentum.max'] = momentum
}
let mrLevel = (this.system.statistics.agi.value + this.system.statistics.agi.mod + this.system.statistics.str.value + this.system.statistics.str.mod) - (this.system.statistics.phy.value+this.system.statistics.phy.mod)
let mrLevel = (this.system.statistics.agi.value + this.system.statistics.agi.mod + this.system.statistics.str.value + this.system.statistics.str.mod) - (this.system.statistics.phy.value + this.system.statistics.phy.mod)
mrLevel = (mrLevel < 1) ? 1 : mrLevel;
if (mrLevel != this.system.mr.value) {
updates['system.mr.value'] = mrLevel
@ -1924,6 +1924,18 @@ export class PegasusActor extends Actor {
await this.createEmbeddedDocuments('Item', newItems)
}
/* -------------------------------------------- */
checkEFfectsHindranceDeletion(statKey) {
let toRem = []
let effects = this.items.filter(effect => effect.type == 'effect' && effect.system.oneuse &&
effect.system.hindrance && (effect.system.stataffected == statKey || effect.system.stataffected == "all"))
for (let effect of effects) {
toRem.push(effect.id)
}
if (toRem.length > 0) {
this.deleteEmbeddedDocuments('Item', toRem)
}
}
/* -------------------------------------------- */
computeCurrentHindrances(statKey) {
@ -1935,15 +1947,9 @@ export class PegasusActor extends Actor {
if (overCapacity > 0) {
hindrancesDices += overCapacity
}
let effects = this.items.filter(item => item.type == 'effect')
let effects = this.items.filter(effect => effect.type == 'effect' && effect.system.hindrance && (effect.system.stataffected == statKey || effect.system.stataffected == "all"))
for (let effect of effects) {
if (effect.system.hindrance && ( effect.system.stataffected == statKey || effect.system.stataffected == "all")) {
hindrancesDices += effect.system.effectlevel
if ( effect.system.oneuse) {
effect.system.isUSed = true // Ensure deletion
this.deleteEmbeddedDocuments('Item', [effect.id])
}
}
}
if (statKey.toLowerCase() == "stl" && this.system.secondary.concealment.status == "exposed") {
hindrancesDices += 1
@ -2298,7 +2304,7 @@ export class PegasusActor extends Actor {
}
/* -------------------------------------------- */
getExtraTICsFromEffect() {
let effects = this.items.filter(it => it.type == "effect" && Number(it.system.extratics)>0)
let effects = this.items.filter(it => it.type == "effect" && Number(it.system.extratics) > 0)
let nbTics = 0
for (let e of effects) {
nbTics += Number(e.system.extratics)
@ -2427,8 +2433,8 @@ export class PegasusActor extends Actor {
rollData.title = "MR / Initiative"
rollData.nbTIC = ((this.type == "character") ? 2 : 1) + this.getExtraTICsFromEffect()
rollData.TICs = []
for(let i=0; i<rollData.nbTIC; i++) {
rollData.TICs.push( {text:"NONE", revealed: false, displayed: false})
for (let i = 0; i < rollData.nbTIC; i++) {
rollData.TICs.push({ text: "NONE", revealed: false, displayed: false })
}
}
this.startRoll(rollData);

4
modules/pegasus-utility.js
View File

@ -801,11 +801,11 @@ export class PegasusUtility {
}
}
}
if (toRem.length > 0) {
//console.log("Going to remove one use effects", toRem)
let actor = game.actors.get(rollData.actorId)
if (toRem.length > 0) {
actor.deleteEmbeddedDocuments('Item', toRem)
}
actor.checkEFfectsHindranceDeletion(rollData.statKey)
}
/* -------------------------------------------- */

4
system.json
View File

@ -252,7 +252,7 @@
],
"title": "Pegasus RPG",
"url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
"version": "11.0.20",
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.20.zip",
"version": "11.0.21",
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.21.zip",
"background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
}