Minor fixes
This commit is contained in:
parent
a57fb3d738
commit
8538af1907
@ -124,7 +124,7 @@ export class BoLUtility {
|
|||||||
let attackId = event.currentTarget.attributes['data-attack-id'].value;
|
let attackId = event.currentTarget.attributes['data-attack-id'].value;
|
||||||
let defenseMode = event.currentTarget.attributes['data-defense-mode'].value;
|
let defenseMode = event.currentTarget.attributes['data-defense-mode'].value;
|
||||||
let weaponId = (event.currentTarget.attributes['data-weapon-id']) ? event.currentTarget.attributes['data-weapon-id'].value : -1
|
let weaponId = (event.currentTarget.attributes['data-weapon-id']) ? event.currentTarget.attributes['data-weapon-id'].value : -1
|
||||||
//console.log("DEFENSE1", event.currentTarget, attackId, defenseMode, weaponId);
|
console.log("DEFENSE1", event.currentTarget, attackId, defenseMode, weaponId);
|
||||||
if ( game.user.isGM) {
|
if ( game.user.isGM) {
|
||||||
BoLUtility.processDamageHandling(event, attackId, defenseMode, weaponId)
|
BoLUtility.processDamageHandling(event, attackId, defenseMode, weaponId)
|
||||||
} else {
|
} else {
|
||||||
@ -165,10 +165,14 @@ export class BoLUtility {
|
|||||||
}
|
}
|
||||||
BoLUtility.removeChatMessageId(BoLUtility.findChatMessageId(event.currentTarget));
|
BoLUtility.removeChatMessageId(BoLUtility.findChatMessageId(event.currentTarget));
|
||||||
|
|
||||||
|
//console.log("Damage Handling", event, attackId, defenseMode, weaponId)
|
||||||
// Only GM process this
|
// Only GM process this
|
||||||
let attackDef = this.attackStore[attackId];
|
let attackDef = this.attackStore[attackId];
|
||||||
if (attackDef) {
|
if (attackDef) {
|
||||||
|
if (attackDef.defenseDone) return; // ?? Why ???
|
||||||
|
attackDef.defenseDone = true
|
||||||
attackDef.defenseMode = defenseMode;
|
attackDef.defenseMode = defenseMode;
|
||||||
|
|
||||||
if (defenseMode == 'damage-with-armor') {
|
if (defenseMode == 'damage-with-armor') {
|
||||||
let armorFormula = attackDef.defender.getArmorFormula();
|
let armorFormula = attackDef.defender.getArmorFormula();
|
||||||
attackDef.rollArmor = new Roll(armorFormula)
|
attackDef.rollArmor = new Roll(armorFormula)
|
||||||
|
Loading…
Reference in New Issue
Block a user