Finishes mod system functionality

source/module/items/M5Item.ts

@@ -30,18 +30,18 @@ export class M5Item extends Item {
 				const actorCalc = character.derivedData({ skills: true, weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true })
 				if (actorCalc?.skillMods && Object.keys(actorCalc.skillMods).indexOf(context._id) !== -1) {
 					pairs = pairs.concat(actorCalc.skillMods[context._id])
-				}
 				
-				if (context.data?.attribute && context.data?.attribute !== "") {
-					pairs.push({
-						source: context.name,
-						mod: {
-							type: M5ModType.SKILL,
-							id: context._id,
-							operation: M5ModOperation.ADD,
-							value: actorCalc.attributes[context.data.attribute].bonus
-						}
-					})
+					if (context.data?.attribute && context.data?.attribute !== "") {
+						pairs.push({
+							source: context.name,
+							mod: {
+								type: M5ModType.SKILL,
+								id: context._id,
+								operation: M5ModOperation.ADD,
+								value: actorCalc.attributes[context.data.attribute].bonus
+							}
+						})
+					}
 				}
 			}
 
@@ -119,15 +119,15 @@ export class M5Item extends Item {
 				switch (mod.type) {
 					case M5ModType.ATTRIBUTE: {
 						for (const key of enumKeys(M5Attributes)) {
-							const val = M5Attributes[key]
-							modCalc[key] = (game as Game).i18n.localize(`midgard5.actor-${val}-long`)
+							const val: string = M5Attributes[key]
+							modCalc[val] = (game as Game).i18n.localize(`midgard5.actor-${val}-long`)
 						}
 						break
 					}
 					case M5ModType.STAT: {
 						for (const key of enumKeys(M5Stats)) {
-							const val = M5Stats[key]
-							modCalc[key] = (game as Game).i18n.localize(`midgard5.mod-stat-${val}`)
+							const val: string = M5Stats[key]
+							modCalc[val] = (game as Game).i18n.localize(`midgard5.mod-stat-${val}`)
 						}
 						break
 					}