From 114db959bd44b364c5a1ec9649f2dce7cde2103f Mon Sep 17 00:00:00 2001 From: Taka Date: Tue, 15 Mar 2022 20:15:33 +1100 Subject: [PATCH] Minor tweaks to the templates. --- .../default-template-pack/atmm-romanian.j2 | 7 +++++-- .../webapp/data/default-template-pack/atmm.j2 | 2 +- .../data/default-template-pack/baz-cpva16.j2 | 10 ++++++---- .../data/default-template-pack/baz-cpva17.j2 | 10 ++++++---- .../webapp/data/default-template-pack/baz.j2 | 14 ++++++++------ .../data/default-template-pack/baz45.j2 | 14 ++++++++------ .../data/default-template-pack/baz50.j2 | 14 ++++++++------ .../extras/kgs/grenade-bundles.j2 | 4 ++-- .../extras/kgs/molotov-cocktails.j2 | 8 ++++---- .../data/default-template-pack/mol-p.j2 | 12 +++++++----- .../webapp/data/default-template-pack/mol.j2 | 6 +++--- .../data/default-template-pack/pf-finnish.j2 | 19 ++++++++++--------- .../default-template-pack/pf-hungarian.j2 | 18 +++++++++--------- .../data/default-template-pack/pf-romanian.j2 | 17 ++++++++++------- .../webapp/data/default-template-pack/pf.j2 | 4 ++-- .../webapp/data/default-template-pack/piat.j2 | 10 ++++++---- .../webapp/data/default-template-pack/psk.j2 | 10 ++++++---- .../webapp/data/default-template-pack/thh.j2 | 6 +++--- vasl_templates/webapp/tests/test_vassal.py | 2 ++ 19 files changed, 106 insertions(+), 81 deletions(-) diff --git a/vasl_templates/webapp/data/default-template-pack/atmm-romanian.j2 b/vasl_templates/webapp/data/default-template-pack/atmm-romanian.j2 index 869799a..c71957f 100644 --- a/vasl_templates/webapp/data/default-template-pack/atmm-romanian.j2 +++ b/vasl_templates/webapp/data/default-template-pack/atmm-romanian.j2 @@ -18,7 +18,11 @@ - ATMM check: dr ≤ {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (△)
+ CC Attack -2 DRM + + + + ATMM check: dr ≤ {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (△)
+1 HS @@ -30,7 +34,6 @@ +1 vs. non-armored vehicle
original 6 = pinned (CCV reduced by 1)
- EXC: CC DRM is -2 diff --git a/vasl_templates/webapp/data/default-template-pack/atmm.j2 b/vasl_templates/webapp/data/default-template-pack/atmm.j2 index 2bb4811..4948037 100644 --- a/vasl_templates/webapp/data/default-template-pack/atmm.j2 +++ b/vasl_templates/webapp/data/default-template-pack/atmm.j2 @@ -18,7 +18,7 @@ - ATMM check: dr ≤ 3 (△)
+ ATMM check: dr ≤ 3 (△)
+ + +
+1 HS/crew diff --git a/vasl_templates/webapp/data/default-template-pack/baz-cpva16.j2 b/vasl_templates/webapp/data/default-template-pack/baz-cpva16.j2 index f181b8e..4b460ce 100644 --- a/vasl_templates/webapp/data/default-template-pack/baz-cpva16.j2 +++ b/vasl_templates/webapp/data/default-template-pack/baz-cpva16.j2 @@ -23,7 +23,7 @@ - @@ -38,14 +38,16 @@
Range TH# + Range TH#
0 10
- - + +
X#: - 11
TK#: 16
8-4 +
  +
X#: + 11
diff --git a/vasl_templates/webapp/data/default-template-pack/baz-cpva17.j2 b/vasl_templates/webapp/data/default-template-pack/baz-cpva17.j2 index 2468b60..0c31572 100644 --- a/vasl_templates/webapp/data/default-template-pack/baz-cpva17.j2 +++ b/vasl_templates/webapp/data/default-template-pack/baz-cpva17.j2 @@ -23,7 +23,7 @@ 		- @@ -40,14 +40,16 @@
Range TH# + Range TH#
0 10
- - + +
X#: - 10
TK#: 22
12-5 +
  +
X#: + 10
diff --git a/vasl_templates/webapp/data/default-template-pack/baz.j2 b/vasl_templates/webapp/data/default-template-pack/baz.j2 index ac51625..7aed095 100644 --- a/vasl_templates/webapp/data/default-template-pack/baz.j2 +++ b/vasl_templates/webapp/data/default-template-pack/baz.j2 @@ -23,7 +23,7 @@ 		-
Range TH# + Range TH# {%if BAZ_TYPE == 45%}
0 11 @@ -53,6 +53,13 @@ + + + + - -
TK#: + {{BAZ_TK}} +
8-{{BAZ_RANGE}} +
 
X#: {{BAZ_BREAKDOWN}} @@ -61,11 +68,6 @@ WP#: {{BAZ_WP}} {%endif%} -
TK#: - {{BAZ_TK}} -
8-{{BAZ_RANGE}}
diff --git a/vasl_templates/webapp/data/default-template-pack/baz45.j2 b/vasl_templates/webapp/data/default-template-pack/baz45.j2 index bcb38fb..fb1dc26 100644 --- a/vasl_templates/webapp/data/default-template-pack/baz45.j2 +++ b/vasl_templates/webapp/data/default-template-pack/baz45.j2 @@ -23,7 +23,7 @@ 		- @@ -40,17 +40,19 @@
Range TH# + Range TH#
0 11
+ + + + - -
TK#: + 16 +
8-5 +
 
X#: 11
WP#: 6 -
TK#: - 16 -
8-5
diff --git a/vasl_templates/webapp/data/default-template-pack/baz50.j2 b/vasl_templates/webapp/data/default-template-pack/baz50.j2 index 9c37e53..3764ae4 100644 --- a/vasl_templates/webapp/data/default-template-pack/baz50.j2 +++ b/vasl_templates/webapp/data/default-template-pack/baz50.j2 @@ -23,7 +23,7 @@ 		- @@ -40,6 +40,13 @@
Range TH# + Range TH#
0 11
+ + + + - -
TK#: + 32 +
12-5 +
 
X#: 11 @@ -48,11 +55,6 @@ WP#: 6 {%endif%} -
TK#: - 32 -
12-5
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 index f404d01..9388b4f 100644 --- 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 @@ -22,11 +22,11 @@
- -2 CC Attack DRM + CC Attack -2 DRM
- ATMM check: dr ≤ 3 (△) + ATMM check: dr ≤ 3 (△)
+1 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/molotov-cocktails.j2 index b6280ab..47ff02b 100644 --- a/vasl_templates/webapp/data/default-template-pack/extras/kgs/molotov-cocktails.j2 +++ b/vasl_templates/webapp/data/default-template-pack/extras/kgs/molotov-cocktails.j2 @@ -22,11 +22,11 @@
- vs. AFV only + Against AFV only.
- MOL check: dr ≤ 3 (△) + MOL check: dr ≤ 3 (△)
+1 @@ -41,7 +41,7 @@
- IFT DR original colored dr: + IFT DR original colored dr:
  • 1 = Flame in target Location
  • 6 = thrower breaks, Flame in their Location @@ -49,7 +49,7 @@
- Kindling Attempt: +2 DRM + Kindling Attempt: +2 DRM
diff --git a/vasl_templates/webapp/data/default-template-pack/mol-p.j2 b/vasl_templates/webapp/data/default-template-pack/mol-p.j2 index 2928774..6f75f7f 100644 --- a/vasl_templates/webapp/data/default-template-pack/mol-p.j2 +++ b/vasl_templates/webapp/data/default-template-pack/mol-p.j2 @@ -23,7 +23,7 @@ 		- @@ -36,21 +36,23 @@
Range TH# + Range TH#
0 10
4 4
-		 + + + + -
4-4 +
 
X#: 12
B#: 11 -
4-4
- IFT DR original colored dr: + IFT DR original colored dr:
  • 1 = Flame in target Location
  • 6 = thrower breaks, Flame in their Location diff --git a/vasl_templates/webapp/data/default-template-pack/mol.j2 b/vasl_templates/webapp/data/default-template-pack/mol.j2 index 32bc694..204a7b4 100644 --- a/vasl_templates/webapp/data/default-template-pack/mol.j2 +++ b/vasl_templates/webapp/data/default-template-pack/mol.j2 @@ -20,7 +20,7 @@
- MOL check: dr ≤ 3 (△)
+ MOL check: dr ≤ 3 (△)
+1 HS/crew @@ -31,12 +31,12 @@
+1 non-AFV target
- IFT DR original colored dr: + IFT DR original colored dr:
  • 1 = Flame in target Location
  • 6 = thrower breaks, Flame in their Location
- Kindling Attempt: +2 DRM + Kindling Attempt: +2 DRM
diff --git a/vasl_templates/webapp/data/default-template-pack/pf-finnish.j2 b/vasl_templates/webapp/data/default-template-pack/pf-finnish.j2 index 3504914..fe20f31 100644 --- a/vasl_templates/webapp/data/default-template-pack/pf-finnish.j2 +++ b/vasl_templates/webapp/data/default-template-pack/pf-finnish.j2 @@ -16,11 +16,14 @@ "> {{INCLUDE:player_flag_large}}Panzerfaust +
+ Elite & 1st Line MMC only. +
- Elite & 1st Line MMC only
- PF check: dr ≤ 2 (△) + PF check: dr ≤ 2 (△) - -
+1 HS/crew @@ -36,19 +39,17 @@ - +
Range TH# + Range TH#
0 10
1 8 +
+ TK#: 31
+ 16-3
-
- TK#: 31
- 16-3 -
diff --git a/vasl_templates/webapp/data/default-template-pack/pf-hungarian.j2 b/vasl_templates/webapp/data/default-template-pack/pf-hungarian.j2 index 07b7dde..8510b19 100644 --- a/vasl_templates/webapp/data/default-template-pack/pf-hungarian.j2 +++ b/vasl_templates/webapp/data/default-template-pack/pf-hungarian.j2 @@ -17,10 +17,12 @@ {{INCLUDE:player_flag_large}}Panzerfaust
+ Non-Crew MMC only. +
- Non-Crew MMC only
- PF check: dr ≤ 2 (△) + PF check: dr ≤ 2 (△) - -
+1 HS/crew @@ -38,21 +40,19 @@ - +
Range TH# + Range TH#
0 10
1 8
2 6 +
+ TK#: 31
+ 16-3
-
- TK#: 31
- 16-3 -
diff --git a/vasl_templates/webapp/data/default-template-pack/pf-romanian.j2 b/vasl_templates/webapp/data/default-template-pack/pf-romanian.j2 index 143c2bd..2a167c9 100644 --- a/vasl_templates/webapp/data/default-template-pack/pf-romanian.j2 +++ b/vasl_templates/webapp/data/default-template-pack/pf-romanian.j2 @@ -16,11 +16,14 @@ "> {{INCLUDE:player_flag_large}}Panzerfaust +
+ Non-Crew MMC only. +
- Non-Crew MMC only
- PF check: dr ≤ {%if SCENARIO_YEAR >= 1945%} 1 {%else%} 2 {%endif%} (△) + PF check: dr ≤ {%if SCENARIO_YEAR >= 1945%} 1 {%else%} 2 {%endif%} (△) -
+1 HS/crew @@ -40,7 +43,7 @@ - @@ -49,14 +52,14 @@ +
Range TH# + Range TH#
0 10
2 6 {%endif%} +
+ TK#: 31
+ 16-3
- TK#: 31
- 16-3 -
diff --git a/vasl_templates/webapp/data/default-template-pack/pf.j2 b/vasl_templates/webapp/data/default-template-pack/pf.j2 index 5abc756..1e742d3 100644 --- a/vasl_templates/webapp/data/default-template-pack/pf.j2 +++ b/vasl_templates/webapp/data/default-template-pack/pf.j2 @@ -46,7 +46,7 @@ 		- @@ -64,7 +64,7 @@ -
Range   TH#   + Range TH#
0 10
+
TK#: 31 (16-3)
diff --git a/vasl_templates/webapp/data/default-template-pack/piat.j2 b/vasl_templates/webapp/data/default-template-pack/piat.j2 index 217c2bf..a7ecbec 100644 --- a/vasl_templates/webapp/data/default-template-pack/piat.j2 +++ b/vasl_templates/webapp/data/default-template-pack/piat.j2 @@ -21,7 +21,7 @@ 		- @@ -34,14 +34,16 @@
Range TH# + Range TH#
0 11
- - + +
B#: - 10
TK#: 15
8-3 +
  +
B#: + 10
diff --git a/vasl_templates/webapp/data/default-template-pack/psk.j2 b/vasl_templates/webapp/data/default-template-pack/psk.j2 index 59c53f0..234e9a7 100644 --- a/vasl_templates/webapp/data/default-template-pack/psk.j2 +++ b/vasl_templates/webapp/data/default-template-pack/psk.j2 @@ -21,7 +21,7 @@ 		- @@ -36,14 +36,16 @@
Range TH# + Range TH#
0 11
- - + +
X#: - 10
TK#: 26
12-4 +
  +
X#: + 10
diff --git a/vasl_templates/webapp/data/default-template-pack/thh.j2 b/vasl_templates/webapp/data/default-template-pack/thh.j2 index a755c33..7c102c9 100644 --- a/vasl_templates/webapp/data/default-template-pack/thh.j2 +++ b/vasl_templates/webapp/data/default-template-pack/thh.j2 @@ -19,7 +19,7 @@
- THH creation: dr ≤ 3 (△) + THH creation: dr ≤ 3 (△) {% if SCENARIO_YEAR %} -
+2 if Conscript @@ -33,8 +33,8 @@
- ATMM check: dr ≤ {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (△) + + ATMM check: dr ≤ {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (△) {%endif%}
diff --git a/vasl_templates/webapp/tests/test_vassal.py b/vasl_templates/webapp/tests/test_vassal.py index 318a6d3..7600ba0 100644 --- a/vasl_templates/webapp/tests/test_vassal.py +++ b/vasl_templates/webapp/tests/test_vassal.py @@ -879,6 +879,8 @@ def _check_vsav_dump( vsav_dump, expected, ignore=None ): snippet_id = mo2.group( 1 ) if snippet_id.startswith( "extras/" ): continue + for tag in [ "b", "em" ]: + label = label.replace( "<{}>".format( tag ), "" ).replace( "".format( tag ), "" ) labels[snippet_id] = label # compare what we extracted from the dump with what's expected