From 319d0578c33766cc22cd896f64a009e49c19f599 Mon Sep 17 00:00:00 2001
From: David Lambert <40821489+BE-Arbiter@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:28:29 +0100
Subject: [PATCH] - Pre-i18n -fix

---
 DnD_3_5_Modern/dnd_3_5_modern.html            | 21 ++++++++++---------
 DnD_3_5_Modern/generated/characteristics.html | 10 ++++-----
 DnD_3_5_Modern/src/js/characteristics.js      |  7 ++++---
 DnD_3_5_Modern/src/js/classes.js              |  2 +-
 DnD_3_5_Modern/src/js/saves.js                |  2 +-
 DnD_3_5_Modern/src/pug/characteristics.pug    |  2 +-
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/DnD_3_5_Modern/dnd_3_5_modern.html b/DnD_3_5_Modern/dnd_3_5_modern.html
index d47ac35696..761ed597b8 100644
--- a/DnD_3_5_Modern/dnd_3_5_modern.html
+++ b/DnD_3_5_Modern/dnd_3_5_modern.html
@@ -66,7 +66,7 @@
                   </div>
                   <div class="attribute">
                     <button class="button-label" value="@{dex_rollvalue}" type="roll"><span>dex</span></button><span class="mod" type="text" name="attr_dex_mod"></span>
-                    <input type="hidden" name="attr_dex_rollvalue" value="&amp;{template:main} {{titre=Test de dex}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+                    <input type="hidden" name="attr_dex_rollvalue" value="&amp;{template:main} {{titre=Test de dex}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{dex_mod}]]}}"/>
                     <div class="base">
                       <input type="hidden" name="attr_dex_modified" value="false"/>
                       <input class="base" type="number" name="attr_dex_base" value="10"/><span name="attr_dex_total">10</span>
@@ -74,7 +74,7 @@
                   </div>
                   <div class="attribute">
                     <button class="button-label" value="@{int_rollvalue}" type="roll"><span>int</span></button><span class="mod" type="text" name="attr_int_mod"></span>
-                    <input type="hidden" name="attr_int_rollvalue" value="&amp;{template:main} {{titre=Test de int}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+                    <input type="hidden" name="attr_int_rollvalue" value="&amp;{template:main} {{titre=Test de int}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{int_mod}]]}}"/>
                     <div class="base">
                       <input type="hidden" name="attr_int_modified" value="false"/>
                       <input class="base" type="number" name="attr_int_base" value="10"/><span name="attr_int_total">10</span>
@@ -82,7 +82,7 @@
                   </div>
                   <div class="attribute">
                     <button class="button-label" value="@{con_rollvalue}" type="roll"><span>con</span></button><span class="mod" type="text" name="attr_con_mod"></span>
-                    <input type="hidden" name="attr_con_rollvalue" value="&amp;{template:main} {{titre=Test de con}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+                    <input type="hidden" name="attr_con_rollvalue" value="&amp;{template:main} {{titre=Test de con}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{con_mod}]]}}"/>
                     <div class="base">
                       <input type="hidden" name="attr_con_modified" value="false"/>
                       <input class="base" type="number" name="attr_con_base" value="10"/><span name="attr_con_total">10</span>
@@ -90,7 +90,7 @@
                   </div>
                   <div class="attribute">
                     <button class="button-label" value="@{sag_rollvalue}" type="roll"><span>sag</span></button><span class="mod" type="text" name="attr_sag_mod"></span>
-                    <input type="hidden" name="attr_sag_rollvalue" value="&amp;{template:main} {{titre=Test de sag}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+                    <input type="hidden" name="attr_sag_rollvalue" value="&amp;{template:main} {{titre=Test de sag}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{sag_mod}]]}}"/>
                     <div class="base">
                       <input type="hidden" name="attr_sag_modified" value="false"/>
                       <input class="base" type="number" name="attr_sag_base" value="10"/><span name="attr_sag_total">10</span>
@@ -98,7 +98,7 @@
                   </div>
                   <div class="attribute">
                     <button class="button-label" value="@{cha_rollvalue}" type="roll"><span>cha</span></button><span class="mod" type="text" name="attr_cha_mod"></span>
-                    <input type="hidden" name="attr_cha_rollvalue" value="&amp;{template:main} {{titre=Test de cha}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+                    <input type="hidden" name="attr_cha_rollvalue" value="&amp;{template:main} {{titre=Test de cha}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{cha_mod}]]}}"/>
                     <div class="base">
                       <input type="hidden" name="attr_cha_modified" value="false"/>
                       <input class="base" type="number" name="attr_cha_base" value="10"/><span name="attr_cha_total">10</span>
@@ -1943,10 +1943,11 @@
                 }
     
                 let modded = total !== base;
-                if (total % 2 == 1) {
-                    total--;
+                let effective_total = total;
+                if (effective_total % 2 == 1) {
+                    effective_total--;
                 }
-                let mod = (total - 10) / 2;
+                let mod = (effective_total - 10) / 2;
                 toUpdate[characteristic + "_modified"] = modded ? "true" : "false";
                 toUpdate[characteristic + "_mod"] = mod;
                 toUpdate[characteristic + "_total"] = "" + total;
@@ -2415,7 +2416,7 @@
     
     
     on("change:class1_ref change:class2_ref change:class3_ref change:class1_vig change:class2_vig change:class3_vig"
-        +"change:class1_vol change:class2_vol change:class3_vol", () => {
+        +" change:class1_vol change:class2_vol change:class3_vol", () => {
         updateClassSaves();
     });
     
@@ -2652,7 +2653,7 @@
                 }
                 let toUpdate = {};
                 toUpdate[`${save}_total`] = total + mods;
-                toUpdate[`${save}_roll_value`] = `&{template:main} {{titre=Test de Réflexes}} {{subtitle=@{character_name} }} {{Jet=[[1d20+${roll}]]}}`;
+                toUpdate[`${save}_roll_value`] = `&{template:main} {{titre=Test de ${save}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+${roll}]]}}`;
                 toUpdate[`${save}_modified`] = !!mods;
                 setAttrs(toUpdate);
             }
