From 9ac4ffeb14b3536e5537b5e170ad413b2a7e5070 Mon Sep 17 00:00:00 2001 From: Taka Date: Thu, 13 Sep 2018 04:00:53 +0000 Subject: [PATCH] Fixed up some abbreviated vehicle/ordnance names. --- .../webapp/data/ordnance/british.json | 4 +- .../webapp/data/ordnance/chinese.json | 2 +- .../webapp/data/ordnance/french.json | 6 +- .../webapp/data/ordnance/italian.json | 2 +- .../webapp/data/vehicles/french.json | 2 +- .../vo-reports/ordnance/british/1940.txt | 54 ++++----- .../vo-reports/ordnance/british/1941.txt | 54 ++++----- .../vo-reports/ordnance/british/1942.txt | 54 ++++----- .../vo-reports/ordnance/british/1943.txt | 54 ++++----- .../vo-reports/ordnance/british/1944.txt | 54 ++++----- .../vo-reports/ordnance/british/1945.txt | 54 ++++----- .../vo-reports/ordnance/chinese/1940.txt | 2 +- .../vo-reports/ordnance/chinese/1941.txt | 2 +- .../vo-reports/ordnance/chinese/1942.txt | 2 +- .../vo-reports/ordnance/chinese/1943.txt | 2 +- .../vo-reports/ordnance/chinese/1944.txt | 2 +- .../vo-reports/ordnance/chinese/1945.txt | 2 +- .../vo-reports/ordnance/french/1940.txt | 46 ++++---- .../vo-reports/ordnance/french/1941.txt | 46 ++++---- .../vo-reports/ordnance/french/1942.txt | 46 ++++---- .../vo-reports/ordnance/french/1943.txt | 46 ++++---- .../vo-reports/ordnance/french/1944.txt | 46 ++++---- .../vo-reports/ordnance/french/1945.txt | 46 ++++---- .../vo-reports/ordnance/italian/1940.txt | 44 ++++---- .../vo-reports/ordnance/italian/1941.txt | 44 ++++---- .../vo-reports/ordnance/italian/1942.txt | 44 ++++---- .../vo-reports/ordnance/italian/1943.txt | 44 ++++---- .../vo-reports/ordnance/italian/1944.txt | 44 ++++---- .../vo-reports/ordnance/italian/1945.txt | 44 ++++---- .../vo-reports/vehicles/french/1940.txt | 104 +++++++++--------- .../vo-reports/vehicles/french/1941.txt | 104 +++++++++--------- .../vo-reports/vehicles/french/1942.txt | 104 +++++++++--------- .../vo-reports/vehicles/french/1943.txt | 104 +++++++++--------- .../vo-reports/vehicles/french/1944.txt | 104 +++++++++--------- .../vo-reports/vehicles/french/1945.txt | 104 +++++++++--------- 35 files changed, 758 insertions(+), 758 deletions(-) diff --git a/vasl_templates/webapp/data/ordnance/british.json b/vasl_templates/webapp/data/ordnance/british.json index 5816cd5..2138752 100644 --- a/vasl_templates/webapp/data/ordnance/british.json +++ b/vasl_templates/webapp/data/ordnance/british.json @@ -52,7 +52,7 @@ "capabilities2": { "HE": [ [8,"J4+"], "\u2020" ], "D": [ [5,"S4"], [6,5], "\u2020" ] }, "note_number": "8\u2020" }, -{ "name": "OQF M1A1 75mm Pack How.", +{ "name": "OQF M1A1 75mm Pack Howitzer", "capabilities": [ "NT", "QSU" ], "capabilities2": { "H": 6, "WP": 7 }, "note_number": "9\u2020", @@ -76,7 +76,7 @@ "note_number": "12", "notes": [ "D", "P" ] }, -{ "name": "OQF 25-Pounder Gun-How.", +{ "name": "OQF 25-Pounder Gun-Howitzer", "capabilities2": { "LF": [ "NT", "0 ROF" ], "s": 8 }, "capabilities_other": [ "ST" ], "note_number": "13\u2020", diff --git a/vasl_templates/webapp/data/ordnance/chinese.json b/vasl_templates/webapp/data/ordnance/chinese.json index 97c73a8..9b0b45f 100644 --- a/vasl_templates/webapp/data/ordnance/chinese.json +++ b/vasl_templates/webapp/data/ordnance/chinese.json @@ -170,7 +170,7 @@ "note_number": "15\u20201", "notes": [ "G\u2020" ] }, -{ "name": "Cannone-mitra. da 20/65", +{ "name": "Cannone-mitragliera da 20/65", "capabilities": [ "T" ], "capabilities2": { "LF": [ "NT", "20\u20201", "2 ROF" ] }, "note_number": "15\u20202", diff --git a/vasl_templates/webapp/data/ordnance/french.json b/vasl_templates/webapp/data/ordnance/french.json index 0f608ca..3396f58 100644 --- a/vasl_templates/webapp/data/ordnance/french.json +++ b/vasl_templates/webapp/data/ordnance/french.json @@ -90,17 +90,17 @@ "capabilities": [ "NT", "RFNM", "no IF" ], "note_number": "17\u2020" }, -{ "name": "Mitr. de 13.2 CAJ mle 30", +{ "name": "Mitrailleuse de 13.2 CAJ mle 30", "capabilities": [ "T", "2 TK DR\u20201", "Towing NA\u20201" ], "note_number": "18\u20201", "notes": [ "B", "G\u2020", "V" ] }, -{ "name": "Mitr. de 20 CA mle 39 O", +{ "name": "Mitrailleuse de 20 CA mle 39 O", "capabilities": [ "T" ], "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF", "B11" ] }, "note_number": "19\u2020" }, -{ "name": "Canon Auto. de 25 CA mle 38", +{ "name": "Canon Automatique de 25 CA mle 38", "capabilities": [ "T" ], "note_number": "20\u20201", "notes": [ "G\u2020" ] diff --git a/vasl_templates/webapp/data/ordnance/italian.json b/vasl_templates/webapp/data/ordnance/italian.json index 12cbd18..f9d155d 100644 --- a/vasl_templates/webapp/data/ordnance/italian.json +++ b/vasl_templates/webapp/data/ordnance/italian.json @@ -89,7 +89,7 @@ "note_number": "16\u2020", "notes": [ "N" ] }, -{ "name": "Cannone-mitr. da 20/65", +{ "name": "Cannone-mitragliera da 20/65", "capabilities": [ "T" ], "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF" ] }, "note_number": "17\u2020", diff --git a/vasl_templates/webapp/data/vehicles/french.json b/vasl_templates/webapp/data/vehicles/french.json index 37e3241..3b1167f 100644 --- a/vasl_templates/webapp/data/vehicles/french.json +++ b/vasl_templates/webapp/data/vehicles/french.json @@ -181,7 +181,7 @@ "note_number": "20\u2020", "notes": [ "M\u20201" ] }, -{ "name": "Camion de Mitr. CA", +{ "name": "Camion de Mitrailleuse CA", "CS#": 4, "note_number": "21\u2020" }, diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt index 2e6e232..8d0a159 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt @@ -1,29 +1,29 @@ === ordnance/british/1940 === -Name Capabilities (effective) # Notes --------------------------- --------------------------------- ----------------------------- --- -------------------- -OML 2-in. Mortar 4PP IR[2+]† s7 4PP s7 1 A† N P -OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a -OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU WP7 2† A†1 D N P -OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P -OQF 25mm Hotchkiss NT QSU NT QSU 4† B N -OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P -OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P -OQF 17/25-Pounder NT NT 7 N -OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a -OQF M1A1 75mm Pack How. NT QSU H6 WP7 NT QSU H6 WP7 9† D P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N -OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P -OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P -OQF 25-Pounder Gun-How. LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P -OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P -OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P -OBL 4.5-in. Gun NT NT 16† N -OBL 5.5-in. Gun-Howitzer NT NT 16† N P -OBL 6-in. Howitzer NT NT 17† N P -OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P -OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P -OQF 20mm AA T T 20 n/a -OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P -OQF 3-in. 20-cwt AA T T 22† E P -OQF 3.7-in. AA T T 23† E N P +Name Capabilities (effective) # Notes +--------------------------- --------------------------------- ----------------------------- --- -------------------- +OML 2-in. Mortar 4PP IR[2+]† s7 4PP s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a +OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU WP7 2† A†1 D N P +OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P +OQF 25mm Hotchkiss NT QSU NT QSU 4† B N +OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P +OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P +OQF 17/25-Pounder NT NT 7 N +OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a +OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N +OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P +OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P +OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P +OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P +OBL 4.5-in. Gun NT NT 16† N +OBL 5.5-in. Gun-Howitzer NT NT 16† N P +OBL 6-in. Howitzer NT NT 17† N P +OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P +OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P +OQF 20mm AA T T 20 n/a +OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA T T 22† E P +OQF 3.7-in. AA T T 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt index efb4143..a26223a 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt @@ -1,29 +1,29 @@ === ordnance/british/1941 === -Name Capabilities (effective) # Notes --------------------------- --------------------------------- ----------------------------- --- -------------------- -OML 2-in. Mortar 4PP IR[2+]† s7 4PP s7 1 A† N P -OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a -OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU WP7 s8† 2† A†1 D N P -OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P -OQF 25mm Hotchkiss NT QSU NT QSU 4† B N -OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P -OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P -OQF 17/25-Pounder NT NT 7 N -OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a -OQF M1A1 75mm Pack How. NT QSU H6 WP7 NT QSU H6 WP7 9† D P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N -OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P -OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P -OQF 25-Pounder Gun-How. LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P -OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P -OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P -OBL 4.5-in. Gun NT NT 16† N -OBL 5.5-in. Gun-Howitzer NT NT 16† N P -OBL 6-in. Howitzer NT NT 17† N P -OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P -OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P -OQF 20mm AA T T 20 n/a -OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P -OQF 3-in. 20-cwt AA T T 22† E P -OQF 3.7-in. AA T T 23† E N P +Name Capabilities (effective) # Notes +--------------------------- --------------------------------- ----------------------------- --- -------------------- +OML 2-in. Mortar 4PP IR[2+]† s7 4PP s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a +OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU WP7 s8† 2† A†1 D N P +OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P +OQF 25mm Hotchkiss NT QSU NT QSU 4† B N +OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P +OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P +OQF 17/25-Pounder NT NT 7 N +OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a +OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N +OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P +OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P +OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P +OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P +OBL 4.5-in. Gun NT NT 16† N +OBL 5.5-in. Gun-Howitzer NT NT 16† N P +OBL 6-in. Howitzer NT NT 17† N P +OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P +OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P +OQF 20mm AA T T 20 n/a +OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA T T 22† E P +OQF 3.7-in. AA T T 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt index ef0ab1f..8f6cd56 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt @@ -1,29 +1,29 @@ === ordnance/british/1942 === -Name Capabilities (effective) # Notes --------------------------- --------------------------------- ----------------------------- --- -------------------- -OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P -OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a -OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P -OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P -OQF 25mm Hotchkiss NT QSU NT QSU 4† B N -OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P -OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P -OQF 17/25-Pounder NT NT 7 N -OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a -OQF M1A1 75mm Pack How. NT QSU H6 WP7 NT QSU H6 WP7 9† D P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N -OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P -OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P -OQF 25-Pounder Gun-How. LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P -OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P -OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P -OBL 4.5-in. Gun NT NT 16† N -OBL 5.5-in. Gun-Howitzer NT NT 16† N P -OBL 6-in. Howitzer NT NT 17† N P -OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P -OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P -OQF 20mm AA T T 20 n/a -OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P -OQF 3-in. 20-cwt AA T T 22† E P -OQF 3.7-in. AA T T 23† E N P +Name Capabilities (effective) # Notes +--------------------------- --------------------------------- ----------------------------- --- -------------------- +OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a +OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P +OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P +OQF 25mm Hotchkiss NT QSU NT QSU 4† B N +OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P +OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P +OQF 17/25-Pounder NT NT 7 N +OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a +OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N +OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P +OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P +OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P +OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P +OBL 4.5-in. Gun NT NT 16† N +OBL 5.5-in. Gun-Howitzer NT NT 16† N P +OBL 6-in. Howitzer NT NT 17† N P +OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P +OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P +OQF 20mm AA T T 20 n/a +OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA T T 22† E P +OQF 3.7-in. AA T T 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt index a6670f3..192b1b9 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt @@ -1,29 +1,29 @@ === ordnance/british/1943 === -Name Capabilities (effective) # Notes --------------------------- --------------------------------- ----------------------------- --- -------------------- -OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P -OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a -OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P -OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P -OQF 25mm Hotchkiss NT QSU NT QSU 4† B N -OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P -OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P -OQF 17/25-Pounder NT NT 7 N -OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a -OQF M1A1 75mm Pack How. NT QSU H6 WP7 NT QSU H6 WP7 9† D P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N -OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P -OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P -OQF 25-Pounder Gun-How. LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P -OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P -OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P -OBL 4.5-in. Gun NT NT 16† N -OBL 5.5-in. Gun-Howitzer NT NT 16† N P -OBL 6-in. Howitzer NT NT 17† N P -OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P -OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P -OQF 20mm AA T T 20 n/a -OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P -OQF 3-in. 20-cwt AA T T 22† E P -OQF 3.7-in. AA T T 23† E N P +Name Capabilities (effective) # Notes +--------------------------- --------------------------------- ----------------------------- --- -------------------- +OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a +OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P +OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P +OQF 25mm Hotchkiss NT QSU NT QSU 4† B N +OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P +OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P +OQF 17/25-Pounder NT NT 7 N +OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a +OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N +OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P +OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P +OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P +OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P +OBL 4.5-in. Gun NT NT 16† N +OBL 5.5-in. Gun-Howitzer NT NT 16† N P +OBL 6-in. Howitzer NT NT 17† N P +OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P +OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P +OQF 20mm AA T T 20 n/a +OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA T T 22† E P +OQF 3.7-in. AA T T 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt index 269224d..b9da5e9 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt @@ -1,29 +1,29 @@ === ordnance/british/1944 === -Name Capabilities (effective) # Notes --------------------------- --------------------------------- ----------------------------- --- -------------------- -OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P -OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a -OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P -OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P -OQF 25mm Hotchkiss NT QSU NT QSU 4† B N -OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P -OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU HE8† 6† B N P -OQF 17/25-Pounder NT NT 7 N -OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a -OQF M1A1 75mm Pack How. NT QSU H6 WP7 NT QSU H6 WP7 9† D P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N -OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P -OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P -OQF 25-Pounder Gun-How. LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P -OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P -OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P -OBL 4.5-in. Gun NT NT 16† N -OBL 5.5-in. Gun-Howitzer NT NT 16† N P -OBL 6-in. Howitzer NT NT 17† N P -OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P -OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P -OQF 20mm AA T T 20 n/a -OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P -OQF 3-in. 20-cwt AA T T 22† E P -OQF 3.7-in. AA T T 23† E N P +Name Capabilities (effective) # Notes +--------------------------- --------------------------------- ----------------------------- --- -------------------- +OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a +OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P +OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P +OQF 25mm Hotchkiss NT QSU NT QSU 4† B N +OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P +OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU HE8† 6† B N P +OQF 17/25-Pounder NT NT 7 N +OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a +OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N +OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P +OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P +OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P +OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P +OBL 4.5-in. Gun NT NT 16† N +OBL 5.5-in. Gun-Howitzer NT NT 16† N P +OBL 6-in. Howitzer NT NT 17† N P +OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P +OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P +OQF 20mm AA T T 20 n/a +OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA T T 22† E P +OQF 3.7-in. AA T T 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt index 97c530c..4ba2314 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt @@ -1,29 +1,29 @@ === ordnance/british/1945 === -Name Capabilities (effective) # Notes --------------------------- --------------------------------- ----------------------------- --- -------------------- -OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P -OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a -OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P -OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P -OQF 25mm Hotchkiss NT QSU NT QSU 4† B N -OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P -OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU D7† HE8† 6† B N P -OQF 17/25-Pounder NT NT 7 N -OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT D6† HE8† 8† n/a -OQF M1A1 75mm Pack How. NT QSU H6 WP7 NT QSU H6 WP7 9† D P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N -OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P -OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P -OQF 25-Pounder Gun-How. LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P -OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P -OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P -OBL 4.5-in. Gun NT NT 16† N -OBL 5.5-in. Gun-Howitzer NT NT 16† N P -OBL 6-in. Howitzer NT NT 17† N P -OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P -OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P -OQF 20mm AA T T 20 n/a -OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P -OQF 3-in. 20-cwt AA T T 22† E P -OQF 3.7-in. AA T T 23† E N P +Name Capabilities (effective) # Notes +--------------------------- --------------------------------- ----------------------------- --- -------------------- +OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P +OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a +OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P +OSB 4.2-in. Mortar NT WP7 s8 Towed† NT WP7 s8 Towed† 3† N P +OQF 25mm Hotchkiss NT QSU NT QSU 4† B N +OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P +OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU D7† HE8† 6† B N P +OQF 17/25-Pounder NT NT 7 N +OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT D6† HE8† 8† n/a +OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N +OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P +OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P +OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P +OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P +OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P +OBL 4.5-in. Gun NT NT 16† N +OBL 5.5-in. Gun-Howitzer NT NT 16† N P +OBL 6-in. Howitzer NT NT 17† N P +OBL 7.2-in. Howitzer Mk I NT no IF Acq. NA† NT no IF Acq. NA† 18† N P +OBL 7.2-in. Howitzer Mk VI NT RFNM no IF NT RFNM no IF 19† P +OQF 20mm AA T T 20 n/a +OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P +OQF 3-in. 20-cwt AA T T 22† E P +OQF 3.7-in. AA T T 23† E N P diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt index 8074b49..79b74c7 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt @@ -32,7 +32,7 @@ M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s 122mm G obr. 38 NT s6 NT s6 13 B D† Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† -Cannone-mitra. da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 +Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† 3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt index 4ba1140..c5ce81d 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt @@ -32,7 +32,7 @@ M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s 122mm G obr. 38 NT s6 NT s6 13 B D† Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† -Cannone-mitra. da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 +Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† 3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt index a817967..9ff5460 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt @@ -32,7 +32,7 @@ M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s 122mm G obr. 38 NT s6 NT s6 13 B D† Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† -Cannone-mitra. da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 +Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† 3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt index cf5dbb4..6ba493b 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt @@ -32,7 +32,7 @@ M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s 122mm G obr. 38 NT s6 NT s6 13 B D† Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† -Cannone-mitra. da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 +Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† 3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt index 26b0d38..c7b90bd 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt @@ -32,7 +32,7 @@ M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s 122mm G obr. 38 NT s6 NT s6 13 B D† Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† -Cannone-mitra. da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 +Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† 3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt index 8f142dd..afd0973 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt @@ -32,7 +32,7 @@ M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s 122mm G obr. 38 NT s6 NT s6 13 B D† Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† -Cannone-mitra. da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 +Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1 2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G† 3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt index b9f1526..271ebe1 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt @@ -1,25 +1,25 @@ === ordnance/french/1940 === -Name Capabilities (effective) # Notes ----------------------------- ------------------------------- ------------------------------- ------ -------- -LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E -Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† 2† A B V -Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V -Fusil Antichar Boys 1PP 1PP 4† B -Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P -Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V -Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E -Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† -Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P -Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P -Canon de 105 M mle 28 NT h-d NT h-d 12† A P -Canon de 105 C mle 35 B NT NT 13 E F† -Canon de 105 L mle 13 S NT NT 14† P -Canon de 105 L mle 36 S NT NT 15 E F† -Canon de 155 C mle 17 S NT s8 NT s8 16† n/a -Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a -Mitr. de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V -Mitr. de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a -Canon Auto. de 25 CA mle 38 T T 20†[1] G† -Canon de 75 CA mle 32 T NM T NM 21† n/a +Name Capabilities (effective) # Notes +--------------------------------- ------------------------------- ------------------------------- ------ -------- +LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E +Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† 2† A B V +Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V +Fusil Antichar Boys 1PP 1PP 4† B +Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P +Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V +Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E +Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† +Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P +Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P +Canon de 105 M mle 28 NT h-d NT h-d 12† A P +Canon de 105 C mle 35 B NT NT 13 E F† +Canon de 105 L mle 13 S NT NT 14† P +Canon de 105 L mle 36 S NT NT 15 E F† +Canon de 155 C mle 17 S NT s8 NT s8 16† n/a +Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V +Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a +Canon Automatique de 25 CA mle 38 T T 20†[1] G† +Canon de 75 CA mle 32 T NM T NM 21† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt index 3f0861c..72d3f9d 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt @@ -1,25 +1,25 @@ === ordnance/french/1941 === -Name Capabilities (effective) # Notes ----------------------------- ------------------------------- ------------------------------- ------ -------- -LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E -Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† 2† A B V -Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V -Fusil Antichar Boys 1PP 1PP 4† B -Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P -Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V -Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E -Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† -Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P -Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P -Canon de 105 M mle 28 NT h-d NT h-d 12† A P -Canon de 105 C mle 35 B NT NT 13 E F† -Canon de 105 L mle 13 S NT NT 14† P -Canon de 105 L mle 36 S NT NT 15 E F† -Canon de 155 C mle 17 S NT s8 NT s8 16† n/a -Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a -Mitr. de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V -Mitr. de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a -Canon Auto. de 25 CA mle 38 T T 20†[1] G† -Canon de 75 CA mle 32 T NM T NM 21† n/a +Name Capabilities (effective) # Notes +--------------------------------- ------------------------------- ------------------------------- ------ -------- +LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E +Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† 2† A B V +Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V +Fusil Antichar Boys 1PP 1PP 4† B +Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P +Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V +Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E +Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† +Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P +Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P +Canon de 105 M mle 28 NT h-d NT h-d 12† A P +Canon de 105 C mle 35 B NT NT 13 E F† +Canon de 105 L mle 13 S NT NT 14† P +Canon de 105 L mle 36 S NT NT 15 E F† +Canon de 155 C mle 17 S NT s8 NT s8 16† n/a +Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V +Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a +Canon Automatique de 25 CA mle 38 T T 20†[1] G† +Canon de 75 CA mle 32 T NM T NM 21† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt index 1bebb30..1476173 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt @@ -1,25 +1,25 @@ === ordnance/french/1942 === -Name Capabilities (effective) # Notes ----------------------------- ------------------------------- ------------------------------- ------ -------- -LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E -Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V -Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V -Fusil Antichar Boys 1PP 1PP 4† B -Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P -Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V -Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E -Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† -Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P -Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P -Canon de 105 M mle 28 NT h-d NT h-d 12† A P -Canon de 105 C mle 35 B NT NT 13 E F† -Canon de 105 L mle 13 S NT NT 14† P -Canon de 105 L mle 36 S NT NT 15 E F† -Canon de 155 C mle 17 S NT s8 NT s8 16† n/a -Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a -Mitr. de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V -Mitr. de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a -Canon Auto. de 25 CA mle 38 T T 20†[1] G† -Canon de 75 CA mle 32 T NM T NM 21† n/a +Name Capabilities (effective) # Notes +--------------------------------- ------------------------------- ------------------------------- ------ -------- +LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E +Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V +Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V +Fusil Antichar Boys 1PP 1PP 4† B +Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P +Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V +Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E +Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† +Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P +Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P +Canon de 105 M mle 28 NT h-d NT h-d 12† A P +Canon de 105 C mle 35 B NT NT 13 E F† +Canon de 105 L mle 13 S NT NT 14† P +Canon de 105 L mle 36 S NT NT 15 E F† +Canon de 155 C mle 17 S NT s8 NT s8 16† n/a +Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V +Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a +Canon Automatique de 25 CA mle 38 T T 20†[1] G† +Canon de 75 CA mle 32 T NM T NM 21† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt index 8660441..a7c2546 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt @@ -1,25 +1,25 @@ === ordnance/french/1943 === -Name Capabilities (effective) # Notes ----------------------------- ------------------------------- ------------------------------- ------ -------- -LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E -Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V -Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V -Fusil Antichar Boys 1PP 1PP 4† B -Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P -Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V -Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E -Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† -Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P -Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P -Canon de 105 M mle 28 NT h-d NT h-d 12† A P -Canon de 105 C mle 35 B NT NT 13 E F† -Canon de 105 L mle 13 S NT NT 14† P -Canon de 105 L mle 36 S NT NT 15 E F† -Canon de 155 C mle 17 S NT s8 NT s8 16† n/a -Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a -Mitr. de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V -Mitr. de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a -Canon Auto. de 25 CA mle 38 T T 20†[1] G† -Canon de 75 CA mle 32 T NM T NM 21† n/a +Name Capabilities (effective) # Notes +--------------------------------- ------------------------------- ------------------------------- ------ -------- +LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E +Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V +Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V +Fusil Antichar Boys 1PP 1PP 4† B +Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P +Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V +Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E +Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† +Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P +Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P +Canon de 105 M mle 28 NT h-d NT h-d 12† A P +Canon de 105 C mle 35 B NT NT 13 E F† +Canon de 105 L mle 13 S NT NT 14† P +Canon de 105 L mle 36 S NT NT 15 E F† +Canon de 155 C mle 17 S NT s8 NT s8 16† n/a +Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V +Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a +Canon Automatique de 25 CA mle 38 T T 20†[1] G† +Canon de 75 CA mle 32 T NM T NM 21† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt index 7053dfa..19a4e01 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt @@ -1,25 +1,25 @@ === ordnance/french/1944 === -Name Capabilities (effective) # Notes ----------------------------- ------------------------------- ------------------------------- ------ -------- -LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E -Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V -Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V -Fusil Antichar Boys 1PP 1PP 4† B -Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P -Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V -Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E -Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† -Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P -Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P -Canon de 105 M mle 28 NT h-d NT h-d 12† A P -Canon de 105 C mle 35 B NT NT 13 E F† -Canon de 105 L mle 13 S NT NT 14† P -Canon de 105 L mle 36 S NT NT 15 E F† -Canon de 155 C mle 17 S NT s8 NT s8 16† n/a -Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a -Mitr. de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V -Mitr. de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a -Canon Auto. de 25 CA mle 38 T T 20†[1] G† -Canon de 75 CA mle 32 T NM T NM 21† n/a +Name Capabilities (effective) # Notes +--------------------------------- ------------------------------- ------------------------------- ------ -------- +LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E +Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V +Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V +Fusil Antichar Boys 1PP 1PP 4† B +Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P +Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V +Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E +Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† +Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P +Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P +Canon de 105 M mle 28 NT h-d NT h-d 12† A P +Canon de 105 C mle 35 B NT NT 13 E F† +Canon de 105 L mle 13 S NT NT 14† P +Canon de 105 L mle 36 S NT NT 15 E F† +Canon de 155 C mle 17 S NT s8 NT s8 16† n/a +Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V +Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a +Canon Automatique de 25 CA mle 38 T T 20†[1] G† +Canon de 75 CA mle 32 T NM T NM 21† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt index 3435b37..b43aeb3 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt @@ -1,25 +1,25 @@ === ordnance/french/1945 === -Name Capabilities (effective) # Notes ----------------------------- ------------------------------- ------------------------------- ------ -------- -LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E -Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V -Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V -Fusil Antichar Boys 1PP 1PP 4† B -Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P -Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V -Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E -Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† -Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P -Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P -Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P -Canon de 105 M mle 28 NT h-d NT h-d 12† A P -Canon de 105 C mle 35 B NT NT 13 E F† -Canon de 105 L mle 13 S NT NT 14† P -Canon de 105 L mle 36 S NT NT 15 E F† -Canon de 155 C mle 17 S NT s8 NT s8 16† n/a -Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a -Mitr. de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V -Mitr. de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a -Canon Auto. de 25 CA mle 38 T T 20†[1] G† -Canon de 75 CA mle 32 T NM T NM 21† n/a +Name Capabilities (effective) # Notes +--------------------------------- ------------------------------- ------------------------------- ------ -------- +LG de 50 mle 37(f) 2PP crewed† 2PP crewed† 1 A B C† E +Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V +Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V +Fusil Antichar Boys 1PP 1PP 4† B +Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P +Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V +Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST no shield h-d HE7 LF [NT] s6 ST no shield 7 E +Canon de 37 mle 16 TR 5PP (3PP dm) crewed† 5PP (3PP dm) crewed† 8†[1] A C† +Canon de 65 M mle 06 NT QSU no Gunshield h-d NT QSU no Gunshield h-d 9† A P +Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P +Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P +Canon de 105 M mle 28 NT h-d NT h-d 12† A P +Canon de 105 C mle 35 B NT NT 13 E F† +Canon de 105 L mle 13 S NT NT 14† P +Canon de 105 L mle 36 S NT NT 15 E F† +Canon de 155 C mle 17 S NT s8 NT s8 16† n/a +Canon de 155 GPF NT RFNM no IF NT RFNM no IF 17† n/a +Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] Towing NA†[1] T 2 TK DR†[1] Towing NA†[1] 18†[1] B G† V +Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a +Canon Automatique de 25 CA mle 38 T T 20†[1] G† +Canon de 75 CA mle 32 T NM T NM 21† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt index ea6c809..0a90a80 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt @@ -1,24 +1,24 @@ === ordnance/italian/1940 === -Name Capabilities (effective) # Notes ----------------------- ----------------------------------- ----------------------------------- --- ------------------------- -Mortaio da 45 "Brixia" 4PP 4PP 1 N -Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N -Fucile-cc S 5PP 5PP 3 N -Cannone-cc da 37/45 NT QSU NT QSU 4† C N R -Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield 5† A C N -Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield 6† A C H†1 N -Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R -Obice da 75/13 NT QSU NT QSU 8† A -Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N -Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N -Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1 -Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N -Cannone da 105/28 NT s8 NT s8 13† N -Obice 149/13 NT NT 14† N -Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R -Cannone da 149/40 NT RFNM NT RFNM 16† N -Cannone-mitr. da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N -Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a -Cannone-aa da 75/46 T T 19† N -Cannone-aa da 90/53 T T 20† N R +Name Capabilities (effective) # Notes +---------------------------- ----------------------------------- ----------------------------------- --- ------------------------- +Mortaio da 45 "Brixia" 4PP 4PP 1 N +Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N +Fucile-cc S 5PP 5PP 3 N +Cannone-cc da 37/45 NT QSU NT QSU 4† C N R +Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield 5† A C N +Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield 6† A C H†1 N +Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R +Obice da 75/13 NT QSU NT QSU 8† A +Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N +Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N +Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1 +Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N +Cannone da 105/28 NT s8 NT s8 13† N +Obice 149/13 NT NT 14† N +Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R +Cannone da 149/40 NT RFNM NT RFNM 16† N +Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N +Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a +Cannone-aa da 75/46 T T 19† N +Cannone-aa da 90/53 T T 20† N R diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt index 8c39ea5..61e65f3 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt @@ -1,24 +1,24 @@ === ordnance/italian/1941 === -Name Capabilities (effective) # Notes ----------------------- ----------------------------------- ----------------------------------- --- ------------------------- -Mortaio da 45 "Brixia" 4PP 4PP 1 N -Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N -Fucile-cc S 5PP 5PP 3 N -Cannone-cc da 37/45 NT QSU NT QSU 4† C N R -Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield 5† A C N -Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield 6† A C H†1 N -Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R -Obice da 75/13 NT QSU NT QSU 8† A -Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N -Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N -Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1 -Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N -Cannone da 105/28 NT s8 NT s8 13† N -Obice 149/13 NT NT 14† N -Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R -Cannone da 149/40 NT RFNM NT RFNM 16† N -Cannone-mitr. da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N -Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a -Cannone-aa da 75/46 T T 19† N -Cannone-aa da 90/53 T T 20† N R +Name Capabilities (effective) # Notes +---------------------------- ----------------------------------- ----------------------------------- --- ------------------------- +Mortaio da 45 "Brixia" 4PP 4PP 1 N +Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N +Fucile-cc S 5PP 5PP 3 N +Cannone-cc da 37/45 NT QSU NT QSU 4† C N R +Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield 5† A C N +Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield 6† A C H†1 N +Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R +Obice da 75/13 NT QSU NT QSU 8† A +Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N +Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N +Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1 +Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N +Cannone da 105/28 NT s8 NT s8 13† N +Obice 149/13 NT NT 14† N +Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R +Cannone da 149/40 NT RFNM NT RFNM 16† N +Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N +Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a +Cannone-aa da 75/46 T T 19† N +Cannone-aa da 90/53 T T 20† N R diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt index 7e73d0b..7f52841 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt @@ -1,24 +1,24 @@ === ordnance/italian/1942 === -Name Capabilities (effective) # Notes ----------------------- ----------------------------------- ----------------------------------- --- ------------------------- -Mortaio da 45 "Brixia" 4PP 4PP 1 N -Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N -Fucile-cc S 5PP 5PP 3 N -Cannone-cc da 37/45 NT QSU NT QSU 4† C N R -Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield Towed† 5† A C N -Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield 6† A C H†1 N -Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R -Obice da 75/13 NT QSU NT QSU 8† A -Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N -Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N -Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1 -Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N -Cannone da 105/28 NT s8 NT s8 13† N -Obice 149/13 NT NT 14† N -Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R -Cannone da 149/40 NT RFNM NT RFNM 16† N -Cannone-mitr. da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N -Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a -Cannone-aa da 75/46 T T 19† N -Cannone-aa da 90/53 T T 20† N R +Name Capabilities (effective) # Notes +---------------------------- ----------------------------------- ----------------------------------- --- ------------------------- +Mortaio da 45 "Brixia" 4PP 4PP 1 N +Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N +Fucile-cc S 5PP 5PP 3 N +Cannone-cc da 37/45 NT QSU NT QSU 4† C N R +Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield Towed† 5† A C N +Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield 6† A C H†1 N +Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R +Obice da 75/13 NT QSU NT QSU 8† A +Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N +Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N +Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1 +Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N +Cannone da 105/28 NT s8 NT s8 13† N +Obice 149/13 NT NT 14† N +Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R +Cannone da 149/40 NT RFNM NT RFNM 16† N +Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N +Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a +Cannone-aa da 75/46 T T 19† N +Cannone-aa da 90/53 T T 20† N R diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt index ea221b1..fefe8fe 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt @@ -1,24 +1,24 @@ === ordnance/italian/1943 === -Name Capabilities (effective) # Notes ----------------------- ----------------------------------- ----------------------------------- --- ------------------------- -Mortaio da 45 "Brixia" 4PP 4PP 1 N -Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N -Fucile-cc S 5PP 5PP 3 N -Cannone-cc da 37/45 NT QSU NT QSU 4† C N R -Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield Towed† 5† A C N -Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield H6†[1] 6† A C H†1 N -Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R -Obice da 75/13 NT QSU NT QSU 8† A -Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N -Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N -Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1 -Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N -Cannone da 105/28 NT s8 NT s8 13† N -Obice 149/13 NT NT 14† N -Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R -Cannone da 149/40 NT RFNM NT RFNM 16† N -Cannone-mitr. da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N -Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a -Cannone-aa da 75/46 T T 19† N -Cannone-aa da 90/53 T T 20† N R +Name Capabilities (effective) # Notes +---------------------------- ----------------------------------- ----------------------------------- --- ------------------------- +Mortaio da 45 "Brixia" 4PP 4PP 1 N +Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N +Fucile-cc S 5PP 5PP 3 N +Cannone-cc da 37/45 NT QSU NT QSU 4† C N R +Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield Towed† 5† A C N +Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield H6†[1] 6† A C H†1 N +Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R +Obice da 75/13 NT QSU NT QSU 8† A +Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N +Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N +Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1 +Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N +Cannone da 105/28 NT s8 NT s8 13† N +Obice 149/13 NT NT 14† N +Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R +Cannone da 149/40 NT RFNM NT RFNM 16† N +Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N +Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a +Cannone-aa da 75/46 T T 19† N +Cannone-aa da 90/53 T T 20† N R diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt index b5f42d7..95d0f09 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt @@ -1,24 +1,24 @@ === ordnance/italian/1944 === -Name Capabilities (effective) # Notes ----------------------- ----------------------------------- ----------------------------------- --- ------------------------- -Mortaio da 45 "Brixia" 4PP 4PP 1 N -Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N -Fucile-cc S 5PP 5PP 3 N -Cannone-cc da 37/45 NT QSU NT QSU 4† C N R -Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield Towed† 5† A C N -Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield H6†[1] 6† A C H†1 N -Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R -Obice da 75/13 NT QSU NT QSU 8† A -Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N -Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N -Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1 -Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N -Cannone da 105/28 NT s8 NT s8 13† N -Obice 149/13 NT NT 14† N -Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R -Cannone da 149/40 NT RFNM NT RFNM 16† N -Cannone-mitr. da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N -Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a -Cannone-aa da 75/46 T T 19† N -Cannone-aa da 90/53 T T 20† N R +Name Capabilities (effective) # Notes +---------------------------- ----------------------------------- ----------------------------------- --- ------------------------- +Mortaio da 45 "Brixia" 4PP 4PP 1 N +Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N +Fucile-cc S 5PP 5PP 3 N +Cannone-cc da 37/45 NT QSU NT QSU 4† C N R +Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield Towed† 5† A C N +Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield H6†[1] 6† A C H†1 N +Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R +Obice da 75/13 NT QSU NT QSU 8† A +Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N +Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N +Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1 +Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N +Cannone da 105/28 NT s8 NT s8 13† N +Obice 149/13 NT NT 14† N +Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R +Cannone da 149/40 NT RFNM NT RFNM 16† N +Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N +Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a +Cannone-aa da 75/46 T T 19† N +Cannone-aa da 90/53 T T 20† N R diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt index 3a4d1f0..d45039d 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt @@ -1,24 +1,24 @@ === ordnance/italian/1945 === -Name Capabilities (effective) # Notes ----------------------- ----------------------------------- ----------------------------------- --- ------------------------- -Mortaio da 45 "Brixia" 4PP 4PP 1 N -Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N -Fucile-cc S 5PP 5PP 3 N -Cannone-cc da 37/45 NT QSU NT QSU 4† C N R -Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield Towed† 5† A C N -Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield H6†[1] 6† A C H†1 N -Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R -Obice da 75/13 NT QSU NT QSU 8† A -Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N -Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N -Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1 -Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N -Cannone da 105/28 NT s8 NT s8 13† N -Obice 149/13 NT NT 14† N -Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R -Cannone da 149/40 NT RFNM NT RFNM 16† N -Cannone-mitr. da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N -Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a -Cannone-aa da 75/46 T T 19† N -Cannone-aa da 90/53 T T 20† N R +Name Capabilities (effective) # Notes +---------------------------- ----------------------------------- ----------------------------------- --- ------------------------- +Mortaio da 45 "Brixia" 4PP 4PP 1 N +Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N +Fucile-cc S 5PP 5PP 3 N +Cannone-cc da 37/45 NT QSU NT QSU 4† C N R +Cannone da 47/32 NT QSU no Gunshield Towed[A1+]† NT QSU no Gunshield Towed† 5† A C N +Cannone da 65/17 NT no Gunshield H6[S2+]†[1] NT no Gunshield H6†[1] 6† A C H†1 N +Cannone da 70/15 NT QSU Acq. NA†[1] no Gunshield h-d NT QSU Acq. NA†[1] no Gunshield h-d 7† A B†1 R +Obice da 75/13 NT QSU NT QSU 8† A +Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N +Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N +Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1 +Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N +Cannone da 105/28 NT s8 NT s8 13† N +Obice 149/13 NT NT 14† N +Cannone da 149/35 NT RFNM no IF Acq. NA†[1] s8 NT RFNM no IF Acq. NA†[1] s8 15† B†1 N R +Cannone da 149/40 NT RFNM NT RFNM 16† N +Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N +Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a +Cannone-aa da 75/46 T T 19† N +Cannone-aa da 90/53 T T 20† N R diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt index 8e6ef35..bf77281 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt @@ -1,54 +1,54 @@ === vehicles/french/1940 === -Name Radio IF Crew survival Capabilities (effective) # Notes ------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- -FT-17M ® yes CS 2 n/a n/a 1† C -FT-17C ® yes CS 2 AP9 AP9 1† C -FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C -AMR 33 ® yes CS 2 n/a n/a 2† E -AMR 35 ® yes CS 2 n/a n/a 3† E -AMR 35(L) ® yes CS 2 n/a n/a 3† E -R35 ® yes CS 2 AP10 AP10 4† A†1 C -H35 ® yes CS 2 AP10 AP10 5† A†1 C E -FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 -H39 ® yes CS 2 AP10 AP10 7† A†1 C F -H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E -R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† -D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 -D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 -D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 -S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 -B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 -Valentine V(b) n/a yes CS 4 sM8 sM8 14† F -AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F -AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 -AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 -AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 -AMD 35 ® yes CS 4 n/a n/a 18† E -Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 -Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 -Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 -Camion de Mitr. CA n/a yes CS 4 n/a n/a 21† n/a -Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 -Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 -Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 -Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 -Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 -AMC 29 ® yes CS 3 AP9 AP9 24† n/a -C-K P17 n/a yes cs 4 n/a n/a 25† n/a -C-K P19 n/a yes cs 5 n/a n/a 25† H†1 -SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a -Unic P107 n/a yes cs 5 n/a n/a 27† L†1 -Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K -Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† -Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K -Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 -Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 -Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 -Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 -Laffly V15T n/a yes cs 5 n/a n/a 35 E J† -Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 -Citroën 23 n/a yes cs 5 n/a n/a 36† n/a -Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- +FT-17M ® yes CS 2 n/a n/a 1† C +FT-17C ® yes CS 2 AP9 AP9 1† C +FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C +AMR 33 ® yes CS 2 n/a n/a 2† E +AMR 35 ® yes CS 2 n/a n/a 3† E +AMR 35(L) ® yes CS 2 n/a n/a 3† E +R35 ® yes CS 2 AP10 AP10 4† A†1 C +H35 ® yes CS 2 AP10 AP10 5† A†1 C E +FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 +H39 ® yes CS 2 AP10 AP10 7† A†1 C F +H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E +R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† +D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 +D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 +D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 +S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 +B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 +Valentine V(b) n/a yes CS 4 sM8 sM8 14† F +AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F +AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 +AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 +AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 +AMD 35 ® yes CS 4 n/a n/a 18† E +Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 +Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 +Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 +Camion de Mitrailleuse CA n/a yes CS 4 n/a n/a 21† n/a +Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 +Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 +Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 +Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 +Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 +AMC 29 ® yes CS 3 AP9 AP9 24† n/a +C-K P17 n/a yes cs 4 n/a n/a 25† n/a +C-K P19 n/a yes cs 5 n/a n/a 25† H†1 +SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a +Unic P107 n/a yes cs 5 n/a n/a 27† L†1 +Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K +Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† +Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K +Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 +Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 +Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 +Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 +Laffly V15T n/a yes cs 5 n/a n/a 35 E J† +Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 +Citroën 23 n/a yes cs 5 n/a n/a 36† n/a +Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt index 1804bd0..0d6aa4c 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt @@ -1,54 +1,54 @@ === vehicles/french/1941 === -Name Radio IF Crew survival Capabilities (effective) # Notes ------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- -FT-17M ® yes CS 2 n/a n/a 1† C -FT-17C ® yes CS 2 AP9 AP9 1† C -FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C -AMR 33 ® yes CS 2 n/a n/a 2† E -AMR 35 ® yes CS 2 n/a n/a 3† E -AMR 35(L) ® yes CS 2 n/a n/a 3† E -R35 ® yes CS 2 AP10 AP10 4† A†1 C -H35 ® yes CS 2 AP10 AP10 5† A†1 C E -FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 -H39 ® yes CS 2 AP10 AP10 7† A†1 C F -H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E -R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† -D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 -D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 -D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 -S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 -B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 -Valentine V(b) n/a yes CS 4 sM8 sM8 14† F -AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F -AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 -AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 -AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 -AMD 35 ® yes CS 4 n/a n/a 18† E -Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 -Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 -Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 -Camion de Mitr. CA n/a yes CS 4 n/a n/a 21† n/a -Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 -Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 -Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 -Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 -Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 -AMC 29 ® yes CS 3 AP9 AP9 24† n/a -C-K P17 n/a yes cs 4 n/a n/a 25† n/a -C-K P19 n/a yes cs 5 n/a n/a 25† H†1 -SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a -Unic P107 n/a yes cs 5 n/a n/a 27† L†1 -Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K -Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† -Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K -Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 -Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 -Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 -Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 -Laffly V15T n/a yes cs 5 n/a n/a 35 E J† -Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 -Citroën 23 n/a yes cs 5 n/a n/a 36† n/a -Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- +FT-17M ® yes CS 2 n/a n/a 1† C +FT-17C ® yes CS 2 AP9 AP9 1† C +FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C +AMR 33 ® yes CS 2 n/a n/a 2† E +AMR 35 ® yes CS 2 n/a n/a 3† E +AMR 35(L) ® yes CS 2 n/a n/a 3† E +R35 ® yes CS 2 AP10 AP10 4† A†1 C +H35 ® yes CS 2 AP10 AP10 5† A†1 C E +FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 +H39 ® yes CS 2 AP10 AP10 7† A†1 C F +H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E +R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† +D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 +D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 +D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 +S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 +B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 +Valentine V(b) n/a yes CS 4 sM8 sM8 14† F +AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F +AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 +AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 +AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 +AMD 35 ® yes CS 4 n/a n/a 18† E +Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 +Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 +Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 +Camion de Mitrailleuse CA n/a yes CS 4 n/a n/a 21† n/a +Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 +Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 +Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 +Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 +Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 +AMC 29 ® yes CS 3 AP9 AP9 24† n/a +C-K P17 n/a yes cs 4 n/a n/a 25† n/a +C-K P19 n/a yes cs 5 n/a n/a 25† H†1 +SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a +Unic P107 n/a yes cs 5 n/a n/a 27† L†1 +Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K +Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† +Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K +Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 +Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 +Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 +Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 +Laffly V15T n/a yes cs 5 n/a n/a 35 E J† +Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 +Citroën 23 n/a yes cs 5 n/a n/a 36† n/a +Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt index dc9d6a9..12634f4 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt @@ -1,54 +1,54 @@ === vehicles/french/1942 === -Name Radio IF Crew survival Capabilities (effective) # Notes ------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- -FT-17M ® yes CS 2 n/a n/a 1† C -FT-17C ® yes CS 2 AP9 AP9 1† C -FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C -AMR 33 ® yes CS 2 n/a n/a 2† E -AMR 35 ® yes CS 2 n/a n/a 3† E -AMR 35(L) ® yes CS 2 n/a n/a 3† E -R35 ® yes CS 2 AP10 AP10 4† A†1 C -H35 ® yes CS 2 AP10 AP10 5† A†1 C E -FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 -H39 ® yes CS 2 AP10 AP10 7† A†1 C F -H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E -R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† -D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 -D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 -D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 -S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 -B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 -Valentine V(b) n/a yes CS 4 sM8 sM8 14† F -AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F -AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 -AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 -AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 -AMD 35 ® yes CS 4 n/a n/a 18† E -Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 -Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 -Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 -Camion de Mitr. CA n/a yes CS 4 n/a n/a 21† n/a -Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 -Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 -Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 -Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 -Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 -AMC 29 ® yes CS 3 AP9 AP9 24† n/a -C-K P17 n/a yes cs 4 n/a n/a 25† n/a -C-K P19 n/a yes cs 5 n/a n/a 25† H†1 -SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a -Unic P107 n/a yes cs 5 n/a n/a 27† L†1 -Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K -Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† -Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K -Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 -Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 -Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 -Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 -Laffly V15T n/a yes cs 5 n/a n/a 35 E J† -Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 -Citroën 23 n/a yes cs 5 n/a n/a 36† n/a -Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- +FT-17M ® yes CS 2 n/a n/a 1† C +FT-17C ® yes CS 2 AP9 AP9 1† C +FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C +AMR 33 ® yes CS 2 n/a n/a 2† E +AMR 35 ® yes CS 2 n/a n/a 3† E +AMR 35(L) ® yes CS 2 n/a n/a 3† E +R35 ® yes CS 2 AP10 AP10 4† A†1 C +H35 ® yes CS 2 AP10 AP10 5† A†1 C E +FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 +H39 ® yes CS 2 AP10 AP10 7† A†1 C F +H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E +R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† +D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 +D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 +D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 +S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 +B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 +Valentine V(b) n/a yes CS 4 sM8 sM8 14† F +AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F +AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 +AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 +AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 +AMD 35 ® yes CS 4 n/a n/a 18† E +Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 +Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 +Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 +Camion de Mitrailleuse CA n/a yes CS 4 n/a n/a 21† n/a +Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 +Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 +Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 +Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 +Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 +AMC 29 ® yes CS 3 AP9 AP9 24† n/a +C-K P17 n/a yes cs 4 n/a n/a 25† n/a +C-K P19 n/a yes cs 5 n/a n/a 25† H†1 +SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a +Unic P107 n/a yes cs 5 n/a n/a 27† L†1 +Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K +Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† +Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K +Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 +Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 +Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 +Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 +Laffly V15T n/a yes cs 5 n/a n/a 35 E J† +Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 +Citroën 23 n/a yes cs 5 n/a n/a 36† n/a +Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt index b5bc8f4..3afc7b2 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt @@ -1,54 +1,54 @@ === vehicles/french/1943 === -Name Radio IF Crew survival Capabilities (effective) # Notes ------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- -FT-17M ® yes CS 2 n/a n/a 1† C -FT-17C ® yes CS 2 AP9 AP9 1† C -FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C -AMR 33 ® yes CS 2 n/a n/a 2† E -AMR 35 ® yes CS 2 n/a n/a 3† E -AMR 35(L) ® yes CS 2 n/a n/a 3† E -R35 ® yes CS 2 AP10 AP10 4† A†1 C -H35 ® yes CS 2 AP10 AP10 5† A†1 C E -FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 -H39 ® yes CS 2 AP10 AP10 7† A†1 C F -H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E -R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† -D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 -D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 -D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 -S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 -B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 -Valentine V(b) n/a yes CS 4 sM8 sM8 14† F -AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F -AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 -AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 -AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 -AMD 35 ® yes CS 4 n/a n/a 18† E -Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 -Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 -Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 -Camion de Mitr. CA n/a yes CS 4 n/a n/a 21† n/a -Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 -Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 -Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 -Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 -Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 -AMC 29 ® yes CS 3 AP9 AP9 24† n/a -C-K P17 n/a yes cs 4 n/a n/a 25† n/a -C-K P19 n/a yes cs 5 n/a n/a 25† H†1 -SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a -Unic P107 n/a yes cs 5 n/a n/a 27† L†1 -Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K -Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† -Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K -Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 -Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 -Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 -Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 -Laffly V15T n/a yes cs 5 n/a n/a 35 E J† -Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 -Citroën 23 n/a yes cs 5 n/a n/a 36† n/a -Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- +FT-17M ® yes CS 2 n/a n/a 1† C +FT-17C ® yes CS 2 AP9 AP9 1† C +FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C +AMR 33 ® yes CS 2 n/a n/a 2† E +AMR 35 ® yes CS 2 n/a n/a 3† E +AMR 35(L) ® yes CS 2 n/a n/a 3† E +R35 ® yes CS 2 AP10 AP10 4† A†1 C +H35 ® yes CS 2 AP10 AP10 5† A†1 C E +FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 +H39 ® yes CS 2 AP10 AP10 7† A†1 C F +H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E +R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† +D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 +D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 +D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 +S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 +B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 +Valentine V(b) n/a yes CS 4 sM8 sM8 14† F +AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F +AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 +AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 +AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 +AMD 35 ® yes CS 4 n/a n/a 18† E +Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 +Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 +Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 +Camion de Mitrailleuse CA n/a yes CS 4 n/a n/a 21† n/a +Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 +Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 +Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 +Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 +Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 +AMC 29 ® yes CS 3 AP9 AP9 24† n/a +C-K P17 n/a yes cs 4 n/a n/a 25† n/a +C-K P19 n/a yes cs 5 n/a n/a 25† H†1 +SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a +Unic P107 n/a yes cs 5 n/a n/a 27† L†1 +Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K +Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† +Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K +Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 +Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 +Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 +Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 +Laffly V15T n/a yes cs 5 n/a n/a 35 E J† +Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 +Citroën 23 n/a yes cs 5 n/a n/a 36† n/a +Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt index afdd239..2e130dc 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt @@ -1,54 +1,54 @@ === vehicles/french/1944 === -Name Radio IF Crew survival Capabilities (effective) # Notes ------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- -FT-17M ® yes CS 2 n/a n/a 1† C -FT-17C ® yes CS 2 AP9 AP9 1† C -FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C -AMR 33 ® yes CS 2 n/a n/a 2† E -AMR 35 ® yes CS 2 n/a n/a 3† E -AMR 35(L) ® yes CS 2 n/a n/a 3† E -R35 ® yes CS 2 AP10 AP10 4† A†1 C -H35 ® yes CS 2 AP10 AP10 5† A†1 C E -FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 -H39 ® yes CS 2 AP10 AP10 7† A†1 C F -H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E -R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† -D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 -D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 -D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 -S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 -B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 -Valentine V(b) n/a yes CS 4 sM8 sM8 14† F -AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F -AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 -AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 -AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 -AMD 35 ® yes CS 4 n/a n/a 18† E -Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 -Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 -Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 -Camion de Mitr. CA n/a yes CS 4 n/a n/a 21† n/a -Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 -Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 -Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 -Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 -Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 -AMC 29 ® yes CS 3 AP9 AP9 24† n/a -C-K P17 n/a yes cs 4 n/a n/a 25† n/a -C-K P19 n/a yes cs 5 n/a n/a 25† H†1 -SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a -Unic P107 n/a yes cs 5 n/a n/a 27† L†1 -Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K -Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† -Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K -Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 -Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 -Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 -Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 -Laffly V15T n/a yes cs 5 n/a n/a 35 E J† -Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 -Citroën 23 n/a yes cs 5 n/a n/a 36† n/a -Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- +FT-17M ® yes CS 2 n/a n/a 1† C +FT-17C ® yes CS 2 AP9 AP9 1† C +FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C +AMR 33 ® yes CS 2 n/a n/a 2† E +AMR 35 ® yes CS 2 n/a n/a 3† E +AMR 35(L) ® yes CS 2 n/a n/a 3† E +R35 ® yes CS 2 AP10 AP10 4† A†1 C +H35 ® yes CS 2 AP10 AP10 5† A†1 C E +FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 +H39 ® yes CS 2 AP10 AP10 7† A†1 C F +H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E +R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† +D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 +D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 +D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 +S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 +B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 +Valentine V(b) n/a yes CS 4 sM8 sM8 14† F +AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F +AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 +AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 +AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 +AMD 35 ® yes CS 4 n/a n/a 18† E +Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 +Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 +Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 +Camion de Mitrailleuse CA n/a yes CS 4 n/a n/a 21† n/a +Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 +Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 +Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 +Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 +Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 +AMC 29 ® yes CS 3 AP9 AP9 24† n/a +C-K P17 n/a yes cs 4 n/a n/a 25† n/a +C-K P19 n/a yes cs 5 n/a n/a 25† H†1 +SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a +Unic P107 n/a yes cs 5 n/a n/a 27† L†1 +Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K +Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† +Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K +Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 +Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 +Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 +Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 +Laffly V15T n/a yes cs 5 n/a n/a 35 E J† +Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 +Citroën 23 n/a yes cs 5 n/a n/a 36† n/a +Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt index 33d96e1..4c7b052 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt @@ -1,54 +1,54 @@ === vehicles/french/1945 === -Name Radio IF Crew survival Capabilities (effective) # Notes ------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- -FT-17M ® yes CS 2 n/a n/a 1† C -FT-17C ® yes CS 2 AP9 AP9 1† C -FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C -AMR 33 ® yes CS 2 n/a n/a 2† E -AMR 35 ® yes CS 2 n/a n/a 3† E -AMR 35(L) ® yes CS 2 n/a n/a 3† E -R35 ® yes CS 2 AP10 AP10 4† A†1 C -H35 ® yes CS 2 AP10 AP10 5† A†1 C E -FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 -H39 ® yes CS 2 AP10 AP10 7† A†1 C F -H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E -R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F -R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† -D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 -D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 -D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 -S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 -B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 -Valentine V(b) n/a yes CS 4 sM8 sM8 14† F -AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F -AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 -AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 -AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 -AMD 35 ® yes CS 4 n/a n/a 18† E -Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 -Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 -Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 -Camion de Mitr. CA n/a yes CS 4 n/a n/a 21† n/a -Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 -Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 -Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 -Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 -Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 -AMC 29 ® yes CS 3 AP9 AP9 24† n/a -C-K P17 n/a yes cs 4 n/a n/a 25† n/a -C-K P19 n/a yes cs 5 n/a n/a 25† H†1 -SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a -Unic P107 n/a yes cs 5 n/a n/a 27† L†1 -Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K -Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† -Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K -Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 -Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 -Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 -Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 -Laffly V15T n/a yes cs 5 n/a n/a 35 E J† -Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 -Citroën 23 n/a yes cs 5 n/a n/a 36† n/a -Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a +Name Radio IF Crew survival Capabilities (effective) # Notes +------------------------- --------------- ----- ------------------------------------ -------------- ------------- --- ----------------------------------------------------------------- +FT-17M ® yes CS 2 n/a n/a 1† C +FT-17C ® yes CS 2 AP9 AP9 1† C +FT-17 75BS ® n/a CS 3 (brew up) n/a n/a 1† C +AMR 33 ® yes CS 2 n/a n/a 2† E +AMR 35 ® yes CS 2 n/a n/a 3† E +AMR 35(L) ® yes CS 2 n/a n/a 3† E +R35 ® yes CS 2 AP10 AP10 4† A†1 C +H35 ® yes CS 2 AP10 AP10 5† A†1 C E +FCM 36 ® yes CS 2 AP10 AP10 6† C E I†1 +H39 ® yes CS 2 AP10 AP10 7† A†1 C F +H39(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +H35(L) ® yes CS 2 AP10 AP10 8† A†1 C E +R35(L) ® yes CS 2 AP10 AP10 8† A†1 C E F +R40 ® yes CS 2 AP10 AP10 9 A†1 C E I† +D1 ®9†1 yes CS 3 n/a n/a 10† B†3 C I†2 R†1 +D2 ®9†1 yes CS 3 n/a n/a 11† B†3 C E I†2 R†1 +D2(L) ®9†1 yes CS 3 n/a n/a 11† A†4 B†3 C E I†2 R†1 +S35 ®9†1 yes CS 4 n/a n/a 12† A†3 C F I†2 R†1 +B1-bis ®9†1 (75†) CS 5 (brew up) AP9[75]† AP9[75]† 13† A†4 B†3 C E F I†2 R†1 +Valentine V(b) n/a yes CS 4 sM8 sM8 14† F +AM Dodge(a) n/a yes CS 6† AP10 AP10 15† F +AMD 20 cv TOE ®9†1 yes CS 4 AP9 AP9 16† D†2 R†1 +AMD 50 AM ® yes CS 4 AP9 AP9 17† D†1 +AMD 80 AM ® yes CS 4 n/a n/a 17† D†1 +AMD 35 ® yes CS 4 n/a n/a 18† E +Laffly W15T CC n/a yes CS 3 n/a n/a 19† E J†1 +Ac de 75 Conus(b) n/a yes CS 5 s8 s8 20† F M†1 +Ac de 75 mle 97 n/a yes CS 4 s8 s8 20† M†1 +Camion de Mitrailleuse CA n/a yes CS 4 n/a n/a 21† n/a +Camion de 13.2 CAJ n/a yes CS 4 n/a n/a 21† AA†1 +Camion de 20 CA n/a yes CS 4 n/a n/a 21† AA†1 +Ac de 25 CA n/a yes CS 4 n/a n/a 21† F AA†1 +Ac de 40 CA(a) n/a yes CS 4 n/a n/a 22 E F M† AA†1 +Ac de 75 mle 13/34 n/a yes CS 7 n/a n/a 23† D†1 F AA†2 +AMC 29 ® yes CS 3 AP9 AP9 24† n/a +C-K P17 n/a yes cs 4 n/a n/a 25† n/a +C-K P19 n/a yes cs 5 n/a n/a 25† H†1 +SOMUA MCG n/a yes cs 4 n/a n/a 26† n/a +Unic P107 n/a yes cs 5 n/a n/a 27† L†1 +Renault UE n/a yes cs 2†1 n/a n/a 28† G†1 K +Lorraine 38L n/a yes cs 3/2† n/a n/a 29† E H† +Lorraine 37L 44 n/a yes CS 3 n/a n/a 30† E K +Carrier AC(b) n/a yes CS 3 n/a n/a 31† F M†1 +Latil TAR H2 n/a yes cs 5 n/a n/a 32† J†1 +Laffly S15T n/a yes cs 5 n/a n/a 33† J†1 L†2 +Laffly S20TL n/a yes cs 5 n/a n/a 34† E J†1 +Laffly V15T n/a yes cs 5 n/a n/a 35 E J† +Peugeot 202 n/a yes cs 2†1 n/a n/a 36† G†1 +Citroën 23 n/a yes cs 5 n/a n/a 36† n/a +Renault AGR2 n/a yes cs 7 n/a n/a 36† n/a