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

FIX: Weapons working

master
U~man 2020-07-25 23:34:38 +02:00
parent 3283519e4a
commit 24c6ab547a
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/module/dice.js
View File

@ -68,10 +68,7 @@ export class OseDice {
if (form !== null && form.bonus.value) { if (form !== null && form.bonus.value) {
parts.push(form.bonus.value); parts.push(form.bonus.value);
} }
if (data.item && data.item.data.bonus) {
parts.push(data.item.data.bonus.toString());
}
console.log(parts);
const roll = new Roll(parts.join("+"), data).roll(); const roll = new Roll(parts.join("+"), data).roll();
// Convert the roll to a chat message and return the roll // Convert the roll to a chat message and return the roll
@ -175,8 +172,6 @@ export class OseDice {
// Optionally include a situational bonus // Optionally include a situational bonus
if (form !== null && form.bonus.value) parts.push(form.bonus.value); if (form !== null && form.bonus.value) parts.push(form.bonus.value);
if (data.item && data.item.data.bonus) parts.push(data.item.data.bonus);
const roll = new Roll(parts.join("+"), data).roll(); const roll = new Roll(parts.join("+"), data).roll();
const dmgRoll = new Roll(data.roll.dmg.join("+"), data).roll(); const dmgRoll = new Roll(data.roll.dmg.join("+"), data).roll();

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

@ -115,13 +115,10 @@ export class OseItem extends Item {
} }
this.actor.rollAttack( this.actor.rollAttack(
{ {
roll: {
type: type,
},
actor: this.actor.data, actor: this.actor.data,
item: this.data, item: this.data,
}, },
options {type: type}
); );
return true; return true;