Fixed like recommended

+ Fixed M5Base
+Fixed M5Character
+ Fixed M5Rolls
+ Fixed Skills HBS
+ Fixed BrawlFw
+ Fixed Effect (not saved already)

packs/items/zauberwirkungen/DieStählendeBallade.json

@@ -1,5 +1,5 @@
 {
-	"name": "Die St\u00e4hlende Ballade",
+	"name": "Die Stählende Ballade",
 	"type": "effect",
 	"img": "icons/tools/instruments/drum-standing-glowing-green.webp",
 	"system": {

source/module/M5Base.ts

@@ -85,7 +85,7 @@ export enum M5Stats {
 	PROTECTION_LP = "lpProtection",
 	PROTECTION_AP = "apProtection",
 	PERCEPTION = "perception",
-	DRINKING = "Trinken"
+	DRINKING = "drinking"
 }
 
 export enum M5ModType {
@@ -165,13 +165,13 @@ export interface M5CharacterCalculatedData {
 		resistanceBody: M5ModResult;
 		spellCasting: M5ModResult;
 		brawl: M5ModResult;
-		brawlEw: number;
+		brawlFw: number;
 		poisonResistance: M5ModResult;
 		enduranceBonus: number;
 		perception: M5ModResult;
-		perceptionEW: number;
+		perceptionFW: number;
 		drinking: M5ModResult;
-		drinkingEW: number;
+		drinkingFW: number;
 	};
 	skillMods: {};
 	skills: {

source/module/actors/M5Character.ts

@@ -64,13 +64,13 @@ export class M5Character extends Actor {
 				resistanceBody: { value: 0, mods: [] },
 				spellCasting: { value: 0, mods: [] },
 				brawl: { value: 0, mods: [] },
-				brawlEw: 0,
+				brawlFw: 0,
 				poisonResistance: { value: 0, mods: [] },
 				enduranceBonus: 0,
 				perception: {value: 0, mods: []},
-				perceptionEW: 0,
+				perceptionFW: 0,
 				drinking: {value: 0, mods: []},
-				drinkingEW: 0,
+				drinkingFW: 0,
 			},
 			skillMods: {},
 			skills: {
@@ -136,13 +136,13 @@ export class M5Character extends Actor {
 		);
 		ret.stats.spellCasting = this.modResult((data.info.magicUsing ? M5Character.spellCastingFromLevel(ret.level) : 3) + ret.attributes.zt.bonus);
 		ret.stats.brawl = this.modResult(Math.floor((ret.attributes.st.value + ret.attributes.gw.value) / 20));
-		ret.stats.brawlEw = ret.stats.brawl.value + ret.stats.attackBonus.value + (data.info.race === "Zwerg" ? 1 : 0);
+		ret.stats.brawlFw = ret.stats.brawl.value + ret.stats.attackBonus.value + (data.info.race === "Zwerg" ? 1 : 0);
 		ret.stats.poisonResistance = this.modResult(30 + Math.floor(ret.attributes.ko.value / 2));
 		ret.stats.enduranceBonus = Math.floor(ret.attributes.ko.value / 10) + Math.floor(ret.attributes.st.value / 20);
 		ret.stats.perception = this.modResult(0);
-		ret.stats.perceptionEW = 6;
-		ret.stats.drinking = this.modResult(Math.floor(ret.attributes.ko.value / 10));
-		ret.stats.drinkingEW = ret.stats.drinking.value;
+		ret.stats.perceptionFW = 6;
+		ret.stats.drinking = this.modResult(0);
+		ret.stats.drinkingFW = Math.floor(ret.attributes.ko.value / 10);
 
 		if (!skip?.mods) {
 			const aggregate = new M5ModAggregate(data, ret);

source/module/rolls/M5Roll.ts

@@ -182,7 +182,7 @@ export class M5Roll {
 		};
 
 		rollData.rolls["0"] = {
-			formula: "1d20 + @c.calc.stats.brawlEw",
+			formula: "1d20 + @c.calc.stats.brawlFw",
 			enabled: true,
 			label: (game as Game).i18n.localize("midgard5.attack"),
 			result: "",
@@ -208,13 +208,9 @@ export class M5Roll {
 
 	static perception(actor: any) {
 		const rollData = actor.getRollData() as M5RollData;
-		rollData.i = {
-			fw: 6,
-			Bonus: 0,
-		};
 		
 		rollData.rolls["0"] = {
-			formula: "1d20 + @c.calc.stats.perceptionEW + @i.bonus",
+			formula: "1d20 + @c.calc.stats.perception.value + @c.calc.stats.perceptionFW",
 			enabled: true,
 			label: (game as Game).i18n.localize("midgard5.perception"),
 			result: "",
@@ -229,13 +225,9 @@ export class M5Roll {
 	
 	static drinking(actor: any) {
 		const rollData = actor.getRollData() as M5RollData;
-		rollData.i = {
-			fw: M5Stats.DRINKING,
-			Bonus: 0,
-		};
 		
 		rollData.rolls["0"] = {
-			formula: "1d20 + @c.calc.stats.drinkingEW + @i.bonus",
+			formula: "1d20 + @c.calc.stats.drinking.value + @c.calc.stats.drinkingFW",
 			enabled: true,
 			label: (game as Game).i18n.localize("midgard5.drinking"),
 			result: "",

templates/sheets/character/gear.hbs

@@ -19,7 +19,7 @@
 
 		<tr data-item="{{itemId}}">
 			<td class="padding edit-item">{{localize "midgard5.brawl"}}</td>
-			<td class="center">{{data.calc.stats.brawlEw}}</td>
+			<td class="center">{{data.calc.stats.brawlFw}}</td>
 			<td class="fixed-value"><button class="roll-button roll-brawl-button"></button></td>
 			<td class="fixed-value"></td>
 		</tr>

templates/sheets/character/skills.hbs

@@ -76,18 +76,18 @@
 		{{/each}}
 			<tr data-item="{{itemId}}">
 				<td class="padding edit-item">{{localize "midgard5.perception"}}</td>
-				<td class="fixed-value">{{stats.fw}}</td>
+				<td class="fixed-value">{{data.calc.stats.perceptionFW}}</td>
 				<td class="fixed-value">{{stats.calc.bonus}}</td>
-				<td class="center">{{data.calc.stats.perceptionEW}}</td>
+				<td class="center">{{add data.calc.stats.perception.value}}</td>
 				<td class="fixed-value"><button class="roll-button roll-perception-button"></button></td>
 				<td class="fixed-value"></td>
 			</tr>
 
 			<tr data-item="{{itemId}}">
 				<td class="padding edit-item">{{localize "midgard5.drinking"}}</td>
-				<td class="fixed-value">{{stats.drinking.value}}</td>
+				<td class="fixed-value">{{data.calc.stats.drinking.value}}</td>
 				<td class="fixed-value">{{stats.calc.bonus}}</td>
-				<td class="center">{{data.calc.stats.drinkingEW}}</td>
+				<td class="center">{{data.calc.stats.drinking.value}}</td>
 				<td class="fixed-value"><button class="roll-button roll-drinking-button"></button></td>
 				<td class="fixed-value"></td>
 			</tr>