From b1dd0f4c6de448c4c733f7607387415844cca620 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 9 Oct 2018 17:04:35 +0200 Subject: [PATCH] Progressively testing all changes to live --- crit.js | 274 ++++++++++++++++++++++----------------------- skill_generator.py | 35 +++++- 2 files changed, 166 insertions(+), 143 deletions(-) diff --git a/crit.js b/crit.js index 30fb236..4771d65 100644 --- a/crit.js +++ b/crit.js @@ -319,145 +319,145 @@ 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]) { - case "+": - d_vars.nb_2add+=to_number(tab[i+1]); - i+=2; - break; - case "-": - d_vars.nb_2sub+=to_number(tab[i+1]); - i+=2; - break; - case "P": - d_vars.perfection=to_p_number(tab[i+1]); - i+=2; - break; - case "r": - d_vars.relances=to_p_number(tab[i+1]); - i+=2; - break; - case "s": - d_vars.seuil=to_p_number(tab[i+1]); - i+=2; - break; - case "d": - d_vars.flat_dices[d_vars.nb_flat_dices]=to_p_number(tab[i+1]); - d_vars.nb_flat_dices++; - i+=2; - break; - case "I": - switch (tab[i+1]) { - case "1": - d_vars.defense_i_0=to_p_number(tab[i+2]); - break; - case "2": - d_vars.defense_i_1=to_p_number(tab[i+2]); - break; - case "4": - d_vars.defense_i_2=to_p_number(tab[i+2]); - break; - } - i+=3; - break; - case "E": - switch (tab[i+1]) { - case "1": - d_vars.exploiter_p_0=to_p_number(tab[i+2]); - break; - case "2": - d_vars.exploiter_p_1=to_p_number(tab[i+2]); - break; - case "4": - d_vars.exploiter_p_2=to_p_number(tab[i+2]); - break; - } - i+=3; - break; - case "T": - switch (tab[i+1]) { - case "2": - d_vars.tir_p_0=to_p_number(tab[i+2]); - break; - case "4": - d_vars.tir_p_1=to_p_number(tab[i+2]); - break; - } - i+=3; - break; - case "R": - d_vars.rempart_p=to_p_number(tab[i+1]); - i+=2; - break; - case "C": - d_vars.charge=to_p_number(tab[i+1]); - 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": - d_vars.coup_d=to_p_number(tab[i+1]); - i+=2; - break; - case "F": - d_vars.fauchage=to_p_number(tab[i+1]); - i+=2; - break; - case "N": - d_vars.charge_i=to_p_number(tab[i+1]); - i+=2; - break; - case "i": - d_vars.tir_i=to_p_number(tab[i+1]); - i+=2; - break; - case "a": - 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 "S": - d_vars.encaissement=to_number(tab[i+1]); - d_vars.encaissement_dices="d20"; - if (tab[i+2]=="4") d_vars.encaissement_dices="d10"; - i+=3; - break; - case "L": - d_vars.replace=to_number(tab[i+1]); - i+=2; - break; - case "l": - d_vars.add_to_all=to_number(tab[i+1]); - i+=2; - break; - case "m": - d_vars.max_dices=to_number(tab[i+1]); - i+=2; - break; - case ":": - d_vars.player_name=tab[i+1]; - /*if(tab[i+2].length>1){ // Fixaround, not really pretty, due to the way things are parsed - d_vars.player_name+=" "+tab[i+2]; // Adding second part of name - i+=1; - }*/ - i+=2; - break; - default: - logit("Argument "+tab[i]+" unknown."); - i++; - break; - } + switch(tab[i]) { + case "P": + d_vars.perfection=to_p_number(tab[i+1]); + i+=2; + break; + case "R": + d_vars.rempart_p=to_p_number(tab[i+1]); + i+=2; + break; + case "M": + d_vars.technique_m=to_p_number(tab[i+2]); + i+=3; + break; + case "D": + d_vars.coup_d=to_p_number(tab[i+1]); + i+=2; + break; + case "F": + d_vars.fauchage=to_p_number(tab[i+1]); + i+=2; + break; + case "i": + d_vars.tir_i=to_p_number(tab[i+1]); + i+=2; + break; + case "C": + d_vars.charge=to_p_number(tab[i+1]); + i+=2; + break; + case "N": + d_vars.charge_i=to_p_number(tab[i+1]); + i+=2; + break; + case "+": + d_vars.nb_2add+=to_number(tab[i+1]); + i+=2; + break; + case "-": + d_vars.nb_2sub+=to_number(tab[i+1]); + i+=2; + break; + case "r": + d_vars.relances=to_p_number(tab[i+1]); + i+=2; + break; + case "s": + d_vars.seuil=to_p_number(tab[i+1]); + i+=2; + break; + case "a": + d_vars.action=tab[i+1]; + i+=2; + break; + case "d": + d_vars.flat_dices[d_vars.nb_flat_dices]=to_p_number(tab[i+1]); + d_vars.nb_flat_dices++; + 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 "S": + d_vars.encaissement=to_number(tab[i+1]); + d_vars.encaissement_dices="d20"; + if (tab[i+2]=="4") d_vars.encaissement_dices="d10"; + i+=3; + break; + case "L": + d_vars.replace=to_number(tab[i+1]); + i+=2; + break; + case "l": + d_vars.add_to_all=to_number(tab[i+1]); + i+=2; + break; + case "m": + d_vars.max_dices=to_p_number(tab[i+1]); + i+=2; + break; + case ":": + d_vars.player_name=tab[i+1]; + i+=2; + break; + case "c": + d_vars.crit_level=to_p_number(tab[i+1]); + i+=2; + break; + case "I": + switch (tab[i+1]) { + case "1": + d_vars.defense_i_0=to_p_number(tab[i+2]); + break; + case "2": + d_vars.defense_i_1=to_p_number(tab[i+2]); + break; + case "4": + d_vars.defense_i_2=to_p_number(tab[i+2]); + break; + } + i+=3; + break; + case "E": + switch (tab[i+1]) { + case "1": + d_vars.exploiter_p_0=to_p_number(tab[i+2]); + break; + case "2": + d_vars.exploiter_p_1=to_p_number(tab[i+2]); + break; + case "4": + d_vars.exploiter_p_2=to_p_number(tab[i+2]); + break; + } + i+=3; + break; + case "T": + switch (tab[i+1]) { + case "2": + d_vars.tir_p_0=to_p_number(tab[i+2]); + break; + case "4": + d_vars.tir_p_1=to_p_number(tab[i+2]); + break; + } + i+=3; + break; + default: + logit("Argument "+tab[i]+" unknown."); + i++; + break; + } } return d_vars; }; diff --git a/skill_generator.py b/skill_generator.py index 8b4f553..51f83c9 100755 --- a/skill_generator.py +++ b/skill_generator.py @@ -19,6 +19,7 @@ except: print("No command specified, just outputing the help") command="help" +EOL="\n" #Custom parsing ENCAISSEMENT_PARSE="""d_vars.encaissement=to_number(tab[i+1]); d_vars.encaissement_dices="d20"; @@ -72,7 +73,7 @@ list.append(['seuil','Seuil',1,'pint','s',0,0,"",None]) list.append(['action','Type d\'Action',1,'str','a',0,'""',"",None]) list.append(['flat_dices','Des fixes',1,'pint','d',0,"[]","+",FLAT_DICES_PARSE]) list.append(['on_hit_c','Dégats a l\'impact critique',1,'int','H',0,0,"+",None]) -list.append(['attribute','Caractéristique',1,'int','A',0,0,"",None]) +list.append(['attribute','Caractéristique',1,'int','A',0,0,"+",None]) list.append(['encaissement','Encaissement',1,'pint','S',0,0,"",ENCAISSEMENT_PARSE]) # It's actually 2 args but no switch 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]) @@ -222,9 +223,9 @@ def reroll(args): reroll+=' + "+(d_vars.{}+d_vars.{}+d_vars.{})'.format(wrapper["nb_2add"].varname, wrapper["technique_result"].varname, wrapper["encaissement_result"].varname) # Last part of the command - reroll+=' r ?{Relances ?}"\n' + reroll+='+" r ?{Relances ?}";\n' reroll+='for (var i=0,len=d_vars.results.length;iRelancer ce jet";\'' + reroll+='msg_relance+="\'>Relancer ce jet";' return reroll @@ -262,7 +263,6 @@ def find_code(args): def parser(args): "Generate the argument parser" tab=" " - EOL="\n" res=tab+"if (len_args>0){"+EOL res+=tab*2+"d_vars.nb_dices=to_p_number(tab[0]);"+EOL res+=tab+"}"+EOL @@ -540,13 +540,36 @@ def test_all(args): #"Check the reroll inline generation" subclass.addTest(testParser()) - if t>0: subclass.test() status=subclass.get_status() return status['failure'] return 0 +def export(args): + if len(args)>1: + filen=args[1] + try: + f=open(filen) + except: + filen="export.log" + f=open(filen,"w+") + + def title(t): + return "{} {} {}".format("#"*10,t,"#"*10)+EOL + + + f.write(title("Relances")) + f.write(reroll([])+EOL) + f.write(title("Reroll")) + f.write(initialise([])+EOL) + f.write(title("Parse")) + f.write(parser([])+EOL) + + f.close() + + return "All data written in '{}'".format(filen) + def help(args): "Help, print the following message" print("List of availables commands") @@ -554,7 +577,7 @@ def help(args): print(" {}: {}".format(key,commands[key].__doc__)) commands={"init":initialise,"print":pprint,"reroll":reroll, -"test":test_all,"code":find_code,"parser":parser,"help":help} +"test":test_all,"code":find_code,"parser":parser,"export":export,"help":help} if __name__ == '__main__': wrapper=megaListWrapper()