Merge branch 'develop' into Vereinfachter-NPC/Kreaturen-Bogen

source/module/actors/M5Character.ts

@@ -280,6 +280,7 @@ export class M5Character extends Actor {
 
 					if (!!item.system.containerId) {
 						ret.gear.containers[item.system.containerId].weight += parseFloat((item.system.weight * item.system.quantity).toPrecision(4));
+						ret.gear.containers[item.system.containerId].value += parseFloat(this.calculateValue(item.system.value * item.system.quantity, item.system.currency).toPrecision(3));
 						if (ret.gear.containers[item.system.containerId].equipped) {
 							ret.stats.encumbrance += item.system.weight * item.system.quantity;
 						}
@@ -302,6 +303,7 @@ export class M5Character extends Actor {
 						label: label,
 						icon: icon,
 						magic: item.system.magic,
+						abw: item.system.abw || 0,
 						calc: item.system.calc,
 						equipped: item.system?.equipped,
 						valuable: item.system?.valuable,
@@ -352,6 +354,7 @@ export class M5Character extends Actor {
 						icon: item.img,
 						skillId: item.system.skillId,
 						magic: item.system.magic,
+						abw: item.system.abw || 0,
 						valuable: item.system?.valuable,
 						hoarded: item.system?.hoarded,
 						value: item.system.value || 0,
@@ -395,6 +398,7 @@ export class M5Character extends Actor {
 						icon: item.img,
 						skillId: item.system.skillId,
 						magic: item.system.magic,
+						abw: item.system.abw || 0,
 						valuable: item.system?.valuable,
 						hoarded: item.system?.hoarded,
 						value: item.system.value || 0,
@@ -438,6 +442,7 @@ export class M5Character extends Actor {
 						label: label,
 						icon: item.img,
 						magic: item.system.magic,
+						abw: item.system.abw || 0,
 						valuable: item.system?.valuable,
 						hoarded: item.system?.hoarded,
 						value: item.system.value || 0,

source/module/items/M5Item.ts

@@ -343,7 +343,13 @@ export class M5Item extends Item {
 
 			if (item.type === "spell" || item.type === "kampfkunst") {
 				if (this.actor["system"].ap.value >= item.system.ap) {
-					this.actor["system"].ap.value -= item.system.ap;
+					this.actor["update"]({
+						data: {
+							ap: {
+								value: this.actor["system"].ap.value - item.system.ap,
+							},
+						},
+					});
 				}
 			}
 

source/template.json

@@ -236,7 +236,8 @@
 				"weight": 0,
 				"capacity": 0,
 				"containerId": "",
-				"magic": false
+				"magic": false,
+				"abw": 0
 			},
 			"durationSelection": {
 				"durationSelection": {
@@ -326,7 +327,8 @@
 					"ausweichen": "midgard5.kido-variante-ausweichen",
 					"blockieren": "midgard5.kido-variante-blockieren",
 					"bewegen": "midgard5.kido-variante-bewegen",
-					"kontrollieren": "midgard5.kido-variante-kontrollieren"
+					"kontrollieren": "midgard5.kido-variante-kontrollieren",
+					"finte": "midgard5.kido-variante-finte"
 				}
 			}
 		},
@@ -451,6 +453,7 @@
 			"agens": "",
 			"reagens": "",
 			"material": "",
+			"rank": 0,
 			"rolls": {
 				"formulas": {
 					"0": {
@@ -472,10 +475,11 @@
 			"ap": "",
 			"weapon": "",
 			"ep": "",
-			"rank": "",
+			"rank": 0,
 			"enemy": "",
 			"color": "",
 			"style": "",
+			"grade": "",
 			"rolls": {
 				"formulas": {
 					"0": {