Merge pull request 'fix: utilisation d’une variable non définie' (#24) from DjLeChuck/bol:fix-damage-without-armor-apply into v10
Reviewed-on: #24
This commit is contained in:
commit
e3b281f195
@ -193,7 +193,7 @@ export class BoLUtility {
|
|||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
static async ready() {
|
static async ready() {
|
||||||
//$("#logo").attr("src", this.getLogoTopLeft() )
|
//$("#logo").attr("src", this.getLogoTopLeft() )
|
||||||
$("#logo").css("content", `url(${this.getLogoTopLeft()})`)
|
$("#logo").css("content", `url(${this.getLogoTopLeft()})`)
|
||||||
|
|
||||||
CONFIG.statusEffects = duplicate(game.bol.config.statusEffects)
|
CONFIG.statusEffects = duplicate(game.bol.config.statusEffects)
|
||||||
@ -451,7 +451,7 @@ export class BoLUtility {
|
|||||||
BoLUtility.removeChatMessageId(msgId)
|
BoLUtility.removeChatMessageId(msgId)
|
||||||
|
|
||||||
console.log("Damage Handling", attackId, defenseMode, weaponId)
|
console.log("Damage Handling", attackId, defenseMode, weaponId)
|
||||||
// Only GM process this
|
// Only GM process this
|
||||||
if (rollData && rollData.defenderId) {
|
if (rollData && rollData.defenderId) {
|
||||||
if (rollData.defenseDone || defenseMode == 'damage-not-applied') {
|
if (rollData.defenseDone || defenseMode == 'damage-not-applied') {
|
||||||
return
|
return
|
||||||
@ -472,7 +472,7 @@ export class BoLUtility {
|
|||||||
console.log("Armor roll -> result ", rollData)
|
console.log("Armor roll -> result ", rollData)
|
||||||
}
|
}
|
||||||
if (defenseMode == 'damage-without-armor') {
|
if (defenseMode == 'damage-without-armor') {
|
||||||
rollData.finalDamage = atrollDatatackDef.damageTotal
|
rollData.finalDamage = rollData.damageTotal
|
||||||
defender.sufferDamage(rollData.finalDamage)
|
defender.sufferDamage(rollData.finalDamage)
|
||||||
}
|
}
|
||||||
if (defenseMode == 'hero-reduce-damage') {
|
if (defenseMode == 'hero-reduce-damage') {
|
||||||
@ -611,7 +611,7 @@ export class BoLUtility {
|
|||||||
attackId: rollData.id,
|
attackId: rollData.id,
|
||||||
attacker: rollData.attacker,
|
attacker: rollData.attacker,
|
||||||
defender: defender,
|
defender: defender,
|
||||||
defenderHeroPoints:defender.getHeroPoints(),
|
defenderHeroPoints:defender.getHeroPoints(),
|
||||||
defenderWeapons: defenderWeapons,
|
defenderWeapons: defenderWeapons,
|
||||||
damageTotal: rollData.damageTotal,
|
damageTotal: rollData.damageTotal,
|
||||||
damagesIgnoresArmor: rollData.damagesIgnoresArmor,
|
damagesIgnoresArmor: rollData.damagesIgnoresArmor,
|
||||||
|
Loading…
Reference in New Issue
Block a user