diff --git a/vasl_templates/webapp/data/default-template-pack/extras/kgs/molotov-cocktails.j2 b/vasl_templates/webapp/data/default-template-pack/extras/kgs.j2
similarity index 58%
rename from vasl_templates/webapp/data/default-template-pack/extras/kgs/molotov-cocktails.j2
rename to vasl_templates/webapp/data/default-template-pack/extras/kgs.j2
index 77b8e19..033c822 100644
--- a/vasl_templates/webapp/data/default-template-pack/extras/kgs/molotov-cocktails.j2
+++ b/vasl_templates/webapp/data/default-template-pack/extras/kgs.j2
@@ -1,7 +1,8 @@
-
-
+
+
+
@@ -18,7 +19,34 @@
font-size: 105% ; font-weight: bold ;
">
{# Some versions of Java require tags to have the width and height specified!?! #}
- {%if PLAYER_FLAGS["german"]%} {%endif%}Molotov Cocktails
+ {%if PLAYER_FLAGS["german"]%} {%endif%}{{TYPE}}
+
+{% if TYPE == "Grenade Bundles" %}
+
+
+
+ CC Attack -2 DRM
+
+ |
+
+ ATMM check: dr ≤ 3 (△)
+
+
+ +1
+ | HS/crew
+ |
+ +2
+ | SMC
+ |
+ +1
+ | CX
+ |
+ +1
+ | vs. non-armored vehicle
+ |
+ original 6 = pinned (CCV reduced by 1)
+
+{% elif TYPE == "Molotov Cocktails" %}
|
@@ -51,6 +79,8 @@
|
Kindling Attempt: +2 DRM
+{%endif%}
+
diff --git a/vasl_templates/webapp/data/default-template-pack/extras/kgs/grenade-bundles.j2 b/vasl_templates/webapp/data/default-template-pack/extras/kgs/grenade-bundles.j2
deleted file mode 100644
index c24ce4b..0000000
--- a/vasl_templates/webapp/data/default-template-pack/extras/kgs/grenade-bundles.j2
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {# Some versions of Java require tags to have the width and height specified!?! #}
- {%if PLAYER_FLAGS["german"]%} {%endif%}Grenade Bundles
-
- |
-
- CC Attack -2 DRM
-
- |
-
- ATMM check: dr ≤ 3 (△)
-
-
- +1
- | HS/crew
- |
- +2
- | SMC
- |
- +1
- | CX
- |
- +1
- | vs. non-armored vehicle
- |
- original 6 = pinned (CCV reduced by 1)
-
- |
-
-
-
diff --git a/vasl_templates/webapp/run_server.py b/vasl_templates/webapp/run_server.py
index 943a52d..c5e0d83 100755
--- a/vasl_templates/webapp/run_server.py
+++ b/vasl_templates/webapp/run_server.py
@@ -42,10 +42,7 @@ def main( bind_addr, force_init_delay, flask_debug ):
# monitor extra files for changes
extra_files = []
fspecs = [ "static/", "static/css/", "static/help/", "templates/", "config/" ]
- fspecs.extend( [
- "data/default-template-pack/",
- "data/default-template-pack/extras/", "data/default-template-pack/extras/kgs/"
- ] )
+ fspecs.extend( [ "data/default-template-pack/", "data/default-template-pack/extras/" ] )
fspecs.extend( [ "tests/control_tests_servicer.py", "tests/proto/generated/" ] )
for fspec in fspecs:
fspec = os.path.abspath( os.path.join( os.path.dirname(__file__), fspec ) )
|