From c99dab0cdf52596d977cc6f7ecb4855b59921dd7 Mon Sep 17 00:00:00 2001
From: LeFrique <lefrique@live.de>
Date: Sun, 17 Mar 2024 13:33:43 +0100
Subject: [PATCH] Deprivationfix & QoL

+ Fixed wrong calculation of deprivations
+ Added wealth on base_values for better look & overview (especially for dwarves)
---
 source/module/rolls/M5Roll.ts              |  6 +++---
 templates/sheets/character/base_values.hbs | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/source/module/rolls/M5Roll.ts b/source/module/rolls/M5Roll.ts
index 76b90da..c490667 100644
--- a/source/module/rolls/M5Roll.ts
+++ b/source/module/rolls/M5Roll.ts
@@ -199,7 +199,7 @@ export class M5Roll {
 		const rollData = actor.getRollData() as M5RollData;
 
 		rollData.rolls["0"] = {
-			formula: "1d100 + @c.calc.stats.deprivationCold.value + @c.calc.stats.deprivationColdBonus.value -100",
+			formula: "@c.calc.stats.deprivationCold.value + @c.calc.stats.deprivationColdBonus.value -1D100",
 			enabled: true,
 			label: (game as Game).i18n.localize("midgard5.deprivationCold"),
 			result: "",
@@ -216,7 +216,7 @@ export class M5Roll {
 		const rollData = actor.getRollData() as M5RollData;
 
 		rollData.rolls["0"] = {
-			formula: "1d100 + @c.calc.stats.deprivationHeat.value + @c.calc.stats.deprivationHeatBonus.value -100",
+			formula: "@c.calc.stats.deprivationHeat.value + @c.calc.stats.deprivationHeatBonus.value -1D100",
 			enabled: true,
 			label: (game as Game).i18n.localize("midgard5.deprivationHeat"),
 			result: "",
@@ -233,7 +233,7 @@ export class M5Roll {
 		const rollData = actor.getRollData() as M5RollData;
 
 		rollData.rolls["0"] = {
-			formula: "1d100 + @c.calc.stats.deprivationFood.value + @c.calc.stats.deprivationFoodBonus.value -100",
+			formula: "@c.calc.stats.deprivationFood.value + @c.calc.stats.deprivationFoodBonus.value -1D100",
 			enabled: true,
 			label: (game as Game).i18n.localize("midgard5.deprivationFood"),
 			result: "",
diff --git a/templates/sheets/character/base_values.hbs b/templates/sheets/character/base_values.hbs
index c9097a2..e5ab39c 100644
--- a/templates/sheets/character/base_values.hbs
+++ b/templates/sheets/character/base_values.hbs
@@ -46,8 +46,8 @@
 					<tr>
 						<td>{{localize "midgard5.luckPoints"}}</td>
 						<td><input name="data.gp" type="text" value="{{data.gp}}" data-dtype="Number" /></td>
-						<td></td>
-						<td></td>
+						<td>{{localize "midgard5.valuable"}}</td>
+						<td class="fixed-value">{{data.calc.stats.wealth}}</td>
 					</tr>
 					<tr height = 10px></tr>
 				</tbody>
@@ -147,21 +147,20 @@
 						<td>{{localize "midgard5.resistanceBody"}}</td>
 						<td class="fixed-value">{{data.calc.stats.resistanceBody.value}}</td>
 					</tr>
+						<td>{{localize "midgard5.valuable"}}</td>
+						<td class="fixed-value">{{data.calc.stats.wealth}}</td>
 					{{#if (eq data.info.race "Zwerg")}}
-						<tr>
+						
 							<td>{{localize "midgard5.hoard"}}</td>
 							<td class="fixed-value">{{data.calc.stats.hoard}}</td>
-							<td></td>
-							<td></td>
 						</tr>
 						<tr>
 							<td>{{localize "midgard5.hoardMin"}}</td>
 							<td class="fixed-value">{{data.calc.stats.hoardMin}}</td>
 							<td>{{localize "midgard5.hoard-next"}}</td>
 							<td class="fixed-value">{{data.calc.stats.hoardNext}}</td>
-						</tr>
+						
 					{{/if}}
-					
 					<tr height = 10px></tr>
 				</tbody>
 			</table>