From e3082036b52debaf4b6813f833fde24b39b53aa8 Mon Sep 17 00:00:00 2001
From: Thalar <biphron@hotmail.com>
Date: Mon, 13 Jul 2020 17:49:37 +0200
Subject: [PATCH] [NOC] Update combat helper (#6936)

---
 NOC/NOC.css  | 199 ++++++++++++++---------------
 NOC/NOC.html | 348 ++++++++++++++++++++++++---------------------------
 2 files changed, 267 insertions(+), 280 deletions(-)

diff --git a/NOC/NOC.css b/NOC/NOC.css
index 5962902812..0f24d84dad 100644
--- a/NOC/NOC.css
+++ b/NOC/NOC.css
@@ -175,8 +175,6 @@
 /*
 -= FICHE PNJ =-
 */
-
-
 .sheet-section-PNJ {
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondmain.jpg");
     background-repeat: repeat-y;
@@ -190,10 +188,6 @@
 	max-width:605px;
 }
 
-.sheet-section-PNJ span {
-	font-size:14px;
-}
-
 .sheet-rollPJ,
 .sheet-input-jetdps-PJ,
 .sheet-CHinitiative-PJ,
@@ -691,7 +685,7 @@ span.sheet-afficheflag {
 	background-repeat: no-repeat;
 	border: 0px solid black;
 	box-shadow:none;
-	z-index:999;
+	z-index:998;
 	position:relative;
 }
 
@@ -718,6 +712,11 @@ span.sheet-afficheflag {
 	font-size:20px;
 }
 
+.charsheet .repcontrol_del {
+	z-index:999;
+	position:relative;
+}
+
 .charsheet .repcontrol_add:hover,
 .charsheet .repcontrol_edit:hover {
 	background: #326097;
@@ -2631,23 +2630,16 @@ span.sheet-afficheflag {
 	margin-left: 10px;
 	margin-top: 75px;
 }
+
 .sheet-CHdivcombobox {
-	width: 250px;
+	width: 480px;
     height: 140px;
 	position: absolute;
 	z-index: 5;
 	margin-left: -5px;
-	margin-top: 105px;
-	vertical-align: middle;
-}
-.sheet-CHdivcheckbox {
-	width: 250px;
-    height: 150px;
-	position: absolute;
-	z-index: 5;
-	margin-left: 225px;
-	margin-top: 105px;
+	margin-top: 115px;
 	vertical-align: middle;
+	padding-left:10px;
 }
 
 .sheet-CHdivbonusmalus {
@@ -2655,8 +2647,8 @@ span.sheet-afficheflag {
     height: 75px;
 	position: absolute;
 	z-index: 5;
-	margin-left: 240px;
-	margin-top: 15px;	
+	margin-left: 280px;
+	margin-top: 10px;	
 }
 
 .sheet-CHtotalBM {
@@ -2664,20 +2656,10 @@ span.sheet-afficheflag {
     height: 60px;
 	position: absolute;
 	z-index: 5;
-	margin-top: 230px;
+	margin-top: 5px;
 	text-align: center;
 }
 
-.sheet-CHdescription {
-	text-align: right;
-	vertical-align: middle;
-	color: #514842;
-	display:inline-block;
-	vertical-align: middle;
-	font-size: 14px;
-	font-family: "Courier New", Courier, monospace;
-	font-weight: bold;
-}
 
 .sheet-CHdescriptionBM {
     width: 170px;
@@ -2685,23 +2667,55 @@ span.sheet-afficheflag {
 	color: #514842;	
 	display:inline-block;
 	vertical-align: middle;
+	font-weight: bold;
+	font-size: 14px;
 }
 
-.sheet-CHdescriptioncombobox {
-	text-align: right;
-	margin-left: 15px;
+.sheet-CHspan,
+.sheet-CHspan2 {
+	color: #514842;
+	vertical-align: middle;
+	font-size: 14px;
+	font-family: "Courier New", Courier, monospace;
+	font-weight: bold;
+	text-align: left;
+	margin-left: 2px;
+	border: 0 solid black;
+	background:transparent;
+	max-height:22px;
+}
+.sheet-CHspan {
+    display: none;
 }
 
-.sheet-CHdescriptioncheckbox {
-	text-align: right;
-	width: 170px;
+.sheet-CHcombo,
+.sheet-CHcombo2 {
+	color: #514842;
+	vertical-align: middle;
+	font-size: 14px;
+	width: auto;
+	margin-left: 0px;
+	margin-bottom: 0px;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
+	border: 0 solid black;
+	background:transparent;
+	max-height:22px;
+
+	padding:0px;
 }
-	
+.sheet-CHcombo {
+	display:none;
+}
+
 .sheet-CHdescriptionroll {
+	color: #514842;
+	font-weight: bold;
 	text-align: right;
-	font-size: 15px;
+	font-size: 22px;
 	margin-left: 10px;
-	/* font-family: 'Special Elite'; */
+	font-family:caveat;
+	margin-right:5px;
 }
 
 .sheet-CHdescriptionbonusmalus {
@@ -2709,49 +2723,16 @@ span.sheet-afficheflag {
 }
 
 .sheet-CHdescriptionbonusmalustitle {
+	color: #514842;
+	vertical-align: middle;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 	display: inline;
 	font-size: 20px;
+	display:none;
+	margin-left:30px;
 }
-	
-.sheet-CHportee {
-	width: 145px;
-	margin-left: 5px;
-	margin-bottom: 5px;
-	border: 2px ridge;
-	border-color: #685C52 #685C52 #616B6F #616B6F;
-	font-family: "Courier New",Courier,monospace;
-	font-weight: bold;
-}
-	
-.sheet-CHNombreopposants {
-	width: 50px;
-	margin-left: 5px;
-	margin-bottom: 5px;
-	border: 2px ridge;
-	border-color: #685C52 #685C52 #616B6F #616B6F;
-	font-family: "Courier New",Courier,monospace;
-	font-weight: bold;
-}
-	
-.sheet-CHcouvert {
-	width: 80px;
-	margin-left: 5px;
-	margin-bottom: 5px;
-	border: 2px ridge;
-	border-color: #685C52 #685C52 #616B6F #616B6F;
-	font-family: "Courier New",Courier,monospace;
-	font-weight: bold;
-}
-	
-.sheet-CHconditions {
-	width: 135px;
-	margin-left: 5px;
-	margin-bottom: 5px;
-	border: 2px ridge;
-	border-color: #685C52 #685C52 #616B6F #616B6F;
-	font-family: "Courier New",Courier,monospace;
-	font-weight: bold;
-}
+
 	
 .sheet-CHinitiative,
 .sheet-CHesquive,
@@ -2760,32 +2741,49 @@ span.sheet-afficheflag {
 	vertical-align: middle;
 }
 	
-.sheet-CHbonusmalus {
-	width: 35px;
-	height: 35px;
+.sheet-CHbonusmalus,
+.sheet-CHbonusmalusdsbl {
+	height: auto;
 	min-height:35;
 	font-size: 20px;
 	text-align: center;	
-	margin-left: 5px;
 	border: 2px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
 	font-family: "Courier New",Courier,monospace;
 	font-weight: bold;
 }
 
+.sheet-CHbonusmalus {
+	margin-left: 50px;
+	max-width: 55px;
+}
+
 .sheet-CHbonusmalusdsbl {
 	color: grey;
-	display:inline;
+	display:none;
+	max-width: 40px;
 }
- 
-.sheet-CHcheckbox {
-	margin-left: 5px;
-	width: 65px;
-	border: 2px ridge;
-	border-color: #685C52 #685C52 #616B6F #616B6F;
-	font-family: "Courier New",Courier,monospace;
-	font-weight: bold;
+
+.sheet-CHactioncombatcontact:checked ~ .sheet-CHcontact {
+	display : inline-block;
 }
+.sheet-CHactioncombatcontact:checked ~ .sheet-CHtotalBM * input.sheet-CHcontact {
+	display : inline-block;
+}
+.sheet-CHactioncombatdistance:checked ~ .sheet-CHdistance {
+	display : inline-block;
+}
+.sheet-CHactioncombatcontact:checked ~ .sheet-CHtotalBM * input.sheet-CHdistance {
+	display : inline-block;
+}
+.sheet-CHactioncombatdef:checked ~ .sheet-CHdef {
+	display : inline-block;
+}
+.sheet-CHactioncombatdef:checked ~ .sheet-CHtotalBM * input.sheet-CHdef {
+	display : inline-block;
+}
+
+
 
 /* NOTES */
 .sheet-section-notes {
@@ -3107,7 +3105,8 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-relance .inlinerollresult,
 .sheet-rolltemplate-noc-relancedegat .inlinerollresult,
 .sheet-rolltemplate-noc-noirceur .inlinerollresult,
-.sheet-rolltemplate-noc-fiel .inlinerollresult {
+.sheet-rolltemplate-noc-fiel .inlinerollresult,
+.sheet-rolltemplate-noc-espoir .inlinerollresult {
     background-color: transparent;
     border: none;
 }
@@ -3127,7 +3126,8 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-relance .sheet-result .inlinerollresult,
 .sheet-rolltemplate-noc-relancedegat .sheet-result .inlinerollresult,
 .sheet-rolltemplate-noc-noirceur .sheet-result .inlinerollresult,
-.sheet-rolltemplate-noc-fiel .sheet-result .inlinerollresult {
+.sheet-rolltemplate-noc-fiel .sheet-result .inlinerollresult
+.sheet-rolltemplate-noc-espoir .sheet-result .inlinerollresult {
     background-color: transparent;
     color: #FFFFFF;
     border: none;
@@ -3137,7 +3137,8 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-attaque .inlinerollresult.fullcrit,
 .sheet-rolltemplate-noc-relance .inlinerollresult.fullcrit,
 .sheet-rolltemplate-noc-relancedegat .inlinerollresult.fullcrit,
-.sheet-rolltemplate-noc-attaque .inlinerollquantique.fullcrit {
+.sheet-rolltemplate-noc-attaque .inlinerollquantique.fullcrit,
+.sheet-rolltemplate-noc-espoir .inlinerollquantique.fullcrit {
     color: #3FB315;
     border: none;
 }
@@ -3146,7 +3147,8 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-attaque .inlinerollresult.fullfail,
 .sheet-rolltemplate-noc-relance .inlinerollresult.fullfail,
 .sheet-rolltemplate-noc-relancedegat .inlinerollresult.fullfail,
-.sheet-rolltemplate-noc-attaque .inlinerollquantique.fullfail {
+.sheet-rolltemplate-noc-attaque .inlinerollresult.fullfail,
+.sheet-rolltemplate-noc-espoir .inlinerollresult.fullfail  {
     color: red;
     border: none;
 }
@@ -3154,7 +3156,8 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-comp .inlinerollresult.importantroll,
 .sheet-rolltemplate-noc-attaque .inlinerollresult.importantroll,
 .sheet-rolltemplate-noc-relance .inlinerollresult.importantroll,
-.sheet-rolltemplate-noc-relancedegat .inlinerollresult.importantroll {
+.sheet-rolltemplate-noc-relancedegat .inlinerollresult.importantroll,
+.sheet-rolltemplate-noc-espoir .inlinerollresult.importantroll {
 	color: #3FB315;
     border: none;
 }
diff --git a/NOC/NOC.html b/NOC/NOC.html
index 10c7b00955..8111489acb 100644
--- a/NOC/NOC.html
+++ b/NOC/NOC.html
@@ -79,19 +79,13 @@
         <span class="templateaction">{{action}}</span>
 	</div>
     <div class="result"> 
-		{{#rollTotal() result 1}}
-		    <span>1 succès</span>
-		{{/rollTotal() result 1}}
-		{{#rollTotal() result 2}}
-		    <span>2 succès</span>
-		{{/rollTotal() result 2}}
-		{{#rollTotal() result 3}}
-		    <span>3 succès</span>
-		{{/rollTotal() result 3}}
-		{{#rollLess() result 1}}
-		    <span>Echec</span>
-		{{/rollLess() result 1}}
+        {{result}} <span>succès</span>
 	</div>  
+	<div class="fiel">	
+		{{#rollWasFumble() result}}
+		<span>!! Fiel détecté !!</span>
+		{{/rollWasFumble() result}}	
+	</div>
 </div>
 </rolltemplate>
 
@@ -141,19 +135,17 @@
     </div>
 	<div class="mal">
 			{{#mod_num1}}
-                 Malus domaines ({{mod_num1}})<br/>
+                Malus domaines ({{mod_num1}})<br/>
             {{/mod_num1}}
 			{{#mod_num2}}
-                 Malus talents ({{mod_num2}})
+                Malus talents ({{mod_num2}})
             {{/mod_num2}}
+			{{#diff}}
+                Difficulté ({{diff}})
+            {{/diff}}
 	</div>
     <div class="result">	    
-		{{#rollGreater() result 0}}
-		    {{result}} <span>succès</span>
-		{{/rollGreater() result 0}}
-		{{#rollLess() result 1}}
-		    <span>Echec</span><div class="result2"><span>(</span>{{result}}<span>)</span></div>
-		{{/rollLess() result 1}}
+		{{result}} <span>succès</span>
 	    {{#rollWasCrit() result}} 
 	        {{relanceJet}}
 	    {{/rollWasCrit() result}}
@@ -189,22 +181,17 @@
     </div>
 	<div class="mal">
 			{{#mod_num1}}
-                 Malus domaines ({{mod_num1}})<br/>
+                Malus domaines ({{mod_num1}})<br/>
             {{/mod_num1}}
 			{{#mod_num2}}
-                 Malus talents ({{mod_num2}})
+                Malus talents ({{mod_num2}})
             {{/mod_num2}}
 			{{#mod_num3}}
-                 Malus/Bonus ({{mod_num3}})
+                Difficulté ({{mod_num3}})
             {{/mod_num3}}
 	</div>
     <div class="result">
-		{{#rollGreater() result 0}}
-		    {{result}} <span>succès</span>
-		{{/rollGreater() result 0}}
-		{{#rollLess() result 1}}
-		    <span>Echec</span><div class="result2"><span>(</span>{{result}}<span>)</span></div>
-		{{/rollLess() result 1}}
+        {{result}} <span>succès</span>
 	    {{#rollWasCrit() result}} 
 	        {{relanceJet}}
 	    {{/rollWasCrit() result}}
@@ -457,13 +444,13 @@
                         <input value="0" style="text-align:center" type="text" class="input-munitions" name="attr_munitions"/>
 				        <input value="0" style="text-align:center" type="text" class="input-munitionsmax" name="attr_munitionsmax"/>             
 				        <input type="checkbox" class="input-talent" name="attr_tirtalent" data-i18n-title="talent-t"/>
-					    <input style="display:none" type="number" class="input-talentflag" name="attr_tirflag" value="0"/>
+					    <input style="display:none" type="number" class="input-talentflag" name="attr_tirflag" value="1"/>
 						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
 						<button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10GM" value="/w gm &{template:noc-relance} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
 						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10degat" value="&{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>
                         <button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10degatGM" value="/w gm &{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>						
-                        <button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degat)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button>
-						<button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10GM)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degatGM)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button><br>
+                        <button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degat)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{tirflag}]]}}"></button>
+						<button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10GM)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degatGM)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{tirflag}]]}}"></button><br>
                         <div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1" name="attr_trait1flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1enoire" name="attr_trait1flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1quantique" name="attr_trait1flagquantique"/>
 						<select class="input-info input-traitselect" name='attr_trait1'>
 						    <option value="-1" style="color:grey"></option>
@@ -538,7 +525,7 @@
 					<div class="cac-droite">
 					    <input value="[[@{constitution}+1]]" style="text-align:center" type="text" class="input-degat" name="attr_degatcac-mainsnues" disabled="true"/>            
                         <input type="checkbox" class="input-talent" name="attr_cactalent-mainsnues" checked disabled="true"/>							
-                        <button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=attaque}} {{arme=ses mains nues}} {{DPS=[[@{degatcac-mainsnues}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}]]}}"></button><button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=attaque}} {{arme=ses mains nues}} {{DPS=[[@{degatcac-mainsnues}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}]]}}"></button><br>
+                        <button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=attaque}} {{arme=ses mains nues}} {{DPS=[[@{degatcac-mainsnues}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}]]}}"></button><button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=attaque}} {{arme=ses mains nues}} {{DPS=[[@{degatcac-mainsnues}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}]]}}"></button><br>
                     </div>
 				</div>
                 <fieldset class="repeating_cac">
@@ -550,13 +537,13 @@
 					<div class="cac-droite">
 					    <input value="0" style="text-align:center" type="text" class="input-degat" name="attr_degatcac"/>            
                         <input type="checkbox" class="input-talent" name="attr_cactalent" data-i18n-title="talent-t"/>
-                        <input style="display:none" type="number" class="input-talentflag" name="attr_cacflag" value="0"/>
+                        <input style="display:none" type="number" class="input-talentflag" name="attr_cacflag" value="1"/>
                         <button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
 						<button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10GM" value="/w gm &{template:noc-relance} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>						
 						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10degat" value="&{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>						
                         <button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10degatGM" value="/w gm &{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>
-						<button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button>
-						<button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10GM)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degatGM)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button><br>
+						<button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{cacflag}]]}}"></button>
+						<button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10GM)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degatGM)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{cacflag}]]}}"></button><br>
                         <div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1" name="attr_trait1flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1enoire" name="attr_trait1flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1quantique" name="attr_trait1flagquantique"/>
 						<select class="input-info input-traitselect" name='attr_trait1'>
 						    <option value="-1" style="color:grey"></option>
@@ -618,80 +605,68 @@
 		<div class="Combathelper-PNJ">
 		    <div class="Combathelper-title"><label class="Combathelper-title-label" data-i18n="Combathelper-u">AIDE AU COMBAT</label></div> 
 		    <div class="CHdivbonusmalus">
-                <span class="CHdescription CHdescriptionBM">Ajouter Bonus/Malus</span><input value="0" type="text" class="CHbonusmalus" name="attr_CHbonusmalus"/>
+                <span class="CHdescriptionBM">Ajouter Bonus/Malus</span><input value="0" type="number" class="CHbonusmalus" name="attr_CHbonusmalus"/>
 			</div>
 			<div class="CHdivjets">
-                <span class="CHdescription CHdescriptionroll">Initiative</span><button type="roll" class="CHinitiative-PJ" name="initiative" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=INITIATIVE}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{instinct-u}}} {{skill_num=[[@{instinct_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{instinct|max} &{tracker}]]}}"></button><button type="roll" class="CHinitiative-GM" name="initiative" value="/w gm &{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=INITIATIVE}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{instinct-u}}} {{skill_num=[[@{instinct_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{instinct|max} &{tracker}]]}}"></button>
-				<span class="CHdescription CHdescriptionroll">Esquive</span><button type="roll" class="CHesquive-PJ" name="esquive" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente d'esquiver}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button><button type="roll" class="CHesquive-GM" name="esquive" value="/w gm &{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente d'esquiver}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button>
-				<span class="CHdescription CHdescriptionroll">Parade</span><button type="roll" class="CHparade-PJ" name="parade" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente de parer}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button><button type="roll" class="CHparade-GM" name="parade" value="/w gm &{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente de parer}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button>										
-				<span class="CHdescription CHdescriptionroll">Relance D10</span><button type="roll" class="CHd10-PJ" name="roll_d10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button><button type="roll" class="CHd10-GM" name="roll_d10GM" value="/w gm &{template:noc-relance} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
+                <span class="CHdescriptionroll">Initiative</span><button type="roll" class="CHinitiative-PJ" name="initiative" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=INITIATIVE}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{instinct-u}}} {{skill_num=[[@{instinct_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{instinct|max} &{tracker}]]}}"></button><button type="roll" class="CHinitiative-GM" name="initiative" value="/w gm &{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=INITIATIVE}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{instinct-u}}} {{skill_num=[[@{instinct_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{instinct|max} &{tracker}]]}}"></button>
+				<span class="CHdescriptionroll">Esquive</span><button type="roll" class="CHesquive-PJ" name="esquive" value="&{template:noc-comp} {{diff=[[@{CHbonusmalusDEF}]]}} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente d'esquiver}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button><button type="roll" class="CHesquive-GM" name="esquive" value="/w gm &{template:noc-comp} {{diff=[[@{CHbonusmalusDEF}]]}} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente d'esquiver}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}]]}}"></button>
+				<span class="CHdescriptionroll">Parade</span><button type="roll" class="CHparade-PJ" name="parade" value="&{template:noc-comp} {{diff=[[@{CHbonusmalusDEF}]]}} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente de parer}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button><button type="roll" class="CHparade-GM" name="parade" value="/w gm &{template:noc-comp} {{diff=[[@{CHbonusmalusDEF}]]}} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente de parer}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}]]}}"></button>										
+				<span class="CHdescriptionroll">Relance D10</span><button type="roll" class="CHd10-PJ" name="roll_d10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button><button type="roll" class="CHd10-GM" name="roll_d10GM" value="/w gm &{template:noc-relance} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
 			</div>
 			<div class="CHdivcombobox">
-                <div>
-					<span class="CHdescription CHdescriptioncombobox">Portée</span>						
-					<select class="CHportee" name='attr_porte'>
-						<option value="-1">Bout portant</option>
-                        <option value="0">Portée courte</option>
-                        <option value="1">Portée moyenne</option>
-						<option value="2">Portée longue</option>
-                    </select>
-				</div>
-                <div>
-					<span class="CHdescription CHdescriptioncombobox">Opposants</span>
-					<select class="CHNombreopposants" name='attr_nbropposants'>
-                        <option value="0">1</option>
-                        <option value="1">2</option>
-					    <option value="2">3</option>
-                        <option value="3">4</option>
-					    <option value="4">5</option>
-                    </select>
-				</div>
-                <div>
-					<span class="CHdescription CHdescriptioncombobox">Couvert</span>
-					<select class="CHcouvert" name='attr_couvert'>
-						<option value="0">Aucun</option>
-						<option value="1">Faible</option>
-                        <option value="2">Fort</option>
-                    </select>
-				</div>
-                <div>
-					<span class="CHdescription CHdescriptioncombobox">Conditions</span>
-					<select class="CHconditions" name='attr_conditions'>
-						<option value="0">Claires</option>
-						<option value="1">Génantes</option>
-                        <option value="2">Épouvantables</option>
-                    </select>
-				</div>			
-			</div>	
-            <div class="CHdivcheckbox">
-				<div>
-                    <span class="CHdescription CHdescriptioncheckbox">Aversaire utilise son couvert</span>
-                    <select type="checkbox" class="CHcheckbox" name="attr_utilisecouvert">
-					    <option value="0">NON</option>
-						<option value="1">OUI</option>
-                    </select>
-                </div>
-				<div>					
-                    <span class="CHdescription CHdescriptioncheckbox">Attaque préparée</span>
-					<select type="checkbox" class="CHcheckbox" name="attr_attaqueprepare">
-						<option value="0">NON</option>
-						<option value="1">OUI</option>
-                    </select>
-                </div>
-				<div>					
-                    <span class="CHdescription CHdescriptioncheckbox">L'adversaire s'est jeté au sol</span>
-                    <select type="checkbox" class="CHcheckbox" name="attr_jetesol">
-						<option value="0">NON</option>
-						<option value="1">OUI</option>
-                    </select>
-                </div>					
-			</div>
-			<div class="CHtotalBM">
-				<span class="CHdescription CHdescriptionbonusmalustitle">Total bonus/malus en attaque</span><br>
-                <span class="CHdescription CHdescriptionbonusmalus">Contact</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusCAC" disabled="disabled" value="@{attaqueprepare}+@{jetesol}-(@{conditions}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>
-			    <span class="CHdescription CHdescriptionbonusmalus">Tir</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusTIR" disabled="disabled" value="@{attaqueprepare}-(@{couvert}+@{conditions}+@{porte}+@{jetesol}+@{utilisecouvert}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>							
-			</div>
-		</div>			
+				<span class="CHspan2">Vous</span><select class="CHcombo2" name="attr_typeaction">
+					<option value="0">attaquez au contact</option>
+					<option value="1">attaquez à distance</option>
+					<option value="2">esquivez/parez</option>
+				</select>	
+				<input type="checkbox" name="attr_actioncombatcontact" class="CHactioncombatcontact" style="display:none;"/>
+				<input type="checkbox" name="attr_actioncombatdistance" class="CHactioncombatdistance" style="display:none;"/>
+				<input type="checkbox" name="attr_actioncombatdef" class="CHactioncombatdef" style="display:none;"/>
+				<br/>
+				<span class="CHspan CHdistance CHcontact CHdef">...</span><select class="CHcombo CHdistance CHcontact" name="attr_attaqueprepare">
+					<option value="0">sans l'avoir préparée</option>
+					<option value="1">en l'ayant préparée</option>
+				</select><span class="CHspan CHdistance CHcontact CHdef">dans des conditions</span><select class="CHcombo CHdistance CHcontact CHdef" name='attr_conditions'>
+					<option value="0">claires</option>
+					<option value="1">génantes</option>
+					<option value="2">horribles</option>
+				</select><select class="CHcombo CHportee CHdistance" name='attr_porte'>
+					<option value="-1">à bout portant</option>
+					<option value="0">à portée courte</option>
+					<option value="1">à portée moyenne</option>
+					<option value="2">à portée longue</option>
+				</select>
+				<br/>
+				<span class="CHspan CHdistance CHcontact CHdef">...</span><span class="CHspan CHdistance CHcontact CHdef">et l'adversaire</span>
+				<select class="CHcombo CHdistance CHcontact" name="attr_jetesol">
+					<option value="0">ne s'est pas jeté au sol</option>
+					<option value="1">s'est jeté au sol</option>
+				</select><span class="CHspan CHdistance">,</span>
+				<select class="CHcombo CHdistance" name='attr_couvert'>
+					<option value="0">n'est pas à couvert</option>
+					<option value="1">a un couvert faible</option>
+					<option value="2">a un couvert fort</option>
+				</select><span class="CHspan CHdistance">,</span>
+				<select class="CHcombo CHdistance" name="attr_utilisecouvert">
+					<option value="0">n'utilise pas son couvert</option>
+					<option value="1">utilise son couvert</option>
+				</select><span class="CHspan CHdef">est aidé par</span>
+				<select class="CHcombo CHdef" name='attr_nbropposants'>
+					<option value="0">0 allié</option>
+					<option value="1">1 allié</option>
+					<option value="2">2 alliés</option>
+					<option value="3">3 alliés</option>
+					<option value="4">4 alliés</option>
+				</select>
+				<br/>
+				<br/>
+				<span class="CHdescriptionbonusmalustitle CHcontact CHdistance CHdef">Le seuil de difficulté est de </span>
+				<input type="text" class="CHbonusmalusdsbl CHcontact" name="attr_CHbonusmalusCAC" disabled="disabled" value="1+@{conditions}-@{attaqueprepare}-@{jetesol}-(@{CHbonusmalus})"/>
+				<input type="text" class="CHbonusmalusdsbl CHdistance" name="attr_CHbonusmalusTIR" disabled="disabled" value="0+@{couvert}+@{conditions}+@{porte}+@{jetesol}+@{utilisecouvert}-@{attaqueprepare}-(@{CHbonusmalus})"/>	
+				<input type="text" class="CHbonusmalusdsbl CHdef" name="attr_CHbonusmalusDEF" disabled="disabled" value="0+@{conditions}+@{nbropposants}-(@{CHbonusmalus})"/>							
+			    </div>	
+        </div>
+    </div>
 </div>
 <div class="main">
 	<input type="radio" class="sheet-tab sheet-tab1" name="attr_background" value="1" checked /><span data-i18n="GENERAL-u" class="sheet-tab sheet-tab1" >IDENTITE</span><br>
@@ -1292,7 +1267,7 @@
 					<div class="cac-droite">
 					    <input value="[[@{constitution}+1]]" style="text-align:center" type="text" class="input-degat" name="attr_degatcac-mainsnues" disabled="true"/>            
                         <input type="checkbox" class="input-talent" name="attr_cactalent-mainsnues" checked disabled="true" data-i18n-title="talent-t"/>							
-                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=attaque}} {{arme=ses mains nues}} {{DPS=[[@{degatcac-mainsnues}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}]]}}"></button><br>
+                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{diff=[[@{CHbonusmalusCAC}]]}} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=attaque}} {{arme=ses mains nues}} {{DPS=[[@{degatcac-mainsnues}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}]]}}"></button><br>
                     </div>
 				</div>
                 <fieldset class="repeating_cac">
@@ -1304,10 +1279,10 @@
 					<div class="cac-droite">
 					    <input value="0" style="text-align:center" type="text" class="input-degat" name="attr_degatcac"/>            
                         <input type="checkbox" class="input-talent" name="attr_cactalent" data-i18n-title="talent-t"/>
-                        <input style="display:none" type="number" class="input-talentflag" name="attr_cacflag" value="0"/>
+                        <input style="display:none" type="number" class="input-talentflag" name="attr_cacflag" value="1"/>
                         <button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
                         <button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10degat" value="&{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>						
-                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button><br>
+                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{diff=[[@{CHbonusmalusCAC}]]}} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{cacflag}]]}}"></button><br>
                         <div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1" name="attr_trait1flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1enoire" name="attr_trait1flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1quantique" name="attr_trait1flagquantique"/>
 						<select class="input-info input-traitselect" name='attr_trait1'>
 						    <option value="-1" style="color:grey"></option>
