Merge branch 'develop' into lefrique

source/module/actors/M5Character.ts

@@ -31,6 +31,7 @@ export class M5Character extends Actor {
 			defensiveWeapons?: boolean;
 			armor?: boolean;
 			items?: boolean;
+			containers?: boolean;
 			spells?: boolean;
 			effects?: boolean;
 			kampfkuenste?: boolean;
@@ -85,6 +86,7 @@ export class M5Character extends Actor {
 				defensiveWeapons: {},
 				armor: {},
 				items: {},
+				containers: {},
 				effects: {},
 			},
 			spells: {},
@@ -153,7 +155,7 @@ export class M5Character extends Actor {
 			const aggregate = new M5ModAggregate(data, ret);
 
 			context.items
-				?.filter((item) => (item.type === "item" || item.type === "effect" || item.type === "armor") && item.system.equipped)
+				?.filter((item) => (item.type === "item" || item.type === "effect" || item.type === "armor" || item.type === "container") && item.system.equipped)
 				.forEach((item) => {
 					const mods = item.system.mods;
 					//console.log("Actor item mods", mods)
@@ -185,6 +187,7 @@ export class M5Character extends Actor {
 						ret.stats.hoard += item.system.value || 0;
 					}
 					
+					let icon = item.img;
 					let rollable = false;
 
 					// console.log(item.system.rolls.formulas.map((p) => p.enabled));
@@ -197,11 +200,50 @@ export class M5Character extends Actor {
 					
 					ret.gear.items[item.id] = {
 						label: label,
+						icon: icon,
+						magic: item.system.magic,
+						calc: item.system.calc,
+						equipped: item.system?.equipped,
+						weight: item.system.weight || 0,
+						containerId: item.system.containerId || "",
+						value: item.system.value || 0,
+						currency: item.system.currency || "",
+						quantity: item.system.quantity || 0,
+						rollExist: rollable,
+					};
+				});
+		}
+
+		if (!skip?.containers) {
+			context.items
+				?.filter((item) => item.type === "container")
+				.forEach((item) => {
+					item.prepareDerivedData();
+
+					let label = item.name;
+					if (item.system.magic) {
+						label += "*";
+					}
+					let icon = item.img;
+					let rollable = false;
+
+					// console.log(item.system.rolls.formulas.map((p) => p.enabled));
+					for (let key in item.system.rolls.formulas) {
+						rollable = item.system.rolls.formulas[key].enabled;
+						if (rollable) {
+							break;
+						}
+					}
+					ret.gear.containers[item.id] = {
+						label: label,
+						icon: icon,
 						magic: item.system.magic,
 						valuable: item.system?.valuable,
 						hoarded: item.system?.hoarded,
 						calc: item.system.calc,
 						equipped: item.system?.equipped,
+						weight: item.system.weight || 0,
+						containerId: item.system.containerId || "",
 						value: item.system.value || 0,
 						currency: item.system.currency || "",
 						quantity: item.system.quantity || 0,