From aaec0ca972be4a03090fd8a2e3db113ca76d564d Mon Sep 17 00:00:00 2001
From: Kreuvf <webmaster@kreuvf.de>
Date: Mon, 8 May 2017 18:46:31 +0200
Subject: [PATCH] * Make talent, spell, miracle roll templates more compact 
 * In part this is a preparation for the upcoming addition of a new talent
 roll template for talents affected by encumbrance

---
 .../dsa4_1_character_sheet_roll20.html        | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/Das_Schwarze_Auge_4-1/dsa4_1_character_sheet_roll20.html b/Das_Schwarze_Auge_4-1/dsa4_1_character_sheet_roll20.html
index 61ff86ec33..d884264703 100644
--- a/Das_Schwarze_Auge_4-1/dsa4_1_character_sheet_roll20.html
+++ b/Das_Schwarze_Auge_4-1/dsa4_1_character_sheet_roll20.html
@@ -12637,16 +12637,13 @@
             <th colspan="2">{{name}}</th>
         </tr>
         <tr>
-            <td colspan="2" class="sheet-templates-result">Talentprobe {{#rollGreater() Talent -1}}ge{{/rollGreater() Talent -1}}{{#rollLess() Talent 0}}miss{{/rollLess() Talent 0}}lungen ({{Talent}} <span class="sheet-abbr" title="übrigbehaltene Talentpunkte">TaP*</span>).</td>
+            <td colspan="2" class="sheet-templates-result">Talentprobe {{#rollLess() mod 0}}{{mod}}{{/rollLess() mod 0}}
+{{#rollTotal() mod 0}}&#177;{{mod}}{{/rollTotal() mod 0}}
+{{#rollGreater() mod 0}}+{{mod}}{{/rollGreater() mod 0}} {{#rollGreater() Talent -1}}ge{{/rollGreater() Talent -1}}{{#rollLess() Talent 0}}miss{{/rollLess() Talent 0}}lungen ({{Talent}} <span class="sheet-abbr" title="übrigbehaltene Talentpunkte">TaP*</span>).</td>
         </tr>
         <tr>
             <td><span class="sheet-abbr" title="Talentwert">TaW</span>: {{taw}}</td>
-            <td>Erschwernis: {{#rollLess() mod 0}}{{mod}}{{/rollLess() mod 0}}
-{{#rollTotal() mod 0}}&#177;{{mod}}{{/rollTotal() mod 0}}
-{{#rollGreater() mod 0}}+{{mod}}{{/rollGreater() mod 0}}</td>
-        </tr>
-        <tr>
-            <td colspan="2">Eigenschaften: {{stat1}}/{{stat2}}/{{stat3}}</td>
+            <td>Eigenschaften: {{stat1}}/{{stat2}}/{{stat3}}</td>
         </tr>
         {{#rollWasCrit() Talent}}
         <tr>
@@ -12672,16 +12669,13 @@
             <th colspan="2">{{name}}</th>
         </tr>
         <tr>
-            <td colspan="2" class="sheet-templates-result">Zauberprobe {{#rollGreater() Talent -1}}ge{{/rollGreater() Talent -1}}{{#rollLess() Talent 0}}miss{{/rollLess() Talent 0}}lungen ({{Talent}} <span class="sheet-abbr" title="übrigbehaltene Zauberfertigkeitspunkte">ZfP*</span>).</td>
+            <td colspan="2" class="sheet-templates-result">Zauberprobe {{#rollLess() mod 0}}{{mod}}{{/rollLess() mod 0}}
+{{#rollTotal() mod 0}}&#177;{{mod}}{{/rollTotal() mod 0}}
+{{#rollGreater() mod 0}}+{{mod}}{{/rollGreater() mod 0}} {{#rollGreater() Talent -1}}ge{{/rollGreater() Talent -1}}{{#rollLess() Talent 0}}miss{{/rollLess() Talent 0}}lungen ({{Talent}} <span class="sheet-abbr" title="übrigbehaltene Zauberfertigkeitspunkte">ZfP*</span>).</td>
         </tr>
         <tr>
             <td><span class="sheet-abbr" title="Zauberfertigkeitswert">ZfW</span>: {{taw}}</td>
-            <td>Erschwernis: {{#rollLess() mod 0}}{{mod}}{{/rollLess() mod 0}}
-{{#rollTotal() mod 0}}&#177;{{mod}}{{/rollTotal() mod 0}}
-{{#rollGreater() mod 0}}+{{mod}}{{/rollGreater() mod 0}}</td>
-        </tr>
-        <tr>
-            <td colspan="2">Eigenschaften: {{stat1}}/{{stat2}}/{{stat3}}</td>
+            <td>Eigenschaften: {{stat1}}/{{stat2}}/{{stat3}}</td>
         </tr>
         {{#rollWasCrit() Talent}}
         <tr>
@@ -12707,16 +12701,13 @@
             <th colspan="2">{{name}}</th>
         </tr>
         <tr>
-            <td colspan="2" class="sheet-templates-result">Mirakelprobe {{#rollGreater() Liturgie -1}}ge{{/rollGreater() Liturgie -1}}{{#rollLess() Liturgie 0}}miss{{/rollLess() Liturgie 0}}lungen ({{Liturgie}} <span class="sheet-abbr" title="übrigbehaltene Liturgiekenntnispunkte">LkP*</span>).</td>
+            <td colspan="2" class="sheet-templates-result">Mirakelprobe {{#rollLess() mod 0}}{{mod}}{{/rollLess() mod 0}}
+{{#rollTotal() mod 0}}&#177;{{mod}}{{/rollTotal() mod 0}}
+{{#rollGreater() mod 0}}+{{mod}}{{/rollGreater() mod 0}} {{#rollGreater() Liturgie -1}}ge{{/rollGreater() Liturgie -1}}{{#rollLess() Liturgie 0}}miss{{/rollLess() Liturgie 0}}lungen ({{Liturgie}} <span class="sheet-abbr" title="übrigbehaltene Liturgiekenntnispunkte">LkP*</span>).</td>
         </tr>
         <tr>
             <td><span class="sheet-abbr" title="Liturgiekenntniswert">LkW</span>: {{lkw}}</td>
-            <td>Erschwernis: {{#rollLess() mod 0}}{{mod}}{{/rollLess() mod 0}}
-{{#rollTotal() mod 0}}&#177;{{mod}}{{/rollTotal() mod 0}}
-{{#rollGreater() mod 0}}+{{mod}}{{/rollGreater() mod 0}}</td>
-        </tr>
-        <tr>
-            <td colspan="2">Eigenschaften: {{stat1}}/{{stat2}}/{{stat3}}</td>
+            <td>Eigenschaften: {{stat1}}/{{stat2}}/{{stat3}}</td>
         </tr>
         {{#rollWasCrit() Liturgie}}
         <tr>