@@ -1371,79 +1346,66 @@
 		    <div class="Combathelper">
 		        <div class="Combathelper-title"><label class="Combathelper-title-label" data-i18n="Combathelper-u">AIDE AU COMBAT</label></div> 
 		        <div class="CHdivbonusmalus">
-                    <span class="CHdescription CHdescriptionBM">Ajouter Bonus/Malus</span><input value="0" type="text" class="CHbonusmalus" name="attr_CHbonusmalus"/>
+                    <span class="CHdescriptionBM">Ajouter Bonus/Malus</span><input value="0" type="number" class="CHbonusmalus" name="attr_CHbonusmalus"/>
 			    </div>
 			    <div class="CHdivjets">
-                    <span class="CHdescription CHdescriptionroll">Initiative</span><button type="roll" class="CHinitiative" name="initiative" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=INITIATIVE}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{instinct-u}}} {{skill_num=[[@{instinct_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{instinct|max} &{tracker}]]}}"></button>
-				    <span class="CHdescription CHdescriptionroll">Esquive</span><button type="roll" class="CHesquive" name="esquive" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente d'esquiver}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button>
-				    <span class="CHdescription CHdescriptionroll">Parade</span><button type="roll" class="CHparade" name="parade" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente de parer}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button>										
-				   <span class="CHdescription CHdescriptionroll">Relance D10</span><button type="roll" class="CHd10" name="roll_d10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
+                    <span class="CHdescriptionroll">Initiative</span><button type="roll" class="CHinitiative" name="initiative" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=INITIATIVE}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{instinct-u}}} {{skill_num=[[@{instinct_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{instinct|max} &{tracker}]]}}"></button>
+				    <span class="CHdescriptionroll">Esquive</span><button type="roll" class="CHesquive" name="esquive" value="&{template:noc-comp} {{diff=[[@{CHbonusmalusDEF}]]}} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente d'esquiver}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}]]}}"></button>
+				    <span class="CHdescriptionroll">Parade</span><button type="roll" class="CHparade" name="parade" value="&{template:noc-comp} {{diff=[[@{CHbonusmalusDEF}]]}} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente de parer}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}+@{armureportee}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}]]}}"></button>										
+				    <span class="CHdescriptionroll">Relance D10</span><button type="roll" class="CHd10" name="roll_d10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
 			    </div>
 			    <div class="CHdivcombobox">
-                    <div>
-					    <span class="CHdescription CHdescriptioncombobox">Portée</span>						
-					    <select class="CHportee" name='attr_porte'>
-						    <option value="-1">Bout portant</option>
-                            <option value="0">Portée courte</option>
-                            <option value="1">Portée moyenne</option>
-						    <option value="2">Portée longue</option>
+					    <span class="CHspan2">Vous</span><select class="CHcombo2" name="attr_typeaction">
+						    <option value="0">attaquez au contact</option>
+						    <option value="1">attaquez à distance</option>
+							<option value="2">esquivez/parez</option>
+						</select>	
+						<input type="checkbox" name="attr_actioncombatcontact" class="CHactioncombatcontact" style="display:none;"/>
+                        <input type="checkbox" name="attr_actioncombatdistance" class="CHactioncombatdistance" style="display:none;"/>
+                        <input type="checkbox" name="attr_actioncombatdef" class="CHactioncombatdef" style="display:none;"/>
+					    <br/>
+						<span class="CHspan CHdistance CHcontact CHdef">...</span><select class="CHcombo CHdistance CHcontact" name="attr_attaqueprepare">
+						    <option value="0">sans l'avoir préparée</option>
+						    <option value="1">en l'ayant préparée</option>
+                        </select><span class="CHspan CHdistance CHcontact CHdef">dans des conditions</span><select class="CHcombo CHdistance CHcontact CHdef" name='attr_conditions'>
+						    <option value="0">claires</option>
+						    <option value="1">génantes</option>
+                            <option value="2">horribles</option>
+                        </select><select class="CHcombo CHportee CHdistance" name='attr_porte'>
+						    <option value="-1">à bout portant</option>
+                            <option value="0">à portée courte</option>
+                            <option value="1">à portée moyenne</option>
+						    <option value="2">à portée longue</option>
                         </select>
-				    </div>
-                    <div>
-					    <span class="CHdescription CHdescriptioncombobox">Opposants</span>
-					    <select class="CHNombreopposants" name='attr_nbropposants'>
-                            <option value="0">1</option>
-                            <option value="1">2</option>
-					        <option value="2">3</option>
-                            <option value="3">4</option>
-					        <option value="4">5</option>
+						<br/>
+						<span class="CHspan CHdistance CHcontact CHdef">...</span><span class="CHspan CHdistance CHcontact CHdef">et l'adversaire</span>
+						<select class="CHcombo CHdistance CHcontact" name="attr_jetesol">
+						    <option value="0">ne s'est pas jeté au sol</option>
+						    <option value="1">s'est jeté au sol</option>
+                        </select><span class="CHspan CHdistance">,</span>
+					    <select class="CHcombo CHdistance" name='attr_couvert'>
+						    <option value="0">n'est pas à couvert</option>
+						    <option value="1">a un couvert faible</option>
+                            <option value="2">a un couvert fort</option>
+                        </select><span class="CHspan CHdistance">,</span>
+						<select class="CHcombo CHdistance" name="attr_utilisecouvert">
+					        <option value="0">n'utilise pas son couvert</option>
+						    <option value="1">utilise son couvert</option>
+                        </select><span class="CHspan CHdef">est aidé par</span>
+					    <select class="CHcombo CHdef" name='attr_nbropposants'>
+                            <option value="0">0 allié</option>
+                            <option value="1">1 allié</option>
+					        <option value="2">2 alliés</option>
+                            <option value="3">3 alliés</option>
+					        <option value="4">4 alliés</option>
                         </select>
-				    </div>
-                    <div>
-					    <span class="CHdescription CHdescriptioncombobox">Couvert</span>
-					    <select class="CHcouvert" name='attr_couvert'>
-						    <option value="0">Aucun</option>
-						    <option value="1">Faible</option>
-                            <option value="2">Fort</option>
-                        </select>
-				    </div>
-                    <div>
-					    <span class="CHdescription CHdescriptioncombobox">Conditions</span>
-					    <select class="CHconditions" name='attr_conditions'>
-						    <option value="0">Claires</option>
-						    <option value="1">Génantes</option>
-                            <option value="2">Épouvantables</option>
-                        </select>
-				    </div>			
+						<br/>
+						<br/>
+				        <span class="CHdescriptionbonusmalustitle CHcontact CHdistance CHdef">Le seuil de difficulté est de </span>
+                        <input type="text" class="CHbonusmalusdsbl CHcontact" name="attr_CHbonusmalusCAC" value="1-@{attaqueprepare}-@{jetesol}+@{conditions}-(@{CHbonusmalus})" disabled="disabled"/>
+					    <input type="text" class="CHbonusmalusdsbl CHdistance" name="attr_CHbonusmalusTIR" value="0-@{attaqueprepare}+@{couvert}+@{conditions}+@{porte}+@{jetesol}+@{utilisecouvert}-(@{CHbonusmalus})" disabled="disabled"/>	
+                        <input type="text" class="CHbonusmalusdsbl CHdef" name="attr_CHbonusmalusDEF" value="0+@{conditions}+@{nbropposants}-(@{CHbonusmalus})" disabled="disabled"/>							
 			    </div>	
-                <div class="CHdivcheckbox">
-				    <div>
-                        <span class="CHdescription CHdescriptioncheckbox">Adversaire utilise son couvert</span>
-                        <select type="checkbox" class="CHcheckbox" name="attr_utilisecouvert">
-					        <option value="0">NON</option>
-						    <option value="1">OUI</option>
-                        </select>
-                    </div>
-				    <div>					
-                        <span class="CHdescription CHdescriptioncheckbox">Attaque préparée</span>
-					    <select type="checkbox" class="CHcheckbox" name="attr_attaqueprepare">
-						    <option value="0">NON</option>
-						    <option value="1">OUI</option>
-                        </select>
-                    </div>
-				    <div>					
-                        <span class="CHdescription CHdescriptioncheckbox">Adversaire s'est jeté au sol</span>
-                        <select type="checkbox" class="CHcheckbox" name="attr_jetesol">
-						    <option value="0">NON</option>
-						    <option value="1">OUI</option>
-                        </select>
-                    </div>					
-			    </div>
-			    <div class="CHtotalBM">
-				    <span class="CHdescription CHdescriptionbonusmalustitle">Total bonus/malus en attaque</span><br>
-                    <span class="CHdescription CHdescriptionbonusmalus">Contact</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusCAC" disabled="disabled" value="@{attaqueprepare}+@{jetesol}-(@{conditions}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>
-					<span class="CHdescription CHdescriptionbonusmalus">Tir</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusTIR" disabled="disabled" value="@{attaqueprepare}-(@{couvert}+@{conditions}+@{porte}+@{jetesol}+@{utilisecouvert}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>							
-			    </div>
 		    </div>
 			<input type="checkbox" class="tir0" name="attr_tir0" style="display:none;" checked="true"/>
             <div class="tab-tir">
@@ -1467,10 +1429,10 @@
                         <input value="0" style="text-align:center" type="text" class="input-munitions" name="attr_munitions"/>
 				        <input value="0" style="text-align:center" type="text" class="input-munitionsmax" name="attr_munitionsmax"/>             
 				        <input type="checkbox" class="input-talent" name="attr_tirtalent" data-i18n-title="talent-t"/>
-					    <input style="display:none" type="number" class="input-talentflag" name="attr_tirflag" value="0"/>
+					    <input style="display:none" type="number" class="input-talentflag" name="attr_tirflag" value="1"/>
 						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
 						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10degat" value="&{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>						
-                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degat)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button><br>
+                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{diff=[[@{CHbonusmalusTIR}]]}} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degat)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{tirflag}]]}}"></button><br>
                         <div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1" name="attr_trait1flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1enoire" name="attr_trait1flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1quantique" name="attr_trait1flagquantique"/>
 						<select class="input-info input-traitselect" name='attr_trait1'>
 						    <option value="-1" style="color:grey"></option>
