diff --git a/Torchbearer 2E/src/js/calculate_dice.js b/Torchbearer 2E/src/js/calculate_dice.js index 44306e4649..0c71199a85 100644 --- a/Torchbearer 2E/src/js/calculate_dice.js +++ b/Torchbearer 2E/src/js/calculate_dice.js @@ -58,7 +58,7 @@ function calculateDice(values, rolling) { // Check to half for beginners luck if (isBeginnersLuck) { - rollValue = Math.floor(rollValue / 2); + rollValue = Math.ceil(rollValue / 2); } // Add traits, persona, channelled nature, conditions, etc. @@ -79,15 +79,15 @@ function calculateDice(values, rolling) { rollValue += parseInt(values['rolling_otherdice']); - if (values['injured'] > 0) { + if (values['injured'] == "on") { rollValue -= 1; } - if (values['sick'] > 0) { + if (values['sick'] == "on") { rollValue -= 1; } - if (values['fresh'] > 0) { + if (values['fresh'] == "on") { rollValue += 1; } diff --git a/Torchbearer 2E/src/pug/pages/kit.pug b/Torchbearer 2E/src/pug/pages/kit.pug index d7d1c9656c..499bd9bcb4 100644 --- a/Torchbearer 2E/src/pug/pages/kit.pug +++ b/Torchbearer 2E/src/pug/pages/kit.pug @@ -34,7 +34,7 @@ include kit_mixin.pug .sheet-kit-inventory-group // Pouch .sheet-kit-group - .sheet-kit-header Pouch + .sheet-kit-header Pocket +kit_item("pocket1", "Pouch", "Trinkets") // Torso .sheet-kit-group diff --git a/Torchbearer 2E/src/scss/anatomy/abilities_and_skills.scss b/Torchbearer 2E/src/scss/anatomy/abilities_and_skills.scss index e2d0ad4fd3..d59001472c 100644 --- a/Torchbearer 2E/src/scss/anatomy/abilities_and_skills.scss +++ b/Torchbearer 2E/src/scss/anatomy/abilities_and_skills.scss @@ -183,7 +183,7 @@ } } - @for $i from 1 through 10 { + @for $i from 2 through 10 { @for $j from 1 through $i - 1 { .sheet-advancement-flag[value="#{$i}"]~.sheet-fail .sheet-#{$j} { display: inline-block; diff --git a/Torchbearer 2E/torchbearer.css b/Torchbearer 2E/torchbearer.css index 4aa1935281..1d5d1d35d4 100644 --- a/Torchbearer 2E/torchbearer.css +++ b/Torchbearer 2E/torchbearer.css @@ -4064,12 +4064,6 @@ .ui-dialog .tab-content .charsheet .sheet-advancement-flag[value="10"] ~ .sheet-pass .sheet-10 { display: inline-block; } -.ui-dialog .tab-content .charsheet .sheet-advancement-flag[value="1"] ~ .sheet-fail .sheet-1 { - display: inline-block; -} -.ui-dialog .tab-content .charsheet .sheet-advancement-flag[value="1"] ~ .sheet-fail .sheet-0 { - display: inline-block; -} .ui-dialog .tab-content .charsheet .sheet-advancement-flag[value="2"] ~ .sheet-fail .sheet-1 { display: inline-block; } diff --git a/Torchbearer 2E/torchbearer.html b/Torchbearer 2E/torchbearer.html index c3c48be006..90e9dbc851 100644 --- a/Torchbearer 2E/torchbearer.html +++ b/Torchbearer 2E/torchbearer.html @@ -2541,7 +2541,7 @@
-
Pouch
+
Pocket
Trinkets
@@ -5745,7 +5745,7 @@ function calculateDice(values, rolling) { // Check to half for beginners luck if (isBeginnersLuck) { - rollValue = Math.floor(rollValue / 2); + rollValue = Math.ceil(rollValue / 2); } // Add traits, persona, channelled nature, conditions, etc. @@ -5766,15 +5766,15 @@ function calculateDice(values, rolling) { rollValue += parseInt(values['rolling_otherdice']); - if (values['injured'] > 0) { + if (values['injured'] == "on") { rollValue -= 1; } - if (values['sick'] > 0) { + if (values['sick'] == "on") { rollValue -= 1; } - if (values['fresh'] > 0) { + if (values['fresh'] == "on") { rollValue += 1; }