FIX: Weapons working
							parent
							
								
									3283519e4a
								
							
						
					
					
						commit
						24c6ab547a
					
				|  | @ -68,10 +68,7 @@ export class OseDice { | |||
|     if (form !== null && 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(); | ||||
| 
 | ||||
|     // Convert the roll to a chat message and return the roll
 | ||||
|  | @ -175,8 +172,6 @@ export class OseDice { | |||
|     // Optionally include a situational bonus
 | ||||
|     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 dmgRoll = new Roll(data.roll.dmg.join("+"), data).roll(); | ||||
| 
 | ||||
|  |  | |||
|  | @ -115,13 +115,10 @@ export class OseItem extends Item { | |||
|     } | ||||
|     this.actor.rollAttack( | ||||
|       { | ||||
|         roll: { | ||||
|           type: type, | ||||
|         }, | ||||
|         actor: this.actor.data, | ||||
|         item: this.data, | ||||
|       }, | ||||
|       options | ||||
|       {type: type} | ||||
|     ); | ||||
| 
 | ||||
|     return true; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue