diff --git a/Todo and utils.txt b/Todo and utils.txt index c9ff727..dbba093 100644 --- a/Todo and utils.txt +++ b/Todo and utils.txt @@ -1,27 +1,35 @@ -General -Perfection P +//Variables a initialiser par parse + /*var nb_dices=0; + var all_dices d* + var nb_2add=0; //+ + var nb_2sub=0; //- -Defense -Défense_impénétrable I_1 -Défense_impénétrable I_2 -Défense_impénétrable I_4 -Rempart_parfait R + var relances=0; //r + Perfection P -Offense -Technique_martiale M_1 -Technique_martiale M_2 -Coup_déchirant D -Fauchage F -Exploiter_les_points_faibles E_1 -Exploiter_les_points_faibles E_2 -Exploiter_les_points_faibles E_4 + Defense + Défense_impénétrable I_1 + Défense_impénétrable I_2 + Défense_impénétrable I_4 + Rempart_parfait R -Spécial -Tir_précis T_1 -Tir_précis T_2 -Tir_implacable i -Charge C -Charge_indomptable N + Offense + Technique_martiale M_1 + Technique_martiale M_2 + Coup_déchirant D + Fauchage F + Exploiter_les_points_faibles E_1 + Exploiter_les_points_faibles E_2 + Exploiter_les_points_faibles E_4 + + Spécial + Tir_précis T_1 + Tir_précis T_2 + Tir_implacable i + Charge C + Charge_indomptable N + Seuil s + */ diff --git a/crit.js b/crit.js index ba76f63..326edb4 100644 --- a/crit.js +++ b/crit.js @@ -5,79 +5,77 @@ on("chat:message", function(msg) { var sndr=msg.who; var raw_msg = msg.content.replace("!crit ", ""); - //Variables a initialiser par parse - /*var nb_dices=0; - var nb_2add=0; //+ - var nb_2sub=0; //- - - var relances=0; //r - Perfection P - - Defense - Défense_impénétrable I_1 - Défense_impénétrable I_2 - Défense_impénétrable I_4 - Rempart_parfait R - - Offense - Technique_martiale M_1 - Technique_martiale M_2 - Coup_déchirant D - Fauchage F - Exploiter_les_points_faibles E_1 - Exploiter_les_points_faibles E_2 - Exploiter_les_points_faibles E_4 - - Spécial - Tir_précis T_1 - Tir_précis T_2 - Tir_implacable i - Charge C - Charge_indomptable N - Seuil s - */ + //Marking the log, note that if logit is disabled, nothing will be shown + logit("Following results will track the session of "+msg.who); + logit("The command input was : "+raw_msg); + //Parsing all Variables from the prompt var d_vars=parse_command(raw_msg); - - logit(d_vars); - //Initialisation + //d_vars.results=new Array(Number(d_vars.nb_dices)); d_vars.perfection=Math.min(10,d_vars.perfection); + logit(d_vars); + + //Initialisation var nb_sides=10-d_vars.perfection; //If the sides turns out to be 0 we could do a skip tho... var msg_roll="/roll "+d_vars.nb_dices+"d"+nb_sides var to_add=d_vars.nb_2add-d_vars.nb_2sub; - var results=new Array(Number(d_vars.nb_dices)); - /*logit("to roll: "+msg_roll); - logit("to add: "+to_add); - logit(nb_sides); - logit(results);*/ + // Original launch sendChat(msg.who,msg_roll,function(ops) { // ops will be an ARRAY of command results. var rollresult = JSON.parse(ops[0]["content"])["rolls"][0]["results"]; - //logit("len: "+rollresult.length); for(var i=0,len = rollresult.length ; i0){ - return_data.relances_table=new Array(Math.min(d_vars.relances,d_vars.nb_dices)); - return_data.keep_table=new Array(Math.max(0,d_vars.nb_dices-d_vars.relances)); - } - - var len=results.length; + var len=d_vars.results.length; return_data.nb_ncrit=len; var is_crit=0; var needed_to_crit=len-d_vars.exploiter_p_2;; // Analyse wether it's a hit/miss and if it's critical - for (i=0;icrit_threshold){ // It's a crit + if (d_vars.results[i]>crit_threshold){ // It's a crit return_data.nb_ncrit--; return_data.nb_crit++; } - if (results[i]>d_vars.seuil){ - //logit(results[i]+">"+d_vars.seuil+(results[i]>d_vars.seuil)); + if (d_vars.results[i]>d_vars.seuil){ return_data.nb_hit++; } } - logit(needed_to_crit); + //logit(needed_to_crit); if (return_data.nb_hit>=Math.floor(hit_percent*len)){ return_data.is_hit=1; } @@ -117,42 +108,17 @@ function eval_crit(d_vars,results){ return_data.is_crit=1; } - //Separate the re-rolls, just in case - var keep=0; - for (i=0;i0){ - return_data.relances_table[return_data.nb_relances]=results[i]; - return_data.nb_relances++; - d_vars.relances--; - } else { - // No more re-rolls - return_data.keep_table[keep]=results[i]; - keep++; - } - } - - //logit("Re-rolls"); - //logit(return_data.relances_table); - //logit("keeps"); - //logit(return_data.keep_table); //logit("Nb crit dices: "+(return_data.nb_crit)+" Nb ncrit dices: "+(return_data.nb_ncrit)+" total: "+len+ " is_hit "+return_data.is_hit+" Nb hit dices: "+(return_data.nb_hit)+" is_crit:"+return_data.is_crit); - var hm=string_hitmiss(return_data.relances_table,d_vars.seuil); - /* - var msg_hit=""; - var add="" - if (d_vars.seuil!=0){ - var mss="l'attaque manque"; - if (d_vars.is_hit){ - mss="l'attaque touche"; - } - msg_hit=" seuil "+d_vars.seuil+" "+mss; - add="les des "+hm.str_m+"ne touchent pas"; - } - sendChat(msg.who,"lances "+d_vars.nb_dices+" des")*/ - string_hitmiss(return_data.relances_table,d_vars.seuil); return return_data; } +function to_p_number(nb){ + // Convert to number or return 0 + var tmp=Number(nb); + if (isNaN(tmp)) return 0; + return Math.abs(tmp); +} + function to_number(nb){ // Convert to number or return 0 var tmp=Number(nb); @@ -160,36 +126,71 @@ function to_number(nb){ return tmp; } -function string_hitmiss(table,threshold){ - //Takes an array and a threshold and return two string of missed and hit dices - var hm={str_h:"[[",str_m:"[["}; - for (var i=0,len=table.length;i"; + break; + case "e": + msg+=who+" esquive"; + if (d_vars.is_hit) m_crit=2; // It's a hit and a hit + break; + case "d": + msg+=who+" se defend"; + break; + default: + msg+=who+" lance "+d_vars.nb_dices+" des"; } - hm.str_m+="]]"; - hm.str_h+="]]"; - logit(hm.str_h); - logit(hm.str_m); - return hm; + if (d_vars.is_crit) m_crit=2; // It's a crit + + //Add the rolls + for (var i=0,len=d_vars.results.length;it_hit && is_below==1){ + msg+=""; //Stop greying everithing + is_below=2; + } + if (d_vars.results[i]>t_crit&&is_acrit==0){ + msg+=""; //Start greening everithing + is_acrit=1; + } + sum+=d_vars.results[i]; + msg+=d_vars.results[i]+" "; + } + + if (is_acrit==1){ + msg+=""; //Stop greening everithing + is_acrit=2; + } + if (d_vars.is_crit==1){ + + } + sendChat(who,msg_head+msg+msg_foot); + logit(msg_head+msg+msg_foot); } function parse_command(message){ // Parsing // Parse a string formated in the following fashion - // 4 P 2 I 2 4 E 4 1 T 1 4 + 11 - 22 + // 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={"nb_dices":0,"perfection":0,"defense_i_0":0,"defense_i_1":0,"defense_i_2":0,"rempart_p":0, "technique_m_0":0,"technique_m_1":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}; + "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":[]}; var tab=message.split(" "); var len_args=tab.length; var i; @@ -197,9 +198,9 @@ function parse_command(message){ //logit(tab.length); if (len_args>0){ - d_vars.nb_dices=tab[0]; + d_vars.nb_dices=to_p_number(tab[0]); } - for (i = 1; i < tab.length;) { + for (i = 1; i < len_args;) { switch(tab[i]) { case "+": d_vars.nb_2add=to_number(tab[i+1]); @@ -210,27 +211,32 @@ function parse_command(message){ i+=2; break; case "P": - d_vars.perfection=to_number(tab[i+1]); + d_vars.perfection=to_p_number(tab[i+1]); i+=2; break; case "r": - d_vars.relances=to_number(tab[i+1]); + d_vars.relances=to_p_number(tab[i+1]); i+=2; break; case "s": - d_vars.seuil=to_number(tab[i+1]); + d_vars.seuil=to_p_number(tab[i+1]); + i+=2; + break; + case "d": + d_vars.flat_dices[d_vars.nb_flat_dices]=to_p_number(tab[i+1]); + d_vars.nb_flat_dices++; i+=2; break; case "I": switch (tab[i+1]) { case "1": - d_vars.defense_i_0=to_number(tab[i+2]); + d_vars.defense_i_0=to_p_number(tab[i+2]); break; case "2": - d_vars.defense_i_1=to_number(tab[i+2]); + d_vars.defense_i_1=to_p_number(tab[i+2]); break; case "4": - d_vars.defense_i_2=to_number(tab[i+2]); + d_vars.defense_i_2=to_p_number(tab[i+2]); break; } i+=3; @@ -238,13 +244,13 @@ function parse_command(message){ case "E": switch (tab[i+1]) { case "1": - d_vars.exploiter_p_0=to_number(tab[i+2]); + d_vars.exploiter_p_0=to_p_number(tab[i+2]); break; case "2": - d_vars.exploiter_p_1=to_number(tab[i+2]); + d_vars.exploiter_p_1=to_p_number(tab[i+2]); break; case "4": - d_vars.exploiter_p_2=to_number(tab[i+2]); + d_vars.exploiter_p_2=to_p_number(tab[i+2]); break; } i+=3; @@ -252,52 +258,56 @@ function parse_command(message){ case "T": switch (tab[i+1]) { case "1": - d_vars.tir_p_0=to_number(tab[i+2]); + d_vars.tir_p_0=to_p_number(tab[i+2]); break; case "2": - d_vars.tir_p_1=to_number(tab[i+2]); + d_vars.tir_p_1=to_p_number(tab[i+2]); break; } i+=3; break; case "R": - d_vars.rempart_p=to_number(tab[i+1]); + d_vars.rempart_p=to_p_number(tab[i+1]); i+=2; break; case "C": - d_vars.charge=to_number(tab[i+1]); + d_vars.charge=to_p_number(tab[i+1]); i+=2; break; case "M": switch (tab[i+1]) { case "1": - d_vars.technique_m_0=to_number(tab[i+2]); + d_vars.technique_m_0=to_p_number(tab[i+2]); break; case "2": - d_vars.technique_m_1=to_number(tab[i+2]); + d_vars.technique_m_1=to_p_number(tab[i+2]); break; } i+=3; break; case "D": - d_vars.coup_d=to_number(tab[i+1]); + d_vars.coup_d=to_p_number(tab[i+1]); i+=2; break; case "F": - d_vars.fauchage=to_number(tab[i+1]); + d_vars.fauchage=to_p_number(tab[i+1]); i+=2; break; case "N": - d_vars.charge_i=to_number(tab[i+1]); + d_vars.charge_i=to_p_number(tab[i+1]); i+=2; break; case "O": - d_vars.tir_i=to_number(tab[i+1]); + d_vars.tir_i=to_p_number(tab[i+1]); i+=2; break; case "r": - d_vars.relance=to_number(tab[i+1]); + d_vars.relance=to_p_number(tab[i+1]); + i+=2; + break; + case "a": + d_vars.action=tab[i+1]; i+=2; break; default: