diff --git a/.gitignore b/.gitignore
index 4e88c56..192fa56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,8 @@ venv.bak/
.mypy_cache/
.dmypy.json
dmypy.json
+.idea/vcs.xml
+.idea/sys_d10.iml
+.idea/modules.xml
+.idea/misc.xml
+.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.gitmodules b/.gitmodules
index 6a38e14..bad102e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "minitest"]
- path = minitest
+ path = helpers/minitest
url = git@github.com:Malphaet/minitest.git
diff --git a/helpers/customs.py b/helpers/customs.py
index e004534..184e4fa 100644
--- a/helpers/customs.py
+++ b/helpers/customs.py
@@ -57,7 +57,7 @@ class DISTANCE(generator.Node):
-
+
"""
return ret
@@ -97,7 +97,7 @@ class MELEE(generator.Node):
-
+
"""
return ret
@@ -121,6 +121,6 @@ class CONSOMMABLE(generator.Node):
-
+
"""
diff --git a/helpers/gen.html b/helpers/gen.html
index 9f76d6e..7a5b138 100644
--- a/helpers/gen.html
+++ b/helpers/gen.html
@@ -2007,7 +2007,7 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
-
+
@@ -2067,7 +2067,7 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
-
+
@@ -2100,7 +2100,7 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
-
+
@@ -2118,7 +2118,7 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
-
+
diff --git a/helpers/generator.py b/helpers/generator.py
index bbb303d..8cccef1 100644
--- a/helpers/generator.py
+++ b/helpers/generator.py
@@ -188,7 +188,7 @@ class Repeating(Node):
{{{{result=[[@{{{node.pname}_skilllevel}}+(@{{{node.pname}_attribute_select}})-d@{{dice}}cs1cf@{{dice}}]]}}}}\
{{{{threshold=[[@{{{node.pname}_skilllevel}}+(@{{{node.pname}_attribute_select}})]]}}}}">\
-
+
\n""".format(node=self)
return ret
@@ -197,7 +197,7 @@ if __name__ == '__main__':
# filen="light.txt"
import customs as custom_skills
filen="cyberpnk.txt"
- output="gen.html"
+ output="gent.html"
outcss="gencss.css"
def parse(filen):
root=Root()
diff --git a/minitest b/helpers/minitest
similarity index 100%
rename from minitest
rename to helpers/minitest
diff --git a/helpers/skill_generator.py b/helpers/skill_generator.py
index 3b26d4e..09a5019 100644
--- a/helpers/skill_generator.py
+++ b/helpers/skill_generator.py
@@ -2,146 +2,154 @@
# -*- coding: UTF-8 -*-
# Not actually part of the project; just easier to maintain everything here
-
-import sys,os,traceback
+import importlib
import re
+import sys,os
+import traceback
try:
+ # path=os.path.join(os.path.dirname(__file__),"..","minitest")
+ # minitest=importlib.import_module("...minitest.minitest","skill_generator")
from minitest import minitest
- term=minitest.Terminal()
-except:
- pass
+ term = minitest.Terminal()
+ from test import testReroll,testInit,testWrapper,testParser
+
+except ImportError as e:
+ print(e)
+ print("Minitest isn't imported, the system cannot execute test units")
+
try:
- args=sys.argv[1:]
- command=sys.argv[1]
+ args = sys.argv[1:]
+ command = sys.argv[1]
except:
- print("No command specified, just outputing the help")
- command="help"
+ print("No command specified, just outputting the help")
+ command = "help"
-EOL="\n"
-tab=" "
-#Custom parsing
-ENCAISSEMENT_PARSE="""d_vars.encaissement=to_number(tab[i+1]);
+EOL = "\n"
+tab = " "
+# Custom parsing
+ENCAISSEMENT_PARSE = """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;"""
-FLAT_DICES_PARSE="""d_vars.flat_dices[d_vars.nb_flat_dices]=to_p_number(tab[i+1]);
+FLAT_DICES_PARSE = """d_vars.flat_dices[d_vars.nb_flat_dices]=to_p_number(tab[i+1]);
d_vars.nb_flat_dices++;
i+=2;
break;"""
-TECHNIQUE_PARSE="""d_vars.technique_m=to_p_number(tab[i+2]);
+TECHNIQUE_PARSE = """d_vars.technique_m=to_p_number(tab[i+2]);
i+=3;
break;"""
## Custom adders:
-lambda_flat_dices=lambda a: "@flat_dices[@flat_dices]=type({tab+1});\n@nb_flat_dices++;"
+lambda_flat_dices = lambda a: "@flat_dices[@flat_dices]=type({tab+1});\n@nb_flat_dices++;"
## Custom rerolls:
-categories=['varname','Pretty name','nb_args','type','code','id','default','action','parser']
-hashedCategories={}
+categories = ['varname', 'Pretty name', 'nb_args', 'type', 'code', 'id', 'default', 'action', 'parser']
+hashedCategories = {}
for c in range(len(categories)):
- hashedCategories[categories[c]]=c
+ hashedCategories[categories[c]] = c
-def findCat(element,category):
+
+def findCat(element, category):
return element[hashedCategories[category]]
-list=[]
-#list.append(['varname','Pretty name','nb_args','type','code','id','default','action','parser'])
-list.append(['perfection','Perfection',1,'pint','P',0,0,"",None])
-list.append(['defense_i_0','Defence impénétrable simple',2,'pint','I',1,0,"",None])
-list.append(['defense_i_1','Defence impénétrable expert',2,'pint','I',2,0,"",None])
-list.append(['defense_i_2','Defence impénétrable meta',2,'pint','I',4,0,"",None])
-list.append(['rempart_p','Rempart parfait',1,'pint','R',0,0,"",None])
-list.append(['technique_m','Perfection',1,'pint','M',0,0,"",TECHNIQUE_PARSE]) #+=3
-list.append(['coup_d','Coup_déchirant',1,'pint','D',0,0,"",None])
-list.append(['fauchage','Fauchage',1,'pint','F',0,0,"",None])
-list.append(['exploiter_p_0','Exploiter_les_points_faibles simple',2,'pint','E',1,0,"",None])
-list.append(['exploiter_p_1','Exploiter_les_points_faibles expert',2,'pint','E',2,0,"",None])
-list.append(['exploiter_p_2','Exploiter_les_points_faibles meta',2,'pint','E',4,0,"",None])
-list.append(['tir_p_0','Tir_précis expert',2,'pint','T',2,0,"",None])
-list.append(['tir_p_1','Tir_précis meta',2,'pint','T',4,0,"",None])
-list.append(['tir_i','Tir_implacable',1,'pint','i',0,0,"",None])
-list.append(['charge','Charge',1,'pint','C',0,0,"",None])
-list.append(['charge_i','Charge_indomptable',1,'pint','N',0,0,"",None])
-list.append(['nb_2add','Nombre à ajouter',1,'int','+',0,0,"+",None])
-list.append(['nb_2sub','Nombre a soustraire',1,'int','-',0,0,"+",None])
-list.append(['relances','Relances',1,'pint','r',0,0,"",None])
-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(['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])
-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])
-list.append(['encaissement_dices','Perfection',1,'pint','',0,'""',"",None])
-list.append(['results','Resultats',1,'pint','',0,"[]","",None])
-list.append(['cleave','Fauchage',1,'pint','',0,"[]","",None])
-list.append(['encaissement_result','Resultat d\'encaissement',1,'pint','',0,0,"",None])
-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])
+list = []
+# list.append(['varname','Pretty name','nb_args','type','code','id','default','action','parser'])
+list.append(['perfection', 'Perfection', 1, 'pint', 'P', 0, 0, "", None])
+list.append(['defense_i_0', 'Defence impénétrable simple', 2, 'pint', 'I', 1, 0, "", None])
+list.append(['defense_i_1', 'Defence impénétrable expert', 2, 'pint', 'I', 2, 0, "", None])
+list.append(['defense_i_2', 'Defence impénétrable meta', 2, 'pint', 'I', 4, 0, "", None])
+list.append(['rempart_p', 'Rempart parfait', 1, 'pint', 'R', 0, 0, "", None])
+list.append(['technique_m', 'Perfection', 1, 'pint', 'M', 0, 0, "", TECHNIQUE_PARSE]) # +=3
+list.append(['coup_d', 'Coup_déchirant', 1, 'pint', 'D', 0, 0, "", None])
+list.append(['fauchage', 'Fauchage', 1, 'pint', 'F', 0, 0, "", None])
+list.append(['exploiter_p_0', 'Exploiter_les_points_faibles simple', 2, 'pint', 'E', 1, 0, "", None])
+list.append(['exploiter_p_1', 'Exploiter_les_points_faibles expert', 2, 'pint', 'E', 2, 0, "", None])
+list.append(['exploiter_p_2', 'Exploiter_les_points_faibles meta', 2, 'pint', 'E', 4, 0, "", None])
+list.append(['tir_p_0', 'Tir_précis expert', 2, 'pint', 'T', 2, 0, "", None])
+list.append(['tir_p_1', 'Tir_précis meta', 2, 'pint', 'T', 4, 0, "", None])
+list.append(['tir_i', 'Tir_implacable', 1, 'pint', 'i', 0, 0, "", None])
+list.append(['charge', 'Charge', 1, 'pint', 'C', 0, 0, "", None])
+list.append(['charge_i', 'Charge_indomptable', 1, 'pint', 'N', 0, 0, "", None])
+list.append(['nb_2add', 'Nombre à ajouter', 1, 'int', '+', 0, 0, "+", None])
+list.append(['nb_2sub', 'Nombre a soustraire', 1, 'int', '-', 0, 0, "+", None])
+list.append(['relances', 'Relances', 1, 'pint', 'r', 0, 0, "", None])
+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(['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])
+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])
+list.append(['encaissement_dices', 'Perfection', 1, 'pint', '', 0, '""', "", None])
+list.append(['results', 'Resultats', 1, 'pint', '', 0, "[]", "", None])
+list.append(['cleave', 'Fauchage', 1, 'pint', '', 0, "[]", "", None])
+list.append(['encaissement_result', 'Resultat d\'encaissement', 1, 'pint', '', 0, 0, "", None])
+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
- self.len=len(table)
- self.indexes={}
+ def __init__(self, table=list):
+ self.table = table
+ self.len = len(table)
+ self.indexes = {}
for i in range(len(table)):
- self.indexes[findCat(table[i],"varname")]=i
+ self.indexes[findCat(table[i], "varname")] = i
# Theese are array because you can't acess them directly
- self.singles=[]
- self.code=[]
- self.doubles={}
+ self.singles = []
+ self.code = []
+ self.doubles = {}
for i in table:
- if findCat(i,'nb_args')==1:
+ if findCat(i, 'nb_args') == 1:
self.singles.append(i)
- elif findCat(i,'nb_args')==2:
- n=findCat(i,'code')
+ elif findCat(i, 'nb_args') == 2:
+ n = findCat(i, 'code')
if n not in self.doubles:
- self.doubles[n]=[]
+ self.doubles[n] = []
self.doubles[n].append(i)
- if findCat(i,'code')!='':
+ if findCat(i, 'code') != '':
self.code.append(i)
- def __getitem__(self,argument): #Actually return the full line as a list wrapper
+ def __getitem__(self, argument): # Actually return the full line as a list wrapper
return listWrapper(self.table[self.indexes[argument]])
def __iter__(self):
- for index,key in self.indexes.items():
+ for index, key in self.indexes.items():
yield self[index]
def itersingles(self):
"Only iterate over the simple argument ones"
for index in self.singles:
- yield self[findCat(index,'varname')]
+ yield self[findCat(index, 'varname')]
def iterdoubles(self):
"Only iterate over the double arguments ones return a table with all"
for table in self.doubles.values():
- yield [self[findCat(l,'varname')] for l in table]
+ yield [self[findCat(l, 'varname')] for l in table]
def iterdefined(self):
"Only iterate over the ones with defined code"
pass
- def __contains__(self,val):
+ def __contains__(self, val):
return val in self.indexes
def __len__(self):
@@ -149,12 +157,13 @@ class megaListWrapper():
def pprint(self):
for e in self:
- print(e[0],":",e)
+ print(e[0], ":", e)
+
class listWrapper():
- def __init__(self,list,index=hashedCategories):
- self.list=list
- self.indexes=index
+ def __init__(self, list, index=hashedCategories):
+ self.list = list
+ self.indexes = index
def pprint(self):
print(self.list)
@@ -168,433 +177,247 @@ class listWrapper():
def __repr__(self):
return str(self.list)
- def __getitem__(self,nb):
+ def __getitem__(self, nb):
return self.list[nb]
- def __getattr__(self,index):
+ def __getattr__(self, index):
return self.list[self.indexes[index]]
def __iter__(self):
for e in self.list:
yield e
+
## Commands
def initialise(args):
"Initialise the variables for the switch"
- text="var d_vars={"
+ text = "var d_vars={"
for line in list:
- text+='"{}":{},'.format(line[0],line[6])
- text=text[:-1]+'};'
+ text += '"{}":{},'.format(line[0], line[6])
+ text = text[:-1] + '};'
return text
+
def pprint(args):
"Print the whole list of values"
for i in list:
print(i)
-def pErrors(name,errors):
+
+def pErrors(name, errors):
"Print sucess or error of given test"
if errors:
- print("{:<15}: {} errors occured".format(name,errors))
+ print("{:<15}: {} errors occured".format(name, errors))
else:
print("{:<15}: All test sucessful".format(name))
return errors
+
def reroll(args):
"Generate the reroll inline message"
- reroll="var msg_relance=\"Relancer ce jet";'
+ reroll += '+" r ?{Relances ?}";\n'
+ reroll += 'for (var i=0,len=d_vars.results.length;iRelancer ce jet";'
return reroll
+
def find_code(args):
"Find the next available code for given name"
try:
- code=args[1]
+ code = args[1]
except:
print("One argument expected")
return 0
- listFree=''
+ listFree = ''
for letter in code:
- Letter=letter.capitalize()
- free,Free=1,1
+ Letter = letter.capitalize()
+ free, Free = 1, 1
for line in wrapper:
- if free and letter==line.code:
- free=0
- if Free and Letter==line.code:
- Free=0
+ if free and letter == line.code:
+ free = 0
+ if Free and Letter == line.code:
+ Free = 0
if not free and not Free:
break
if Free and Letter not in listFree:
- listFree+=Letter
+ listFree += Letter
if free and letter not in listFree:
- listFree+=letter
+ listFree += letter
if listFree:
- if len(listFree)==1:
+ if len(listFree) == 1:
return 'The code "{}" is available.'.format(listFree)
else:
return 'The following codes "{}" are available'.format(listFree)
else:
print('No letter from name "{}" is available'.format(code))
- print(find_code([0,"abcdefghijklmnopqrstuvwxyz&_?.§!;"]))
+ print(find_code([0, "abcdefghijklmnopqrstuvwxyz&_?.§!;"]))
+
def parser(args):
"Generate the argument parser"
- res=tab+"if (len_args>0){"+EOL
- res+=tab*2+"d_vars.nb_dices=to_p_number(tab[0]);"+EOL
- res+=tab+"}"+EOL
- res+=tab+"for (i = 1; i < len_args;) {"+EOL
- res+=tab*2+"switch(tab[i]) {"+EOL
+ res = tab + "if (len_args>0){" + EOL
+ res += tab * 2 + "d_vars.nb_dices=to_p_number(tab[0]);" + EOL
+ res += tab + "}" + EOL
+ res += tab + "for (i = 1; i < len_args;) {" + EOL
+ res += tab * 2 + "switch(tab[i]) {" + EOL
+
def typewise(type):
- if type=="pint":
+ if type == "pint":
return "to_p_number({});"
- elif type=='int':
+ elif type == 'int':
return "to_number({});"
return "{};"
- doubles={}
+ doubles = {}
for elt in wrapper.itersingles():
if elt.parser:
- res+=tab*3+'case "{}":'.format(elt.code)+EOL
+ res += tab * 3 + 'case "{}":'.format(elt.code) + EOL
for l in elt.parser.splitlines():
- res+=tab*4+l+EOL
- elif elt.code!="":
- res+=tab*3+'case "{}":'.format(elt.code)+EOL
- res+=tab*4+'d_vars.{}{}={}'.format(elt.varname,elt.action,typewise(elt.type).format("tab[i+1]"))+EOL
- res+=tab*4+'i+=2;'+EOL
- res+=tab*4+'break;'+EOL
+ res += tab * 4 + l + EOL
+ elif elt.code != "":
+ res += tab * 3 + 'case "{}":'.format(elt.code) + EOL
+ res += tab * 4 + 'd_vars.{}{}={}'.format(elt.varname, elt.action,
+ typewise(elt.type).format("tab[i+1]")) + EOL
+ res += tab * 4 + 'i+=2;' + EOL
+ res += tab * 4 + 'break;' + EOL
for grp in wrapper.iterdoubles():
- res+=tab*3+'case "{}":'.format(grp[0].code)+EOL
- res+=tab*4+'switch (tab[i+1]) {'+EOL
+ res += tab * 3 + 'case "{}":'.format(grp[0].code) + EOL
+ res += tab * 4 + 'switch (tab[i+1]) {' + EOL
for elt in grp:
if elt.parser:
for l in elt.parser.splitlines():
- res+=tab*5+l+EOL
- elif elt.code!="":
- res+=tab*5+'case "{}":'.format(elt.id)+EOL
- res+=tab*6+'d_vars.{}{}={}'.format(elt.varname,elt.action,typewise(elt.type).format("tab[i+2]"))+EOL
- res+=tab*6+'break;'+EOL
+ res += tab * 5 + l + EOL
+ elif elt.code != "":
+ res += tab * 5 + 'case "{}":'.format(elt.id) + EOL
+ res += tab * 6 + 'd_vars.{}{}={}'.format(elt.varname, elt.action,
+ typewise(elt.type).format("tab[i+2]")) + EOL
+ res += tab * 6 + 'break;' + EOL
if not elt.parser:
- res+=tab*4+"}"+EOL
- res+=tab*4+'i+=3;'+EOL
- res+=tab*4+'break;'+EOL
+ res += tab * 4 + "}" + EOL
+ res += tab * 4 + 'i+=3;' + EOL
+ res += tab * 4 + 'break;' + EOL
- res+=tab*3+"default:"+EOL
- res+=tab*4+'logit("Argument "+tab[i]+" unknown.");'+EOL
- res+=tab*4+"i++;"+EOL
- res+=tab*4+"break;"+EOL
- res+=tab*2+"}"+EOL
- res+=tab*1+"}"+EOL
+ res += tab * 3 + "default:" + EOL
+ res += tab * 4 + 'logit("Argument "+tab[i]+" unknown.");' + EOL
+ res += tab * 4 + "i++;" + EOL
+ res += tab * 4 + "break;" + EOL
+ res += tab * 2 + "}" + EOL
+ res += tab * 1 + "}" + EOL
return res
-class testInit(minitest.simpleTestUnit):
- """Check the initialisation message"""
- def __init__(self):
- super(testInit, self).__init__("initialisation variables")
-
- def _testInit(self):
- self.currentTest("generating test values")
-
- test_values={"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,"coup_d_results":"[]",
- "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,"encaissement_dices":'""',
- "encaissement_result":0,"replace":-1,"add_to_all":0,"max_dices":-1,"player_name":'""'}
- a=len(test_values)
- b=len(list)
- try:
- dict_list={}
- for l in list:
- dict_list[l[0]]=l[6]
- self.addSuccess()
- except Exception as ex:
- self.addFailure(str(ex))
-
- self.currentTest("testing list")
- if aRelancer ce jet";"""
- var=re.compile(' ([a-zA-Z:+_] .*?".*?)(?:\+"|;)')
- self.addSuccess()
-
- self.currentTest('generating inline message')
- roll=reroll(args)
- self.addSuccess()
-
- self.currentTest("checking generated roll")
- for e in (var.findall(model)):
- if roll.find(e)<0:
- self.currentTest("[{}]".format(e))
- self.addFailure("missing value")
- self.addSuccess()
-
- # Only if the args are updated
- #self.currentTest("checking model")
- #for e in var.findall(roll):
- # if model.find(e)<0:
- # self.currentTest("[{}]".format(e))
- # self.addFailure("missing value")
- #self.addSuccess()
-
-class testWrapper(minitest.simpleTestUnit):
- """Check the reroll inline message"""
- def __init__(self):
- super(testWrapper, self).__init__("inline message")
-
- def _testWrapper(self):
- self.currentTest("generating wrapper")
- s=len(hashedCategories)
- try:
- wrapper[-1]
- errors+=1
- self.addFailure("Error: Element -1 shouldn't exist")
- except:
- self.addSuccess()
-
- f=0
- self.currentTest("hashing categories")
- for ele in wrapper:
- for c in hashedCategories.keys():
- if ele.__getattr__(c)!=findCat(ele,c):
- f+=1
- self.currentTest(ele[0])
- self.addFailure("{} found, should be {}".format(findCat(ele,c),ele.__getattr__(c)))
-
- for i in range(s):
- if wrapper[ele[0]][i]!=ele.asList()[i] or wrapper[ele[0]][i]!=ele[i]:
- f+=1
- self.currentTest(i)
- self.addFailure("Element differs {}!={}".format(wrapper[ele[0]][i],ele.asList()[i]))
- if f==0:
- self.addSuccess()
- else:
- self.addFailure("{} elements failed".format(f))
-
- f=0
- self.currentTest("single variable")
- for i in wrapper.itersingles():
- if i[0] not in wrapper:
- f+=1
- self.addFailure("{} element missing".format(i[0]),nonDestructive=True)
- if f==0:
- self.addSuccess()
- else:
- self.addFailure("{} elements failed".format(f))
-
- f=0
- self.currentTest("double variables")
- for l in wrapper.iterdoubles():
- for i in l:
- if i[0] not in wrapper:
- f+=1
- self.addFailure("{} element missing".format(i[0]),nonDestructive=True)
- if f==0:
- self.addSuccess()
- else:
- self.addFailure("{} elements failed".format(f))
-
-
-class testParser(minitest.simpleTestUnit):
- """Check the reroll inline message"""
- def __init__(self):
- super(testParser, self).__init__("inline message")
-
- def _testParser(self):
- self.currentTest("loading parser")
- par=parser(args)
- self.addSuccess()
- f=0
- nb_code=0
- self.currentTest("testing all variables")
- for line in list:
- cat=findCat(line,"code")
- if cat!="":
- nb_code+=1
- if 'case "{}"'.format(cat) not in par:
- f+=1
- self.addFailure("code {} not found".format(cat),nonDestructive=True)
- if 'd_vars.{}'.format(findCat(line,"varname")) not in par:
- f+=1
- self.addFailure("variable {} not found".format(findCat(line,"varname")),nonDestructive=True)
- if f==0:
- self.addSuccess()
- else:
- self.addFailure("{} failures".format(f))
-
- self.currentTest("testing i++ count")
- count=par.count("i+=")
- nb_code=nb_code+len([l for l in wrapper.iterdoubles()])-sum([len(l) for l in wrapper.iterdoubles()])
- if count!=nb_code:
- self.addFailure("{} occurences found (expected {})".format(par.count("i+="),nb_code))
- else:
- self.addSuccess()
-
- self.currentTest("counting {}")
- counto=par.count("{")
- countc=par.count("}")
- tot=len([l for l in wrapper.iterdoubles()])+3
- if counto!=countc or counto!=tot:
- self.addFailure("found {} '{{' and {} '}} ' instead of {}".format(counto,countc,tot))
- else:
- self.addSuccess()
-
- f=0
- self.currentTest("checking special text")
- for line in list:
- cat=findCat(line,"parser")
- if cat:
- for l in cat.splitlines():
- if l not in par:
- self.addFailure("{} isn't in the end result".format(l),nonDestructive=True)
- if f==0:
- self.addSuccess()
- else:
- self.addFailure("{} failures".format(f))
- """for varname with symbol, find symbol
- for Special text, find special
- """
-
-def test_all(args):
- "Execute all tests"
- subclass=minitest.testGroup("Main Classes",term,verbose=True)
- all_s,t=["reroll","init","wrapper","parser"],0
- if len(args)>1:
- sub=[]# A list of test to execute
- for a in args[1:]:
- a=a.strip("-")
- if a in all_s or a=="all":
- t+=1
- sub.append(a.strip("-"))
- else:
- print("Argument {} unknown".format(a))
- else:
- sub=all_s
- t=len(sub)
-
- if "all" in sub or "reroll" in sub:
- #"Check the reroll inline generation"
- subclass.addTest(testReroll())
- if "all" in sub or "init" in sub:
- #"Check the initialisation message"
- subclass.addTest(testInit())
- if "all" in sub or "wrapper" in sub:
- #"Test the wrapper, only useful internally"
- subclass.addTest(testWrapper())
- if "all" in sub or "parser" in sub:
- #"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]
+ if len(args) > 1:
+ filen = args[1]
try:
- f=open(filen)
+ f = open(filen)
except:
- filen="export.log"
- f=open(filen,"w+")
+ filen = "export.log"
+ f = open(filen, "w+")
def title(t):
- return "{} {} {}".format("#"*10,t,"#"*10)+EOL
+ return "{} {} {}".format("#" * 10, t, "#" * 10) + EOL
f.write(title("Relances"))
- f.write(reroll([])+EOL)
+ f.write(reroll([]) + EOL)
f.write(title("Reroll"))
- f.write(initialise([])+EOL)
+ f.write(initialise([]) + EOL)
f.write(title("Parse"))
- f.write(parser([])+EOL)
+ f.write(parser([]) + EOL)
f.close()
return "All data written in '{}'".format(filen)
+
+def test_all(args):
+ "Execute all tests"
+ subclass = minitest.testGroup("Main Classes", term, verbose=True)
+ all_s, t = ["reroll", "init", "wrapper", "parser"], 0
+ if len(args) > 1:
+ sub = [] # A list of test to execute
+ for a in args[1:]:
+ a = a.strip("-")
+ if a in all_s or a == "all":
+ t += 1
+ sub.append(a.strip("-"))
+ else:
+ print("Argument {} unknown".format(a))
+ else:
+ sub = all_s
+ t = len(sub)
+
+ if "all" in sub or "reroll" in sub:
+ # "Check the reroll inline generation"
+ subclass.addTest(testReroll())
+ if "all" in sub or "init" in sub:
+ # "Check the initialisation message"
+ subclass.addTest(testInit())
+ if "all" in sub or "wrapper" in sub:
+ # "Test the wrapper, only useful internally"
+ subclass.addTest(testWrapper())
+ if "all" in sub or "parser" in sub:
+ # "Check the reroll inline generation"
+ subclass.addTest(testParser())
+
+ if t > 0:
+ subclass.test()
+ status = subclass.get_status()
+ return status['failure']
+ return 0
+
def help(args):
"Help, print the following message"
print("List of availables commands")
for key in commands.keys():
- print(" {}: {}".format(key,commands[key].__doc__))
+ print(" {}: {}".format(key, commands[key].__doc__))
-commands={"init":initialise,"print":pprint,"reroll":reroll,
-"test":test_all,"code":find_code,"parser":parser,"export":export,"help":help}
+
+commands = {"init": initialise, "print": pprint, "reroll": reroll,
+ "test": test_all, "code": find_code, "parser": parser, "export": export, "help": help}
if __name__ == '__main__':
- wrapper=megaListWrapper()
+ wrapper = megaListWrapper()
try:
- ret=commands[command](args)
+ ret = commands[command](args)
if ret:
print(ret)
except KeyError:
print("Command {} doesn't exist".format(command))
commands['help'](args)
except Exception:
- print("Couldn't execute command "+command)
- print(" > {} ({})".format(sys.exc_info()[1],sys.exc_info()[0]))
+ print("Couldn't execute command " + command)
+ print(" > {} ({})".format(sys.exc_info()[1], sys.exc_info()[0]))
traceback.print_tb(sys.exc_info()[2])
diff --git a/helpers/tests.py b/helpers/tests.py
new file mode 100644
index 0000000..bc30ca1
--- /dev/null
+++ b/helpers/tests.py
@@ -0,0 +1,215 @@
+import minitest
+import re
+from skill_generator import *
+
+__all__=["testParser","testWrapper","testInit","testReroll"]
+
+class testInit(minitest.simpleTestUnit):
+ """Check the initialisation message"""
+
+ def __init__(self):
+ super(testInit, self).__init__("initialisation variables")
+
+ def _testInit(self):
+ self.currentTest("generating test values")
+
+ test_values = {"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, "coup_d_results": "[]",
+ "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, "encaissement_dices": '""',
+ "encaissement_result": 0, "replace": -1, "add_to_all": 0, "max_dices": -1, "player_name": '""'}
+ a = len(test_values)
+ b = len(list)
+ try:
+ dict_list = {}
+ for l in list:
+ dict_list[l[0]] = l[6]
+ self.addSuccess()
+ except Exception as ex:
+ self.addFailure(str(ex))
+
+ self.currentTest("testing list")
+ if a < b:
+ pass # Only if the values are updated
+ # self.addFailure("Too many values in the list")
+ # for l in dict_list.keys():
+ # if l not in test_values:
+ # self.currentTest(l)
+ # self.addFailure("{} missing from the test template".format(l))
+ elif b < a:
+ self.addFailure("Too few values in the list")
+ for t, v in test_values.items():
+ if t not in dict_list.keys():
+ self.currentTest(t)
+ self.addFailure("Missing element {}".format(v))
+ else:
+ for l, vl in dict_list.items():
+ if l in test_values.keys():
+ if test_values[l] != vl:
+ self.currentTest(test_values[l])
+ self.addFailure("Expected {}, got {}".format(l, vl))
+ else:
+ self.currentTest(l)
+ self.addFailure("The element is not in the test values")
+ self.addSuccess()
+
+
+class testReroll(minitest.simpleTestUnit):
+ """Check the reroll inline message"""
+
+ def __init__(self):
+ super(testReroll, self).__init__("inline message")
+
+ def _testReroll(self):
+ self.currentTest("regex generation")
+ model = """"var msg_relance="Relancer ce jet";"""
+ var = re.compile(' ([a-zA-Z:+_] .*?".*?)(?:\+"|;)')
+ self.addSuccess()
+
+ self.currentTest('generating inline message')
+ roll = reroll(args)
+ self.addSuccess()
+
+ self.currentTest("checking generated roll")
+ for e in (var.findall(model)):
+ if roll.find(e) < 0:
+ self.currentTest("[{}]".format(e))
+ self.addFailure("missing value")
+ self.addSuccess()
+
+ # Only if the args are updated
+ # self.currentTest("checking model")
+ # for e in var.findall(roll):
+ # if model.find(e)<0:
+ # self.currentTest("[{}]".format(e))
+ # self.addFailure("missing value")
+ # self.addSuccess()
+
+
+class testWrapper(minitest.simpleTestUnit):
+ """Check the reroll inline message"""
+
+ def __init__(self):
+ super(testWrapper, self).__init__("inline message")
+
+ def _testWrapper(self):
+ self.currentTest("generating wrapper")
+ s = len(hashedCategories)
+ errors=0
+ try:
+ wrapper[-1]
+ errors += 1
+ self.addFailure("Error: Element -1 shouldn't exist")
+ except:
+ self.addSuccess()
+
+ f = 0
+ self.currentTest("hashing categories")
+ for ele in wrapper:
+ for c in hashedCategories.keys():
+ if ele.__getattr__(c) != findCat(ele, c):
+ f += 1
+ self.currentTest(ele[0])
+ self.addFailure("{} found, should be {}".format(findCat(ele, c), ele.__getattr__(c)))
+
+ for i in range(s):
+ if wrapper[ele[0]][i] != ele.asList()[i] or wrapper[ele[0]][i] != ele[i]:
+ f += 1
+ self.currentTest(i)
+ self.addFailure("Element differs {}!={}".format(wrapper[ele[0]][i], ele.asList()[i]))
+ if f == 0:
+ self.addSuccess()
+ else:
+ self.addFailure("{} elements failed".format(f))
+
+ f = 0
+ self.currentTest("single variable")
+ for i in wrapper.itersingles():
+ if i[0] not in wrapper:
+ f += 1
+ self.addFailure("{} element missing".format(i[0]), nonDestructive=True)
+ if f == 0:
+ self.addSuccess()
+ else:
+ self.addFailure("{} elements failed".format(f))
+
+ f = 0
+ self.currentTest("double variables")
+ for l in wrapper.iterdoubles():
+ for i in l:
+ if i[0] not in wrapper:
+ f += 1
+ self.addFailure("{} element missing".format(i[0]), nonDestructive=True)
+ if f == 0:
+ self.addSuccess()
+ else:
+ self.addFailure("{} elements failed".format(f))
+
+
+class testParser(minitest.simpleTestUnit):
+ """Check the reroll inline message"""
+
+ def __init__(self):
+ super(testParser, self).__init__("inline message")
+
+ def _testParser(self):
+ self.currentTest("loading parser")
+ par = parser(args)
+ self.addSuccess()
+ f = 0
+ nb_code = 0
+ self.currentTest("testing all variables")
+ for line in list:
+ cat = findCat(line, "code")
+ if cat != "":
+ nb_code += 1
+ if 'case "{}"'.format(cat) not in par:
+ f += 1
+ self.addFailure("code {} not found".format(cat), nonDestructive=True)
+ if 'd_vars.{}'.format(findCat(line, "varname")) not in par:
+ f += 1
+ self.addFailure("variable {} not found".format(findCat(line, "varname")), nonDestructive=True)
+ if f == 0:
+ self.addSuccess()
+ else:
+ self.addFailure("{} failures".format(f))
+
+ self.currentTest("testing i++ count")
+ count = par.count("i+=")
+ nb_code = nb_code + len([l for l in wrapper.iterdoubles()]) - sum([len(l) for l in wrapper.iterdoubles()])
+ if count != nb_code:
+ self.addFailure("{} occurences found (expected {})".format(par.count("i+="), nb_code))
+ else:
+ self.addSuccess()
+
+ self.currentTest("counting {}")
+ counto = par.count("{")
+ countc = par.count("}")
+ tot = len([l for l in wrapper.iterdoubles()]) + 3
+ if counto != countc or counto != tot:
+ self.addFailure("found {} '{{' and {} '}} ' instead of {}".format(counto, countc, tot))
+ else:
+ self.addSuccess()
+
+ f = 0
+ self.currentTest("checking special text")
+ for line in list:
+ cat = findCat(line, "parser")
+ if cat:
+ for l in cat.splitlines():
+ if l not in par:
+ self.addFailure("{} isn't in the end result".format(l), nonDestructive=True)
+ if f == 0:
+ self.addSuccess()
+ else:
+ self.addFailure("{} failures".format(f))
+ """for varname with symbol, find symbol
+ for Special text, find special
+ """
+
+term = minitest.Terminal()
\ No newline at end of file
diff --git a/helpers/weapon.html b/helpers/weapon.html
index ef288c5..93e72c2 100644
--- a/helpers/weapon.html
+++ b/helpers/weapon.html
@@ -45,7 +45,7 @@
-
+
diff --git a/style.css b/style.css
index 98e55df..bc49b4b 100644
--- a/style.css
+++ b/style.css
@@ -2,9 +2,16 @@ div.sheet-tab-content { display: none; }
input.sheet-tab1:checked ~ div.sheet-tab1,
input.sheet-tab2:checked ~ div.sheet-tab2,
input.sheet-tab3:checked ~ div.sheet-tab3
+{
+ display: block;
+
+div.sheet-header-tab-content { display: none; }
+input.sheet-header-tab1:checked ~ div.sheet-header-tab1,
+input.sheet-header-tab2:checked ~ div.sheet-header-tab2,
{
display: block;
}
+
input.sheet-secondary_physique_tab1:checked ~ div.sheet-secondary_physique_tab1,
input.sheet-secondary_physique_tab2:checked ~ div.sheet-secondary_physique_tab2,
input.sheet-secondary_physique_tab3:checked ~ div.sheet-secondary_physique_tab3,