From b5744bc58888037d9220d4885461173038478d5b Mon Sep 17 00:00:00 2001
From: Orc & Roll <66952844+orcnroll-dev@users.noreply.github.com>
Date: Fri, 3 Jul 2020 18:27:08 -0300
Subject: [PATCH] resolve critical calculation

---
 Tormenta20/tormenta20.html | 119 ++++++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 55 deletions(-)

diff --git a/Tormenta20/tormenta20.html b/Tormenta20/tormenta20.html
index 4887d881c9..e4c268cfcd 100644
--- a/Tormenta20/tormenta20.html
+++ b/Tormenta20/tormenta20.html
@@ -4,7 +4,8 @@
     <div class="left-container">
         <div class="header-info">
             <div class="input-with-text-bellow char-name">
-                <input name="attr_charname" type="text" spellcheck="false" value=""/>
+                <!-- <input name="attr_charname" type="text" spellcheck="false" value=""/> -->
+                <input name="attr_character_name" type="text"  spellcheck="false"  value="">
                 <span>Nome do Personagem</span>
             </div>
             <div class="input-with-text-bellow char-player">
@@ -31,7 +32,7 @@
                 <div class="container-negative-corner">
                     <div class="inside-negative-corner">
                         <!-- Conteudo aqui -->
-                        <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Força}}{{theroll=[[1d20+@{for_mod}]]}}" class="button-title-attribute">FOR</button>
+                        <button type="roll" name="roll_for" value="&{template:t20}{{character=@{charname}}}{{rollname=Força}}{{theroll=[[1d20+@{for_mod}]]}}" class="button-title-attribute">FOR</button>
                         <input name="attr_for_mod_fake" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{for_mod}" value="@{for_mod}" disabled="true" />
                         <input type="hidden" name="attr_for_mod" />
     
@@ -49,7 +50,7 @@
             <div class="outer-container-negative-corner">
                 <div class="container-negative-corner">
                     <div class="inside-negative-corner">
-                        <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Destreza}}{{theroll=[[1d20+@{des_mod}]]}}" class="button-title-attribute">DES</button>
+                        <button type="roll" name="roll_des" value="&{template:t20}{{character=@{charname}}}{{rollname=Destreza}}{{theroll=[[1d20+@{des_mod}]]}}" class="button-title-attribute">DES</button>
                         <input name="attr_des_mod_fake" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{des_mod}" value="@{des_mod}" disabled="true" />
                         <input type="hidden" name="attr_des_mod" />
     
@@ -67,7 +68,7 @@
             <div class="outer-container-negative-corner">
                 <div class="container-negative-corner">
                     <div class="inside-negative-corner">
-                        <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Constituição}}{{theroll=[[1d20+@{con_mod}]]}}" class="button-title-attribute">CON</button>
+                        <button type="roll" name="roll_con" value="&{template:t20}{{character=@{charname}}}{{rollname=Constituição}}{{theroll=[[1d20+@{con_mod}]]}}" class="button-title-attribute">CON</button>
                         <input name="attr_con_mod_fake" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{con_mod}" value="@{con_mod}" disabled="true" />
                         <input type="hidden" name="attr_con_mod" />
     
@@ -85,7 +86,7 @@
             <div class="outer-container-negative-corner">
                 <div class="container-negative-corner">
                     <div class="inside-negative-corner">
-                        <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Inteligência}}{{theroll=[[1d20+@{int_mod}]]}}" class="button-title-attribute">INT</button>
+                        <button type="roll" name="roll_int" value="&{template:t20}{{character=@{charname}}}{{rollname=Inteligência}}{{theroll=[[1d20+@{int_mod}]]}}" class="button-title-attribute">INT</button>
                         <input name="attr_int_mod_fake" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{int_mod}" value="@{int_mod}" disabled="true" />
                         <input type="hidden" name="attr_int_mod" />
     
@@ -103,7 +104,7 @@
             <div class="outer-container-negative-corner">
                 <div class="container-negative-corner">
                     <div class="inside-negative-corner">
