From 7c7ba3679b17d3aeaf7c99cd4daf58516dd689bb Mon Sep 17 00:00:00 2001 From: LeFrique Date: Sun, 2 Jun 2024 20:17:20 +0200 Subject: [PATCH 1/3] KUS-Update (#116) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + 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: https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/pulls/116 Reviewed-by: Byroks Co-authored-by: LeFrique Co-committed-by: LeFrique --- lang/de.json | 4 ++++ source/module/actors/M5Character.ts | 2 +- source/template.json | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lang/de.json b/lang/de.json index 4a7f4af..5de3520 100644 --- a/lang/de.json +++ b/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", diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts index 5a54bed..1cd0dab 100644 --- a/source/module/actors/M5Character.ts +++ b/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; diff --git a/source/template.json b/source/template.json index b337148..d84f595 100644 --- a/source/template.json +++ b/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 }, From 6a90581c4ed9c81cd82d6bb5e5d7cad80ecab181 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sat, 21 Sep 2024 10:17:53 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Fix=20Versteckte=20W=C3=BCrfe=20&=20Ungeler?= =?UTF-8?q?nte=20W=C3=BCrfe=20auf=20EW?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/module/rolls/M5Roll.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/module/rolls/M5Roll.ts b/source/module/rolls/M5Roll.ts index 5e296a9..65f32b4 100644 --- a/source/module/rolls/M5Roll.ts +++ b/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: "", From 4a9afcf1500be801c8baa0e5da5eff4a3456eee0 Mon Sep 17 00:00:00 2001 From: Byroks Date: Sat, 21 Sep 2024 10:21:19 +0200 Subject: [PATCH 3/3] v2.7.2 --- package.json | 4 ++-- source/system.json | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 479073a..8562c7a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "foundry-system-midgard5", - "version": "2.7.1", + "version": "2.7.2", "description": "", "main": "index.js", "scripts": { @@ -58,4 +58,4 @@ "dependencies": { "handlebars-helpers": "^0.10.0" } -} +} \ No newline at end of file diff --git a/source/system.json b/source/system.json index 4f9178e..5007a71 100644 --- a/source/system.json +++ b/source/system.json @@ -3,13 +3,17 @@ "name": "midgard5", "title": "Midgard 5. Edition", "description": "The German RPG Midgard 5. Edition", - "version": "2.7.1", + "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" -} +} \ No newline at end of file