diff --git a/Todo and utils.txt b/Todo and utils.txt index aa13ff3..c318bd4 100644 --- a/Todo and utils.txt +++ b/Todo and utils.txt @@ -1,6 +1,5 @@ General -Perfection__ P - +Perfection P Defense Défense_impénétrable I_1 @@ -8,7 +7,6 @@ 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 @@ -18,9 +16,6 @@ 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 @@ -35,3 +30,23 @@ Charge_indomptable N + + + +
diff --git a/crit.js b/crit.js index fbd5449..f91b45f 100644 --- a/crit.js +++ b/crit.js @@ -7,171 +7,42 @@ on("chat:message", function(msg) { var result=''; //Variables a initialiser par parse - var nb_dices=0; - var nb_2add=0; //+ - var nb_2sub=0; //- + /*var nb_dices=0; + var nb_2add=0; //+ + var nb_2sub=0; //- - var relances=0; //r - var perfection=0; //P + var relances=0; //r + Perfection P - var defense_i_0=0; // I_1 - var defense_i_0=0; // I_2 - var defense_i_0=0; // I_4 - var rempart_p=0; //R - var technique_m_0=0; //M_1 - var technique_m_1=0; //M_2 - var coup_d=0; //D + 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 fauchage=0; //F + 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 - var exploiter_p_0=0; //E_1 - var exploiter_p_1=0; //E_2 - var exploiter_p_2=0; //E_4 + Spécial + Tir_précis T_1 + Tir_précis T_2 + Tir_implacable i + Charge C + Charge_indomptable N + */ - var tir_p_0=0; //T_1 - var tir_p_1=0; //T_2 - var tir_i=0; // O - var charge=0; //C - var charge_i=0; //N - - // Parsing - // Parse a string formated in the following fashion - // 4 P 2 I 2 4 E 4 1 T 1 4 + 11 - 22 - // And add everithing in the related Variables - - var tab=raw_msg.split(" "); - log(tab); - log(tab.length); - var i; + var d_vars=parse_command(raw_msg); + var msg_roll=d_vars.nb_dices+"d10"+"+"+d_vars.nb_2add+"-"+d_vars.nb_2sub; - var msg_roll=nb_dices+"d10"+"+"+nb_2add+"-"+nb_2sub; - for (i = 0; i < tab.length;) { - while(i == 0) { - nb_dices=tab[i]; - i++; - } - - switch(tab[i]) { - case "+": - nb_2add=tab[i+1]; - i+=2; - break; - - case "-": - nb_2sub=tab[i+1]; - i+=2; - break; - - case "P": - perfection=tab[i+1]; - i+=2; - break; - - case "I": - switch (tab[i+1]) { - case "1": - defense_i_0=tab[i+2]; - break; - - case "2": - defense_i_1=tab[i+2]; - break; - - case "4": - defense_i_2=tab[i+2]; - break; - } - i+=3; - break; - - case "E": - switch (tab[i+1]) { - case "1": - exploiter_p_0=tab[i+2]; - break; - - case "2": - exploiter_p_1=tab[i+2]; - break; - - case "4": - exploiter_p_2=tab[i+2]; - break; - } - i+=3; - break; - - case "T": - switch (tab[i+1]) { - case "1": - tir_p_0=tab[i+2]; - break; - - case "2": - tir_p_1=tab[i+2]; - break; - } - i+=3; - break; - - case "R": - rempart_p=tab[i+1]; - i+=2; - break; - - case "C": - charge=tab[i+1]; - i+=2; - break; - - case "M": - switch (tab[i+1]) { - case "1": - technique_m_0=tab[i+2]; - break; - - case "2": - technique_m_1=tab[i+2]; - break; - } - i+=3; - break; - - case "D": - coup_d=tab[i+1]; - i+=2; - break; - - case "F": - fauchage=tab[i+1]; - i+=2; - break; - - case "N": - charge_i=tab[i+1]; - i+=2; - break; - - case "O": - tir_i=tab[i+1]; - i+=2; - break; - - case "r": - relance=tab[i+1]; - i+=2; - break; - - default: - console.log("None of the above"); - i++; - } - -console.log(i); -} /* log(msg); sendChat(msg.who,'/roll 4d10',function(ops) { @@ -190,3 +61,135 @@ console.log(i); */ } }); + +function to_number(nb){ + var tmp=Number(nb); + if (isNaN(tmp)) return 0; + return tmp; +} + +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 + // 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}; + var tab=message.split(" "); + var len_args=tab.length; + var i; + //logit(tab); + //logit(tab.length); + + if (len_args>0){ + d_vars.nb_dices=tab[0]; + } + for (i = 1; i < tab.length;) { + switch(tab[i]) { + case "+": + d_vars.nb_2add=to_number(tab[i+1]); + i+=2; + break; + case "-": + d_vars.nb_2sub=to_number(tab[i+1]); + i+=2; + break; + case "P": + d_vars.perfection=to_number(tab[i+1]); + i+=2; + break; + case "r": + d_vars.relances=to_number(tab[i+1]); + i+=2; + break; + case "I": + switch (tab[i+1]) { + case "1": + d_vars.defense_i_0=to_number(tab[i+2]); + break; + case "2": + d_vars.defense_i_1=to_number(tab[i+2]); + break; + case "4": + d_vars.defense_i_2=to_number(tab[i+2]); + break; + } + i+=3; + break; + case "E": + switch (tab[i+1]) { + case "1": + d_vars.exploiter_p_0=to_number(tab[i+2]); + break; + case "2": + d_vars.exploiter_p_1=to_number(tab[i+2]); + break; + case "4": + d_vars.exploiter_p_2=to_number(tab[i+2]); + break; + } + i+=3; + break; + case "T": + switch (tab[i+1]) { + case "1": + d_vars.tir_p_0=to_number(tab[i+2]); + break; + case "2": + d_vars.tir_p_1=to_number(tab[i+2]); + break; + } + i+=3; + break; + case "R": + d_vars.rempart_p=to_number(tab[i+1]); + i+=2; + break; + case "C": + d_vars.charge=to_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]); + break; + + case "2": + d_vars.technique_m_1=to_number(tab[i+2]); + break; + } + i+=3; + break; + case "D": + d_vars.coup_d=to_number(tab[i+1]); + i+=2; + break; + case "F": + d_vars.fauchage=to_number(tab[i+1]); + i+=2; + break; + case "N": + d_vars.charge_i=to_number(tab[i+1]); + i+=2; + break; + case "O": + d_vars.tir_i=to_number(tab[i+1]); + i+=2; + break; + case "r": + d_vars.relance=to_number(tab[i+1]); + i+=2; + break; + default: + logit("Argument "+tab[i]+" unknown."); + i++; + } + } + return d_vars; +}; +function logit(txt){ + //Due to the incomprehensible restriction of console. in roll20 + log(txt); +}; diff --git a/tesidy.html b/tesidy.html index a591651..0aa4257 100644 --- a/tesidy.html +++ b/tesidy.html @@ -5,7 +5,7 @@