From f54cc6bbcd2966010b8a3773455e62dc1f246860 Mon Sep 17 00:00:00 2001
From: Juha Makkonen <jamakkon@gmail.com>
Date: Sat, 13 Mar 2021 15:55:28 +0200
Subject: [PATCH] [MERP] Fix minor issues.

* Fix the issue with encumbrance penalty: negative strength bonus no longer yields MM penalty.
* Fix misaligned sheet elements.
* Fix too short text fields.
* Fix encumbrance calculation for NPC/Creature sheet
---
 MERP/merp_2nd_ed_sheet.css  | 16 +++++++++++-----
 MERP/merp_2nd_ed_sheet.html | 35 +++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/MERP/merp_2nd_ed_sheet.css b/MERP/merp_2nd_ed_sheet.css
index bfe264df42..0fb795e55b 100644
--- a/MERP/merp_2nd_ed_sheet.css
+++ b/MERP/merp_2nd_ed_sheet.css
@@ -387,6 +387,12 @@ select::-ms-expand {
     padding-right: 3px;
 }
 
+.sheet-main .sheet-table-cell-no-padding {
+    display: table-cell;
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
 .sheet-main .sheet-horizontal-spacer {
     width: 3px;
 }
@@ -404,22 +410,22 @@ select::-ms-expand {
 }
 
 .sheet-main .sheet-personal-box {
-    min-height: 295px; 
+    min-height: 344px; 
     width: 352px;
 }
 
 .sheet-main .sheet-resistance-box {
-    min-height: 295px; 
+    min-height: 344px; 
     width: 443px;
 }
 
 .sheet-main .sheet-appearance-box {
-    min-height: 136px; 
+    min-height: 148px; 
     width: 268px;
 }
 
 .sheet-main .sheet-status-box {
-    min-height: 136px;
+    min-height: 148px;
     width: 527px;
 }
 
@@ -448,7 +454,7 @@ select::-ms-expand {
 }
 
 .sheet-main .sheet-text-field-race {
-    width: 80px;
+    width: 140px;
 }
 
 .sheet-main .sheet-text-field-profession {
diff --git a/MERP/merp_2nd_ed_sheet.html b/MERP/merp_2nd_ed_sheet.html
index 8c713deaaa..228daca0dd 100644
--- a/MERP/merp_2nd_ed_sheet.html
+++ b/MERP/merp_2nd_ed_sheet.html
@@ -110,7 +110,7 @@
                         <div class="table-cell">
                             <label>Profession:</label>
                         </div>
-                        <div class="table-cell">
+                        <div class="table-cell-no-padding">
                             <div class="tablelike">
                                 <div class="table-row">
                                     <div class="table-cell">
@@ -530,7 +530,8 @@
                                         <span class="skill-label" title="Encumbrance penalty applies to all movement and moving maneuvers. Negated by ST bonus.">Enc. Penalty:</span>
                                     </div>
                                     <div class="table-cell">
-                                        <input type="hidden" name="attr_enc_plus_st" value="(@{encumbrance_penalty} + @{stat_st_total_bonus})" disabled />
+                                        <input type="hidden" name="attr_positive_st_bonus" value="(((@{stat_st_total_bonus}) + abs(@{stat_st_total_bonus}))/2)" disabled />
+                                        <input type="hidden" name="attr_enc_plus_st" value="(@{encumbrance_penalty} + @{positive_st_bonus})" disabled />
                                         <input type="hidden" name="attr_abs_enc_penalty" value="(((@{enc_plus_st}) - abs(@{enc_plus_st}))/2)" disabled />
 
                                         <input type="number" class="autocalc-bonus" name="attr_total_enc_penalty" value="@{abs_enc_penalty}" disabled />
@@ -2578,16 +2579,6 @@
         <input type="hidden" name="attr_item_total_weight" value="0"/>
         <input type="hidden" name="attr_item_total_encumbrance" value="0"/>
 
-        <div class="tablelike">
-            <div class="fields-rowlike">
-                <div class="table-cell">
-                    <span class="skill-label" title="Total weight of items and coins">Total Weight:</span><input type="number" class="autocalc-weight" name="attr_equipment_total_weight" value="round(@{item_total_weight} + @{coins_total_weight})" disabled /> lbs
-                </div>
-                <div class="table-cell">
-                    <span class="skill-label" title="Total encumbering weight of items and coins">Encumbering Weight:</span><input type="number" class="autocalc-weight" name="attr_equipment_total_encumbrance" value="round(@{item_total_encumbrance} + @{coins_total_weight})" disabled /> lbs
-                </div>
-            </div>
-        </div>
         <div class="row">
             <div class="col border-box full-width">
                 <h3>Weapons</h3>
@@ -2596,9 +2587,9 @@
                     <div class="table-heading fields-rowlike">
                         <div class="table-cell">Weapon</div>
                         <div class="table-cell" title="The max value of a fumble">Fum</div>
-                        <div class="table-cell" title="This is the critical you take on a fumble roll, if applicable.">Fumble<br/>Crit</div>
-                        <div class="table-cell" title="The primary critical that happens for this weapon.">Primary<br/>Crit</div>
-                        <div class="table-cell" title="The secondary critical that happens for this weapon, if applicable.">2nd<br/>Crit</div>
+                        <div class="table-cell" title="This is the critical you take on a fumble roll, if applicable.">Fumble<br/>Critical</div>
+                        <div class="table-cell" title="The primary critical that happens for this weapon.">Primary<br/>Critical</div>
+                        <div class="table-cell" title="The secondary critical that happens for this weapon, if applicable.">Secondary<br/>Critical</div>
                         <div class="table-cell" title="The range of a thrown or missile weapon.">Range</div>
                         <div class="table-cell" title="The rounds it takes to reload the weapon to avoid a OB penalty.">Load<br/>Rnds</div>
                         <div class="table-cell" title="The OB penalty for not taking the indicated rounds to reload the weapon.">Load<br/>Pen</div>
@@ -2676,6 +2667,18 @@
         <div class="row">
             <div class="col border-box full-width">
                 <h3>Items Carried</h3>
+                
+                <div class="tablelike">
+                    <div class="fields-rowlike">
+                        <div class="table-cell">
+                            <span class="skill-label" title="Total weight of items and coins">Total Weight:</span><input type="number" class="autocalc-weight" name="attr_equipment_total_weight" value="round(@{item_total_weight} + @{coins_total_weight})" disabled /> lbs
+                        </div>
+                        <div class="table-cell">
+                            <span class="skill-label" title="Total encumbering weight of items and coins">Encumbering Weight:</span><input type="number" class="autocalc-weight" name="attr_equipment_total_encumbrance" value="round(@{item_total_encumbrance} + @{coins_total_weight})" disabled /> lbs
+                        </div>
+                    </div>
+                </div>
+
                 <div class="tablelike">
                     <div class="table-heading fields-rowlike">
                         <div class="table-cell">Item</div>
@@ -3168,7 +3171,7 @@
                                         <span class="skill-label" title="Encumbrance penalty applies to all movement and moving maneuvers. Negated by ST bonus.">Enc. Penalty:</span>
                                     </div>
                                     <div class="table-cell">
-                                        <input type="hidden" name="attr_creature_enc_plus_st" value="(@{creature_encumbrance_penalty} + @{stat_st_total_bonus})" disabled />
+                                        <input type="hidden" name="attr_creature_enc_plus_st" value="(@{creature_encumbrance_penalty} + @{positive_st_bonus})" disabled />
                                         <input type="hidden" name="attr_creature_abs_enc_penalty" value="(((@{creature_enc_plus_st}) - abs(@{creature_enc_plus_st}))/2)" disabled />
 
                                         <input type="number" class="autocalc-bonus" name="attr_creature_total_enc_penalty" value="@{creature_abs_enc_penalty}" disabled />