slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[GURPS] Fixed Encubrance Bug

Browse Source 
•	Fixed Encumbrance Table calculations to always allow for a Minimum Move of 1 and a Minimum Dodge of 1.
This commit is contained in:
Klingon Mike
2018-09-11 01:02:14 -07:00
parent 42f8e1bf27
commit ba3c804eec
1 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GURPS/gurps.html
+31 -12
View File
@@ -1060,6 +1060,7 @@
<!-- _____ _____ ENCUMBERANCE BOX _____ _____ -->
<!-- Note: Many of the Move and Dodge calculations were complicated, this was to allow for a Minimum Move of 1 and a Minimum Dodge of 1 -->
<div class="sheet-box sheet-encumberance">
<div class="sheet-table">
@@ -1091,10 +1092,10 @@
<input type="number" name="attr_lift_1" value="2 * @{basic_lift}" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col2">
<input type="number" name="attr_move_1" value="floor((@{basic_move}) * 0.8)" disabled="disabled" />
<input type="number" name="attr_move_1" value="[[((1 + floor((@{basic_move} * 0.8))) + abs(1 - floor((@{basic_move} * 0.8)))) / 2]]" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col3">
<input type="number" name="attr_dodge_1" value="@{dodge} - 1" disabled="disabled" />
<input type="number" name="attr_dodge_1" value="[[((1 + (@{dodge} - 1)) + abs(1 - (@{dodge} - 1))) / 2]]" disabled="disabled" />
</div>
</div> <!-- .sheet-row -->
<div class="sheet-row sheet-row-encumberance-2">
@@ -1105,10 +1106,10 @@
<input type="number" name="attr_lift_2" value="floor(3 * @{basic_lift}*100)/100" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col2">
<input type="number" name="attr_move_2" value="floor((@{basic_move}) * 0.6)" disabled="disabled" />
<input type="number" name="attr_move_2" value="[[((1 + floor((@{basic_move} * 0.6))) + abs(1 - floor((@{basic_move} * 0.6)))) / 2]]" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col3">
<input type="number" name="attr_dodge_2" value="@{dodge} - 2" disabled="disabled" />
<input type="number" name="attr_dodge_2" value="[[((1 + (@{dodge} - 2)) + abs(1 - (@{dodge} -2))) / 2]]" disabled="disabled" />
</div>
</div> <!-- .sheet-row -->
<div class="sheet-row sheet-row-encumberance-3">
@@ -1119,10 +1120,10 @@
<input type="number" name="attr_lift_3" value="floor(6 * @{basic_lift}*100)/100" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col2">
<input type="number" name="attr_move_3" value="floor((@{basic_move}) * 0.4)" disabled="disabled" />
<input type="number" name="attr_move_3" value="[[((1 + floor((@{basic_move} * 0.4))) + abs(1 - floor((@{basic_move} * 0.4)))) / 2]]" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col3">
<input type="number" name="attr_dodge_3" value="@{dodge} - 3" disabled="disabled" />
<input type="number" name="attr_dodge_3" value="[[((1 + (@{dodge} - 3)) + abs(1 - (@{dodge} -3))) / 2]]" disabled="disabled" />
</div>
</div> <!-- .sheet-row -->
<div class="sheet-row sheet-row-encumberance-4">
@@ -1133,10 +1134,10 @@
<input type="number" name="attr_lift_4" value="10 * @{basic_lift}" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col2">
<input type="number" name="attr_move_4" value="floor((@{basic_move}) * 0.2)" disabled="disabled" />
<input type="number" name="attr_move_4" value="[[((1 + floor((@{basic_move} * 0.2))) + abs(1 - floor((@{basic_move} * 0.2)))) / 2]]" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col3">
<input type="number" name="attr_dodge_4" value="@{dodge} - 4" disabled="disabled" />
<input type="number" name="attr_dodge_4" value="[[((1 + (@{dodge} -4)) + abs(1 - (@{dodge} - 4))) / 2]]" disabled="disabled" />
</div>
</div> <!-- .sheet-row -->
<!-- Yes I realize encumbrance is spelled wrong here but the original authors misspelled it throughout the file so I did the same to stay backwards compatible. -->
@@ -1159,10 +1160,10 @@
<input type="number" name="attr_lift_5" value="15 * @{basic_lift}" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col2">
<input type="number" name="attr_move_5" value="floor((@{basic_move}) * 0.2)" disabled="disabled" />
<input type="number" name="attr_move_5" value="[[((1 + floor((@{basic_move} * 0.2))) + abs(1 - floor((@{basic_move} * 0.2)))) / 2]]" disabled="disabled" />
</div>
<div class="sheet-cell sheet-col3">
<input type="number" name="attr_dodge_5" value="@{dodge} - 4" disabled="disabled" />
<input type="number" name="attr_dodge_5" value="[[((1 + (@{dodge} -4)) + abs(1 - (@{dodge} - 4))) / 2]]"disabled="disabled" />
</div>
</div> <!-- .sheet-row -->
<div class="sheet-row sheet-row-load sheet-hr">
@@ -2353,6 +2354,24 @@
<p>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.</p>
<h4>Version: 1.4.1</h4>
<p>Pull Request: ##/##/2018</p>
<ul>
<li>Changes, Fixes, and Adds made by Mike W (UserID: 1414610</li>
<li>Fixed Encumbrance Table calculations to always allow for a Minimum Move of 1 and a Minimum Dodge of 1.</li>
<li></li>
<li ></li>
<li ></li>
<li></li>
<li></li>
<li></li>
<li ></li>
<li ></li>
<li></li>
</ul>
<h4>Version: 1.4.0</h4>
@@ -2569,7 +2588,7 @@
var noop = function () {}; // do nothing.
var version = '1.4.0';
var version = '1.4.1';
var modCascade = true;
var modCascadeAll = true;
@@ -3166,7 +3185,7 @@
encumbranceLevel--;
}
if (encumbranceLevel >= 10) {
encumbranceLevel = 5;
encumbranceLevel = 4;
} else if (encumbranceLevel >= 6) {
encumbranceLevel = 4;
} else if (encumbranceLevel >= 3) {