From 42f8e1bf278bad75d383e67def808e0ebaf0b457 Mon Sep 17 00:00:00 2001 From: Klingon Mike Date: Tue, 4 Sep 2018 02:06:19 -0700 Subject: [PATCH] [GURPS] Bug Fixes and added FoA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Fixed bug with calculating Current Move for Heavy and Extra Heavy Encumbrances and not using a Minimum of 1. Reported by Ray G (@raymond-g) (UserID: 1600355). • Fixed bug with calculating Total Weight from Inventory which at times created a weigh of more than 3 decimal places. • Added a ‘FOA’ (Frequency of Appearance) field under Advantages (& Quirks) • Modified the Tool Tip for SCN under Disadvantages (& Quirks) and Racial Traits to include the wording ‘OR Frequency of Appearance’– Cosmetic Only • Added Max Load to the Encumbrance table. --- GURPS/gurps.css | 13 +++--- GURPS/gurps.html | 113 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 95 insertions(+), 31 deletions(-) diff --git a/GURPS/gurps.css b/GURPS/gurps.css index b6c660fead..71b87b0b6c 100644 --- a/GURPS/gurps.css +++ b/GURPS/gurps.css @@ -475,6 +475,8 @@ input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll, .sheet-melee-attacks .sheet-tooltip { margin-left: -100px; } .sheet-ranged-attacks .sheet-tooltip { margin-left: -100px; } .sheet-ranged-attacks .sheet-col1 .sheet-tooltip { margin-left: -40px; } +.sheet-encumberance .sheet-tooltip { margin-left: -40px; } + /* -- GENERAL -- */ .sheet-attribute { width: 180px; } @@ -580,12 +582,13 @@ input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll, .sheet-culture .sheet-col1 { width: 30px; } .sheet-traits { width: calc(100% - 0.4em); } -.sheet-traits .sheet-col0 { width: calc(100% - 100px); } +.sheet-traits .sheet-col0 { width: calc(100% - 117px); } .sheet-traits .sheet-col0 input { text-align:left; } -.sheet-traits .sheet-col1 { width: 30px; } -.sheet-traits .sheet-col2 { width: 30px; } -.sheet-traits .sheet-col3 { width: 40px; } -.sheet-traits .sheet-row-stats .sheet-col0 { margin-left: 20px; width: calc(100% - 120px); } +.sheet-traits .sheet-col1 { width: 25px; } +.sheet-traits .sheet-col2 { width: 22px; } +.sheet-traits .sheet-col3 { width: 30px; } +.sheet-traits .sheet-col4 { width: 40px; } +.sheet-traits .sheet-row-stats .sheet-col0 { margin-left: 20px; width: calc(100% - 137px); } .sheet-disadvantages { width: calc(100% - 0.4em); } .sheet-disadvantages .sheet-col0 { width: calc(100% - 117px); } diff --git a/GURPS/gurps.html b/GURPS/gurps.html index e2f939006e..64fe8642b3 100644 --- a/GURPS/gurps.html +++ b/GURPS/gurps.html @@ -1130,7 +1130,7 @@ X-Heavy (4)
- +
@@ -1139,6 +1139,32 @@
+ +
+
+
MAX Load*
+ + Carry on Back (B353) 15xBL. Thus, you can carry +
+ more than you can lift by yourself . . . but +
+ every second that your encumbrance is over 10xBL +
+ (that is Extra-Heavy encumbrance), you lose 1 FP. +
+ +
+ +
+ +
+
+ +
+
+ +
+
Current () @@ -1263,9 +1289,24 @@
Advantages (& Perks)
-
-
Pts
-
Ref
+
+
FOA
+ + Frequency of Appearance +
+ + + + + + + +
15 or less>
12 or less>
9 or less>
6 or less>
+ +
+
+
Pts
+
Ref
@@ -1275,12 +1316,15 @@
- +
- +
+ +
+
@@ -1306,14 +1350,16 @@
SCN
- Self-control Number + Self-control Number OR
+ Frequency of Appearance +
- - - - + + + +
6 or less2x
9 or less1.5x
12 or less1x
15 or less0.5x
15 or less
12 or less
9 or less
6 or less
@@ -1321,7 +1367,6 @@
Pts
Ref
-
@@ -1365,14 +1410,15 @@
SCN
- Self-control Number + Self-control Number OR
+ Frequency of Appearance - - - - + + + +
6 or less2x
9 or less1.5x
12 or less1x
15 or less0.5x
15 or less
12 or less
9 or less
6 or less
@@ -2308,6 +2354,20 @@

If there are others that are working on or wish to work on this sheet, lets coordinate using the Roll20 Forum for now (Like Tom and I are doing) - perhaps later we can use GitHub.

+

Version: 1.4.0

+ +

Pull Request: 09/04/2018

+ +
    +
  • Changes, Fixes, and Adds made by Mike W (UserID: 1414610
    • +
  • Fixed bug with calculating Current Move for Heavy and Extra Heavy Encumbrances and not using a Minimum of 1. Reported by Ray G (@raymond-g) (UserID: 1600355)
    • +
  • Fixed bug with calculating Total Weight from Inventory which at times created a weigh of more than 3 decimal places.
    • +
  • Added a ‘FOA’ (Frequency of Appearance) field under Advantages (& Quirks)
    • +
  • Modified the Tool Tip for SCN under Disadvantages (& Quirks) and Racial Traits to include the wording ‘OR Frequency of Appearance’– Cosmetic Only
    • +
  • Added Max Load to the Encumbrance Table
    • +
+ +

Version: 1.3.9

Pull Request: 08/21/2018

@@ -2381,7 +2441,7 @@

Version: 1.3.5

- +

Pull Request: 7/17/2018

    @@ -2509,7 +2569,7 @@ var noop = function () {}; // do nothing. - var version = '1.3.9'; + var version = '1.4.0'; var modCascade = true; var modCascadeAll = true; @@ -2602,7 +2662,7 @@ }); sumRepeating('repeating_item', 'weighttotal', function (v) { - setAttrs({ total_weight: (v * 100) / 100 }, {silent: false}, thenEncumbrance); + setAttrs({ total_weight: (v * 1000) / 1000 }, {silent: false}, thenEncumbrance); }); // Update attributes, then secondary characteristics, and so on... @@ -2924,13 +2984,14 @@ var move = +v.basic_move; var strength = +v.strength_base + +v.strength_mod; if (v.encumbrance_level === 5) { - dodge = 0; - move = 0; + dodge = 1; + move = 1; } else { dodge = dodge - +v.encumbrance_level; - move = Math.floor(+v.basic_move * (1 - (0.2 * +v.encumbrance_level))); - dodge = dodge < 0 ? 0 : dodge; - move = move < 0 ? 0 : move; + // There is some math error when calculating Encumbrance which requires the modifier of 1.01 instead of 1 below + move = Math.floor(+v.basic_move * (1.01 - (0.2 * +v.encumbrance_level))); + dodge = dodge < 1 ? 1 : dodge; + move = move < 1 ? 1 : move; } if (+v.hit_points < +v.hit_points_max / 3) { dodge = Math.ceil(dodge / 2); @@ -3088,7 +3149,7 @@ // Update the total weight of all carried items. on('change:repeating_item:weighttotal remove:repeating_item', function (e) { sumRepeating('repeating_item', 'weighttotal', function(v) { - setAttrs({ total_weight: (v * 1000) / 1000 }); + setAttrs({ total_weight: Math.round(v * 1000) / 1000 }); }); });