From 2db7cb38da52a84c78b32308bde895325c4783de Mon Sep 17 00:00:00 2001
From: max37 <still-max@mail.ru>
Date: Mon, 15 Jun 2020 16:51:16 +0300
Subject: [PATCH] [Torchbearer] Magic and Beginner's Luck improvements (#6728)

* Spellbook and macros fix

* Beginner's Luck update
---
 Torchbearer/torchbearer.css  | 8 ++++++--
 Torchbearer/torchbearer.html | 8 ++++++--
 Torchbearer/translation.json | 4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Torchbearer/torchbearer.css b/Torchbearer/torchbearer.css
index c43bce5abc..603660d408 100644
--- a/Torchbearer/torchbearer.css
+++ b/Torchbearer/torchbearer.css
@@ -341,14 +341,18 @@
 }
 .sheet-section.sheet-section-traveling-spellbook table tr th:nth-child(1),
 .sheet-section.sheet-section-traveling-spellbook table tr td:nth-child(1) {
-  width: 25%;
+  width: 20%;
 }
 .sheet-section.sheet-section-traveling-spellbook table tr th:nth-child(2),
 .sheet-section.sheet-section-traveling-spellbook table tr td:nth-child(2) {
-  width: 15%;
+  width: 10%;
 }
 .sheet-section.sheet-section-traveling-spellbook table tr th:nth-child(3),
 .sheet-section.sheet-section-traveling-spellbook table tr td:nth-child(3) {
+  width: 10%;
+}
+.sheet-section.sheet-section-traveling-spellbook table tr th:nth-child(4),
+.sheet-section.sheet-section-traveling-spellbook table tr td:nth-child(4) {
   width: 60%;
 }
 .sheet-section.sheet-section-traveling-spellbook table tr th select,
diff --git a/Torchbearer/torchbearer.html b/Torchbearer/torchbearer.html
index 7c34b735e0..e48f15e02c 100644
--- a/Torchbearer/torchbearer.html
+++ b/Torchbearer/torchbearer.html
@@ -444,7 +444,7 @@
 						</th>
                         <td>
 							<input type="number" name="attr_will_rating" value="2"/>
-							<button type='roll' name='roll_will_bl_test' value="&{template:default} {{name=Beginner's Luck based on Will}}{{Successes=[[ [[ floor( (@{will_rating} + ?{Help, wises, supplies and gear modifiers|0}) / 2 ) + ?{Traits, persona, tapped Nature, Fresh and other modifiers|0} ]]d6>4]]}}{{Ob=[[?{Obstacle|0}]]}}{{Important=Check Pass or Fail after roll!}}">
+							<button type='roll' name='roll_will_bl_test' value="&{template:default} {{name=Beginner's Luck based on Will}}{{Successes=[[ [[ ceil( (@{will_rating} + ?{Help, wises, supplies and gear modifiers|0}) / 2 ) + ?{Traits, persona, tapped Nature, Fresh and other modifiers|0} ]]d6>4]]}}{{Ob=[[?{Obstacle|0}]]}}{{Important=Check skill advancement after roll!}}" data-i18n-title="BeginnersLuckFull" title="Beginner s Luck!">
 								<span data-i18n="BeginnersLuck">BL</span>
 							</button>
 						</td>
@@ -476,7 +476,7 @@
 						</th>
                         <td>
 							<input type="number" name="attr_health_rating" value="2"/>
-							<button type='roll' name='roll_health_bl_test' value="&{template:default} {{name=Beginner's Luck based on Health}}{{Successes=[[ [[ floor( (@{health_rating} + ?{Help, wises, supplies and gear modifiers|0}) / 2 ) + ?{Traits, persona, tapped Nature, Fresh and other modifiers|0} ]]d6>4]]}}{{Ob=[[?{Obstacle|0}]]}}{{Important=Check Pass or Fail after roll!}}">
+							<button type='roll' name='roll_health_bl_test' value="&{template:default} {{name=Beginner's Luck based on Health}}{{Successes=[[ [[ ceil( (@{health_rating} + ?{Help, wises, supplies and gear modifiers|0}) / 2 ) + ?{Traits, persona, tapped Nature, Fresh and other modifiers|0} ]]d6>4]]}}{{Ob=[[?{Obstacle|0}]]}}{{Important=Check skill advancement after roll!}}" data-i18n-title="BeginnersLuckFull" title="Beginner s Luck!">
 								<span data-i18n="BeginnersLuck">BL</span>
 							</button>
 						</td>
@@ -1625,6 +1625,10 @@
                         <label for="attr_spell_name"><span data-i18n="SpellName">Spell Name</span></label>
                         <input type="text" name="attr_spell_name" />
                     </td>
+                    <td>
+                        <label for="attr_spell_memory"><span data-i18n="Spellbook">Spellbook</span></label>
+                        <input type="checkbox" name="attr_spell_spellbook" />
+                    </td>
                     <td>
                         <label for="attr_spell_memory"><span data-i18n="Memory">Memory</span></label>
                         <input type="checkbox" name="attr_spell_memory" />
diff --git a/Torchbearer/translation.json b/Torchbearer/translation.json
index a0115203b9..94a0455a3c 100644
--- a/Torchbearer/translation.json
+++ b/Torchbearer/translation.json
@@ -138,10 +138,12 @@
 	"FifthCircle": "Fifth Circle",
 	"TravelingSpellbook": "Traveling Spellbook",
 	"SpellName": "Spell Name",
+	"Spellbook": "Spellbook",
 	"Memory": "Memory",
 	"SpellRulesPlaceholder": "Spell Rules",
 	"LevelRequirementsAndBenefits": "Level Requirements &amp; Benefits",
 	"LevelTitleAndBenefits": "Level Title &amp; Benefits",
 	"GrindConditionsOrder":"The Grind",
-	"BeginnersLuck":"BL"
+	"BeginnersLuck":"BL",
+	"BeginnersLuckFull":"Beginner s Luck!"
 }