From 4c07d279da42b55a25c8709714682c5b7b4c87d8 Mon Sep 17 00:00:00 2001 From: Taka Date: Sun, 2 May 2021 04:56:33 +1000 Subject: [PATCH] Changed the ANZAC nationality to be based on the British. --- chapter-h/chapter-h-placeholders.zip | Bin 180654 -> 180718 bytes .../tests/fixtures/chapter-h-placeholders.txt | 8 +- .../default-template-pack/nationalities.json | 8 +- .../webapp/data/extensions/bfp-bj-v403.json | 2 +- .../webapp/data/ordnance/british~anzac.json | 1 + .../webapp/data/vehicles/british~anzac.json | 1 + .../flags/{anzac.png => british~anzac.png} | Bin vasl_templates/webapp/static/nat_caps.js | 2 +- .../{anzac => british~anzac}/1940.txt | 2 +- .../{anzac => british~anzac}/1941.txt | 2 +- .../{anzac => british~anzac}/1942.txt | 2 +- .../{anzac => british~anzac}/1943.txt | 2 +- .../{anzac => british~anzac}/1944.txt | 2 +- .../{anzac => british~anzac}/1945.txt | 2 +- .../ordnance/british~anzac/1940.txt | 29 ++++ .../ordnance/british~anzac/1941.txt | 29 ++++ .../ordnance/british~anzac/1942.txt | 29 ++++ .../ordnance/british~anzac/1943.txt | 29 ++++ .../ordnance/british~anzac/1944.txt | 29 ++++ .../ordnance/british~anzac/1945.txt | 29 ++++ .../vo-reports/vehicles/anzac/1940.txt | 8 -- .../vo-reports/vehicles/anzac/1941.txt | 8 -- .../vo-reports/vehicles/anzac/1942.txt | 8 -- .../vo-reports/vehicles/anzac/1943.txt | 8 -- .../vo-reports/vehicles/anzac/1944.txt | 8 -- .../vo-reports/vehicles/anzac/1945.txt | 8 -- .../vehicles/british~anzac/1940.txt | 135 ++++++++++++++++++ .../vehicles/british~anzac/1941.txt | 135 ++++++++++++++++++ .../vehicles/british~anzac/1942.txt | 135 ++++++++++++++++++ .../vehicles/british~anzac/1943.txt | 135 ++++++++++++++++++ .../vehicles/british~anzac/1944.txt | 135 ++++++++++++++++++ .../vehicles/british~anzac/1945.txt | 135 ++++++++++++++++++ vasl_templates/webapp/vo_notes.py | 3 +- 33 files changed, 1004 insertions(+), 65 deletions(-) create mode 100644 vasl_templates/webapp/data/ordnance/british~anzac.json create mode 100644 vasl_templates/webapp/data/vehicles/british~anzac.json rename vasl_templates/webapp/static/images/flags/{anzac.png => british~anzac.png} (100%) rename vasl_templates/webapp/tests/fixtures/nat-caps/{anzac => british~anzac}/1940.txt (87%) rename vasl_templates/webapp/tests/fixtures/nat-caps/{anzac => british~anzac}/1941.txt (87%) rename vasl_templates/webapp/tests/fixtures/nat-caps/{anzac => british~anzac}/1942.txt (87%) rename vasl_templates/webapp/tests/fixtures/nat-caps/{anzac => british~anzac}/1943.txt (87%) rename vasl_templates/webapp/tests/fixtures/nat-caps/{anzac => british~anzac}/1944.txt (87%) rename vasl_templates/webapp/tests/fixtures/nat-caps/{anzac => british~anzac}/1945.txt (87%) create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1940.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1941.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1942.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1943.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1944.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1945.txt delete mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt delete mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt delete mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt delete mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt delete mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt delete mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1940.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1941.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1942.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1943.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1944.txt create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1945.txt diff --git a/chapter-h/chapter-h-placeholders.zip b/chapter-h/chapter-h-placeholders.zip index c47ec0383b2ee0b4082c705576d7011d16254a99..5ef205b8138d8c4645e94867b666315e584d39d7 100644 GIT binary patch literal 180718 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 Ym0A=0nia2EamiVey86fd?_FL0A4JhlT>t<8 literal 180654 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 R9RAs^QTq=4zmFRA{{i#5SZ4qL diff --git a/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt b/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt index d16fe3b..9f87877 100644 --- a/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt +++ b/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt @@ -182,10 +182,6 @@ american/vehicles/w.html american/vehicles/x.html american/vehicles/y.html american/vehicles/z.html -anzac/vehicles/adf-bj/1.png -anzac/vehicles/adf-bj/2.png -anzac/vehicles/adf-bj/3.png -anzac/vehicles/adf-bj/4.png axis-minor/ordnance/44.png axis-minor/ordnance/45.png axis-minor/ordnance/46.png @@ -425,6 +421,10 @@ british/vehicles/w.html british/vehicles/x.html british/vehicles/y.html british/vehicles/z.html +british~anzac/vehicles/adf-bj/1.png +british~anzac/vehicles/adf-bj/2.png +british~anzac/vehicles/adf-bj/3.png +british~anzac/vehicles/adf-bj/4.png bulgarian/ordnance/37.png bulgarian/ordnance/38.png bulgarian/ordnance/39.png diff --git a/vasl_templates/webapp/data/default-template-pack/nationalities.json b/vasl_templates/webapp/data/default-template-pack/nationalities.json index aee1236..bf74dd6 100644 --- a/vasl_templates/webapp/data/default-template-pack/nationalities.json +++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json @@ -31,6 +31,10 @@ "display_name": "Australian", "ob_colors": [ "#f6edda","#e5cea0", "#e5cea0" ] }, +"british~anzac": { + "display_name": "ANZAC", + "ob_colors": [ "#f6edda","#e5cea0", "#e5cea0" ] +}, "french": { "display_name": "French", @@ -122,10 +126,6 @@ "type": "axis-minor" }, -"anzac": { - "display_name": "ANZAC", - "ob_colors": [ "#f6edda","#e5cea0", "#e5cea0" ] -}, "thai": { "display_name": "Thai", "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ] diff --git a/vasl_templates/webapp/data/extensions/bfp-bj-v403.json b/vasl_templates/webapp/data/extensions/bfp-bj-v403.json index 0ceb3ea..d313ef0 100644 --- a/vasl_templates/webapp/data/extensions/bfp-bj-v403.json +++ b/vasl_templates/webapp/data/extensions/bfp-bj-v403.json @@ -788,7 +788,7 @@ }, -"anzac": { +"british~anzac": { "vehicles": [ diff --git a/vasl_templates/webapp/data/ordnance/british~anzac.json b/vasl_templates/webapp/data/ordnance/british~anzac.json new file mode 100644 index 0000000..fe51488 --- /dev/null +++ b/vasl_templates/webapp/data/ordnance/british~anzac.json @@ -0,0 +1 @@ +[] diff --git a/vasl_templates/webapp/data/vehicles/british~anzac.json b/vasl_templates/webapp/data/vehicles/british~anzac.json new file mode 100644 index 0000000..fe51488 --- /dev/null +++ b/vasl_templates/webapp/data/vehicles/british~anzac.json @@ -0,0 +1 @@ +[] diff --git a/vasl_templates/webapp/static/images/flags/anzac.png b/vasl_templates/webapp/static/images/flags/british~anzac.png similarity index 100% rename from vasl_templates/webapp/static/images/flags/anzac.png rename to vasl_templates/webapp/static/images/flags/british~anzac.png diff --git a/vasl_templates/webapp/static/nat_caps.js b/vasl_templates/webapp/static/nat_caps.js index 94fc885..bb2a3f5 100644 --- a/vasl_templates/webapp/static/nat_caps.js +++ b/vasl_templates/webapp/static/nat_caps.js @@ -101,7 +101,7 @@ function get_national_capabilities( nat, is_kfw ) else if ( ["british","british~canadian","british~newzealand"].indexOf( nat ) !== -1 ) nat = "kfw-bcfk" ; } - else if ( nat === "anzac" || nat === "free-french" || nat.substring(0,8) === "british~" ) + else if ( nat === "free-french" || nat.substring(0,8) === "british~" ) nat = "british" ; var nat_caps = gTemplatePack["national-capabilities"][ nat ] ; if ( nat_caps ) diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1940.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1940.txt similarity index 87% rename from vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1940.txt rename to vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1940.txt index 4d2320c..7a7e88d 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1940.txt @@ -1,4 +1,4 @@ -=== anzac (ETO 1940) === +=== british~anzac (ETO 1940) === Smoke grenades HoB: -1 DRM diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1941.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1941.txt similarity index 87% rename from vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1941.txt rename to vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1941.txt index 674346f..2133733 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1941.txt @@ -1,4 +1,4 @@ -=== anzac (ETO 1941) === +=== british~anzac (ETO 1941) === Smoke grenades HoB: -1 DRM diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1942.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1942.txt similarity index 87% rename from vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1942.txt rename to vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1942.txt index 552aaad..0cc277a 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1942.txt @@ -1,4 +1,4 @@ -=== anzac (ETO 1942) === +=== british~anzac (ETO 1942) === Smoke grenades HoB: -1 DRM diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1943.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1943.txt similarity index 87% rename from vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1943.txt rename to vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1943.txt index 1b16a06..f9762e5 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1943.txt @@ -1,4 +1,4 @@ -=== anzac (ETO 1943) === +=== british~anzac (ETO 1943) === Smoke grenades HoB: -1 DRM diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1944.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1944.txt similarity index 87% rename from vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1944.txt rename to vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1944.txt index e2f4884..3eb28d3 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1944.txt @@ -1,4 +1,4 @@ -=== anzac (ETO 1944) === +=== british~anzac (ETO 1944) === SMOKE grenades HoB: -1 DRM diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1945.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1945.txt similarity index 87% rename from vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1945.txt rename to vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1945.txt index 0357844..7457bdb 100644 --- a/vasl_templates/webapp/tests/fixtures/nat-caps/anzac/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/nat-caps/british~anzac/1945.txt @@ -1,4 +1,4 @@ -=== anzac (ETO 1945) === +=== british~anzac (ETO 1945) === SMOKE grenades HoB: -1 DRM diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1940.txt new file mode 100644 index 0000000..c80686a --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1940.txt @@ -0,0 +1,29 @@ +=== ordnance/british~anzac/1940 === + +Name Capabilities (effective) # Notes Comments +--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------ +OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a +OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 2† A†1 D N P QSU | Animal-Packed +OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed +OQF 25mm Hotchkiss 4† B N QSU | En Portee NA +OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee NA +OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee NA +OQF 17/25-Pounder 7 N +OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a +OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed +Canon de 75 mle 1897 s8 s8 10† B N QSU | En Portee NA +OQF 18-Pounder WP7 s8 WP7 s8 11† N P QSU +OQF 25-Pounder Short s8 s8 12 D P QSU | Animal-Packed +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P +OQF 3.7-in. Howitzer H6[3+P]† WP7 s8 WP7 s8 14† D N P QSU | Animal-Packed +OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P +OBL 4.5-in. Gun 16† N +OBL 5.5-in. Gun-Howitzer 16† N P +OBL 6-in. Howitzer 17† N P +OBL 7.2-in. Howitzer Mk I 18† N P No IF | Acquisition NA +OBL 7.2-in. Howitzer Mk VI 19† P RFNM | No IF +OQF 20mm AA 20 n/a +OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA 22† E P +OQF 3.7-in. AA 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1941.txt new file mode 100644 index 0000000..cefe69d --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1941.txt @@ -0,0 +1,29 @@ +=== ordnance/british~anzac/1941 === + +Name Capabilities (effective) # Notes Comments +--------------------------- --------------------------- --------------------------- --- -------------------- ----------------------------------------------------------------------------------------- +OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a +OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed +OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed +OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck) +OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry) +OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }] +OQF 17/25-Pounder 7 N +OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a +OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed +Canon de 75 mle 1897 s8 s8 10† B N QSU | En Portee (3-ton lorry) +OQF 18-Pounder WP7 s8 WP7 s8 11† N P QSU +OQF 25-Pounder Short s8 s8 12 D P QSU | Animal-Packed +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P +OQF 3.7-in. Howitzer H6[3+P]† WP7 s8 WP7 s8 14† D N P QSU | Animal-Packed +OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P +OBL 4.5-in. Gun 16† N +OBL 5.5-in. Gun-Howitzer 16† N P +OBL 6-in. Howitzer 17† N P +OBL 7.2-in. Howitzer Mk I 18† N P No IF | Acquisition NA +OBL 7.2-in. Howitzer Mk VI 19† P RFNM | No IF +OQF 20mm AA 20 n/a +OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA 22† E P +OQF 3.7-in. AA 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1942.txt new file mode 100644 index 0000000..8ec7b86 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1942.txt @@ -0,0 +1,29 @@ +=== ordnance/british~anzac/1942 === + +Name Capabilities (effective) # Notes Comments +--------------------------- --------------------------- --------------------------- --- -------------------- ----------------------------------------------------------------------------------------- +OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a +OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed +OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed +OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck) +OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry) +OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }] +OQF 17/25-Pounder 7 N +OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a +OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed +Canon de 75 mle 1897 s8 s8 10† B N QSU | En Portee (3-ton lorry) +OQF 18-Pounder WP7 s8 WP7 s8 11† N P QSU +OQF 25-Pounder Short s8 s8 12 D P QSU | Animal-Packed +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P +OQF 3.7-in. Howitzer H6[3+P]† WP7 s8 WP7 s8 14† D N P QSU | Animal-Packed +OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P +OBL 4.5-in. Gun 16† N +OBL 5.5-in. Gun-Howitzer 16† N P +OBL 6-in. Howitzer 17† N P +OBL 7.2-in. Howitzer Mk I 18† N P No IF | Acquisition NA +OBL 7.2-in. Howitzer Mk VI 19† P RFNM | No IF +OQF 20mm AA 20 n/a +OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA 22† E P +OQF 3.7-in. AA 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1943.txt new file mode 100644 index 0000000..09f286b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1943.txt @@ -0,0 +1,29 @@ +=== ordnance/british~anzac/1943 === + +Name Capabilities (effective) # Notes Comments +--------------------------- --------------------------- --------------------------- --- -------------------- ----------------------------------------------------------------------------------------- +OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a +OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed +OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed +OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck) +OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry) +OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }] +OQF 17/25-Pounder 7 N +OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a +OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed +Canon de 75 mle 1897 s8 s8 10† B N QSU | En Portee (3-ton lorry) +OQF 18-Pounder WP7 s8 WP7 s8 11† N P QSU +OQF 25-Pounder Short s8 s8 12 D P QSU | Animal-Packed +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P +OQF 3.7-in. Howitzer H6[3+P]† WP7 s8 WP7 s8 14† D N P QSU | Animal-Packed +OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P +OBL 4.5-in. Gun 16† N +OBL 5.5-in. Gun-Howitzer 16† N P +OBL 6-in. Howitzer 17† N P +OBL 7.2-in. Howitzer Mk I 18† N P No IF | Acquisition NA +OBL 7.2-in. Howitzer Mk VI 19† P RFNM | No IF +OQF 20mm AA 20 n/a +OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA 22† E P +OQF 3.7-in. AA 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1944.txt new file mode 100644 index 0000000..f0d0aa5 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1944.txt @@ -0,0 +1,29 @@ +=== ordnance/british~anzac/1944 === + +Name Capabilities (effective) # Notes Comments +--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------ +OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a +OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed +OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed +OQF 25mm Hotchkiss 4† B N QSU | En Portee NA +OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee NA +OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† HE8† 6† B N P QSU | CA restrictions | En Portee NA +OQF 17/25-Pounder 7 N +OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a +OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed +Canon de 75 mle 1897 s8 s8 10† B N QSU | En Portee NA +OQF 18-Pounder WP7 s8 WP7 s8 11† N P QSU +OQF 25-Pounder Short s8 s8 12 D P QSU | Animal-Packed +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P +OQF 3.7-in. Howitzer H6[3+P]† WP7 s8 WP7 s8 14† D N P QSU | Animal-Packed +OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P +OBL 4.5-in. Gun 16† N +OBL 5.5-in. Gun-Howitzer 16† N P +OBL 6-in. Howitzer 17† N P +OBL 7.2-in. Howitzer Mk I 18† N P No IF | Acquisition NA +OBL 7.2-in. Howitzer Mk VI 19† P RFNM | No IF +OQF 20mm AA 20 n/a +OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA 22† E P +OQF 3.7-in. AA 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1945.txt new file mode 100644 index 0000000..6f2584a --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1945.txt @@ -0,0 +1,29 @@ +=== ordnance/british~anzac/1945 === + +Name Capabilities (effective) # Notes Comments +--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------ +OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a +OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed +OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed +OQF 25mm Hotchkiss 4† B N QSU | En Portee NA +OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee NA +OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† D7† HE8† 6† B N P QSU | CA restrictions | En Portee NA +OQF 17/25-Pounder 7 N +OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† D6† HE8† 8† n/a +OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed +Canon de 75 mle 1897 s8 s8 10† B N QSU | En Portee NA +OQF 18-Pounder WP7 s8 WP7 s8 11† N P QSU +OQF 25-Pounder Short s8 s8 12 D P QSU | Animal-Packed +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P +OQF 3.7-in. Howitzer H6[3+P]† WP7 s8 WP7 s8 14† D N P QSU | Animal-Packed +OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P +OBL 4.5-in. Gun 16† N +OBL 5.5-in. Gun-Howitzer 16† N P +OBL 6-in. Howitzer 17† N P +OBL 7.2-in. Howitzer Mk I 18† N P No IF | Acquisition NA +OBL 7.2-in. Howitzer Mk VI 19† P RFNM | No IF +OQF 20mm AA 20 n/a +OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA 22† E P +OQF 3.7-in. AA 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt deleted file mode 100644 index 3c14918..0000000 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt +++ /dev/null @@ -1,8 +0,0 @@ -=== vehicles/anzac/1940 === - -Name Capabilities (effective) # Notes Comments ----------------- -------------- ------------- --- ----------------- -------------------------------------------------------------------------- -Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke -Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt deleted file mode 100644 index b7cad8f..0000000 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt +++ /dev/null @@ -1,8 +0,0 @@ -=== vehicles/anzac/1941 === - -Name Capabilities (effective) # Notes Comments ----------------- -------------- ------------- --- ----------------- -------------------------------------------------------------------------- -Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke -Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt deleted file mode 100644 index e237a7a..0000000 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt +++ /dev/null @@ -1,8 +0,0 @@ -=== vehicles/anzac/1942 === - -Name Capabilities (effective) # Notes Comments ----------------- -------------- ------------- --- ----------------- -------------------------------------------------------------------------- -Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke -Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt deleted file mode 100644 index db4d717..0000000 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt +++ /dev/null @@ -1,8 +0,0 @@ -=== vehicles/anzac/1943 === - -Name Capabilities (effective) # Notes Comments ----------------- -------------- ------------- --- ----------------- -------------------------------------------------------------------------- -Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke -Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt deleted file mode 100644 index 4dad052..0000000 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt +++ /dev/null @@ -1,8 +0,0 @@ -=== vehicles/anzac/1944 === - -Name Capabilities (effective) # Notes Comments ----------------- -------------- ------------- --- ----------------- --------------------------------------------------------------------------- -Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | s9, ∞ HE -Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt deleted file mode 100644 index 3db28a0..0000000 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt +++ /dev/null @@ -1,8 +0,0 @@ -=== vehicles/anzac/1945 === - -Name Capabilities (effective) # Notes Comments ----------------- -------------- ------------- --- ----------------- --------------------------------------------------------------------------- -Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] -Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | s9, ∞ HE -Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1940.txt new file mode 100644 index 0000000..ca2cc18 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1940.txt @@ -0,0 +1,135 @@ +=== vehicles/british~anzac/1940 === + +Name Capabilities (effective) # Notes Comments +------------------------- ---------------------------------------------------- -------------------------- ------ ---------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +Mark VIB sD6 CS 3 sD6 CS 3 1† N P 2 TK DR (12.7 & MG) +Mark VIC sD6 CS 3 sD6 CS 3 1† n/a +Tetrarch sD6 CS 3 sD6 CS 3 2† n/a +Tetrarch CS HE9†[1] s†[1] sD6 CS 3 HE9†[1] s†[1] sD6 CS 3 2† S†1 ∞ Smoke +Stuart I(a) sD5 CS 4 sD5 CS 4 3† A N P American ESB+ | Red TH# +Stuart III(a) C6[4+]†[1] HE[4+] sD5 CS 4 sD5 CS 4 3† A C†1 G N P American ESB+ | Red TH# +Stuart V(a) C6†[1] sD5 CS 4 C6†[1] sD5 CS 4 4† A C†1 G American ESB+ | Red TH# +Locust(a) C6† sD6 CS 3 C6† sD6 CS 3 5 A C† American ESB+ | Red TH# +A9 sD6 CS 5[brewup] sD6 CS 5[brewup] 6† K†1 N BMG: Scrounge NA +A9 CS s†[2] sD6 CS 5[brewup] s†[2] sD6 CS 5[brewup] 6† K†1 N S†2 ∞ Smoke | BMG: Scrounge NA +A10 Mk IA sD6 CS 5[brewup]† sD6 CS 5[brewup]† 7† B†1 K†2 N +A10 Mk IA CS s†[2] sD6 CS 5[brewup]† s†[2] sD6 CS 5[brewup]† 7† K†1 N S†2 ∞ Smoke +A13 Mk I sD6 CS 4[brewup] sD6 CS 4[brewup] 8 K† +A13 Mk II sD6 CS 4[brewup] sD6 CS 4[brewup] 8† B†1 K†2 N +A13 Mk II CS s†[2] sD6 CS 4[brewup] s†[2] sD6 CS 4[brewup] 8† K†1 N S†2 ∞ Smoke +Crusader I sM8 CS 5[brewup] sM8 CS 5[brewup] 9† K†1 N BMG: extended port-side +Crusader I CS HE9 s†[2] sM8 CS 5[brewup] HE9 s†[2] sM8 CS 5[brewup] 9† K†1 N S†2 BMG: extended port-side | ∞ Smoke +Crusader II sM8 CS 4[brewup] sM8 CS 4[brewup] 9† K†1 N +Crusader II CS HE9 s†[2] sM8 CS 4[brewup] HE9 s†[2] sM8 CS 4[brewup] 9† K†1 N S†2 ∞ Smoke +Crusader III HE7[F3+]†[1] sD7 sM8†[2] CS 3[brewup] sD7 sM8†[2] CS 3[brewup] 10† N Y†1 Z†2 +Grant(a) C5[4+]†[1] HE[4+] s8† sM8 CS 6 s8† sM8 CS 6 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | American ESB+ | Red TH# +Lee(a) C5[4+]†[1] HE[4+] s8† sD6 CS 7 s8† sD6 CS 7 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | AAMG: BU Fire & CC ok [EXC: vs Aerial NA] | American ESB+ | Red TH# +Sherman II(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 12† A G K†2 N R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman III(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 13† A G K†2 N R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman V(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 14† A G K†2 P R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman IIA(a) A4[4]5[5] s5[5] sM8 CS 6 sM8 CS 6 15† A G K†1 American ESB+ | Red TH# +Sherman IIC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ | Red TH# +Sherman VC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ | Red TH# +Sherman IB(a) H9 WP9 s7 sM8 CS 6 H9 WP9 s7 sM8 CS 6 17† A K†1 American ESB+ | Red TH# +Centaur IV H6 s9 sD7 sM8† CS 5 H6 s9 sD7 sM8† CS 5 18 S Z† +Cromwell IV WP6 s8 sD7 sM8†[1] CS 5 WP6 s8 sD7 sM8†[1] CS 5 19† Z†1 +Cromwell VI H6 s9 sD7 sM8†[1] CS 5 H6 s9 sD7 sM8†[1] CS 5 20† S Z†1 +Cromwell VII WP6 s8 sD7 sM8† CS 6 WP6 s8 sD7 sM8† CS 6 19† Z†1 +Cromwell VIII H6 s9 sD7 sM8†[1] CS 6 H6 s9 sD7 sM8†[1] CS 6 20† S Z†1 +Challenger D5[S4]6[5]†[1] HE7 sD7 sM8†[2] CS 6 HE7 sD7 sM8†[2] CS 6 21† J†1 Z†2 +Comet sD7 sM8† CS 6 sD7 sM8† CS 6 22 Z† +Sherman Dozer(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 23† A G K†2 P R†1 Front-hull hit: +2 TH DRM (unless level < firer) | American ESB+ | Red TH# | Multiple Hits +Sherman Crab(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 24† A G K†2 P R†1 Mine & Wire Clearance | American ESB+ | Red TH# | Multiple Hits +Matilda I ® sD5 CS 2 ® sD5 CS 2 25† B†1 MA: 12.7 | Road Rate NA +Matilda II sD6 CS 5 sD6 CS 5 26† B†1 K†2 N P Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS HE9†[2] s†[2] sD6 CS 5 HE9†[2] s†[2] sD6 CS 5 26† K†1 N P S†2 Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke +Valentine II sM8 CS 4 sM8 CS 4 27† N +Valentine V sM8 CS 4 sM8 CS 4 28† K†1 NT +Valentine VIII HE7 sD6 CS 4 HE7 sD6 CS 4 29 NT +Valentine XI WP6 s8 sD8 CS 4 WP6 s8 sD8 CS 4 30 n/a +Churchill I HE9†[2] s†[2] sD5[4] sM8†[1] CS 7 HE9†[2] s†[2] sM8†[1] CS 7 31† NT S†2 Z†1 CC 40 MA: T | 76 SA: NT (bow-mounted) | 76 SA: +1 DRM vs Moving/Motion | Smoke & HE: 76 SA only | 76 SA: ∞ Smoke | Steep climbs +Churchill IV D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] CS 7 sM8†[3] CS 7 32† J†2 N Y†1 Z†3 CC Steep climbs +Churchill V H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 33† S Z†1 CC Steep climbs +Churchill VI WP6[J4+]†[1] s8 sD7 sM8†[2] CS 7 s8 sD7 sM8†[2] CS 7 34† W†1 Z†2 CC Steep climbs +Churchill VII WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 35† Z†1 CC Steep climbs +Churchill VIII H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 35† S Z†1 CC Steep climbs +Valentine Bridgelayer sD7 CS 2 sD7 CS 2 36† M P Inherent Crew | Stun = Recall, CE & Fire NA +Churchill Bridgelayer sD7 CS 2 sD7 CS 2 36† M CC Inherent Crew | VBM NA (with bridge) | Stun = Recall, CE & Fire NA | Steep climbs +Churchill AVRE sD7 sM8†[1] CS 8 sD7 sM8†[1] CS 8 37† Z†1 CC Crew: Assault Engineers & Sappers | Inherent 4× DC (Throw NA, Fanaticism) | MA: Area Target Type & TH Case L NA | TH# = 12 - 2 × range | TCA alignment | Mine Clearance | Wall/Hedge Breaches | No IF | Steep climbs +Churchill Crocodile WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 38† Z†1 CC Trailer (AF 6) | Steep climbs +Deacon HE7[F3+]†[2] CS 5 CS 5 39† L†1 N Y†2 Starboard VCA NA | TCA restrictions | Turret Rear unarmored | CE: +3 Front/Side Turret | Reverse MP ×3 +Wolverine(a) A5[S4]6[5]†[1] HE7 s5[5] CS 7 HE7 CS 7 40† A J†1 American ESB+ | Red TH# +Achilles(a) D6[S4]7[5]†[1] HE7 CS 7 HE7 CS 7 40† A J†1 American ESB+ | Red TH# +Archer D6[4]7[5]†[1] HE7 sD7 CS 5 HE7 sD7 CS 5 41† J†1 MA: Rear VCA only | No Bnd FF, Motion Fire +Daimler sD4[4+]† CS 2 CS 2 42† M N P Stun = Recall, CE & Fire NA +Lynx sD5 CS 2 sD5 CS 2 42† L†1 M P Reverse MP ×3 | Stun = Recall, CE & Fire NA +Humber sD4[4+]† CS 2 CS 2 43† L†1 M P BB†2 MA: CE, Rider, vs Aerial NA | Reverse MP ×3 | Stun = Recall, CE & Fire NA | Pas: 1 SMC or 1PP SW +Stuart Recce CS 5 CS 5 44† A D NT P MA: VCA only | 2 TK DR (MG) | As fully-tracked | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Humber III LRC sD5 CS 3 sD5 CS 3 45† L†1 N P Q†2 Reverse MP ×3 +Otter LRC sD5 CS 3 sD5 CS 3 45† L†1 P Q†2 Reverse MP ×3 +Morris CS9 sD5 CS 4 sD5 CS 4 46† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Rolls Royce sD5 CS 3 sD5 CS 3 47† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Marmon-Herrington II ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIv CS 4 CS 4 49† L†1 N AA†2 MA & CMG: AA ok | Red TH# | Reverse MP ×3 +Marmon-Herrington III MFF CS 4 CS 4 48† L†1 P Q†2 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK +Marmon-Herrington III ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIIv CS 4 CS 4 49† K†2 L†1 N T†2 AAMG: Rear VCA only | Red TH# | Reverse MP ×3 +Humber II sD6 CS 3 sD6 CS 3 50† L†1 N Reverse MP ×3 +Humber III sD6 CS 4 sD6 CS 4 50† K†2 L†1 N P Reverse MP ×3 +Humber IV C6[4+]†[2] sD6 CS 3 sD6 CS 3 51† A C†2 L†1 P Red TH# | Reverse MP ×3 +Daimler sD6 CS 3 sD6 CS 3 52† K†1 N P +AEC I sM8 CS 3 sM8 CS 3 53† N X†1 Reverse MP ×4 +AEC II D6[J4]7[5]†[2] HE7[3]8[4+]†[1] sM8 CS 4 sM8 CS 4 53 J†2 X† Y†1 Reverse MP ×4 +AEC III WP6 s8 sM8 CS 4 WP6 s8 sM8 CS 4 53 X† Reverse MP ×4 +Staghound I(a) C6[4+]†[3] sM8 CS 5 sM8 CS 5 54† A C†3 G K†2 X†1 American ESB+ | Red TH# | Reverse MP ×4 +Staghound II(a) s9 sD6 CS 4 s9 sD6 CS 4 54† A K†3 S†2 X†1 ∞ Smoke | American ESB+ | Red TH# | Reverse MP ×4 +Bishop s8 CS 5 s8 CS 5 55† K†1 N P +1 TH DRM vs Moving/Motion | No IF +Priest(a) H6 WP7 s8 CS 7 H6 WP7 s8 CS 7 56† A N P American ESB+ | Red TH# +Sexton(a) s8 CS 7 s8 CS 7 57† A K†1 American ESB+ | Red TH# +M3 GMC(a) WP7[J4+]†[1] s8 CS 4 s8 CS 4 58† A NT W†1 CE: +3 Front | American ESB+ | Red TH# +Mk VI AA CS 2 CS 2 59† N O†1 AA†2 BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Crusader AA sD7 CS 4[brewup] sD7 CS 4[brewup] 60† AA†1 2 TK DR | CE Fire NA | MA & CMG: AA ok +M17 MGMC(a) CS 4 CS 4 61† A F† AA†1 CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok +Humber AA CS 2 CS 2 62† L†1 N O†2 AA†3 Reverse MP ×3 | BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Staghound AA(a) CS 3 CS 3 62† A F† X†1 AA†2 2 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | Reverse MP ×4 | MA & CMG: AA ok +M5(a) cs 5†[1] cs 5†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M9(a) cs 4†[1] cs 4†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M5A1(a) cs 5† cs 5† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +M9A1(a) cs 4† cs 4† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +Carrier A sD5[4+]†[1] CS 3 CS 3 64† N P U†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading | Towing NA +Carrier B sD5[4+]†[2] CS 3 CS 3 64† N P Q†1 U†2 Always CE | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA +Carrier C sD5[4+]†[1] CS 3 CS 3 64† N P U†1 Always CE | MA: Removal NA | Combined (un)hooking/(un)loading | Towing NA +Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†1 U†2 Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA +Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†2 BB†1 Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW +Carrier, 2-in. MTR IR[2+]† s7 CS 3 s7 CS 3 66† N P U†1 Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA +Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†1 N P U BB†2 Always CE | Inherent dm 76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW +Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#) +IP Carrier Mk IIA CS 4 CS 4 70† N P V X†1 As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier Mk IIB CS 4 CS 4 70† N P Q†2 V X†1 BU Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier AOV CS 4 CS 4 70† P Q†1 V X† BATR SA: BU/HD Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier, 3-in. MTR IR WP7 s8 CS 5[brewup]† IR WP7 s8 CS 5[brewup]† 71†[2] E†3 H† P V X†1 BB†4 MA: Rear VCA only | BMG: HD Fire OK | Inherent Infantry Crew | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 | Pas: 1 SMC or 1PP SW +Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 72† K†1 U Always CE | sD: 2 hexes +Badger(a) CS 3 CS 3 72† A K†1 M American ESB+ | Stun = Recall, CE & Fire NA +Buffalo Mk II(a) sD5† CS 6 sD5† CS 6 73† A D AA†1 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Red TH# | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | MA & CMG: AA ok +Buffalo Mk IV(a) sD5† CS 6 sD5† CS 6 73† A D E†1 AA†2 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Red TH# | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | BMG: HD Fire OK | MA & CMG: AA ok +Sherman III DD(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 74† A G K†2 R†1 American ESB+ | Red TH# | Multiple Hits +DUKW(a) cs 7†[1] cs 7†[1] 75† A D I†1 P American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | Inherent Crew if armed (with CS#) +Terrapin Mk I cs 7 cs 7 76† D (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok +2pdr Portee CS 4†[1] CS 4†[1] 77† H†1 N P MA: NA VCA | Inherent Infantry Crew +Morris C9/B CS 4 CS 4 78† P AA†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok +Loyd Carrier cs 5 cs 5 79† N P Not a Carrier +Quad FAT cs 5[brewup]† cs 5[brewup]† 80† N P Burning Wreck: -1 DRM +15-cwt Truck cs 5 cs 5 81† N P +30-cwt Lorry cs 6 cs 6 82† N P +3-Ton Lorry cs 7 cs 7 83† N P +¼-Ton Jeep(a) cs 2†[1] cs 2†[1] 84† A I†1 N P American ESB+ | Bog assistance | Inherent Crew if armed (with CS#) +¾-Ton Truck(a) cs 4 cs 4 85 A N American ESB+ +1½-Ton Truck(a) cs 6 cs 6 85 A N American ESB+ +2½-Ton Truck(a) cs 7 cs 7 85 A N American ESB+ +7½-Ton Truck(a) cs 7 cs 7 85† A N American ESB+ +Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke +Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1941.txt new file mode 100644 index 0000000..4c74a2b --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1941.txt @@ -0,0 +1,135 @@ +=== vehicles/british~anzac/1941 === + +Name Capabilities (effective) # Notes Comments +------------------------- ---------------------------------------------------- -------------------------- ------ ---------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +Mark VIB sD6 CS 3 sD6 CS 3 1† N P 2 TK DR (12.7 & MG) +Mark VIC sD6 CS 3 sD6 CS 3 1† n/a +Tetrarch sD6 CS 3 sD6 CS 3 2† n/a +Tetrarch CS HE9†[1] s†[1] sD6 CS 3 HE9†[1] s†[1] sD6 CS 3 2† S†1 ∞ Smoke +Stuart I(a) sD5 CS 4 sD5 CS 4 3† A N P American ESB+ | Red TH# +Stuart III(a) C6[4+]†[1] HE[4+] sD5 CS 4 sD5 CS 4 3† A C†1 G N P American ESB+ | Red TH# +Stuart V(a) C6†[1] sD5 CS 4 C6†[1] sD5 CS 4 4† A C†1 G American ESB+ | Red TH# +Locust(a) C6† sD6 CS 3 C6† sD6 CS 3 5 A C† American ESB+ | Red TH# +A9 sD6 CS 5[brewup] sD6 CS 5[brewup] 6† K†1 N BMG: Scrounge NA +A9 CS s†[2] sD6 CS 5[brewup] s†[2] sD6 CS 5[brewup] 6† K†1 N S†2 ∞ Smoke | BMG: Scrounge NA +A10 Mk IA sD6 CS 5[brewup]† sD6 CS 5[brewup]† 7† B†1 K†2 N +A10 Mk IA CS s†[2] sD6 CS 5[brewup]† s†[2] sD6 CS 5[brewup]† 7† K†1 N S†2 ∞ Smoke +A13 Mk I sD6 CS 4[brewup] sD6 CS 4[brewup] 8 K† +A13 Mk II sD6 CS 4[brewup] sD6 CS 4[brewup] 8† B†1 K†2 N +A13 Mk II CS s†[2] sD6 CS 4[brewup] s†[2] sD6 CS 4[brewup] 8† K†1 N S†2 ∞ Smoke +Crusader I sM8 CS 5[brewup] sM8 CS 5[brewup] 9† K†1 N BMG: extended port-side +Crusader I CS HE9 s†[2] sM8 CS 5[brewup] HE9 s†[2] sM8 CS 5[brewup] 9† K†1 N S†2 BMG: extended port-side | ∞ Smoke +Crusader II sM8 CS 4[brewup] sM8 CS 4[brewup] 9† K†1 N +Crusader II CS HE9 s†[2] sM8 CS 4[brewup] HE9 s†[2] sM8 CS 4[brewup] 9† K†1 N S†2 ∞ Smoke +Crusader III HE7[F3+]†[1] sD7 sM8†[2] CS 3[brewup] sD7 sM8†[2] CS 3[brewup] 10† N Y†1 Z†2 +Grant(a) C5[4+]†[1] HE[4+] s8† sM8 CS 6 s8† sM8 CS 6 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | American ESB+ | Red TH# +Lee(a) C5[4+]†[1] HE[4+] s8† sD6 CS 7 s8† sD6 CS 7 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | AAMG: BU Fire & CC ok [EXC: vs Aerial NA] | American ESB+ | Red TH# +Sherman II(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 12† A G K†2 N R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman III(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 13† A G K†2 N R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman V(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 14† A G K†2 P R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman IIA(a) A4[4]5[5] s5[5] sM8 CS 6 sM8 CS 6 15† A G K†1 American ESB+ | Red TH# +Sherman IIC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ | Red TH# +Sherman VC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ | Red TH# +Sherman IB(a) H9 WP9 s7 sM8 CS 6 H9 WP9 s7 sM8 CS 6 17† A K†1 American ESB+ | Red TH# +Centaur IV H6 s9 sD7 sM8† CS 5 H6 s9 sD7 sM8† CS 5 18 S Z† +Cromwell IV WP6 s8 sD7 sM8†[1] CS 5 WP6 s8 sD7 sM8†[1] CS 5 19† Z†1 +Cromwell VI H6 s9 sD7 sM8†[1] CS 5 H6 s9 sD7 sM8†[1] CS 5 20† S Z†1 +Cromwell VII WP6 s8 sD7 sM8† CS 6 WP6 s8 sD7 sM8† CS 6 19† Z†1 +Cromwell VIII H6 s9 sD7 sM8†[1] CS 6 H6 s9 sD7 sM8†[1] CS 6 20† S Z†1 +Challenger D5[S4]6[5]†[1] HE7 sD7 sM8†[2] CS 6 HE7 sD7 sM8†[2] CS 6 21† J†1 Z†2 +Comet sD7 sM8† CS 6 sD7 sM8† CS 6 22 Z† +Sherman Dozer(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 23† A G K†2 P R†1 Front-hull hit: +2 TH DRM (unless level < firer) | American ESB+ | Red TH# | Multiple Hits +Sherman Crab(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 24† A G K†2 P R†1 Mine & Wire Clearance | American ESB+ | Red TH# | Multiple Hits +Matilda I ® sD5 CS 2 ® sD5 CS 2 25† B†1 MA: 12.7 | Road Rate NA +Matilda II sD6 CS 5 sD6 CS 5 26† B†1 K†2 N P Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS HE9†[2] s†[2] sD6 CS 5 HE9†[2] s†[2] sD6 CS 5 26† K†1 N P S†2 Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke +Valentine II sM8 CS 4 sM8 CS 4 27† N +Valentine V sM8 CS 4 sM8 CS 4 28† K†1 NT +Valentine VIII HE7 sD6 CS 4 HE7 sD6 CS 4 29 NT +Valentine XI WP6 s8 sD8 CS 4 WP6 s8 sD8 CS 4 30 n/a +Churchill I HE9†[2] s†[2] sD5[4] sM8†[1] CS 7 HE9†[2] s†[2] sM8†[1] CS 7 31† NT S†2 Z†1 CC 40 MA: T | 76 SA: NT (bow-mounted) | 76 SA: +1 DRM vs Moving/Motion | Smoke & HE: 76 SA only | 76 SA: ∞ Smoke | Steep climbs +Churchill IV D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] CS 7 sM8†[3] CS 7 32† J†2 N Y†1 Z†3 CC Steep climbs +Churchill V H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 33† S Z†1 CC Steep climbs +Churchill VI WP6[J4+]†[1] s8 sD7 sM8†[2] CS 7 s8 sD7 sM8†[2] CS 7 34† W†1 Z†2 CC Steep climbs +Churchill VII WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 35† Z†1 CC Steep climbs +Churchill VIII H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 35† S Z†1 CC Steep climbs +Valentine Bridgelayer sD7 CS 2 sD7 CS 2 36† M P Inherent Crew | Stun = Recall, CE & Fire NA +Churchill Bridgelayer sD7 CS 2 sD7 CS 2 36† M CC Inherent Crew | VBM NA (with bridge) | Stun = Recall, CE & Fire NA | Steep climbs +Churchill AVRE sD7 sM8†[1] CS 8 sD7 sM8†[1] CS 8 37† Z†1 CC Crew: Assault Engineers & Sappers | Inherent 4× DC (Throw NA, Fanaticism) | MA: Area Target Type & TH Case L NA | TH# = 12 - 2 × range | TCA alignment | Mine Clearance | Wall/Hedge Breaches | No IF | Steep climbs +Churchill Crocodile WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 38† Z†1 CC Trailer (AF 6) | Steep climbs +Deacon HE7[F3+]†[2] CS 5 CS 5 39† L†1 N Y†2 Starboard VCA NA | TCA restrictions | Turret Rear unarmored | CE: +3 Front/Side Turret | Reverse MP ×3 +Wolverine(a) A5[S4]6[5]†[1] HE7 s5[5] CS 7 HE7 CS 7 40† A J†1 American ESB+ | Red TH# +Achilles(a) D6[S4]7[5]†[1] HE7 CS 7 HE7 CS 7 40† A J†1 American ESB+ | Red TH# +Archer D6[4]7[5]†[1] HE7 sD7 CS 5 HE7 sD7 CS 5 41† J†1 MA: Rear VCA only | No Bnd FF, Motion Fire +Daimler sD4[4+]† CS 2 CS 2 42† M N P Stun = Recall, CE & Fire NA +Lynx sD5 CS 2 sD5 CS 2 42† L†1 M P Reverse MP ×3 | Stun = Recall, CE & Fire NA +Humber sD4[4+]† CS 2 CS 2 43† L†1 M P BB†2 MA: CE, Rider, vs Aerial NA | Reverse MP ×3 | Stun = Recall, CE & Fire NA | Pas: 1 SMC or 1PP SW +Stuart Recce CS 5 CS 5 44† A D NT P MA: VCA only | 2 TK DR (MG) | As fully-tracked | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Humber III LRC sD5 CS 3 sD5 CS 3 45† L†1 N P Q†2 Reverse MP ×3 +Otter LRC sD5 CS 3 sD5 CS 3 45† L†1 P Q†2 Reverse MP ×3 +Morris CS9 sD5 CS 4 sD5 CS 4 46† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Rolls Royce sD5 CS 3 sD5 CS 3 47† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Marmon-Herrington II ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIv CS 4 CS 4 49† L†1 N AA†2 MA & CMG: AA ok | Red TH# | Reverse MP ×3 +Marmon-Herrington III MFF CS 4 CS 4 48† L†1 P Q†2 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK +Marmon-Herrington III ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIIv CS 4 CS 4 49† K†2 L†1 N T†2 AAMG: Rear VCA only | Red TH# | Reverse MP ×3 +Humber II sD6 CS 3 sD6 CS 3 50† L†1 N Reverse MP ×3 +Humber III sD6 CS 4 sD6 CS 4 50† K†2 L†1 N P Reverse MP ×3 +Humber IV C6[4+]†[2] sD6 CS 3 sD6 CS 3 51† A C†2 L†1 P Red TH# | Reverse MP ×3 +Daimler sD6 CS 3 sD6 CS 3 52† K†1 N P +AEC I sM8 CS 3 sM8 CS 3 53† N X†1 Reverse MP ×4 +AEC II D6[J4]7[5]†[2] HE7[3]8[4+]†[1] sM8 CS 4 sM8 CS 4 53 J†2 X† Y†1 Reverse MP ×4 +AEC III WP6 s8 sM8 CS 4 WP6 s8 sM8 CS 4 53 X† Reverse MP ×4 +Staghound I(a) C6[4+]†[3] sM8 CS 5 sM8 CS 5 54† A C†3 G K†2 X†1 American ESB+ | Red TH# | Reverse MP ×4 +Staghound II(a) s9 sD6 CS 4 s9 sD6 CS 4 54† A K†3 S†2 X†1 ∞ Smoke | American ESB+ | Red TH# | Reverse MP ×4 +Bishop s8 CS 5 s8 CS 5 55† K†1 N P +1 TH DRM vs Moving/Motion | No IF +Priest(a) H6 WP7 s8 CS 7 H6 WP7 s8 CS 7 56† A N P American ESB+ | Red TH# +Sexton(a) s8 CS 7 s8 CS 7 57† A K†1 American ESB+ | Red TH# +M3 GMC(a) WP7[J4+]†[1] s8 CS 4 s8 CS 4 58† A NT W†1 CE: +3 Front | American ESB+ | Red TH# +Mk VI AA CS 2 CS 2 59† N O†1 AA†2 BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Crusader AA sD7 CS 4[brewup] sD7 CS 4[brewup] 60† AA†1 2 TK DR | CE Fire NA | MA & CMG: AA ok +M17 MGMC(a) CS 4 CS 4 61† A F† AA†1 CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok +Humber AA CS 2 CS 2 62† L†1 N O†2 AA†3 Reverse MP ×3 | BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Staghound AA(a) CS 3 CS 3 62† A F† X†1 AA†2 2 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | Reverse MP ×4 | MA & CMG: AA ok +M5(a) cs 5†[1] cs 5†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M9(a) cs 4†[1] cs 4†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M5A1(a) cs 5† cs 5† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +M9A1(a) cs 4† cs 4† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +Carrier A sD5[4+]†[1] CS 3 CS 3 64† N P U†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading | Towing NA +Carrier B sD5[4+]†[2] CS 3 CS 3 64† N P Q†1 U†2 Always CE | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA +Carrier C sD5[4+]†[1] CS 3 CS 3 64† N P U†1 Always CE | MA: Removal NA | Combined (un)hooking/(un)loading | Towing NA +Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†1 U†2 Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA +Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†2 BB†1 Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW +Carrier, 2-in. MTR IR[2+]† s7 CS 3 s7 CS 3 66† N P U†1 Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA +Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†1 N P U BB†2 Always CE | Inherent dm 76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW +Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#) +IP Carrier Mk IIA CS 4 CS 4 70† N P V X†1 As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier Mk IIB CS 4 CS 4 70† N P Q†2 V X†1 BU Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier AOV CS 4 CS 4 70† P Q†1 V X† BATR SA: BU/HD Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier, 3-in. MTR IR WP7 s8 CS 5[brewup]† IR WP7 s8 CS 5[brewup]† 71†[2] E†3 H† P V X†1 BB†4 MA: Rear VCA only | BMG: HD Fire OK | Inherent Infantry Crew | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 | Pas: 1 SMC or 1PP SW +Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 72† K†1 U Always CE | sD: 2 hexes +Badger(a) CS 3 CS 3 72† A K†1 M American ESB+ | Stun = Recall, CE & Fire NA +Buffalo Mk II(a) sD5† CS 6 sD5† CS 6 73† A D AA†1 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Red TH# | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | MA & CMG: AA ok +Buffalo Mk IV(a) sD5† CS 6 sD5† CS 6 73† A D E†1 AA†2 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Red TH# | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | BMG: HD Fire OK | MA & CMG: AA ok +Sherman III DD(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 74† A G K†2 R†1 American ESB+ | Red TH# | Multiple Hits +DUKW(a) cs 7†[1] cs 7†[1] 75† A D I†1 P American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | Inherent Crew if armed (with CS#) +Terrapin Mk I cs 7 cs 7 76† D (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok +2pdr Portee CS 4†[1] CS 4†[1] 77† H†1 N P MA: NA VCA | Inherent Infantry Crew +Morris C9/B CS 4 CS 4 78† P AA†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok +Loyd Carrier cs 5 cs 5 79† N P Not a Carrier +Quad FAT cs 5[brewup]† cs 5[brewup]† 80† N P Burning Wreck: -1 DRM +15-cwt Truck cs 5 cs 5 81† N P +30-cwt Lorry cs 6 cs 6 82† N P +3-Ton Lorry cs 7 cs 7 83† N P +¼-Ton Jeep(a) cs 2†[1] cs 2†[1] 84† A I†1 N P American ESB+ | Bog assistance | Inherent Crew if armed (with CS#) +¾-Ton Truck(a) cs 4 cs 4 85 A N American ESB+ +1½-Ton Truck(a) cs 6 cs 6 85 A N American ESB+ +2½-Ton Truck(a) cs 7 cs 7 85 A N American ESB+ +7½-Ton Truck(a) cs 7 cs 7 85† A N American ESB+ +Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke +Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1942.txt new file mode 100644 index 0000000..67f1369 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1942.txt @@ -0,0 +1,135 @@ +=== vehicles/british~anzac/1942 === + +Name Capabilities (effective) # Notes Comments +------------------------- ---------------------------------------------------- -------------------------- ------ ---------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +Mark VIB sD6 CS 3 sD6 CS 3 1† N P 2 TK DR (12.7 & MG) +Mark VIC sD6 CS 3 sD6 CS 3 1† n/a +Tetrarch sD6 CS 3 sD6 CS 3 2† n/a +Tetrarch CS HE9†[1] s†[1] sD6 CS 3 HE9†[1] s†[1] sD6 CS 3 2† S†1 ∞ Smoke +Stuart I(a) sD5 CS 4 sD5 CS 4 3† A N P American ESB+ | Red TH# +Stuart III(a) C6[4+]†[1] HE[4+] sD5 CS 4 sD5 CS 4 3† A C†1 G N P American ESB+ | Red TH# +Stuart V(a) C6†[1] sD5 CS 4 C6†[1] sD5 CS 4 4† A C†1 G American ESB+ | Red TH# +Locust(a) C6† sD6 CS 3 C6† sD6 CS 3 5 A C† American ESB+ | Red TH# +A9 sD6 CS 5[brewup] sD6 CS 5[brewup] 6† K†1 N BMG: Scrounge NA +A9 CS s†[2] sD6 CS 5[brewup] s†[2] sD6 CS 5[brewup] 6† K†1 N S†2 ∞ Smoke | BMG: Scrounge NA +A10 Mk IA sD6 CS 5[brewup]† sD6 CS 5[brewup]† 7† B†1 K†2 N +A10 Mk IA CS s†[2] sD6 CS 5[brewup]† s†[2] sD6 CS 5[brewup]† 7† K†1 N S†2 ∞ Smoke +A13 Mk I sD6 CS 4[brewup] sD6 CS 4[brewup] 8 K† +A13 Mk II sD6 CS 4[brewup] sD6 CS 4[brewup] 8† B†1 K†2 N +A13 Mk II CS s†[2] sD6 CS 4[brewup] s†[2] sD6 CS 4[brewup] 8† K†1 N S†2 ∞ Smoke +Crusader I sM8 CS 5[brewup] sM8 CS 5[brewup] 9† K†1 N BMG: extended port-side +Crusader I CS HE9 s†[2] sM8 CS 5[brewup] HE9 s†[2] sM8 CS 5[brewup] 9† K†1 N S†2 BMG: extended port-side | ∞ Smoke +Crusader II sM8 CS 4[brewup] sM8 CS 4[brewup] 9† K†1 N +Crusader II CS HE9 s†[2] sM8 CS 4[brewup] HE9 s†[2] sM8 CS 4[brewup] 9† K†1 N S†2 ∞ Smoke +Crusader III HE7[F3+]†[1] sD7 sM8†[2] CS 3[brewup] sD7 sM8†[2] CS 3[brewup] 10† N Y†1 Z†2 +Grant(a) C5[4+]†[1] HE[4+] s8† sM8 CS 6 s8† sM8 CS 6 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | American ESB+ | Red TH# +Lee(a) C5[4+]†[1] HE[4+] s8† sD6 CS 7 s8† sD6 CS 7 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | AAMG: BU Fire & CC ok [EXC: vs Aerial NA] | American ESB+ | Red TH# +Sherman II(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 12† A G K†2 N R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman III(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 13† A G K†2 N R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman V(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 14† A G K†2 P R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman IIA(a) A4[4]5[5] s5[5] sM8 CS 6 sM8 CS 6 15† A G K†1 American ESB+ | Red TH# +Sherman IIC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ | Red TH# +Sherman VC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ | Red TH# +Sherman IB(a) H9 WP9 s7 sM8 CS 6 H9 WP9 s7 sM8 CS 6 17† A K†1 American ESB+ | Red TH# +Centaur IV H6 s9 sD7 sM8† CS 5 H6 s9 sD7 sM8† CS 5 18 S Z† +Cromwell IV WP6 s8 sD7 sM8†[1] CS 5 WP6 s8 sD7 sM8†[1] CS 5 19† Z†1 +Cromwell VI H6 s9 sD7 sM8†[1] CS 5 H6 s9 sD7 sM8†[1] CS 5 20† S Z†1 +Cromwell VII WP6 s8 sD7 sM8† CS 6 WP6 s8 sD7 sM8† CS 6 19† Z†1 +Cromwell VIII H6 s9 sD7 sM8†[1] CS 6 H6 s9 sD7 sM8†[1] CS 6 20† S Z†1 +Challenger D5[S4]6[5]†[1] HE7 sD7 sM8†[2] CS 6 HE7 sD7 sM8†[2] CS 6 21† J†1 Z†2 +Comet sD7 sM8† CS 6 sD7 sM8† CS 6 22 Z† +Sherman Dozer(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 23† A G K†2 P R†1 Front-hull hit: +2 TH DRM (unless level < firer) | American ESB+ | Red TH# | Multiple Hits +Sherman Crab(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 24† A G K†2 P R†1 Mine & Wire Clearance | American ESB+ | Red TH# | Multiple Hits +Matilda I ® sD5 CS 2 ® sD5 CS 2 25† B†1 MA: 12.7 | Road Rate NA +Matilda II sD6 CS 5 sD6 CS 5 26† B†1 K†2 N P Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS HE9†[2] s†[2] sD6 CS 5 HE9†[2] s†[2] sD6 CS 5 26† K†1 N P S†2 Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke +Valentine II sM8 CS 4 sM8 CS 4 27† N +Valentine V sM8 CS 4 sM8 CS 4 28† K†1 NT +Valentine VIII HE7 sD6 CS 4 HE7 sD6 CS 4 29 NT +Valentine XI WP6 s8 sD8 CS 4 WP6 s8 sD8 CS 4 30 n/a +Churchill I HE9†[2] s†[2] sD5[4] sM8†[1] CS 7 HE9†[2] s†[2] sM8†[1] CS 7 31† NT S†2 Z†1 CC 40 MA: T | 76 SA: NT (bow-mounted) | 76 SA: +1 DRM vs Moving/Motion | Smoke & HE: 76 SA only | 76 SA: ∞ Smoke | Steep climbs +Churchill IV D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] CS 7 sM8†[3] CS 7 32† J†2 N Y†1 Z†3 CC Steep climbs +Churchill V H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 33† S Z†1 CC Steep climbs +Churchill VI WP6[J4+]†[1] s8 sD7 sM8†[2] CS 7 s8 sD7 sM8†[2] CS 7 34† W†1 Z†2 CC Steep climbs +Churchill VII WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 35† Z†1 CC Steep climbs +Churchill VIII H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 35† S Z†1 CC Steep climbs +Valentine Bridgelayer sD7 CS 2 sD7 CS 2 36† M P Inherent Crew | Stun = Recall, CE & Fire NA +Churchill Bridgelayer sD7 CS 2 sD7 CS 2 36† M CC Inherent Crew | VBM NA (with bridge) | Stun = Recall, CE & Fire NA | Steep climbs +Churchill AVRE sD7 sM8†[1] CS 8 sD7 sM8†[1] CS 8 37† Z†1 CC Crew: Assault Engineers & Sappers | Inherent 4× DC (Throw NA, Fanaticism) | MA: Area Target Type & TH Case L NA | TH# = 12 - 2 × range | TCA alignment | Mine Clearance | Wall/Hedge Breaches | No IF | Steep climbs +Churchill Crocodile WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 38† Z†1 CC Trailer (AF 6) | Steep climbs +Deacon HE7[F3+]†[2] CS 5 CS 5 39† L†1 N Y†2 Starboard VCA NA | TCA restrictions | Turret Rear unarmored | CE: +3 Front/Side Turret | Reverse MP ×3 +Wolverine(a) A5[S4]6[5]†[1] HE7 s5[5] CS 7 HE7 CS 7 40† A J†1 American ESB+ | Red TH# +Achilles(a) D6[S4]7[5]†[1] HE7 CS 7 HE7 CS 7 40† A J†1 American ESB+ | Red TH# +Archer D6[4]7[5]†[1] HE7 sD7 CS 5 HE7 sD7 CS 5 41† J†1 MA: Rear VCA only | No Bnd FF, Motion Fire +Daimler sD4[4+]† CS 2 CS 2 42† M N P Stun = Recall, CE & Fire NA +Lynx sD5 CS 2 sD5 CS 2 42† L†1 M P Reverse MP ×3 | Stun = Recall, CE & Fire NA +Humber sD4[4+]† CS 2 CS 2 43† L†1 M P BB†2 MA: CE, Rider, vs Aerial NA | Reverse MP ×3 | Stun = Recall, CE & Fire NA | Pas: 1 SMC or 1PP SW +Stuart Recce CS 5 CS 5 44† A D NT P MA: VCA only | 2 TK DR (MG) | As fully-tracked | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Humber III LRC sD5 CS 3 sD5 CS 3 45† L†1 N P Q†2 Reverse MP ×3 +Otter LRC sD5 CS 3 sD5 CS 3 45† L†1 P Q†2 Reverse MP ×3 +Morris CS9 sD5 CS 4 sD5 CS 4 46† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Rolls Royce sD5 CS 3 sD5 CS 3 47† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Marmon-Herrington II ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIv CS 4 CS 4 49† L†1 N AA†2 MA & CMG: AA ok | Red TH# | Reverse MP ×3 +Marmon-Herrington III MFF CS 4 CS 4 48† L†1 P Q†2 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK +Marmon-Herrington III ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIIv CS 4 CS 4 49† K†2 L†1 N T†2 AAMG: Rear VCA only | Red TH# | Reverse MP ×3 +Humber II sD6 CS 3 sD6 CS 3 50† L†1 N Reverse MP ×3 +Humber III sD6 CS 4 sD6 CS 4 50† K†2 L†1 N P Reverse MP ×3 +Humber IV C6[4+]†[2] sD6 CS 3 sD6 CS 3 51† A C†2 L†1 P Red TH# | Reverse MP ×3 +Daimler sD6 CS 3 sD6 CS 3 52† K†1 N P +AEC I sM8 CS 3 sM8 CS 3 53† N X†1 Reverse MP ×4 +AEC II D6[J4]7[5]†[2] HE7[3]8[4+]†[1] sM8 CS 4 sM8 CS 4 53 J†2 X† Y†1 Reverse MP ×4 +AEC III WP6 s8 sM8 CS 4 WP6 s8 sM8 CS 4 53 X† Reverse MP ×4 +Staghound I(a) C6[4+]†[3] sM8 CS 5 sM8 CS 5 54† A C†3 G K†2 X†1 American ESB+ | Red TH# | Reverse MP ×4 +Staghound II(a) s9 sD6 CS 4 s9 sD6 CS 4 54† A K†3 S†2 X†1 ∞ Smoke | American ESB+ | Red TH# | Reverse MP ×4 +Bishop s8 CS 5 s8 CS 5 55† K†1 N P +1 TH DRM vs Moving/Motion | No IF +Priest(a) H6 WP7 s8 CS 7 H6 WP7 s8 CS 7 56† A N P American ESB+ | Red TH# +Sexton(a) s8 CS 7 s8 CS 7 57† A K†1 American ESB+ | Red TH# +M3 GMC(a) WP7[J4+]†[1] s8 CS 4 s8 CS 4 58† A NT W†1 CE: +3 Front | American ESB+ | Red TH# +Mk VI AA CS 2 CS 2 59† N O†1 AA†2 BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Crusader AA sD7 CS 4[brewup] sD7 CS 4[brewup] 60† AA†1 2 TK DR | CE Fire NA | MA & CMG: AA ok +M17 MGMC(a) CS 4 CS 4 61† A F† AA†1 CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok +Humber AA CS 2 CS 2 62† L†1 N O†2 AA†3 Reverse MP ×3 | BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Staghound AA(a) CS 3 CS 3 62† A F† X†1 AA†2 2 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | Reverse MP ×4 | MA & CMG: AA ok +M5(a) cs 5†[1] cs 5†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M9(a) cs 4†[1] cs 4†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M5A1(a) cs 5† cs 5† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +M9A1(a) cs 4† cs 4† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +Carrier A sD5[4+]†[1] CS 3 CS 3 64† N P U†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading | Towing NA +Carrier B sD5[4+]†[2] CS 3 CS 3 64† N P Q†1 U†2 Always CE | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA +Carrier C sD5[4+]†[1] CS 3 CS 3 64† N P U†1 Always CE | MA: Removal NA | Combined (un)hooking/(un)loading | Towing NA +Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†1 U†2 Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA +Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†2 BB†1 Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW +Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†1 Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA +Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†1 N P U BB†2 Always CE | Inherent dm 76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW +Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#) +IP Carrier Mk IIA CS 4 CS 4 70† N P V X†1 As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier Mk IIB CS 4 CS 4 70† N P Q†2 V X†1 BU Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier AOV CS 4 CS 4 70† P Q†1 V X† BATR SA: BU/HD Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier, 3-in. MTR IR WP7 s8 CS 5[brewup]† IR WP7 s8 CS 5[brewup]† 71†[2] E†3 H† P V X†1 BB†4 MA: Rear VCA only | BMG: HD Fire OK | Inherent Infantry Crew | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 | Pas: 1 SMC or 1PP SW +Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 72† K†1 U Always CE | sD: 2 hexes +Badger(a) CS 3 CS 3 72† A K†1 M American ESB+ | Stun = Recall, CE & Fire NA +Buffalo Mk II(a) sD5† CS 6 sD5† CS 6 73† A D AA†1 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Red TH# | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | MA & CMG: AA ok +Buffalo Mk IV(a) sD5† CS 6 sD5† CS 6 73† A D E†1 AA†2 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Red TH# | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | BMG: HD Fire OK | MA & CMG: AA ok +Sherman III DD(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 74† A G K†2 R†1 American ESB+ | Red TH# | Multiple Hits +DUKW(a) cs 7†[1] cs 7†[1] 75† A D I†1 P American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | Inherent Crew if armed (with CS#) +Terrapin Mk I cs 7 cs 7 76† D (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok +2pdr Portee CS 4†[1] CS 4†[1] 77† H†1 N P MA: NA VCA | Inherent Infantry Crew +Morris C9/B CS 4 CS 4 78† P AA†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok +Loyd Carrier cs 5 cs 5 79† N P Not a Carrier +Quad FAT cs 5[brewup]† cs 5[brewup]† 80† N P Burning Wreck: -1 DRM +15-cwt Truck cs 5 cs 5 81† N P +30-cwt Lorry cs 6 cs 6 82† N P +3-Ton Lorry cs 7 cs 7 83† N P +¼-Ton Jeep(a) cs 2†[1] cs 2†[1] 84† A I†1 N P American ESB+ | Bog assistance | Inherent Crew if armed (with CS#) +¾-Ton Truck(a) cs 4 cs 4 85 A N American ESB+ +1½-Ton Truck(a) cs 6 cs 6 85 A N American ESB+ +2½-Ton Truck(a) cs 7 cs 7 85 A N American ESB+ +7½-Ton Truck(a) cs 7 cs 7 85† A N American ESB+ +Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke +Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1943.txt new file mode 100644 index 0000000..26f1cf8 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1943.txt @@ -0,0 +1,135 @@ +=== vehicles/british~anzac/1943 === + +Name Capabilities (effective) # Notes Comments +------------------------- ---------------------------------------------------- -------------------------- ------ ---------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +Mark VIB sD6 CS 3 sD6 CS 3 1† N P 2 TK DR (12.7 & MG) +Mark VIC sD6 CS 3 sD6 CS 3 1† n/a +Tetrarch sD6 CS 3 sD6 CS 3 2† n/a +Tetrarch CS HE9†[1] s†[1] sD6 CS 3 HE9†[1] s†[1] sD6 CS 3 2† S†1 ∞ Smoke +Stuart I(a) sD5 CS 4 sD5 CS 4 3† A N P American ESB+ | Red TH# +Stuart III(a) C6[4+]†[1] HE[4+] sD5 CS 4 sD5 CS 4 3† A C†1 G N P American ESB+ | Red TH# +Stuart V(a) C6†[1] sD5 CS 4 C6†[1] sD5 CS 4 4† A C†1 G American ESB+ | Red TH# +Locust(a) C6† sD6 CS 3 C6† sD6 CS 3 5 A C† American ESB+ | Red TH# +A9 sD6 CS 5[brewup] sD6 CS 5[brewup] 6† K†1 N BMG: Scrounge NA +A9 CS s†[2] sD6 CS 5[brewup] s†[2] sD6 CS 5[brewup] 6† K†1 N S†2 ∞ Smoke | BMG: Scrounge NA +A10 Mk IA sD6 CS 5[brewup]† sD6 CS 5[brewup]† 7† B†1 K†2 N +A10 Mk IA CS s†[2] sD6 CS 5[brewup]† s†[2] sD6 CS 5[brewup]† 7† K†1 N S†2 ∞ Smoke +A13 Mk I sD6 CS 4[brewup] sD6 CS 4[brewup] 8 K† +A13 Mk II sD6 CS 4[brewup] sD6 CS 4[brewup] 8† B†1 K†2 N +A13 Mk II CS s†[2] sD6 CS 4[brewup] s†[2] sD6 CS 4[brewup] 8† K†1 N S†2 ∞ Smoke +Crusader I sM8 CS 5[brewup] sM8 CS 5[brewup] 9† K†1 N BMG: extended port-side +Crusader I CS HE9 s†[2] sM8 CS 5[brewup] HE9 s†[2] sM8 CS 5[brewup] 9† K†1 N S†2 BMG: extended port-side | ∞ Smoke +Crusader II sM8 CS 4[brewup] sM8 CS 4[brewup] 9† K†1 N +Crusader II CS HE9 s†[2] sM8 CS 4[brewup] HE9 s†[2] sM8 CS 4[brewup] 9† K†1 N S†2 ∞ Smoke +Crusader III HE7[F3+]†[1] sD7 sM8†[2] CS 3[brewup] sD7 sM8†[2] CS 3[brewup] 10† N Y†1 Z†2 +Grant(a) C5[4+]†[1] HE[4+] s8† sM8 CS 6 s8† sM8 CS 6 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | American ESB+ | Red TH# +Lee(a) C5[4+]†[1] HE[4+] s8† sD6 CS 7 s8† sD6 CS 7 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | AAMG: BU Fire & CC ok [EXC: vs Aerial NA] | American ESB+ | Red TH# +Sherman II(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 12† A G K†2 N R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman III(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 13† A G K†2 N R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman V(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 14† A G K†2 P R†1 W†3 American ESB+ | Red TH# | Multiple Hits +Sherman IIA(a) A4[4]5[5] s5[5] sM8 CS 6 sM8 CS 6 15† A G K†1 American ESB+ | Red TH# +Sherman IIC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ | Red TH# +Sherman VC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ | Red TH# +Sherman IB(a) H9 WP9 s7 sM8 CS 6 H9 WP9 s7 sM8 CS 6 17† A K†1 American ESB+ | Red TH# +Centaur IV H6 s9 sD7 sM8† CS 5 H6 s9 sD7 sM8† CS 5 18 S Z† +Cromwell IV WP6 s8 sD7 sM8†[1] CS 5 WP6 s8 sD7 sM8†[1] CS 5 19† Z†1 +Cromwell VI H6 s9 sD7 sM8†[1] CS 5 H6 s9 sD7 sM8†[1] CS 5 20† S Z†1 +Cromwell VII WP6 s8 sD7 sM8† CS 6 WP6 s8 sD7 sM8† CS 6 19† Z†1 +Cromwell VIII H6 s9 sD7 sM8†[1] CS 6 H6 s9 sD7 sM8†[1] CS 6 20† S Z†1 +Challenger D5[S4]6[5]†[1] HE7 sD7 sM8†[2] CS 6 HE7 sD7 sM8†[2] CS 6 21† J†1 Z†2 +Comet sD7 sM8† CS 6 sD7 sM8† CS 6 22 Z† +Sherman Dozer(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 23† A G K†2 P R†1 Front-hull hit: +2 TH DRM (unless level < firer) | American ESB+ | Red TH# | Multiple Hits +Sherman Crab(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 24† A G K†2 P R†1 Mine & Wire Clearance | American ESB+ | Red TH# | Multiple Hits +Matilda I ® sD5 CS 2 ® sD5 CS 2 25† B†1 MA: 12.7 | Road Rate NA +Matilda II sD6 CS 5 sD6 CS 5 26† B†1 K†2 N P Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS HE9†[2] s†[2] sD6 CS 5 HE9†[2] s†[2] sD6 CS 5 26† K†1 N P S†2 Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke +Valentine II sM8 CS 4 sM8 CS 4 27† N +Valentine V sM8 CS 4 sM8 CS 4 28† K†1 NT +Valentine VIII HE7 sD6 CS 4 HE7 sD6 CS 4 29 NT +Valentine XI WP6 s8 sD8 CS 4 WP6 s8 sD8 CS 4 30 n/a +Churchill I HE9†[2] s†[2] sD5[4] sM8†[1] CS 7 HE9†[2] s†[2] sM8†[1] CS 7 31† NT S†2 Z†1 CC 40 MA: T | 76 SA: NT (bow-mounted) | 76 SA: +1 DRM vs Moving/Motion | Smoke & HE: 76 SA only | 76 SA: ∞ Smoke | Steep climbs +Churchill IV D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] CS 7 sM8†[3] CS 7 32† J†2 N Y†1 Z†3 CC Steep climbs +Churchill V H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 33† S Z†1 CC Steep climbs +Churchill VI WP6[J4+]†[1] s8 sD7 sM8†[2] CS 7 s8 sD7 sM8†[2] CS 7 34† W†1 Z†2 CC Steep climbs +Churchill VII WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 35† Z†1 CC Steep climbs +Churchill VIII H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 35† S Z†1 CC Steep climbs +Valentine Bridgelayer sD7 CS 2 sD7 CS 2 36† M P Inherent Crew | Stun = Recall, CE & Fire NA +Churchill Bridgelayer sD7 CS 2 sD7 CS 2 36† M CC Inherent Crew | VBM NA (with bridge) | Stun = Recall, CE & Fire NA | Steep climbs +Churchill AVRE sD7 sM8†[1] CS 8 sD7 sM8†[1] CS 8 37† Z†1 CC Crew: Assault Engineers & Sappers | Inherent 4× DC (Throw NA, Fanaticism) | MA: Area Target Type & TH Case L NA | TH# = 12 - 2 × range | TCA alignment | Mine Clearance | Wall/Hedge Breaches | No IF | Steep climbs +Churchill Crocodile WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 38† Z†1 CC Trailer (AF 6) | Steep climbs +Deacon HE7[F3+]†[2] CS 5 CS 5 39† L†1 N Y†2 Starboard VCA NA | TCA restrictions | Turret Rear unarmored | CE: +3 Front/Side Turret | Reverse MP ×3 +Wolverine(a) A5[S4]6[5]†[1] HE7 s5[5] CS 7 HE7 CS 7 40† A J†1 American ESB+ | Red TH# +Achilles(a) D6[S4]7[5]†[1] HE7 CS 7 HE7 CS 7 40† A J†1 American ESB+ | Red TH# +Archer D6[4]7[5]†[1] HE7 sD7 CS 5 HE7 sD7 CS 5 41† J†1 MA: Rear VCA only | No Bnd FF, Motion Fire +Daimler sD4[4+]† CS 2 CS 2 42† M N P Stun = Recall, CE & Fire NA +Lynx sD5 CS 2 sD5 CS 2 42† L†1 M P Reverse MP ×3 | Stun = Recall, CE & Fire NA +Humber sD4[4+]† CS 2 CS 2 43† L†1 M P BB†2 MA: CE, Rider, vs Aerial NA | Reverse MP ×3 | Stun = Recall, CE & Fire NA | Pas: 1 SMC or 1PP SW +Stuart Recce CS 5 CS 5 44† A D NT P MA: VCA only | 2 TK DR (MG) | As fully-tracked | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Humber III LRC sD5 CS 3 sD5 CS 3 45† L†1 N P Q†2 Reverse MP ×3 +Otter LRC sD5 CS 3 sD5 CS 3 45† L†1 P Q†2 Reverse MP ×3 +Morris CS9 sD5 CS 4 sD5 CS 4 46† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Rolls Royce sD5 CS 3 sD5 CS 3 47† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Marmon-Herrington II ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIv CS 4 CS 4 49† L†1 N AA†2 MA & CMG: AA ok | Red TH# | Reverse MP ×3 +Marmon-Herrington III MFF CS 4 CS 4 48† L†1 P Q†2 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK +Marmon-Herrington III ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIIv CS 4 CS 4 49† K†2 L†1 N T†2 AAMG: Rear VCA only | Red TH# | Reverse MP ×3 +Humber II sD6 CS 3 sD6 CS 3 50† L†1 N Reverse MP ×3 +Humber III sD6 CS 4 sD6 CS 4 50† K†2 L†1 N P Reverse MP ×3 +Humber IV C6[4+]†[2] sD6 CS 3 sD6 CS 3 51† A C†2 L†1 P Red TH# | Reverse MP ×3 +Daimler sD6 CS 3 sD6 CS 3 52† K†1 N P +AEC I sM8 CS 3 sM8 CS 3 53† N X†1 Reverse MP ×4 +AEC II D6[J4]7[5]†[2] HE7[3]8[4+]†[1] sM8 CS 4 HE7†[1] sM8 CS 4 53 J†2 X† Y†1 Reverse MP ×4 +AEC III WP6 s8 sM8 CS 4 WP6 s8 sM8 CS 4 53 X† Reverse MP ×4 +Staghound I(a) C6[4+]†[3] sM8 CS 5 sM8 CS 5 54† A C†3 G K†2 X†1 American ESB+ | Red TH# | Reverse MP ×4 +Staghound II(a) s9 sD6 CS 4 s9 sD6 CS 4 54† A K†3 S†2 X†1 ∞ Smoke | American ESB+ | Red TH# | Reverse MP ×4 +Bishop s8 CS 5 s8 CS 5 55† K†1 N P +1 TH DRM vs Moving/Motion | No IF +Priest(a) H6 WP7 s8 CS 7 H6 WP7 s8 CS 7 56† A N P American ESB+ | Red TH# +Sexton(a) s8 CS 7 s8 CS 7 57† A K†1 American ESB+ | Red TH# +M3 GMC(a) WP7[J4+]†[1] s8 CS 4 s8 CS 4 58† A NT W†1 CE: +3 Front | American ESB+ | Red TH# +Mk VI AA CS 2 CS 2 59† N O†1 AA†2 BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Crusader AA sD7 CS 4[brewup] sD7 CS 4[brewup] 60† AA†1 2 TK DR | CE Fire NA | MA & CMG: AA ok +M17 MGMC(a) CS 4 CS 4 61† A F† AA†1 CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok +Humber AA CS 2 CS 2 62† L†1 N O†2 AA†3 Reverse MP ×3 | BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Staghound AA(a) CS 3 CS 3 62† A F† X†1 AA†2 2 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | Reverse MP ×4 | MA & CMG: AA ok +M5(a) cs 5†[1] cs 5†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M9(a) cs 4†[1] cs 4†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M5A1(a) cs 5† cs 5† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +M9A1(a) cs 4† cs 4† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +Carrier A sD5[4+]†[1] CS 3 CS 3 64† N P U†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading | Towing NA +Carrier B sD5[4+]†[2] CS 3 CS 3 64† N P Q†1 U†2 Always CE | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA +Carrier C sD5[4+]†[1] CS 3 CS 3 64† N P U†1 Always CE | MA: Removal NA | Combined (un)hooking/(un)loading | Towing NA +Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†1 U†2 Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA +Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†2 BB†1 Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW +Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†1 Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA +Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†1 N P U BB†2 Always CE | Inherent dm 76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW +Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#) +IP Carrier Mk IIA CS 4 CS 4 70† N P V X†1 As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier Mk IIB CS 4 CS 4 70† N P Q†2 V X†1 BU Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier AOV CS 4 CS 4 70† P Q†1 V X† BATR SA: BU/HD Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier, 3-in. MTR IR WP7 s8 CS 5[brewup]† IR WP7 s8 CS 5[brewup]† 71†[2] E†3 H† P V X†1 BB†4 MA: Rear VCA only | BMG: HD Fire OK | Inherent Infantry Crew | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 | Pas: 1 SMC or 1PP SW +Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 72† K†1 U Always CE | sD: 2 hexes +Badger(a) CS 3 CS 3 72† A K†1 M American ESB+ | Stun = Recall, CE & Fire NA +Buffalo Mk II(a) sD5† CS 6 sD5† CS 6 73† A D AA†1 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Red TH# | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | MA & CMG: AA ok +Buffalo Mk IV(a) sD5† CS 6 sD5† CS 6 73† A D E†1 AA†2 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Red TH# | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | BMG: HD Fire OK | MA & CMG: AA ok +Sherman III DD(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 74† A G K†2 R†1 American ESB+ | Red TH# | Multiple Hits +DUKW(a) cs 7†[1] cs 7†[1] 75† A D I†1 P American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | Inherent Crew if armed (with CS#) +Terrapin Mk I cs 7 cs 7 76† D (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok +2pdr Portee CS 4†[1] CS 4†[1] 77† H†1 N P MA: NA VCA | Inherent Infantry Crew +Morris C9/B CS 4 CS 4 78† P AA†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok +Loyd Carrier cs 5 cs 5 79† N P Not a Carrier +Quad FAT cs 5[brewup]† cs 5[brewup]† 80† N P Burning Wreck: -1 DRM +15-cwt Truck cs 5 cs 5 81† N P +30-cwt Lorry cs 6 cs 6 82† N P +3-Ton Lorry cs 7 cs 7 83† N P +¼-Ton Jeep(a) cs 2†[1] cs 2†[1] 84† A I†1 N P American ESB+ | Bog assistance | Inherent Crew if armed (with CS#) +¾-Ton Truck(a) cs 4 cs 4 85 A N American ESB+ +1½-Ton Truck(a) cs 6 cs 6 85 A N American ESB+ +2½-Ton Truck(a) cs 7 cs 7 85 A N American ESB+ +7½-Ton Truck(a) cs 7 cs 7 85† A N American ESB+ +Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | ∞ Smoke +Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1944.txt new file mode 100644 index 0000000..8a7ddd2 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1944.txt @@ -0,0 +1,135 @@ +=== vehicles/british~anzac/1944 === + +Name Capabilities (effective) # Notes Comments +------------------------- ---------------------------------------------------- -------------------------------- ------ ---------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +Mark VIB sD6 CS 3 sD6 CS 3 1† N P 2 TK DR (12.7 & MG) +Mark VIC sD6 CS 3 sD6 CS 3 1† n/a +Tetrarch sD6 CS 3 sD6 CS 3 2† n/a +Tetrarch CS HE9†[1] s†[1] sD6 CS 3 HE9†[1] s†[1] sD6 CS 3 2† S†1 s9, ∞ HE +Stuart I(a) sD5 CS 4 sD5 CS 4 3† A N P American ESB+ +Stuart III(a) C6[4+]†[1] HE[4+] sD5 CS 4 C6†[1] HE sD5 CS 4 3† A C†1 G N P American ESB+ +Stuart V(a) C6†[1] sD5 CS 4 C6†[1] sD5 CS 4 4† A C†1 G American ESB+ +Locust(a) C6† sD6 CS 3 C6† sD6 CS 3 5 A C† American ESB+ +A9 sD6 CS 5[brewup] sD6 CS 5[brewup] 6† K†1 N BMG: Scrounge NA +A9 CS s†[2] sD6 CS 5[brewup] s†[2] sD6 CS 5[brewup] 6† K†1 N S†2 ∞ Smoke | BMG: Scrounge NA +A10 Mk IA sD6 CS 5[brewup]† sD6 CS 5[brewup]† 7† B†1 K†2 N +A10 Mk IA CS s†[2] sD6 CS 5[brewup]† s†[2] sD6 CS 5[brewup]† 7† K†1 N S†2 ∞ Smoke +A13 Mk I sD6 CS 4[brewup] sD6 CS 4[brewup] 8 K† +A13 Mk II sD6 CS 4[brewup] sD6 CS 4[brewup] 8† B†1 K†2 N +A13 Mk II CS s†[2] sD6 CS 4[brewup] s†[2] sD6 CS 4[brewup] 8† K†1 N S†2 ∞ Smoke +Crusader I sM8 CS 5[brewup] sM8 CS 5[brewup] 9† K†1 N BMG: extended port-side +Crusader I CS HE9 s†[2] sM8 CS 5[brewup] HE9 s†[2] sM8 CS 5[brewup] 9† K†1 N S†2 BMG: extended port-side | ∞ Smoke +Crusader II sM8 CS 4[brewup] sM8 CS 4[brewup] 9† K†1 N +Crusader II CS HE9 s†[2] sM8 CS 4[brewup] HE9 s†[2] sM8 CS 4[brewup] 9† K†1 N S†2 ∞ Smoke +Crusader III HE7[F3+]†[1] sD7 sM8†[2] CS 3[brewup] HE7†[1] sD7 sM8†[2] CS 3[brewup] 10† N Y†1 Z†2 +Grant(a) C5[4+]†[1] HE[4+] s8† sM8 CS 6 C5†[1] HE s8† sM8 CS 6 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | American ESB+ +Lee(a) C5[4+]†[1] HE[4+] s8† sD6 CS 7 C5†[1] HE s8† sD6 CS 7 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | AAMG: BU Fire & CC ok [EXC: vs Aerial NA] | American ESB+ +Sherman II(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 12† A G K†2 N R†1 W†3 American ESB+ | Multiple Hits +Sherman III(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 13† A G K†2 N R†1 W†3 American ESB+ | Multiple Hits +Sherman V(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] s8 sD6 CS 5[brewup] 14† A G K†2 P R†1 W†3 American ESB+ | Multiple Hits +Sherman IIA(a) A4[4]5[5] s5[5] sM8 CS 6 A4 sM8 CS 6 15† A G K†1 American ESB+ +Sherman IIC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ +Sherman VC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ +Sherman IB(a) H9 WP9 s7 sM8 CS 6 H9 WP9 s7 sM8 CS 6 17† A K†1 American ESB+ +Centaur IV H6 s9 sD7 sM8† CS 5 H6 s9 sD7 sM8† CS 5 18 S Z† +Cromwell IV WP6 s8 sD7 sM8†[1] CS 5 WP6 s8 sD7 sM8†[1] CS 5 19† Z†1 +Cromwell VI H6 s9 sD7 sM8†[1] CS 5 H6 s9 sD7 sM8†[1] CS 5 20† S Z†1 +Cromwell VII WP6 s8 sD7 sM8† CS 6 WP6 s8 sD7 sM8† CS 6 19† Z†1 +Cromwell VIII H6 s9 sD7 sM8†[1] CS 6 H6 s9 sD7 sM8†[1] CS 6 20† S Z†1 +Challenger D5[S4]6[5]†[1] HE7 sD7 sM8†[2] CS 6 HE7 sD7 sM8†[2] CS 6 21† J†1 Z†2 +Comet sD7 sM8† CS 6 sD7 sM8† CS 6 22 Z† +Sherman Dozer(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 23† A G K†2 P R†1 Front-hull hit: +2 TH DRM (unless level < firer) | American ESB+ | Multiple Hits +Sherman Crab(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 24† A G K†2 P R†1 Mine & Wire Clearance | American ESB+ | Multiple Hits +Matilda I ® sD5 CS 2 ® sD5 CS 2 25† B†1 MA: 12.7 | Road Rate NA +Matilda II sD6 CS 5 sD6 CS 5 26† B†1 K†2 N P Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS HE9†[2] s†[2] sD6 CS 5 HE9†[2] s†[2] sD6 CS 5 26† K†1 N P S†2 Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | s9, ∞ HE +Valentine II sM8 CS 4 sM8 CS 4 27† N +Valentine V sM8 CS 4 sM8 CS 4 28† K†1 NT +Valentine VIII HE7 sD6 CS 4 HE7 sD6 CS 4 29 NT +Valentine XI WP6 s8 sD8 CS 4 WP6 s8 sD8 CS 4 30 n/a +Churchill I HE9†[2] s†[2] sD5[4] sM8†[1] CS 7 HE9†[2] s†[2] sD5 sM8†[1] CS 7 31† NT S†2 Z†1 CC 40 MA: T | 76 SA: NT (bow-mounted) | 76 SA: +1 DRM vs Moving/Motion | Smoke & HE: 76 SA only | 76 SA: s9, ∞ HE | Steep climbs +Churchill IV D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] CS 7 HE8†[1] sD6 sM8†[3] CS 7 32† J†2 N Y†1 Z†3 CC Steep climbs +Churchill V H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 33† S Z†1 CC Steep climbs +Churchill VI WP6[J4+]†[1] s8 sD7 sM8†[2] CS 7 s8 sD7 sM8†[2] CS 7 34† W†1 Z†2 CC Steep climbs +Churchill VII WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 35† Z†1 CC Steep climbs +Churchill VIII H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 35† S Z†1 CC Steep climbs +Valentine Bridgelayer sD7 CS 2 sD7 CS 2 36† M P Inherent Crew | Stun = Recall, CE & Fire NA +Churchill Bridgelayer sD7 CS 2 sD7 CS 2 36† M CC Inherent Crew | VBM NA (with bridge) | Stun = Recall, CE & Fire NA | Steep climbs +Churchill AVRE sD7 sM8†[1] CS 8 sD7 sM8†[1] CS 8 37† Z†1 CC Crew: Assault Engineers & Sappers | Inherent 4× DC (Throw NA, Fanaticism) | MA: Area Target Type & TH Case L NA | TH# = 12 - 2 × range | TCA alignment | Mine Clearance | Wall/Hedge Breaches | No IF | Steep climbs +Churchill Crocodile WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 38† Z†1 CC Trailer (AF 6) | Steep climbs +Deacon HE7[F3+]†[2] CS 5 HE7†[2] CS 5 39† L†1 N Y†2 Starboard VCA NA | TCA restrictions | Turret Rear unarmored | CE: +3 Front/Side Turret | Reverse MP ×3 +Wolverine(a) A5[S4]6[5]†[1] HE7 s5[5] CS 7 HE7 CS 7 40† A J†1 American ESB+ +Achilles(a) D6[S4]7[5]†[1] HE7 CS 7 HE7 CS 7 40† A J†1 American ESB+ +Archer D6[4]7[5]†[1] HE7 sD7 CS 5 D6†[1] HE7 sD7 CS 5 41† J†1 MA: Rear VCA only | No Bnd FF, Motion Fire +Daimler sD4[4+]† CS 2 sD4† CS 2 42† M N P Stun = Recall, CE & Fire NA +Lynx sD5 CS 2 sD5 CS 2 42† L†1 M P Reverse MP ×3 | Stun = Recall, CE & Fire NA +Humber sD4[4+]† CS 2 sD4† CS 2 43† L†1 M P BB†2 MA: CE, Rider, vs Aerial NA | Reverse MP ×3 | Stun = Recall, CE & Fire NA | Pas: 1 SMC or 1PP SW +Stuart Recce CS 5 CS 5 44† A D NT P MA: VCA only | 2 TK DR (MG) | As fully-tracked | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Humber III LRC sD5 CS 3 sD5 CS 3 45† L†1 N P Q†2 Reverse MP ×3 +Otter LRC sD5 CS 3 sD5 CS 3 45† L†1 P Q†2 Reverse MP ×3 +Morris CS9 sD5 CS 4 sD5 CS 4 46† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Rolls Royce sD5 CS 3 sD5 CS 3 47† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Marmon-Herrington II ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIv CS 4 CS 4 49† L†1 N AA†2 MA & CMG: AA ok | Red TH# | Reverse MP ×3 +Marmon-Herrington III MFF CS 4 CS 4 48† L†1 P Q†2 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK +Marmon-Herrington III ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIIv CS 4 CS 4 49† K†2 L†1 N T†2 AAMG: Rear VCA only | Red TH# | Reverse MP ×3 +Humber II sD6 CS 3 sD6 CS 3 50† L†1 N Reverse MP ×3 +Humber III sD6 CS 4 sD6 CS 4 50† K†2 L†1 N P Reverse MP ×3 +Humber IV C6[4+]†[2] sD6 CS 3 C6†[2] sD6 CS 3 51† A C†2 L†1 P Reverse MP ×3 +Daimler sD6 CS 3 sD6 CS 3 52† K†1 N P +AEC I sM8 CS 3 sM8 CS 3 53† N X†1 Reverse MP ×4 +AEC II D6[J4]7[5]†[2] HE7[3]8[4+]†[1] sM8 CS 4 HE8†[1] sM8 CS 4 53 J†2 X† Y†1 Reverse MP ×4 +AEC III WP6 s8 sM8 CS 4 WP6 s8 sM8 CS 4 53 X† Reverse MP ×4 +Staghound I(a) C6[4+]†[3] sM8 CS 5 C6†[3] sM8 CS 5 54† A C†3 G K†2 X†1 American ESB+ | Reverse MP ×4 +Staghound II(a) s9 sD6 CS 4 s9 sD6 CS 4 54† A K†3 S†2 X†1 ∞ Smoke | American ESB+ | Reverse MP ×4 +Bishop s8 CS 5 s8 CS 5 55† K†1 N P +1 TH DRM vs Moving/Motion | No IF +Priest(a) H6 WP7 s8 CS 7 H6 WP7 s8 CS 7 56† A N P American ESB+ +Sexton(a) s8 CS 7 s8 CS 7 57† A K†1 American ESB+ +M3 GMC(a) WP7[J4+]†[1] s8 CS 4 s8 CS 4 58† A NT W†1 CE: +3 Front | American ESB+ +Mk VI AA CS 2 CS 2 59† N O†1 AA†2 BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Crusader AA sD7 CS 4[brewup] sD7 CS 4[brewup] 60† AA†1 2 TK DR | CE Fire NA | MA & CMG: AA ok +M17 MGMC(a) CS 4 CS 4 61† A F† AA†1 CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok +Humber AA CS 2 CS 2 62† L†1 N O†2 AA†3 Reverse MP ×3 | BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Staghound AA(a) CS 3 CS 3 62† A F† X†1 AA†2 2 TK DR | American ESB+ | MA: [16] TH | MA: Removal/Scrounge NA | Reverse MP ×4 | MA & CMG: AA ok +M5(a) cs 5†[1] cs 5†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M9(a) cs 4†[1] cs 4†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M5A1(a) cs 5† cs 5† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +M9A1(a) cs 4† cs 4† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +Carrier A sD5[4+]†[1] CS 3 sD5†[1] CS 3 64† N P U†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading | Towing OK +Carrier B sD5[4+]†[2] CS 3 sD5†[2] CS 3 64† N P Q†1 U†2 Always CE | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK +Carrier C sD5[4+]†[1] CS 3 sD5†[1] CS 3 64† N P U†1 Always CE | MA: Removal NA | PIAT | Combined (un)hooking/(un)loading | Towing OK +Carrier, MMG A sD5[4+]†[2] CS 3 sD5†[2] CS 3 65† N P Q†1 U†2 Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK +Carrier, MMG B sD5[4+]†[2] CS 4 sD5†[2] CS 4 65† U†2 BB†1 Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW +Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†1 Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing OK +Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†1 N P U BB†2 Always CE | Inherent dm 76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW +Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#) +IP Carrier Mk IIA CS 4 CS 4 70† N P V X†1 As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier Mk IIB CS 4 CS 4 70† N P Q†2 V X†1 BU Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier AOV CS 4 CS 4 70† P Q†1 V X† BATR SA: BU/HD Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier, 3-in. MTR IR WP7 s8 CS 5[brewup]† IR WP7 s8 CS 5[brewup]† 71†[2] E†3 H† P V X†1 BB†4 MA: Rear VCA only | BMG: HD Fire OK | Inherent Infantry Crew | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 | Pas: 1 SMC or 1PP SW +Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 72† K†1 U Always CE | sD: 2 hexes +Badger(a) CS 3 CS 3 72† A K†1 M American ESB+ | Stun = Recall, CE & Fire NA +Buffalo Mk II(a) sD5† CS 6 sD5† CS 6 73† A D AA†1 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | MA & CMG: AA ok +Buffalo Mk IV(a) sD5† CS 6 sD5† CS 6 73† A D E†1 AA†2 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | BMG: HD Fire OK | MA & CMG: AA ok +Sherman III DD(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 74† A G K†2 R†1 American ESB+ | Multiple Hits +DUKW(a) cs 7†[1] cs 7†[1] 75† A D I†1 P American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | Inherent Crew if armed (with CS#) +Terrapin Mk I cs 7 cs 7 76† D (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok +2pdr Portee CS 4†[1] CS 4†[1] 77† H†1 N P MA: NA VCA | Inherent Infantry Crew +Morris C9/B CS 4 CS 4 78† P AA†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok +Loyd Carrier cs 5 cs 5 79† N P Not a Carrier +Quad FAT cs 5[brewup]† cs 5[brewup]† 80† N P Burning Wreck: -1 DRM +15-cwt Truck cs 5 cs 5 81† N P +30-cwt Lorry cs 6 cs 6 82† N P +3-Ton Lorry cs 7 cs 7 83† N P +¼-Ton Jeep(a) cs 2†[1] cs 2†[1] 84† A I†1 N P American ESB+ | Bog assistance | Inherent Crew if armed (with CS#) +¾-Ton Truck(a) cs 4 cs 4 85 A N American ESB+ +1½-Ton Truck(a) cs 6 cs 6 85 A N American ESB+ +2½-Ton Truck(a) cs 7 cs 7 85 A N American ESB+ +7½-Ton Truck(a) cs 7 cs 7 85† A N American ESB+ +Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | s9, ∞ HE +Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1945.txt new file mode 100644 index 0000000..0657f95 --- /dev/null +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~anzac/1945.txt @@ -0,0 +1,135 @@ +=== vehicles/british~anzac/1945 === + +Name Capabilities (effective) # Notes Comments +------------------------- ---------------------------------------------------- -------------------------------- ------ ---------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +Mark VIB sD6 CS 3 sD6 CS 3 1† N P 2 TK DR (12.7 & MG) +Mark VIC sD6 CS 3 sD6 CS 3 1† n/a +Tetrarch sD6 CS 3 sD6 CS 3 2† n/a +Tetrarch CS HE9†[1] s†[1] sD6 CS 3 HE9†[1] s†[1] sD6 CS 3 2† S†1 s9, ∞ HE +Stuart I(a) sD5 CS 4 sD5 CS 4 3† A N P American ESB+ +Stuart III(a) C6[4+]†[1] HE[4+] sD5 CS 4 C6†[1] HE sD5 CS 4 3† A C†1 G N P American ESB+ +Stuart V(a) C6†[1] sD5 CS 4 C6†[1] sD5 CS 4 4† A C†1 G American ESB+ +Locust(a) C6† sD6 CS 3 C6† sD6 CS 3 5 A C† American ESB+ +A9 sD6 CS 5[brewup] sD6 CS 5[brewup] 6† K†1 N BMG: Scrounge NA +A9 CS s†[2] sD6 CS 5[brewup] s†[2] sD6 CS 5[brewup] 6† K†1 N S†2 ∞ Smoke | BMG: Scrounge NA +A10 Mk IA sD6 CS 5[brewup]† sD6 CS 5[brewup]† 7† B†1 K†2 N +A10 Mk IA CS s†[2] sD6 CS 5[brewup]† s†[2] sD6 CS 5[brewup]† 7† K†1 N S†2 ∞ Smoke +A13 Mk I sD6 CS 4[brewup] sD6 CS 4[brewup] 8 K† +A13 Mk II sD6 CS 4[brewup] sD6 CS 4[brewup] 8† B†1 K†2 N +A13 Mk II CS s†[2] sD6 CS 4[brewup] s†[2] sD6 CS 4[brewup] 8† K†1 N S†2 ∞ Smoke +Crusader I sM8 CS 5[brewup] sM8 CS 5[brewup] 9† K†1 N BMG: extended port-side +Crusader I CS HE9 s†[2] sM8 CS 5[brewup] HE9 s†[2] sM8 CS 5[brewup] 9† K†1 N S†2 BMG: extended port-side | ∞ Smoke +Crusader II sM8 CS 4[brewup] sM8 CS 4[brewup] 9† K†1 N +Crusader II CS HE9 s†[2] sM8 CS 4[brewup] HE9 s†[2] sM8 CS 4[brewup] 9† K†1 N S†2 ∞ Smoke +Crusader III HE7[F3+]†[1] sD7 sM8†[2] CS 3[brewup] HE7†[1] sD7 sM8†[2] CS 3[brewup] 10† N Y†1 Z†2 +Grant(a) C5[4+]†[1] HE[4+] s8† sM8 CS 6 C5†[1] HE s8† sM8 CS 6 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | American ESB+ +Lee(a) C5[4+]†[1] HE[4+] s8† sD6 CS 7 C5†[1] HE s8† sD6 CS 7 11† A C†1 G N P 37LL: T | 75 SA: NT (bow-mounted) | Smoke: 75 SA only | HE & C: 37 MA only | BMG: +1 DRM vs Moving/Motion | AAMG: BU Fire & CC ok [EXC: vs Aerial NA] | American ESB+ +Sherman II(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] WP6†[3] s8 sD6 CS 5[brewup] 12† A G K†2 N R†1 W†3 American ESB+ | Multiple Hits +Sherman III(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] WP6†[3] s8 sD6 CS 5[brewup] 13† A G K†2 N R†1 W†3 American ESB+ | Multiple Hits +Sherman V(a) WP6[J4+]†[3] s8 sD6 CS 5[brewup] WP6†[3] s8 sD6 CS 5[brewup] 14† A G K†2 P R†1 W†3 American ESB+ | Multiple Hits +Sherman IIA(a) A4[4]5[5] s5[5] sM8 CS 6 A5 s5 sM8 CS 6 15† A G K†1 American ESB+ +Sherman IIC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] D6†[2] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ +Sherman VC(a) D5[S4]6[5]†[2] HE7 sM8 CS 5[brewup] D6†[2] HE7 sM8 CS 5[brewup] 16† A J†2 K†1 American ESB+ +Sherman IB(a) H9 WP9 s7 sM8 CS 6 H9 WP9 s7 sM8 CS 6 17† A K†1 American ESB+ +Centaur IV H6 s9 sD7 sM8† CS 5 H6 s9 sD7 sM8† CS 5 18 S Z† +Cromwell IV WP6 s8 sD7 sM8†[1] CS 5 WP6 s8 sD7 sM8†[1] CS 5 19† Z†1 +Cromwell VI H6 s9 sD7 sM8†[1] CS 5 H6 s9 sD7 sM8†[1] CS 5 20† S Z†1 +Cromwell VII WP6 s8 sD7 sM8† CS 6 WP6 s8 sD7 sM8† CS 6 19† Z†1 +Cromwell VIII H6 s9 sD7 sM8†[1] CS 6 H6 s9 sD7 sM8†[1] CS 6 20† S Z†1 +Challenger D5[S4]6[5]†[1] HE7 sD7 sM8†[2] CS 6 D6†[1] HE7 sD7 sM8†[2] CS 6 21† J†1 Z†2 +Comet sD7 sM8† CS 6 sD7 sM8† CS 6 22 Z† +Sherman Dozer(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 23† A G K†2 P R†1 Front-hull hit: +2 TH DRM (unless level < firer) | American ESB+ | Multiple Hits +Sherman Crab(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 24† A G K†2 P R†1 Mine & Wire Clearance | American ESB+ | Multiple Hits +Matilda I ® sD5 CS 2 ® sD5 CS 2 25† B†1 MA: 12.7 | Road Rate NA +Matilda II sD6 CS 5 sD6 CS 5 26† B†1 K†2 N P Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS HE9†[2] s†[2] sD6 CS 5 HE9†[2] s†[2] sD6 CS 5 26† K†1 N P S†2 Immob: dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | s9, ∞ HE +Valentine II sM8 CS 4 sM8 CS 4 27† N +Valentine V sM8 CS 4 sM8 CS 4 28† K†1 NT +Valentine VIII HE7 sD6 CS 4 HE7 sD6 CS 4 29 NT +Valentine XI WP6 s8 sD8 CS 4 WP6 s8 sD8 CS 4 30 n/a +Churchill I HE9†[2] s†[2] sD5[4] sM8†[1] CS 7 HE9†[2] s†[2] sM8†[1] CS 7 31† NT S†2 Z†1 CC 40 MA: T | 76 SA: NT (bow-mounted) | 76 SA: +1 DRM vs Moving/Motion | Smoke & HE: 76 SA only | 76 SA: s9, ∞ HE | Steep climbs +Churchill IV D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] CS 7 D7†[2] HE8†[1] sD6 sM8†[3] CS 7 32† J†2 N Y†1 Z†3 CC Steep climbs +Churchill V H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 33† S Z†1 CC Steep climbs +Churchill VI WP6[J4+]†[1] s8 sD7 sM8†[2] CS 7 WP6†[1] s8 sD7 sM8†[2] CS 7 34† W†1 Z†2 CC Steep climbs +Churchill VII WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 35† Z†1 CC Steep climbs +Churchill VIII H6 s9 sD7 sM8†[1] CS 7 H6 s9 sD7 sM8†[1] CS 7 35† S Z†1 CC Steep climbs +Valentine Bridgelayer sD7 CS 2 sD7 CS 2 36† M P Inherent Crew | Stun = Recall, CE & Fire NA +Churchill Bridgelayer sD7 CS 2 sD7 CS 2 36† M CC Inherent Crew | VBM NA (with bridge) | Stun = Recall, CE & Fire NA | Steep climbs +Churchill AVRE sD7 sM8†[1] CS 8 sD7 sM8†[1] CS 8 37† Z†1 CC Crew: Assault Engineers & Sappers | Inherent 4× DC (Throw NA, Fanaticism) | MA: Area Target Type & TH Case L NA | TH# = 12 - 2 × range | TCA alignment | Mine Clearance | Wall/Hedge Breaches | No IF | Steep climbs +Churchill Crocodile WP6 s8 sD7 sM8†[1] CS 7 WP6 s8 sD7 sM8†[1] CS 7 38† Z†1 CC Trailer (AF 6) | Steep climbs +Deacon HE7[F3+]†[2] CS 5 HE7†[2] CS 5 39† L†1 N Y†2 Starboard VCA NA | TCA restrictions | Turret Rear unarmored | CE: +3 Front/Side Turret | Reverse MP ×3 +Wolverine(a) A5[S4]6[5]†[1] HE7 s5[5] CS 7 A6†[1] HE7 s5 CS 7 40† A J†1 American ESB+ +Achilles(a) D6[S4]7[5]†[1] HE7 CS 7 D7†[1] HE7 CS 7 40† A J†1 American ESB+ +Archer D6[4]7[5]†[1] HE7 sD7 CS 5 D7†[1] HE7 sD7 CS 5 41† J†1 MA: Rear VCA only | No Bnd FF, Motion Fire +Daimler sD4[4+]† CS 2 sD4† CS 2 42† M N P Stun = Recall, CE & Fire NA +Lynx sD5 CS 2 sD5 CS 2 42† L†1 M P Reverse MP ×3 | Stun = Recall, CE & Fire NA +Humber sD4[4+]† CS 2 sD4† CS 2 43† L†1 M P BB†2 MA: CE, Rider, vs Aerial NA | Reverse MP ×3 | Stun = Recall, CE & Fire NA | Pas: 1 SMC or 1PP SW +Stuart Recce CS 5 CS 5 44† A D NT P MA: VCA only | 2 TK DR (MG) | As fully-tracked | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Humber III LRC sD5 CS 3 sD5 CS 3 45† L†1 N P Q†2 Reverse MP ×3 +Otter LRC sD5 CS 3 sD5 CS 3 45† L†1 P Q†2 Reverse MP ×3 +Morris CS9 sD5 CS 4 sD5 CS 4 46† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Rolls Royce sD5 CS 3 sD5 CS 3 47† N Q†2 T†3 X†1 ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only | Reverse MP ×4 +Marmon-Herrington II ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIv CS 4 CS 4 49† L†1 N AA†2 MA & CMG: AA ok | Red TH# | Reverse MP ×3 +Marmon-Herrington III MFF CS 4 CS 4 48† L†1 P Q†2 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK +Marmon-Herrington III ME CS 4 CS 4 48† L†1 N Q†2 T†3 Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only +Marmon-Herrington IIIv CS 4 CS 4 49† K†2 L†1 N T†2 AAMG: Rear VCA only | Red TH# | Reverse MP ×3 +Humber II sD6 CS 3 sD6 CS 3 50† L†1 N Reverse MP ×3 +Humber III sD6 CS 4 sD6 CS 4 50† K†2 L†1 N P Reverse MP ×3 +Humber IV C6[4+]†[2] sD6 CS 3 C6†[2] sD6 CS 3 51† A C†2 L†1 P Reverse MP ×3 +Daimler sD6 CS 3 sD6 CS 3 52† K†1 N P +AEC I sM8 CS 3 sM8 CS 3 53† N X†1 Reverse MP ×4 +AEC II D6[J4]7[5]†[2] HE7[3]8[4+]†[1] sM8 CS 4 D7†[2] HE8†[1] sM8 CS 4 53 J†2 X† Y†1 Reverse MP ×4 +AEC III WP6 s8 sM8 CS 4 WP6 s8 sM8 CS 4 53 X† Reverse MP ×4 +Staghound I(a) C6[4+]†[3] sM8 CS 5 C6†[3] sM8 CS 5 54† A C†3 G K†2 X†1 American ESB+ | Reverse MP ×4 +Staghound II(a) s9 sD6 CS 4 s9 sD6 CS 4 54† A K†3 S†2 X†1 ∞ Smoke | American ESB+ | Reverse MP ×4 +Bishop s8 CS 5 s8 CS 5 55† K†1 N P +1 TH DRM vs Moving/Motion | No IF +Priest(a) H6 WP7 s8 CS 7 H6 WP7 s8 CS 7 56† A N P American ESB+ +Sexton(a) s8 CS 7 s8 CS 7 57† A K†1 American ESB+ +M3 GMC(a) WP7[J4+]†[1] s8 CS 4 WP7†[1] s8 CS 4 58† A NT W†1 CE: +3 Front | American ESB+ +Mk VI AA CS 2 CS 2 59† N O†1 AA†2 BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Crusader AA sD7 CS 4[brewup] sD7 CS 4[brewup] 60† AA†1 2 TK DR | CE Fire NA | MA & CMG: AA ok +M17 MGMC(a) CS 4 CS 4 61† A F† AA†1 CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok +Humber AA CS 2 CS 2 62† L†1 N O†2 AA†3 Reverse MP ×3 | BU Fire NA | 4 TK DR (MG) | MA & CMG: AA ok +Staghound AA(a) CS 3 CS 3 62† A F† X†1 AA†2 2 TK DR | American ESB+ | MA: [16] TH | MA: Removal/Scrounge NA | Reverse MP ×4 | MA & CMG: AA ok +M5(a) cs 5†[1] cs 5†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M9(a) cs 4†[1] cs 4†[1] 63† A I†1 N American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) +M5A1(a) cs 5† cs 5† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +M9A1(a) cs 4† cs 4† 63 A I† American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) +Carrier A sD5[4+]†[1] CS 3 sD5†[1] CS 3 64† N P U†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading | Towing OK +Carrier B sD5[4+]†[2] CS 3 sD5†[2] CS 3 64† N P Q†1 U†2 Always CE | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK +Carrier C sD5[4+]†[1] CS 3 sD5†[1] CS 3 64† N P U†1 Always CE | MA: Removal NA | PIAT | Combined (un)hooking/(un)loading | Towing OK +Carrier, MMG A sD5[4+]†[2] CS 3 sD5†[2] CS 3 65† N P Q†1 U†2 Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK +Carrier, MMG B sD5[4+]†[2] CS 4 sD5†[2] CS 4 65† U†2 BB†1 Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW +Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†1 Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing OK +Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†1 N P U BB†2 Always CE | Inherent dm 76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW +Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA +White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#) +IP Carrier Mk IIA CS 4 CS 4 70† N P V X†1 As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier Mk IIB CS 4 CS 4 70† N P Q†2 V X†1 BU Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier AOV CS 4 CS 4 70† P Q†1 V X† BATR SA: BU/HD Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 +IP Carrier, 3-in. MTR IR WP7 s8 CS 5[brewup]† IR WP7 s8 CS 5[brewup]† 71†[2] E†3 H† P V X†1 BB†4 MA: Rear VCA only | BMG: HD Fire OK | Inherent Infantry Crew | As wheeled OT AFV [EXC: D6.82-.83, H1.43] | Unpossessed SW ok | Reverse MP ×4 | Pas: 1 SMC or 1PP SW +Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 72† K†1 U Always CE | sD: 2 hexes +Badger(a) CS 3 CS 3 72† A K†1 M American ESB+ | Stun = Recall, CE & Fire NA +Buffalo Mk II(a) sD5† CS 6 sD5† CS 6 73† A D AA†1 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | MA & CMG: AA ok +Buffalo Mk IV(a) sD5† CS 6 sD5† CS 6 73† A D E†1 AA†2 sD: Water OK | Bog: 0 DRM for soft, mud, snow-covered ground | American ESB+ | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA | BMG: HD Fire OK | MA & CMG: AA ok +Sherman III DD(a) WP6 s8 sD6 CS 5[brewup] WP6 s8 sD6 CS 5[brewup] 74† A G K†2 R†1 American ESB+ | Multiple Hits +DUKW(a) cs 7†[1] cs 7†[1] 75† A D I†1 P American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | Inherent Crew if armed (with CS#) +Terrapin Mk I cs 7 cs 7 76† D (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok +2pdr Portee CS 4†[1] CS 4†[1] 77† H†1 N P MA: NA VCA | Inherent Infantry Crew +Morris C9/B CS 4 CS 4 78† P AA†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok +Loyd Carrier cs 5 cs 5 79† N P Not a Carrier +Quad FAT cs 5[brewup]† cs 5[brewup]† 80† N P Burning Wreck: -1 DRM +15-cwt Truck cs 5 cs 5 81† N P +30-cwt Lorry cs 6 cs 6 82† N P +3-Ton Lorry cs 7 cs 7 83† N P +¼-Ton Jeep(a) cs 2†[1] cs 2†[1] 84† A I†1 N P American ESB+ | Bog assistance | Inherent Crew if armed (with CS#) +¾-Ton Truck(a) cs 4 cs 4 85 A N American ESB+ +1½-Ton Truck(a) cs 6 cs 6 85 A N American ESB+ +2½-Ton Truck(a) cs 7 cs 7 85 A N American ESB+ +7½-Ton Truck(a) cs 7 cs 7 85† A N American ESB+ +Matilda Frog sD6 CS 5 sD6 CS 5 1† n/a Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II(L) sD6 CS 5 sD6 CS 5 2† Br B†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] +Matilda II CS(L) s9 sD6 CS 5 s9 sD6 CS 5 3† Br S†1 Immob dr ≤ 3 [EXC: mines, Direct Fire vs front/rear] | s9, ∞ HE +Valentine III CS s9 sM8 CS 5 s9 sM8 CS 5 4† Br S†1 ∞ Smoke diff --git a/vasl_templates/webapp/vo_notes.py b/vasl_templates/webapp/vo_notes.py index f0b3280..d82c88c 100644 --- a/vasl_templates/webapp/vo_notes.py +++ b/vasl_templates/webapp/vo_notes.py @@ -83,7 +83,7 @@ def load_vo_notes( msg_store ): #pylint: disable=too-many-statements,too-many-lo vo_notes = { "vehicles": defaultdict(dict), "ordnance": defaultdict(dict) } # NOTE: We don't have any data files for these vehicles/ordnance, but they have # multi-applicable notes, so we force them to appear in the final results. - vo_notes["vehicles"]["anzac"] = {} + vo_notes["vehicles"]["british~anzac"] = {} vo_notes["ordnance"]["indonesian"] = {} vo_note_layout_width = app.config.get( "VO_NOTE_LAYOUT_WIDTH", 500 ) @@ -200,6 +200,7 @@ def load_vo_notes( msg_store ): #pylint: disable=too-many-statements,too-many-lo vo_notes[vo_type2]["british~canadian"] = copy.deepcopy( vo_notes[vo_type2]["british"] ) vo_notes[vo_type2]["british~newzealand"] = copy.deepcopy( vo_notes[vo_type2]["british"] ) vo_notes[vo_type2]["british~australian"] = copy.deepcopy( vo_notes[vo_type2]["british"] ) + vo_notes[vo_type2]["british~anzac"] = copy.deepcopy( vo_notes[vo_type2]["british"] ) def install_kfw_vo_notes( nat, vo_type, extn_id, include ): """Install the K:FW vehicle/ordnance notes into the specified nationality."""