Charakterbogen anpassen #7 (#9)

- Use of flexboxes in two columns for better display
- Introduction of item containers for the different storage of items

Co-authored-by: Ender <harald@drueppels.de>
Co-authored-by: Byroks <byroks@gmail.com>
Reviewed-on: Byroks/foundry-vtt-system-midgard5#9
Reviewed-by: Byroks <byroks@gmail.com>

source/module/M5Base.ts

@@ -187,6 +187,7 @@ export interface M5CharacterCalculatedData {
 		defensiveWeapons: {};
 		armor: {};
 		items: {};
+		containers: {};
 		effects: {};
 	};
 	spells: {};

source/module/actors/M5Character.ts

@@ -32,6 +32,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: {},
@@ -148,7 +150,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)
@@ -171,6 +173,7 @@ export class M5Character extends Actor {
 					if (item.system.magic) {
 						label += "*";
 					}
+					let icon = item.img;
 					let rollable = false;
 
 					// console.log(item.system.rolls.formulas.map((p) => p.enabled));
@@ -182,9 +185,48 @@ 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,
+						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,

source/module/items/M5Item.ts

@@ -14,7 +14,22 @@ export class M5Item extends Item {
 		const itemData = (this as any).system;
 		const calc = itemData.calc;
 
-		if (itemType === "skill") {
+	if (itemType === "item") {
+		calc.containers = null;
+
+		if (actor) {
+			const actorCalc = actor.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true, kampfkuenste: true });
+			if (actorCalc) {
+				calc.containers = actorCalc.gear.containers;
+			}
+			const container = character.getItem(itemData.containerId);
+			//console.log("M5Item.prepareDerivedData:containers", itemData, container?.system)
+			if (container) {
+				container.prepareDerivedData();
+				const containerData = container.system;
+			}	
+		}	
+	} else if (itemType === "skill") {
 			calc.fw = itemData.fw;
 			calc.bonus = 0;
 

source/module/sheets/M5CharacterSheet.ts

@@ -8,7 +8,7 @@ export default class M5CharacterSheet extends ActorSheet {
 	static get defaultOptions() {
 		return mergeObject(super.defaultOptions, {
 			template: "systems/midgard5/templates/sheets/character/main.hbs",
-			width: 800,
+			width: 1200,
 			height: 800,
 			classes: ["midgard5", "sheet", "character"],
 			tabs: [{ navSelector: ".sheet-navigation", contentSelector: ".sheet-content", initial: "base_values" }],
@@ -270,7 +270,7 @@ export default class M5CharacterSheet extends ActorSheet {
 		const item = this.actor.items.get(li.dataset.itemId);
 
 		// limit transfer on personal weapons/armour/gear
-		if (["skill", "item", "weapon", "defensiveWeapon", "armor", "spell", "effect", "kampfkunst"].includes(item.type)) {
+		if (["skill", "item", "weapon", "defensiveWeapon", "armor", "spell", "effect", "kampfkunst", "container"].includes(item.type)) {
 			const dragData = {
 				type: "Transfer",
 				actorId: this.actor.id,

source/module/sheets/M5ItemSheet.ts

@@ -30,7 +30,7 @@ export class M5ItemSheet extends ItemSheet {
 			context.rollData = {}
 			let actor = this.object?.parent ?? null
 			if (actor) {
-				context.rollData = actor.getRollData()
+				context.rollData = actor.getRollData() 
 			}
 		
 			context.data = itemData.system