From 8ffe1ff7e9df18ebfa9905fea6c988eb54d86eca Mon Sep 17 00:00:00 2001
From: Kaias26 <ryuran1@msn.com>
Date: Thu, 17 May 2018 09:44:28 +0200
Subject: [PATCH] rollTemplate Magic improvement

---
 Naheulbeuk/Naheulbeuk.html | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Naheulbeuk/Naheulbeuk.html b/Naheulbeuk/Naheulbeuk.html
index 3391f9639f..0ce86cbafe 100644
--- a/Naheulbeuk/Naheulbeuk.html
+++ b/Naheulbeuk/Naheulbeuk.html
@@ -835,24 +835,26 @@
 				<td><span class="tcat">Aire d’effet </span>{{magie_aireeffet}}</td>
 			</tr>
 		{{/magie_aireeffet}}
-		{{#rollTotal() magie_display_epreuve 1}}
+		{{#magie_display_epreuve}}
 			<tr>
 				<td><span class="tcat">Épreuve </span>{{magie_epreuve}}</td>
 			</tr>
+		{{/magie_display_epreuve}}
+		{{#magie_display_resistance}}
 			<tr>
 				<td><span class="tcat">Resistance </span>{{magie_resistance}}</td>
 			</tr>
-		{{/rollTotal() magie_display_epreuve 1}}
-		{{#rollTotal() magie_display_soins 1}}
+		{{/magie_display_resistance}}
+		{{#magie_soin}}
 			<tr>
 				<td><span class="tcat">Soin </span>{{magie_soin}}</td>
 			</tr>
-		{{/rollTotal() magie_display_soins 1}}
-		{{#rollTotal() magie_display_degats 1}}
+		{{/magie_soin}}
+		{{#magie_degats}}
 			<tr>
-				<td><span class="tcat">Dégats </span>{{magie_degats}}</td>
+				<td><span class="tcat">Dégats </span>{{magie_degats}} {{#rollGreater() magie_bonusint 0}}+ Bonus Int{{/rollGreater() magie_bonusint 0}}</td>
 			</tr>
-		{{/rollTotal() magie_display_degats 1}}
+		{{/magie_degats}}
 		<tr>
 			<td>{{magie_effet}}</td>
 		</tr>
@@ -862,7 +864,7 @@
 			</tr>
 		{{/magie_ingre}}
 
-		{{#rollTotal() magie_display_creature 1}}
+		{{#creature_ev}}
 			<tr><th>Créature invoquée :</th></tr>
 			<tr><td><span class="tcat">EV </span>{{creature_ev}} - <span class="tcat">INT </span>{{creature_int}}</td></tr>
 			<tr><td><span class="tcat">AT </span>{{creature_at}} - <span class="tcat">PRD/ESQ </span>{{creature_def}}</td><tr>
@@ -872,7 +874,7 @@
 			<tr><td><span class="tcat">Appel </span>Magie PSY + {{magie_epreuveappel_mod}}</td><tr>
 			<tr><td><span class="tcat">Contrôle </span>Magie PSY + {{magie_epreuvecontrol_mod}}</td><tr>
 			<tr><td><span class="tcat">Révocation </span>Magie PSY + {{magie_epreuverevocation_mod}}</td><tr>
-		{{/rollTotal() magie_display_creature 1}}
+		{{/creature_ev}}
 	</table>
 </rolltemplate>
 
@@ -1629,7 +1631,7 @@
 								</select>
 							</div>
 							<div class="sheet-col" style="width: 100px;">
-								<button type="roll" value="@{displayJet} &{template:magie} {{name=@{magie_nom}}} {{magie_ecole=@{magie_ecole}}} {{magie_niveau=@{magie_niveau}}} {{magie_display_epreuve=[[@{magie_display_epreuve}]]}} {{magie_display_soins=[[@{magie_display_soins}]]}} {{magie_display_degats=[[@{magie_display_degats}]]}} {{magie_display_creature=[[@{magie_display_creature}]]}} {{magie_incantation=@{magie_incantation}}} {{magie_duree=@{magie_duree}}} {{magie_cout=@{magie_cout}}} {{magie_portee=@{magie_portee}}} {{magie_effet=@{magie_effet}}} {{magie_ingre=@{magie_ingre}}} {{magie_aireeffet=@{magie_aireeffet}}} {{magie_soin=@{magie_soin}}} {{magie_degats=@{Magie_Degats} + @{magieBonusInt}}} {{magie_epreuve=@{Magie_EpreuveLanceur_Jet} + @{Magie_EpreuveLanceur_mod}}} {{magie_resistance=@{Magie_EpreuveCible_Jet} + @{Magie_EpreuveCible_mod}}} {{creature_ev=@{creature_ev}}} {{creature_int=@{creature_int}}} {{creature_at=@{creature_at}}} {{creature_def=@{creature_def}}} {{creature_cou=@{creature_cou}}} {{creature_pr=@{creature_pr}}} {{creature_xp=@{creature_xp}}} {{creature_resimagie=@{creature_resimagie}}} {{creature_degats=@{creature_degats}}} {{magie_epreuveappel_mod=@{magie_epreuveappel_mod}}} {{magie_epreuvecontrol_mod=@{magie_epreuvecontrol_mod}}} {{magie_epreuverevocation_mod=@{magie_epreuverevocation_mod}}}"> Grimmoire </button>
+								<button type="roll" value="@{displayJet} &{template:magie} {{name=@{magie_nom}}} {{magie_ecole=@{magie_ecole}}} {{magie_niveau=@{magie_niveau}}} {{magie_display_epreuve=@{Magie_EpreuveLanceur_Jet}}}  {{magie_display_resistance=@{Magie_EpreuveCible_Jet}}} {{magie_incantation=@{magie_incantation}}} {{magie_duree=@{magie_duree}}} {{magie_cout=@{magie_cout}}} {{magie_portee=@{magie_portee}}} {{magie_effet=@{magie_effet}}} {{magie_ingre=@{magie_ingre}}} {{magie_aireeffet=@{magie_aireeffet}}} {{magie_soin=@{magie_soin}}} {{magie_degats=@{Magie_Degats}}} {{magie_bonusint=[[@{MagieBonusInt}]]}} {{magie_epreuve=@{Magie_EpreuveLanceur_Jet} + @{Magie_EpreuveLanceur_mod}}} {{magie_resistance=@{Magie_EpreuveCible_Jet} + @{Magie_EpreuveCible_mod}}} {{creature_ev=@{creature_ev}}} {{creature_int=@{creature_int}}} {{creature_at=@{creature_at}}} {{creature_def=@{creature_def}}} {{creature_cou=@{creature_cou}}} {{creature_pr=@{creature_pr}}} {{creature_xp=@{creature_xp}}} {{creature_resimagie=@{creature_resimagie}}} {{creature_degats=@{creature_degats}}} {{magie_epreuveappel_mod=@{magie_epreuveappel_mod}}} {{magie_epreuvecontrol_mod=@{magie_epreuvecontrol_mod}}} {{magie_epreuverevocation_mod=@{magie_epreuverevocation_mod}}}"> Grimmoire </button>
 							</div>
 							<br clear="all" />
 							<br />