Merge branch 'develop' into 24-injuries-as-effects-and-adding-them-to-macros

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",

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,

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": {

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);
+				const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0);
-				ret.value = Math.max(0, ret.value + bonus);
+				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);
+				const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0);
-				ret.value = Math.max(0, ret.value + bonus);
+				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);
+				const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0);
-				ret.value = Math.max(0, ret.value + bonus);
+				ret.value = Math.max(0, Math.floor(ret.value / bonus));
 			}
 		}
 

templates/sheets/partial/mod.hbs

@@ -40,6 +40,9 @@
 							<option value="add">{{localize "midgard5.mod-operation-add"}}</option>
 							<option value="set">{{localize "midgard5.mod-operation-set"}}</option>
 							<option value="fixed">{{localize "midgard5.mod-operation-fixed"}}</option>
+							<option value="subtract">{{localize "midgard5.mod-operation-subtract"}}</option>
+							<option value="multiply">{{localize "midgard5.mod-operation-multiply"}}</option>
+							<option value="division">{{localize "midgard5.mod-operation-division"}}</option>
 						{{/select}}
 					</select>
 				</td>