-                        <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Sabedoria}}{{theroll=[[1d20+@{sab_mod}]]}}" class="button-title-attribute">SAB</button>
+                        <button type="roll" name="roll_sab" value="&{template:t20}{{character=@{charname}}}{{rollname=Sabedoria}}{{theroll=[[1d20+@{sab_mod}]]}}" class="button-title-attribute">SAB</button>
                         <input name="attr_sab_mod_fake" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{sab_mod}" value="@{sab_mod}" disabled="true" />
                         <input type="hidden" name="attr_sab_mod" />
     
@@ -121,7 +122,7 @@
             <div class="outer-container-negative-corner">
                 <div class="container-negative-corner">
                     <div class="inside-negative-corner">
-                        <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Carisma}}{{theroll=[[1d20+@{car_mod}]]}}" class="button-title-attribute">CAR</button>
+                        <button type="roll" name="roll_car" value="&{template:t20}{{character=@{charname}}}{{rollname=Carisma}}{{theroll=[[1d20+@{car_mod}]]}}" class="button-title-attribute">CAR</button>
                         <input name="attr_car_mod_fake" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{car_mod}" value="@{car_mod}" disabled="true" />
                         <input type="hidden" name="attr_car_mod" />
     
@@ -204,7 +205,7 @@
                             <!-- Ataques -->
                             <fieldset class="repeating_attacks"> 
                                 <div class="attacksgrid">
-                                    <button type="roll" class="buttonrollataque" value="&{template:t20-attack}{{character=@{charname}}}{{attackname=@{nomeataque}}}{{attackroll=[[1d20cs>@{margemcriticoataque}+[[@{ataquepericia}]]+@{bonusataque}]]}} {{damageroll=[[@{danoataque}+@{modatributodano}+@{danoextraataque}]]}} {{criticaldamageroll=[[@{danocriticoataque}+@{modatributodano}+@{danoextraataque}]]}}{{typeofdamage=@{ataquetipodedano}}}{{description=@{ataquedescricao}}}">T</button>
+                                    <button type="roll" name="roll_attack" class="buttonrollataque" value="&{template:t20-attack}{{character=@{charname}}}{{attackname=@{nomeataque}}}{{attackroll=[[1d20cs>@{margemcriticoataque}+[[@{ataquepericia}]]+@{bonusataque}]]}} {{damageroll=[[@{danoataque}+@{modatributodano}+@{danoextraataque}]]}} {{criticaldamageroll=[[@{danocriticoataque}+@{modatributodano}+@{danoextraataque}]]}}{{typeofdamage=@{ataquetipodedano}}}{{description=@{ataquedescricao}}}">T</button>
                                     <input name="attr_nomeataque" type="text" spellcheck="false" class="" value="">
                                     <input name="attr_bonusataque" type="text" spellcheck="false" class="" value="0">
                                     <input name="attr_danoataque" type="text" spellcheck="false" class="" value="0">
@@ -383,7 +384,7 @@
                         <div class="container-reapeater">
                             <fieldset class="repeating_abilities">
                                 <div class="container-ability-power">
-                                    <button type="roll" class="buttonshowinfo" value="&{template:t20-info}{{infoname=@{nameability}}}{{description=@{abilitydescription}}}">q</button>
+                                    <button type="roll" name="roll_ability" class="buttonshowinfo" value="&{template:t20-info}{{infoname=@{nameability}}}{{description=@{abilitydescription}}}">q</button>
                                     <input name="attr_nameability" type="text" spellcheck="false" value=""/>
                                     <input type="checkbox" class="hiddencheckbox">
                                     <span class="hiddencheckboxcover">W</span>
@@ -397,7 +398,7 @@
                         <div class="container-reapeater">
                             <fieldset class="repeating_powers">
                                 <div class="container-ability-power">
-                                    <button type="roll" class="buttonshowinfo" value="&{template:t20-info}{{infoname=@{namepower}}}{{description=@{powerdescription}}}">q</button>
+                                    <button type="roll" name="roll_power" class="buttonshowinfo" value="&{template:t20-info}{{infoname=@{namepower}}}{{description=@{powerdescription}}}">q</button>
                                     <input name="attr_namepower" type="text" spellcheck="false" value=""/>
                                     <input type="checkbox" class="hiddencheckbox">
                                     <span class="hiddencheckboxcover">W</span>
