QoL updates

Nearly mandatory updates tbh
This commit is contained in:
Maximilien Rigaut 2018-05-13 20:50:40 +02:00
parent 11ec61a30e
commit fd40ba15f3
2 changed files with 18 additions and 8 deletions

18
crit.js
View File

@ -174,7 +174,7 @@ function show_rolls(who,d_vars){
" I 4 "+d_vars.defense_i_2+" R "+d_vars.rempart_p+" F "+d_vars.fauchage+
" E 0 "+d_vars.exploiter_p_0+" E 1 "+d_vars.exploiter_p_1+" E 4 "+d_vars.exploiter_p_2+" T 0 "+d_vars.tir_p_0+" T 2 "+d_vars.tir_p_1+
" i "+d_vars.tir_i+" C "+d_vars.charge+" N "+d_vars.charge_i+" + "+(d_vars.nb_2add+d_vars.technique_result+d_vars.encaissement_result)+" - "+d_vars.nb_2sub+
" r ?{Relances ?} "+" s "+d_vars.seuil+" a "+d_vars.action+" H "+d_vars.on_hit_c+" A "+d_vars.attribute+" L "+d_vars.replace+" l "+d_vars.add_to_all+" m "+d_vars.max_dices;
" r ?{Relances ?} "+" s "+d_vars.seuil+" a "+d_vars.action+" H "+d_vars.on_hit_c+" A "+d_vars.attribute+" L "+d_vars.replace+" l "+d_vars.add_to_all+" m "+d_vars.max_dices+" : "+d_vars.player_name;
for (var i=0,len=d_vars.results.length;i<len;i++) msg_relance+=" d "+d_vars.results[i];
msg_relance+="'>Relancer ce jet</a>";
var sum=0;
@ -184,6 +184,9 @@ function show_rolls(who,d_vars){
var dice_stats=eval_crit(d_vars);
logit(dice_stats);
if (d_vars.player_name!=""){
who=d_vars.player_name;
}
switch(d_vars.action){
case "a":
@ -262,8 +265,11 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){
}
// Only add to the sum if you pass the threshold
if (results[i]>t_hit) {
if (d_vars.replace>=0) results[i]=d_vars.replace;
sum+=results[i]+d_vars.add_to_all;
if (d_vars.replace>=0) {
sum+=d_vars.replace+d_vars.add_to_all;
} else {
sum+=results[i]+d_vars.add_to_all;
}
}
dices+=results[i]+d_vars.add_to_all+" ";
}
@ -300,7 +306,7 @@ function parse_command(message){
"exploiter_p_2":0,"tir_p_0":0,"tir_p_1":0,"tir_i":0,"charge":0,"charge_i":0,"nb_2add":0,"nb_2sub":0,
"relances":0,"seuil":0,"nb_flat_dices":0,"action":"","flat_dices":[],"results":[],"technique_result":0,
"cleave":[],"on_hit_c":0,"attribute":0,"encaissement":0,"encaissement_dices":"","encaissement_result":0,
"replace":-1,"add_to_all":0,"max_dices":-1};
"replace":-1,"add_to_all":0,"max_dices":-1,"player_name":""};
var tab=message.split(" ");
var len_args=tab.length;
var i;
@ -434,6 +440,10 @@ function parse_command(message){
d_vars.max_dices=to_number(tab[i+1]);
i+=2;
break;
case ":":
d_vars.player_name=tab[i+1];
i+=2;
break;
default:
logit("Argument "+tab[i]+" unknown.");
i++;

View File

@ -367,7 +367,7 @@
<div class="sheet-tab-content sheet-secondary_tab1">
<button type='roll' class="sheet-Initiative_roll" value="/e tire son initiative [[@{base-Agilite} + @{exal-Agilite} + @{Initiative} + 1d10 &{tracker}]]">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} + @{effective_base_damage_dices} A @{Skill_general_attribute_select_attaque} a a">Attaque de base</button>
<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} + @{effective_base_damage_dices} A @{Skill_general_attribute_select_attaque} a a : @{character_name}">Attaque de base</button>
<input type="number" class="sheet-numberbox" name="attr_nb_attack_dices" value="0"/>d10+
<input type="number" class="sheet-numberbox" name="attr_base_damage_dices" 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></select>
@ -466,12 +466,12 @@
<!--Defense -->
<div class="sheet-tab-content sheet-secondary_tab3">
<button type='roll' class="sheet-Attack_roll" value="!crit @{nb_defense_dices} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} S @{general_skilllevel_Encaissement} @{general_effective_Encaissement} + @{base_defense_dices} A @{Skill_general_attribute_select_defense} - ?{Dégats a parer|0} a d">Parade</button>
<button type='roll' class="sheet-Attack_roll" value="!crit @{nb_defense_dices} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} S @{general_skilllevel_Encaissement} @{general_effective_Encaissement} + @{base_defense_dices} A @{Skill_general_attribute_select_defense} - ?{Dégats a parer|0} a d : @{character_name}">Parade</button>
<input type="number" class="sheet-numberbox" name="attr_nb_defense_dices" value="0"/>d10+
<input type="number" class="sheet-numberbox" name="attr_base_defense_dices" 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><option value="@{base-Volonte} A @{exal-Volonte}">Vol</option><option value="@{base-Psyche} A @{exal-Psyche}">Psy</option></select>
<br/>
<button type='roll' class="sheet-Attack_roll" value="!crit @{nb_dodge_dices} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} + @{base_dodge_dices} A @{Skill_general_attribute_select_dodge} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e">Esquive</button>
<button type='roll' class="sheet-Attack_roll" value="!crit @{nb_dodge_dices} I @{skillcost_Defense_impenetrable} @{general_effective_Defense_impenetrable} R @{general_effective_Rempart_parfait} + @{base_dodge_dices} A @{Skill_general_attribute_select_dodge} s ?{Seuil d'esquive} - ?{Dégats a esquiver|0} a e : @{character_name}">Esquive</button>
<input type="number" class="sheet-numberbox" name="attr_nb_dodge_dices" value="0"/>d10+
<input type="number" class="sheet-numberbox" name="attr_base_dodge_dices" value="0"/>
<select class="sheet-skill_select" style="margin-right:4px" name="attr_Skill_general_attribute_select_dodge"><option value="@{base-Chance} A @{exal-Chance}">Chn</option><option value="@{base-Agilite} A @{exal-Agilite}">Agi</option></select>
@ -536,7 +536,7 @@
<!--TIR & CHARGE -->
<div class="sheet-tab-content sheet-secondary_tab4">.
<button type='roll' class="sheet-Attack_roll" value="!crit @{nb_shoot_dices} T @{skillcost_Tir_precis} @{general_effective_Tir_precis} i @{general_effective_Tir_implacable} M @{skillcost_Technique_martiale} @{general_effective_Technique_martiale} E @{skillcost_Exploiter_les_points_faibles} @{general_effective_Exploiter_les_points_faibles} L @{base_shoot_dices} l @{add_shoot_dices} s ?{Seuil de tir|6} a a">Tir</button>
<button type='roll' class="sheet-Attack_roll" value="!crit @{nb_shoot_dices} T @{skillcost_Tir_precis} @{general_effective_Tir_precis} i @{general_effective_Tir_implacable} M @{skillcost_Technique_martiale} @{general_effective_Technique_martiale} E @{skillcost_Exploiter_les_points_faibles} @{general_effective_Exploiter_les_points_faibles} L @{base_shoot_dices} l @{add_shoot_dices} s ?{Seuil de tir|6} a a : @{character_name}">Tir</button>
<input type="number" class="sheet-numberbox" name="attr_nb_shoot_dices" value="0"/>d10 &#8728;
<input type="number" class="sheet-numberbox" name="attr_base_shoot_dices" value="0"/>+
<input type="number" class="sheet-numberbox" name="attr_add_shoot_dices" value="0"/>