From 3188397986c8e36bb23370ede809c676af7b78b3 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sun, 26 Feb 2017 22:34:28 +0100 Subject: [PATCH] Partially added Tanking & Crits & Onhits --- Todo and utils.txt | 15 ++- crit.js | 295 ++++++++++++++++++++++++-------------------- feuille_sysd10.html | 126 +++++++++---------- 3 files changed, 230 insertions(+), 206 deletions(-) diff --git a/Todo and utils.txt b/Todo and utils.txt index c6a77f9..f20f1d9 100644 --- a/Todo and utils.txt +++ b/Todo and utils.txt @@ -2,7 +2,7 @@ /* var nb_dices=0; Action a a e d -var all_dices d* +var all_dices d* var nb_2add=0; //+ var nb_2sub=0; //- @@ -31,6 +31,9 @@ Tir_implacable i Charge C Charge_indomptable N - (Sur la feuille de perso) Seuil s +On Hit crit H +Attribute values A +Encaissement E */ // SKILLNAME @@ -42,12 +45,12 @@ on("change:skill_SKILLNAME_activation change:general_skilllevel_SKILLNAME", func - - + + - + - +
@@ -65,5 +68,5 @@ on("change:skill_SKILLNAME_activation change:general_skilllevel_SKILLNAME", func - +
diff --git a/crit.js b/crit.js index 9abc8f3..97ee477 100644 --- a/crit.js +++ b/crit.js @@ -1,134 +1,134 @@ on("chat:message", function(msg) { -//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) { + //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) { - var sndr=msg.who; - var raw_msg = msg.content.replace("!crit ", ""); + var sndr=msg.who; + var raw_msg = msg.content.replace("!crit ", ""); - //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); + //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); - //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_i; - d_vars.fauchage=Math.min(d_vars.fauchage,d_vars.nb_dices); - d_vars.seuil=Math.max(d_vars.seuil-d_vars.tir_p_0-d_vars.tir_p_1,0); + //Parsing all Variables from the prompt + 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_i; + d_vars.fauchage=Math.min(d_vars.fauchage,d_vars.nb_dices); + d_vars.seuil=Math.max(d_vars.seuil-d_vars.tir_p_0-d_vars.tir_p_1,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); + // 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; - 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; + //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; + 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. + // 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 ; icrit_threshold){ // It's a crit - return_data.nb_ncrit--; - return_data.nb_crit++; - } - if (d_vars.results[i]>=d_vars.seuil){ - return_data.nb_hit++; - } + // Analyse wether it's a hit/miss and if it's critical + for (i=0;icrit_threshold){ // It's a crit + return_data.nb_ncrit--; + return_data.nb_crit++; + } + if (d_vars.results[i]>=d_vars.seuil){ + return_data.nb_hit++; + } } if (return_data.nb_hit>=Math.floor(hit_percent*len)){ @@ -165,9 +165,10 @@ function show_rolls(who,d_vars){ var msg_foot=""; var msg_adds=""; var msg_relance="Relancer ce jet"; var sum=0; @@ -180,19 +181,19 @@ function show_rolls(who,d_vars){ switch(d_vars.action){ case "a": - msg+=who+" attaque"; - break; + msg+=who+" attaque"; + break; case "e": - msg+=who+" esquive"; - m_esq=2; // It's a hit - break; + msg+=who+" esquive"; + m_esq=2; // It's a hit + break; case "d": - msg+=who+" se defend"; - break; + msg+=who+" se defend"; + break; default: - msg+=who+" lance "+d_vars.nb_dices+" dés"; + msg+=who+" lance "+d_vars.nb_dices+" dés"; } - if (dice_stats.is_crit) {if (d_vars.nb_dices+d_vars.nb_flat_dices>1){ + if (dice_stats.is_crit) {if ((d_vars.nb_dices+d_vars.nb_flat_dices)>(d_vars.attribute/2)){ m_crit=2; // It's a crit } else { m_crit=1.5; // Only half a crit @@ -202,7 +203,7 @@ function show_rolls(who,d_vars){ msg+=add_thoose_dices(d_vars,d_vars.results,"",m_esq,m_crit); if (d_vars.fauchage!=0) - msg+=add_thoose_dices(d_vars,d_vars.cleave,"Fauchage: ",m_esq,m_crit); + msg+=add_thoose_dices(d_vars,d_vars.cleave,"Fauchage: ",m_esq,m_crit); if (d_vars.coup_d!=0) msg_adds+="Coup déchirant: "+d_vars.coup_d+""; // Coup déchirant if (d_vars.technique_m!=0) msg_adds+="Technique martiale: "+d_vars.technique_result+""; // Technique martiale if (d_vars.relances!=0) msg_adds+="Relances: "+d_vars.relances+""; // Technique martiale @@ -262,10 +263,16 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ dices+=""; //Stop greening everything is_acrit=2; } - if (d_vars.nb_2add!=0){dices+=" + "+d_vars.nb_2add;}; + + if (d_vars.nb_2add!=0){dices+=" + ("+d_vars.nb_2add;}; + if (d_vars.on_hit_c!=0){ + dices+=" + "+d_vars.on_hit_c; + if (m_crit>1) dices+="x"+m_crit; + }; + if (d_vars.nb_2add!=0){dices+=")";}; if (d_vars.nb_2sub!=0){dices+=" - "+d_vars.nb_2sub;}; // Add everything to the sum - sum=((sum*m_esq))*m_crit+d_vars.nb_2add-d_vars.nb_2sub; + sum=Math.floor(((sum*m_esq+d_vars.on_hit_c))*m_crit)+d_vars.nb_2add-d_vars.nb_2sub; sum+=d_vars.defense_i_0+d_vars.exploiter_p_0+d_vars.charge+d_vars.technique_result; dices+=" Total: "+sum+""; @@ -280,9 +287,10 @@ function parse_command(message){ // 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,"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":[],"technique_result":0,"cleave":[]}; + "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":[],"technique_result":0, + "cleave":[],"on_hit_c":0,"attribute":0,"encaissement":0}; var tab=message.split(" "); var len_args=tab.length; var i; @@ -290,7 +298,7 @@ function parse_command(message){ //logit(tab.length); if (len_args>0){ - d_vars.nb_dices=to_p_number(tab[0]); + d_vars.nb_dices=to_p_number(tab[0]); } for (i = 1; i < len_args;) { switch(tab[i]) { @@ -332,7 +340,7 @@ function parse_command(message){ break; } i+=3; - break; + break; case "E": switch (tab[i+1]) { case "1": @@ -344,15 +352,15 @@ function parse_command(message){ case "4": d_vars.exploiter_p_2=to_p_number(tab[i+2]); break; - } - i+=3; - break; + } + i+=3; + break; case "T": switch (tab[i+1]) { - case "1": + case "2": d_vars.tir_p_0=to_p_number(tab[i+2]); break; - case "2": + case "4": d_vars.tir_p_1=to_p_number(tab[i+2]); break; } @@ -394,10 +402,23 @@ function parse_command(message){ d_vars.action=tab[i+1]; i+=2; break; + case "H": + d_vars.on_hit_c+=to_number(tab[i+1]); + i+=2; + break; + case "A": + d_vars.attribute+=to_number(tab[i+1]); + i+=2; + break; + case "E": + d_vars.encaissement+=to_number(tab[i+1]); + i+=2; + break; default: logit("Argument "+tab[i]+" unknown."); i++; - } + break; + } } return d_vars; }; diff --git a/feuille_sysd10.html b/feuille_sysd10.html index 39ac8a5..1ea3243 100644 --- a/feuille_sysd10.html +++ b/feuille_sysd10.html @@ -223,9 +223,9 @@
- - - + + +
@@ -252,7 +252,7 @@

Compétences sociales

-
+
@@ -267,7 +267,7 @@ - +
@@ -289,7 +289,7 @@ - +
@@ -361,20 +361,20 @@
- + d10+ - - + + - - + + - +
@@ -392,7 +392,7 @@ - +
@@ -402,39 +402,39 @@ - - + + - + - + - - + + - + - - + + - + - + - - + + - + - + @@ -453,7 +453,7 @@ - +
@@ -473,37 +473,37 @@ - - + + - + - + - - + + - + - + - - + + - + - +
- - + + - +
@@ -524,50 +524,50 @@ d10+ - +
- + - + - + - - + + - + - + - - + + - + - + - - + + - + - +
- - + + - +