diff --git a/lang/de.json b/lang/de.json index 1014c7f..b51472e 100644 --- a/lang/de.json +++ b/lang/de.json @@ -275,6 +275,10 @@ "midgard5.mod-operation-add": "Addieren", "midgard5.mod-operation-set": "Basiswert", "midgard5.mod-operation-fixed": "Fester Wert", + "midgard5.mod-operation-subtract": "Subtrahieren", + "midgard5.mod-operation-multiply": "Multiplizieren", + "midgard5.mod-operation-division": "Dividieren", + "midgard5.mod-stat-defenseBonus": "Abwehrbonus", "midgard5.mod-stat-attackBonus": "Angriffsbonus", diff --git a/packs/items/kampfzustaende/angeschlagen.json b/packs/items/kampfzustaende/angeschlagen.json index ce189a0..6c499c2 100644 --- a/packs/items/kampfzustaende/angeschlagen.json +++ b/packs/items/kampfzustaende/angeschlagen.json @@ -1,7 +1,7 @@ { "name": "Angeschlagen", "type": "effect", - "img": "icons/skills/wounds/injury-pain-body-orange.web", + "img": "icons/skills/wounds/injury-pain-body-orange.webp", "system": { "description": "", "equippable": false, diff --git a/packs/items/kampfzustaende/verwirrt.json b/packs/items/kampfzustaende/verwirrt.json index 8d33277..204284a 100644 --- a/packs/items/kampfzustaende/verwirrt.json +++ b/packs/items/kampfzustaende/verwirrt.json @@ -1,5 +1,5 @@ { - "name": "Lahm", + "name": "Verwirrt", "type": "effect", "img": "icons/magic/control/silhouette-grow-shrink-blue.webp", "system": { diff --git a/source/module/actors/M5ModAggregate.ts b/source/module/actors/M5ModAggregate.ts index c84fa37..0e2fbe8 100644 --- a/source/module/actors/M5ModAggregate.ts +++ b/source/module/actors/M5ModAggregate.ts @@ -130,22 +130,22 @@ export default class M5ModAggregate { mods = arr.filter((pair) => pair.mod.operation === M5ModOperation.SUBTRACT); if (mods.length !== 0) { ret.mods = ret.mods.concat(mods.map(this.pairAsSource)); - const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a - b, 0); - ret.value = Math.max(0, ret.value + bonus); + const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0); + ret.value = Math.max(0, ret.value - bonus); } mods = arr.filter((pair) => pair.mod.operation === M5ModOperation.MULTIPLY); if (mods.length !== 0) { ret.mods = ret.mods.concat(mods.map(this.pairAsSource)); - const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a * b, 0); - ret.value = Math.max(0, ret.value + bonus); + const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0); + ret.value = Math.max(0, ret.value * bonus); } mods = arr.filter((pair) => pair.mod.operation === M5ModOperation.DIVISION); if (mods.length !== 0) { ret.mods = ret.mods.concat(mods.map(this.pairAsSource)); - const bonus = mods.map((p) => p.mod.value).reduce((a, b) => Math.floor(a / b), 0); - ret.value = Math.max(0, ret.value + bonus); + const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0); + ret.value = Math.max(0, Math.floor(ret.value / bonus)); } } diff --git a/templates/sheets/partial/mod.hbs b/templates/sheets/partial/mod.hbs index f56d85a..d4a2bfe 100644 --- a/templates/sheets/partial/mod.hbs +++ b/templates/sheets/partial/mod.hbs @@ -40,6 +40,9 @@ + + + {{/select}}