diff --git a/Helpers/Characters/God.ini b/Helpers/Characters/God.ini index 05b1e42..6b93747 100644 --- a/Helpers/Characters/God.ini +++ b/Helpers/Characters/God.ini @@ -9,5 +9,5 @@ cn = (@{base-Chance}+{exal-Chance}) sp = (@{base-special}+{exal-special}) [Type] -big +big = changes [God] diff --git a/Helpers/Characters/Julien.ini b/Helpers/Characters/Julien.ini index cd431e0..0049f44 100644 --- a/Helpers/Characters/Julien.ini +++ b/Helpers/Characters/Julien.ini @@ -7,3 +7,4 @@ _vars = macro = xhanges [Sceau du Ninix] + elno=test diff --git a/Helpers/macro.py b/Helpers/macro.py index 2bd4a9c..783702f 100755 --- a/Helpers/macro.py +++ b/Helpers/macro.py @@ -38,11 +38,13 @@ def diff(characters,output,version): list=["git", "diff","HEAD","--word-diff=color","--function-context"]+chars if output=="tty": dprint("Printing diff") - subprocess.call(list) + pi=subprocess.check_output(list).decode("utf-8") + print(pi) else: proc=subprocess.Popen(list,stdout=subprocess.PIPE) - pi=subprocess.check_output(("./ansi2html.sh","test.html"),stdin=proc.stdout) - print(pi) + pi=subprocess.check_output(("./ansi2html.sh"),stdin=proc.stdout) + with open(output,"wb") as file: + file.write(pi) def get_char(names): if names[0]=="all": diff --git a/Helpers/test.html b/Helpers/test.html new file mode 100644 index 0000000..02f744b --- /dev/null +++ b/Helpers/test.html @@ -0,0 +1,333 @@ + +
+ + + + + ++diff --git a/Helpers/Characters/God.ini b/Helpers/Characters/God.ini +index 05b1e42..6b93747 100644 +--- a/Helpers/Characters/God.ini ++++ b/Helpers/Characters/God.ini +@@ -1,13 +1,13 @@ +[Base] + fo = (@{base-Force}+{exal-Force}) + ag = (@{base-Agilite}+{exal-Agilite}) + pe = (@{base-Perception}+{exal-Perception}) + ca = (@{base-Charisme}+{exal-Charisme}) + in = (@{base-Intelligence}+{exal-Intelligence}) + vo = (@{base-Volonte}+{exal-Volonte}) + ps = (@{base-Psyche}+{exal-Psyche}) + cn = (@{base-Chance}+{exal-Chance}) + sp = (@{base-special}+{exal-special}) +[Type] +big = changes +[God] +diff --git a/Helpers/Characters/Julien.ini b/Helpers/Characters/Julien.ini +index cd431e0..0049f44 100644 +--- a/Helpers/Characters/Julien.ini ++++ b/Helpers/Characters/Julien.ini +@@ -1,9 +1,10 @@ +[Sceau du Phenix] + niveau = Ultime + display_name = Sceau du Phénix + description = + self = + others = + _vars = + macro = xhanges +[Sceau du Ninix] + elno=test ++ +