From 5bef1d84bd7721670241b62a3a4bc9a676b10639 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Fri, 6 Jul 2018 23:33:55 +0200 Subject: [PATCH 1/4] added forall and threshold to the sheet --- Skills.txt | 3 +++ crit.js | 17 +++++++++-------- feuille_sysd10.html | 10 +++++++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Skills.txt b/Skills.txt index 0ea2e98..140a7f2 100644 --- a/Skills.txt +++ b/Skills.txt @@ -6,6 +6,7 @@ Perfection P Prescience_ @Reserve Rage_primale @Reserve A_corps_perdu @Reserve +undescored_name : Defence Encaissement @Defence @@ -52,6 +53,8 @@ Special Tir_mortel @Reserve Tir_precis T_1 Tir_precis T_2 +replace L +add_to_add l Tir_implacable i Charge C Charge_Mortelle (Rappel) diff --git a/crit.js b/crit.js index 5ae4ae6..3d8c94e 100644 --- a/crit.js +++ b/crit.js @@ -216,27 +216,28 @@ function show_rolls(who,d_vars){ if (d_vars.fauchage!=0) 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_results.join(" ")+""; // 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 - if (d_vars.encaissement!=0) msg_adds+="Encaissement: "+d_vars.encaissement_result+""; // Technique martiale + if (d_vars.relances!=0) msg_adds+="Relances: "+d_vars.relances+""; // Relances + if (d_vars.encaissement!=0) msg_adds+="Encaissement: "+d_vars.encaissement_result+""; // Encaissement + if (d_vars.add_to_all!=0){msg_adds+=" Modificateur de des: "+d_vars.add_to_all;}; //Dice modifier 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 à toucher sa cible"; + msg+="L'attaque parvient à toucher sa cible (seuil "+d_vars.seuil+")"; } else if (d_vars.action=="d"||d_vars.action=="e"){ // Can't miss a block or a dodge, can be a shitty roll tho } else { - msg+="L'action est un succes"; + msg+="L'action est un succes (seuil "+d_vars.seuil+")"; } } } else { if (d_vars.action=="a"){ - msg+="L'attaque ne touche pas sa cible"; + msg+="L'attaque ne touche pas sa cible (seuil "+d_vars.seuil+")"; } 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+="L'action est un echec (seuil "+d_vars.seuil+")"; } } msg+=msg_adds; @@ -267,7 +268,7 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ } // Only add to the sum if you pass the threshold if (results[i]>t_hit) { - if (d_vars.replace>=0) { + if (d_vars.replace>0) { sum+=d_vars.replace+d_vars.add_to_all; } else { sum+=results[i]+d_vars.add_to_all; @@ -308,7 +309,7 @@ function parse_command(message){ "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,"encaissement_dices":"","encaissement_result":0, - "replace":-1,"add_to_all":0,"max_dices":-1,"player_name":""}; + "replace":0,"add_to_all":0,"max_dices":-1,"player_name":""}; var tab=message.split(" "); var len_args=tab.length; var i; diff --git a/feuille_sysd10.html b/feuille_sysd10.html index 537d674..7a4192a 100644 --- a/feuille_sysd10.html +++ b/feuille_sysd10.html @@ -403,7 +403,7 @@
- + d10+ + @@ -411,6 +411,8 @@ + > + ∀
@@ -595,7 +597,7 @@
- + d10+ + @@ -605,6 +607,8 @@ + > + ∀
d10+ @@ -737,7 +741,7 @@
. d10 ∘ - + + ∀ - +
From 725d4f8a4b20eeb82a0b80fee4a14e8ea63437a2 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sun, 8 Jul 2018 07:43:49 +0200 Subject: [PATCH 3/4] x2 dodge and init --- crit.js | 17 +++++++++-------- feuille_sysd10.html | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/crit.js b/crit.js index 26b4854..00ab9e8 100644 --- a/crit.js +++ b/crit.js @@ -191,17 +191,17 @@ function show_rolls(who,d_vars){ switch(d_vars.action){ case "a": - msg+=who_pr+" attaque"; - break; + msg+=who_pr+" attaque"; + break; case "e": - msg+=who_pr+" esquive"; - m_esq=2; // It's a hit - break; + msg+=who_pr+" esquive"; + m_esq=2; // It's a hit + break; case "d": - msg+=who_pr+" se defend"; - break; + msg+=who_pr+" se defend"; + break; default: - msg+=who_pr+" lance "+d_vars.nb_dices+" dés"; + msg+=who_pr+" lance "+d_vars.nb_dices+" dés"; } if (dice_stats.is_crit) { if ((d_vars.nb_dices+d_vars.nb_flat_dices)>(d_vars.attribute/2)){ @@ -283,6 +283,7 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ is_acrit=2; } + if (m_esq==2) {dices+=" [x2]";}; if (d_vars.nb_2add!=0){dices+=" + ("+d_vars.nb_2add;}; if (d_vars.attribute+d_vars.attribute!=0){ //&&!=0 dices+=" + "+(d_vars.on_hit_c+d_vars.attribute); diff --git a/feuille_sysd10.html b/feuille_sysd10.html index 33a0d36..93366ea 100644 --- a/feuille_sysd10.html +++ b/feuille_sysd10.html @@ -401,7 +401,7 @@
- + d10+ @@ -893,10 +893,10 @@ {{name}} — {{roll_name}} 1d10+{{value}} = {{result}} {{#rollWasCrit() result}} - +{{value}} + +{{base}} {{/rollWasCrit() result}} {{#rollWasFumble() result}} - {{result}}-{{value}} + {{result}}-{{base}} {{/rollWasFumble() result}} From 3830a2ea2cbc17f55ffbfd4e0abbb9d7c2a5aafa Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Wed, 8 Aug 2018 22:32:57 +0200 Subject: [PATCH 4/4] QoL Changement de lancers de des, QoL mostly --- feuille_sysd10.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/feuille_sysd10.html b/feuille_sysd10.html index 93366ea..e345569 100644 --- a/feuille_sysd10.html +++ b/feuille_sysd10.html @@ -403,8 +403,8 @@
- - d10+ + + + d10+ + + + ∀
- - d10+ + + d10 ∘ + + ∘ ∀