Squashed commit of the following:

commit 250fc499ae
Author: Byroks <byroks@gmail.com>
Date:   Thu Nov 30 16:17:04 2023 +0100

    v2.1.0

commit 28595e7dd0
Author: Byroks <byroks@gmail.com>
Date:   Thu Nov 30 15:50:59 2023 +0100

    Make Items with mods equippable (#11)

    Changes:
     + Items that can influence you stats are equippable
     + only equipped items influence your stats
     + Armor now influences your stats
     + move mods into a partial for easier changes

commit 8095785fc2
Author: Byroks <byroks@gmail.com>
Date:   Wed Nov 29 10:14:49 2023 +0100

    Movement stat (#10)

    Changes:
     + make movement stat work and be moddable by effects

commit e141839055
Merge: 14e005c 0bfa224
Author: Byroks <byroks@gmail.com>
Date:   Tue Nov 28 19:50:38 2023 +0100

    Merge branch 'main' into develop

commit 14e005cb0a
Author: Byroks <byroks@gmail.com>
Date:   Tue Nov 28 19:48:14 2023 +0100

    v2.0.0

commit c635c54f24
Author: Byroks <byroks@gmail.com>
Date:   Tue Nov 28 19:42:38 2023 +0100

    Dev Kampfkünste Items & Integration (#7)

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

commit e27f4209e5
Author: Byroks <byroks@gmail.com>
Date:   Mon Nov 27 20:05:20 2023 +0100

    Squashed commit of the following:

    commit 0bfa224dae
    Author: Byroks <byroks@gmail.com>
    Date:   Mon Nov 27 19:56:05 2023 +0100

        V1.3.1 (#6)

        * v1.3.1

        * v1.3.1

        * update .gitingore

    commit 35a6b0fae9
    Author: Byroks <byroks@gmail.com>
    Date:   Mon Nov 27 19:48:56 2023 +0100

        v1.3.1

    commit db21ca93b0
    Author: Byroks <byroks@gmail.com>
    Date:   Sun Nov 26 13:13:13 2023 +0100

        subtract ap when casting spell

        Changes:
         + subtract AP when casting a spell

lang/de.json

@@ -197,6 +197,8 @@
 	"midgard5.defensive-weapon": "Verteidigungswaffe",
 	"midgard5.no-skill": "Keine Fertigkeit",
 	"midgard5.magic": "magisch",
+	"midgard5.equipped": "Ausgerüstet",
+	"midgard5.active": "Aktiv",
 	"midgard5.rangedWeapon": "Schusswaffe",
 	"midgard5.assignItemToCharacter": "Füge Gegenstand einem Charakter hinzu, um Fähigkeit auwählen zu können",
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "foundry-system-midgard5",
-	"version": "2.0.0",
+	"version": "2.1.0",
 	"description": "",
 	"main": "index.js",
 	"scripts": {

packs/items/blaupause-gegenstaende/rüstung.json

@@ -13,8 +13,7 @@
 			"resistanceBody": 0,
 			"spellBonus": 0
 		},
-		"equippable": false,
+		"equipped": false,
-		"equipped": true,
 		"attributeMod": {
 			"st": 0,
 			"gs": 0,

source/PreloadTemplates.ts

@@ -13,6 +13,7 @@ const preloadTemplates = async (): Promise<Handlebars.TemplateDelegate<any>[]> =
 		"sheets/character/spells.hbs",
 		"sheets/character/kampfkuenste.hbs",
 		"sheets/character/effects.hbs",
+		"sheets/partial/mod.hbs",
 		"sheets/item/rolls.hbs",
 		"chat/roll-m5.hbs",
 	];

source/module/M5Base.ts

@@ -145,7 +145,7 @@ export interface M5CharacterCalculatedData {
 		damageBonus: M5ModResult;
 		attackBonus: M5ModResult;
 		defenseBonus: M5ModResult;
-		movementBonus: M5ModResult;
+		movement: M5ModResult;
 		resistanceMind: M5ModResult;
 		resistanceBody: M5ModResult;
 		spellCasting: M5ModResult;

source/module/actors/M5Character.ts

@@ -58,7 +58,7 @@ export class M5Character extends Actor {
 				damageBonus: { value: 0, mods: [] },
 				attackBonus: { value: 0, mods: [] },
 				defenseBonus: { value: 0, mods: [] },
-				movementBonus: { value: 0, mods: [] },
+				movement: { value: 0, mods: [] },
 				resistanceMind: { value: 0, mods: [] },
 				resistanceBody: { value: 0, mods: [] },
 				spellCasting: { value: 0, mods: [] },
@@ -121,7 +121,7 @@ export class M5Character extends Actor {
 		ret.stats.damageBonus = this.modResult(Math.floor(ret.attributes.st.value / 20) + Math.floor(ret.attributes.gs.value / 30) - 3);
 		ret.stats.attackBonus = this.modResult(ret.attributes.gs.bonus);
 		ret.stats.defenseBonus = this.modResult(ret.attributes.gw.bonus);
-		ret.stats.movementBonus = this.modResult(0);
+		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))
 		);
@@ -138,7 +138,7 @@ export class M5Character extends Actor {
 			const aggregate = new M5ModAggregate(data, ret);
 
 			context.items
-				?.filter((item) => item.type === "item" || item.type === "effect")
+				?.filter((item) => (item.type === "item" || item.type === "effect" || item.type === "armor") && item.system.equipped)
 				.forEach((item) => {
 					const mods = item.system.mods;
 					//console.log("Actor item mods", mods)
@@ -166,6 +166,7 @@ export class M5Character extends Actor {
 						label: label,
 						magic: item.system.magic,
 						calc: item.system.calc,
+						equipped: item.system?.equipped,
 					};
 				});
 		}
@@ -185,6 +186,7 @@ export class M5Character extends Actor {
 						label: label,
 						magic: item.system.magic,
 						calc: item.system.calc,
+						equipped: item.system?.equipped,
 					};
 				});
 		}
@@ -267,6 +269,7 @@ export class M5Character extends Actor {
 						label: label,
 						magic: item.system.magic,
 						calc: item.system.calc,
+						equipped: item.system?.equipped,
 					};
 				});
 		}

