Merge branch 'develop'

+ Fine Arts from KUS-QB
+ Bugfix for Wealth (again parseFloat) on higher and mixed values for gold, silver and copper

Neuer/alter Mitspieler mit viel zuviel Vermögen deckt kleine Mängel auf, immer diese reichen Elfen... und ich hab schnell noch die neuen Fertigkeiten für die Küstenstaaten eingetragen.

Reviewed-on: #116
Reviewed-by: Byroks <byroks@gmail.com>
Co-authored-by: LeFrique <lefrique@live.de>
Co-committed-by: LeFrique <lefrique@live.de>

lang/de.json

@@ -156,6 +156,10 @@
 		"beredsamkeit": "Beredsamkeit",
 		"betaeuben": "Betäuben",
 		"betaeubungsgriff": "Betäubungsgriff",
+		"bildendeKuensteA": "Bildende Künste (Architektur)",
+		"bildendeKuensteB": "Bildende Künste (Bildhauerei)",
+		"bildendeKuensteG": "Bildende Künste (Grafik)",
+		"bildendeKuensteM": "Bildende Künste (Malerei)",
 		"bootfahren": "Bootfahren",
 		"dickhaeuterLenken": "Dickhäuter lenken",
 		"ersteHilfe": "Erste Hilfe",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "foundry-system-midgard5",
-	"version": "2.7.0",
+	"version": "2.7.2",
 	"description": "",
 	"main": "index.js",
 	"scripts": {
@@ -58,4 +58,4 @@
 	"dependencies": {
 		"handlebars-helpers": "^0.10.0"
 	}
-}
+}

source/module/actors/M5Character.ts

