From 39e7cd98cc7eeaa0ed24b92c362df2d3ceaefa8c Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Thu, 11 Oct 2018 21:27:11 +0200 Subject: [PATCH] Finally added the Transcendance and Crit level --- crit.js | 32 +++++++++++++++++--------------- feuille_sysd10.html | 20 +++++++++++++++----- skill_generator.py | 4 ++-- style.css | 3 ++- 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/crit.js b/crit.js index e2e2ded..ad4a15f 100644 --- a/crit.js +++ b/crit.js @@ -170,7 +170,7 @@ function show_rolls(who,d_vars){ var msg=""; var msg_foot=""; var msg_adds=""; - var msg_relance="Relancer ce jet"; logit(msg_relance); @@ -200,12 +200,16 @@ function show_rolls(who,d_vars){ default: msg+=who_pr+" lance "+d_vars.nb_dices+" dés"; } + // 1=pas de crit, 2=crit normal + //d_vars.crit_level-=2; 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 full crit + m_crit=d_vars.crit_level; // It's a full crit } else { if (d_vars.nb_dices+d_vars.nb_flat_dices==0){m_crit=1;} // That's not a crit - else {m_crit=1.5;} // Only half a crit + else { + m_crit=Math.min((0.5+d_vars.crit_level/2),d_vars.crit_level); + } // Only half a crit }}; //Add the rolls @@ -217,6 +221,7 @@ function show_rolls(who,d_vars){ 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 (d_vars.transcendence!=3){msg_adds+=" Transcendence: "+d_vars.transcendence;}; //Transcendence if (dice_stats.is_crit==1&&m_crit>1) msg+="L'action est une réussite critique"; if (dice_stats.is_hit==1){ @@ -291,7 +296,10 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ // Add everything to the sum sum=Math.floor(((sum*m_esq+d_vars.on_hit_c+d_vars.attribute))*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+d_vars.encaissement_result; - + if(d_vars.transcendence>3){sum=sum*(2**(d_vars.transcendence-3));} + else { + if (d_vars.transcendence<3) { sum=Math.floor(sum/(2**(3-d_vars.transcendence)));} + } dices+=" Total: "+sum+""; //logit(dices); @@ -303,17 +311,7 @@ function parse_command(message){ // 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={"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, - "action":"","flat_dices":[],"on_hit_c":0,"attribute":0, - "encaissement":0,"replace":-1,"add_to_all":0,"max_dices":-1, - "player_name":"","crit_level":0,"nb_dices":0,"nb_flat_dices":0, - "encaissement_dices":"","results":[],"cleave":[], - "encaissement_result":0,"technique_result":0,"coup_d_results":[]}; + var d_vars={"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,"action":"","flat_dices":[],"on_hit_c":0,"attribute":0,"encaissement":0,"replace":-1,"add_to_all":0,"max_dices":-1,"player_name":"","crit_level":2,"transcendence":3,"nb_dices":0,"nb_flat_dices":0,"encaissement_dices":"","results":[],"cleave":[],"encaissement_result":0,"technique_result":0,"coup_d_results":[]}; var tab=message.split(" "); var len_args=tab.length; var i; @@ -416,6 +414,10 @@ function parse_command(message){ d_vars.crit_level=to_p_number(tab[i+1]); i+=2; break; + case "t": + d_vars.transcendence=to_p_number(tab[i+1]); + i+=2; + break; case "I": switch (tab[i+1]) { case "1": diff --git a/feuille_sysd10.html b/feuille_sysd10.html index 2308b71..e6a6044 100644 --- a/feuille_sysd10.html +++ b/feuille_sysd10.html @@ -400,10 +400,11 @@ +
- + + @@ -597,7 +598,7 @@
- + + @@ -610,7 +611,7 @@ > ∀
- + ∀ @@ -850,7 +851,16 @@
- + +
+ + +
+ + +
+ +
diff --git a/skill_generator.py b/skill_generator.py index 0a41aeb..de6641d 100755 --- a/skill_generator.py +++ b/skill_generator.py @@ -80,7 +80,8 @@ list.append(['replace','Des de substitution',1,'int','L',0,-1,"",None]) list.append(['add_to_all','Valeur d\'ajout aux des',1,'int','l',0,0,"",None]) list.append(['max_dices','Nombre de des max',1,'pint','m',0,-1,"",None]) list.append(['player_name','Nom du joueur',1,'str','n',0,'""',"",None]) -list.append(['crit_level','Niveau de critique',1,'pint','c',0,0,"",None]) +list.append(['crit_level','Niveau de critique',1,'pint','c',0,2,"",None]) +list.append(['transcendence','Transcendence',1,'pint','t',0,3,"",None]) list.append(['nb_dices','Nombre de des',1,'pint','',0,0,"",None]) list.append(['nb_flat_dices','Nombre de des fixes',1,'pint','',0,0,"",None]) @@ -558,7 +559,6 @@ def export(args): def title(t): return "{} {} {}".format("#"*10,t,"#"*10)+EOL - f.write(title("Relances")) f.write(reroll([])+EOL) f.write(title("Reroll")) diff --git a/style.css b/style.css index 1b2c4b5..79f3e10 100644 --- a/style.css +++ b/style.css @@ -8,7 +8,8 @@ input.sheet-tab3:checked ~ div.sheet-tab3 input.sheet-secondary_tab1:checked ~ div.sheet-secondary_tab1, input.sheet-secondary_tab2:checked ~ div.sheet-secondary_tab2, input.sheet-secondary_tab3:checked ~ div.sheet-secondary_tab3, -input.sheet-secondary_tab4:checked ~ div.sheet-secondary_tab4 +input.sheet-secondary_tab4:checked ~ div.sheet-secondary_tab4, +input.sheet-secondary_tab5:checked ~ div.sheet-secondary_tab5 { display:block; }