daniel
/
foundryacks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Monster damages

master
U~man 2020-07-07 00:44:44 +02:00
parent bae803025e
commit c94807c9ae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/module/actor/entity.js
View File

@ -215,7 +215,7 @@ export class OseActor extends Actor {
}; };
let dmgParts = []; let dmgParts = [];
if (!attData.dmg || !game.settings.get("ose", "variableWeaponDamage")) { if ((!attData.dmg || !game.settings.get("ose", "variableWeaponDamage")) && this.type == "character") {
dmgParts.push("1d6"); dmgParts.push("1d6");
} else { } else {
dmgParts.push(attData.dmg); dmgParts.push(attData.dmg);
@ -243,8 +243,8 @@ export class OseActor extends Actor {
const rollParts = ["1d20"]; const rollParts = ["1d20"];
const dmgParts = []; const dmgParts = [];
if (!attData.dmg || !game.settings.get("ose", "variableWeaponDamage")) { if ((!attData.dmg || !game.settings.get("ose", "variableWeaponDamage")) && this.type == "character") {
dmgParts.push("1d6"); dmgParts.push("1d6");
} else { } else {
dmgParts.push(attData.dmg); dmgParts.push(attData.dmg);

2
src/module/item/entity.js
View File

@ -57,7 +57,7 @@ export class OseItem extends Item {
} else if (this.data.data.melee && !isNPC) { } else if (this.data.data.melee && !isNPC) {
this.actor.rollAttack({type: 'melee', label: this.name, dmg: this.data.data.damage}); this.actor.rollAttack({type: 'melee', label: this.name, dmg: this.data.data.damage});
} else { } else {
this.actor.rollAttack({type: 'raw', label: this.name}); this.actor.rollAttack({type: 'raw', label: this.name, dmg: this.data.data.damage});
} }
return true; return true;
} }