From d291508726b2c10914b1fd22691a768c06997e47 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 20 Mar 2021 08:06:20 +0100 Subject: [PATCH] Working Ammory --- helpers/base.py | 11 +++++++---- helpers/gen.html | 39 +++++++++++++++++++++++++++++++++++---- helpers/weapon.html | 5 +++-- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/helpers/base.py b/helpers/base.py index 887e581..f47af55 100644 --- a/helpers/base.py +++ b/helpers/base.py @@ -215,7 +215,6 @@ footer=""" -

{{name}}

@@ -223,25 +222,29 @@ footer="""
{{#attack}}
Attack: {{attack}} sucesses
- {{#mode}} -
Mode: {{mode}} ({{usedammo}})
- {{/mode}} + {{#mode}} +
Mode: {{mode}} ({{usedammo}})
+ {{/mode}} {{/attack}} {{#damage}}
Damage: {{damage}}
+ {{#ammocurrent}}
Ammunition: {{ammocurrent}}/{{magsize}} | {{ammototal}}
+ {{/ammocurrent}} {{/damage}} {{#damagedone}}
Damage: {{damagedone}}
+ {{#ammocurrent}}
Ammunition: {{ammocurrent}}/{{magsize}} | {{ammototal}}
+ {{/ammocurrent}} {{/damagedone}} {{#special}}
diff --git a/helpers/gen.html b/helpers/gen.html index b9c8121..2800c99 100644 --- a/helpers/gen.html +++ b/helpers/gen.html @@ -2027,9 +2027,9 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su - Dégats - + + +
@@ -2052,7 +2052,34 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
-

Melée

+
+
+
+ + + + +
+
+ + + +
+
+ + + + + + + + +
+
@@ -2121,17 +2148,21 @@ on("change:base-Force change:base-Agilite change:general_skilllevel_Endurance_su
Damage: {{damage}}
+ {{#ammocurrent}}
Ammunition: {{ammocurrent}}/{{magsize}} | {{ammototal}}
+ {{/ammocurrent}} {{/damage}} {{#damagedone}}
Damage: {{damagedone}}
+ {{#ammocurrent}}
Ammunition: {{ammocurrent}}/{{magsize}} | {{ammototal}}
+ {{/ammocurrent}} {{/damagedone}} {{#special}}
diff --git a/helpers/weapon.html b/helpers/weapon.html index 8c1e983..851ad5a 100644 --- a/helpers/weapon.html +++ b/helpers/weapon.html @@ -24,8 +24,8 @@ - Dégats + +
@@ -75,5 +75,6 @@ +