@@ -180,7 +180,7 @@ export class M5Character extends Actor {
 		ret.stats.movement = this.modResult(data.movement);
 		ret.stats.hoardMin = M5Character.levelThreshold.at(ret.level - 1) / 2;
 		ret.stats.hoardNext = M5Character.levelThreshold.at(ret.level) / 2;
-		ret.stats.wealth = parseFloat((data.info.gold + data.info.silver / 10 + data.info.copper / 100).toPrecision(3));
+		ret.stats.wealth = parseFloat((data.info.gold + data.info.silver / 10 + data.info.copper / 100).toPrecision(10));
 		ret.stats.hoard = 0;
 		ret.stats.encumbrance = 0;
 
@@ -223,6 +223,26 @@ export class M5Character extends Actor {
 		ret.stats.loadMax = M5Character.maxLoadValue(data.attributes.st);
 		ret.stats.thrustLoad = M5Character.thrustLoadValue(data.attributes.st);
 
+		if (!skip?.mods) {
+			const aggregate = new M5ModAggregate(data, ret);
+
+			context.items
+				?.filter(
+					(item) =>
+						(item.type === "item" || item.type === "skill" || 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)
+					Object.keys(mods).forEach((modIndex) => {
+						const mod = mods[modIndex] as M5ItemMod;
+						aggregate.push(mod, item.name);
+					});
+				});
+
+			ret.skillMods = aggregate.calculate();
+		}
+
 		if (!skip?.containers) {
 			context.items
 				?.filter((item) => item.type === "container")

source/module/rolls/M5Roll.ts

@@ -155,14 +155,14 @@ export class M5Roll {
 	async toMessage(toggleAutomatedRoll = false) {
 		let automatedRoll = (game as Game).settings.get("midgard5", "automatedRoll");
 		automatedRoll = toggleAutomatedRoll ? !automatedRoll : automatedRoll;
-		const rMode = (game as Game).settings.get("core", "rollMode");
+		let rMode = (game as Game).settings.get("core", "rollMode");
 
 		if (!automatedRoll) {
 			let checkOptions = await this.popUp({ isPW: this.data.rolls[0].label === (game as Game).i18n.localize("midgard5.pw") });
 			if (checkOptions["cancelled"]) {
 				return;
 			} else {
-				const rMode = checkOptions["rollMode"];
+				rMode = checkOptions["rollMode"];
 				this.data.b = checkOptions;
 			}
 		} else {
@@ -222,7 +222,7 @@ export class M5Roll {
 		rollData.rolls["0"] = {
 			formula: "1d20 + @i.fw + @i.bonus",
 			enabled: true,
-			label: (game as Game).i18n.localize("midgard5.pw"),
+			label: (game as Game).i18n.localize("midgard5.ew"),
 			result: "",
 			total: 0,
 			totalStr: "",

source/system.json

@@ -3,13 +3,17 @@
 	"name": "midgard5",
 	"title": "Midgard 5. Edition",
 	"description": "The German RPG Midgard 5. Edition",
-	"version": "2.7.0",
+	"version": "2.7.2",
 	"compatibility": {
 		"minimum": "10",
 		"verified": "11",
 		"maximum": "11"
 	},
-	"authors": [{ "name": "Byroks" }, { "name": "Le-Frique" }, { "name": "Oskaloq" }],
+	"authors": [
+		{"name": "Byroks"},
+		{"name": "Le-Frique"},
+		{"name": "Oskaloq"}
+	],
 	"scripts": ["bundle.js"],
 	"styles": ["bundle.css"],
 	"languages": [
@@ -28,4 +32,4 @@
 	"download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/latest/midgard5.zip?token=2455375115b92bc8d87c93df7159eec232456f2d",
 	"initiative": "@c.calc.attributes.gw.value",
 	"license": "LICENSE.txt"
-}
+}

source/template.json

@@ -81,6 +81,10 @@
 						"bergreiten": { "fw": 0, "attribute": "gw", "initial": 12, "pp": 0 },
 						"betaeuben": { "fw": 6, "attribute": "gs", "initial": 8, "pp": 0 },
 						"betaeubungsgriff": { "fw": 0, "attribute": "in", "initial": 8, "pp": 0 },
+						"bildendeKuensteA": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 },
+						"bildendeKuensteB": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 },
+						"bildendeKuensteG": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 },
+						"bildendeKuensteM": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 },
 						"bootfahren": { "fw": 3, "attribute": "gs", "initial": 8, "pp": 0 },
 						"dickhaeuterLenken": { "fw": 0, "attribute": "gs", "initial": 8, "pp": 0 },
 						"ersteHilfe": { "fw": 0, "attribute": "gs", "initial": 8, "pp": 0 },

templates/sheets/npc/main.hbs

@@ -34,16 +34,16 @@
 
 			<table style="width: 100%;">
 				<tr>
-					<td class="attribute-value roll-attribute-button" data-attribute="st" data-value="{{data.attributes.st.value}}">{{data.attributes.st.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="gs" data-value="{{data.attributes.gs.value}}">{{data.attributes.gs.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="gw" data-value="{{data.attributes.gw.value}}">{{data.attributes.gw.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="ko" data-value="{{data.attributes.ko.value}}">{{data.attributes.ko.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="in" data-value="{{data.attributes.in.value}}">{{data.attributes.in.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="zt" data-value="{{data.attributes.zt.value}}">{{data.attributes.zt.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="au" data-value="{{data.attributes.au.value}}">{{data.attributes.au.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="pa" data-value="{{data.attributes.pa.value}}">{{data.attributes.pa.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="wk" data-value="{{data.attributes.wk.value}}">{{data.attributes.wk.value}}</td>
-					<td class="attribute-value roll-attribute-button" data-attribute="git" data-value="{{data.attributes.git.value}}">{{data.attributes.git.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="st" data-value="{{data.calc.attributes.st.value}}">{{data.calc.attributes.st.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="gs" data-value="{{data.calc.attributes.gs.value}}">{{data.calc.attributes.gs.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="gw" data-value="{{data.calc.attributes.gw.value}}">{{data.calc.attributes.gw.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="ko" data-value="{{data.calc.attributes.ko.value}}">{{data.calc.attributes.ko.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="in" data-value="{{data.calc.attributes.in.value}}">{{data.calc.attributes.in.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="zt" data-value="{{data.calc.attributes.zt.value}}">{{data.calc.attributes.zt.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="au" data-value="{{data.calc.attributes.au.value}}">{{data.calc.attributes.au.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="pa" data-value="{{data.calc.attributes.pa.value}}">{{data.calc.attributes.pa.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="wk" data-value="{{data.calc.attributes.wk.value}}">{{data.calc.attributes.wk.value}}</td>
+					<td class="attribute-value roll-attribute-button" data-attribute="git" data-value="{{data.calc.stats.poisonResistance.value}}">{{data.calc.stats.poisonResistance.value}}</td>
 				</tr>
 				<tr>
 					<td class="attribute">{{localize "midgard5.actor-st"}}</td>