diff --git a/crit.js b/crit.js index 1ed5756..43de1ce 100644 --- a/crit.js +++ b/crit.js @@ -167,12 +167,13 @@ on("chat:message", function(msg) { function show_rolls(who,d_vars){ //Return a beautiful table showing the results and some information depending on the type of action "e":Dodge "a":Attack "d":Defense - + d_vars.pctinflicted_show=Math.floor(d_vars.pctinflicted*100)-100; + d_vars.pctreceived_show=Math.floor(d_vars.pctreceived*100)-100; var msg_head="
" var msg="
"; var msg_foot="
"; var msg_adds=""; - var msg_relance="Relancer ce jet"; logit(msg_relance); @@ -296,10 +297,10 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ dices+=" + "+(d_vars.on_hit_c+d_vars.attribute); if (m_crit>1) dices+=" [x"+m_crit+"]"; }; - if (d_vars.pctreceived!=0 && d_vars.action!="a"){ - d_vars.pctreceived=(100+d_vars.pctreceived); - d_vars.nb_2sub=Math.floor(d_vars.nb_2sub*d_vars.pctreceived/100); - dices+=" [x"+d_vars.pctreceived+"%]"; + if (d_vars.pctreceived!=1 && d_vars.action!="a"){ + //d_vars.pctreceived=(100+d_vars.pctreceived); + d_vars.nb_2sub=Math.floor(d_vars.nb_2sub*d_vars.pctreceived); + dices+=" [x"+(d_vars.pctreceived_show)+"%]"; } if (d_vars.nb_2add!=0){dices+=")";}; if (d_vars.nb_2sub!=0){dices+=" - "+d_vars.nb_2sub;}; @@ -310,10 +311,10 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ else { if (d_vars.transcendence<3) { sum=Math.floor(sum/(2**(3-d_vars.transcendence)));} } - if (d_vars.pctinflicted!=0 && d_vars.action=="a"){ - d_vars.pctinflicted=(100+d_vars.pctinflicted); - sum=Math.floor(sum*d_vars.pctinflicted/100); - dices+=' [x'+d_vars.pctinflicted+'%]'; + if (d_vars.pctinflicted!=1 && d_vars.action=="a"){ + //d_vars.pctinflicted=(100+d_vars.pctinflicted); + sum=Math.floor(sum*d_vars.pctinflicted); + dices+=' [x'+(d_vars.pctinflicted_show+100)+'%]'; } sum+=-d_vars.nb_2sub; @@ -328,7 +329,7 @@ function parse_command(message){ // Parse a string formated in the following fashion // 4 P 2 I 2 4 E 4 1 T 1 4 + 11 - 22 s 2 d 4 d 5 d 8 d 1 // And add everithing in the related Variables - var d_vars={"perfection":0,"defense_i_0":0,"defense_i_1":0,"defense_i_2":0,"rempart_p":0,"technique_m":0,"coup_d":0,"fauchage":0,"exploiter_p_0":0,"exploiter_p_1":0,"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,"action":"","flat_dices":[],"on_hit_c":0,"attribute":0,"encaissement":0,"replace":-1,"add_to_all":0,"max_dices":-1,"player_name":"","crit_level":2,"transcendence":3,"pctreceived":0,"pctinflicted":0,"nb_dices":0,"nb_flat_dices":0,"encaissement_dices":"","results":[],"cleave":[],"encaissement_result":0,"technique_result":0,"coup_d_results":[]}; + var d_vars={"perfection":0,"defense_i_0":0,"defense_i_1":0,"defense_i_2":0,"rempart_p":0,"technique_m":0,"coup_d":0,"fauchage":0,"exploiter_p_0":0,"exploiter_p_1":0,"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,"action":"","flat_dices":[],"on_hit_c":0,"attribute":0,"encaissement":0,"replace":-1,"add_to_all":0,"max_dices":-1,"player_name":"","crit_level":2,"transcendence":3,"pctreceived":1,"pctinflicted":1,"nb_dices":0,"nb_flat_dices":0,"encaissement_dices":"","results":[],"cleave":[],"encaissement_result":0,"technique_result":0,"coup_d_results":[]}; var tab=message.split(" "); var len_args=tab.length; var i; @@ -436,11 +437,11 @@ function parse_command(message){ i+=2; break; case "v": - d_vars.pctreceived+=to_number(tab[i+1]); + d_vars.pctreceived*=(100+to_number(tab[i+1]))/100; i+=2; break; case "f": - d_vars.pctinflicted+=to_number(tab[i+1]); + d_vars.pctinflicted*=(100+to_number(tab[i+1]))/100; i+=2; break; case "I": diff --git a/feuille_sysd10.html b/feuille_sysd10.html index 2987c36..591c444 100644 --- a/feuille_sysd10.html +++ b/feuille_sysd10.html @@ -120,16 +120,16 @@ }); // Life_Points on("change:base-Force change:base-Agilite change:base-Volonte change:general_skilllevel_Endurance_surnaturelle", function() { - getAttrs(["base-Force","base-Agilite","base-Volonte","general_skilllevel_Endurance_surnaturelle"], function(values) { - setAttrs({"Life_Points_max":Number(values['base-Force'])+Number(values['base-Volonte'])+Number(values['base-Agilite'])+Number(values.general_skilllevel_Endurance_surnaturelle)*2+10}); - setAttrs({"Life_Points_maximum":Number(values['base-Force'])+Number(values['base-Volonte'])+Number(values['base-Agilite'])+Number(values.general_skilllevel_Endurance_surnaturelle)*2+10}); + getAttrs(["base-Force","base-Agilite","base-Volonte","general_skilllevel_Endurance_surnaturelle general_skilllevel_Health_supp"], function(values) { + setAttrs({"Life_Points_max":Number(values['base-Force'])+Number(values['base-Volonte'])+Number(values['base-Agilite'])*2+Number(values.general_skilllevel_Endurance_surnaturelle)*4+Number(values.general_skilllevel_Health_supp)+25}); + setAttrs({"Life_Points_maximum":Number(values['base-Force'])+Number(values['base-Volonte'])+Number(values['base-Agilite'])*2+Number(values.general_skilllevel_Endurance_surnaturelle)*4+Number(values.general_skilllevel_Health_supp)+25}); }); }); // Endurance_Points on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_surnaturelle", function() { getAttrs(["base-Force","base-Agilite","general_skilllevel_Endurance_surnaturelle"], function(values) { - setAttrs({"Endurance_Points_maximum":Number(values['base-Force'])*4}); - setAttrs({"Endurance_Points_max":Number(values['base-Force'])*4}); + setAttrs({"Endurance_Points_maximum":Number(values['base-Force'])*5+Number(values['base-Volonte'])*3}); + setAttrs({"Endurance_Points_max":Number(values['base-Force'])*5+Number(values['base-Volonte'])*3}); }); }); // attr_Grievious_Wounds @@ -878,6 +878,9 @@
+ + +
@@ -1032,9 +1035,9 @@
- - - + + +