diff --git a/helpers/base.py b/helpers/base.py index f47af55..cf6baee 100644 --- a/helpers/base.py +++ b/helpers/base.py @@ -230,11 +230,11 @@ footer="""
Damage: {{damage}}
- {{#ammocurrent}} + {{#ammocurrent}}
Ammunition: {{ammocurrent}}/{{magsize}} | {{ammototal}}
- {{/ammocurrent}} + {{/ammocurrent}} {{/damage}} {{#damagedone}}
@@ -244,7 +244,7 @@ footer="""
Ammunition: {{ammocurrent}}/{{magsize}} | {{ammototal}}
- {{/ammocurrent}} + {{/ammocurrent}} {{/damagedone}} {{#special}}
diff --git a/helpers/customs.py b/helpers/customs.py index 211e25e..e004534 100644 --- a/helpers/customs.py +++ b/helpers/customs.py @@ -58,7 +58,8 @@ class DISTANCE(generator.Node):
- """ + +""" return ret @@ -70,44 +71,7 @@ class MELEE(generator.Node): def content(self): ret=""" -
-
-
- - - - -
-
- - - -
-
- - - - - - - - -
-
""" - return ret - -class CONSOMMABLE(generator.Node): - """CONSUMMABLES""" - - def __init__(self, name,nb): - super(CONSOMMABLE, self).__init__(name,nb) - - def content(self): - return """
+
@@ -135,4 +99,28 @@ class CONSOMMABLE(generator.Node):
- """ +""" + return ret + +class CONSOMMABLE(generator.Node): + """CONSUMMABLES""" + + def __init__(self, name,nb): + super(CONSOMMABLE, self).__init__(name,nb) + + def content(self): + return """
+
+
+ + + + + + +
+
+ +
+
+""" diff --git a/helpers/gen.html b/helpers/gen.html index 6805a88..5afe52e 100644 --- a/helpers/gen.html +++ b/helpers/gen.html @@ -242,7 +242,6 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
- @@ -260,7 +259,6 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
- @@ -2020,6 +2018,7 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
+

Distance

@@ -2072,6 +2071,8 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
+ +

Melée

@@ -2104,6 +2105,7 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
+

Consommable

@@ -2170,7 +2172,6 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su -

{{name}}

@@ -2186,21 +2187,21 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
Damage: {{damage}}
- {{#ammocurrent}} + {{#ammocurrent}}
Ammunition: {{ammocurrent}}/{{magsize}} | {{ammototal}}
- {{/ammocurrent}} + {{/ammocurrent}} {{/damage}} {{#damagedone}}
Damage: {{damagedone}}
- {{#ammocurrent}} + {{#ammocurrent}}
Ammunition: {{ammocurrent}}/{{magsize}} | {{ammototal}}
- {{/ammocurrent}} + {{/ammocurrent}} {{/damagedone}} {{#special}}