@@ -431,7 +432,7 @@
                                 <fieldset class="repeating_spells1">
                                     
                                     <div class="container-single-spell">
-                                        <button type="roll" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                        <button type="roll" name="roll_spell1" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
                                         <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                         <input type="checkbox" class="hiddencheckbox">
                                         <span class="hiddencheckboxcover">W</span>
@@ -470,7 +471,7 @@
                             <div class="sheet-containerspelllist">
                                 <fieldset class="repeating_spells3">
                                     <div class="container-single-spell">
-                                        <button type="roll" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                        <button type="roll" name="roll_spell3" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
                                         <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                         <input type="checkbox" class="hiddencheckbox">
                                         <span class="hiddencheckboxcover">W</span>
@@ -504,7 +505,7 @@
                             <div class="sheet-containerspelllist">
                                 <fieldset class="repeating_spells5">
                                     <div class="container-single-spell">
-                                        <button type="roll" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                        <button type="roll" name="roll_spell5" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
                                         <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                         <input type="checkbox" class="hiddencheckbox">
                                         <span class="hiddencheckboxcover">W</span>
@@ -540,7 +541,7 @@
                             <div class="sheet-containerspelllist">
                                 <fieldset class="repeating_spells2">
                                     <div class="container-single-spell">
-                                        <button type="roll" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                        <button type="roll" name="roll_spell2" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
                                         <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                         <input type="checkbox" class="hiddencheckbox">
                                         <span class="hiddencheckboxcover">W</span>
@@ -574,7 +575,7 @@
                             <div class="sheet-containerspelllist">
                                 <fieldset class="repeating_spells4">
                                     <div class="container-single-spell">
-                                        <button type="roll" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                        <button type="roll" name="roll_spell4" class="buttonspell" value="&{template:spell}{{character=@{charname}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
                                         <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                         <input type="checkbox" class="hiddencheckbox">
                                         <span class="hiddencheckboxcover">W</span>
