#70-classes-as-items (#92)

Co-authored-by: LeFrique <lefrique@live.de>
Reviewed-on: #92

source/module/actors/M5Character.ts

@@ -1,18 +1,5 @@
 import { M5Item } from "../items/M5Item";
-import {
-	M5Attribute,
-	M5CharacterCalculatedData,
-	M5ItemMod,
-	M5ItemType,
-	M5ModOperation,
-	M5ModResult,
-	M5ModType,
-	M5RollData,
-	M5Skill,
-	M5SkillCalculated,
-	M5SkillLearned,
-	M5SkillType,
-} from "../M5Base";
+import { M5Attribute, M5CharacterCalculatedData, M5ItemMod, M5ItemType, M5ModOperation, M5ModResult, M5RollData, M5Skill, M5SkillCalculated } from "../M5Base";
 import M5ModAggregate from "./M5ModAggregate";
 export class M5Character extends Actor {
 	// constructor(
@@ -94,6 +81,7 @@ export class M5Character extends Actor {
 			containers?: boolean;
 			kampfkuenste?: boolean;
 			encumbrance?: boolean;
+			class?: boolean;
 		} = {}
 	): M5CharacterCalculatedData {
 		let ret: M5CharacterCalculatedData = {
@@ -194,12 +182,8 @@ export class M5Character extends Actor {
 		ret.stats.attackBonus = this.modResult(ret.attributes.gs.bonus);
 		ret.stats.defenseBonus = this.modResult(ret.attributes.gw.bonus);
 		ret.stats.movement = this.modResult(data.movement);
-		ret.stats.resistanceMind = this.modResult(
-			(data.info.magicUsing ? 2 : 0) + ret.stats.defense.value + (data.info.race === "Mensch" ? ret.attributes.in.bonus : this.raceBonus(data.info.race))
-		);
-		ret.stats.resistanceBody = this.modResult(
-			(data.info.magicUsing ? 2 : 1) + ret.stats.defense.value + (data.info.race === "Mensch" ? ret.attributes.ko.bonus : this.raceBonus(data.info.race))
-		);
+		ret.stats.resistanceMind = this.modResult(ret.stats.defense.value + (data.info.race === "Mensch" ? ret.attributes.in.bonus : this.raceBonus(data.info.race)));
+		ret.stats.resistanceBody = this.modResult(ret.stats.defense.value + (data.info.race === "Mensch" ? ret.attributes.ko.bonus : this.raceBonus(data.info.race)));
 		ret.stats.spellCasting = this.modResult((data.info.magicUsing ? M5Character.spellCastingFromLevel(ret.level) : 3) + ret.attributes.zt.bonus);
 		ret.stats.brawl = this.modResult(Math.floor((ret.attributes.st.value + ret.attributes.gw.value) / 20));
 		ret.stats.brawlFw = ret.stats.brawl.value + ret.stats.attackBonus.value + (data.info.race === "Zwerg" ? 1 : 0);
@@ -223,7 +207,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.type === "container") && item.system.equipped)
+				?.filter((item) => (item.type === "item" || item.type === "effect" || item.type === "armor" || item.type === "container" || item.type === "class") && item.system.equipped)
 				.forEach((item) => {
 					const mods = item.system.mods;
 					//console.log("Actor item mods", mods)
@@ -499,6 +483,25 @@ export class M5Character extends Actor {
 				//}
 			}
 
+		if (!skip?.class) {
+			context.items
+				?.filter((item) => item.type === "class")
+				.sort((a, b) => b?.system.magicUsing - a?.system.magicUsing)
+				.forEach((item, index) => {
+					if (index !== 0) {
+						item.system.equipped = false;
+					} else {
+						item.system.equipped = true;
+						data.info.magicUsing = item.system.magicUsing;
+					}
+
+					if (typeof data.info.class === "string") {
+						data.info.class = {};
+					}
+					data.info.class[item.id] = item.name;
+				});
+		}
+
 		if (!skip?.effects) {
 			context.items
 				?.filter((item) => item.type === "effect")
@@ -565,7 +568,7 @@ export class M5Character extends Actor {
 						type: item.system.type,
 						castDuration: item.system.castDuration || 0,
 						ap: item.system.ap || 0,
-						range: item.system.range|| 0,
+						range: item.system.range || 0,
 						effectTarget: item.system.effectTarget,
 						effectArea: item.system.effectArea,
 						effectDuration: item.system.effectDuration || 0,

source/module/items/M5Item.ts

@@ -18,7 +18,7 @@ export class M5Item extends Item {
 			calc.containers = null;
 
 			if (actor) {
-				const actorCalc = actor.derivedData({ containers: false, items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true });
+				const actorCalc = actor.derivedData({ containers: false, items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true, class: true });
 				if (actorCalc) {
 					calc.containers = actorCalc.gear.containers;
 				}
@@ -47,12 +47,14 @@ export class M5Item extends Item {
 
 			if (character) {
 				const actorCalc = character.derivedData({
+					containers: true,
 					skills: true,
 					items: true,
 					spells: true,
 					effects: true,
 					kampfkuenste: true,
 					encumbrance: true,
+					class: true,
 				});
 				if (actorCalc?.skillMods && Object.keys(actorCalc.skillMods).indexOf(itemId) !== -1) {
 					pairs = pairs.concat(actorCalc.skillMods[itemId]);
@@ -89,7 +91,7 @@ export class M5Item extends Item {
 			calc.containers = null;
 
 			if (actor) {
-				const actorCalc = character.derivedData({ items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true });
+				const actorCalc = character.derivedData({ items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true, class: true });
 				if (actorCalc) {
 					calc.ew += actorCalc.stats.attackBonus.value;
 					calc.combatSkills = actorCalc.skills.combat;
@@ -124,7 +126,7 @@ export class M5Item extends Item {
 			calc.containers = null;
 
 			if (actor) {
-				const actorCalc = character.derivedData({ items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true });
+				const actorCalc = character.derivedData({ items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true, class: true });
 				if (actorCalc) {
 					calc.ew += actorCalc.stats.defense.value + actorCalc.stats.defenseBonus.value;
 					calc.combatSkills = actorCalc.skills.combat;
@@ -157,7 +159,7 @@ export class M5Item extends Item {
 			itemData.mods[5] = { type: "stat", id: "apProtection", operation: "set", value: itemData.apProtection };
 			calc.containers = null;
 			if (actor) {
-				const actorCalc = actor.derivedData({ items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true });
+				const actorCalc = actor.derivedData({ items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true, class: true });
 				if (actorCalc) {
 					calc.containers = actorCalc.gear.containers;
 				}
@@ -171,7 +173,7 @@ export class M5Item extends Item {
 		} else if (itemType === "spell") {
 			calc.fw = 0;
 			if (actor) {
-				const actorCalc = character.derivedData({ items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true });
+				const actorCalc = character.derivedData({ containers: true, items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true, class: true });
 				if (actorCalc) {
 					calc.ew = actorCalc.stats.spellCasting.value;
 				}
@@ -183,7 +185,7 @@ export class M5Item extends Item {
 			calc.generalSkills = null;
 
 			if (actor) {
-				const actorCalc = character.derivedData({ items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true });
+				const actorCalc = character.derivedData({ containers: true, items: true, spells: true, effects: true, kampfkuenste: true, encumbrance: true, class: true });
 				if (actorCalc) {
 					calc.generalSkills = actorCalc.skills.general;
 				}
@@ -197,6 +199,9 @@ export class M5Item extends Item {
 					itemData.rolls.formulas[0].label = skill.name;
 				}
 			}
+		} else if (itemType === "class") {
+			itemData.mods[0] = { type: "stat", id: "resistanceBody", operation: "add", value: itemData.resistanceBody };
+			itemData.mods[1] = { type: "stat", id: "resistanceMind", operation: "add", value: itemData.resistanceMind };
 		}
 		if (itemData?.mods) {
 			calc.mods = {};

source/module/sheets/M5CharacterSheet.ts

@@ -433,6 +433,14 @@ export default class M5CharacterSheet extends ActorSheet {
 			}
 		});
 
+		html.find(".class-item-edit").on("click", async (event) => {
+			this.actor.items.find((x) => x.type === "class").sheet.render(true);
+		});
+
+		html.find(".class-item-delete").on("click", async (event) => {
+			this.actor.items.find((x) => x.type === "class").delete();
+		});
+
 		// Drag & Drop
 		const dragDrop = new DragDrop({
 			dragSelector: ".items-list .item",

source/module/sheets/M5ItemSheet.ts

@@ -7,6 +7,13 @@ export class M5ItemSheet extends ItemSheet {
 			width: 640,
 			height: 480,
 			classes: ["midgard5", "sheet", "item"],
+			tabs: [
+				{
+					navSelector: ".sheet-navigation",
+					contentSelector: ".sheet-content",
+					initial: "base_values",
+				},
+			],
 		});
 	}