source/module/actors/M5ModAggregate.ts

@@ -31,7 +31,7 @@ export default class M5ModAggregate {
 		this.push({ type: M5ModType.STAT, id: M5Stats.DEFENSE, operation: M5ModOperation.SET, value: calc.stats.defenseBonus.value }, characterString);
 		this.push({ type: M5ModType.STAT, id: M5Stats.ATTACK, operation: M5ModOperation.SET, value: calc.stats.attackBonus.value }, characterString);
 		this.push({ type: M5ModType.STAT, id: M5Stats.DAMAGE, operation: M5ModOperation.SET, value: calc.stats.damageBonus.value }, characterString);
-		this.push({ type: M5ModType.STAT, id: M5Stats.MOVEMENT, operation: M5ModOperation.SET, value: calc.stats.movementBonus.value }, characterString);
+		this.push({ type: M5ModType.STAT, id: M5Stats.MOVEMENT, operation: M5ModOperation.SET, value: calc.stats.movement.value }, characterString);
 		this.push({ type: M5ModType.STAT, id: M5Stats.RESISTANCE_MIND, operation: M5ModOperation.SET, value: calc.stats.resistanceMind.value }, characterString);
 		this.push({ type: M5ModType.STAT, id: M5Stats.RESISTANCE_BODY, operation: M5ModOperation.SET, value: calc.stats.resistanceBody.value }, characterString);
 		this.push({ type: M5ModType.STAT, id: M5Stats.SPELL_CASTING, operation: M5ModOperation.SET, value: calc.stats.spellCasting.value }, characterString);

source/module/items/M5Item.ts

@@ -105,6 +105,11 @@ export class M5Item extends Item {
 					calc.fw += skillData.fw;
 				}
 			}