@@ -652,7 +653,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Acrobacia}}{{theroll=[[1d20+[[@{acrobaciatotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_acrobacia" value="&{template:t20}{{character=@{charname}}}{{rollname=Acrobacia}}{{theroll=[[1d20+[[@{acrobaciatotal}]]]]}}" class="skill-button">
                                 <span class="sup-penalidade">Acrobacia</span>
                             </button>
                         </div>
@@ -681,7 +682,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Adestramento}}{{theroll=[[1d20+[[@{adestramentototal}]]]]}}" class="skill-button">
+                            <button type="roll"  name="roll_adestramento" value="&{template:t20}{{character=@{charname}}}{{rollname=Adestramento}}{{theroll=[[1d20+[[@{adestramentototal}]]]]}}" class="skill-button">
                                 <span>Adestramento</span>
                             </button>
                         </div>
@@ -709,7 +710,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Atletismo}}{{theroll=[[1d20+[[@{atletismototal}]]]]}}" class="skill-button">
+                            <button type="roll"  name="roll_atletismo" value="&{template:t20}{{character=@{charname}}}{{rollname=Atletismo}}{{theroll=[[1d20+[[@{atletismototal}]]]]}}" class="skill-button">
                                 <span>Atletismo</span>
                             </button>
                         </div>
@@ -737,7 +738,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Atuação}}{{theroll=[[1d20+[[@{atuacaototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_atuacao" value="&{template:t20}{{character=@{charname}}}{{rollname=Atuação}}{{theroll=[[1d20+[[@{atuacaototal}]]]]}}" class="skill-button">
                                 <span>Atuação</span>
                             </button>
                         </div>
@@ -765,7 +766,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Cavalgar}}{{theroll=[[1d20+[[@{cavalgartotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_cavalgar" value="&{template:t20}{{character=@{charname}}}{{rollname=Cavalgar}}{{theroll=[[1d20+[[@{cavalgartotal}]]]]}}" class="skill-button">
                                 <span>Cavalgar</span>
                             </button>
                         </div>
@@ -793,7 +794,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Conhecimento}}{{theroll=[[1d20+[[@{conhecimentototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_conhecimento" value="&{template:t20}{{character=@{charname}}}{{rollname=Conhecimento}}{{theroll=[[1d20+[[@{conhecimentototal}]]]]}}" class="skill-button">
                                 <span class="sup-treinada">Conhecimento</span>
                             </button>
                         </div>
@@ -821,7 +822,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Cura}}{{theroll=[[1d20+[[@{curatotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_cura" value="&{template:t20}{{character=@{charname}}}{{rollname=Cura}}{{theroll=[[1d20+[[@{curatotal}]]]]}}" class="skill-button">
                                 <span class="sup-treinada">Cura</span>
                             </button>
                         </div>
@@ -849,7 +850,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Diplomacia}}{{theroll=[[1d20+[[@{diplomaciatotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_diplomacia" value="&{template:t20}{{character=@{charname}}}{{rollname=Diplomacia}}{{theroll=[[1d20+[[@{diplomaciatotal}]]]]}}" class="skill-button">
                                 <span>Diplomacia</span>
                             </button>
                         </div>
@@ -877,7 +878,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Enganação}}{{theroll=[[1d20+[[@{enganacaototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_enganacao" value="&{template:t20}{{character=@{charname}}}{{rollname=Enganação}}{{theroll=[[1d20+[[@{enganacaototal}]]]]}}" class="skill-button">
                                 <span>Enganação</span>
                             </button>
                         </div>
@@ -905,7 +906,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Fortitude}}{{theroll=[[1d20+[[@{fortitudetotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_fortitude" value="&{template:t20}{{character=@{charname}}}{{rollname=Fortitude}}{{theroll=[[1d20+[[@{fortitudetotal}]]]]}}" class="skill-button">
                                 <span>Fortitude</span>
                             </button>
                         </div>
@@ -933,7 +934,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Furtividade}}{{theroll=[[1d20+[[@{furtividadetotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_furtividade" value="&{template:t20}{{character=@{charname}}}{{rollname=Furtividade}}{{theroll=[[1d20+[[@{furtividadetotal}]]]]}}" class="skill-button">
                                 <span class="sup-penalidade">Furtividade</span>
                             </button>
                         </div>
@@ -961,7 +962,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Guerra}}{{theroll=[[1d20+[[@{guerratotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_guerra" value="&{template:t20}{{character=@{charname}}}{{rollname=Guerra}}{{theroll=[[1d20+[[@{guerratotal}]]]]}}" class="skill-button">
                                 <span class="sup-treinada">Guerra</span>
                             </button>
                         </div>
@@ -990,7 +991,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Iniciativa}}{{theroll=[[1d20+[[@{iniciativatotal}]] &{tracker:+}]]}}" class="skill-button">
+                            <button type="roll" name="roll_iniciativa" value="&{template:t20}{{character=@{charname}}}{{rollname=Iniciativa}}{{theroll=[[1d20+[[@{iniciativatotal}]] &{tracker}]]}}" class="skill-button">
                                 <span>Iniciativa</span>
                             </button>
                         </div>
@@ -1018,7 +1019,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Intimidação}}{{theroll=[[1d20+[[@{intimidacaototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_intimidacao" value="&{template:t20}{{character=@{charname}}}{{rollname=Intimidação}}{{theroll=[[1d20+[[@{intimidacaototal}]]]]}}" class="skill-button">
                                 <span>Intimidação</span>
                             </button>
                         </div>
@@ -1046,7 +1047,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Intuição}}{{theroll=[[1d20+[[@{intuicaototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_intuicao" value="&{template:t20}{{character=@{charname}}}{{rollname=Intuição}}{{theroll=[[1d20+[[@{intuicaototal}]]]]}}" class="skill-button">
                                 <span>Intuição</span>
                             </button>
                         </div>
@@ -1074,7 +1075,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Investigação}}{{theroll=[[1d20+[[@{investigacaototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_investigacao" value="&{template:t20}{{character=@{charname}}}{{rollname=Investigação}}{{theroll=[[1d20+[[@{investigacaototal}]]]]}}" class="skill-button">
                                 <span>Investigação</span>
                             </button>
                         </div>
@@ -1102,7 +1103,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Jogatina}}{{theroll=[[1d20+[[@{jogatinatotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_jogatina" value="&{template:t20}{{character=@{charname}}}{{rollname=Jogatina}}{{theroll=[[1d20+[[@{jogatinatotal}]]]]}}" class="skill-button">
                                 <span>Jogatina</span>
                             </button>
                         </div>
@@ -1130,7 +1131,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Ladinagem}}{{theroll=[[1d20+[[@{ladinagemtotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_ladinagem" value="&{template:t20}{{character=@{charname}}}{{rollname=Ladinagem}}{{theroll=[[1d20+[[@{ladinagemtotal}]]]]}}" class="skill-button">
                                 <span class="sup-treinada-penalidade">Ladinagem</span>
                             </button>
                         </div>
@@ -1158,7 +1159,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Luta}}{{theroll=[[1d20+[[@{lutatotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_luta" value="&{template:t20}{{character=@{charname}}}{{rollname=Luta}}{{theroll=[[1d20+[[@{lutatotal}]]]]}}" class="skill-button">
                                 <span>Luta</span>
                             </button>
                         </div>
@@ -1186,7 +1187,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Misticismo}}{{theroll=[[1d20+[[@{misticismototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_misticismo" value="&{template:t20}{{character=@{charname}}}{{rollname=Misticismo}}{{theroll=[[1d20+[[@{misticismototal}]]]]}}" class="skill-button">
                                 <span class="sup-treinada">Misticismo</span>
                             </button>
                         </div>
@@ -1214,7 +1215,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Nobreza}}{{theroll=[[1d20+[[@{nobrezatotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_nobreza" value="&{template:t20}{{character=@{charname}}}{{rollname=Nobreza}}{{theroll=[[1d20+[[@{nobrezatotal}]]]]}}" class="skill-button">
                                 <span class="sup-treinada">Nobreza</span>
                             </button>
                         </div>
@@ -1242,7 +1243,7 @@
                             </label>
                         </div>
                         <div class="oficio">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Ofício @{oficionome}}}{{theroll=[[1d20+[[@{oficiototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_oficio1" name="roll_oficio1" value="&{template:t20}{{character=@{charname}}}{{rollname=Ofício @{oficionome}}}{{theroll=[[1d20+[[@{oficiototal}]]]]}}" class="skill-button">
                                 <span>Ofício</span>
                             </button>
                             <input class="nome-oficio" name="attr_oficionome" type="text" spellcheck="false">
@@ -1271,7 +1272,7 @@
                             </label>
                         </div>
                         <div class="oficio">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Ofício @{oficio2nome}}}{{theroll=[[1d20+[[@{oficio2total}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_oficio2" value="&{template:t20}{{character=@{charname}}}{{rollname=Ofício @{oficio2nome}}}{{theroll=[[1d20+[[@{oficio2total}]]]]}}" class="skill-button">
                                 <span>Ofício</span>
                             </button>
                             <input class="nome-oficio" name="attr_oficio2nome" type="text" spellcheck="false">
@@ -1300,7 +1301,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Percepção}}{{theroll=[[1d20+[[@{percepcaototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_percepcao" value="&{template:t20}{{character=@{charname}}}{{rollname=Percepção}}{{theroll=[[1d20+[[@{percepcaototal}]]]]}}" class="skill-button">
                                 <span>Percepção</span>
                             </button>
                         </div>
@@ -1328,7 +1329,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Pilotagem}}{{theroll=[[1d20+[[@{pilotagemtotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_pilotagem" value="&{template:t20}{{character=@{charname}}}{{rollname=Pilotagem}}{{theroll=[[1d20+[[@{pilotagemtotal}]]]]}}" class="skill-button">
                                 <span class="sup-treinada">Pilotagem</span>
                             </button>
                         </div>
@@ -1356,7 +1357,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Pontaria}}{{theroll=[[1d20+[[@{pontariatotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_pontaria" value="&{template:t20}{{character=@{charname}}}{{rollname=Pontaria}}{{theroll=[[1d20+[[@{pontariatotal}]]]]}}" class="skill-button">
                                 <span>Pontaria</span>
                             </button>
                         </div>
@@ -1384,7 +1385,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Reflexos}}{{theroll=[[1d20+[[@{reflexostotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_reflexos" value="&{template:t20}{{character=@{charname}}}{{rollname=Reflexos}}{{theroll=[[1d20+[[@{reflexostotal}]]]]}}" class="skill-button">
                                 <span>Reflexos</span>
                             </button>
                         </div>
@@ -1412,7 +1413,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Religião}}{{theroll=[[1d20+[[@{religiaototal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_religiao" value="&{template:t20}{{character=@{charname}}}{{rollname=Religião}}{{theroll=[[1d20+[[@{religiaototal}]]]]}}" class="skill-button">
                                 <span class="sup-treinada">Religião</span>
                             </button>
                         </div>
@@ -1440,7 +1441,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Sobrevivência}}{{theroll=[[1d20+[[@{sobrevivenciatotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_sobrevivencia" value="&{template:t20}{{character=@{charname}}}{{rollname=Sobrevivência}}{{theroll=[[1d20+[[@{sobrevivenciatotal}]]]]}}" class="skill-button">
                                 <span>Sobrevivência</span>
                             </button>
                         </div>
@@ -1468,7 +1469,7 @@
                             </label>
                         </div>
                         <div class="skill-name">
-                            <button type="roll" value="&{template:t20}{{character=@{charname}}}{{rollname=Vontade}}{{theroll=[[1d20+[[@{vontadetotal}]]]]}}" class="skill-button">
+                            <button type="roll" name="roll_vontade" value="&{template:t20}{{character=@{charname}}}{{rollname=Vontade}}{{theroll=[[1d20+[[@{vontadetotal}]]]]}}" class="skill-button">
                                 <span>Vontade</span>
                             </button>
                         </div>
@@ -1579,10 +1580,11 @@
 <input type="hidden" name="attr_penalidades_armadura" value="0" readonly="1">
 <input type="hidden" name="attr_penalidades_armadura_carga" value="0" readonly="1">
 <input type="hidden" name="attr_metade_do_nivel" value="floor(@{charnivel}/2)">
-<input name="attr_character_name" type="hidden" spellcheck="false">
+<!-- <input name="attr_character_name" type="hidden" spellcheck="false"> -->
+<input name="attr_charname" type="hidden" spellcheck="false" value=""/>
 <input type="hidden" name="attr_vida_max" value="@{vidatotal} + @{vidatemp}"/>
 <input type="hidden" name="attr_mana_max" value="@{manatotal} + @{manatemp}"/>
-<input name="attr_defesatotal" maxlength="3" type="hidden" spellcheck="false">
+<input name="attr_defesatotal" maxlength="3" type="hidden" value="10" spellcheck="false">
 </body>
 </html>
 
@@ -1892,7 +1894,7 @@
     });
 
     //Calculando o dano de um acerto critico
-    on("change:repeating_attacks:danoataque change:repeating_attacks:multiplicadorcriticoataque", function() {
+    on("sheet:opened change:repeating_attacks:danoataque change:repeating_attacks:multiplicadorcriticoataque", function() {
         getAttrs([
            "repeating_attacks_danoataque",
            "repeating_attacks_multiplicadorcriticoataque"
@@ -2032,13 +2034,20 @@
         }); 
     });
 
-    //Campo oculto para nome
-    on("sheet:opened change:charname", function(e){
+    //Compatibilidade para o nome (FAZ O BOTÃO DE EDITAR A FICHA SUMIR)
+    /*on("sheet:opened", function(e){
         getAttrs(["charname"], function(v){
-            let newname = v.charname;            
-            setAttrs({
-                "character_name": newname
-            });
+            
+            if(v.charname != '' || v.charname.length < 1){
+                let newname = v.charname;            
+                setAttrs({
+                    "character_name": newname
+                });
+            }
         }); 
-    });
+    });*/
+    
+    
+
+
 </script>
\ No newline at end of file