diff --git a/Todo and utils.txt b/Todo and utils.txt index dbba093..d85de02 100644 --- a/Todo and utils.txt +++ b/Todo and utils.txt @@ -1,34 +1,34 @@ //Variables a initialiser par parse /*var nb_dices=0; - var all_dices d* - var nb_2add=0; //+ - var nb_2sub=0; //- + var all_dices d* + var nb_2add=0; //+ + var nb_2sub=0; //- - var relances=0; //r - Perfection P + 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 + Défense_impénétrable I_1 + Défense_impénétrable I_2 - Rappel + 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 + 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_2 - Rappel 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 + Tir_précis T_1 + Tir_précis T_2 + Tir_implacable i + Charge C + Charge_indomptable N - (Sur la feuille de perso) + Seuil s */ diff --git a/crit.js b/crit.js index 326edb4..7282313 100644 --- a/crit.js +++ b/crit.js @@ -1,7 +1,7 @@ on("chat:message", function(msg) { - //This allows players to enter !sr to roll a number of d6 dice with a target of 4. +//This allows players to enter !sr to roll a number of d6 dice with a target of 4. +if(msg.type == "api" && msg.content.indexOf("!crit ") !== -1) { - if(msg.type == "api" && msg.content.indexOf("!crit ") !== -1) { var sndr=msg.who; var raw_msg = msg.content.replace("!crit ", ""); @@ -13,38 +13,49 @@ on("chat:message", function(msg) { var d_vars=parse_command(raw_msg); //d_vars.results=new Array(Number(d_vars.nb_dices)); d_vars.perfection=Math.min(10,d_vars.perfection); + d_vars.rempart_p=Math.min(10,d_vars.rempart_p); + d_vars.nb_dices+=d_vars.tir_p_0+d_vars.tir_p_1; + + d_vars.seuil=Math.max(d_vars.seuil-d_vars.tir_i,0); + + // Let's be honests no one really cares if it's a defensive or offensive perfection + d_vars.perfection=Math.max(d_vars.perfection,d_vars.rempart_p); 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 msg_roll="/roll "+d_vars.nb_dices+"d"+nb_sides; + if (d_vars.technique_m!=0) msg_roll+="+1d10"; // Let's have one more dice for the test, ugly but meh + //var to_add=d_vars.nb_2add-d_vars.nb_2sub; // 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"]; + if (d_vars.technique_m!=0) { + d_vars.technique_result = JSON.parse(ops[0]["content"])["rolls"][2]["results"][0]["v"]; + var t = Math.max(0,d_vars.technique_m-d_vars.technique_result); + if (d_vars.technique_result==1) d_vars.technique_result=t*2; + else d_vars.technique_result=t; + } for(var i=0,len = rollresult.length ; i=Math.floor(hit_percent*len)){ return_data.is_hit=1; } @@ -108,7 +127,8 @@ function eval_crit(d_vars){ return_data.is_crit=1; } - //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); + //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+" needed_to_crit "+needed_to_crit); + //logit(return_data); return return_data; } @@ -128,69 +148,114 @@ function to_number(nb){ 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 - //logit(d_vars.results); - var msg_head="" - var msg="
"; - var msg_foot="
"; + + var msg_head="
" + var msg="
"; + var msg_foot="
"; + var msg_adds=""; + var sum=0; - var is_below=0,is_acrit=0; var m_esq=1,m_crit=1; //The multiplier from dodge or crit - var t_hit=d_vars.seuil,t_crit=Math.max(7,d_vars.seuil); //The crit threshold can change if the hit threshold is higher + + //Eval the rolls to determine if it's a crit + var dice_stats=eval_crit(d_vars); + logit(dice_stats); switch(d_vars.action){ case "a": - msg+=who+" attaque"; + msg+=who+" attaque"; break; case "e": - msg+=who+" esquive"; - if (d_vars.is_hit) m_crit=2; // It's a hit and a hit + msg+=who+" esquive"; + m_esq=2; // It's a hit break; case "d": - msg+=who+" se defend"; + msg+=who+" se defend"; break; default: - msg+=who+" lance "+d_vars.nb_dices+" des"; + msg+=who+" lance "+d_vars.nb_dices+" dés"; } - if (d_vars.is_crit) m_crit=2; // It's a crit + if (dice_stats.is_crit) m_crit=2; // It's a crit //Add the rolls - for (var i=0,len=d_vars.results.length;i"; // Close this line + + if (dice_stats.is_crit==1) msg+="L'action est une réussite critique"; + if (dice_stats.is_hit==1){ + if (d_vars.seuil!=0){ + if (d_vars.action=="a"){ + msg+="L'attaque parvient a toucher sa cible"; + } else if (d_vars.action=="d"||d_vars.action=="e"){ + // Can't miss a block or a dodge, can be shitty tho + } else { + msg+="L'action est un succes"; + } + } + } else { + if (d_vars.action=="a"){ + msg+="L'attaque ne touche pas sa cible"; + } else if (d_vars.action=="d"||d_vars.action=="e"){ + // Can't miss a block or a dodge + } else { + msg+="L'action est un echec"; + } + } + msg+=msg_adds; + sendChat(who,msg_head+msg+msg_foot); + //logit(msg_head+msg+msg_foot); +} + +function add_thoose_dices(d_vars,results,m_esq,m_crit){ + var dices=""; + var is_below=0,is_acrit=0; + var sum=0; + var t_hit=d_vars.seuil,t_crit=Math.max(7,d_vars.seuil); //The crit threshold can change if the hit threshold is higher + + for (var i=0,len=results.length;it_hit && is_below==1){ - msg+=""; //Stop greying everithing + if (results[i]>t_hit && is_below==1){ + dices+=""; //Stop greying everithing is_below=2; } - if (d_vars.results[i]>t_crit&&is_acrit==0){ - msg+=""; //Start greening everithing + if (results[i]>t_crit&&is_acrit==0){ + dices+=""; //Start greening everithing is_acrit=1; } - sum+=d_vars.results[i]; - msg+=d_vars.results[i]+" "; + // Only add to the sum if you pass the threshold + if (results[i]>t_hit) sum+=results[i]; + dices+=results[i]+" "; } if (is_acrit==1){ - msg+=""; //Stop greening everithing + dices+=""; //Stop greening everything is_acrit=2; } - if (d_vars.is_crit==1){ + // Add everything to the sum + sum=((sum*m_esq)+d_vars.nb_2add)*m_crit-d_vars.nb_2sub; + sum+=d_vars.defense_i_0+d_vars.exploiter_p_0+d_vars.charge; + + dices+="Resultat: "+sum+""; + + logit(dices); + return dices; +}; - } - 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 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, + "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,"nb_flat_dices":0,"action":"","flat_dices":[],"results":[]}; + "relances":0,"seuil":0,"nb_flat_dices":0,"action":"","flat_dices":[],"results":[],"technique_result":0,"cleave":[]}; var tab=message.split(" "); var len_args=tab.length; var i; @@ -274,16 +339,8 @@ function parse_command(message){ 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_p_number(tab[i+2]); - break; - - case "2": - d_vars.technique_m_1=to_p_number(tab[i+2]); - break; - } + case "M": // Both act likewise, we don't care the level in the script + d_vars.technique_m=to_p_number(tab[i+2]); i+=3; break; case "D":