diff --git a/Knight/knight.html b/Knight/knight.html
index 5e46d1320e..aa19e1c491 100644
--- a/Knight/knight.html
+++ b/Knight/knight.html
@@ -1,4 +1,4 @@
-	<script type="text/worker">
+<script type="text/worker">
 	/* ---- BEGIN: TheAaronSheet.js ---- */
 	// Github:   https://github.com/shdwjk/TheAaronSheet/blob/master/TheAaronSheet.js
 	// By:       The Aaron, Arcane Scriptomancer
@@ -902,7 +902,35 @@
 		});
 	});
 
-
+	on(
+	"change:sorcerer250PG"
+	, function() 
+	{
+		getAttrs(["sorcerer250PG"], function(value)
+		{
+			if(value["sorcerer250PG"] == "on")
+			{
+				setAttrs
+				({
+					sorcererMMVolNuee: 0,
+					sorcererMMPhase: 0,
+					sorcererMMEtirement: 0,
+					sorcererMMCorpMetal: 0,
+					sorcererMMCorpFluide: 0,
+					sorcererMMPMGuerre: 0
+				});
+			}
+			else
+			{
+				setAttrs
+				({
+					sorcererMM250PG: 0
+				});a
+			}
+		});
+	});
+	
+	
 	on(
 	"change:styleCombat"
 	, function() 
@@ -3982,7 +4010,7 @@
 											<th colspan="2"><h6 class="black">Champ de Force</h6></th>
 										</tr>
 										<tr>
-											<td colspan="2" class="tab-padding-left tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfSorcerer_max" value="14+@{cdfSorcererModif}+@{sorcererMMCorpMetal}" disabled /></td>
+											<td colspan="2" class="tab-padding-left tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfSorcererMax" value="14+@{cdfSorcererModif}+@{sorcererMMCorpMetal}" disabled /></td>
 										</tr>
 										<tr style="height:20px;">
 										</tr>
@@ -4596,7 +4624,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energieBarbarian" min="0" class="center" style="width:100%" value="60" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieBarbarian_max" min="0" class="center" style="width:100%" value="60+@{energieBarbarianModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieBarbarianMax" min="0" class="center" style="width:100%" value="@{energieBarbarian_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableBarb hidden" style="margin-top:20px;">
@@ -4631,7 +4659,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energieBard" min="0" class="center" style="width:100%" value="80" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieBard_max" min="0" class="center" style="width:100%" value="80+@{energieBardModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieBardMax" min="0" class="center" style="width:100%" value="@{energieBard_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableBard hidden" style="margin-top:20px;">
@@ -4683,7 +4711,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energieDrui" min="0" class="center" style="width:100%" value="80" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieDrui_max" min="0" class="center" style="width:100%" value="80+@{energieDruiModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieDruiMax" min="0" class="center" style="width:100%" value="@{energieDrui_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableDrui hidden" style="margin-top:20px;">
@@ -4694,7 +4722,7 @@
 							<th colspan="3" class="center">Gloire</th>
 						</tr>
 						<tr>
-							<td colspan="3"><input type="number" style="width:100%" class="center" value="@{gloAct}+@{gloUti}" name="attr_gloTot" disabled /></td>
+							<td colspan="3"><input type="number" style="width:100%" class="center" value="@{gloTot}" name="attr_gloDrui" disabled /></td>
 						</tr>
 						<tr>
 							<th colspan="3">Niveau des compagnons</th>
@@ -4728,12 +4756,12 @@
 						<tr>
 							<th class="tab-padding-left"><h4>Energie</h4></th>
 							<td><input type="number" name="attr_energieMonk" min="0" class="center" style="width:100%" value="50" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_energieMonk_max" min="0" class="center" style="width:100%" value="50+@{energieMonkModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" name="attr_energieMonkMax" min="0" class="center" style="width:100%" value="50+@{espoirModif}" disabled /></td>
 						</tr>
 						<tr>
 							<th class="tab-padding-left tab-padding-bottom"><h4>Espoir</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_espoir" min="0" class="center" style="width:100%" value="50" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_espoir_max" min="0" class="center" style="width:100%" value="50+@{espoirModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_espoirMaxMonk" min="0" class="center" style="width:100%" value="@{espoir_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableMonk hidden" style="margin-top:20px;">
@@ -4783,7 +4811,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energiePaladin" min="0" class="center" style="width:100%" value="20" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePaladin_max" value="20+@{energiePaladinModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePaladinMax" value="@{energiePaladin_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tablePala hidden" style="margin-top:20px;">
@@ -4818,7 +4846,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energiePriest" min="0" class="center" style="width:100%" value="60" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePriest_max" value="60+@{energiePriestModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePriestMax" value="@{energiePriest_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tablePrie hidden" style="margin-top:20px;">
@@ -4858,7 +4886,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energiePsion" min="0" class="center" style="width:100%" value="60" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePsion_max" value="60+@{energiePsionModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePsionMax" value="@{energiePsion_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tablePsio hidden" style="margin-top:20px;">
@@ -4918,22 +4946,22 @@
 						<tr>
 							<th class="tab-padding-left left"><h4>Santé</h4></th>
 							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right" ><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
+							<td class="tab-padding-right" ><input type="number" name="attr_santeMaxRanger" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
 						</tr>
 						<tr>
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureRanger" value="50" /></td>
-							<td class="tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_armureRanger_max" value="50+@{armureRangerModif}" disabled /></td>
+							<td class="tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_armureRangerMax" value="@{armureRanger_max}" disabled /></td>
 						</tr>
 						<tr>
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieRanger" value="70" /></td>
-							<td class="tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_energieRanger_max" value="70+@{energieRangerModif}" disabled /></td>
+							<td class="tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_energieRangerMax" value="@{energieRanger_max}" disabled /></td>
 						</tr>
 						<tr>
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRanger" value="12" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRanger_max" value="12+@{cdfRangerModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRangerMax" value="@{cdfRanger_max}" disabled /></td>
 						</tr>
 					</table>
 				</div>
@@ -4968,22 +4996,22 @@
 						<tr>
 							<th class="tab-padding-left left"><h4>Santé</h4></th>
 							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right" ><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
+							<td class="tab-padding-right" ><input type="number" name="attr_santeMaxRogue" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
 						</tr>
 						<tr>
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureRogue" value="50" /></td>
-							<td class="tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_armureRogue_max" value="50+@{armureRogueModif}" disabled /></td>
+							<td class="tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_armureRogueMax" value="@{armureRogue_max}" disabled /></td>
 						</tr>
 						<tr>
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieRogue" value="70" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieRogue_max" value="70+@{energieRogueModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieRogueMax" value="@{energieRogue_max}" disabled /></td>
 						</tr>
 						<tr>
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRogue" value="12" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRogue_max" value="12+@{cdfRogueModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRogueMax" value="@{cdfRogue_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableRogu hidden" style="margin-top:20px;">
@@ -5007,12 +5035,12 @@
 						<tr>
 							<th class="tab-padding-left"><h4>Energie</h4></th>
 							<td><input type="number" name="attr_energieSorcerer" min="0" class="center" style="width:100%" value="80" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_energieSorcerer_max" min="0" class="center" style="width:100%" value="80+@{energieSorcererModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" name="attr_energieSorcererMax" min="0" class="center" style="width:100%" value="@{energieSorcerer_max}" disabled /></td>
 						</tr>
 						<tr>
 							<th class="tab-padding-left tab-padding-bottom"><h4>Espoir</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_espoir" min="0" class="center" style="width:100%" value="50" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_espoir_max" min="0" class="center" style="width:100%" value="50+@{espoirModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_espoirMaxSorcerer" min="0" class="center" style="width:100%" value="50+@{espoirModif}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableSorc hidden" style="margin-top:20px;">
@@ -5059,7 +5087,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energieWarmaster" min="0" class="center" style="width:100%" value="40" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieWarmaster_max" min="0" class="center" style="width:100%" value="40+@{energieWarmasterModif}+@{warmaster150PG}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieWarmasterMax" min="0" class="center" style="width:100%" value="@{energieWarmaster_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableWarm hidden" style="margin-top:20px">
@@ -5094,7 +5122,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energieWarrior" min="0" class="center" style="width:100%" value="40" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieWarrior_max" min="0" class="center" style="width:100%" value="40+@{energieWarriorModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieWarriorMax" min="0" class="center" style="width:100%" value="@{energieWarrior_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableWarr hidden" style="margin-top:20px">
@@ -5129,7 +5157,7 @@
 						<tr>
 							<th class="tab-padding-bottom tab-padding-left left"><h4>Energie</h4></th>
 							<td class="tab-padding-bottom"><input type="number" name="attr_energieWizard" min="0" class="center" style="width:100%" value="80" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieWizard_max" min="0" class="center" style="width:100%" value="80+@{energieWizardModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" name="attr_energieWizardMax" min="0" class="center" style="width:100%" value="@{energieWizard_max}" disabled /></td>
 						</tr>
 					</table>
 					<table class="tableWiza hidden" style="margin-top:20px">
@@ -5255,13 +5283,13 @@
 							</tr>
 							<tr style="height:40px;background-color:#ACD1F6">
 								<th style="vertical-align:middle" class="center"><b>Aspects</b></th>
-								<td class="center"><input type="number" name="attr_druidLionChairTot" class="center normalize" style="width:100%" value="@{druidLionChairBase}+@{druidLionChairEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidLionBeteTot" class="center normalize" style="width:100%" value="@{druidLionBeteBase}+@{druidLionBeteEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidLionMachineTot" class="center normalize" style="width:100%" value="@{druidLionMachineBase}+@{druidLionMachineEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidLionDameTot" class="center normalize" style="width:100%" value="@{druidLionDameBase}+@{druidLionDameEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidLionMasqueTot" class="center normalize" style="width:100%" value="@{druidLionMasqueBase}+@{druidLionMasqueEvol}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionChairT" class="center normalize" style="width:100%" value="@{druidLionChairTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionBeteT" class="center normalize" style="width:100%" value="@{druidLionBeteTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionMachineT" class="center normalize" style="width:100%" value="@{druidLionMachineTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionDameT" class="center normalize" style="width:100%" value="@{druidLionDameTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionMasqueT" class="center normalize" style="width:100%" value="@{druidLionMasqueTot}" disabled /></td>
 								<td class="center"></td>
-								<td class="center"><input type="number" name="attr_druidLionCDFTot" class="center normalize" style="width:100%" value="@{druidLionCDFBase}+@{druidLionCDFEvol}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionCDFT" class="center normalize" style="width:100%" value="@{druidLionCDFTot}" disabled /></td>
 							</tr>
 							<tr style="height:20px">
 								<th style="vertical-align:middle;" class="center"><b>Aspects<br/>Exceptionnels</b></th>
@@ -5302,9 +5330,9 @@
 								<th style="vertical-align:middle" class="center"><b>Valeurs<br/>Dérivées</b></th>
 								<td class="center"><input type="number" name="attr_druidLionDefenseTotAff" class="center normalize" style="width:100%" value="@{defCompBM}+@{druidLionDefenseBase}+@{druidLionDefenseEvol}+@{druidLionMasqueAE}" disabled /></td>
 								<td class="center"><input type="number" name="attr_druidLionReactionTotAff" class="center normalize" style="width:100%" value="@{rctCompBM}+@{druidLionReactionBase}+@{druidLionReactionEvol}+@{druidLionMachineAE}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidLionInitiativeTot" class="center normalize" style="width:100%" value="@{druidLionInitiativeBase}+@{druidLionInitiativeEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidLionPAAct" class="center" value="60" style="width:30px" /> <b>/</b><input type="number" name="attr_druidLionPATot" class="normalize left" style="width:25px" value="@{druidLionPABase}+@{druidLionPAEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidLionPEAct" class="center" value="0" style="width:30px" /> <b>/</b><input type="number" name="attr_druidLionPEMax" class="normalize left" value="@{druidEnergieCompanon}" style="width:25px" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionInitiativeT" class="center normalize" style="width:100%" value="@{druidLionInitiativeTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionPAAct" class="center" value="60" style="width:30px" /> <b>/</b><input type="number" name="attr_druidLionPAAct_max" class="normalize left" style="width:25px" value="@{druidLionPATot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidLionPEAct" class="center" value="0" style="width:30px" /> <b>/</b><input type="number" name="attr_druidLionPEAct_max" class="normalize left" value="@{druidEnergieCompanon}" style="width:25px" disabled /></td>
 								<td></td>
 							</tr>
 							<tr style="background-color:#ACD1F6">
@@ -6562,13 +6590,13 @@
 							</tr>
 							<tr style="height:40px;background-color:#ACD1F6">
 								<th style="vertical-align:middle" class="center"><b>Aspects</b></th>
-								<td class="center"><input type="number" name="attr_druidWolfChairTot" class="center normalize" style="width:100%" value="@{druidWolfChairBase}+@{druidWolfChairEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidWolfBeteTot" class="center normalize" style="width:100%" value="@{druidWolfBeteBase}+@{druidWolfBeteEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidWolfMachineTot" class="center normalize" style="width:100%" value="@{druidWolfMachineBase}+@{druidWolfMachineEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidWolfDameTot" class="center normalize" style="width:100%" value="@{druidWolfDameBase}+@{druidWolfDameEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidWolfMasqueTot" class="center normalize" style="width:100%" value="@{druidWolfMasqueBase}+@{druidWolfMasqueEvol}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidWolfChairT" class="center normalize" style="width:100%" value="@{druidWolfChairTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidWolfBeteT" class="center normalize" style="width:100%" value="@{druidWolfBeteTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidWolfMachineT" class="center normalize" style="width:100%" value="@{druidWolfMachineTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidWolfDameT" class="center normalize" style="width:100%" value="@{druidWolfDameTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidWolfMasqueT" class="center normalize" style="width:100%" value="@{druidWolfMasqueTot}" disabled /></td>
 								<td class="center"></td>
-								<td class="center"><input type="number" name="attr_druidWolfCDFTot" class="center normalize" style="width:100%" value="@{druidWolfCDFBase}+@{druidWolfCDFEvol}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidWolfCDFT" class="center normalize" style="width:100%" value="@{druidWolfCDFTot}" disabled /></td>
 							</tr>
 							<tr style="height:20px">
 								<th style="vertical-align:middle;" class="center"><b>Aspects<br/>Exceptionnels</b></th>
@@ -6610,8 +6638,8 @@
 								<td class="center"><input type="number" name="attr_druidWolfDefenseTot" class="center normalize" style="width:100%" value="@{defCompBM}+4" disabled /></td>
 								<td class="center"><input type="number" name="attr_druidWolfReactionTot" class="center normalize" style="width:100%" value="@{rctCompBM}+4" disabled /></td>
 								<td class="center"><input type="number" name="attr_druidWolfInitiativeTot" class="center normalize" style="width:100%" value="2" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidWolfPAAct" class="center" value="20" style="width:30px" /> <b>/</b><input type="number" name="attr_druidWolfPATot" class="normalize left" style="width:25px" value="20" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidWolfPEAct" class="center" value="0" style="width:30px" /> <b>/</b><input type="number" name="attr_druidWolfPEMax" class="normalize left" value="@{druidEnergieCompanon}" style="width:25px" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidWolfPAAct" class="center" value="20" style="width:30px" /> <b>/</b><input type="number" name="attr_druidWolfPAAct_max" class="normalize left" style="width:25px" value="20" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidWolfPEAct" class="center" value="0" style="width:30px" /> <b>/</b><input type="number" name="attr_druidWolfPEAct_max" class="normalize left" value="@{druidEnergieCompanon}" style="width:25px" disabled /></td>
 								<td></td>
 							</tr>
 							<tr style="background-color:#ACD1F6">
@@ -7115,11 +7143,11 @@
 							</tr>
 							<tr style="height:40px;background-color:#ACD1F6">
 								<th style="vertical-align:middle" class="center"><b>Aspects</b></th>
-								<td class="center"><input type="number" name="attr_druidCrowChairTot" class="center normalize" style="width:100%" value="@{druidCrowChairBase}+@{druidCrowChairEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidCrowBeteTot" class="center normalize" style="width:100%" value="@{druidCrowBeteBase}+@{druidCrowBeteEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidCrowMachineTot" class="center normalize" style="width:100%" value="@{druidCrowMachineBase}+@{druidCrowMachineEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidCrowDameTot" class="center normalize" style="width:100%" value="@{druidCrowDameBase}+@{druidCrowDameEvol}" disabled /></td>
-								<td class="center"><input type="number" name="attr_druidCrowMasqueTot" class="center normalize" style="width:100%" value="@{druidCrowMasqueBase}+@{druidCrowMasqueEvol}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidCrowChairT" class="center normalize" style="width:100%" value="@{druidCrowChairTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidCrowBeteT" class="center normalize" style="width:100%" value="@{druidCrowBeteTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidCrowMachineT" class="center normalize" style="width:100%" value="@{druidCrowMachineTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidCrowDameT" class="center normalize" style="width:100%" value="@{druidCrowDameTot}" disabled /></td>
+								<td class="center"><input type="number" name="attr_druidCrowMasqueT" class="center normalize" style="width:100%" value="@{druidCrowMasqueTot}" disabled /></td>
 								<td class="center"></td>
 								<td class="center"><input type="number" name="attr_druidCrowCDFTot" class="center normalize" style="width:100%" value="2*@{druidNiveauCrow}" disabled /></td>
 							</tr>
@@ -8666,7 +8694,7 @@
 					<input type="checkbox" name="attr_warmaster200PG" class="checkShow hidden" value="on" />
 					<input type="checkbox" name="attr_warmasterImpForceC" class="checkShow hidden" value="on" />
 					<div class="hidden">
-						<input type="number" class="center" min="0" style="width:100%" name="attr_cdfWarmaster_max" value="8+@{cdfWarmasterModif}+@{warmasterImpFPersonnel}" disabled />
+						<input type="number" class="center" min="0" style="width:100%" name="attr_cdfWarmasterMax" value="@{cdfWarmaster_max}" disabled />
 					</div>
 				</td>
 			</tr>
@@ -8777,9 +8805,10 @@
 											<th style="width:33%"><h6 class="black">OD Bonus<br/>Endurance</h6></th>
 										</tr>
 										<tr>
-											<td><input type="number" name="attr_warriorSoldierBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorSoldierBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorSoldierBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
+											<input type="hidden" name="attr_warriorSoldierBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled >
+											<td><input type="number" name="attr_warriorSoldierBD" class="center" style="width:100%" value="@{warriorSoldierBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorSoldierBF" class="center" style="width:100%" value="@{warriorSoldierBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorSoldierBE" class="center" style="width:100%" value="@{warriorSoldierBonus}" disabled ></td>
 										</tr>
 									</table>
 								</div>
@@ -8808,9 +8837,10 @@
 											<th style="width:33%"><h6 class="black">OD Bonus<br/>Instinct</h6></th>
 										</tr>
 										<tr>
-											<td><input type="number" name="attr_warriorHunterBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorHunterBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorHunterBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
+											<input type="hidden" name="attr_warriorHunterBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled >
+											<td><input type="number" name="attr_warriorHunterBH" class="center" style="width:100%" value="@{warriorHunterBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorHunterBC" class="center" style="width:100%" value="@{warriorHunterBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorHunterBI" class="center" style="width:100%" value="@{warriorHunterBonus}" disabled ></td>
 										</tr>
 									</table>
 								</div>
@@ -8839,9 +8869,10 @@
 											<th style="width:33%"><h6 class="black">OD Bonus<br/>Technique</h6></th>
 										</tr>
 										<tr>
-											<td><input type="number" name="attr_warriorScholarBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorScholarBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorScholarBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
+											<input type="hidden" name="attr_warriorScholarBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled >
+											<td><input type="number" name="attr_warriorScholarBT" class="center" style="width:100%" value="@{warriorScholarBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorScholarBS" class="center" style="width:100%" value="@{warriorScholarBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorScholarBTech" class="center" style="width:100%" value="@{warriorScholarBonus}" disabled ></td>
 										</tr>
 									</table>
 								</div>
@@ -8872,9 +8903,10 @@
 											<th style="width:33%"><h6 class="black">OD Bonus<br/>Sang-Froid</h6></th>
 										</tr>
 										<tr>
-											<td><input type="number" name="attr_warriorHeraldBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorHeraldBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorHeraldBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
+											<input type="hidden" name="attr_warriorHeraldBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled >
+											<td><input type="number" name="attr_warriorHeraldBA" class="center" style="width:100%" value="@{warriorHeraldBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorHeraldBP" class="center" style="width:100%" value="@{warriorHeraldBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorHeraldBSF" class="center" style="width:100%" value="@{warriorHeraldBonus}" disabled ></td>
 										</tr>
 									</table>
 								</div>
@@ -8904,9 +8936,10 @@
 											<th style="width:33%"><h6 class="black">OD Bonus<br/>Perception</h6></th>
 										</tr>
 										<tr>
-											<td><input type="number" name="attr_warriorScoutBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorScoutBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
-											<td><input type="number" name="attr_warriorScoutBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled ></td>
+											<input type="hidden" name="attr_warriorScoutBonus" class="center" style="width:100%" value="1+@{warrior250PG}" disabled >
+											<td><input type="number" name="attr_warriorScoutBD" class="center" style="width:100%" value="@{warriorScoutBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorScoutBDext" class="center" style="width:100%" value="@{warriorScoutBonus}" disabled ></td>
+											<td><input type="number" name="attr_warriorScoutBP" class="center" style="width:100%" value="@{warriorScoutBonus}" disabled ></td>
 										</tr>
 									</table>
 								</div>
@@ -8972,11 +9005,24 @@
 							<td class="tab-padding-bottom tab-padding-right tab-padding-left"><textarea name="attr_styleCombatDescr" style="height:40px;" readonly ></textarea></td>
 						</tr>
 					</table>
-				</div>
-				<br/>
-				<div class="Guardian">
+					<br/>
 					<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" checked />
-					<table class="tableGuardian hidden">
+					<input type="checkbox" name="attr_armure" class="checkBarb hidden" value="barbarian" />
+					<input type="checkbox" name="attr_armure" class="checkBard hidden" value="bard" />
+					<input type="checkbox" name="attr_armure" class="checkDrui hidden" value="druid" />
+					<input type="checkbox" name="attr_armure" class="checkMonk hidden" value="monk" />
+					<input type="checkbox" name="attr_armure" class="checkNecr hidden" value="necromancer" />
+					<input type="checkbox" name="attr_armure" class="checkPala hidden" value="paladin" />
+					<input type="checkbox" name="attr_armure" class="checkPrie hidden" value="priest" />
+					<input type="checkbox" name="attr_armure" class="checkPsio hidden" value="psion" />
+					<input type="checkbox" name="attr_armure" class="checkRang hidden" value="ranger" />
+					<input type="checkbox" name="attr_armure" class="checkRogu hidden" value="rogue" />
+					<input type="checkbox" name="attr_armure" class="checkSorc hidden" value="sorcerer" />
+					<input type="checkbox" name="attr_armure" class="checkWarm hidden" value="warmaster" />
+					<input type="checkbox" name="attr_armure" class="checkWarr hidden" value="warrior" />
+					<input type="checkbox" name="attr_armure" class="checkWiza hidden" value="wizard" />
+					
+					<table>
 						<tr>
 							<td class="tab-padding-left" style="width:40%"></td>
 							<th style="width:20%"><h4>Actuel</h4></th>
@@ -8984,455 +9030,266 @@
 						</tr>
 						<tr>
 							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
+							<td><input type="number" name="attr_santepj" min="0" value="0" class="center" style="width:100%" /></td>
+							<td class="tab-padding-right"><input type="number" name="attr_equipSante" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
 						</tr>
-						<tr>
+						
+						<!-- Guardian -->
+						<tr class="tableGuardian hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureGuardian" value="5" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureGuardian_max" value="5+@{armureGuardianModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureGuardian" value="5+@{armureGuardianModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableGuardian hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieGuardian" value="0" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieGuardian_max" value="0+@{energieGuardianModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieGuardian" value="0+@{energieGuardianModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableGuardian hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfGuardian" value="5" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfGuardian_max" value="5+@{cdfGuardianModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfGuardian_max" value="5+@{cdfGuardianModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Barb">
-					<input type="checkbox" name="attr_armure" class="checkBarb hidden" value="barbarian" />
-					<table class="tableBarb hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Barbarian -->
+						<tr class="tableBarb hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureBarbarian" value="60" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureBarbarian_max" value="60+@{armureBarbarianModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureBarbarian" value="60+@{armureBarbarianModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableBarb hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieBarbarian" value="60" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieBarbarian_max" value="60+@{energieBarbarianModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieBarbarian" value="60+@{energieBarbarianModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableBarb hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfBarbarian" value="12" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfBarbarian_max" value="12+@{barbarianCdF}+@{cdfBarbarianModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfBarbarian" value="12+@{barbarianCdF}+@{cdfBarbarianModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Bard">
-					<input type="checkbox" name="attr_armure" class="checkBard hidden" value="bard" />
-					<table class="tableBard hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Bard -->
+						<tr class="tableBard hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureBard" value="40" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureBard_max" value="40+@{armureBardModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureBard" value="40+@{armureBardModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableBard hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieBard" value="80" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieBard_max" value="80+@{energieBardModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieBard" value="80+@{energieBardModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableBard hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfBard" value="12" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfBard_max" value="12+@{cdfBardModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfBard" value="12+@{cdfBardModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Drui">
-					<input type="checkbox" name="attr_armure" class="checkDrui hidden" value="druid" />
-					<table class="tableDrui hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Druide -->
+						<tr class="tableDrui hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureDrui" value="50" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureDrui_max" value="50+@{armureDruiModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureDrui" value="50+@{armureDruiModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableDrui hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieDrui" value="80" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieDrui_max" value="80+@{energieDruiModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieDrui" value="80+@{energieDruiModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableDrui hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfDrui" value="12" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfDrui_max" value="12+@{cdfDruiModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfDrui" value="12+@{cdfDruiModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Monk">
-					<input type="checkbox" name="attr_armure" class="checkMonk hidden" value="monk" />
-					<table class="tableMonk hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Monk -->
+						<tr class="tableMonk hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureMonk" value="60" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureMonk_max" value="60+@{armureMonkModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureMonk" value="60+@{armureMonkModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableMonk hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieMonk" value="50" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieMonk_max" value="50+@{energieMonkModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieMonk" value="50+@{energieMonkModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableMonk hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfMonk" value="14" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfMonk_max" value="14+@{cdfMonkModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfMonk" value="14+@{cdfMonkModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Necr">
-					<input type="checkbox" name="attr_armure" class="checkNecr hidden" value="necromancer" />
-					<table class="tableNecr hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Necromancer -->
+						<tr class="tableNecr hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureNecromancer" value="80" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureNecromancer_max" value="80+@{armureNecromancerModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureNecromancer" value="80+@{armureNecromancerModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableNecr hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieNecromancer" value="100" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieNecromancer_max" value="100+@{energieNecromancerModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieNecromancer" value="100+@{energieNecromancerModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableNecr hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfNecromancer" value="12" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfNecromancer_max" value="12+@{cdfNecromancerModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfNecromancer" value="12+@{cdfNecromancerModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Pala">
-					<input type="checkbox" name="attr_armure" class="checkPala hidden" value="paladin" />
-					<table class="tablePala hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Paladin -->
+						<tr class="tablePala hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armurePaladin" value="120" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armurePaladin_max" value="120+@{armurePaladinModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmurePaladin" value="120+@{armurePaladinModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tablePala hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energiePaladin" value="20" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePaladin_max" value="20+@{energiePaladinModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergiePaladin" value="20+@{energiePaladinModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tablePala hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfPaladin" value="8" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfPaladin_max" value="8+@{cdfPaladinModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfPaladin" value="8+@{cdfPaladinModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Prie">
-					<input type="checkbox" name="attr_armure" class="checkPrie hidden" value="priest" />
-					<table class="tablePrie hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Priest -->
+						<tr class="tablePrie hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armurePriest" value="70" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armurePriest_max" value="70+@{armurePriestModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmurePriest" value="70+@{armurePriestModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tablePrie hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energiePriest" value="60" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePriest_max" value="60+@{energiePriestModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergiePriest" value="60+@{energiePriestModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tablePrie hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfPriest" value="10" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfPriest_max" value="10+@{cdfPriestModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfPriest" value="10+@{cdfPriestModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Psio">
-					<input type="checkbox" name="attr_armure" class="checkPsio hidden" value="psion" />
-					<table class="tablePsio hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Psion -->
+						<tr class="tablePsio hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armurePsion" value="50" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armurePsion_max" value="50+@{armurePsionModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmurePsion" value="50+@{armurePsionModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tablePsio hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energiePsion" value="60" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energiePsion_max" value="60+@{energiePsionModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergiePsion" value="60+@{energiePsionModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tablePsio hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfPsion" value="14" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfPsion_max" value="14+@{cdfPsionModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfPsion" value="14+@{cdfPsionModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Rang">
-					<input type="checkbox" name="attr_armure" class="checkRang hidden" value="ranger" />
-					<table class="tableRang hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Ranger -->
+						<tr class="tableRang hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureRanger" value="50" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureRanger_max" value="50+@{armureRangerModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureRanger" value="50+@{armureRangerModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableRang hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieRanger" value="70" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieRanger_max" value="70+@{energieRangerModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieRanger" value="70+@{energieRangerModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableRang hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRanger" value="12" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRanger_max" value="12+@{cdfRangerModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfRanger" value="12+@{cdfRangerModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Rogu">
-					<input type="checkbox" name="attr_armure" class="checkRogu hidden" value="rogue" />
-					<table class="tableRogu hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right" ><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Rogue -->
+						<tr class="tableRogu hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureRogue" value="50" /></td>
-							<td class="tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_armureRogue_max" value="50+@{armureRogueModif}" disabled /></td>
+							<td class="tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureRogue" value="50+@{armureRogueModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableRogu hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieRogue" value="70" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieRogue_max" value="70+@{energieRogueModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieRogue" value="70+@{energieRogueModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableRogu hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRogue" value="12" /></td>
-							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRogue_max" value="12+@{cdfRogueModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfRogue" value="12+@{cdfRogueModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Sorc">
-					<input type="checkbox" name="attr_armure" class="checkSorc hidden" value="sorcerer" />
-					<table class="tableSorc hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Sorcerer -->
+						<tr class="tableSorc hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureSorcerer" value="60" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureSorcerer_max" value="60+@{armureSorcererModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureSorcerer" value="60+@{armureSorcererModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableSorc hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieSorcerer" value="80" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieSorcerer_max" value="80+@{energieSorcererModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieSorcerer" value="80+@{energieSorcererModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableSorc hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfSorcerer" value="14" /></td>
-							<td class="tab-padding-bottom tab-padding-right" >
-								<input type="checkbox" name="attr_sorcerer250PG" class="checkShow hidden" value="on" />
-								<div class="reveal">
-									<input type="number" class="center" min="0" style="width:100%" name="attr_cdfSorcerer_max" value="14+@{cdfSorcererModif}+@{sorcererMMCorpMetal}" disabled />
-								</div>
-								<div class="hidden">
-									<input type="number" class="center" min="0" style="width:100%" name="attr_cdfSorcerer250PG_max" value="14+@{cdfSorcererModif}+(@{sorcererMM250PG}*4)" disabled />
-								</div>
-							</td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfSorcerer" value="14+@{cdfSorcererModif}+(@{sorcererMMCorpMetal})+(@{sorcererMM250PG}*4)" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Warm">
-					<input type="checkbox" name="attr_armure" class="checkWarm hidden" value="warmaster" />
-					<table class="tableWarm hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Warmaster -->
+						<tr class="tableWarm hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureWarmaster" value="90" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureWarmaster_max" value="90+@{armureWarmasterModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureWarmaster" value="90+@{armureWarmasterModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableWarm hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieWarmaster" value="40" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieWarmaster_max" value="40+@{energieWarmasterModif}+@{warmaster150PG}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieWarmaster" value="40+@{energieWarmasterModif}+@{warmaster150PG}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableWarm hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfWarmaster" value="8" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfWarmaster_max" value="8+@{cdfWarmasterModif}+@{warmasterImpFPersonnel}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfWarmaster" value="8+@{cdfWarmasterModif}+@{warmasterImpFPersonnel}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Warr">
-					<input type="checkbox" name="attr_armure" class="checkWarr hidden" value="warrior" />
-					<table class="tableWarr hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Warrior -->
+						<tr class="tableWarr hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureWarrior" value="100" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureWarrior_max" value="100+@{armureWarriorModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureWarrior" value="100+@{armureWarriorModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableWarr hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieWarrior" value="40" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieWarrior_max" value="40+@{energieWarriorModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieWarrior" value="40+@{energieWarriorModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableWarr hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfWarrior" value="8" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfWarrior_max" value="8+@{cdfWarriorModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfWarrior" value="8+@{cdfWarriorModif}" disabled /></td>
 						</tr>
-					</table>
-				</div>
-				<div class="Wiza">
-					<input type="checkbox" name="attr_armure" class="checkWiza hidden" value="wizard" />
-					<table class="tableWiza hidden">
-						<tr>
-							<td class="tab-padding-left" style="width:40%"></td>
-							<th style="width:20%"><h4>Actuel</h4></th>
-							<th class="tab-padding-right" style="width:20%"><h4>Maximum</h4></th>
-						</tr>
-						<tr>
-							<th class="tab-padding-left left"><h4>Santé</h4></th>
-							<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-							<td class="tab-padding-right"><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
-						</tr>
-						<tr>
+						
+						<!-- Wizard -->
+						<tr class="tableWiza hidden">
 							<th class="tab-padding-left left"><h4>Armure</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_armureWizard" value="40" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_armureWizard_max" value="40+@{armureWizardModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipArmureWizard" value="40+@{armureWizardModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableWiza hidden">
 							<th class="tab-padding-left left"><h4>Energie</h4></th>
 							<td><input type="number" min="0" style="width:100%" class="center" name="attr_energieWizard" value="80" /></td>
-							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_energieWizard_max" value="80+@{energieWizardModif}" disabled /></td>
+							<td class="tab-padding-right"><input type="number" class="center" min="0" style="width:100%" name="attr_equipEnergieWizard" value="80+@{energieWizardModif}" disabled /></td>
 						</tr>
-						<tr>
+						<tr class="tableWiza hidden">
 							<th class="tab-padding-left tab-padding-bottom left"><h4>Champ de force</h4></th>
 							<td class="tab-padding-bottom"><input type="number" class="center" min="0" style="width:100%" name="attr_cdfWizard" value="14" /></td>
-							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_cdfWizard_max" value="14+@{cdfWizardModif}" disabled /></td>
+							<td class="tab-padding-bottom tab-padding-right" ><input type="number" class="center" min="0" style="width:100%" name="attr_equipCdfWizard" value="14+@{cdfWizardModif}" disabled /></td>
 						</tr>
 					</table>
-				</div>
-				<div class="All">
+					
 					<table style="margin-top:20px">
 						<tr>
 							<th class="center tab-padding-left tab-padding-right"><h4>Bonus/Malus aux Jets</h4></th>