Corrected transcendance; added (crit)

This commit is contained in:
Dandaedre 2018-11-05 11:37:39 +01:00
parent f375cdf6c3
commit 733972c62e
2 changed files with 11 additions and 8 deletions

View File

@ -294,12 +294,13 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){
if (d_vars.nb_2add!=0){dices+=")";};
if (d_vars.nb_2sub!=0){dices+=" - "+d_vars.nb_2sub;};
// Add everything to the sum
sum=Math.floor(((sum*m_esq+d_vars.on_hit_c+d_vars.attribute))*m_crit)+d_vars.nb_2add-d_vars.nb_2sub;
sum=Math.floor(((sum*m_esq+d_vars.on_hit_c+d_vars.attribute))*m_crit)+d_vars.nb_2add
sum+=d_vars.defense_i_0+d_vars.exploiter_p_0+d_vars.charge+d_vars.technique_result+d_vars.encaissement_result;
if(d_vars.transcendence>3){sum=sum*(2**(d_vars.transcendence-3));}
else {
if (d_vars.transcendence<3) { sum=Math.floor(sum/(2**(3-d_vars.transcendence)));}
}
sum+=-d_vars.nb_2sub;
dices+="<tr><td class='sheet-sum'> Total: "+sum+"</tr></td>";
//logit(dices);

View File

@ -151,6 +151,8 @@
setAttrs({"dice":Math.floor(values.tmpdice/Math.pow(2,3-values.transcendence))});
} else if (values.transcendence>3) {
setAttrs({"dice":Math.floor(values.tmpdice/Math.pow(2,values.transcendence-3))});
}else {
setAttrs({"dice":values.tmpdice});
};
});
});
@ -414,10 +416,10 @@
<div class="sheet-tab-content sheet-secondary_tab1">
<button type='roll' class="sheet-Initiative_roll" value="&{template:d10init}{{name=@{character_name}}} {{roll_name=Initiative}} {{result=[[@{base-Agilite} + @{exal-Agilite} + @{Initiative} + 1d10 &{tracker}]]}} {{value=[[@{base-Agilite} + @{exal-Agilite} + @{Initiative}]]}} {{base=[[@{Initiative}]]}}">Initiative</button>
<input type="number" class="sheet-numberbox" name="attr_Initiative" value="0"/>
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'attaque} P @{general_effective_Perfection} c @{crit_level} M @{skillcost_Technique_martiale} @{general_effective_Technique_martiale} E @{skillcost_Exploiter_les_points_faibles} @{general_effective_Exploiter_les_points_faibles} F @{general_effective_Fauchage} D @{general_effective_Coup_dechirant} + @{base_damage_dices} + @{exal_damage_dices} A @{Skill_general_attribute_select_attaque} s @{general_attack_threshold} l @{general_attack_addall} a a n @{undescored_name} + @{general_effective_weapon1} + @{general_effective_weapon2} t @{transcendence} + @{general_effective_weapon3}">Attaque</button>
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'attaque} P @{general_effective_Perfection} c @{crit_level} M @{skillcost_Technique_martiale} @{general_effective_Technique_martiale} E @{skillcost_Exploiter_les_points_faibles} @{general_effective_Exploiter_les_points_faibles} F @{general_effective_Fauchage} D @{general_effective_Coup_dechirant} H @{base_damage_dices} H @{exal_damage_dices} A @{Skill_general_attribute_select_attaque} s @{general_attack_threshold} l @{general_attack_addall} a a n @{undescored_name} + @{general_effective_weapon1} + @{general_effective_weapon2} t @{transcendence} + @{general_effective_weapon3}">Attaque</button>
<!-- <input type="number" class="sheet-numberbox" name="attr_nb_attack_dices" title="Nombre de des d'attaque" value="0"/>d10+ -->
<input type="number" class="sheet-numberbox" type="number" name="attr_base_damage_dices" title="Base de dégats" value="0"/>+
<input type="number" class="sheet-numberbox" type="number" name="attr_exal_damage_dices" title="Modificateur temporaire" value="0"/>
<input type="number" class="sheet-numberbox" type="number" name="attr_base_damage_dices" title="Base de dégats (crit)" value="0"/>+
<input type="number" class="sheet-numberbox" type="number" name="attr_exal_damage_dices" title="Modificateur temporaire (crit)" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_attaque">
<option value="@{base-Force} A @{exal-Force}">For</option>
<option value="@{base-Agilite} A @{exal-Agilite}">Agi</option>
@ -608,10 +610,10 @@
<!--Defense -->
<div class="sheet-tab-content sheet-secondary_tab3">
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des de defense} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} c @{crit_level} S @{general_skilllevel_Encaissement} @{general_effective_Encaissement} + @{base_defense_dices} + @{exal_defense_dices} s @{general_defense_threshold} l @{general_defense_addall} A @{Skill_general_attribute_select_defense} t @{transcendence} - ?{Dégats a parer|0} a d n @{undescored_name} + @{general_effective_shield1} + @{general_effective_shield2} + @{general_effective_shield3}">Parade</button>
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des de defense} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} c @{crit_level} S @{general_skilllevel_Encaissement} @{general_effective_Encaissement} H @{base_defense_dices} H @{exal_defense_dices} s @{general_defense_threshold} l @{general_defense_addall} A @{Skill_general_attribute_select_defense} t @{transcendence} - ?{Dégats a parer|0} a d n @{undescored_name} + @{general_effective_shield1} + @{general_effective_shield2} + @{general_effective_shield3}">Parade</button>
<!--<input type="number" class="sheet-numberbox" name="attr_nb_defense_dices" title="Nombre de des de defense" value="0"/>d10+-->
<input type="number" class="sheet-numberbox" name="attr_base_defense_dices" title="Base de defense" value="0"/>+
<input type="number" class="sheet-numberbox" name="attr_exal_defense_dices" title="Modificateur temporaire" value="0"/>
<input type="number" class="sheet-numberbox" name="attr_base_defense_dices" title="Base de defense (crit)" value="0"/>+
<input type="number" class="sheet-numberbox" name="attr_exal_defense_dices" title="Modificateur temporaire (crit)" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_defense">
<option value="@{base-Force} + @{exal-Force}">For</option>
<option value="@{base-Agilite} A @{exal-Agilite}">Agi</option>
@ -621,7 +623,7 @@
><input type="number" class="sheet-numberbox" name="attr_general_defense_threshold" title="Seuil pour toucher l'attaque" value="0"/>
&forall;<input type="number" class="sheet-numberbox" name="attr_general_defense_addall" title="Modificateur sur chaque des" value="0"/>
<br/>
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'esquive} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} c @{crit_level} + @{base_dodge_dices} A @{Skill_general_attribute_select_dodge} t @{transcendence} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e n @{undescored_name}">Esquive</button>
<button type='roll' class="sheet-Attack_roll" value="!crit ?{Nombre de des d'esquive} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} c @{crit_level} H @{base_dodge_dices} A @{Skill_general_attribute_select_dodge} t @{transcendence} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e n @{undescored_name}">Esquive</button>
<!--<input type="number" class="sheet-numberbox" name="attr_nb_dodge_dices" title="Nombre de des d'esquive" value="0"/>d10+-->
<input type="number" class="sheet-numberbox" name="attr_base_dodge_dices" title="Modificateur d'esquive" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_dodge">