From 3ed2c2ddde975d347d0f6c90391c486014696014 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Thu, 11 Jul 2019 23:12:10 +0200 Subject: [PATCH] Added % damage dealt and received --- crit.js | 26 ++++++++++++++++++++++++-- feuille_sysd10.html | 14 ++++++++++---- skill_generator.py | 6 ++++++ 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/crit.js b/crit.js index 39812ef..7985649 100644 --- a/crit.js +++ b/crit.js @@ -172,7 +172,7 @@ function show_rolls(who,d_vars){ var msg=""; var msg_foot=""; var msg_adds=""; - var msg_relance="Relancer ce jet"; logit(msg_relance); @@ -224,6 +224,8 @@ function show_rolls(who,d_vars){ 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 (d_vars.pctreceived!=0){msg_adds+=" Réduction de dégats: "+d_vars.pctreceived+"%";}; //Transcendence + //if (d_vars.pctinflicted!=0){msg_adds+=" Augmentation de dégats: "+d_vars.pctinflicted+"%";}; //Transcendence if (dice_stats.is_crit==1&&m_crit>1) msg+="L'action est une réussite critique"; if (dice_stats.is_hit==1){ @@ -287,12 +289,18 @@ 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); if (m_crit>1) dices+=" [x"+m_crit+"]"; }; + if (d_vars.pctreceived!=0 && d_vars.action!="a"){ + d_vars.pctreceived=(100+d_vars.pctreceived); + d_vars.nb_2sub=Math.floor(d_vars.nb_2sub*d_vars.pctreceived/100); + dices+=" [x"+d_vars.pctreceived+"%]"; + } if (d_vars.nb_2add!=0){dices+=")";}; if (d_vars.nb_2sub!=0){dices+=" - "+d_vars.nb_2sub;}; // Add everything to the sum @@ -302,6 +310,12 @@ function add_thoose_dices(d_vars,results,name,m_esq,m_crit){ else { if (d_vars.transcendence<3) { sum=Math.floor(sum/(2**(3-d_vars.transcendence)));} } + if (d_vars.pctinflicted!=0 && d_vars.action=="a"){ + d_vars.pctinflicted=(100+d_vars.pctinflicted); + sum=Math.floor(sum*d_vars.pctinflicted/100); + dices+=' [x'+d_vars.pctinflicted+'%]'; + } + sum+=-d_vars.nb_2sub; dices+=" Total: "+sum+""; @@ -314,7 +328,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":2,"transcendence":3,"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,"pctreceived":0,"pctinflicted":0,"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; @@ -421,6 +435,14 @@ function parse_command(message){ d_vars.transcendence=to_p_number(tab[i+1]); i+=2; break; + case "v": + d_vars.pctreceived=to_number(tab[i+1]); + i+=2; + break; + case "f": + d_vars.pctinflicted=to_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 5175fdc..cdbf90c 100644 --- a/feuille_sysd10.html +++ b/feuille_sysd10.html @@ -416,7 +416,7 @@
- + + + @@ -611,7 +611,7 @@
- + + @@ -624,7 +624,7 @@ > ∀
- + ∀ @@ -871,6 +871,12 @@
+
+ + +
+ +
diff --git a/skill_generator.py b/skill_generator.py index 4e64a2f..3b26d4e 100755 --- a/skill_generator.py +++ b/skill_generator.py @@ -80,8 +80,11 @@ 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,2,"",None]) list.append(['transcendence','Transcendence',1,'pint','t',0,3,"",None]) +list.append(['pctreceived','Pourcentage dégats recus',1,'int','v',0,0,"",None]) +list.append(['pctinflicted','Pourcentage dégats infligés',1,'int','f',0,0,"",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]) @@ -92,6 +95,9 @@ list.append(['encaissement_result','Resultat d\'encaissement',1,'pint','',0,0,"" list.append(['technique_result','Dégats technique martiale',1,'int','',0,0,"",None]) list.append(['coup_d_results','Coup déchirant results',1,'pint','',0,"[]","",None]) + + + class megaListWrapper(): def __init__(self,table=list): self.table=table