+		} else if (itemType === "armor") {
+			itemData.mods[0] = { type: "stat", id: "defenseBonus", operation: "add", value: itemData.stats.defenseBonus };
+			itemData.mods[1] = { type: "stat", id: "attackBonus", operation: "add", value: itemData.stats.attackBonus };
+			itemData.mods[2] = { type: "stat", id: "movement", operation: "add", value: itemData.stats.movementBonus };
+			itemData.mods[3] = { type: "attribute", id: "gw", operation: "add100", value: itemData.attributeMod.gw };
 		} else if (itemType === "spell") {
 			calc.fw = 0;
 			if (actor) {
@@ -134,8 +139,10 @@ export class M5Item extends Item {
 					itemData.rolls.formulas[0].label = skill.name;
 				}
 			}
-		} else if (itemType === "item" || itemType === "effect") {
+		}
+		if (itemData?.mods) {
 			calc.mods = {};
+
 			Object.keys(itemData?.mods).forEach((key) => {
 				const mod = itemData.mods[key];
 				const modCalc = {};
@@ -243,6 +250,7 @@ export class M5Item extends Item {
 			}
 
 			const roll = new M5Roll(rollData, this.actor, item.name);
+			console.log(roll);
 			return roll.toMessage();
 		} else {
 			ChatMessage.create({

source/system.json

@@ -3,7 +3,7 @@
 	"name": "midgard5",
 	"title": "Midgard 5. Edition",
 	"description": "The German RPG Midgard 5. Edition",
-	"version": "2.0.0",
+	"version": "2.1.0",
 	"compatibility": {
 		"minimum": "10",
 		"verified": "11",
@@ -89,8 +89,8 @@
 	"primaryTokenAttribute": "lp",
 	"secondaryTokenAttribute": "ap",
 	"url": "https://github.com/Byroks/foundry-vtt-system-midgard5",
-	"manifest": "https://github.com/Byroks/foundry-vtt-system-midgard5/releases/download/v2.0.0/system.json",
+	"manifest": "https://github.com/Byroks/foundry-vtt-system-midgard5/releases/download/v2.1.0/system.json",
-	"download": "https://github.com/Byroks/foundry-vtt-system-midgard5/releases/download/v2.0.0/midgard5-v2.0.0.zip",
+	"download": "https://github.com/Byroks/foundry-vtt-system-midgard5/releases/download/v2.1.0/midgard5-v2.1.0.zip",
 	"initiative": "@c.calc.attributes.gw.value",
 	"license": "LICENSE.txt"
 }

source/template.json

@@ -350,7 +350,8 @@
 				"formulas": {},
 				"output": ""
 			},
-			"calc": {}
+			"calc": {},
+			"mods": {}
 		},
 		"spell": {
 			"templates": ["itemDescription", "spellSelection"],

templates/sheets/character/base_values.hbs

@@ -56,7 +56,7 @@
 			<td>{{localize "midgard5.luckPoints"}}</td>
 			<td><input name="data.gp" type="text" value="{{data.gp}}" data-dtype="Number" /></td>
 			<td>{{localize "Bewegungsweite"}}</td>
-			<td><input name="data.movement" type="text" value="{{data.movement}}" data-dtype="Number" /></td>
+			<td><input name="data.movement" type="text" value="{{data.calc.stats.movement.value}}" data-dtype="Number" /></td>
 		</tr>
 	</tbody>
 </table>

templates/sheets/character/effects.hbs

@@ -8,7 +8,12 @@
 	<tbody>
 		{{#each data.calc.gear.effects as |item itemId|}}
 			<tr data-item="{{itemId}}">
-				<td class="padding edit-item">{{item.label}}</td>
+				<td class="padding">
+					<span class="edit-item">{{item.label}}</span>
+					{{#if item.equipped}}
+						<span class="spell-process">{{localize "midgard5.active"}}</span>
+					{{/if}}
+				</td>
 				<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
 			</tr>
 		{{/each}}

templates/sheets/character/gear.hbs

@@ -84,7 +84,12 @@
 	<tbody>
 		{{#each data.calc.gear.armor as |item itemId|}}
 			<tr data-item="{{itemId}}">
-				<td class="padding edit-item">{{item.label}}</td>
+				<td class="padding">
+					<span class="edit-item">{{item.label}}</span>
+					{{#if item.equipped}}
+						<span class="spell-process">{{localize "midgard5.equipped"}}</span>
+					{{/if}}
+				</td>
 				<td class="fixed-value">{{actorItemValue ../actor._id itemId "lpProtection"}}</td>
 				<td class="fixed-value">{{actorItemValue ../actor._id itemId "apProtection"}}</td>
 				<td class="fixed-value">{{actorItemValue ../actor._id itemId "stats.attackBonus"}}</td>
@@ -107,7 +112,12 @@
 	<tbody>
 		{{#each data.calc.gear.items as |item itemId|}}
 			<tr data-item="{{itemId}}">
-				<td class="padding edit-item">{{item.label}}</td>
+				<td class="padding">
+					<span class="edit-item">{{item.label}}</span>
+					{{#if item.equipped}}
+						<span class="spell-process">{{localize "midgard5.equipped"}}</span>
+					{{/if}}
+				</td>
 				<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
 			</tr>
 		{{/each}}

templates/sheets/item/armor.hbs

@@ -6,6 +6,21 @@
 	<div class="sheet-content">
 		<table>
 			<tbody>
+				<tr>
+					<td colspan="4">
+						<div class="flexrow">
+							<span>
+								<input id="data.equipped" type="checkbox" name="data.equipped" {{checked data.equipped}} />
+								<label for="data.equipped">{{localize "midgard5.equipped"}}</label>
+							</span>
+
+							<span>
+								<input id="data.magic" type="checkbox" name="data.magic" {{checked data.magic}} />
+								<label for="data.magic">{{localize "midgard5.magic"}}</label>
+							</span>
+						</div>
+					</td>
+				</tr>
 				<tr>
 					<td>{{localize "midgard5.actor-lp"}}</td>
 					<td><input name="data.lpProtection" type="text" value="{{data.lpProtection}}" data-dtype="Number" /></td>
@@ -32,6 +47,9 @@
 			</tbody>
 		</table>
 
+		{{> "systems/midgard5/templates/sheets/partial/mod.hbs" mods=data.mods calc=data.calc}}
+
+
 		{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
 	</div>
 </form>

templates/sheets/item/effect.hbs

@@ -6,10 +6,20 @@
 	<div class="sheet-content">
 		<table>
 			<tr>
-				<td>
+				<td colspan=4>
-					<input id="data.magic" type="checkbox" name="data.magic" {{checked data.magic}}>
+					<div class="flexrow">
-					<label for="data.magic">{{localize "midgard5.magic"}}</label>
+						<span>
+							<input id="data.equipped" type="checkbox" name="data.equipped" {{checked data.equipped}}>
+							<label for="data.equipped">{{localize "midgard5.active"}}</label>
+						</span>
+						<span>
+							<input id="data.magic" type="checkbox" name="data.magic" {{checked data.magic}}>
+							<label for="data.magic">{{localize "midgard5.magic"}}</label>
+						</span>
+					</div>
 				</td>
+			</tr>
+			<tr>
 				<td>
 					<div class="flexrow">
 						<span>{{localize "midgard5.item-value"}}</span>
@@ -19,59 +29,8 @@
 			</tr>
 		</table>
 		
-		<table>
+		{{> "systems/midgard5/templates/sheets/partial/mod.hbs" mods=data.mods calc=data.calc}}
-			<thead>
-				<tr>
-					<th>Mods</th>
-					<th></th>
-					<th></th>
-					<th><button class="add-mod">+</button></th>
-				</tr>
-			</thead>
-			<tbody>
-				{{#each data.mods as |mod modId|}}
-					<tr>
-						<td>
-							<select class="select-mod-type" name="data.mods.{{modId}}.type" data-type="String">
-								{{#select mod.type}}
-									<option value="attribute">{{localize "midgard5.attribute"}}</option>
-									<option value="stat">{{localize "midgard5.bonus"}}</option>
-									<option value="skill">{{localize "midgard5.skill"}}</option>
-								{{/select}}
-							</select>
-						</td>
 
-						<td>
-							<select class="select-id" name="data.mods.{{modId}}.id" data-type="String">
-								{{#select mod.id}}
-									<option value="">{{localize "midgard5.no-skill"}}</option>
-									{{#each (lookup ../data.calc.mods modId) as |name key|}}
-										<option value="{{key}}">{{name}}</option>
-									{{/each}}
-								{{/select}}
-							</select>
-						</td>
-
-						<td>
-							<select class="select-mod-operation" name="data.mods.{{modId}}.operation" data-type="String">
-								{{#select mod.operation}}
-									{{#if (eq mod.type "attribute")}}
-										<option value="add100">{{localize "midgard5.mod-operation-add100"}}</option>
-									{{/if}}
-									<option value="add">{{localize "midgard5.mod-operation-add"}}</option>
-									<option value="set">{{localize "midgard5.mod-operation-set"}}</option>
-									<option value="fixed">{{localize "midgard5.mod-operation-fixed"}}</option>
-								{{/select}}
-							</select>
-						</td>
-						
-						<td>
-							<input name="data.mods.{{modId}}.value" type="text" value="{{mod.value}}" data-dtype="Number" />
-						</td>
-					</tr>
-				{{/each}}
-			</tbody>
-		</table>
 
 		{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
 	</div>

templates/sheets/item/item.hbs

@@ -6,10 +6,20 @@
 	<div class="sheet-content">
 		<table>
 			<tr>
-				<td>
+				<td colspan=4>
-					<input id="data.magic" type="checkbox" name="data.magic" {{checked data.magic}}>
+					<div class="flexrow">
-					<label for="data.magic">{{localize "midgard5.magic"}}</label>
+						<span>
+							<input id="data.equipped" type="checkbox" name="data.equipped" {{checked data.equipped}}>
+							<label for="data.equipped">{{localize "midgard5.equipped"}}</label>
+						</span>
+						<span>
+							<input id="data.magic" type="checkbox" name="data.magic" {{checked data.magic}}>
+							<label for="data.magic">{{localize "midgard5.magic"}}</label>
+						</span>
+					</div>
 				</td>
+			</tr>
+			<tr>
 				<td>
 					<div class="flexrow">
 						<span>{{localize "midgard5.item-value"}}</span>
@@ -19,59 +29,8 @@
 			</tr>
 		</table>
 		
-		<table>
+		{{> "systems/midgard5/templates/sheets/partial/mod.hbs" mods=data.mods calc=data.calc}}
-			<thead>
-				<tr>
-					<th>Mods</th>
-					<th></th>
-					<th></th>
-					<th><button class="add-mod">+</button></th>
-				</tr>
-			</thead>
-			<tbody>
-				{{#each data.mods as |mod modId|}}
-					<tr>
-						<td>
-							<select class="select-mod-type" name="data.mods.{{modId}}.type" data-type="String">
-								{{#select mod.type}}
-									<option value="attribute">{{localize "midgard5.attribute"}}</option>
-									<option value="stat">{{localize "midgard5.bonus"}}</option>
-									<option value="skill">{{localize "midgard5.skill"}}</option>
-								{{/select}}
-							</select>
-						</td>
 
-						<td>
-							<select class="select-id" name="data.mods.{{modId}}.id" data-type="String">
-								{{#select mod.id}}
-									<option value="">{{localize "midgard5.no-skill"}}</option>
-									{{#each (lookup ../data.calc.mods modId) as |name key|}}
-										<option value="{{key}}">{{name}}</option>
-									{{/each}}
-								{{/select}}
-							</select>
-						</td>
-
-						<td>
-							<select class="select-mod-operation" name="data.mods.{{modId}}.operation" data-type="String">
-								{{#select mod.operation}}
-									{{#if (eq mod.type "attribute")}}
-										<option value="add100">{{localize "midgard5.mod-operation-add100"}}</option>
-									{{/if}}
-									<option value="add">{{localize "midgard5.mod-operation-add"}}</option>
-									<option value="set">{{localize "midgard5.mod-operation-set"}}</option>
-									<option value="fixed">{{localize "midgard5.mod-operation-fixed"}}</option>
-								{{/select}}
-							</select>
-						</td>
-						
-						<td>
-							<input name="data.mods.{{modId}}.value" type="text" value="{{mod.value}}" data-dtype="Number" />
-						</td>
-					</tr>
-				{{/each}}
-			</tbody>
-		</table>
 
 		{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
 	</div>

templates/sheets/item/kampfkunst.hbs

@@ -85,9 +85,9 @@
 									{{/each}}
 								{{/select}}
 							</select>
-						{{!-- {{else}}
+						{{else}}
 							<span>{{localize "midgard5.assignItemToCharacter"}}</span>
-						{{/if}} --}}
+						{{/if}}
 					</td>
 			</tbody>
 		</table>

templates/sheets/partial/mod.hbs

@@ -0,0 +1,53 @@
+<table>
+	<thead>
+		<tr>
+			<th>Mods</th>
+			<th></th>
+			<th></th>
+			<th><button class="add-mod">+</button></th>
+		</tr>
+	</thead>
+	<tbody>
+		{{#each mods as |mod modId|}}
+			<tr>
+				<td>
+					<select class="select-mod-type" name="data.mods.{{modId}}.type" data-type="String">
+						{{#select mod.type}}
+							<option value="attribute">{{localize "midgard5.attribute"}}</option>
+							<option value="stat">{{localize "midgard5.bonus"}}</option>
+							<option value="skill">{{localize "midgard5.skill"}}</option>
+						{{/select}}
+					</select>
+				</td>
+
+				<td>
+					<select class="select-id" name="data.mods.{{modId}}.id" data-type="String">
+						{{#select mod.id}}
+							<option value="">{{localize "midgard5.no-skill"}}</option>
+							{{#each (lookup ../calc.mods modId) as |name key|}}
+								<option value="{{key}}">{{name}}</option>
+							{{/each}}
+						{{/select}}
+					</select>
+				</td>
+
+				<td>
+					<select class="select-mod-operation" name="data.mods.{{modId}}.operation" data-type="String">
+						{{#select mod.operation}}
+							{{#if (eq mod.type "attribute")}}
+								<option value="add100">{{localize "midgard5.mod-operation-add100"}}</option>
+							{{/if}}
+							<option value="add">{{localize "midgard5.mod-operation-add"}}</option>
+							<option value="set">{{localize "midgard5.mod-operation-set"}}</option>
+							<option value="fixed">{{localize "midgard5.mod-operation-fixed"}}</option>
+						{{/select}}
+					</select>
+				</td>
+
+				<td>
+					<input name="data.mods.{{modId}}.value" type="text" value="{{mod.value}}" data-dtype="Number" />
+				</td>
+			</tr>
+		{{/each}}
+	</tbody>
+</table>