Dev Kampfkünste Items & Integration (#7)

Changes:
 + add kampfkuenste template
 + add kampfkuenste tab
 + make kampfkuenste rollable
 + update localization

source/module/M5Base.ts

@@ -170,6 +170,7 @@ export interface M5CharacterCalculatedData {
 		effects: {};
 	};
 	spells: {};
+	kampfkuenste: {};
 }
 
 export function enumKeys<O extends object, K extends keyof O = keyof O>(obj: O): K[] {

source/module/actors/M5Character.ts

@@ -25,7 +25,17 @@ export class M5Character extends Actor {
 	}
 
 	derivedData(
-		skip: { mods?: boolean; skills?: boolean; weapons?: boolean; defensiveWeapons?: boolean; armor?: boolean; items?: boolean; spells?: boolean; effects?: boolean } = {}
+		skip: {
+			mods?: boolean;
+			skills?: boolean;
+			weapons?: boolean;
+			defensiveWeapons?: boolean;
+			armor?: boolean;
+			items?: boolean;
+			spells?: boolean;
+			effects?: boolean;
+			kampfkuenste?: boolean;
+		} = {}
 	): M5CharacterCalculatedData {
 		let ret: M5CharacterCalculatedData = {
 			level: 0,
@@ -73,6 +83,7 @@ export class M5Character extends Actor {
 				effects: {},
 			},
 			spells: {},
+			kampfkuenste: {},
 		} as M5CharacterCalculatedData;
 
 		const context = this as any;
@@ -274,6 +285,22 @@ export class M5Character extends Actor {
 				});
 		}
 
+		if (!skip?.kampfkuenste) {
+			context.items
+				?.filter((item) => item.type === "kampfkunst")
+				.forEach((item) => {
+					item.prepareDerivedData();
+
+					ret.kampfkuenste[item.id] = {
+						label: item.name,
+						isKido: item.system.isKido,
+						type: item.system.type,
+						variante: item.system.variante,
+						calc: item.system.calc,
+					};
+				});
+		}
+
 		return ret;
 	}
 

source/module/items/M5Item.ts

@@ -31,7 +31,7 @@ export class M5Item extends Item {
 			];
 
 			if (character) {
-				const actorCalc = character.derivedData({ skills: true, weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true });
+				const actorCalc = character.derivedData({ skills: true, weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true, kampfkuenste: true });
 				if (actorCalc?.skillMods && Object.keys(actorCalc.skillMods).indexOf(itemId) !== -1) {
 					pairs = pairs.concat(actorCalc.skillMods[itemId]);
 				}
@@ -65,7 +65,7 @@ export class M5Item extends Item {
 			calc.combatSkills = null;
 
 			if (actor) {
-				const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true });
+				const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true, kampfkuenste: true });
 				if (actorCalc) {
 					calc.ew += actorCalc.stats.attackBonus.value;
 					calc.combatSkills = actorCalc.skills.combat;
@@ -89,7 +89,7 @@ export class M5Item extends Item {
 			calc.combatSkills = null;
 
 			if (actor) {
-				const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true });
+				const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true, kampfkuenste: true });
 				if (actorCalc) {
 					calc.ew += actorCalc.stats.defense.value + actorCalc.stats.defenseBonus.value;
 					calc.combatSkills = actorCalc.skills.combat;
@@ -108,11 +108,32 @@ export class M5Item extends Item {
 		} else if (itemType === "spell") {
 			calc.fw = 0;
 			if (actor) {
-				const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true });
+				const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true, kampfkuenste: true });
 				if (actorCalc) {
 					calc.ew = actorCalc.stats.spellCasting.value;
 				}
 			}
+		} else if (itemType === "kampfkunst") {
+			calc.fw = 0;
+			calc.bonus = 0;
+			calc.ew = 0;
+			calc.generalSkills = null;
+
+			if (actor) {
+				const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true, kampfkuenste: true });
+				if (actorCalc) {
+					calc.generalSkills = actorCalc.skills.general;
+				}
+
+				const skill = character.getItem(itemData.skillId);
+				if (skill) {
+					skill.prepareDerivedData();
+					const skillData = skill.system;
+					calc.ew = skillData.calc.ew;
+					calc.fw = skillData.fw + calc.bonus;
+					itemData.rolls.formulas[0].label = skill.name;
+				}
+			}
 		} else if (itemType === "item" || itemType === "effect") {
 			calc.mods = {};
 			Object.keys(itemData?.mods).forEach((key) => {
@@ -135,7 +156,7 @@ export class M5Item extends Item {
 					}
 					case M5ModType.SKILL: {
 						if (character) {
-							const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true });
+							const actorCalc = character.derivedData({ weapons: true, defensiveWeapons: true, armor: true, items: true, spells: true, effects: true, kampfkuenste: true });
 							if (actorCalc) {
 								let category = (game as Game).i18n.localize("midgard5.skill");
 								Object.keys(actorCalc.skills.general).forEach((skillId) => {

source/module/rolls/M5Roll.ts

@@ -245,6 +245,27 @@ export class M5Roll {
 		return new M5Roll(rollData, actor, (game as Game).i18n.localize("midgard5.resistanceMind"));
 	}
 
+	static async initativeRoll(actor: any) {
+		let newInitiative; // the initiative value for the combatant
+
+		// ...
+		// The intnitiative value is calculated here
+		// ...
+
+		let combatant = game["combat"].getCombatantByActor(actor._id);
+		if (!combatant) {
+			await game["combat"].createEmbeddedDocuments("Combatant", [{ actorId: actor._id }]);
+			combatant = game["combat"].getCombatantByActor(actor._id);
+		}
+
+		const initiatives = {
+			_id: combatant._id,
+			initiative: actor.system.calc.attributes.gw.value,
+		};
+
+		await game["combat"].updateEmbeddedDocuments("Combatant", [initiatives]);
+	}
+
 	static resistanceBody(actor: any) {
 		const rollData = actor.getRollData() as M5RollData;
 		rollData.i = {

source/module/sheets/M5CharacterSheet.ts

@@ -206,7 +206,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"].includes(item.type)) {
+		if (["skill", "item", "weapon", "defensiveWeapon", "armor", "spell", "effect", "kampfkunst"].includes(item.type)) {
 			const dragData = {
 				type: "Transfer",
 				actorId: this.actor.id,