Add weapon item handling

source/module/items/M5Item.ts

@@ -14,17 +14,33 @@ export class M5Item extends Item {
 			calc.bonus = 0
 
 			if (context.data.attribute && context.data.attribute !== "") {
-				//console.log(context.name, context.data)
 				const attribute = character.attribute(context.data.attribute)
 				calc.bonus += M5Character.attributeBonus(attribute)
 			}
 
-			if (context._id === actor.data.data.skills.preferredCombatSkill) {
+			if (context._id === actor.data?.data?.skills.preferredCombatSkill) {
 				calc.bonus += 2
 			}
 
 			calc.ew = context.data.fw + calc.bonus
 		} else if (context.type === "weapon") {
+			calc.ew = context.data.stats.attackBonus
+			calc.combatSkills = null
+
+			if (actor) {
+				const actorCalc = character.derivedData(false, true)
+				calc.ew += actorCalc.stats.attackBonus
+
+				const skill = character.getSkill(context.data.skillId) as any
+				//console.log("M5Item.prepareDerivedData:weapon", context.data, skill?.data?.data)
+				if (skill) {
+					skill.prepareDerivedData()
+					const skillData = skill.data.data
+					calc.ew += skillData.calc.ew
+				}
+
+				calc.combatSkills = actorCalc.skills.combat
+			}
 		}
 	}