From e59352cc3fecb78d89bfcd9fa13b3bf47dfa1ed0 Mon Sep 17 00:00:00 2001 From: LeFrique Date: Sun, 24 Mar 2024 15:01:07 +0100 Subject: [PATCH] Fix & Bonus + Fixed wrong calculation for PP + Added defensiveWeapon for PP + Added Musizieren skills as on KOD S. 118 - Deleted thaumagraphie as spellprocess in de.json because its a skill --- lang/de.json | 7 +++++-- source/module/rolls/M5Roll.ts | 10 +++++++++- source/template.json | 6 +++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lang/de.json b/lang/de.json index 35393b2..d6aff9d 100644 --- a/lang/de.json +++ b/lang/de.json @@ -181,7 +181,11 @@ "midgard5.meditieren": "Meditieren", "midgard5.menschenkenntnis": "Menschenkenntnis", "midgard5.meucheln": "Meucheln", - "midgard5.musizieren": "Musizieren", + "midgard5.musizierenFloete": "Musizieren (Flöten)", + "midgard5.musizierenBlas": "Musizieren (Blasinstrumente)", + "midgard5.musizierenRythmus": "Musizieren (Rythmusinstrumente)", + "midgard5.musizierenStreich": "Musizieren (Streichinstrumente)", + "midgard5.musizierenZupf": "Musizieren (Zupfinstrumente)", "midgard5.naturkunde": "Naturkunde", "midgard5.ninjutsu": "NinJutsu", "midgard5.orakelkunst": "Orakelkunst", @@ -295,7 +299,6 @@ "midgard5.spell-process-nekromantie": "Nekromantie", "midgard5.spell-process-runenstaebe": "Runenstäbe", "midgard5.spell-process-thaumatherapie": "Thaumatherapie", - "midgard5.spell-process-thaumagraphie": "Thaumagraphie", "midgard5.spell-process-veraendern": "Verändern", "midgard5.spell-process-vigilsignien": "Vigilsignien", "midgard5.spell-process-wundertat": "Wundertat", diff --git a/source/module/rolls/M5Roll.ts b/source/module/rolls/M5Roll.ts index 62e95e5..2fd137b 100644 --- a/source/module/rolls/M5Roll.ts +++ b/source/module/rolls/M5Roll.ts @@ -89,7 +89,7 @@ export class M5Roll { this.data.res.label = this.label; if ((game as Game).settings.get("midgard5", "automatedPP")) { - if ((this.data.i.type === "language" || this.data.i.type === "general") && this.data.rolls[0].dice[0] >= 0) { + if ((this.data.i.type === "language" || this.data.i.type === "general") && this.data.rolls[0].dice[0] >= 16) { this.actor.items.get(this.id).update({ system: { pp: this.data.i.pp + 1, @@ -111,6 +111,14 @@ export class M5Roll { pp: skill.system.pp + 1, }, }); + } else if (this.data.iType === "defensiveWeapon") { + // Rolling through defensiveWeapon Item + const skill = this.actor.items.get(this.data.i.skillId); + skill.update({ + system: { + pp: skill.system.pp + 1, + }, + }); } else if (this.data.iType === "spell") { // Rolling through Spell Item const klasse = this.actor.items.find((x) => x.type === "class" && x.system.equipped); diff --git a/source/template.json b/source/template.json index 23483b4..de2ef9e 100644 --- a/source/template.json +++ b/source/template.json @@ -101,7 +101,11 @@ "meditieren": { "fw": 0, "attribute": "wk", "initial": 8, "pp": 0 }, "menschenkenntnis": { "fw": 3, "attribute": "in", "initial": 8, "pp": 0 }, "meucheln": { "fw": 0, "attribute": "gs", "initial": 8, "pp": 0 }, - "musizieren": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 }, + "musizierenFloete": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 }, + "musizierenBlas": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 }, + "musizierenRythmus": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 }, + "musizierenStreich": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 }, + "musizierenZupf": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 }, "ninjutsu": { "fw": 0, "attribute": "gw", "initial": 8, "pp": 0 }, "naturkunde": { "fw": 0, "attribute": "in", "initial": 8, "pp": 0 }, "orakelkunst": { "fw": 0, "attribute": "in", "initial": 8, "pp": 0 },