@@ -1568,6 +1530,28 @@
 </div>
 
 <script type="text/worker">
+on("change:typeaction", function() {
+	getAttrs(["typeaction"], function(values) {
+		switch (values.typeaction) {
+		case "0":
+		    setAttrs({actioncombatcontact:"on"});
+			setAttrs({actioncombatdistance:0});
+			setAttrs({actioncombatdef:0});
+        break;
+		case "1":
+		    setAttrs({actioncombatcontact:0});
+			setAttrs({actioncombatdistance:"on"});
+			setAttrs({actioncombatdef:0});
+        break;
+		case "2":
+		    setAttrs({actioncombatcontact:0});
+			setAttrs({actioncombatdistance:0});
+			setAttrs({actioncombatdef:"on"});
+        break;
+		}
+	});
+});
+
 on("sheet:opened change:ferveur change:artefact", function() {
     getAttrs(["vie","erudition","technique","action","statut","ame","social","malustraumaleger","malusblessleger","ferveur","artefact"], function(values) {
         setAttrs({vie_max:parseInt(values.vie)+parseInt(values.malustraumaleger)+parseInt(values.malusblessleger)})
@@ -2298,11 +2282,11 @@ on("change:repeating_cac:cactalent", function() {
         else {setAttrs({repeating_cac_cacflag:"1"})}
 	});
 });	
-on("change:repeating_tir:tirtalent", function() {
-	getAttrs(["repeating_tir_tirtalent"], function(values) {
-	    let talent = values.repeating_tir_tirtalent;
-        if (talent=="on") {setAttrs({repeating_tir_tirflag:"0"})}
-        else {setAttrs({repeating_tir_tirflag:"1"})}
+on("change:repeating_projectiles:tirtalent", function() {
+	getAttrs(["repeating_projectiles_tirtalent"], function(values) {
+	    let talent = values.repeating_projectiles_tirtalent;
+        if (talent=="on") {setAttrs({repeating_projectiles_tirflag:"0"})}
+        else {setAttrs({repeating_projectiles_tirflag:"1"})}
 	});
 });