x2 dodge and init

This commit is contained in:
Maximilien Rigaut 2018-07-08 07:43:49 +02:00
parent 6774f377bc
commit 725d4f8a4b
2 changed files with 12 additions and 11 deletions

17
crit.js
View File

@ -191,17 +191,17 @@ function show_rolls(who,d_vars){
switch(d_vars.action){
case "a":
msg+=who_pr+" attaque</span></td>";
break;
msg+=who_pr+" attaque</span></td>";
break;
case "e":
msg+=who_pr+" esquive</span></td>";
m_esq=2; // It's a hit
break;
msg+=who_pr+" esquive</span></td>";
m_esq=2; // It's a hit
break;
case "d":
msg+=who_pr+" se defend</span></td>";
break;
msg+=who_pr+" se defend</span></td>";
break;
default:
msg+=who_pr+" lance "+d_vars.nb_dices+" dés</span></td>";
msg+=who_pr+" lance "+d_vars.nb_dices+" dés</span></td>";
}
if (dice_stats.is_crit) {
if ((d_vars.nb_dices+d_vars.nb_flat_dices)>(d_vars.attribute/2)){
@ -283,6 +283,7 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){
is_acrit=2;
}
if (m_esq==2) {dices+=" [x2]";};
if (d_vars.nb_2add!=0){dices+=" + ("+d_vars.nb_2add;};
if (d_vars.attribute+d_vars.attribute!=0){ //&&!=0
dices+=" + "+(d_vars.on_hit_c+d_vars.attribute);

View File

@ -401,7 +401,7 @@
<input type="radio" name="attr_secondary_tab" class="small_tab secondary_tab3" value="3" title="Défensives" />
<input type="radio" name="attr_secondary_tab" class="small_tab secondary_tab4" value="4" title="Tir & Charge" />
<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}]]}}">Initiative</button>
<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 @{nb_attack_dices} P @{general_effective_Perfection} 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 : @{undescored_name} + @{general_effective_weapon1} + @{general_effective_weapon2} + @{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+
@ -893,10 +893,10 @@
<tr><th class="roll-title">{{name}} &mdash; {{roll_name}}</th></tr>
<tr><td class="roll-sucess"> 1d10+{{value}} = {{result}}
{{#rollWasCrit() result}}
<span class="inline fullcrit">+{{value}}</span>
<span class="inline fullcrit">+{{base}}</span>
{{/rollWasCrit() result}}
{{#rollWasFumble() result}}
{{result}}<span class="inline fullfail">-{{value}}</span>
{{result}}<span class="inline fullfail">-{{base}}</span>
{{/rollWasFumble() result}}
</td></tr>
</tr>