diff --git a/DnD_3_5_Modern/generated/characteristics.html b/DnD_3_5_Modern/generated/characteristics.html
index d648cabd5e..68ca3b69a1 100644
--- a/DnD_3_5_Modern/generated/characteristics.html
+++ b/DnD_3_5_Modern/generated/characteristics.html
@@ -10,7 +10,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{dex_rollvalue}" type="roll"><span>dex</span></button><span class="mod" type="text" name="attr_dex_mod"></span>
-    <input type="hidden" name="attr_dex_rollvalue" value="&amp;{template:main} {{titre=Test de dex}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+    <input type="hidden" name="attr_dex_rollvalue" value="&amp;{template:main} {{titre=Test de dex}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{dex_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_dex_modified" value="false"/>
       <input class="base" type="number" name="attr_dex_base" value="10"/><span name="attr_dex_total">10</span>
@@ -18,7 +18,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{int_rollvalue}" type="roll"><span>int</span></button><span class="mod" type="text" name="attr_int_mod"></span>
-    <input type="hidden" name="attr_int_rollvalue" value="&amp;{template:main} {{titre=Test de int}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+    <input type="hidden" name="attr_int_rollvalue" value="&amp;{template:main} {{titre=Test de int}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{int_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_int_modified" value="false"/>
       <input class="base" type="number" name="attr_int_base" value="10"/><span name="attr_int_total">10</span>
@@ -26,7 +26,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{con_rollvalue}" type="roll"><span>con</span></button><span class="mod" type="text" name="attr_con_mod"></span>
-    <input type="hidden" name="attr_con_rollvalue" value="&amp;{template:main} {{titre=Test de con}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+    <input type="hidden" name="attr_con_rollvalue" value="&amp;{template:main} {{titre=Test de con}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{con_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_con_modified" value="false"/>
       <input class="base" type="number" name="attr_con_base" value="10"/><span name="attr_con_total">10</span>
@@ -34,7 +34,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{sag_rollvalue}" type="roll"><span>sag</span></button><span class="mod" type="text" name="attr_sag_mod"></span>
-    <input type="hidden" name="attr_sag_rollvalue" value="&amp;{template:main} {{titre=Test de sag}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+    <input type="hidden" name="attr_sag_rollvalue" value="&amp;{template:main} {{titre=Test de sag}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{sag_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_sag_modified" value="false"/>
       <input class="base" type="number" name="attr_sag_base" value="10"/><span name="attr_sag_total">10</span>
@@ -42,7 +42,7 @@
   </div>
   <div class="attribute">
     <button class="button-label" value="@{cha_rollvalue}" type="roll"><span>cha</span></button><span class="mod" type="text" name="attr_cha_mod"></span>
-    <input type="hidden" name="attr_cha_rollvalue" value="&amp;{template:main} {{titre=Test de cha}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}"/>
+    <input type="hidden" name="attr_cha_rollvalue" value="&amp;{template:main} {{titre=Test de cha}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{cha_mod}]]}}"/>
     <div class="base">
       <input type="hidden" name="attr_cha_modified" value="false"/>
       <input class="base" type="number" name="attr_cha_base" value="10"/><span name="attr_cha_total">10</span>
diff --git a/DnD_3_5_Modern/src/js/characteristics.js b/DnD_3_5_Modern/src/js/characteristics.js
index db0fe105ad..c3775fc757 100644
--- a/DnD_3_5_Modern/src/js/characteristics.js
+++ b/DnD_3_5_Modern/src/js/characteristics.js
@@ -33,10 +33,11 @@ let updateCharacteristicsList = (characteristicList, modifierList) => {
             }
 
             let modded = total !== base;
-            if (total % 2 == 1) {
-                total--;
+            let effective_total = total;
+            if (effective_total % 2 == 1) {
+                effective_total--;
             }
-            let mod = (total - 10) / 2;
+            let mod = (effective_total - 10) / 2;
             toUpdate[characteristic + "_modified"] = modded ? "true" : "false";
             toUpdate[characteristic + "_mod"] = mod;
             toUpdate[characteristic + "_total"] = "" + total;
diff --git a/DnD_3_5_Modern/src/js/classes.js b/DnD_3_5_Modern/src/js/classes.js
index 617eb09ff2..bddf4d4bfd 100644
--- a/DnD_3_5_Modern/src/js/classes.js
+++ b/DnD_3_5_Modern/src/js/classes.js
@@ -11,7 +11,7 @@ on("change:class1_bab change:class2_bab change:class3_bab", () => {
 
 
 on("change:class1_ref change:class2_ref change:class3_ref change:class1_vig change:class2_vig change:class3_vig"
-    +"change:class1_vol change:class2_vol change:class3_vol", () => {
+    +" change:class1_vol change:class2_vol change:class3_vol", () => {
     updateClassSaves();
 });
 
diff --git a/DnD_3_5_Modern/src/js/saves.js b/DnD_3_5_Modern/src/js/saves.js
index 286d2e8410..455dbc5900 100644
--- a/DnD_3_5_Modern/src/js/saves.js
+++ b/DnD_3_5_Modern/src/js/saves.js
@@ -73,7 +73,7 @@ let updateAllSaves = (modifierList) => {
             }
             let toUpdate = {};
             toUpdate[`${save}_total`] = total + mods;
-            toUpdate[`${save}_roll_value`] = `&{template:main} {{titre=Test de Réflexes}} {{subtitle=@{character_name} }} {{Jet=[[1d20+${roll}]]}}`;
+            toUpdate[`${save}_roll_value`] = `&{template:main} {{titre=Test de ${save}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+${roll}]]}}`;
             toUpdate[`${save}_modified`] = !!mods;
             setAttrs(toUpdate);
         }
diff --git a/DnD_3_5_Modern/src/pug/characteristics.pug b/DnD_3_5_Modern/src/pug/characteristics.pug
index 6d2f295c18..5b0a809bda 100644
--- a/DnD_3_5_Modern/src/pug/characteristics.pug
+++ b/DnD_3_5_Modern/src/pug/characteristics.pug
@@ -7,7 +7,7 @@ div.attributes.w-3
                 span= attribute
             span.mod(type="text" name=`attr_${attribute}_mod`)
             input(type="hidden" name=`attr_${attribute}_rollvalue`
-            value=`&{template:main} {{titre=Test de ${attribute}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{for_mod}]]}}`)
+            value=`&{template:main} {{titre=Test de ${attribute}}} {{subtitle=@{character_name} }} {{Jet=[[1d20+@{${attribute}_mod}]]}}`)
             div.base
                 input(type="hidden" name=`attr_${attribute}_modified` value="false")
                 input.base(type="number" name=`attr_${attribute}_base` value="10")