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

50
modules/pegasus-actor.js
View File

@ -764,17 +764,17 @@ export class PegasusActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
modifyStun(incDec) { 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) ui.notifications.warn("Unable to recover STUN because of Confidence status : " + this.system.secondary.confidence.status)
return return
} }
let myself = this let myself = this
let combat = duplicate(myself.system.combat) let combat = duplicate(myself.system.combat)
combat.stunlevel += incDec 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) { if (daze && combat.stunlevel == 0) {
this.deleteEmbeddedDocuments("ActiveEffect", [ daze.id ] ) this.deleteEmbeddedDocuments("ActiveEffect", [daze.id])
} }
if (combat.stunlevel >= 0) { if (combat.stunlevel >= 0) {
myself.update({ 'system.combat': combat }) myself.update({ 'system.combat': combat })
@ -786,7 +786,7 @@ export class PegasusActor extends Actor {
if (!daze) { if (!daze) {
this.createEmbeddedDocuments("ActiveEffect", [ this.createEmbeddedDocuments("ActiveEffect", [
{ label: 'Daze', icon: 'icons/svg/daze.svg', flags: { core: { statusId: 'daze' } } } { label: 'Daze', icon: 'icons/svg/daze.svg', flags: { core: { statusId: 'daze' } } }
]) ])
} }
if (incDec > 0) { if (incDec > 0) {
chatData.content = `<div>${this.name} suffered a Stun level.</div` chatData.content = `<div>${this.name} suffered a Stun level.</div`
@ -811,7 +811,7 @@ export class PegasusActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
modifyMomentum(incDec) { modifyMomentum(incDec) {
if ( this.system.combat.stunlevel > 0 ) { if (this.system.combat.stunlevel > 0) {
ui.notifications.warn("Unable to gain/use Momentum while stunned") ui.notifications.warn("Unable to gain/use Momentum while stunned")
return return
} }
@ -1467,7 +1467,7 @@ export class PegasusActor extends Actor {
updates['system.momentum.max'] = momentum 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; mrLevel = (mrLevel < 1) ? 1 : mrLevel;
if (mrLevel != this.system.mr.value) { if (mrLevel != this.system.mr.value) {
updates['system.mr.value'] = mrLevel updates['system.mr.value'] = mrLevel
@ -1578,8 +1578,8 @@ export class PegasusActor extends Actor {
for (let e of effects) { for (let e of effects) {
meleeBonus += Number(e.system.effectlevel) meleeBonus += Number(e.system.effectlevel)
} }
this.baseMDL = this.system.biodata.sizenum + this.system.biodata.sizebonus + this.system.statistics.str.value + this.baseMDL = this.system.biodata.sizenum + this.system.biodata.sizebonus + this.system.statistics.str.value +
this.system.statistics.str.mod + this.system.statistics.str.bonuseffect + meleeBonus this.system.statistics.str.mod + this.system.statistics.str.bonuseffect + meleeBonus
let weaponsMelee = this.items.filter(it => it.type == "weapon" && it.system.damagestatistic.toLowerCase() == "str") let weaponsMelee = this.items.filter(it => it.type == "weapon" && it.system.damagestatistic.toLowerCase() == "str")
for (let w of weaponsMelee) { for (let w of weaponsMelee) {
let damage = this.baseMDL + Number(w.system.damage) let damage = this.baseMDL + Number(w.system.damage)
@ -1614,11 +1614,11 @@ export class PegasusActor extends Actor {
if (role?.name?.toLowerCase() == "defender") { // Add defender bonus to ADRL if (role?.name?.toLowerCase() == "defender") { // Add defender bonus to ADRL
roleBonus = this.getRoleLevel() roleBonus = this.getRoleLevel()
} }
this.baseADRL = roleBonus + armorBonus + this.system.statistics.phy.value + this.system.statistics.phy.mod + this.baseADRL = roleBonus + armorBonus + this.system.statistics.phy.value + this.system.statistics.phy.mod +
this.system.statistics.phy.bonuseffect + this.system.biodata.sizenum + this.system.biodata.sizebonus this.system.statistics.phy.bonuseffect + this.system.biodata.sizenum + this.system.biodata.sizebonus
let armors = this.items.filter(it => it.type == "armor") let armors = this.items.filter(it => it.type == "armor")
for (let a of armors) { for (let a of armors) {
let adrl = this.baseADRL + a.system.resistance let adrl = this.baseADRL + a.system.resistance
if (adrl != a.system.adrl) { if (adrl != a.system.adrl) {
updates.push({ _id: a.id, "system.adrl": adrl }) updates.push({ _id: a.id, "system.adrl": adrl })
} }
@ -1924,6 +1924,18 @@ export class PegasusActor extends Actor {
await this.createEmbeddedDocuments('Item', newItems) 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) { computeCurrentHindrances(statKey) {
@ -1935,15 +1947,9 @@ export class PegasusActor extends Actor {
if (overCapacity > 0) { if (overCapacity > 0) {
hindrancesDices += overCapacity 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) { for (let effect of effects) {
if (effect.system.hindrance && ( effect.system.stataffected == statKey || effect.system.stataffected == "all")) { hindrancesDices += effect.system.effectlevel
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") { if (statKey.toLowerCase() == "stl" && this.system.secondary.concealment.status == "exposed") {
hindrancesDices += 1 hindrancesDices += 1
@ -2298,7 +2304,7 @@ export class PegasusActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getExtraTICsFromEffect() { 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 let nbTics = 0
for (let e of effects) { for (let e of effects) {
nbTics += Number(e.system.extratics) nbTics += Number(e.system.extratics)
@ -2427,8 +2433,8 @@ export class PegasusActor extends Actor {
rollData.title = "MR / Initiative" rollData.title = "MR / Initiative"
rollData.nbTIC = ((this.type == "character") ? 2 : 1) + this.getExtraTICsFromEffect() rollData.nbTIC = ((this.type == "character") ? 2 : 1) + this.getExtraTICsFromEffect()
rollData.TICs = [] rollData.TICs = []
for(let i=0; i<rollData.nbTIC; i++) { for (let i = 0; i < rollData.nbTIC; i++) {
rollData.TICs.push( {text:"NONE", revealed: false, displayed: false}) rollData.TICs.push({ text: "NONE", revealed: false, displayed: false })
} }
} }
this.startRoll(rollData); this.startRoll(rollData);

4
modules/pegasus-utility.js
View File

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

4
system.json
View File

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