From f7dda94b900a4ea77209d42d26e945f4078de819 Mon Sep 17 00:00:00 2001 From: Taka Date: Mon, 6 Aug 2018 15:17:21 +0000 Subject: [PATCH] Added the ability to include raw capabilities in snippets. --- vasl_templates/webapp/static/snippets.js | 73 ++++-- .../webapp/templates/vo-report.html | 6 +- .../data/default-template-pack/ordnance.j2 | 3 +- .../data/default-template-pack/vehicles.j2 | 3 +- .../vo-reports/ordnance/german/1940.txt | 64 ++--- .../vo-reports/ordnance/german/1941.txt | 64 ++--- .../vo-reports/ordnance/german/1942.txt | 64 ++--- .../vo-reports/ordnance/german/1943.txt | 64 ++--- .../vo-reports/ordnance/german/1944.txt | 64 ++--- .../vo-reports/ordnance/german/1945.txt | 64 ++--- .../vo-reports/ordnance/russian/1940.txt | 62 ++--- .../vo-reports/ordnance/russian/1941.txt | 62 ++--- .../vo-reports/ordnance/russian/1942.txt | 62 ++--- .../vo-reports/ordnance/russian/1943.txt | 62 ++--- .../vo-reports/ordnance/russian/1944.txt | 62 ++--- .../vo-reports/ordnance/russian/1945.txt | 62 ++--- .../vo-reports/vehicles/german/1940.txt | 244 +++++++++--------- .../vo-reports/vehicles/german/1941.txt | 244 +++++++++--------- .../vo-reports/vehicles/german/1942.txt | 244 +++++++++--------- .../vo-reports/vehicles/german/1943.txt | 244 +++++++++--------- .../vo-reports/vehicles/german/1944.txt | 244 +++++++++--------- .../vo-reports/vehicles/german/1945.txt | 244 +++++++++--------- .../vo-reports/vehicles/russian/1940.txt | 174 ++++++------- .../vo-reports/vehicles/russian/1941.txt | 174 ++++++------- .../vo-reports/vehicles/russian/1942.txt | 174 ++++++------- .../vo-reports/vehicles/russian/1943.txt | 174 ++++++------- .../vo-reports/vehicles/russian/1944.txt | 174 ++++++------- .../vo-reports/vehicles/russian/1945.txt | 174 ++++++------- .../webapp/tests/test_vehicles_ordnance.py | 9 +- .../webapp/tests/test_vo_reports.py | 28 +- 30 files changed, 1717 insertions(+), 1669 deletions(-) diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js index 6f6b3a2..6ee40d3 100644 --- a/vasl_templates/webapp/static/snippets.js +++ b/vasl_templates/webapp/static/snippets.js @@ -230,9 +230,19 @@ function unload_params( params, check_date_capabilities ) } ; if ( entry.no_radio ) obj.no_radio = entry.no_radio ; - var capabilities = make_capabilities( entry, params.SCENARIO_YEAR, params.SCENARIO_MONTH, check_date_capabilities ) ; + // NOTE: It would be nice to have a Jinja2 filter that inserted the raw capabilities or selected + // the correct one for the scenario date e.g. + // {% for c in veh.capabilities %} {{c|selcap}} {%endif%}} + // but the problem is that if a capability is not available, we want nothing to appear, + // but by the time the filter gets called, it's too late :-( Instead, we provide a "raw_capabilities" + // parameter that people can use in their templates - ugly, but probably not something that will + // get a lot of use :-/ + var capabilities = make_capabilities( entry, params.SCENARIO_YEAR, params.SCENARIO_MONTH, check_date_capabilities, false ) ; if ( capabilities ) obj.capabilities = capabilities ; + capabilities = make_capabilities( entry, params.SCENARIO_YEAR, params.SCENARIO_MONTH, check_date_capabilities, true ) ; + if ( capabilities ) + obj.raw_capabilities = capabilities ; var crew_survival = make_crew_survival( entry ) ; if ( crew_survival ) obj.crew_survival = crew_survival ; @@ -251,7 +261,7 @@ function unload_params( params, check_date_capabilities ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -function make_capabilities( entry, scenario_year, scenario_month, check_date_capabilities ) +function make_capabilities( entry, scenario_year, scenario_month, check_date_capabilities, raw ) { var capabilities = [] ; @@ -266,32 +276,42 @@ function make_capabilities( entry, scenario_year, scenario_month, check_date_cap if ( "capabilities2" in entry ) { var indeterminate_caps=[], unexpected_caps=[], invalid_caps=[] ; for ( var key in entry.capabilities2 ) { - if ( entry.capabilities2[key] instanceof Array ) { - if ( key == "LF" ) - capabilities.push( "LF [" + entry.capabilities2[key].join(", ") + "]" ) ; - else { - if ( ! scenario_year ) - indeterminate_caps.push( key ) ; - if ( $.inArray( key, ["HE","A","D","sD","sN","WP"] ) === -1 ) { - unexpected_caps.push( key ) ; - continue ; - } - var cap = select_capability_by_date( entry.capabilities2[key], scenario_year, scenario_month ) ; - if ( cap == "" ) { - invalid_caps.push( entry.name + ": " + key + " " + entry.capabilities2[key] ) ; - continue ; - } - if ( cap !== null ) - capabilities.push( key + cap ) ; - } + // check if the capability is dependent on the scenario date + if ( !( entry.capabilities2[key] instanceof Array ) ) { + capabilities.push( key + entry.capabilities2[key] ) ; + continue ; + } + // check for LF + if ( key == "LF" ) { + capabilities.push( "LF [" + entry.capabilities2[key].join(", ") + "]" ) ; + continue ; + } + if ( $.inArray( key, ["HE","A","D","sD","sN","WP"] ) === -1 ) { + unexpected_caps.push( key ) ; + continue ; + } + // check if we should return the raw capability, or select the one for the scenario date + if ( ! scenario_year ) { + indeterminate_caps.push( key ) ; + raw = true ; + } + if ( raw ) { + capabilities.push( make_raw_capability( key, entry.capabilities2[key] ) ) ; } else { - capabilities.push( key + entry.capabilities2[key] ) ; + var cap = select_capability_by_date( entry.capabilities2[key], scenario_year, scenario_month ) ; + if ( ! cap ) + continue ; + if ( cap == "" ) { + invalid_caps.push( entry.name + ": " + key + " " + entry.capabilities2[key] ) ; + continue ; + } + capabilities.push( key + cap ) ; } } // check if there were any capabilities not set if ( check_date_capabilities && indeterminate_caps.length > 0 ) { - showErrorMsg( makeBulletListMsg( + showWarningMsg( makeBulletListMsg( "Can't determine capabilities without a scenario year:", indeterminate_caps ) ) ; @@ -321,6 +341,15 @@ function make_capabilities( entry, scenario_year, scenario_month, check_date_cap return capabilities.length > 0 ? capabilities : null ; } +function make_raw_capability( name, capability ) +{ + // generate the raw capability string + var buf = [ name ] ; + for ( var i=0 ; i < capability.length ; ++i ) + buf.push( escapeHTML(capability[i][0]), ""+escapeHTML(capability[i][1])+"" ) ; + return buf.join( "" ) ; +} + function select_capability_by_date( capabilities, scenario_year, scenario_month ) { var MONTH_NAMES = { F: 2, J: 6, } ; diff --git a/vasl_templates/webapp/templates/vo-report.html b/vasl_templates/webapp/templates/vo-report.html index e4ea708..41918ea 100644 --- a/vasl_templates/webapp/templates/vo-report.html +++ b/vasl_templates/webapp/templates/vo-report.html @@ -56,7 +56,7 @@ function load_vo_listings( objs ) buf.push( "Radio" ) ; buf.push( "Crew survival" ) ; } - buf.push( "Capabilities", "Notes" ) ; + buf.push( "Capabilities", "Notes" ) ; for ( var i=0 ; i < objs[nat].length ; ++i ) { var obj = objs[nat][i] ; buf.push( "" ) ; @@ -65,7 +65,9 @@ function load_vo_listings( objs ) buf.push( "", fmtval(obj.no_radio) ) ; buf.push( "", fmtval(make_crew_survival(obj)) ) ; } - var capabilities = make_capabilities( obj, year, true ) ; + var capabilities = make_capabilities( obj, year, 1, true, true ) ; + buf.push( "", listval(capabilities) ) ; + var capabilities = make_capabilities( obj, year, 1, true, false ) ; buf.push( "", listval(capabilities) ) ; buf.push( "", "" + fmtval(obj.note_number) + "" ) ; buf.push( "", listval(obj.notes) ) ; diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ordnance.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ordnance.j2 index ba55fd5..5ae9e0e 100644 --- a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ordnance.j2 +++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ordnance.j2 @@ -1,4 +1,5 @@ [{{PLAYER_NAME}}] ; width={{ORDNANCE_WIDTH}}{%for ord in ORDNANCE %} [*] {{ord.name}}: #={{ord.note_number}}{%if ord.notes%} - notes:{%for n in ord.notes%} "{{n}}"{%endfor%}{%endif%}{%if ord.capabilities%} -- capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%endfor%} +- capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%if ord.raw_capabilities%} +- raw capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%endfor%} diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/vehicles.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/vehicles.j2 index 0f556bf..5196be9 100644 --- a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/vehicles.j2 +++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/vehicles.j2 @@ -2,4 +2,5 @@ [*] {{veh.name}}: #={{veh.note_number}}{%if veh.notes%} - notes:{%for n in veh.notes%} "{{n}}"{%endfor%}{%endif%}{%if veh.crew_survival%} - {{veh.crew_survival}}{%endif%}{%if veh.capabilities%} -- capabilities:{%for c in veh.capabilities%} "{{c}}"{%endfor%}{%endif%}{%endfor%} +- capabilities:{%for c in veh.capabilities%} "{{c}}"{%endfor%}{%endif%}{%if veh.raw_capabilities%} +- raw capabilities:{%for c in veh.raw_capabilities%} "{{c}}"{%endfor%}{%endif%}{%endfor%} diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt index 45f4d2f..31d7d4d 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt @@ -1,34 +1,34 @@ === ordnance/german/1940 === -Name Capabilities # Notes -------------------- ------------------------------------- --- ------- -5cm leGrW 5PP 1 N -8cm GrW 34 NT QSU IR s8 2† N -10cm NbW 35 NT QSU s10 3 O -12cm GrW 42 NT QSU s8 4† n/a -2.8cm sPzB 41 NT QSU uses APCR TK Table† 5† A† N P -3.7cm PaK 35/36 NT QSU H6[9]† 6 B† N P -4.2cm lePaK 41 NT QSU uses APCR TK Table† 7 A† N -5cm PaK 38 NT QSU 8† N -7.5cm PaK 97/38 NT QSU H6 s7 9 N -7.5cm PaK 40 NT QSU s7 10† N -7.62cm PaK 36r NT QSU s6 11† N -8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] 12 C† -8.8cm PaK 43/41 NT 13 n/a -12.8cm K 81/1 NT NM 14 n/a -7.5cm leIG 18 NT QSU H7 15 N O -15cm sIG 33 NT H7 s8 16 N -7.5cm LG 40 T QSU H6 17 N -10.5cm LG 42 T QSU H6 s6 18† N -7.5cm leFK 16nA NT QSU h-d H5 s8 19 n/a -10.5cm leFH 18 NT H6 s8 20 N -s 10cm K 18 NT NM H6 s8 21 N -15cm sFH 18 NT NM H6 s8 22 N -15cm K 18 NT RFNM AP6 23 N -17cm K 18 NT RFNM no IF AP6 24 N -2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] 25 C† N -2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] 26 C† N -2cm FlaKvierling 38 T 4TK DR† 27† N -3.7cm FlaK 36 o. 37 T H5[9]† 28 B† N -3.7cm FlaK 43 T 29 n/a -8.8cm FlaK 18 o. 36 T LF [88L†, 1 ROF, B11] 30 C† N +Name Capabilities (effective) # Notes +------------------- ------------------------------------- ------------------------------------- --- ------- +5cm leGrW 5PP 5PP 1 N +8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N +10cm NbW 35 NT QSU s10 NT QSU s10 3 O +12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a +2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P +3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU H6[9]† 6 B† N P +4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N +5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU 8† N +7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N +7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU s7 10† N +7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU s6 11† N +8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C† +8.8cm PaK 43/41 NT NT 13 n/a +12.8cm K 81/1 NT NM NT NM 14 n/a +7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O +15cm sIG 33 NT H7 s8 NT H7 s8 16 N +7.5cm LG 40 T QSU H6 T QSU H6 17 N +10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† N +7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a +10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N +s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N +15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N +15cm K 18 NT RFNM AP6 NT RFNM AP6 23 N +17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N +2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N +2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N +2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N +3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N +3.7cm FlaK 43 T T 29 n/a +8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T LF [88L†, 1 ROF, B11] 30 C† N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt index 20832e5..7a0160b 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt @@ -1,34 +1,34 @@ === ordnance/german/1941 === -Name Capabilities # Notes -------------------- ------------------------------------- --- ------- -5cm leGrW 5PP 1 N -8cm GrW 34 NT QSU IR s8 2† N -10cm NbW 35 NT QSU s10 3 O -12cm GrW 42 NT QSU s8 4† n/a -2.8cm sPzB 41 NT QSU uses APCR TK Table† 5† A† N P -3.7cm PaK 35/36 NT QSU A4 H6[9]† 6 B† N P -4.2cm lePaK 41 NT QSU uses APCR TK Table† 7 A† N -5cm PaK 38 NT QSU A5 8† N -7.5cm PaK 97/38 NT QSU H6 s7 9 N -7.5cm PaK 40 NT QSU s7 10† N -7.62cm PaK 36r NT QSU s6 11† N -8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] 12 C† -8.8cm PaK 43/41 NT 13 n/a -12.8cm K 81/1 NT NM 14 n/a -7.5cm leIG 18 NT QSU H7 15 N O -15cm sIG 33 NT H7 s8 16 N -7.5cm LG 40 T QSU H6 17 N -10.5cm LG 42 T QSU H6 s6 18† N -7.5cm leFK 16nA NT QSU h-d H5 s8 19 n/a -10.5cm leFH 18 NT H6 s8 20 N -s 10cm K 18 NT NM H6 s8 21 N -15cm sFH 18 NT NM H6 s8 22 N -15cm K 18 NT RFNM AP6 23 N -17cm K 18 NT RFNM no IF AP6 24 N -2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] 25 C† N -2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] 26 C† N -2cm FlaKvierling 38 T 4TK DR† 27† N -3.7cm FlaK 36 o. 37 T H5[9]† 28 B† N -3.7cm FlaK 43 T 29 n/a -8.8cm FlaK 18 o. 36 T LF [88L†, 1 ROF, B11] 30 C† N +Name Capabilities (effective) # Notes +------------------- ------------------------------------- ------------------------------------- --- ------- +5cm leGrW 5PP 5PP 1 N +8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N +10cm NbW 35 NT QSU s10 NT QSU s10 3 O +12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a +2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P +3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A4 H6[9]† 6 B† N P +4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N +5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A5 8† N +7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N +7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU s7 10† N +7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU s6 11† N +8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C† +8.8cm PaK 43/41 NT NT 13 n/a +12.8cm K 81/1 NT NM NT NM 14 n/a +7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O +15cm sIG 33 NT H7 s8 NT H7 s8 16 N +7.5cm LG 40 T QSU H6 T QSU H6 17 N +10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† N +7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a +10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N +s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N +15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N +15cm K 18 NT RFNM AP6 NT RFNM AP6 23 N +17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N +2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N +2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N +2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N +3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N +3.7cm FlaK 43 T T 29 n/a +8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T LF [88L†, 1 ROF, B11] 30 C† N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt index 53bb8e0..68e325c 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt @@ -1,34 +1,34 @@ === ordnance/german/1942 === -Name Capabilities # Notes -------------------- ------------------------------------- --- ------- -5cm leGrW 5PP 1 N -8cm GrW 34 NT QSU IR s8 2† N -10cm NbW 35 NT QSU s10 3 O -12cm GrW 42 NT QSU s8 4† n/a -2.8cm sPzB 41 NT QSU uses APCR TK Table† 5† A† N P -3.7cm PaK 35/36 NT QSU A5 H6[9]† 6 B† N P -4.2cm lePaK 41 NT QSU uses APCR TK Table† 7 A† N -5cm PaK 38 NT QSU A6 8† N -7.5cm PaK 97/38 NT QSU H6 s7 9 N -7.5cm PaK 40 NT QSU A5 s7 10† N -7.62cm PaK 36r NT QSU A5 s6 11† N -8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] 12 C† -8.8cm PaK 43/41 NT 13 n/a -12.8cm K 81/1 NT NM 14 n/a -7.5cm leIG 18 NT QSU H7 15 N O -15cm sIG 33 NT H7 s8 16 N -7.5cm LG 40 T QSU H6 17 N -10.5cm LG 42 T QSU H6 s6 18† N -7.5cm leFK 16nA NT QSU h-d H5 s8 19 n/a -10.5cm leFH 18 NT H6 s8 20 N -s 10cm K 18 NT NM H6 s8 21 N -15cm sFH 18 NT NM H6 s8 22 N -15cm K 18 NT RFNM AP6 23 N -17cm K 18 NT RFNM no IF AP6 24 N -2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] 25 C† N -2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] 26 C† N -2cm FlaKvierling 38 T 4TK DR† 27† N -3.7cm FlaK 36 o. 37 T H5[9]† 28 B† N -3.7cm FlaK 43 T 29 n/a -8.8cm FlaK 18 o. 36 T A5 LF [88L†, 1 ROF, B11] 30 C† N +Name Capabilities (effective) # Notes +------------------- ------------------------------------- ------------------------------------- --- ------- +5cm leGrW 5PP 5PP 1 N +8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N +10cm NbW 35 NT QSU s10 NT QSU s10 3 O +12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a +2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P +3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A5 H6[9]† 6 B† N P +4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N +5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A6 8† N +7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N +7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A5 s7 10† N +7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU A5 s6 11† N +8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C† +8.8cm PaK 43/41 NT NT 13 n/a +12.8cm K 81/1 NT NM NT NM 14 n/a +7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O +15cm sIG 33 NT H7 s8 NT H7 s8 16 N +7.5cm LG 40 T QSU H6 T QSU H6 17 N +10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† N +7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a +10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N +s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N +15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N +15cm K 18 NT RFNM AP6 NT RFNM AP6 23 N +17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N +2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N +2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N +2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N +3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N +3.7cm FlaK 43 T T 29 n/a +8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T A5 LF [88L†, 1 ROF, B11] 30 C† N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt index 2fdff34..c227a5d 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt @@ -1,34 +1,34 @@ === ordnance/german/1943 === -Name Capabilities # Notes -------------------- ------------------------------------- --- ------- -5cm leGrW 5PP 1 N -8cm GrW 34 NT QSU IR s8 2† N -10cm NbW 35 NT QSU s10 3 O -12cm GrW 42 NT QSU s8 4† n/a -2.8cm sPzB 41 NT QSU uses APCR TK Table† 5† A† N P -3.7cm PaK 35/36 NT QSU A4 H6[9]† 6 B† N P -4.2cm lePaK 41 NT QSU uses APCR TK Table† 7 A† N -5cm PaK 38 NT QSU A5 8† N -7.5cm PaK 97/38 NT QSU H6 s7 9 N -7.5cm PaK 40 NT QSU A4 s7 10† N -7.62cm PaK 36r NT QSU A4 s6 11† N -8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] 12 C† -8.8cm PaK 43/41 NT 13 n/a -12.8cm K 81/1 NT NM 14 n/a -7.5cm leIG 18 NT QSU H7 15 N O -15cm sIG 33 NT H7 s8 16 N -7.5cm LG 40 T QSU H6 17 N -10.5cm LG 42 T QSU H6 s6 18† N -7.5cm leFK 16nA NT QSU h-d H5 s8 19 n/a -10.5cm leFH 18 NT H6 s8 20 N -s 10cm K 18 NT NM H6 s8 21 N -15cm sFH 18 NT NM H6 s8 22 N -15cm K 18 NT RFNM AP6 23 N -17cm K 18 NT RFNM no IF AP6 24 N -2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] 25 C† N -2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] 26 C† N -2cm FlaKvierling 38 T 4TK DR† 27† N -3.7cm FlaK 36 o. 37 T H5[9]† 28 B† N -3.7cm FlaK 43 T 29 n/a -8.8cm FlaK 18 o. 36 T A4 LF [88L†, 1 ROF, B11] 30 C† N +Name Capabilities (effective) # Notes +------------------- ------------------------------------- ------------------------------------- --- ------- +5cm leGrW 5PP 5PP 1 N +8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N +10cm NbW 35 NT QSU s10 NT QSU s10 3 O +12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a +2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P +3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A4 H6[9]† 6 B† N P +4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N +5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A5 8† N +7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N +7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A4 s7 10† N +7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU A4 s6 11† N +8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C† +8.8cm PaK 43/41 NT NT 13 n/a +12.8cm K 81/1 NT NM NT NM 14 n/a +7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O +15cm sIG 33 NT H7 s8 NT H7 s8 16 N +7.5cm LG 40 T QSU H6 T QSU H6 17 N +10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† N +7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a +10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N +s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N +15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N +15cm K 18 NT RFNM AP6 NT RFNM AP6 23 N +17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N +2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N +2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N +2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N +3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N +3.7cm FlaK 43 T T 29 n/a +8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T A4 LF [88L†, 1 ROF, B11] 30 C† N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt index e257ac1..cdeeaeb 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt @@ -1,34 +1,34 @@ === ordnance/german/1944 === -Name Capabilities # Notes -------------------- ------------------------------------- --- ------- -5cm leGrW 5PP 1 N -8cm GrW 34 NT QSU IR s8 2† N -10cm NbW 35 NT QSU s10 3 O -12cm GrW 42 NT QSU s8 4† n/a -2.8cm sPzB 41 NT QSU uses APCR TK Table† 5† A† N P -3.7cm PaK 35/36 NT QSU A3 H6[9]† 6 B† N P -4.2cm lePaK 41 NT QSU uses APCR TK Table† 7 A† N -5cm PaK 38 NT QSU A4 8† N -7.5cm PaK 97/38 NT QSU H6 s7 9 N -7.5cm PaK 40 NT QSU A3 s7 10† N -7.62cm PaK 36r NT QSU A3 s6 11† N -8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] 12 C† -8.8cm PaK 43/41 NT 13 n/a -12.8cm K 81/1 NT NM 14 n/a -7.5cm leIG 18 NT QSU H7 15 N O -15cm sIG 33 NT H7 s8 16 N -7.5cm LG 40 T QSU H6 17 N -10.5cm LG 42 T QSU H6 s6 18† N -7.5cm leFK 16nA NT QSU h-d H5 s8 19 n/a -10.5cm leFH 18 NT H6 s8 20 N -s 10cm K 18 NT NM H6 s8 21 N -15cm sFH 18 NT NM H6 s8 22 N -15cm K 18 NT RFNM AP6 23 N -17cm K 18 NT RFNM no IF AP6 24 N -2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] 25 C† N -2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] 26 C† N -2cm FlaKvierling 38 T 4TK DR† 27† N -3.7cm FlaK 36 o. 37 T H5[9]† 28 B† N -3.7cm FlaK 43 T 29 n/a -8.8cm FlaK 18 o. 36 T A3 LF [88L†, 1 ROF, B11] 30 C† N +Name Capabilities (effective) # Notes +------------------- ------------------------------------- ------------------------------------- --- ------- +5cm leGrW 5PP 5PP 1 N +8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N +10cm NbW 35 NT QSU s10 NT QSU s10 3 O +12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a +2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P +3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A3 H6[9]† 6 B† N P +4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N +5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A4 8† N +7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N +7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A3 s7 10† N +7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU A3 s6 11† N +8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C† +8.8cm PaK 43/41 NT NT 13 n/a +12.8cm K 81/1 NT NM NT NM 14 n/a +7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O +15cm sIG 33 NT H7 s8 NT H7 s8 16 N +7.5cm LG 40 T QSU H6 T QSU H6 17 N +10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† N +7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a +10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N +s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N +15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N +15cm K 18 NT RFNM AP6 NT RFNM AP6 23 N +17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N +2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N +2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N +2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N +3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N +3.7cm FlaK 43 T T 29 n/a +8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T A3 LF [88L†, 1 ROF, B11] 30 C† N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt index feae160..6ae38f5 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt @@ -1,34 +1,34 @@ === ordnance/german/1945 === -Name Capabilities # Notes -------------------- ------------------------------------- --- ------- -5cm leGrW 5PP 1 N -8cm GrW 34 NT QSU IR s8 2† N -10cm NbW 35 NT QSU s10 3 O -12cm GrW 42 NT QSU s8 4† n/a -2.8cm sPzB 41 NT QSU uses APCR TK Table† 5† A† N P -3.7cm PaK 35/36 NT QSU A3 H6[9]† 6 B† N P -4.2cm lePaK 41 NT QSU uses APCR TK Table† 7 A† N -5cm PaK 38 NT QSU A4 8† N -7.5cm PaK 97/38 NT QSU H6 s7 9 N -7.5cm PaK 40 NT QSU A3 s7 10† N -7.62cm PaK 36r NT QSU A3 s6 11† N -8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] 12 C† -8.8cm PaK 43/41 NT 13 n/a -12.8cm K 81/1 NT NM 14 n/a -7.5cm leIG 18 NT QSU H7 15 N O -15cm sIG 33 NT H7 s8 16 N -7.5cm LG 40 T QSU H6 17 N -10.5cm LG 42 T QSU H6 s6 18† N -7.5cm leFK 16nA NT QSU h-d H5 s8 19 n/a -10.5cm leFH 18 NT H6 s8 20 N -s 10cm K 18 NT NM H6 s8 21 N -15cm sFH 18 NT NM H6 s8 22 N -15cm K 18 NT RFNM AP6 23 N -17cm K 18 NT RFNM no IF AP6 24 N -2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] 25 C† N -2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] 26 C† N -2cm FlaKvierling 38 T 4TK DR† 27† N -3.7cm FlaK 36 o. 37 T H5[9]† 28 B† N -3.7cm FlaK 43 T 29 n/a -8.8cm FlaK 18 o. 36 T A3 LF [88L†, 1 ROF, B11] 30 C† N +Name Capabilities (effective) # Notes +------------------- ------------------------------------- ------------------------------------- --- ------- +5cm leGrW 5PP 5PP 1 N +8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N +10cm NbW 35 NT QSU s10 NT QSU s10 3 O +12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a +2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P +3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A3 H6[9]† 6 B† N P +4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N +5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A4 8† N +7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N +7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A3 s7 10† N +7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU A3 s6 11† N +8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C† +8.8cm PaK 43/41 NT NT 13 n/a +12.8cm K 81/1 NT NM NT NM 14 n/a +7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O +15cm sIG 33 NT H7 s8 NT H7 s8 16 N +7.5cm LG 40 T QSU H6 T QSU H6 17 N +10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† N +7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a +10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N +s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N +15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N +15cm K 18 NT RFNM AP6 NT RFNM AP6 23 N +17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N +2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N +2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N +2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N +3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N +3.7cm FlaK 43 T T 29 n/a +8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T A3 LF [88L†, 1 ROF, B11] 30 C† N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt index 26123b0..44a76c5 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt @@ -1,33 +1,33 @@ === ordnance/russian/1940 === -Name Capabilities # Notes --------------------- ---------------------------- ---- ------- -50mm RM obr. 40 4PP 1 n/a -37mm PM-39 1PP Air Bursts & Acq. NA 1.1 A -82mm BM obr. 37 NT QSU IR s8 2† n/a -107mm GVPM obr. 38 NT QSU s8 3 A -120mm PM obr. 38 NT QSU s8 4 n/a -160mm PM obr. 43 NT no IF 5 n/a -37mm PTP obr. 30 NT QSU 6 n/a -45mm PTP obr. 32 NT QSU 7 n/a -45mm PTP obr. 42 NT QSU 8 n/a -57mm PTP obr. 43 NT QSU 9† n/a -100mm PTP obr. 44 NT 10 n/a -37mm PP obr. 15R NT QSU h-d 11 n/a -76.2mm PP obr. 27 NT QSU H6 s8 12 A -76.2mm P obr. 00/02P NT QSU h-d s8 13 n/a -76.2mm P obr. 02/30 NT QSU h-d s8 14 n/a -76.2mm P obr. 39 NT QSU s8 15† n/a -76.2mm P obr. 36 NT QSU s8 16† n/a -85mm P obr. 44 NT QSU s8 17 n/a -107mm P obr. 10/30 NT h-d s8 18 n/a -122mm G obr. 10/30 NT h-d s8 19 n/a -122mm G obr. 38 NT H6 s8 20 n/a -122mm P obr. 31 NT s8 21 n/a -152mm G obr. 38 NT 22 n/a -152mm GP obr. 37 NT 23 n/a -203mm B-4 obr. 1931 NT RFNM no IF 23.1 n/a -25mm ZP obr. 40 T 24 n/a -37mm ZP obr. 39 T 25† n/a -76.2mm ZP obr. 38 T 26† n/a -85mm ZP obr. 39 T 27 n/a +Name Capabilities (effective) # Notes +-------------------- ---------------------------- ---------------------------- ---- ------- +50mm RM obr. 40 4PP 4PP 1 n/a +37mm PM-39 1PP Air Bursts & Acq. NA 1PP Air Bursts & Acq. NA 1.1 A +82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a +107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A +120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a +160mm PM obr. 43 NT no IF NT no IF 5 n/a +37mm PTP obr. 30 NT QSU NT QSU 6 n/a +45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU 7 n/a +45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU 8 n/a +57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU 9† n/a +100mm PTP obr. 44 NT NT 10 n/a +37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a +76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A +76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a +76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a +76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU s8 15† n/a +76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU s8 16† n/a +85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU s8 17 n/a +107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a +122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a +122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a +122mm P obr. 31 NT s8 NT s8 21 n/a +152mm G obr. 38 NT NT 22 n/a +152mm GP obr. 37 NT NT 23 n/a +203mm B-4 obr. 1931 NT RFNM no IF NT RFNM no IF 23.1 n/a +25mm ZP obr. 40 T T 24 n/a +37mm ZP obr. 39 T T 25† n/a +76.2mm ZP obr. 38 T T 26† n/a +85mm ZP obr. 39 T T 27 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt index bc6e9e8..404e2b9 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt @@ -1,33 +1,33 @@ === ordnance/russian/1941 === -Name Capabilities # Notes --------------------- ---------------------------- ---- ------- -50mm RM obr. 40 4PP 1 n/a -37mm PM-39 1PP Air Bursts & Acq. NA 1.1 A -82mm BM obr. 37 NT QSU IR s8 2† n/a -107mm GVPM obr. 38 NT QSU s8 3 A -120mm PM obr. 38 NT QSU s8 4 n/a -160mm PM obr. 43 NT no IF 5 n/a -37mm PTP obr. 30 NT QSU 6 n/a -45mm PTP obr. 32 NT QSU 7 n/a -45mm PTP obr. 42 NT QSU 8 n/a -57mm PTP obr. 43 NT QSU 9† n/a -100mm PTP obr. 44 NT 10 n/a -37mm PP obr. 15R NT QSU h-d 11 n/a -76.2mm PP obr. 27 NT QSU H6 s8 12 A -76.2mm P obr. 00/02P NT QSU h-d s8 13 n/a -76.2mm P obr. 02/30 NT QSU h-d s8 14 n/a -76.2mm P obr. 39 NT QSU s8 15† n/a -76.2mm P obr. 36 NT QSU s8 16† n/a -85mm P obr. 44 NT QSU s8 17 n/a -107mm P obr. 10/30 NT h-d s8 18 n/a -122mm G obr. 10/30 NT h-d s8 19 n/a -122mm G obr. 38 NT H6 s8 20 n/a -122mm P obr. 31 NT s8 21 n/a -152mm G obr. 38 NT 22 n/a -152mm GP obr. 37 NT 23 n/a -203mm B-4 obr. 1931 NT RFNM no IF 23.1 n/a -25mm ZP obr. 40 T 24 n/a -37mm ZP obr. 39 T 25† n/a -76.2mm ZP obr. 38 T 26† n/a -85mm ZP obr. 39 T 27 n/a +Name Capabilities (effective) # Notes +-------------------- ---------------------------- ---------------------------- ---- ------- +50mm RM obr. 40 4PP 4PP 1 n/a +37mm PM-39 1PP Air Bursts & Acq. NA 1PP Air Bursts & Acq. NA 1.1 A +82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a +107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A +120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a +160mm PM obr. 43 NT no IF NT no IF 5 n/a +37mm PTP obr. 30 NT QSU NT QSU 6 n/a +45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU 7 n/a +45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU 8 n/a +57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU 9† n/a +100mm PTP obr. 44 NT NT 10 n/a +37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a +76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A +76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a +76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a +76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU s8 15† n/a +76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU s8 16† n/a +85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU s8 17 n/a +107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a +122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a +122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a +122mm P obr. 31 NT s8 NT s8 21 n/a +152mm G obr. 38 NT NT 22 n/a +152mm GP obr. 37 NT NT 23 n/a +203mm B-4 obr. 1931 NT RFNM no IF NT RFNM no IF 23.1 n/a +25mm ZP obr. 40 T T 24 n/a +37mm ZP obr. 39 T T 25† n/a +76.2mm ZP obr. 38 T T 26† n/a +85mm ZP obr. 39 T T 27 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt index 0c4a3f4..0a263bf 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt @@ -1,33 +1,33 @@ === ordnance/russian/1942 === -Name Capabilities # Notes --------------------- ---------------------------- ---- ------- -50mm RM obr. 40 4PP 1 n/a -37mm PM-39 1PP Air Bursts & Acq. NA 1.1 A -82mm BM obr. 37 NT QSU IR s8 2† n/a -107mm GVPM obr. 38 NT QSU s8 3 A -120mm PM obr. 38 NT QSU s8 4 n/a -160mm PM obr. 43 NT no IF 5 n/a -37mm PTP obr. 30 NT QSU 6 n/a -45mm PTP obr. 32 NT QSU A4 7 n/a -45mm PTP obr. 42 NT QSU A4 8 n/a -57mm PTP obr. 43 NT QSU 9† n/a -100mm PTP obr. 44 NT 10 n/a -37mm PP obr. 15R NT QSU h-d 11 n/a -76.2mm PP obr. 27 NT QSU H6 s8 12 A -76.2mm P obr. 00/02P NT QSU h-d s8 13 n/a -76.2mm P obr. 02/30 NT QSU h-d s8 14 n/a -76.2mm P obr. 39 NT QSU A4 s8 15† n/a -76.2mm P obr. 36 NT QSU A4 s8 16† n/a -85mm P obr. 44 NT QSU s8 17 n/a -107mm P obr. 10/30 NT h-d s8 18 n/a -122mm G obr. 10/30 NT h-d s8 19 n/a -122mm G obr. 38 NT H6 s8 20 n/a -122mm P obr. 31 NT s8 21 n/a -152mm G obr. 38 NT 22 n/a -152mm GP obr. 37 NT 23 n/a -203mm B-4 obr. 1931 NT RFNM no IF 23.1 n/a -25mm ZP obr. 40 T 24 n/a -37mm ZP obr. 39 T 25† n/a -76.2mm ZP obr. 38 T 26† n/a -85mm ZP obr. 39 T 27 n/a +Name Capabilities (effective) # Notes +-------------------- ---------------------------- ---------------------------- ---- ------- +50mm RM obr. 40 4PP 4PP 1 n/a +37mm PM-39 1PP Air Bursts & Acq. NA 1PP Air Bursts & Acq. NA 1.1 A +82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a +107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A +120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a +160mm PM obr. 43 NT no IF NT no IF 5 n/a +37mm PTP obr. 30 NT QSU NT QSU 6 n/a +45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU A4 7 n/a +45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU A4 8 n/a +57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU 9† n/a +100mm PTP obr. 44 NT NT 10 n/a +37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a +76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A +76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a +76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a +76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU A4 s8 15† n/a +76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU A4 s8 16† n/a +85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU s8 17 n/a +107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a +122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a +122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a +122mm P obr. 31 NT s8 NT s8 21 n/a +152mm G obr. 38 NT NT 22 n/a +152mm GP obr. 37 NT NT 23 n/a +203mm B-4 obr. 1931 NT RFNM no IF NT RFNM no IF 23.1 n/a +25mm ZP obr. 40 T T 24 n/a +37mm ZP obr. 39 T T 25† n/a +76.2mm ZP obr. 38 T T 26† n/a +85mm ZP obr. 39 T T 27 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt index 91f0442..cd0b6c0 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt @@ -1,33 +1,33 @@ === ordnance/russian/1943 === -Name Capabilities # Notes --------------------- ---------------------------- ---- ------- -50mm RM obr. 40 4PP 1 n/a -37mm PM-39 1PP Air Bursts & Acq. NA 1.1 A -82mm BM obr. 37 NT QSU IR s8 2† n/a -107mm GVPM obr. 38 NT QSU s8 3 A -120mm PM obr. 38 NT QSU s8 4 n/a -160mm PM obr. 43 NT no IF 5 n/a -37mm PTP obr. 30 NT QSU 6 n/a -45mm PTP obr. 32 NT QSU A5 7 n/a -45mm PTP obr. 42 NT QSU A5 8 n/a -57mm PTP obr. 43 NT QSU A4 9† n/a -100mm PTP obr. 44 NT 10 n/a -37mm PP obr. 15R NT QSU h-d 11 n/a -76.2mm PP obr. 27 NT QSU H6 s8 12 A -76.2mm P obr. 00/02P NT QSU h-d s8 13 n/a -76.2mm P obr. 02/30 NT QSU h-d s8 14 n/a -76.2mm P obr. 39 NT QSU A5 s8 15† n/a -76.2mm P obr. 36 NT QSU A4 s8 16† n/a -85mm P obr. 44 NT QSU s8 17 n/a -107mm P obr. 10/30 NT h-d s8 18 n/a -122mm G obr. 10/30 NT h-d s8 19 n/a -122mm G obr. 38 NT H6 s8 20 n/a -122mm P obr. 31 NT s8 21 n/a -152mm G obr. 38 NT 22 n/a -152mm GP obr. 37 NT 23 n/a -203mm B-4 obr. 1931 NT RFNM no IF 23.1 n/a -25mm ZP obr. 40 T 24 n/a -37mm ZP obr. 39 T 25† n/a -76.2mm ZP obr. 38 T 26† n/a -85mm ZP obr. 39 T 27 n/a +Name Capabilities (effective) # Notes +-------------------- ---------------------------- ---------------------------- ---- ------- +50mm RM obr. 40 4PP 4PP 1 n/a +37mm PM-39 1PP Air Bursts & Acq. NA 1PP Air Bursts & Acq. NA 1.1 A +82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a +107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A +120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a +160mm PM obr. 43 NT no IF NT no IF 5 n/a +37mm PTP obr. 30 NT QSU NT QSU 6 n/a +45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU A5 7 n/a +45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU A5 8 n/a +57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU A4 9† n/a +100mm PTP obr. 44 NT NT 10 n/a +37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a +76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A +76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a +76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a +76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU A5 s8 15† n/a +76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU A4 s8 16† n/a +85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU s8 17 n/a +107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a +122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a +122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a +122mm P obr. 31 NT s8 NT s8 21 n/a +152mm G obr. 38 NT NT 22 n/a +152mm GP obr. 37 NT NT 23 n/a +203mm B-4 obr. 1931 NT RFNM no IF NT RFNM no IF 23.1 n/a +25mm ZP obr. 40 T T 24 n/a +37mm ZP obr. 39 T T 25† n/a +76.2mm ZP obr. 38 T T 26† n/a +85mm ZP obr. 39 T T 27 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt index 65cb63f..a15eda7 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt @@ -1,33 +1,33 @@ === ordnance/russian/1944 === -Name Capabilities # Notes --------------------- ---------------------------- ---- ------- -50mm RM obr. 40 4PP 1 n/a -37mm PM-39 1PP Air Bursts & Acq. NA 1.1 A -82mm BM obr. 37 NT QSU IR s8 2† n/a -107mm GVPM obr. 38 NT QSU s8 3 A -120mm PM obr. 38 NT QSU s8 4 n/a -160mm PM obr. 43 NT no IF 5 n/a -37mm PTP obr. 30 NT QSU 6 n/a -45mm PTP obr. 32 NT QSU A6 7 n/a -45mm PTP obr. 42 NT QSU A6 8 n/a -57mm PTP obr. 43 NT QSU A5 9† n/a -100mm PTP obr. 44 NT 10 n/a -37mm PP obr. 15R NT QSU h-d 11 n/a -76.2mm PP obr. 27 NT QSU H6 s8 12 A -76.2mm P obr. 00/02P NT QSU h-d s8 13 n/a -76.2mm P obr. 02/30 NT QSU h-d s8 14 n/a -76.2mm P obr. 39 NT QSU A6 s8 15† n/a -76.2mm P obr. 36 NT QSU A4 s8 16† n/a -85mm P obr. 44 NT QSU A5 s8 17 n/a -107mm P obr. 10/30 NT h-d s8 18 n/a -122mm G obr. 10/30 NT h-d s8 19 n/a -122mm G obr. 38 NT H6 s8 20 n/a -122mm P obr. 31 NT s8 21 n/a -152mm G obr. 38 NT 22 n/a -152mm GP obr. 37 NT 23 n/a -203mm B-4 obr. 1931 NT RFNM no IF 23.1 n/a -25mm ZP obr. 40 T 24 n/a -37mm ZP obr. 39 T 25† n/a -76.2mm ZP obr. 38 T 26† n/a -85mm ZP obr. 39 T 27 n/a +Name Capabilities (effective) # Notes +-------------------- ---------------------------- ---------------------------- ---- ------- +50mm RM obr. 40 4PP 4PP 1 n/a +37mm PM-39 1PP Air Bursts & Acq. NA 1PP Air Bursts & Acq. NA 1.1 A +82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a +107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A +120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a +160mm PM obr. 43 NT no IF NT no IF 5 n/a +37mm PTP obr. 30 NT QSU NT QSU 6 n/a +45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU A6 7 n/a +45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU A6 8 n/a +57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU A5 9† n/a +100mm PTP obr. 44 NT NT 10 n/a +37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a +76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A +76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a +76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a +76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU A6 s8 15† n/a +76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU A4 s8 16† n/a +85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU A5 s8 17 n/a +107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a +122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a +122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a +122mm P obr. 31 NT s8 NT s8 21 n/a +152mm G obr. 38 NT NT 22 n/a +152mm GP obr. 37 NT NT 23 n/a +203mm B-4 obr. 1931 NT RFNM no IF NT RFNM no IF 23.1 n/a +25mm ZP obr. 40 T T 24 n/a +37mm ZP obr. 39 T T 25† n/a +76.2mm ZP obr. 38 T T 26† n/a +85mm ZP obr. 39 T T 27 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt index 3ef0cb3..fd5d0c6 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt @@ -1,33 +1,33 @@ === ordnance/russian/1945 === -Name Capabilities # Notes --------------------- ---------------------------- ---- ------- -50mm RM obr. 40 4PP 1 n/a -37mm PM-39 1PP Air Bursts & Acq. NA 1.1 A -82mm BM obr. 37 NT QSU IR s8 2† n/a -107mm GVPM obr. 38 NT QSU s8 3 A -120mm PM obr. 38 NT QSU s8 4 n/a -160mm PM obr. 43 NT no IF 5 n/a -37mm PTP obr. 30 NT QSU 6 n/a -45mm PTP obr. 32 NT QSU A7 7 n/a -45mm PTP obr. 42 NT QSU A7 8 n/a -57mm PTP obr. 43 NT QSU A6 9† n/a -100mm PTP obr. 44 NT 10 n/a -37mm PP obr. 15R NT QSU h-d 11 n/a -76.2mm PP obr. 27 NT QSU H6 s8 12 A -76.2mm P obr. 00/02P NT QSU h-d s8 13 n/a -76.2mm P obr. 02/30 NT QSU h-d s8 14 n/a -76.2mm P obr. 39 NT QSU A7 s8 15† n/a -76.2mm P obr. 36 NT QSU A4 s8 16† n/a -85mm P obr. 44 NT QSU A6 s8 17 n/a -107mm P obr. 10/30 NT h-d s8 18 n/a -122mm G obr. 10/30 NT h-d s8 19 n/a -122mm G obr. 38 NT H6 s8 20 n/a -122mm P obr. 31 NT s8 21 n/a -152mm G obr. 38 NT 22 n/a -152mm GP obr. 37 NT 23 n/a -203mm B-4 obr. 1931 NT RFNM no IF 23.1 n/a -25mm ZP obr. 40 T 24 n/a -37mm ZP obr. 39 T 25† n/a -76.2mm ZP obr. 38 T 26† n/a -85mm ZP obr. 39 T 27 n/a +Name Capabilities (effective) # Notes +-------------------- ---------------------------- ---------------------------- ---- ------- +50mm RM obr. 40 4PP 4PP 1 n/a +37mm PM-39 1PP Air Bursts & Acq. NA 1PP Air Bursts & Acq. NA 1.1 A +82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a +107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A +120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a +160mm PM obr. 43 NT no IF NT no IF 5 n/a +37mm PTP obr. 30 NT QSU NT QSU 6 n/a +45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU A7 7 n/a +45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU A7 8 n/a +57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU A6 9† n/a +100mm PTP obr. 44 NT NT 10 n/a +37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a +76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A +76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a +76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a +76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU A7 s8 15† n/a +76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU A4 s8 16† n/a +85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU A6 s8 17 n/a +107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a +122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a +122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a +122mm P obr. 31 NT s8 NT s8 21 n/a +152mm G obr. 38 NT NT 22 n/a +152mm GP obr. 37 NT NT 23 n/a +203mm B-4 obr. 1931 NT RFNM no IF NT RFNM no IF 23.1 n/a +25mm ZP obr. 40 T T 24 n/a +37mm ZP obr. 39 T T 25† n/a +76.2mm ZP obr. 38 T T 26† n/a +85mm ZP obr. 39 T T 27 n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt index 87589cb..214dd3b 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt @@ -1,124 +1,124 @@ === vehicles/german/1940 === -Name Radio Crew survival Capabilities # Notes ----------------------- ------- ------------------------------------ -------------- ----- --------------------------------- -PzKpfw IB n/a CS 2 sD6 1† N -PzKpfw IIA n/a CS 3 sD6 2 n/a -PzKpfw IIF n/a CS 3 sD7 3 N -PzKpfw II(Fl) n/a CS 2 (brew up) sD7† 4† n/a -PzKpfw IIL n/a CS 4 sD7 5 n/a -PzKpfw 35t n/a CS 4 sD5 6† n/a -PzKpfw 38(t)A n/a CS 4 sD6 7† E -PzKpfw 38(t)E n/a CS 4 sD7 8† E -Aufklaerer 38(t) n/a CS 5 n/a 9 A† E -FT-17 730m(f) n/a CS 2 n/a 9.1† a c f -FT-17 730(f) n/a CS 2 AP9 9.1† a c f -38H 735(f) n/a CS 3 AP10 9.2 a b† f -35-S 739(f) n/a CS 4 n/a 9.3 a b†2 d†1 f -PzKpfw IIID n/a CS 5 sD6 10† n/a -PzKpfw IIIF n/a CS 5 sD7 11† n/a -PzKpfw IIIG n/a CS 5 sD7 12 N -PzKpfw IIIH n/a CS 6 sD7 13† N -PzKpfw IIIJ n/a CS 6 sD7 14† N S -PzKpfw IIIL n/a CS 5 sD7 15† B† N S -PzKpfw IIIN n/a CS 5 H9 s9 sD7 16 B† N S -PzKpfw III(Fl) n/a CS 3 sD7 17 n/a -PzKpfw IVA n/a CS 5 AP7 s9 sD6 18† n/a -PzKpfw IVC n/a CS 5 AP7 s9 sD6 19† n/a -PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 20 N R† -PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 21 N R† -PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 22 N R† -PzKpfw IVF2 n/a CS 6 s8 sD6 23† N S -PzKpfw IVH n/a CS 6 s8 sD5 24† B† S -PzKpfw IVJ n/a CS 6 s8 sN9 25 S -PzKpfw VD n/a CS 5 (brew up) sD5 26 F† -PzKpfw VG n/a CS 6 n/a 27† H† -PzKpfw M15/42(i) n/a CS 4 n/a 28 I -PzKpfw P26/40(i) n/a CS 4 s8 29 I -PzKpfw VIE n/a CS 6 M7† sD7 30† K N -PzKpfw VIE (L) n/a CS 6 n/a 31 K -PzKpfw VIB n/a CS 6 sN9 32† K -StuG IIIB n/a CS 4 AP7 H6 s9 sD7 33† n/a -StuG IIIG n/a CS 4 s8 sD7 34† N P† S -StuG IIIG (L) n/a CS 4 s8 sN9 35 O† Q† S -StuH 42 n/a CS 4 H9 s9 sD7 36† N P† S -StuH 42 (L) n/a CS 4 H9 s9 sN9 35 O† Q† S -StuPz IV n/a CS 6 H7 s9 37† S -Sturmtiger n/a CS 5 sN9 37.1† K -PzJg Tiger n/a CS 7 n/a 38 n/a -StuG 75/18(i) n/a CS 3 H7 s9 39 I P† -StuG 75/34(i) n/a CS 3 s9 40 I P† -StuG 105/25(i) n/a CS 3 H7 s9 41 I P† -StuG 75/46(i) n/a CS 3 s9 42 I P† -PzJg I n/a CS 3 HE7 43 N -PzJg 35R(f) n/a CS 3 HE7 44 a -Pz 35R 731(f) n/a CS 2 n/a 44.1† a -Marder I n/a CS 4 (brew up) HE7 s7 45† a -GSW 39H(f) Pak n/a CS 3 HE9 45.1 a e -Marder II n/a CS 4 (brew up) HE7 s7 46 M† N -Marder III(t)H n/a CS 4 (brew up) HE7 s7 sD6 47 E G N -Marder III(t)M n/a CS 4 (brew up) HE7 s7 sD5 48 E -PzJg III/IV n/a CS 5 HE7 49 M† -JgdPz 38(t) n/a CS 4 HE7 50 E O† -JgdPz 38(t) (Fl) n/a CS 4 n/a 51 E O† -JgdPz IV n/a CS 4 HE7 s7 52 S -JgdPz IV (L) n/a CS 4 HE7 s7 52 S -StuIG 33B n/a CS 5 H7 s9 53† n/a -JgdPz IV/70 n/a CS 4 HE7 sN9 54† S -JgdPz V n/a CS 6 HE7 sN9 55 H -JgdPz VI n/a CS 7 HE7 sN9 56 n/a -SPW 250/1 n/a CS 4 n/a 57 N -SPW 250/sMG n/a CS 4† n/a 58† J† N -SPW 250/7 n/a CS 4 (brew up) IR s8 59 J† N -SPW 250/8 n/a CS 4 (brew up) H6 s8 60 Q† -SPW 250/9 n/a CS 4 n/a 61† A† -SPW 250/10 n/a CS 4 n/a 62 J† N -SPW 251/1 n/a CS 5 n/a 63 C† N -SPW 251/sMG n/a CS 5† n/a 58† C† J† N -SPW 251/2 n/a CS 4 (brew up) IR s8 59 C† J† N -SPW 251/9 n/a CS 4 (brew up) H6 s9 64 C† N Q† -SPW 251/10 n/a CS 4 n/a 65 C† J† N -SPW 251/16 n/a CS 4 (brew up) n/a 66† n/a -SPW 251/21 n/a CS 4 n/a 66.1† n/a -SPW 251/22 n/a CS 4 (brew up) HE7 s7 67 J† -SPW S307(f) n/a CS 4 HE9 67.1 a e -mSPW S307(f) n/a CS 4 IR s5 67.2 a e -Kfz 13 n/a CS 2 n/a 68† n/a -PSW 221 n/a CS 2 sD6 69† A† N -PSW 222 n/a CS 3 sD6 70† A† N -PSW 222 (L) n/a CS 3 sD6 70† A† N -PSW 231 (6 rad) n/a CS 4 n/a 71† n/a -PSW 231 (8 rad) n/a CS 4 sD6 72† N -PSW 232 (8 rad) n/a CS 4 sD6 72 N -PSW 233 n/a CS 5 H8 s9 sD7 73 N -PSW 234/1 n/a CS 5 n/a 74 A† -PSW 234/2 n/a CS 4 sD7 75 n/a -PSW 234/3 n/a CS 5 H8 s9 76 Q† -PSW 234/4 n/a CS 5 (brew up) HE7 s7 77† n/a -sIG IB n/a CS 4 (brew up) H6 s9 78 G -sIG II n/a CS 4 (brew up) H6 s9 79 N -sIG 38(t)M n/a CS 4 (brew up) H6 s9 80 E N -PzA II n/a CS 4 H5 s8 81 M† -PzA LrS(f) n/a CS 4 H4 s8 82 a N -GSW 39H(f) n/a CS 4 H4 s7 82.1 a e -PzA III/IV n/a CS 6 H5 s8 83 n/a -FlaKPz 38(t) n/a CS 4 n/a 84 A† E -37 FlaK/Pz IV n/a CS 5 n/a 85† A† -(Moebelwagen) n/a CS 6 n/a 85† A† -FlaKPz IV/20 n/a CS 6 n/a 86 A† -FlaKPz IV/37 n/a CS 6 n/a 87 A† -SdKfz 10/4 n/a CS 5 n/a 88 A† D† N -SdKfz 10/5 n/a CS 4 n/a 88.1† A†2 D†1 -SdKfz 6/2 n/a CS 5 n/a 89 A† D† N -SdKfz 7/1 n/a CS 4 n/a 90 A† D† N -Kfz 4 n/a CS 3 n/a 91† N -2cm FlaK LKW n/a CS 5 n/a 92 A† -3.7cm FlaK LKW n/a CS 5 n/a 92 A† -Goliath n/a n/a n/a 93† L† -Kfz 1 n/a cs 2† n/a 94† L† N -Kfz 1/20 n/a cs 2 n/a 95† L† -Opel 6700 (Blitz) n/a cs 6 n/a 96 N -Buessing-NAG 4500 n/a cs 7 n/a 96 N -SdKfz 2 n/a cs 2 n/a 97† L† N -SdKfz 7 n/a cs 6 n/a 98 N -SdKfz 11 n/a cs 5 n/a 99 N +Name Radio Crew survival Capabilities (effective) # Notes +---------------------- ------- ------------------------------------ ------------------- ------------- ----- --------------------------------- +PzKpfw IB n/a CS 2 sD6 sD6 1† N +PzKpfw IIA n/a CS 3 sD6 sD6 2 n/a +PzKpfw IIF n/a CS 3 sD7 sD7 3 N +PzKpfw II(Fl) n/a CS 2 (brew up) sD7† sD7† 4† n/a +PzKpfw IIL n/a CS 4 sD7 sD7 5 n/a +PzKpfw 35t n/a CS 4 sD5 sD5 6† n/a +PzKpfw 38(t)A n/a CS 4 A4[1]5[2] sD6 sD6 7† E +PzKpfw 38(t)E n/a CS 4 A4[1]5[2] sD7 sD7 8† E +Aufklaerer 38(t) n/a CS 5 n/a n/a 9 A† E +FT-17 730m(f) n/a CS 2 n/a n/a 9.1† a c f +FT-17 730(f) n/a CS 2 AP9 AP9 9.1† a c f +38H 735(f) n/a CS 3 AP10 AP10 9.2 a b† f +35-S 739(f) n/a CS 4 n/a n/a 9.3 a b†2 d†1 f +PzKpfw IIID n/a CS 5 sD6 sD6 10† n/a +PzKpfw IIIF n/a CS 5 A4[1] sD7 sD7 11† n/a +PzKpfw IIIG n/a CS 5 A4[1] sD7 sD7 12 N +PzKpfw IIIH n/a CS 6 A4[1] sD7 sD7 13† N +PzKpfw IIIJ n/a CS 6 A6[2] sD7 sD7 14† N S +PzKpfw IIIL n/a CS 5 A6[2] sD7 sD7 15† B† N S +PzKpfw IIIN n/a CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S +PzKpfw III(Fl) n/a CS 3 sD7 sD7 17 n/a +PzKpfw IVA n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a +PzKpfw IVC n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a +PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 AP7 H6 s9 sD7 20 N R† +PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 21 N R† +PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 22 N R† +PzKpfw IVF2 n/a CS 6 A5[2] s8 sD6 s8 sD6 23† N S +PzKpfw IVH n/a CS 6 A5[2] s8 sD5 s8 sD5 24† B† S +PzKpfw IVJ n/a CS 6 A3[4] s8 sN9 s8 sN9 25 S +PzKpfw VD n/a CS 5 (brew up) sD5 sD5 26 F† +PzKpfw VG n/a CS 6 sN7[4] n/a 27† H† +PzKpfw M15/42(i) n/a CS 4 n/a n/a 28 I +PzKpfw P26/40(i) n/a CS 4 s8 s8 29 I +PzKpfw VIE n/a CS 6 A6[2] M7† sD7 M7† sD7 30† K N +PzKpfw VIE (L) n/a CS 6 A4[4] sN7[4] n/a 31 K +PzKpfw VIB n/a CS 6 sN9 sN9 32† K +StuG IIIB n/a CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a +StuG IIIG n/a CS 4 A6[2] s8 sD7 s8 sD7 34† N P† S +StuG IIIG (L) n/a CS 4 A4[4] s8 sN9 s8 sN9 35 O† Q† S +StuH 42 n/a CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S +StuH 42 (L) n/a CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S +StuPz IV n/a CS 6 H7 s9 H7 s9 37† S +Sturmtiger n/a CS 5 sN9 sN9 37.1† K +PzJg Tiger n/a CS 7 n/a n/a 38 n/a +StuG 75/18(i) n/a CS 3 H7 s9 H7 s9 39 I P† +StuG 75/34(i) n/a CS 3 s9 s9 40 I P† +StuG 105/25(i) n/a CS 3 H7 s9 H7 s9 41 I P† +StuG 75/46(i) n/a CS 3 s9 s9 42 I P† +PzJg I n/a CS 3 A5[1] HE7 HE7 43 N +PzJg 35R(f) n/a CS 3 A5[1] HE7 HE7 44 a +Pz 35R 731(f) n/a CS 2 n/a n/a 44.1† a +Marder I n/a CS 4 (brew up) A6[2] HE7 s7 HE7 s7 45† a +GSW 39H(f) Pak n/a CS 3 A4[4] HE9 HE9 45.1 a e +Marder II n/a CS 4 (brew up) A6[2] HE7 s7 HE7 s7 46 M† N +Marder III(t)H n/a CS 4 (brew up) A6[2] HE7 s7 sD6 HE7 s7 sD6 47 E G N +Marder III(t)M n/a CS 4 (brew up) A5[3] HE7 s7 sD5 HE7 s7 sD5 48 E +PzJg III/IV n/a CS 5 HE7 HE7 49 M† +JgdPz 38(t) n/a CS 4 A4[4] HE7 HE7 50 E O† +JgdPz 38(t) (Fl) n/a CS 4 n/a n/a 51 E O† +JgdPz IV n/a CS 4 A4[4] HE7 s7 sN7[4] HE7 s7 52 S +JgdPz IV (L) n/a CS 4 A4[4] HE7 s7 sN8[4] HE7 s7 52 S +StuIG 33B n/a CS 5 H7 s9 H7 s9 53† n/a +JgdPz IV/70 n/a CS 4 HE7 sN9 HE7 sN9 54† S +JgdPz V n/a CS 6 HE7 sN9 HE7 sN9 55 H +JgdPz VI n/a CS 7 HE7 sN9 HE7 sN9 56 n/a +SPW 250/1 n/a CS 4 n/a n/a 57 N +SPW 250/sMG n/a CS 4† n/a n/a 58† J† N +SPW 250/7 n/a CS 4 (brew up) IR s8 IR s8 59 J† N +SPW 250/8 n/a CS 4 (brew up) H6 s8 H6 s8 60 Q† +SPW 250/9 n/a CS 4 n/a n/a 61† A† +SPW 250/10 n/a CS 4 A4[1] n/a 62 J† N +SPW 251/1 n/a CS 5 n/a n/a 63 C† N +SPW 251/sMG n/a CS 5† n/a n/a 58† C† J† N +SPW 251/2 n/a CS 4 (brew up) IR s8 IR s8 59 C† J† N +SPW 251/9 n/a CS 4 (brew up) H6 s9 H6 s9 64 C† N Q† +SPW 251/10 n/a CS 4 A4[1] n/a 65 C† J† N +SPW 251/16 n/a CS 4 (brew up) n/a n/a 66† n/a +SPW 251/21 n/a CS 4 n/a n/a 66.1† n/a +SPW 251/22 n/a CS 4 (brew up) HE7 s7 HE7 s7 67 J† +SPW S307(f) n/a CS 4 A4[4] HE9 HE9 67.1 a e +mSPW S307(f) n/a CS 4 IR s5 IR s5 67.2 a e +Kfz 13 n/a CS 2 n/a n/a 68† n/a +PSW 221 n/a CS 2 sD6 sD6 69† A† N +PSW 222 n/a CS 3 sD6 sD6 70† A† N +PSW 222 (L) n/a CS 3 sD6 sD6 70† A† N +PSW 231 (6 rad) n/a CS 4 n/a n/a 71† n/a +PSW 231 (8 rad) n/a CS 4 sD6 sD6 72† N +PSW 232 (8 rad) n/a CS 4 sD6 sD6 72 N +PSW 233 n/a CS 5 H8 s9 sD7 H8 s9 sD7 73 N +PSW 234/1 n/a CS 5 n/a n/a 74 A† +PSW 234/2 n/a CS 4 A5[3] sD7 sD7 75 n/a +PSW 234/3 n/a CS 5 H8 s9 H8 s9 76 Q† +PSW 234/4 n/a CS 5 (brew up) HE7 s7 HE7 s7 77† n/a +sIG IB n/a CS 4 (brew up) H6 s9 H6 s9 78 G +sIG II n/a CS 4 (brew up) H6 s9 H6 s9 79 N +sIG 38(t)M n/a CS 4 (brew up) H6 s9 H6 s9 80 E N +PzA II n/a CS 4 H5 s8 H5 s8 81 M† +PzA LrS(f) n/a CS 4 H4 s8 H4 s8 82 a N +GSW 39H(f) n/a CS 4 H4 s7 H4 s7 82.1 a e +PzA III/IV n/a CS 6 H5 s8 H5 s8 83 n/a +FlaKPz 38(t) n/a CS 4 n/a n/a 84 A† E +37 FlaK/Pz IV n/a CS 5 n/a n/a 85† A† +(Moebelwagen) n/a CS 6 n/a n/a 85† A† +FlaKPz IV/20 n/a CS 6 n/a n/a 86 A† +FlaKPz IV/37 n/a CS 6 n/a n/a 87 A† +SdKfz 10/4 n/a CS 5 n/a n/a 88 A† D† N +SdKfz 10/5 n/a CS 4 n/a n/a 88.1† A†2 D†1 +SdKfz 6/2 n/a CS 5 n/a n/a 89 A† D† N +SdKfz 7/1 n/a CS 4 n/a n/a 90 A† D† N +Kfz 4 n/a CS 3 n/a n/a 91† N +2cm FlaK LKW n/a CS 5 n/a n/a 92 A† +3.7cm FlaK LKW n/a CS 5 n/a n/a 92 A† +Goliath n/a n/a n/a n/a 93† L† +Kfz 1 n/a cs 2† n/a n/a 94† L† N +Kfz 1/20 n/a cs 2 n/a n/a 95† L† +Opel 6700 (Blitz) n/a cs 6 n/a n/a 96 N +Buessing-NAG 4500 n/a cs 7 n/a n/a 96 N +SdKfz 2 n/a cs 2 n/a n/a 97† L† N +SdKfz 7 n/a cs 6 n/a n/a 98 N +SdKfz 11 n/a cs 5 n/a n/a 99 N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt index dc96e32..7a50cc1 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt @@ -1,124 +1,124 @@ === vehicles/german/1941 === -Name Radio Crew survival Capabilities # Notes ----------------------- ------- ------------------------------------ -------------- ----- --------------------------------- -PzKpfw IB n/a CS 2 sD6 1† N -PzKpfw IIA n/a CS 3 sD6 2 n/a -PzKpfw IIF n/a CS 3 sD7 3 N -PzKpfw II(Fl) n/a CS 2 (brew up) sD7† 4† n/a -PzKpfw IIL n/a CS 4 sD7 5 n/a -PzKpfw 35t n/a CS 4 sD5 6† n/a -PzKpfw 38(t)A n/a CS 4 A4 sD6 7† E -PzKpfw 38(t)E n/a CS 4 A4 sD7 8† E -Aufklaerer 38(t) n/a CS 5 n/a 9 A† E -FT-17 730m(f) n/a CS 2 n/a 9.1† a c f -FT-17 730(f) n/a CS 2 AP9 9.1† a c f -38H 735(f) n/a CS 3 AP10 9.2 a b† f -35-S 739(f) n/a CS 4 n/a 9.3 a b†2 d†1 f -PzKpfw IIID n/a CS 5 sD6 10† n/a -PzKpfw IIIF n/a CS 5 A4 sD7 11† n/a -PzKpfw IIIG n/a CS 5 A4 sD7 12 N -PzKpfw IIIH n/a CS 6 A4 sD7 13† N -PzKpfw IIIJ n/a CS 6 sD7 14† N S -PzKpfw IIIL n/a CS 5 sD7 15† B† N S -PzKpfw IIIN n/a CS 5 H9 s9 sD7 16 B† N S -PzKpfw III(Fl) n/a CS 3 sD7 17 n/a -PzKpfw IVA n/a CS 5 AP7 s9 sD6 18† n/a -PzKpfw IVC n/a CS 5 AP7 s9 sD6 19† n/a -PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 20 N R† -PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 21 N R† -PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 22 N R† -PzKpfw IVF2 n/a CS 6 s8 sD6 23† N S -PzKpfw IVH n/a CS 6 s8 sD5 24† B† S -PzKpfw IVJ n/a CS 6 s8 sN9 25 S -PzKpfw VD n/a CS 5 (brew up) sD5 26 F† -PzKpfw VG n/a CS 6 n/a 27† H† -PzKpfw M15/42(i) n/a CS 4 n/a 28 I -PzKpfw P26/40(i) n/a CS 4 s8 29 I -PzKpfw VIE n/a CS 6 M7† sD7 30† K N -PzKpfw VIE (L) n/a CS 6 n/a 31 K -PzKpfw VIB n/a CS 6 sN9 32† K -StuG IIIB n/a CS 4 AP7 H6 s9 sD7 33† n/a -StuG IIIG n/a CS 4 s8 sD7 34† N P† S -StuG IIIG (L) n/a CS 4 s8 sN9 35 O† Q† S -StuH 42 n/a CS 4 H9 s9 sD7 36† N P† S -StuH 42 (L) n/a CS 4 H9 s9 sN9 35 O† Q† S -StuPz IV n/a CS 6 H7 s9 37† S -Sturmtiger n/a CS 5 sN9 37.1† K -PzJg Tiger n/a CS 7 n/a 38 n/a -StuG 75/18(i) n/a CS 3 H7 s9 39 I P† -StuG 75/34(i) n/a CS 3 s9 40 I P† -StuG 105/25(i) n/a CS 3 H7 s9 41 I P† -StuG 75/46(i) n/a CS 3 s9 42 I P† -PzJg I n/a CS 3 A5 HE7 43 N -PzJg 35R(f) n/a CS 3 A5 HE7 44 a -Pz 35R 731(f) n/a CS 2 n/a 44.1† a -Marder I n/a CS 4 (brew up) HE7 s7 45† a -GSW 39H(f) Pak n/a CS 3 HE9 45.1 a e -Marder II n/a CS 4 (brew up) HE7 s7 46 M† N -Marder III(t)H n/a CS 4 (brew up) HE7 s7 sD6 47 E G N -Marder III(t)M n/a CS 4 (brew up) HE7 s7 sD5 48 E -PzJg III/IV n/a CS 5 HE7 49 M† -JgdPz 38(t) n/a CS 4 HE7 50 E O† -JgdPz 38(t) (Fl) n/a CS 4 n/a 51 E O† -JgdPz IV n/a CS 4 HE7 s7 52 S -JgdPz IV (L) n/a CS 4 HE7 s7 52 S -StuIG 33B n/a CS 5 H7 s9 53† n/a -JgdPz IV/70 n/a CS 4 HE7 sN9 54† S -JgdPz V n/a CS 6 HE7 sN9 55 H -JgdPz VI n/a CS 7 HE7 sN9 56 n/a -SPW 250/1 n/a CS 4 n/a 57 N -SPW 250/sMG n/a CS 4† n/a 58† J† N -SPW 250/7 n/a CS 4 (brew up) IR s8 59 J† N -SPW 250/8 n/a CS 4 (brew up) H6 s8 60 Q† -SPW 250/9 n/a CS 4 n/a 61† A† -SPW 250/10 n/a CS 4 A4 62 J† N -SPW 251/1 n/a CS 5 n/a 63 C† N -SPW 251/sMG n/a CS 5† n/a 58† C† J† N -SPW 251/2 n/a CS 4 (brew up) IR s8 59 C† J† N -SPW 251/9 n/a CS 4 (brew up) H6 s9 64 C† N Q† -SPW 251/10 n/a CS 4 A4 65 C† J† N -SPW 251/16 n/a CS 4 (brew up) n/a 66† n/a -SPW 251/21 n/a CS 4 n/a 66.1† n/a -SPW 251/22 n/a CS 4 (brew up) HE7 s7 67 J† -SPW S307(f) n/a CS 4 HE9 67.1 a e -mSPW S307(f) n/a CS 4 IR s5 67.2 a e -Kfz 13 n/a CS 2 n/a 68† n/a -PSW 221 n/a CS 2 sD6 69† A† N -PSW 222 n/a CS 3 sD6 70† A† N -PSW 222 (L) n/a CS 3 sD6 70† A† N -PSW 231 (6 rad) n/a CS 4 n/a 71† n/a -PSW 231 (8 rad) n/a CS 4 sD6 72† N -PSW 232 (8 rad) n/a CS 4 sD6 72 N -PSW 233 n/a CS 5 H8 s9 sD7 73 N -PSW 234/1 n/a CS 5 n/a 74 A† -PSW 234/2 n/a CS 4 sD7 75 n/a -PSW 234/3 n/a CS 5 H8 s9 76 Q† -PSW 234/4 n/a CS 5 (brew up) HE7 s7 77† n/a -sIG IB n/a CS 4 (brew up) H6 s9 78 G -sIG II n/a CS 4 (brew up) H6 s9 79 N -sIG 38(t)M n/a CS 4 (brew up) H6 s9 80 E N -PzA II n/a CS 4 H5 s8 81 M† -PzA LrS(f) n/a CS 4 H4 s8 82 a N -GSW 39H(f) n/a CS 4 H4 s7 82.1 a e -PzA III/IV n/a CS 6 H5 s8 83 n/a -FlaKPz 38(t) n/a CS 4 n/a 84 A† E -37 FlaK/Pz IV n/a CS 5 n/a 85† A† -(Moebelwagen) n/a CS 6 n/a 85† A† -FlaKPz IV/20 n/a CS 6 n/a 86 A† -FlaKPz IV/37 n/a CS 6 n/a 87 A† -SdKfz 10/4 n/a CS 5 n/a 88 A† D† N -SdKfz 10/5 n/a CS 4 n/a 88.1† A†2 D†1 -SdKfz 6/2 n/a CS 5 n/a 89 A† D† N -SdKfz 7/1 n/a CS 4 n/a 90 A† D† N -Kfz 4 n/a CS 3 n/a 91† N -2cm FlaK LKW n/a CS 5 n/a 92 A† -3.7cm FlaK LKW n/a CS 5 n/a 92 A† -Goliath n/a n/a n/a 93† L† -Kfz 1 n/a cs 2† n/a 94† L† N -Kfz 1/20 n/a cs 2 n/a 95† L† -Opel 6700 (Blitz) n/a cs 6 n/a 96 N -Buessing-NAG 4500 n/a cs 7 n/a 96 N -SdKfz 2 n/a cs 2 n/a 97† L† N -SdKfz 7 n/a cs 6 n/a 98 N -SdKfz 11 n/a cs 5 n/a 99 N +Name Radio Crew survival Capabilities (effective) # Notes +---------------------- ------- ------------------------------------ ------------------- ------------- ----- --------------------------------- +PzKpfw IB n/a CS 2 sD6 sD6 1† N +PzKpfw IIA n/a CS 3 sD6 sD6 2 n/a +PzKpfw IIF n/a CS 3 sD7 sD7 3 N +PzKpfw II(Fl) n/a CS 2 (brew up) sD7† sD7† 4† n/a +PzKpfw IIL n/a CS 4 sD7 sD7 5 n/a +PzKpfw 35t n/a CS 4 sD5 sD5 6† n/a +PzKpfw 38(t)A n/a CS 4 A4[1]5[2] sD6 A4 sD6 7† E +PzKpfw 38(t)E n/a CS 4 A4[1]5[2] sD7 A4 sD7 8† E +Aufklaerer 38(t) n/a CS 5 n/a n/a 9 A† E +FT-17 730m(f) n/a CS 2 n/a n/a 9.1† a c f +FT-17 730(f) n/a CS 2 AP9 AP9 9.1† a c f +38H 735(f) n/a CS 3 AP10 AP10 9.2 a b† f +35-S 739(f) n/a CS 4 n/a n/a 9.3 a b†2 d†1 f +PzKpfw IIID n/a CS 5 sD6 sD6 10† n/a +PzKpfw IIIF n/a CS 5 A4[1] sD7 A4 sD7 11† n/a +PzKpfw IIIG n/a CS 5 A4[1] sD7 A4 sD7 12 N +PzKpfw IIIH n/a CS 6 A4[1] sD7 A4 sD7 13† N +PzKpfw IIIJ n/a CS 6 A6[2] sD7 sD7 14† N S +PzKpfw IIIL n/a CS 5 A6[2] sD7 sD7 15† B† N S +PzKpfw IIIN n/a CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S +PzKpfw III(Fl) n/a CS 3 sD7 sD7 17 n/a +PzKpfw IVA n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a +PzKpfw IVC n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a +PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 AP7 H6 s9 sD7 20 N R† +PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 21 N R† +PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 22 N R† +PzKpfw IVF2 n/a CS 6 A5[2] s8 sD6 s8 sD6 23† N S +PzKpfw IVH n/a CS 6 A5[2] s8 sD5 s8 sD5 24† B† S +PzKpfw IVJ n/a CS 6 A3[4] s8 sN9 s8 sN9 25 S +PzKpfw VD n/a CS 5 (brew up) sD5 sD5 26 F† +PzKpfw VG n/a CS 6 sN7[4] n/a 27† H† +PzKpfw M15/42(i) n/a CS 4 n/a n/a 28 I +PzKpfw P26/40(i) n/a CS 4 s8 s8 29 I +PzKpfw VIE n/a CS 6 A6[2] M7† sD7 M7† sD7 30† K N +PzKpfw VIE (L) n/a CS 6 A4[4] sN7[4] n/a 31 K +PzKpfw VIB n/a CS 6 sN9 sN9 32† K +StuG IIIB n/a CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a +StuG IIIG n/a CS 4 A6[2] s8 sD7 s8 sD7 34† N P† S +StuG IIIG (L) n/a CS 4 A4[4] s8 sN9 s8 sN9 35 O† Q† S +StuH 42 n/a CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S +StuH 42 (L) n/a CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S +StuPz IV n/a CS 6 H7 s9 H7 s9 37† S +Sturmtiger n/a CS 5 sN9 sN9 37.1† K +PzJg Tiger n/a CS 7 n/a n/a 38 n/a +StuG 75/18(i) n/a CS 3 H7 s9 H7 s9 39 I P† +StuG 75/34(i) n/a CS 3 s9 s9 40 I P† +StuG 105/25(i) n/a CS 3 H7 s9 H7 s9 41 I P† +StuG 75/46(i) n/a CS 3 s9 s9 42 I P† +PzJg I n/a CS 3 A5[1] HE7 A5 HE7 43 N +PzJg 35R(f) n/a CS 3 A5[1] HE7 A5 HE7 44 a +Pz 35R 731(f) n/a CS 2 n/a n/a 44.1† a +Marder I n/a CS 4 (brew up) A6[2] HE7 s7 HE7 s7 45† a +GSW 39H(f) Pak n/a CS 3 A4[4] HE9 HE9 45.1 a e +Marder II n/a CS 4 (brew up) A6[2] HE7 s7 HE7 s7 46 M† N +Marder III(t)H n/a CS 4 (brew up) A6[2] HE7 s7 sD6 HE7 s7 sD6 47 E G N +Marder III(t)M n/a CS 4 (brew up) A5[3] HE7 s7 sD5 HE7 s7 sD5 48 E +PzJg III/IV n/a CS 5 HE7 HE7 49 M† +JgdPz 38(t) n/a CS 4 A4[4] HE7 HE7 50 E O† +JgdPz 38(t) (Fl) n/a CS 4 n/a n/a 51 E O† +JgdPz IV n/a CS 4 A4[4] HE7 s7 sN7[4] HE7 s7 52 S +JgdPz IV (L) n/a CS 4 A4[4] HE7 s7 sN8[4] HE7 s7 52 S +StuIG 33B n/a CS 5 H7 s9 H7 s9 53† n/a +JgdPz IV/70 n/a CS 4 HE7 sN9 HE7 sN9 54† S +JgdPz V n/a CS 6 HE7 sN9 HE7 sN9 55 H +JgdPz VI n/a CS 7 HE7 sN9 HE7 sN9 56 n/a +SPW 250/1 n/a CS 4 n/a n/a 57 N +SPW 250/sMG n/a CS 4† n/a n/a 58† J† N +SPW 250/7 n/a CS 4 (brew up) IR s8 IR s8 59 J† N +SPW 250/8 n/a CS 4 (brew up) H6 s8 H6 s8 60 Q† +SPW 250/9 n/a CS 4 n/a n/a 61† A† +SPW 250/10 n/a CS 4 A4[1] A4 62 J† N +SPW 251/1 n/a CS 5 n/a n/a 63 C† N +SPW 251/sMG n/a CS 5† n/a n/a 58† C† J† N +SPW 251/2 n/a CS 4 (brew up) IR s8 IR s8 59 C† J† N +SPW 251/9 n/a CS 4 (brew up) H6 s9 H6 s9 64 C† N Q† +SPW 251/10 n/a CS 4 A4[1] A4 65 C† J† N +SPW 251/16 n/a CS 4 (brew up) n/a n/a 66† n/a +SPW 251/21 n/a CS 4 n/a n/a 66.1† n/a +SPW 251/22 n/a CS 4 (brew up) HE7 s7 HE7 s7 67 J† +SPW S307(f) n/a CS 4 A4[4] HE9 HE9 67.1 a e +mSPW S307(f) n/a CS 4 IR s5 IR s5 67.2 a e +Kfz 13 n/a CS 2 n/a n/a 68† n/a +PSW 221 n/a CS 2 sD6 sD6 69† A† N +PSW 222 n/a CS 3 sD6 sD6 70† A† N +PSW 222 (L) n/a CS 3 sD6 sD6 70† A† N +PSW 231 (6 rad) n/a CS 4 n/a n/a 71† n/a +PSW 231 (8 rad) n/a CS 4 sD6 sD6 72† N +PSW 232 (8 rad) n/a CS 4 sD6 sD6 72 N +PSW 233 n/a CS 5 H8 s9 sD7 H8 s9 sD7 73 N +PSW 234/1 n/a CS 5 n/a n/a 74 A† +PSW 234/2 n/a CS 4 A5[3] sD7 sD7 75 n/a +PSW 234/3 n/a CS 5 H8 s9 H8 s9 76 Q† +PSW 234/4 n/a CS 5 (brew up) HE7 s7 HE7 s7 77† n/a +sIG IB n/a CS 4 (brew up) H6 s9 H6 s9 78 G +sIG II n/a CS 4 (brew up) H6 s9 H6 s9 79 N +sIG 38(t)M n/a CS 4 (brew up) H6 s9 H6 s9 80 E N +PzA II n/a CS 4 H5 s8 H5 s8 81 M† +PzA LrS(f) n/a CS 4 H4 s8 H4 s8 82 a N +GSW 39H(f) n/a CS 4 H4 s7 H4 s7 82.1 a e +PzA III/IV n/a CS 6 H5 s8 H5 s8 83 n/a +FlaKPz 38(t) n/a CS 4 n/a n/a 84 A† E +37 FlaK/Pz IV n/a CS 5 n/a n/a 85† A† +(Moebelwagen) n/a CS 6 n/a n/a 85† A† +FlaKPz IV/20 n/a CS 6 n/a n/a 86 A† +FlaKPz IV/37 n/a CS 6 n/a n/a 87 A† +SdKfz 10/4 n/a CS 5 n/a n/a 88 A† D† N +SdKfz 10/5 n/a CS 4 n/a n/a 88.1† A†2 D†1 +SdKfz 6/2 n/a CS 5 n/a n/a 89 A† D† N +SdKfz 7/1 n/a CS 4 n/a n/a 90 A† D† N +Kfz 4 n/a CS 3 n/a n/a 91† N +2cm FlaK LKW n/a CS 5 n/a n/a 92 A† +3.7cm FlaK LKW n/a CS 5 n/a n/a 92 A† +Goliath n/a n/a n/a n/a 93† L† +Kfz 1 n/a cs 2† n/a n/a 94† L† N +Kfz 1/20 n/a cs 2 n/a n/a 95† L† +Opel 6700 (Blitz) n/a cs 6 n/a n/a 96 N +Buessing-NAG 4500 n/a cs 7 n/a n/a 96 N +SdKfz 2 n/a cs 2 n/a n/a 97† L† N +SdKfz 7 n/a cs 6 n/a n/a 98 N +SdKfz 11 n/a cs 5 n/a n/a 99 N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt index fa971d7..3dbff42 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt @@ -1,124 +1,124 @@ === vehicles/german/1942 === -Name Radio Crew survival Capabilities # Notes ----------------------- ------- ------------------------------------ -------------- ----- --------------------------------- -PzKpfw IB n/a CS 2 sD6 1† N -PzKpfw IIA n/a CS 3 sD6 2 n/a -PzKpfw IIF n/a CS 3 sD7 3 N -PzKpfw II(Fl) n/a CS 2 (brew up) sD7† 4† n/a -PzKpfw IIL n/a CS 4 sD7 5 n/a -PzKpfw 35t n/a CS 4 sD5 6† n/a -PzKpfw 38(t)A n/a CS 4 A5 sD6 7† E -PzKpfw 38(t)E n/a CS 4 A5 sD7 8† E -Aufklaerer 38(t) n/a CS 5 n/a 9 A† E -FT-17 730m(f) n/a CS 2 n/a 9.1† a c f -FT-17 730(f) n/a CS 2 AP9 9.1† a c f -38H 735(f) n/a CS 3 AP10 9.2 a b† f -35-S 739(f) n/a CS 4 n/a 9.3 a b†2 d†1 f -PzKpfw IIID n/a CS 5 sD6 10† n/a -PzKpfw IIIF n/a CS 5 A4 sD7 11† n/a -PzKpfw IIIG n/a CS 5 A4 sD7 12 N -PzKpfw IIIH n/a CS 6 A4 sD7 13† N -PzKpfw IIIJ n/a CS 6 A6 sD7 14† N S -PzKpfw IIIL n/a CS 5 A6 sD7 15† B† N S -PzKpfw IIIN n/a CS 5 H9 s9 sD7 16 B† N S -PzKpfw III(Fl) n/a CS 3 sD7 17 n/a -PzKpfw IVA n/a CS 5 AP7 s9 sD6 18† n/a -PzKpfw IVC n/a CS 5 AP7 s9 sD6 19† n/a -PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 20 N R† -PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 21 N R† -PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 22 N R† -PzKpfw IVF2 n/a CS 6 A5 s8 sD6 23† N S -PzKpfw IVH n/a CS 6 A5 s8 sD5 24† B† S -PzKpfw IVJ n/a CS 6 s8 sN9 25 S -PzKpfw VD n/a CS 5 (brew up) sD5 26 F† -PzKpfw VG n/a CS 6 n/a 27† H† -PzKpfw M15/42(i) n/a CS 4 n/a 28 I -PzKpfw P26/40(i) n/a CS 4 s8 29 I -PzKpfw VIE n/a CS 6 A6 M7† sD7 30† K N -PzKpfw VIE (L) n/a CS 6 n/a 31 K -PzKpfw VIB n/a CS 6 sN9 32† K -StuG IIIB n/a CS 4 AP7 H6 s9 sD7 33† n/a -StuG IIIG n/a CS 4 A6 s8 sD7 34† N P† S -StuG IIIG (L) n/a CS 4 s8 sN9 35 O† Q† S -StuH 42 n/a CS 4 H9 s9 sD7 36† N P† S -StuH 42 (L) n/a CS 4 H9 s9 sN9 35 O† Q† S -StuPz IV n/a CS 6 H7 s9 37† S -Sturmtiger n/a CS 5 sN9 37.1† K -PzJg Tiger n/a CS 7 n/a 38 n/a -StuG 75/18(i) n/a CS 3 H7 s9 39 I P† -StuG 75/34(i) n/a CS 3 s9 40 I P† -StuG 105/25(i) n/a CS 3 H7 s9 41 I P† -StuG 75/46(i) n/a CS 3 s9 42 I P† -PzJg I n/a CS 3 A5 HE7 43 N -PzJg 35R(f) n/a CS 3 A5 HE7 44 a -Pz 35R 731(f) n/a CS 2 n/a 44.1† a -Marder I n/a CS 4 (brew up) A6 HE7 s7 45† a -GSW 39H(f) Pak n/a CS 3 HE9 45.1 a e -Marder II n/a CS 4 (brew up) A6 HE7 s7 46 M† N -Marder III(t)H n/a CS 4 (brew up) A6 HE7 s7 sD6 47 E G N -Marder III(t)M n/a CS 4 (brew up) HE7 s7 sD5 48 E -PzJg III/IV n/a CS 5 HE7 49 M† -JgdPz 38(t) n/a CS 4 HE7 50 E O† -JgdPz 38(t) (Fl) n/a CS 4 n/a 51 E O† -JgdPz IV n/a CS 4 HE7 s7 52 S -JgdPz IV (L) n/a CS 4 HE7 s7 52 S -StuIG 33B n/a CS 5 H7 s9 53† n/a -JgdPz IV/70 n/a CS 4 HE7 sN9 54† S -JgdPz V n/a CS 6 HE7 sN9 55 H -JgdPz VI n/a CS 7 HE7 sN9 56 n/a -SPW 250/1 n/a CS 4 n/a 57 N -SPW 250/sMG n/a CS 4† n/a 58† J† N -SPW 250/7 n/a CS 4 (brew up) IR s8 59 J† N -SPW 250/8 n/a CS 4 (brew up) H6 s8 60 Q† -SPW 250/9 n/a CS 4 n/a 61† A† -SPW 250/10 n/a CS 4 A4 62 J† N -SPW 251/1 n/a CS 5 n/a 63 C† N -SPW 251/sMG n/a CS 5† n/a 58† C† J† N -SPW 251/2 n/a CS 4 (brew up) IR s8 59 C† J† N -SPW 251/9 n/a CS 4 (brew up) H6 s9 64 C† N Q† -SPW 251/10 n/a CS 4 A4 65 C† J† N -SPW 251/16 n/a CS 4 (brew up) n/a 66† n/a -SPW 251/21 n/a CS 4 n/a 66.1† n/a -SPW 251/22 n/a CS 4 (brew up) HE7 s7 67 J† -SPW S307(f) n/a CS 4 HE9 67.1 a e -mSPW S307(f) n/a CS 4 IR s5 67.2 a e -Kfz 13 n/a CS 2 n/a 68† n/a -PSW 221 n/a CS 2 sD6 69† A† N -PSW 222 n/a CS 3 sD6 70† A† N -PSW 222 (L) n/a CS 3 sD6 70† A† N -PSW 231 (6 rad) n/a CS 4 n/a 71† n/a -PSW 231 (8 rad) n/a CS 4 sD6 72† N -PSW 232 (8 rad) n/a CS 4 sD6 72 N -PSW 233 n/a CS 5 H8 s9 sD7 73 N -PSW 234/1 n/a CS 5 n/a 74 A† -PSW 234/2 n/a CS 4 sD7 75 n/a -PSW 234/3 n/a CS 5 H8 s9 76 Q† -PSW 234/4 n/a CS 5 (brew up) HE7 s7 77† n/a -sIG IB n/a CS 4 (brew up) H6 s9 78 G -sIG II n/a CS 4 (brew up) H6 s9 79 N -sIG 38(t)M n/a CS 4 (brew up) H6 s9 80 E N -PzA II n/a CS 4 H5 s8 81 M† -PzA LrS(f) n/a CS 4 H4 s8 82 a N -GSW 39H(f) n/a CS 4 H4 s7 82.1 a e -PzA III/IV n/a CS 6 H5 s8 83 n/a -FlaKPz 38(t) n/a CS 4 n/a 84 A† E -37 FlaK/Pz IV n/a CS 5 n/a 85† A† -(Moebelwagen) n/a CS 6 n/a 85† A† -FlaKPz IV/20 n/a CS 6 n/a 86 A† -FlaKPz IV/37 n/a CS 6 n/a 87 A† -SdKfz 10/4 n/a CS 5 n/a 88 A† D† N -SdKfz 10/5 n/a CS 4 n/a 88.1† A†2 D†1 -SdKfz 6/2 n/a CS 5 n/a 89 A† D† N -SdKfz 7/1 n/a CS 4 n/a 90 A† D† N -Kfz 4 n/a CS 3 n/a 91† N -2cm FlaK LKW n/a CS 5 n/a 92 A† -3.7cm FlaK LKW n/a CS 5 n/a 92 A† -Goliath n/a n/a n/a 93† L† -Kfz 1 n/a cs 2† n/a 94† L† N -Kfz 1/20 n/a cs 2 n/a 95† L† -Opel 6700 (Blitz) n/a cs 6 n/a 96 N -Buessing-NAG 4500 n/a cs 7 n/a 96 N -SdKfz 2 n/a cs 2 n/a 97† L† N -SdKfz 7 n/a cs 6 n/a 98 N -SdKfz 11 n/a cs 5 n/a 99 N +Name Radio Crew survival Capabilities (effective) # Notes +---------------------- ------- ------------------------------------ ------------------- ------------- ----- --------------------------------- +PzKpfw IB n/a CS 2 sD6 sD6 1† N +PzKpfw IIA n/a CS 3 sD6 sD6 2 n/a +PzKpfw IIF n/a CS 3 sD7 sD7 3 N +PzKpfw II(Fl) n/a CS 2 (brew up) sD7† sD7† 4† n/a +PzKpfw IIL n/a CS 4 sD7 sD7 5 n/a +PzKpfw 35t n/a CS 4 sD5 sD5 6† n/a +PzKpfw 38(t)A n/a CS 4 A4[1]5[2] sD6 A5 sD6 7† E +PzKpfw 38(t)E n/a CS 4 A4[1]5[2] sD7 A5 sD7 8† E +Aufklaerer 38(t) n/a CS 5 n/a n/a 9 A† E +FT-17 730m(f) n/a CS 2 n/a n/a 9.1† a c f +FT-17 730(f) n/a CS 2 AP9 AP9 9.1† a c f +38H 735(f) n/a CS 3 AP10 AP10 9.2 a b† f +35-S 739(f) n/a CS 4 n/a n/a 9.3 a b†2 d†1 f +PzKpfw IIID n/a CS 5 sD6 sD6 10† n/a +PzKpfw IIIF n/a CS 5 A4[1] sD7 A4 sD7 11† n/a +PzKpfw IIIG n/a CS 5 A4[1] sD7 A4 sD7 12 N +PzKpfw IIIH n/a CS 6 A4[1] sD7 A4 sD7 13† N +PzKpfw IIIJ n/a CS 6 A6[2] sD7 A6 sD7 14† N S +PzKpfw IIIL n/a CS 5 A6[2] sD7 A6 sD7 15† B† N S +PzKpfw IIIN n/a CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S +PzKpfw III(Fl) n/a CS 3 sD7 sD7 17 n/a +PzKpfw IVA n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a +PzKpfw IVC n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a +PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 AP7 H6 s9 sD7 20 N R† +PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 21 N R† +PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 22 N R† +PzKpfw IVF2 n/a CS 6 A5[2] s8 sD6 A5 s8 sD6 23† N S +PzKpfw IVH n/a CS 6 A5[2] s8 sD5 A5 s8 sD5 24† B† S +PzKpfw IVJ n/a CS 6 A3[4] s8 sN9 s8 sN9 25 S +PzKpfw VD n/a CS 5 (brew up) sD5 sD5 26 F† +PzKpfw VG n/a CS 6 sN7[4] n/a 27† H† +PzKpfw M15/42(i) n/a CS 4 n/a n/a 28 I +PzKpfw P26/40(i) n/a CS 4 s8 s8 29 I +PzKpfw VIE n/a CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K N +PzKpfw VIE (L) n/a CS 6 A4[4] sN7[4] n/a 31 K +PzKpfw VIB n/a CS 6 sN9 sN9 32† K +StuG IIIB n/a CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a +StuG IIIG n/a CS 4 A6[2] s8 sD7 A6 s8 sD7 34† N P† S +StuG IIIG (L) n/a CS 4 A4[4] s8 sN9 s8 sN9 35 O† Q† S +StuH 42 n/a CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S +StuH 42 (L) n/a CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S +StuPz IV n/a CS 6 H7 s9 H7 s9 37† S +Sturmtiger n/a CS 5 sN9 sN9 37.1† K +PzJg Tiger n/a CS 7 n/a n/a 38 n/a +StuG 75/18(i) n/a CS 3 H7 s9 H7 s9 39 I P† +StuG 75/34(i) n/a CS 3 s9 s9 40 I P† +StuG 105/25(i) n/a CS 3 H7 s9 H7 s9 41 I P† +StuG 75/46(i) n/a CS 3 s9 s9 42 I P† +PzJg I n/a CS 3 A5[1] HE7 A5 HE7 43 N +PzJg 35R(f) n/a CS 3 A5[1] HE7 A5 HE7 44 a +Pz 35R 731(f) n/a CS 2 n/a n/a 44.1† a +Marder I n/a CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 45† a +GSW 39H(f) Pak n/a CS 3 A4[4] HE9 HE9 45.1 a e +Marder II n/a CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† N +Marder III(t)H n/a CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G N +Marder III(t)M n/a CS 4 (brew up) A5[3] HE7 s7 sD5 HE7 s7 sD5 48 E +PzJg III/IV n/a CS 5 HE7 HE7 49 M† +JgdPz 38(t) n/a CS 4 A4[4] HE7 HE7 50 E O† +JgdPz 38(t) (Fl) n/a CS 4 n/a n/a 51 E O† +JgdPz IV n/a CS 4 A4[4] HE7 s7 sN7[4] HE7 s7 52 S +JgdPz IV (L) n/a CS 4 A4[4] HE7 s7 sN8[4] HE7 s7 52 S +StuIG 33B n/a CS 5 H7 s9 H7 s9 53† n/a +JgdPz IV/70 n/a CS 4 HE7 sN9 HE7 sN9 54† S +JgdPz V n/a CS 6 HE7 sN9 HE7 sN9 55 H +JgdPz VI n/a CS 7 HE7 sN9 HE7 sN9 56 n/a +SPW 250/1 n/a CS 4 n/a n/a 57 N +SPW 250/sMG n/a CS 4† n/a n/a 58† J† N +SPW 250/7 n/a CS 4 (brew up) IR s8 IR s8 59 J† N +SPW 250/8 n/a CS 4 (brew up) H6 s8 H6 s8 60 Q† +SPW 250/9 n/a CS 4 n/a n/a 61† A† +SPW 250/10 n/a CS 4 A4[1] A4 62 J† N +SPW 251/1 n/a CS 5 n/a n/a 63 C† N +SPW 251/sMG n/a CS 5† n/a n/a 58† C† J† N +SPW 251/2 n/a CS 4 (brew up) IR s8 IR s8 59 C† J† N +SPW 251/9 n/a CS 4 (brew up) H6 s9 H6 s9 64 C† N Q† +SPW 251/10 n/a CS 4 A4[1] A4 65 C† J† N +SPW 251/16 n/a CS 4 (brew up) n/a n/a 66† n/a +SPW 251/21 n/a CS 4 n/a n/a 66.1† n/a +SPW 251/22 n/a CS 4 (brew up) HE7 s7 HE7 s7 67 J† +SPW S307(f) n/a CS 4 A4[4] HE9 HE9 67.1 a e +mSPW S307(f) n/a CS 4 IR s5 IR s5 67.2 a e +Kfz 13 n/a CS 2 n/a n/a 68† n/a +PSW 221 n/a CS 2 sD6 sD6 69† A† N +PSW 222 n/a CS 3 sD6 sD6 70† A† N +PSW 222 (L) n/a CS 3 sD6 sD6 70† A† N +PSW 231 (6 rad) n/a CS 4 n/a n/a 71† n/a +PSW 231 (8 rad) n/a CS 4 sD6 sD6 72† N +PSW 232 (8 rad) n/a CS 4 sD6 sD6 72 N +PSW 233 n/a CS 5 H8 s9 sD7 H8 s9 sD7 73 N +PSW 234/1 n/a CS 5 n/a n/a 74 A† +PSW 234/2 n/a CS 4 A5[3] sD7 sD7 75 n/a +PSW 234/3 n/a CS 5 H8 s9 H8 s9 76 Q† +PSW 234/4 n/a CS 5 (brew up) HE7 s7 HE7 s7 77† n/a +sIG IB n/a CS 4 (brew up) H6 s9 H6 s9 78 G +sIG II n/a CS 4 (brew up) H6 s9 H6 s9 79 N +sIG 38(t)M n/a CS 4 (brew up) H6 s9 H6 s9 80 E N +PzA II n/a CS 4 H5 s8 H5 s8 81 M† +PzA LrS(f) n/a CS 4 H4 s8 H4 s8 82 a N +GSW 39H(f) n/a CS 4 H4 s7 H4 s7 82.1 a e +PzA III/IV n/a CS 6 H5 s8 H5 s8 83 n/a +FlaKPz 38(t) n/a CS 4 n/a n/a 84 A† E +37 FlaK/Pz IV n/a CS 5 n/a n/a 85† A† +(Moebelwagen) n/a CS 6 n/a n/a 85† A† +FlaKPz IV/20 n/a CS 6 n/a n/a 86 A† +FlaKPz IV/37 n/a CS 6 n/a n/a 87 A† +SdKfz 10/4 n/a CS 5 n/a n/a 88 A† D† N +SdKfz 10/5 n/a CS 4 n/a n/a 88.1† A†2 D†1 +SdKfz 6/2 n/a CS 5 n/a n/a 89 A† D† N +SdKfz 7/1 n/a CS 4 n/a n/a 90 A† D† N +Kfz 4 n/a CS 3 n/a n/a 91† N +2cm FlaK LKW n/a CS 5 n/a n/a 92 A† +3.7cm FlaK LKW n/a CS 5 n/a n/a 92 A† +Goliath n/a n/a n/a n/a 93† L† +Kfz 1 n/a cs 2† n/a n/a 94† L† N +Kfz 1/20 n/a cs 2 n/a n/a 95† L† +Opel 6700 (Blitz) n/a cs 6 n/a n/a 96 N +Buessing-NAG 4500 n/a cs 7 n/a n/a 96 N +SdKfz 2 n/a cs 2 n/a n/a 97† L† N +SdKfz 7 n/a cs 6 n/a n/a 98 N +SdKfz 11 n/a cs 5 n/a n/a 99 N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt index 4f96f36..0f2e563 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt @@ -1,124 +1,124 @@ === vehicles/german/1943 === -Name Radio Crew survival Capabilities # Notes ----------------------- ------- ------------------------------------ -------------- ----- --------------------------------- -PzKpfw IB n/a CS 2 sD6 1† N -PzKpfw IIA n/a CS 3 sD6 2 n/a -PzKpfw IIF n/a CS 3 sD7 3 N -PzKpfw II(Fl) n/a CS 2 (brew up) sD7† 4† n/a -PzKpfw IIL n/a CS 4 sD7 5 n/a -PzKpfw 35t n/a CS 4 sD5 6† n/a -PzKpfw 38(t)A n/a CS 4 A5 sD6 7† E -PzKpfw 38(t)E n/a CS 4 A5 sD7 8† E -Aufklaerer 38(t) n/a CS 5 n/a 9 A† E -FT-17 730m(f) n/a CS 2 n/a 9.1† a c f -FT-17 730(f) n/a CS 2 AP9 9.1† a c f -38H 735(f) n/a CS 3 AP10 9.2 a b† f -35-S 739(f) n/a CS 4 n/a 9.3 a b†2 d†1 f -PzKpfw IIID n/a CS 5 sD6 10† n/a -PzKpfw IIIF n/a CS 5 A4 sD7 11† n/a -PzKpfw IIIG n/a CS 5 A4 sD7 12 N -PzKpfw IIIH n/a CS 6 A4 sD7 13† N -PzKpfw IIIJ n/a CS 6 A6 sD7 14† N S -PzKpfw IIIL n/a CS 5 A6 sD7 15† B† N S -PzKpfw IIIN n/a CS 5 H9 s9 sD7 16 B† N S -PzKpfw III(Fl) n/a CS 3 sD7 17 n/a -PzKpfw IVA n/a CS 5 AP7 s9 sD6 18† n/a -PzKpfw IVC n/a CS 5 AP7 s9 sD6 19† n/a -PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 20 N R† -PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 21 N R† -PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 22 N R† -PzKpfw IVF2 n/a CS 6 A5 s8 sD6 23† N S -PzKpfw IVH n/a CS 6 A5 s8 sD5 24† B† S -PzKpfw IVJ n/a CS 6 s8 sN9 25 S -PzKpfw VD n/a CS 5 (brew up) sD5 26 F† -PzKpfw VG n/a CS 6 n/a 27† H† -PzKpfw M15/42(i) n/a CS 4 n/a 28 I -PzKpfw P26/40(i) n/a CS 4 s8 29 I -PzKpfw VIE n/a CS 6 A6 M7† sD7 30† K N -PzKpfw VIE (L) n/a CS 6 n/a 31 K -PzKpfw VIB n/a CS 6 sN9 32† K -StuG IIIB n/a CS 4 AP7 H6 s9 sD7 33† n/a -StuG IIIG n/a CS 4 A6 s8 sD7 34† N P† S -StuG IIIG (L) n/a CS 4 s8 sN9 35 O† Q† S -StuH 42 n/a CS 4 H9 s9 sD7 36† N P† S -StuH 42 (L) n/a CS 4 H9 s9 sN9 35 O† Q† S -StuPz IV n/a CS 6 H7 s9 37† S -Sturmtiger n/a CS 5 sN9 37.1† K -PzJg Tiger n/a CS 7 n/a 38 n/a -StuG 75/18(i) n/a CS 3 H7 s9 39 I P† -StuG 75/34(i) n/a CS 3 s9 40 I P† -StuG 105/25(i) n/a CS 3 H7 s9 41 I P† -StuG 75/46(i) n/a CS 3 s9 42 I P† -PzJg I n/a CS 3 A5 HE7 43 N -PzJg 35R(f) n/a CS 3 A5 HE7 44 a -Pz 35R 731(f) n/a CS 2 n/a 44.1† a -Marder I n/a CS 4 (brew up) A6 HE7 s7 45† a -GSW 39H(f) Pak n/a CS 3 HE9 45.1 a e -Marder II n/a CS 4 (brew up) A6 HE7 s7 46 M† N -Marder III(t)H n/a CS 4 (brew up) A6 HE7 s7 sD6 47 E G N -Marder III(t)M n/a CS 4 (brew up) A5 HE7 s7 sD5 48 E -PzJg III/IV n/a CS 5 HE7 49 M† -JgdPz 38(t) n/a CS 4 HE7 50 E O† -JgdPz 38(t) (Fl) n/a CS 4 n/a 51 E O† -JgdPz IV n/a CS 4 HE7 s7 52 S -JgdPz IV (L) n/a CS 4 HE7 s7 52 S -StuIG 33B n/a CS 5 H7 s9 53† n/a -JgdPz IV/70 n/a CS 4 HE7 sN9 54† S -JgdPz V n/a CS 6 HE7 sN9 55 H -JgdPz VI n/a CS 7 HE7 sN9 56 n/a -SPW 250/1 n/a CS 4 n/a 57 N -SPW 250/sMG n/a CS 4† n/a 58† J† N -SPW 250/7 n/a CS 4 (brew up) IR s8 59 J† N -SPW 250/8 n/a CS 4 (brew up) H6 s8 60 Q† -SPW 250/9 n/a CS 4 n/a 61† A† -SPW 250/10 n/a CS 4 A4 62 J† N -SPW 251/1 n/a CS 5 n/a 63 C† N -SPW 251/sMG n/a CS 5† n/a 58† C† J† N -SPW 251/2 n/a CS 4 (brew up) IR s8 59 C† J† N -SPW 251/9 n/a CS 4 (brew up) H6 s9 64 C† N Q† -SPW 251/10 n/a CS 4 A4 65 C† J† N -SPW 251/16 n/a CS 4 (brew up) n/a 66† n/a -SPW 251/21 n/a CS 4 n/a 66.1† n/a -SPW 251/22 n/a CS 4 (brew up) HE7 s7 67 J† -SPW S307(f) n/a CS 4 HE9 67.1 a e -mSPW S307(f) n/a CS 4 IR s5 67.2 a e -Kfz 13 n/a CS 2 n/a 68† n/a -PSW 221 n/a CS 2 sD6 69† A† N -PSW 222 n/a CS 3 sD6 70† A† N -PSW 222 (L) n/a CS 3 sD6 70† A† N -PSW 231 (6 rad) n/a CS 4 n/a 71† n/a -PSW 231 (8 rad) n/a CS 4 sD6 72† N -PSW 232 (8 rad) n/a CS 4 sD6 72 N -PSW 233 n/a CS 5 H8 s9 sD7 73 N -PSW 234/1 n/a CS 5 n/a 74 A† -PSW 234/2 n/a CS 4 A5 sD7 75 n/a -PSW 234/3 n/a CS 5 H8 s9 76 Q† -PSW 234/4 n/a CS 5 (brew up) HE7 s7 77† n/a -sIG IB n/a CS 4 (brew up) H6 s9 78 G -sIG II n/a CS 4 (brew up) H6 s9 79 N -sIG 38(t)M n/a CS 4 (brew up) H6 s9 80 E N -PzA II n/a CS 4 H5 s8 81 M† -PzA LrS(f) n/a CS 4 H4 s8 82 a N -GSW 39H(f) n/a CS 4 H4 s7 82.1 a e -PzA III/IV n/a CS 6 H5 s8 83 n/a -FlaKPz 38(t) n/a CS 4 n/a 84 A† E -37 FlaK/Pz IV n/a CS 5 n/a 85† A† -(Moebelwagen) n/a CS 6 n/a 85† A† -FlaKPz IV/20 n/a CS 6 n/a 86 A† -FlaKPz IV/37 n/a CS 6 n/a 87 A† -SdKfz 10/4 n/a CS 5 n/a 88 A† D† N -SdKfz 10/5 n/a CS 4 n/a 88.1† A†2 D†1 -SdKfz 6/2 n/a CS 5 n/a 89 A† D† N -SdKfz 7/1 n/a CS 4 n/a 90 A† D† N -Kfz 4 n/a CS 3 n/a 91† N -2cm FlaK LKW n/a CS 5 n/a 92 A† -3.7cm FlaK LKW n/a CS 5 n/a 92 A† -Goliath n/a n/a n/a 93† L† -Kfz 1 n/a cs 2† n/a 94† L† N -Kfz 1/20 n/a cs 2 n/a 95† L† -Opel 6700 (Blitz) n/a cs 6 n/a 96 N -Buessing-NAG 4500 n/a cs 7 n/a 96 N -SdKfz 2 n/a cs 2 n/a 97† L† N -SdKfz 7 n/a cs 6 n/a 98 N -SdKfz 11 n/a cs 5 n/a 99 N +Name Radio Crew survival Capabilities (effective) # Notes +---------------------- ------- ------------------------------------ ------------------- ------------- ----- --------------------------------- +PzKpfw IB n/a CS 2 sD6 sD6 1† N +PzKpfw IIA n/a CS 3 sD6 sD6 2 n/a +PzKpfw IIF n/a CS 3 sD7 sD7 3 N +PzKpfw II(Fl) n/a CS 2 (brew up) sD7† sD7† 4† n/a +PzKpfw IIL n/a CS 4 sD7 sD7 5 n/a +PzKpfw 35t n/a CS 4 sD5 sD5 6† n/a +PzKpfw 38(t)A n/a CS 4 A4[1]5[2] sD6 A5 sD6 7† E +PzKpfw 38(t)E n/a CS 4 A4[1]5[2] sD7 A5 sD7 8† E +Aufklaerer 38(t) n/a CS 5 n/a n/a 9 A† E +FT-17 730m(f) n/a CS 2 n/a n/a 9.1† a c f +FT-17 730(f) n/a CS 2 AP9 AP9 9.1† a c f +38H 735(f) n/a CS 3 AP10 AP10 9.2 a b† f +35-S 739(f) n/a CS 4 n/a n/a 9.3 a b†2 d†1 f +PzKpfw IIID n/a CS 5 sD6 sD6 10† n/a +PzKpfw IIIF n/a CS 5 A4[1] sD7 A4 sD7 11† n/a +PzKpfw IIIG n/a CS 5 A4[1] sD7 A4 sD7 12 N +PzKpfw IIIH n/a CS 6 A4[1] sD7 A4 sD7 13† N +PzKpfw IIIJ n/a CS 6 A6[2] sD7 A6 sD7 14† N S +PzKpfw IIIL n/a CS 5 A6[2] sD7 A6 sD7 15† B† N S +PzKpfw IIIN n/a CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S +PzKpfw III(Fl) n/a CS 3 sD7 sD7 17 n/a +PzKpfw IVA n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a +PzKpfw IVC n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a +PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 AP7 H6 s9 sD7 20 N R† +PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 21 N R† +PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 22 N R† +PzKpfw IVF2 n/a CS 6 A5[2] s8 sD6 A5 s8 sD6 23† N S +PzKpfw IVH n/a CS 6 A5[2] s8 sD5 A5 s8 sD5 24† B† S +PzKpfw IVJ n/a CS 6 A3[4] s8 sN9 s8 sN9 25 S +PzKpfw VD n/a CS 5 (brew up) sD5 sD5 26 F† +PzKpfw VG n/a CS 6 sN7[4] n/a 27† H† +PzKpfw M15/42(i) n/a CS 4 n/a n/a 28 I +PzKpfw P26/40(i) n/a CS 4 s8 s8 29 I +PzKpfw VIE n/a CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K N +PzKpfw VIE (L) n/a CS 6 A4[4] sN7[4] n/a 31 K +PzKpfw VIB n/a CS 6 sN9 sN9 32† K +StuG IIIB n/a CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a +StuG IIIG n/a CS 4 A6[2] s8 sD7 A6 s8 sD7 34† N P† S +StuG IIIG (L) n/a CS 4 A4[4] s8 sN9 s8 sN9 35 O† Q† S +StuH 42 n/a CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S +StuH 42 (L) n/a CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S +StuPz IV n/a CS 6 H7 s9 H7 s9 37† S +Sturmtiger n/a CS 5 sN9 sN9 37.1† K +PzJg Tiger n/a CS 7 n/a n/a 38 n/a +StuG 75/18(i) n/a CS 3 H7 s9 H7 s9 39 I P† +StuG 75/34(i) n/a CS 3 s9 s9 40 I P† +StuG 105/25(i) n/a CS 3 H7 s9 H7 s9 41 I P† +StuG 75/46(i) n/a CS 3 s9 s9 42 I P† +PzJg I n/a CS 3 A5[1] HE7 A5 HE7 43 N +PzJg 35R(f) n/a CS 3 A5[1] HE7 A5 HE7 44 a +Pz 35R 731(f) n/a CS 2 n/a n/a 44.1† a +Marder I n/a CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 45† a +GSW 39H(f) Pak n/a CS 3 A4[4] HE9 HE9 45.1 a e +Marder II n/a CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† N +Marder III(t)H n/a CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G N +Marder III(t)M n/a CS 4 (brew up) A5[3] HE7 s7 sD5 A5 HE7 s7 sD5 48 E +PzJg III/IV n/a CS 5 HE7 HE7 49 M† +JgdPz 38(t) n/a CS 4 A4[4] HE7 HE7 50 E O† +JgdPz 38(t) (Fl) n/a CS 4 n/a n/a 51 E O† +JgdPz IV n/a CS 4 A4[4] HE7 s7 sN7[4] HE7 s7 52 S +JgdPz IV (L) n/a CS 4 A4[4] HE7 s7 sN8[4] HE7 s7 52 S +StuIG 33B n/a CS 5 H7 s9 H7 s9 53† n/a +JgdPz IV/70 n/a CS 4 HE7 sN9 HE7 sN9 54† S +JgdPz V n/a CS 6 HE7 sN9 HE7 sN9 55 H +JgdPz VI n/a CS 7 HE7 sN9 HE7 sN9 56 n/a +SPW 250/1 n/a CS 4 n/a n/a 57 N +SPW 250/sMG n/a CS 4† n/a n/a 58† J† N +SPW 250/7 n/a CS 4 (brew up) IR s8 IR s8 59 J† N +SPW 250/8 n/a CS 4 (brew up) H6 s8 H6 s8 60 Q† +SPW 250/9 n/a CS 4 n/a n/a 61† A† +SPW 250/10 n/a CS 4 A4[1] A4 62 J† N +SPW 251/1 n/a CS 5 n/a n/a 63 C† N +SPW 251/sMG n/a CS 5† n/a n/a 58† C† J† N +SPW 251/2 n/a CS 4 (brew up) IR s8 IR s8 59 C† J† N +SPW 251/9 n/a CS 4 (brew up) H6 s9 H6 s9 64 C† N Q† +SPW 251/10 n/a CS 4 A4[1] A4 65 C† J† N +SPW 251/16 n/a CS 4 (brew up) n/a n/a 66† n/a +SPW 251/21 n/a CS 4 n/a n/a 66.1† n/a +SPW 251/22 n/a CS 4 (brew up) HE7 s7 HE7 s7 67 J† +SPW S307(f) n/a CS 4 A4[4] HE9 HE9 67.1 a e +mSPW S307(f) n/a CS 4 IR s5 IR s5 67.2 a e +Kfz 13 n/a CS 2 n/a n/a 68† n/a +PSW 221 n/a CS 2 sD6 sD6 69† A† N +PSW 222 n/a CS 3 sD6 sD6 70† A† N +PSW 222 (L) n/a CS 3 sD6 sD6 70† A† N +PSW 231 (6 rad) n/a CS 4 n/a n/a 71† n/a +PSW 231 (8 rad) n/a CS 4 sD6 sD6 72† N +PSW 232 (8 rad) n/a CS 4 sD6 sD6 72 N +PSW 233 n/a CS 5 H8 s9 sD7 H8 s9 sD7 73 N +PSW 234/1 n/a CS 5 n/a n/a 74 A† +PSW 234/2 n/a CS 4 A5[3] sD7 A5 sD7 75 n/a +PSW 234/3 n/a CS 5 H8 s9 H8 s9 76 Q† +PSW 234/4 n/a CS 5 (brew up) HE7 s7 HE7 s7 77† n/a +sIG IB n/a CS 4 (brew up) H6 s9 H6 s9 78 G +sIG II n/a CS 4 (brew up) H6 s9 H6 s9 79 N +sIG 38(t)M n/a CS 4 (brew up) H6 s9 H6 s9 80 E N +PzA II n/a CS 4 H5 s8 H5 s8 81 M† +PzA LrS(f) n/a CS 4 H4 s8 H4 s8 82 a N +GSW 39H(f) n/a CS 4 H4 s7 H4 s7 82.1 a e +PzA III/IV n/a CS 6 H5 s8 H5 s8 83 n/a +FlaKPz 38(t) n/a CS 4 n/a n/a 84 A† E +37 FlaK/Pz IV n/a CS 5 n/a n/a 85† A† +(Moebelwagen) n/a CS 6 n/a n/a 85† A† +FlaKPz IV/20 n/a CS 6 n/a n/a 86 A† +FlaKPz IV/37 n/a CS 6 n/a n/a 87 A† +SdKfz 10/4 n/a CS 5 n/a n/a 88 A† D† N +SdKfz 10/5 n/a CS 4 n/a n/a 88.1† A†2 D†1 +SdKfz 6/2 n/a CS 5 n/a n/a 89 A† D† N +SdKfz 7/1 n/a CS 4 n/a n/a 90 A† D† N +Kfz 4 n/a CS 3 n/a n/a 91† N +2cm FlaK LKW n/a CS 5 n/a n/a 92 A† +3.7cm FlaK LKW n/a CS 5 n/a n/a 92 A† +Goliath n/a n/a n/a n/a 93† L† +Kfz 1 n/a cs 2† n/a n/a 94† L† N +Kfz 1/20 n/a cs 2 n/a n/a 95† L† +Opel 6700 (Blitz) n/a cs 6 n/a n/a 96 N +Buessing-NAG 4500 n/a cs 7 n/a n/a 96 N +SdKfz 2 n/a cs 2 n/a n/a 97† L† N +SdKfz 7 n/a cs 6 n/a n/a 98 N +SdKfz 11 n/a cs 5 n/a n/a 99 N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt index 4356b3d..40a5899 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt @@ -1,124 +1,124 @@ === vehicles/german/1944 === -Name Radio Crew survival Capabilities # Notes ----------------------- ------- ------------------------------------ -------------- ----- --------------------------------- -PzKpfw IB n/a CS 2 sD6 1† N -PzKpfw IIA n/a CS 3 sD6 2 n/a -PzKpfw IIF n/a CS 3 sD7 3 N -PzKpfw II(Fl) n/a CS 2 (brew up) sD7† 4† n/a -PzKpfw IIL n/a CS 4 sD7 5 n/a -PzKpfw 35t n/a CS 4 sD5 6† n/a -PzKpfw 38(t)A n/a CS 4 A5 sD6 7† E -PzKpfw 38(t)E n/a CS 4 A5 sD7 8† E -Aufklaerer 38(t) n/a CS 5 n/a 9 A† E -FT-17 730m(f) n/a CS 2 n/a 9.1† a c f -FT-17 730(f) n/a CS 2 AP9 9.1† a c f -38H 735(f) n/a CS 3 AP10 9.2 a b† f -35-S 739(f) n/a CS 4 n/a 9.3 a b†2 d†1 f -PzKpfw IIID n/a CS 5 sD6 10† n/a -PzKpfw IIIF n/a CS 5 A4 sD7 11† n/a -PzKpfw IIIG n/a CS 5 A4 sD7 12 N -PzKpfw IIIH n/a CS 6 A4 sD7 13† N -PzKpfw IIIJ n/a CS 6 A6 sD7 14† N S -PzKpfw IIIL n/a CS 5 A6 sD7 15† B† N S -PzKpfw IIIN n/a CS 5 H9 s9 sD7 16 B† N S -PzKpfw III(Fl) n/a CS 3 sD7 17 n/a -PzKpfw IVA n/a CS 5 AP7 s9 sD6 18† n/a -PzKpfw IVC n/a CS 5 AP7 s9 sD6 19† n/a -PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 20 N R† -PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 21 N R† -PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 22 N R† -PzKpfw IVF2 n/a CS 6 A5 s8 sD6 23† N S -PzKpfw IVH n/a CS 6 A5 s8 sD5 24† B† S -PzKpfw IVJ n/a CS 6 A3 s8 sN9 25 S -PzKpfw VD n/a CS 5 (brew up) sD5 26 F† -PzKpfw VG n/a CS 6 sN7 27† H† -PzKpfw M15/42(i) n/a CS 4 n/a 28 I -PzKpfw P26/40(i) n/a CS 4 s8 29 I -PzKpfw VIE n/a CS 6 A6 M7† sD7 30† K N -PzKpfw VIE (L) n/a CS 6 A4 sN7 31 K -PzKpfw VIB n/a CS 6 sN9 32† K -StuG IIIB n/a CS 4 AP7 H6 s9 sD7 33† n/a -StuG IIIG n/a CS 4 A6 s8 sD7 34† N P† S -StuG IIIG (L) n/a CS 4 A4 s8 sN9 35 O† Q† S -StuH 42 n/a CS 4 H9 s9 sD7 36† N P† S -StuH 42 (L) n/a CS 4 H9 s9 sN9 35 O† Q† S -StuPz IV n/a CS 6 H7 s9 37† S -Sturmtiger n/a CS 5 sN9 37.1† K -PzJg Tiger n/a CS 7 n/a 38 n/a -StuG 75/18(i) n/a CS 3 H7 s9 39 I P† -StuG 75/34(i) n/a CS 3 s9 40 I P† -StuG 105/25(i) n/a CS 3 H7 s9 41 I P† -StuG 75/46(i) n/a CS 3 s9 42 I P† -PzJg I n/a CS 3 A5 HE7 43 N -PzJg 35R(f) n/a CS 3 A5 HE7 44 a -Pz 35R 731(f) n/a CS 2 n/a 44.1† a -Marder I n/a CS 4 (brew up) A6 HE7 s7 45† a -GSW 39H(f) Pak n/a CS 3 A4 HE9 45.1 a e -Marder II n/a CS 4 (brew up) A6 HE7 s7 46 M† N -Marder III(t)H n/a CS 4 (brew up) A6 HE7 s7 sD6 47 E G N -Marder III(t)M n/a CS 4 (brew up) A5 HE7 s7 sD5 48 E -PzJg III/IV n/a CS 5 HE7 49 M† -JgdPz 38(t) n/a CS 4 A4 HE7 50 E O† -JgdPz 38(t) (Fl) n/a CS 4 n/a 51 E O† -JgdPz IV n/a CS 4 A4 HE7 s7 sN7 52 S -JgdPz IV (L) n/a CS 4 A4 HE7 s7 sN8 52 S -StuIG 33B n/a CS 5 H7 s9 53† n/a -JgdPz IV/70 n/a CS 4 HE7 sN9 54† S -JgdPz V n/a CS 6 HE7 sN9 55 H -JgdPz VI n/a CS 7 HE7 sN9 56 n/a -SPW 250/1 n/a CS 4 n/a 57 N -SPW 250/sMG n/a CS 4† n/a 58† J† N -SPW 250/7 n/a CS 4 (brew up) IR s8 59 J† N -SPW 250/8 n/a CS 4 (brew up) H6 s8 60 Q† -SPW 250/9 n/a CS 4 n/a 61† A† -SPW 250/10 n/a CS 4 A4 62 J† N -SPW 251/1 n/a CS 5 n/a 63 C† N -SPW 251/sMG n/a CS 5† n/a 58† C† J† N -SPW 251/2 n/a CS 4 (brew up) IR s8 59 C† J† N -SPW 251/9 n/a CS 4 (brew up) H6 s9 64 C† N Q† -SPW 251/10 n/a CS 4 A4 65 C† J† N -SPW 251/16 n/a CS 4 (brew up) n/a 66† n/a -SPW 251/21 n/a CS 4 n/a 66.1† n/a -SPW 251/22 n/a CS 4 (brew up) HE7 s7 67 J† -SPW S307(f) n/a CS 4 A4 HE9 67.1 a e -mSPW S307(f) n/a CS 4 IR s5 67.2 a e -Kfz 13 n/a CS 2 n/a 68† n/a -PSW 221 n/a CS 2 sD6 69† A† N -PSW 222 n/a CS 3 sD6 70† A† N -PSW 222 (L) n/a CS 3 sD6 70† A† N -PSW 231 (6 rad) n/a CS 4 n/a 71† n/a -PSW 231 (8 rad) n/a CS 4 sD6 72† N -PSW 232 (8 rad) n/a CS 4 sD6 72 N -PSW 233 n/a CS 5 H8 s9 sD7 73 N -PSW 234/1 n/a CS 5 n/a 74 A† -PSW 234/2 n/a CS 4 A5 sD7 75 n/a -PSW 234/3 n/a CS 5 H8 s9 76 Q† -PSW 234/4 n/a CS 5 (brew up) HE7 s7 77† n/a -sIG IB n/a CS 4 (brew up) H6 s9 78 G -sIG II n/a CS 4 (brew up) H6 s9 79 N -sIG 38(t)M n/a CS 4 (brew up) H6 s9 80 E N -PzA II n/a CS 4 H5 s8 81 M† -PzA LrS(f) n/a CS 4 H4 s8 82 a N -GSW 39H(f) n/a CS 4 H4 s7 82.1 a e -PzA III/IV n/a CS 6 H5 s8 83 n/a -FlaKPz 38(t) n/a CS 4 n/a 84 A† E -37 FlaK/Pz IV n/a CS 5 n/a 85† A† -(Moebelwagen) n/a CS 6 n/a 85† A† -FlaKPz IV/20 n/a CS 6 n/a 86 A† -FlaKPz IV/37 n/a CS 6 n/a 87 A† -SdKfz 10/4 n/a CS 5 n/a 88 A† D† N -SdKfz 10/5 n/a CS 4 n/a 88.1† A†2 D†1 -SdKfz 6/2 n/a CS 5 n/a 89 A† D† N -SdKfz 7/1 n/a CS 4 n/a 90 A† D† N -Kfz 4 n/a CS 3 n/a 91† N -2cm FlaK LKW n/a CS 5 n/a 92 A† -3.7cm FlaK LKW n/a CS 5 n/a 92 A† -Goliath n/a n/a n/a 93† L† -Kfz 1 n/a cs 2† n/a 94† L† N -Kfz 1/20 n/a cs 2 n/a 95† L† -Opel 6700 (Blitz) n/a cs 6 n/a 96 N -Buessing-NAG 4500 n/a cs 7 n/a 96 N -SdKfz 2 n/a cs 2 n/a 97† L† N -SdKfz 7 n/a cs 6 n/a 98 N -SdKfz 11 n/a cs 5 n/a 99 N +Name Radio Crew survival Capabilities (effective) # Notes +---------------------- ------- ------------------------------------ ------------------- ------------- ----- --------------------------------- +PzKpfw IB n/a CS 2 sD6 sD6 1† N +PzKpfw IIA n/a CS 3 sD6 sD6 2 n/a +PzKpfw IIF n/a CS 3 sD7 sD7 3 N +PzKpfw II(Fl) n/a CS 2 (brew up) sD7† sD7† 4† n/a +PzKpfw IIL n/a CS 4 sD7 sD7 5 n/a +PzKpfw 35t n/a CS 4 sD5 sD5 6† n/a +PzKpfw 38(t)A n/a CS 4 A4[1]5[2] sD6 A5 sD6 7† E +PzKpfw 38(t)E n/a CS 4 A4[1]5[2] sD7 A5 sD7 8† E +Aufklaerer 38(t) n/a CS 5 n/a n/a 9 A† E +FT-17 730m(f) n/a CS 2 n/a n/a 9.1† a c f +FT-17 730(f) n/a CS 2 AP9 AP9 9.1† a c f +38H 735(f) n/a CS 3 AP10 AP10 9.2 a b† f +35-S 739(f) n/a CS 4 n/a n/a 9.3 a b†2 d†1 f +PzKpfw IIID n/a CS 5 sD6 sD6 10† n/a +PzKpfw IIIF n/a CS 5 A4[1] sD7 A4 sD7 11† n/a +PzKpfw IIIG n/a CS 5 A4[1] sD7 A4 sD7 12 N +PzKpfw IIIH n/a CS 6 A4[1] sD7 A4 sD7 13† N +PzKpfw IIIJ n/a CS 6 A6[2] sD7 A6 sD7 14† N S +PzKpfw IIIL n/a CS 5 A6[2] sD7 A6 sD7 15† B† N S +PzKpfw IIIN n/a CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S +PzKpfw III(Fl) n/a CS 3 sD7 sD7 17 n/a +PzKpfw IVA n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a +PzKpfw IVC n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a +PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 AP7 H6 s9 sD7 20 N R† +PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 21 N R† +PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 22 N R† +PzKpfw IVF2 n/a CS 6 A5[2] s8 sD6 A5 s8 sD6 23† N S +PzKpfw IVH n/a CS 6 A5[2] s8 sD5 A5 s8 sD5 24† B† S +PzKpfw IVJ n/a CS 6 A3[4] s8 sN9 A3 s8 sN9 25 S +PzKpfw VD n/a CS 5 (brew up) sD5 sD5 26 F† +PzKpfw VG n/a CS 6 sN7[4] sN7 27† H† +PzKpfw M15/42(i) n/a CS 4 n/a n/a 28 I +PzKpfw P26/40(i) n/a CS 4 s8 s8 29 I +PzKpfw VIE n/a CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K N +PzKpfw VIE (L) n/a CS 6 A4[4] sN7[4] A4 sN7 31 K +PzKpfw VIB n/a CS 6 sN9 sN9 32† K +StuG IIIB n/a CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a +StuG IIIG n/a CS 4 A6[2] s8 sD7 A6 s8 sD7 34† N P† S +StuG IIIG (L) n/a CS 4 A4[4] s8 sN9 A4 s8 sN9 35 O† Q† S +StuH 42 n/a CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S +StuH 42 (L) n/a CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S +StuPz IV n/a CS 6 H7 s9 H7 s9 37† S +Sturmtiger n/a CS 5 sN9 sN9 37.1† K +PzJg Tiger n/a CS 7 n/a n/a 38 n/a +StuG 75/18(i) n/a CS 3 H7 s9 H7 s9 39 I P† +StuG 75/34(i) n/a CS 3 s9 s9 40 I P† +StuG 105/25(i) n/a CS 3 H7 s9 H7 s9 41 I P† +StuG 75/46(i) n/a CS 3 s9 s9 42 I P† +PzJg I n/a CS 3 A5[1] HE7 A5 HE7 43 N +PzJg 35R(f) n/a CS 3 A5[1] HE7 A5 HE7 44 a +Pz 35R 731(f) n/a CS 2 n/a n/a 44.1† a +Marder I n/a CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 45† a +GSW 39H(f) Pak n/a CS 3 A4[4] HE9 A4 HE9 45.1 a e +Marder II n/a CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† N +Marder III(t)H n/a CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G N +Marder III(t)M n/a CS 4 (brew up) A5[3] HE7 s7 sD5 A5 HE7 s7 sD5 48 E +PzJg III/IV n/a CS 5 HE7 HE7 49 M† +JgdPz 38(t) n/a CS 4 A4[4] HE7 A4 HE7 50 E O† +JgdPz 38(t) (Fl) n/a CS 4 n/a n/a 51 E O† +JgdPz IV n/a CS 4 A4[4] HE7 s7 sN7[4] A4 HE7 s7 sN7 52 S +JgdPz IV (L) n/a CS 4 A4[4] HE7 s7 sN8[4] A4 HE7 s7 sN8 52 S +StuIG 33B n/a CS 5 H7 s9 H7 s9 53† n/a +JgdPz IV/70 n/a CS 4 HE7 sN9 HE7 sN9 54† S +JgdPz V n/a CS 6 HE7 sN9 HE7 sN9 55 H +JgdPz VI n/a CS 7 HE7 sN9 HE7 sN9 56 n/a +SPW 250/1 n/a CS 4 n/a n/a 57 N +SPW 250/sMG n/a CS 4† n/a n/a 58† J† N +SPW 250/7 n/a CS 4 (brew up) IR s8 IR s8 59 J† N +SPW 250/8 n/a CS 4 (brew up) H6 s8 H6 s8 60 Q† +SPW 250/9 n/a CS 4 n/a n/a 61† A† +SPW 250/10 n/a CS 4 A4[1] A4 62 J† N +SPW 251/1 n/a CS 5 n/a n/a 63 C† N +SPW 251/sMG n/a CS 5† n/a n/a 58† C† J† N +SPW 251/2 n/a CS 4 (brew up) IR s8 IR s8 59 C† J† N +SPW 251/9 n/a CS 4 (brew up) H6 s9 H6 s9 64 C† N Q† +SPW 251/10 n/a CS 4 A4[1] A4 65 C† J† N +SPW 251/16 n/a CS 4 (brew up) n/a n/a 66† n/a +SPW 251/21 n/a CS 4 n/a n/a 66.1† n/a +SPW 251/22 n/a CS 4 (brew up) HE7 s7 HE7 s7 67 J† +SPW S307(f) n/a CS 4 A4[4] HE9 A4 HE9 67.1 a e +mSPW S307(f) n/a CS 4 IR s5 IR s5 67.2 a e +Kfz 13 n/a CS 2 n/a n/a 68† n/a +PSW 221 n/a CS 2 sD6 sD6 69† A† N +PSW 222 n/a CS 3 sD6 sD6 70† A† N +PSW 222 (L) n/a CS 3 sD6 sD6 70† A† N +PSW 231 (6 rad) n/a CS 4 n/a n/a 71† n/a +PSW 231 (8 rad) n/a CS 4 sD6 sD6 72† N +PSW 232 (8 rad) n/a CS 4 sD6 sD6 72 N +PSW 233 n/a CS 5 H8 s9 sD7 H8 s9 sD7 73 N +PSW 234/1 n/a CS 5 n/a n/a 74 A† +PSW 234/2 n/a CS 4 A5[3] sD7 A5 sD7 75 n/a +PSW 234/3 n/a CS 5 H8 s9 H8 s9 76 Q† +PSW 234/4 n/a CS 5 (brew up) HE7 s7 HE7 s7 77† n/a +sIG IB n/a CS 4 (brew up) H6 s9 H6 s9 78 G +sIG II n/a CS 4 (brew up) H6 s9 H6 s9 79 N +sIG 38(t)M n/a CS 4 (brew up) H6 s9 H6 s9 80 E N +PzA II n/a CS 4 H5 s8 H5 s8 81 M† +PzA LrS(f) n/a CS 4 H4 s8 H4 s8 82 a N +GSW 39H(f) n/a CS 4 H4 s7 H4 s7 82.1 a e +PzA III/IV n/a CS 6 H5 s8 H5 s8 83 n/a +FlaKPz 38(t) n/a CS 4 n/a n/a 84 A† E +37 FlaK/Pz IV n/a CS 5 n/a n/a 85† A† +(Moebelwagen) n/a CS 6 n/a n/a 85† A† +FlaKPz IV/20 n/a CS 6 n/a n/a 86 A† +FlaKPz IV/37 n/a CS 6 n/a n/a 87 A† +SdKfz 10/4 n/a CS 5 n/a n/a 88 A† D† N +SdKfz 10/5 n/a CS 4 n/a n/a 88.1† A†2 D†1 +SdKfz 6/2 n/a CS 5 n/a n/a 89 A† D† N +SdKfz 7/1 n/a CS 4 n/a n/a 90 A† D† N +Kfz 4 n/a CS 3 n/a n/a 91† N +2cm FlaK LKW n/a CS 5 n/a n/a 92 A† +3.7cm FlaK LKW n/a CS 5 n/a n/a 92 A† +Goliath n/a n/a n/a n/a 93† L† +Kfz 1 n/a cs 2† n/a n/a 94† L† N +Kfz 1/20 n/a cs 2 n/a n/a 95† L† +Opel 6700 (Blitz) n/a cs 6 n/a n/a 96 N +Buessing-NAG 4500 n/a cs 7 n/a n/a 96 N +SdKfz 2 n/a cs 2 n/a n/a 97† L† N +SdKfz 7 n/a cs 6 n/a n/a 98 N +SdKfz 11 n/a cs 5 n/a n/a 99 N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt index be74a57..5eb44fd 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt @@ -1,124 +1,124 @@ === vehicles/german/1945 === -Name Radio Crew survival Capabilities # Notes ----------------------- ------- ------------------------------------ -------------- ----- --------------------------------- -PzKpfw IB n/a CS 2 sD6 1† N -PzKpfw IIA n/a CS 3 sD6 2 n/a -PzKpfw IIF n/a CS 3 sD7 3 N -PzKpfw II(Fl) n/a CS 2 (brew up) sD7† 4† n/a -PzKpfw IIL n/a CS 4 sD7 5 n/a -PzKpfw 35t n/a CS 4 sD5 6† n/a -PzKpfw 38(t)A n/a CS 4 A5 sD6 7† E -PzKpfw 38(t)E n/a CS 4 A5 sD7 8† E -Aufklaerer 38(t) n/a CS 5 n/a 9 A† E -FT-17 730m(f) n/a CS 2 n/a 9.1† a c f -FT-17 730(f) n/a CS 2 AP9 9.1† a c f -38H 735(f) n/a CS 3 AP10 9.2 a b† f -35-S 739(f) n/a CS 4 n/a 9.3 a b†2 d†1 f -PzKpfw IIID n/a CS 5 sD6 10† n/a -PzKpfw IIIF n/a CS 5 A4 sD7 11† n/a -PzKpfw IIIG n/a CS 5 A4 sD7 12 N -PzKpfw IIIH n/a CS 6 A4 sD7 13† N -PzKpfw IIIJ n/a CS 6 A6 sD7 14† N S -PzKpfw IIIL n/a CS 5 A6 sD7 15† B† N S -PzKpfw IIIN n/a CS 5 H9 s9 sD7 16 B† N S -PzKpfw III(Fl) n/a CS 3 sD7 17 n/a -PzKpfw IVA n/a CS 5 AP7 s9 sD6 18† n/a -PzKpfw IVC n/a CS 5 AP7 s9 sD6 19† n/a -PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 20 N R† -PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 21 N R† -PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 22 N R† -PzKpfw IVF2 n/a CS 6 A5 s8 sD6 23† N S -PzKpfw IVH n/a CS 6 A5 s8 sD5 24† B† S -PzKpfw IVJ n/a CS 6 A3 s8 sN9 25 S -PzKpfw VD n/a CS 5 (brew up) sD5 26 F† -PzKpfw VG n/a CS 6 sN7 27† H† -PzKpfw M15/42(i) n/a CS 4 n/a 28 I -PzKpfw P26/40(i) n/a CS 4 s8 29 I -PzKpfw VIE n/a CS 6 A6 M7† sD7 30† K N -PzKpfw VIE (L) n/a CS 6 A4 sN7 31 K -PzKpfw VIB n/a CS 6 sN9 32† K -StuG IIIB n/a CS 4 AP7 H6 s9 sD7 33† n/a -StuG IIIG n/a CS 4 A6 s8 sD7 34† N P† S -StuG IIIG (L) n/a CS 4 A4 s8 sN9 35 O† Q† S -StuH 42 n/a CS 4 H9 s9 sD7 36† N P† S -StuH 42 (L) n/a CS 4 H9 s9 sN9 35 O† Q† S -StuPz IV n/a CS 6 H7 s9 37† S -Sturmtiger n/a CS 5 sN9 37.1† K -PzJg Tiger n/a CS 7 n/a 38 n/a -StuG 75/18(i) n/a CS 3 H7 s9 39 I P† -StuG 75/34(i) n/a CS 3 s9 40 I P† -StuG 105/25(i) n/a CS 3 H7 s9 41 I P† -StuG 75/46(i) n/a CS 3 s9 42 I P† -PzJg I n/a CS 3 A5 HE7 43 N -PzJg 35R(f) n/a CS 3 A5 HE7 44 a -Pz 35R 731(f) n/a CS 2 n/a 44.1† a -Marder I n/a CS 4 (brew up) A6 HE7 s7 45† a -GSW 39H(f) Pak n/a CS 3 A4 HE9 45.1 a e -Marder II n/a CS 4 (brew up) A6 HE7 s7 46 M† N -Marder III(t)H n/a CS 4 (brew up) A6 HE7 s7 sD6 47 E G N -Marder III(t)M n/a CS 4 (brew up) A5 HE7 s7 sD5 48 E -PzJg III/IV n/a CS 5 HE7 49 M† -JgdPz 38(t) n/a CS 4 A4 HE7 50 E O† -JgdPz 38(t) (Fl) n/a CS 4 n/a 51 E O† -JgdPz IV n/a CS 4 A4 HE7 s7 sN7 52 S -JgdPz IV (L) n/a CS 4 A4 HE7 s7 sN8 52 S -StuIG 33B n/a CS 5 H7 s9 53† n/a -JgdPz IV/70 n/a CS 4 HE7 sN9 54† S -JgdPz V n/a CS 6 HE7 sN9 55 H -JgdPz VI n/a CS 7 HE7 sN9 56 n/a -SPW 250/1 n/a CS 4 n/a 57 N -SPW 250/sMG n/a CS 4† n/a 58† J† N -SPW 250/7 n/a CS 4 (brew up) IR s8 59 J† N -SPW 250/8 n/a CS 4 (brew up) H6 s8 60 Q† -SPW 250/9 n/a CS 4 n/a 61† A† -SPW 250/10 n/a CS 4 A4 62 J† N -SPW 251/1 n/a CS 5 n/a 63 C† N -SPW 251/sMG n/a CS 5† n/a 58† C† J† N -SPW 251/2 n/a CS 4 (brew up) IR s8 59 C† J† N -SPW 251/9 n/a CS 4 (brew up) H6 s9 64 C† N Q† -SPW 251/10 n/a CS 4 A4 65 C† J† N -SPW 251/16 n/a CS 4 (brew up) n/a 66† n/a -SPW 251/21 n/a CS 4 n/a 66.1† n/a -SPW 251/22 n/a CS 4 (brew up) HE7 s7 67 J† -SPW S307(f) n/a CS 4 A4 HE9 67.1 a e -mSPW S307(f) n/a CS 4 IR s5 67.2 a e -Kfz 13 n/a CS 2 n/a 68† n/a -PSW 221 n/a CS 2 sD6 69† A† N -PSW 222 n/a CS 3 sD6 70† A† N -PSW 222 (L) n/a CS 3 sD6 70† A† N -PSW 231 (6 rad) n/a CS 4 n/a 71† n/a -PSW 231 (8 rad) n/a CS 4 sD6 72† N -PSW 232 (8 rad) n/a CS 4 sD6 72 N -PSW 233 n/a CS 5 H8 s9 sD7 73 N -PSW 234/1 n/a CS 5 n/a 74 A† -PSW 234/2 n/a CS 4 A5 sD7 75 n/a -PSW 234/3 n/a CS 5 H8 s9 76 Q† -PSW 234/4 n/a CS 5 (brew up) HE7 s7 77† n/a -sIG IB n/a CS 4 (brew up) H6 s9 78 G -sIG II n/a CS 4 (brew up) H6 s9 79 N -sIG 38(t)M n/a CS 4 (brew up) H6 s9 80 E N -PzA II n/a CS 4 H5 s8 81 M† -PzA LrS(f) n/a CS 4 H4 s8 82 a N -GSW 39H(f) n/a CS 4 H4 s7 82.1 a e -PzA III/IV n/a CS 6 H5 s8 83 n/a -FlaKPz 38(t) n/a CS 4 n/a 84 A† E -37 FlaK/Pz IV n/a CS 5 n/a 85† A† -(Moebelwagen) n/a CS 6 n/a 85† A† -FlaKPz IV/20 n/a CS 6 n/a 86 A† -FlaKPz IV/37 n/a CS 6 n/a 87 A† -SdKfz 10/4 n/a CS 5 n/a 88 A† D† N -SdKfz 10/5 n/a CS 4 n/a 88.1† A†2 D†1 -SdKfz 6/2 n/a CS 5 n/a 89 A† D† N -SdKfz 7/1 n/a CS 4 n/a 90 A† D† N -Kfz 4 n/a CS 3 n/a 91† N -2cm FlaK LKW n/a CS 5 n/a 92 A† -3.7cm FlaK LKW n/a CS 5 n/a 92 A† -Goliath n/a n/a n/a 93† L† -Kfz 1 n/a cs 2† n/a 94† L† N -Kfz 1/20 n/a cs 2 n/a 95† L† -Opel 6700 (Blitz) n/a cs 6 n/a 96 N -Buessing-NAG 4500 n/a cs 7 n/a 96 N -SdKfz 2 n/a cs 2 n/a 97† L† N -SdKfz 7 n/a cs 6 n/a 98 N -SdKfz 11 n/a cs 5 n/a 99 N +Name Radio Crew survival Capabilities (effective) # Notes +---------------------- ------- ------------------------------------ ------------------- ------------- ----- --------------------------------- +PzKpfw IB n/a CS 2 sD6 sD6 1† N +PzKpfw IIA n/a CS 3 sD6 sD6 2 n/a +PzKpfw IIF n/a CS 3 sD7 sD7 3 N +PzKpfw II(Fl) n/a CS 2 (brew up) sD7† sD7† 4† n/a +PzKpfw IIL n/a CS 4 sD7 sD7 5 n/a +PzKpfw 35t n/a CS 4 sD5 sD5 6† n/a +PzKpfw 38(t)A n/a CS 4 A4[1]5[2] sD6 A5 sD6 7† E +PzKpfw 38(t)E n/a CS 4 A4[1]5[2] sD7 A5 sD7 8† E +Aufklaerer 38(t) n/a CS 5 n/a n/a 9 A† E +FT-17 730m(f) n/a CS 2 n/a n/a 9.1† a c f +FT-17 730(f) n/a CS 2 AP9 AP9 9.1† a c f +38H 735(f) n/a CS 3 AP10 AP10 9.2 a b† f +35-S 739(f) n/a CS 4 n/a n/a 9.3 a b†2 d†1 f +PzKpfw IIID n/a CS 5 sD6 sD6 10† n/a +PzKpfw IIIF n/a CS 5 A4[1] sD7 A4 sD7 11† n/a +PzKpfw IIIG n/a CS 5 A4[1] sD7 A4 sD7 12 N +PzKpfw IIIH n/a CS 6 A4[1] sD7 A4 sD7 13† N +PzKpfw IIIJ n/a CS 6 A6[2] sD7 A6 sD7 14† N S +PzKpfw IIIL n/a CS 5 A6[2] sD7 A6 sD7 15† B† N S +PzKpfw IIIN n/a CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S +PzKpfw III(Fl) n/a CS 3 sD7 sD7 17 n/a +PzKpfw IVA n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a +PzKpfw IVC n/a CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a +PzKpfw IVD n/a CS 5 AP7 H6 s9 sD7 AP7 H6 s9 sD7 20 N R† +PzKpfw IVE n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 21 N R† +PzKpfw IVF1 n/a CS 6 AP7 H6 s9 sD7 AP7 H6 s9 sD7 22 N R† +PzKpfw IVF2 n/a CS 6 A5[2] s8 sD6 A5 s8 sD6 23† N S +PzKpfw IVH n/a CS 6 A5[2] s8 sD5 A5 s8 sD5 24† B† S +PzKpfw IVJ n/a CS 6 A3[4] s8 sN9 A3 s8 sN9 25 S +PzKpfw VD n/a CS 5 (brew up) sD5 sD5 26 F† +PzKpfw VG n/a CS 6 sN7[4] sN7 27† H† +PzKpfw M15/42(i) n/a CS 4 n/a n/a 28 I +PzKpfw P26/40(i) n/a CS 4 s8 s8 29 I +PzKpfw VIE n/a CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K N +PzKpfw VIE (L) n/a CS 6 A4[4] sN7[4] A4 sN7 31 K +PzKpfw VIB n/a CS 6 sN9 sN9 32† K +StuG IIIB n/a CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a +StuG IIIG n/a CS 4 A6[2] s8 sD7 A6 s8 sD7 34† N P† S +StuG IIIG (L) n/a CS 4 A4[4] s8 sN9 A4 s8 sN9 35 O† Q† S +StuH 42 n/a CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S +StuH 42 (L) n/a CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S +StuPz IV n/a CS 6 H7 s9 H7 s9 37† S +Sturmtiger n/a CS 5 sN9 sN9 37.1† K +PzJg Tiger n/a CS 7 n/a n/a 38 n/a +StuG 75/18(i) n/a CS 3 H7 s9 H7 s9 39 I P† +StuG 75/34(i) n/a CS 3 s9 s9 40 I P† +StuG 105/25(i) n/a CS 3 H7 s9 H7 s9 41 I P† +StuG 75/46(i) n/a CS 3 s9 s9 42 I P† +PzJg I n/a CS 3 A5[1] HE7 A5 HE7 43 N +PzJg 35R(f) n/a CS 3 A5[1] HE7 A5 HE7 44 a +Pz 35R 731(f) n/a CS 2 n/a n/a 44.1† a +Marder I n/a CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 45† a +GSW 39H(f) Pak n/a CS 3 A4[4] HE9 A4 HE9 45.1 a e +Marder II n/a CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† N +Marder III(t)H n/a CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G N +Marder III(t)M n/a CS 4 (brew up) A5[3] HE7 s7 sD5 A5 HE7 s7 sD5 48 E +PzJg III/IV n/a CS 5 HE7 HE7 49 M† +JgdPz 38(t) n/a CS 4 A4[4] HE7 A4 HE7 50 E O† +JgdPz 38(t) (Fl) n/a CS 4 n/a n/a 51 E O† +JgdPz IV n/a CS 4 A4[4] HE7 s7 sN7[4] A4 HE7 s7 sN7 52 S +JgdPz IV (L) n/a CS 4 A4[4] HE7 s7 sN8[4] A4 HE7 s7 sN8 52 S +StuIG 33B n/a CS 5 H7 s9 H7 s9 53† n/a +JgdPz IV/70 n/a CS 4 HE7 sN9 HE7 sN9 54† S +JgdPz V n/a CS 6 HE7 sN9 HE7 sN9 55 H +JgdPz VI n/a CS 7 HE7 sN9 HE7 sN9 56 n/a +SPW 250/1 n/a CS 4 n/a n/a 57 N +SPW 250/sMG n/a CS 4† n/a n/a 58† J† N +SPW 250/7 n/a CS 4 (brew up) IR s8 IR s8 59 J† N +SPW 250/8 n/a CS 4 (brew up) H6 s8 H6 s8 60 Q† +SPW 250/9 n/a CS 4 n/a n/a 61† A† +SPW 250/10 n/a CS 4 A4[1] A4 62 J† N +SPW 251/1 n/a CS 5 n/a n/a 63 C† N +SPW 251/sMG n/a CS 5† n/a n/a 58† C† J† N +SPW 251/2 n/a CS 4 (brew up) IR s8 IR s8 59 C† J† N +SPW 251/9 n/a CS 4 (brew up) H6 s9 H6 s9 64 C† N Q† +SPW 251/10 n/a CS 4 A4[1] A4 65 C† J† N +SPW 251/16 n/a CS 4 (brew up) n/a n/a 66† n/a +SPW 251/21 n/a CS 4 n/a n/a 66.1† n/a +SPW 251/22 n/a CS 4 (brew up) HE7 s7 HE7 s7 67 J† +SPW S307(f) n/a CS 4 A4[4] HE9 A4 HE9 67.1 a e +mSPW S307(f) n/a CS 4 IR s5 IR s5 67.2 a e +Kfz 13 n/a CS 2 n/a n/a 68† n/a +PSW 221 n/a CS 2 sD6 sD6 69† A† N +PSW 222 n/a CS 3 sD6 sD6 70† A† N +PSW 222 (L) n/a CS 3 sD6 sD6 70† A† N +PSW 231 (6 rad) n/a CS 4 n/a n/a 71† n/a +PSW 231 (8 rad) n/a CS 4 sD6 sD6 72† N +PSW 232 (8 rad) n/a CS 4 sD6 sD6 72 N +PSW 233 n/a CS 5 H8 s9 sD7 H8 s9 sD7 73 N +PSW 234/1 n/a CS 5 n/a n/a 74 A† +PSW 234/2 n/a CS 4 A5[3] sD7 A5 sD7 75 n/a +PSW 234/3 n/a CS 5 H8 s9 H8 s9 76 Q† +PSW 234/4 n/a CS 5 (brew up) HE7 s7 HE7 s7 77† n/a +sIG IB n/a CS 4 (brew up) H6 s9 H6 s9 78 G +sIG II n/a CS 4 (brew up) H6 s9 H6 s9 79 N +sIG 38(t)M n/a CS 4 (brew up) H6 s9 H6 s9 80 E N +PzA II n/a CS 4 H5 s8 H5 s8 81 M† +PzA LrS(f) n/a CS 4 H4 s8 H4 s8 82 a N +GSW 39H(f) n/a CS 4 H4 s7 H4 s7 82.1 a e +PzA III/IV n/a CS 6 H5 s8 H5 s8 83 n/a +FlaKPz 38(t) n/a CS 4 n/a n/a 84 A† E +37 FlaK/Pz IV n/a CS 5 n/a n/a 85† A† +(Moebelwagen) n/a CS 6 n/a n/a 85† A† +FlaKPz IV/20 n/a CS 6 n/a n/a 86 A† +FlaKPz IV/37 n/a CS 6 n/a n/a 87 A† +SdKfz 10/4 n/a CS 5 n/a n/a 88 A† D† N +SdKfz 10/5 n/a CS 4 n/a n/a 88.1† A†2 D†1 +SdKfz 6/2 n/a CS 5 n/a n/a 89 A† D† N +SdKfz 7/1 n/a CS 4 n/a n/a 90 A† D† N +Kfz 4 n/a CS 3 n/a n/a 91† N +2cm FlaK LKW n/a CS 5 n/a n/a 92 A† +3.7cm FlaK LKW n/a CS 5 n/a n/a 92 A† +Goliath n/a n/a n/a n/a 93† L† +Kfz 1 n/a cs 2† n/a n/a 94† L† N +Kfz 1/20 n/a cs 2 n/a n/a 95† L† +Opel 6700 (Blitz) n/a cs 6 n/a n/a 96 N +Buessing-NAG 4500 n/a cs 7 n/a n/a 96 N +SdKfz 2 n/a cs 2 n/a n/a 97† L† N +SdKfz 7 n/a cs 6 n/a n/a 98 N +SdKfz 11 n/a cs 5 n/a n/a 99 N diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt index fc5d154..3b8364c 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt @@ -1,89 +1,89 @@ === vehicles/russian/1940 === -Name Radio Crew survival Capabilities # Notes ------------------ ------- ------------------------------------ -------------- ----- --------------------- -T-37 ® CS 2 n/a 1 H† M -T-27 ® CS 2 n/a 1.1† M Q -T-40 ® CS 2 n/a 2† H† -T-50 ® CS 4 n/a 3 n/a -T-60 M40 ® CS 2 n/a 4 n/a -T-60 M42 ®† CS 2 n/a 4 C† -T-70 ®† CS 2 n/a 5 C† -T-26 M33 ® CS 3 n/a 6 D I† M P -T-26 M37/39 ® CS 3 n/a 6 D M P -T-26 M31 ® CS 3 n/a 6.1† M P -T-26 M32 ® CS 3 n/a 6.2† M P -OT-26 ® CS 3 (brew up) n/a 6.3† M P -ST-26 Bridgelayer n/a CS 3 n/a 6.4† M -OT-133 ® CS 3 n/a 7† M P -BT-2A ® CS 3 n/a 7.1† M -BT-5 M34 ® CS 3 n/a 8† M P -BT-7 M37 ® CS 3 n/a 9 D I† M P -BT-7A n/a CS 3 AP7 s9 10 M P -T-28 M34 ® CS 5 s8 11† M -T-28 M34(L) ® CS 5 s8 11.1† M -T-28E M40 ® CS 6 s8 12† M -T-28E M40(L) ® CS 6 s8 12.1† M -T-34 M40 ® CS 5 n/a 13 M -T-34 M41 ®† CS 5 n/a 14† C† M -OT-34 ®† CS 4 AP7 15† C† M -T-34 M43 n/a CS 5 n/a 16† n/a -T-43 ®† CS 5 n/a 17 C† M -T-34/85 n/a CS 6 sD6† 18† J† -M4/76(a) n/a CS 6 s8 sM8 19† N -T-44 n/a CS 5 n/a 20 B† M -T-35 ® CS 8 s9 21† M -SMK n/a CS 7 n/a 21.1 M T† -T-100 n/a CS 7 n/a 22.1 M T† -KV-1 M39/40 n/a CS 6 n/a 22† M -KV-1E n/a CS 6 n/a 23 D M -KV-1 M41 n/a CS 6 n/a 23 D M -KV-1 M42 n/a CS 6 n/a 23 D M -KV-2 n/a CS 7 AP9 24† M -KV-8 n/a CS 6 AP7 15† D M -KV-1S n/a CS 6 n/a 25† n/a -KV-85 n/a CS 5 n/a 26 B† -IS-2 n/a CS 6 n/a 27 B† -IS-2m n/a CS 6 n/a 28 B† G† -IS-3 n/a CS 6 sD6† 29 G† J† -SU-76M n/a CS 4 (brew up) n/a 30† n/a -SU-76i(g) n/a CS 5 n/a 31 K -SU-122 n/a CS 5 H9 s8 32 n/a -SU-152 n/a CS 6 n/a 33† n/a -ISU-122 n/a CS 6 s8 34 G† -ISU-152 n/a CS 6 n/a 34 G† -SU-85 n/a CS 5 HE7 s7 35 n/a -SU-100 n/a CS 5 HE7 36 n/a -SU-57(a) n/a CS 4 HE7 37 K -BA-20 ® CS 3 n/a 38 n/a -BA-6 ® CS 4 n/a 39 n/a -BA-64B n/a CS 2 n/a 40† A† -ZSU-37 n/a CS 4 n/a 41† A† -SU-12 n/a CS 4 AP7 s8 42 F† -GAZ-4M-AA n/a CS 4 n/a 43† A† -ZIS-42-AA n/a CS 4 n/a 44 A† F† -LANO AT ® CS 5 n/a 44.1 n/a -LANO AA ® CS 5 n/a 44.2† A†1 -IAG-10-AA n/a CS 4 AP7 45 A† F† -GAZ-67B n/a CS 2 n/a 46 L† -Komsomolet n/a CS 2† n/a 46.1† n/a -STZ-3 n/a cs 4 n/a 46.2 n/a -STZ-5 n/a cs 7 n/a 46.3 n/a -GAZ-MM n/a cs 6 n/a 47 n/a -ZIS-5 n/a cs 7 n/a 47 n/a -IAG-6 n/a cs 7 n/a 47 n/a -NKL-6 n/a CS 2† n/a 47.1† S†1 -NKL-16 n/a cs 2 n/a 47.1† S†1 -NKL-26 n/a CS 2 n/a 47.2† Q S†1 -RF-8-GAZ-98 n/a CS 3 n/a 47.3† S†1 -Stuart III(a) n/a CS 4 C6 48 N O LL -Lee(a) n/a CS 7 C4† s8† 49† B†1 N O LL -Sherman III(a) n/a CS 5 (brew up) s8 50† N O R†1 LL -Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 50.1 N O R† LL -Matilda II(b) n/a CS 5 sD6 51† M†1 N LL -Valentine V(b) n/a CS 4 sM8 52.1 N LL -Valentine VIII(b) n/a CS 4 HE7 sD6 52.2 N LL -Churchill III(b) n/a CS 7 sM8† 53† N LL -M3A1 Scout Car(a) n/a CS 4 n/a 54† N LL -Jeep GPA(a) n/a cs 2 n/a 59 H† L†1 -DUKW(a) n/a cs 7 n/a 60† n/a +Name Radio Crew survival Capabilities (effective) # Notes +----------------- ------- ------------------------------------ ------------------------------------------ ------------- ----- --------------------- +T-37 ® CS 2 n/a n/a 1 H† M +T-27 ® CS 2 n/a n/a 1.1† M Q +T-40 ® CS 2 n/a n/a 2† H† +T-50 ® CS 4 A4[2] n/a 3 n/a +T-60 M40 ® CS 2 n/a n/a 4 n/a +T-60 M42 ®† CS 2 n/a n/a 4 C† +T-70 ®† CS 2 A4[2] n/a 5 C† +T-26 M33 ® CS 3 n/a n/a 6 D I† M P +T-26 M37/39 ® CS 3 n/a n/a 6 D M P +T-26 M31 ® CS 3 n/a n/a 6.1† M P +T-26 M32 ® CS 3 n/a n/a 6.2† M P +OT-26 ® CS 3 (brew up) n/a n/a 6.3† M P +ST-26 Bridgelayer n/a CS 3 n/a n/a 6.4† M +OT-133 ® CS 3 n/a n/a 7† M P +BT-2A ® CS 3 n/a n/a 7.1† M +BT-5 M34 ® CS 3 n/a n/a 8† M P +BT-7 M37 ® CS 3 n/a n/a 9 D I† M P +BT-7A n/a CS 3 AP7 s9 AP7 s9 10 M P +T-28 M34 ® CS 5 s8 s8 11† M +T-28 M34(L) ® CS 5 s8 s8 11.1† M +T-28E M40 ® CS 6 s8 s8 12† M +T-28E M40(L) ® CS 6 s8 s8 12.1† M +T-34 M40 ® CS 5 n/a n/a 13 M +T-34 M41 ®† CS 5 A4[2] n/a 14† C† M +OT-34 ®† CS 4 A2[2] AP7 AP7 15† C† M +T-34 M43 n/a CS 5 A4[2] n/a 16† n/a +T-43 ®† CS 5 A4[2] n/a 17 C† M +T-34/85 n/a CS 6 A5[4] sD6† sD6† 18† J† +M4/76(a) n/a CS 6 A3[4] s8 sM8 s8 sM8 19† N +T-44 n/a CS 5 A6[5] n/a 20 B† M +T-35 ® CS 8 s9 s9 21† M +SMK n/a CS 7 n/a n/a 21.1 M T† +T-100 n/a CS 7 n/a n/a 22.1 M T† +KV-1 M39/40 n/a CS 6 n/a n/a 22† M +KV-1E n/a CS 6 n/a n/a 23 D M +KV-1 M41 n/a CS 6 A4[2] n/a 23 D M +KV-1 M42 n/a CS 6 A4[2] n/a 23 D M +KV-2 n/a CS 7 AP9 AP9 24† M +KV-8 n/a CS 6 A4[2] AP7 AP7 15† D M +KV-1S n/a CS 6 A4[2] n/a 25† n/a +KV-85 n/a CS 5 A4[3]5[4] n/a 26 B† +IS-2 n/a CS 6 n/a n/a 27 B† +IS-2m n/a CS 6 n/a n/a 28 B† G† +IS-3 n/a CS 6 sD6† sD6† 29 G† J† +SU-76M n/a CS 4 (brew up) A5[3] n/a 30† n/a +SU-76i(g) n/a CS 5 A5[3] n/a 31 K +SU-122 n/a CS 5 H9 s8 H9 s8 32 n/a +SU-152 n/a CS 6 n/a n/a 33† n/a +ISU-122 n/a CS 6 s8 s8 34 G† +ISU-152 n/a CS 6 n/a n/a 34 G† +SU-85 n/a CS 5 A5[3] HE7 s7 HE7 s7 35 n/a +SU-100 n/a CS 5 HE7 HE7 36 n/a +SU-57(a) n/a CS 4 A5[3] HE7 HE7 37 K +BA-20 ® CS 3 n/a n/a 38 n/a +BA-6 ® CS 4 A4[2] n/a 39 n/a +BA-64B n/a CS 2 n/a n/a 40† A† +ZSU-37 n/a CS 4 n/a n/a 41† A† +SU-12 n/a CS 4 AP7 s8 AP7 s8 42 F† +GAZ-4M-AA n/a CS 4 n/a n/a 43† A† +ZIS-42-AA n/a CS 4 n/a n/a 44 A† F† +LANO AT ® CS 5 A4[2+] n/a 44.1 n/a +LANO AA ® CS 5 n/a n/a 44.2† A†1 +IAG-10-AA n/a CS 4 AP7 AP7 45 A† F† +GAZ-67B n/a CS 2 n/a n/a 46 L† +Komsomolet n/a CS 2† n/a n/a 46.1† n/a +STZ-3 n/a cs 4 n/a n/a 46.2 n/a +STZ-5 n/a cs 7 n/a n/a 46.3 n/a +GAZ-MM n/a cs 6 n/a n/a 47 n/a +ZIS-5 n/a cs 7 n/a n/a 47 n/a +IAG-6 n/a cs 7 n/a n/a 47 n/a +NKL-6 n/a CS 2† n/a n/a 47.1† S†1 +NKL-16 n/a cs 2 n/a n/a 47.1† S†1 +NKL-26 n/a CS 2 n/a n/a 47.2† Q S†1 +RF-8-GAZ-98 n/a CS 3 n/a n/a 47.3† S†1 +Stuart III(a) n/a CS 4 C6 C6 48 N O LL +Lee(a) n/a CS 7 C4† s8† C4† s8† 49† B†1 N O LL +Sherman III(a) n/a CS 5 (brew up) WP6[J4+]†[] s8 s8 50† N O R†1 LL +Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 50.1 N O R† LL +Matilda II(b) n/a CS 5 sD6 sD6 51† M†1 N LL +Valentine V(b) n/a CS 4 sM8 sM8 52.1 N LL +Valentine VIII(b) n/a CS 4 HE7 sD6 HE7 sD6 52.2 N LL +Churchill III(b) n/a CS 7 D6[J4]7[5]†[] HE7[F3]8[4+]†[] sD6[4+] sM8† sM8† 53† N LL +M3A1 Scout Car(a) n/a CS 4 n/a n/a 54† N LL +Jeep GPA(a) n/a cs 2 n/a n/a 59 H† L†1 +DUKW(a) n/a cs 7 n/a n/a 60† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt index 46dbcf2..fd995ca 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt @@ -1,89 +1,89 @@ === vehicles/russian/1941 === -Name Radio Crew survival Capabilities # Notes ------------------ ------- ------------------------------------ -------------- ----- --------------------- -T-37 ® CS 2 n/a 1 H† M -T-27 ® CS 2 n/a 1.1† M Q -T-40 ® CS 2 n/a 2† H† -T-50 ® CS 4 n/a 3 n/a -T-60 M40 ® CS 2 n/a 4 n/a -T-60 M42 ®† CS 2 n/a 4 C† -T-70 ®† CS 2 n/a 5 C† -T-26 M33 ® CS 3 n/a 6 D I† M P -T-26 M37/39 ® CS 3 n/a 6 D M P -T-26 M31 ® CS 3 n/a 6.1† M P -T-26 M32 ® CS 3 n/a 6.2† M P -OT-26 ® CS 3 (brew up) n/a 6.3† M P -ST-26 Bridgelayer n/a CS 3 n/a 6.4† M -OT-133 ® CS 3 n/a 7† M P -BT-2A ® CS 3 n/a 7.1† M -BT-5 M34 ® CS 3 n/a 8† M P -BT-7 M37 ® CS 3 n/a 9 D I† M P -BT-7A n/a CS 3 AP7 s9 10 M P -T-28 M34 ® CS 5 s8 11† M -T-28 M34(L) ® CS 5 s8 11.1† M -T-28E M40 ® CS 6 s8 12† M -T-28E M40(L) ® CS 6 s8 12.1† M -T-34 M40 ® CS 5 n/a 13 M -T-34 M41 ®† CS 5 n/a 14† C† M -OT-34 ®† CS 4 AP7 15† C† M -T-34 M43 n/a CS 5 n/a 16† n/a -T-43 ®† CS 5 n/a 17 C† M -T-34/85 n/a CS 6 sD6† 18† J† -M4/76(a) n/a CS 6 s8 sM8 19† N -T-44 n/a CS 5 n/a 20 B† M -T-35 ® CS 8 s9 21† M -SMK n/a CS 7 n/a 21.1 M T† -T-100 n/a CS 7 n/a 22.1 M T† -KV-1 M39/40 n/a CS 6 n/a 22† M -KV-1E n/a CS 6 n/a 23 D M -KV-1 M41 n/a CS 6 n/a 23 D M -KV-1 M42 n/a CS 6 n/a 23 D M -KV-2 n/a CS 7 AP9 24† M -KV-8 n/a CS 6 AP7 15† D M -KV-1S n/a CS 6 n/a 25† n/a -KV-85 n/a CS 5 n/a 26 B† -IS-2 n/a CS 6 n/a 27 B† -IS-2m n/a CS 6 n/a 28 B† G† -IS-3 n/a CS 6 sD6† 29 G† J† -SU-76M n/a CS 4 (brew up) n/a 30† n/a -SU-76i(g) n/a CS 5 n/a 31 K -SU-122 n/a CS 5 H9 s8 32 n/a -SU-152 n/a CS 6 n/a 33† n/a -ISU-122 n/a CS 6 s8 34 G† -ISU-152 n/a CS 6 n/a 34 G† -SU-85 n/a CS 5 HE7 s7 35 n/a -SU-100 n/a CS 5 HE7 36 n/a -SU-57(a) n/a CS 4 HE7 37 K -BA-20 ® CS 3 n/a 38 n/a -BA-6 ® CS 4 n/a 39 n/a -BA-64B n/a CS 2 n/a 40† A† -ZSU-37 n/a CS 4 n/a 41† A† -SU-12 n/a CS 4 AP7 s8 42 F† -GAZ-4M-AA n/a CS 4 n/a 43† A† -ZIS-42-AA n/a CS 4 n/a 44 A† F† -LANO AT ® CS 5 n/a 44.1 n/a -LANO AA ® CS 5 n/a 44.2† A†1 -IAG-10-AA n/a CS 4 AP7 45 A† F† -GAZ-67B n/a CS 2 n/a 46 L† -Komsomolet n/a CS 2† n/a 46.1† n/a -STZ-3 n/a cs 4 n/a 46.2 n/a -STZ-5 n/a cs 7 n/a 46.3 n/a -GAZ-MM n/a cs 6 n/a 47 n/a -ZIS-5 n/a cs 7 n/a 47 n/a -IAG-6 n/a cs 7 n/a 47 n/a -NKL-6 n/a CS 2† n/a 47.1† S†1 -NKL-16 n/a cs 2 n/a 47.1† S†1 -NKL-26 n/a CS 2 n/a 47.2† Q S†1 -RF-8-GAZ-98 n/a CS 3 n/a 47.3† S†1 -Stuart III(a) n/a CS 4 C6 48 N O LL -Lee(a) n/a CS 7 C4† s8† 49† B†1 N O LL -Sherman III(a) n/a CS 5 (brew up) s8 50† N O R†1 LL -Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 50.1 N O R† LL -Matilda II(b) n/a CS 5 sD6 51† M†1 N LL -Valentine V(b) n/a CS 4 sM8 52.1 N LL -Valentine VIII(b) n/a CS 4 HE7 sD6 52.2 N LL -Churchill III(b) n/a CS 7 sM8† 53† N LL -M3A1 Scout Car(a) n/a CS 4 n/a 54† N LL -Jeep GPA(a) n/a cs 2 n/a 59 H† L†1 -DUKW(a) n/a cs 7 n/a 60† n/a +Name Radio Crew survival Capabilities (effective) # Notes +----------------- ------- ------------------------------------ ------------------------------------------ ------------- ----- --------------------- +T-37 ® CS 2 n/a n/a 1 H† M +T-27 ® CS 2 n/a n/a 1.1† M Q +T-40 ® CS 2 n/a n/a 2† H† +T-50 ® CS 4 A4[2] n/a 3 n/a +T-60 M40 ® CS 2 n/a n/a 4 n/a +T-60 M42 ®† CS 2 n/a n/a 4 C† +T-70 ®† CS 2 A4[2] n/a 5 C† +T-26 M33 ® CS 3 n/a n/a 6 D I† M P +T-26 M37/39 ® CS 3 n/a n/a 6 D M P +T-26 M31 ® CS 3 n/a n/a 6.1† M P +T-26 M32 ® CS 3 n/a n/a 6.2† M P +OT-26 ® CS 3 (brew up) n/a n/a 6.3† M P +ST-26 Bridgelayer n/a CS 3 n/a n/a 6.4† M +OT-133 ® CS 3 n/a n/a 7† M P +BT-2A ® CS 3 n/a n/a 7.1† M +BT-5 M34 ® CS 3 n/a n/a 8† M P +BT-7 M37 ® CS 3 n/a n/a 9 D I† M P +BT-7A n/a CS 3 AP7 s9 AP7 s9 10 M P +T-28 M34 ® CS 5 s8 s8 11† M +T-28 M34(L) ® CS 5 s8 s8 11.1† M +T-28E M40 ® CS 6 s8 s8 12† M +T-28E M40(L) ® CS 6 s8 s8 12.1† M +T-34 M40 ® CS 5 n/a n/a 13 M +T-34 M41 ®† CS 5 A4[2] n/a 14† C† M +OT-34 ®† CS 4 A2[2] AP7 AP7 15† C† M +T-34 M43 n/a CS 5 A4[2] n/a 16† n/a +T-43 ®† CS 5 A4[2] n/a 17 C† M +T-34/85 n/a CS 6 A5[4] sD6† sD6† 18† J† +M4/76(a) n/a CS 6 A3[4] s8 sM8 s8 sM8 19† N +T-44 n/a CS 5 A6[5] n/a 20 B† M +T-35 ® CS 8 s9 s9 21† M +SMK n/a CS 7 n/a n/a 21.1 M T† +T-100 n/a CS 7 n/a n/a 22.1 M T† +KV-1 M39/40 n/a CS 6 n/a n/a 22† M +KV-1E n/a CS 6 n/a n/a 23 D M +KV-1 M41 n/a CS 6 A4[2] n/a 23 D M +KV-1 M42 n/a CS 6 A4[2] n/a 23 D M +KV-2 n/a CS 7 AP9 AP9 24† M +KV-8 n/a CS 6 A4[2] AP7 AP7 15† D M +KV-1S n/a CS 6 A4[2] n/a 25† n/a +KV-85 n/a CS 5 A4[3]5[4] n/a 26 B† +IS-2 n/a CS 6 n/a n/a 27 B† +IS-2m n/a CS 6 n/a n/a 28 B† G† +IS-3 n/a CS 6 sD6† sD6† 29 G† J† +SU-76M n/a CS 4 (brew up) A5[3] n/a 30† n/a +SU-76i(g) n/a CS 5 A5[3] n/a 31 K +SU-122 n/a CS 5 H9 s8 H9 s8 32 n/a +SU-152 n/a CS 6 n/a n/a 33† n/a +ISU-122 n/a CS 6 s8 s8 34 G† +ISU-152 n/a CS 6 n/a n/a 34 G† +SU-85 n/a CS 5 A5[3] HE7 s7 HE7 s7 35 n/a +SU-100 n/a CS 5 HE7 HE7 36 n/a +SU-57(a) n/a CS 4 A5[3] HE7 HE7 37 K +BA-20 ® CS 3 n/a n/a 38 n/a +BA-6 ® CS 4 A4[2] n/a 39 n/a +BA-64B n/a CS 2 n/a n/a 40† A† +ZSU-37 n/a CS 4 n/a n/a 41† A† +SU-12 n/a CS 4 AP7 s8 AP7 s8 42 F† +GAZ-4M-AA n/a CS 4 n/a n/a 43† A† +ZIS-42-AA n/a CS 4 n/a n/a 44 A† F† +LANO AT ® CS 5 A4[2+] n/a 44.1 n/a +LANO AA ® CS 5 n/a n/a 44.2† A†1 +IAG-10-AA n/a CS 4 AP7 AP7 45 A† F† +GAZ-67B n/a CS 2 n/a n/a 46 L† +Komsomolet n/a CS 2† n/a n/a 46.1† n/a +STZ-3 n/a cs 4 n/a n/a 46.2 n/a +STZ-5 n/a cs 7 n/a n/a 46.3 n/a +GAZ-MM n/a cs 6 n/a n/a 47 n/a +ZIS-5 n/a cs 7 n/a n/a 47 n/a +IAG-6 n/a cs 7 n/a n/a 47 n/a +NKL-6 n/a CS 2† n/a n/a 47.1† S†1 +NKL-16 n/a cs 2 n/a n/a 47.1† S†1 +NKL-26 n/a CS 2 n/a n/a 47.2† Q S†1 +RF-8-GAZ-98 n/a CS 3 n/a n/a 47.3† S†1 +Stuart III(a) n/a CS 4 C6 C6 48 N O LL +Lee(a) n/a CS 7 C4† s8† C4† s8† 49† B†1 N O LL +Sherman III(a) n/a CS 5 (brew up) WP6[J4+]†[] s8 s8 50† N O R†1 LL +Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 50.1 N O R† LL +Matilda II(b) n/a CS 5 sD6 sD6 51† M†1 N LL +Valentine V(b) n/a CS 4 sM8 sM8 52.1 N LL +Valentine VIII(b) n/a CS 4 HE7 sD6 HE7 sD6 52.2 N LL +Churchill III(b) n/a CS 7 D6[J4]7[5]†[] HE7[F3]8[4+]†[] sD6[4+] sM8† sM8† 53† N LL +M3A1 Scout Car(a) n/a CS 4 n/a n/a 54† N LL +Jeep GPA(a) n/a cs 2 n/a n/a 59 H† L†1 +DUKW(a) n/a cs 7 n/a n/a 60† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt index 156f8a4..c5e371e 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt @@ -1,89 +1,89 @@ === vehicles/russian/1942 === -Name Radio Crew survival Capabilities # Notes ------------------ ------- ------------------------------------ -------------- ----- --------------------- -T-37 ® CS 2 n/a 1 H† M -T-27 ® CS 2 n/a 1.1† M Q -T-40 ® CS 2 n/a 2† H† -T-50 ® CS 4 A4 3 n/a -T-60 M40 ® CS 2 n/a 4 n/a -T-60 M42 ®† CS 2 n/a 4 C† -T-70 ®† CS 2 A4 5 C† -T-26 M33 ® CS 3 n/a 6 D I† M P -T-26 M37/39 ® CS 3 n/a 6 D M P -T-26 M31 ® CS 3 n/a 6.1† M P -T-26 M32 ® CS 3 n/a 6.2† M P -OT-26 ® CS 3 (brew up) n/a 6.3† M P -ST-26 Bridgelayer n/a CS 3 n/a 6.4† M -OT-133 ® CS 3 n/a 7† M P -BT-2A ® CS 3 n/a 7.1† M -BT-5 M34 ® CS 3 n/a 8† M P -BT-7 M37 ® CS 3 n/a 9 D I† M P -BT-7A n/a CS 3 AP7 s9 10 M P -T-28 M34 ® CS 5 s8 11† M -T-28 M34(L) ® CS 5 s8 11.1† M -T-28E M40 ® CS 6 s8 12† M -T-28E M40(L) ® CS 6 s8 12.1† M -T-34 M40 ® CS 5 n/a 13 M -T-34 M41 ®† CS 5 A4 14† C† M -OT-34 ®† CS 4 A2 AP7 15† C† M -T-34 M43 n/a CS 5 A4 16† n/a -T-43 ®† CS 5 A4 17 C† M -T-34/85 n/a CS 6 sD6† 18† J† -M4/76(a) n/a CS 6 s8 sM8 19† N -T-44 n/a CS 5 n/a 20 B† M -T-35 ® CS 8 s9 21† M -SMK n/a CS 7 n/a 21.1 M T† -T-100 n/a CS 7 n/a 22.1 M T† -KV-1 M39/40 n/a CS 6 n/a 22† M -KV-1E n/a CS 6 n/a 23 D M -KV-1 M41 n/a CS 6 A4 23 D M -KV-1 M42 n/a CS 6 A4 23 D M -KV-2 n/a CS 7 AP9 24† M -KV-8 n/a CS 6 A4 AP7 15† D M -KV-1S n/a CS 6 A4 25† n/a -KV-85 n/a CS 5 n/a 26 B† -IS-2 n/a CS 6 n/a 27 B† -IS-2m n/a CS 6 n/a 28 B† G† -IS-3 n/a CS 6 sD6† 29 G† J† -SU-76M n/a CS 4 (brew up) n/a 30† n/a -SU-76i(g) n/a CS 5 n/a 31 K -SU-122 n/a CS 5 H9 s8 32 n/a -SU-152 n/a CS 6 n/a 33† n/a -ISU-122 n/a CS 6 s8 34 G† -ISU-152 n/a CS 6 n/a 34 G† -SU-85 n/a CS 5 HE7 s7 35 n/a -SU-100 n/a CS 5 HE7 36 n/a -SU-57(a) n/a CS 4 HE7 37 K -BA-20 ® CS 3 n/a 38 n/a -BA-6 ® CS 4 A4 39 n/a -BA-64B n/a CS 2 n/a 40† A† -ZSU-37 n/a CS 4 n/a 41† A† -SU-12 n/a CS 4 AP7 s8 42 F† -GAZ-4M-AA n/a CS 4 n/a 43† A† -ZIS-42-AA n/a CS 4 n/a 44 A† F† -LANO AT ® CS 5 A4 44.1 n/a -LANO AA ® CS 5 n/a 44.2† A†1 -IAG-10-AA n/a CS 4 AP7 45 A† F† -GAZ-67B n/a CS 2 n/a 46 L† -Komsomolet n/a CS 2† n/a 46.1† n/a -STZ-3 n/a cs 4 n/a 46.2 n/a -STZ-5 n/a cs 7 n/a 46.3 n/a -GAZ-MM n/a cs 6 n/a 47 n/a -ZIS-5 n/a cs 7 n/a 47 n/a -IAG-6 n/a cs 7 n/a 47 n/a -NKL-6 n/a CS 2† n/a 47.1† S†1 -NKL-16 n/a cs 2 n/a 47.1† S†1 -NKL-26 n/a CS 2 n/a 47.2† Q S†1 -RF-8-GAZ-98 n/a CS 3 n/a 47.3† S†1 -Stuart III(a) n/a CS 4 C6 48 N O LL -Lee(a) n/a CS 7 C4† s8† 49† B†1 N O LL -Sherman III(a) n/a CS 5 (brew up) s8 50† N O R†1 LL -Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 50.1 N O R† LL -Matilda II(b) n/a CS 5 sD6 51† M†1 N LL -Valentine V(b) n/a CS 4 sM8 52.1 N LL -Valentine VIII(b) n/a CS 4 HE7 sD6 52.2 N LL -Churchill III(b) n/a CS 7 sM8† 53† N LL -M3A1 Scout Car(a) n/a CS 4 n/a 54† N LL -Jeep GPA(a) n/a cs 2 n/a 59 H† L†1 -DUKW(a) n/a cs 7 n/a 60† n/a +Name Radio Crew survival Capabilities (effective) # Notes +----------------- ------- ------------------------------------ ------------------------------------------ ------------- ----- --------------------- +T-37 ® CS 2 n/a n/a 1 H† M +T-27 ® CS 2 n/a n/a 1.1† M Q +T-40 ® CS 2 n/a n/a 2† H† +T-50 ® CS 4 A4[2] A4 3 n/a +T-60 M40 ® CS 2 n/a n/a 4 n/a +T-60 M42 ®† CS 2 n/a n/a 4 C† +T-70 ®† CS 2 A4[2] A4 5 C† +T-26 M33 ® CS 3 n/a n/a 6 D I† M P +T-26 M37/39 ® CS 3 n/a n/a 6 D M P +T-26 M31 ® CS 3 n/a n/a 6.1† M P +T-26 M32 ® CS 3 n/a n/a 6.2† M P +OT-26 ® CS 3 (brew up) n/a n/a 6.3† M P +ST-26 Bridgelayer n/a CS 3 n/a n/a 6.4† M +OT-133 ® CS 3 n/a n/a 7† M P +BT-2A ® CS 3 n/a n/a 7.1† M +BT-5 M34 ® CS 3 n/a n/a 8† M P +BT-7 M37 ® CS 3 n/a n/a 9 D I† M P +BT-7A n/a CS 3 AP7 s9 AP7 s9 10 M P +T-28 M34 ® CS 5 s8 s8 11† M +T-28 M34(L) ® CS 5 s8 s8 11.1† M +T-28E M40 ® CS 6 s8 s8 12† M +T-28E M40(L) ® CS 6 s8 s8 12.1† M +T-34 M40 ® CS 5 n/a n/a 13 M +T-34 M41 ®† CS 5 A4[2] A4 14† C† M +OT-34 ®† CS 4 A2[2] AP7 A2 AP7 15† C† M +T-34 M43 n/a CS 5 A4[2] A4 16† n/a +T-43 ®† CS 5 A4[2] A4 17 C† M +T-34/85 n/a CS 6 A5[4] sD6† sD6† 18† J† +M4/76(a) n/a CS 6 A3[4] s8 sM8 s8 sM8 19† N +T-44 n/a CS 5 A6[5] n/a 20 B† M +T-35 ® CS 8 s9 s9 21† M +SMK n/a CS 7 n/a n/a 21.1 M T† +T-100 n/a CS 7 n/a n/a 22.1 M T† +KV-1 M39/40 n/a CS 6 n/a n/a 22† M +KV-1E n/a CS 6 n/a n/a 23 D M +KV-1 M41 n/a CS 6 A4[2] A4 23 D M +KV-1 M42 n/a CS 6 A4[2] A4 23 D M +KV-2 n/a CS 7 AP9 AP9 24† M +KV-8 n/a CS 6 A4[2] AP7 A4 AP7 15† D M +KV-1S n/a CS 6 A4[2] A4 25† n/a +KV-85 n/a CS 5 A4[3]5[4] n/a 26 B† +IS-2 n/a CS 6 n/a n/a 27 B† +IS-2m n/a CS 6 n/a n/a 28 B† G† +IS-3 n/a CS 6 sD6† sD6† 29 G† J† +SU-76M n/a CS 4 (brew up) A5[3] n/a 30† n/a +SU-76i(g) n/a CS 5 A5[3] n/a 31 K +SU-122 n/a CS 5 H9 s8 H9 s8 32 n/a +SU-152 n/a CS 6 n/a n/a 33† n/a +ISU-122 n/a CS 6 s8 s8 34 G† +ISU-152 n/a CS 6 n/a n/a 34 G† +SU-85 n/a CS 5 A5[3] HE7 s7 HE7 s7 35 n/a +SU-100 n/a CS 5 HE7 HE7 36 n/a +SU-57(a) n/a CS 4 A5[3] HE7 HE7 37 K +BA-20 ® CS 3 n/a n/a 38 n/a +BA-6 ® CS 4 A4[2] A4 39 n/a +BA-64B n/a CS 2 n/a n/a 40† A† +ZSU-37 n/a CS 4 n/a n/a 41† A† +SU-12 n/a CS 4 AP7 s8 AP7 s8 42 F† +GAZ-4M-AA n/a CS 4 n/a n/a 43† A† +ZIS-42-AA n/a CS 4 n/a n/a 44 A† F† +LANO AT ® CS 5 A4[2+] A4 44.1 n/a +LANO AA ® CS 5 n/a n/a 44.2† A†1 +IAG-10-AA n/a CS 4 AP7 AP7 45 A† F† +GAZ-67B n/a CS 2 n/a n/a 46 L† +Komsomolet n/a CS 2† n/a n/a 46.1† n/a +STZ-3 n/a cs 4 n/a n/a 46.2 n/a +STZ-5 n/a cs 7 n/a n/a 46.3 n/a +GAZ-MM n/a cs 6 n/a n/a 47 n/a +ZIS-5 n/a cs 7 n/a n/a 47 n/a +IAG-6 n/a cs 7 n/a n/a 47 n/a +NKL-6 n/a CS 2† n/a n/a 47.1† S†1 +NKL-16 n/a cs 2 n/a n/a 47.1† S†1 +NKL-26 n/a CS 2 n/a n/a 47.2† Q S†1 +RF-8-GAZ-98 n/a CS 3 n/a n/a 47.3† S†1 +Stuart III(a) n/a CS 4 C6 C6 48 N O LL +Lee(a) n/a CS 7 C4† s8† C4† s8† 49† B†1 N O LL +Sherman III(a) n/a CS 5 (brew up) WP6[J4+]†[] s8 s8 50† N O R†1 LL +Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 50.1 N O R† LL +Matilda II(b) n/a CS 5 sD6 sD6 51† M†1 N LL +Valentine V(b) n/a CS 4 sM8 sM8 52.1 N LL +Valentine VIII(b) n/a CS 4 HE7 sD6 HE7 sD6 52.2 N LL +Churchill III(b) n/a CS 7 D6[J4]7[5]†[] HE7[F3]8[4+]†[] sD6[4+] sM8† sM8† 53† N LL +M3A1 Scout Car(a) n/a CS 4 n/a n/a 54† N LL +Jeep GPA(a) n/a cs 2 n/a n/a 59 H† L†1 +DUKW(a) n/a cs 7 n/a n/a 60† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt index 3d52a71..d8b3717 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt @@ -1,89 +1,89 @@ === vehicles/russian/1943 === -Name Radio Crew survival Capabilities # Notes ------------------ ------- ------------------------------------ -------------- ----- --------------------- -T-37 ® CS 2 n/a 1 H† M -T-27 ® CS 2 n/a 1.1† M Q -T-40 ® CS 2 n/a 2† H† -T-50 ® CS 4 A4 3 n/a -T-60 M40 ® CS 2 n/a 4 n/a -T-60 M42 ®† CS 2 n/a 4 C† -T-70 ®† CS 2 A4 5 C† -T-26 M33 ® CS 3 n/a 6 D I† M P -T-26 M37/39 ® CS 3 n/a 6 D M P -T-26 M31 ® CS 3 n/a 6.1† M P -T-26 M32 ® CS 3 n/a 6.2† M P -OT-26 ® CS 3 (brew up) n/a 6.3† M P -ST-26 Bridgelayer n/a CS 3 n/a 6.4† M -OT-133 ® CS 3 n/a 7† M P -BT-2A ® CS 3 n/a 7.1† M -BT-5 M34 ® CS 3 n/a 8† M P -BT-7 M37 ® CS 3 n/a 9 D I† M P -BT-7A n/a CS 3 AP7 s9 10 M P -T-28 M34 ® CS 5 s8 11† M -T-28 M34(L) ® CS 5 s8 11.1† M -T-28E M40 ® CS 6 s8 12† M -T-28E M40(L) ® CS 6 s8 12.1† M -T-34 M40 ® CS 5 n/a 13 M -T-34 M41 ®† CS 5 A4 14† C† M -OT-34 ®† CS 4 A2 AP7 15† C† M -T-34 M43 n/a CS 5 A4 16† n/a -T-43 ®† CS 5 A4 17 C† M -T-34/85 n/a CS 6 sD6† 18† J† -M4/76(a) n/a CS 6 s8 sM8 19† N -T-44 n/a CS 5 n/a 20 B† M -T-35 ® CS 8 s9 21† M -SMK n/a CS 7 n/a 21.1 M T† -T-100 n/a CS 7 n/a 22.1 M T† -KV-1 M39/40 n/a CS 6 n/a 22† M -KV-1E n/a CS 6 n/a 23 D M -KV-1 M41 n/a CS 6 A4 23 D M -KV-1 M42 n/a CS 6 A4 23 D M -KV-2 n/a CS 7 AP9 24† M -KV-8 n/a CS 6 A4 AP7 15† D M -KV-1S n/a CS 6 A4 25† n/a -KV-85 n/a CS 5 A4 26 B† -IS-2 n/a CS 6 n/a 27 B† -IS-2m n/a CS 6 n/a 28 B† G† -IS-3 n/a CS 6 sD6† 29 G† J† -SU-76M n/a CS 4 (brew up) A5 30† n/a -SU-76i(g) n/a CS 5 A5 31 K -SU-122 n/a CS 5 H9 s8 32 n/a -SU-152 n/a CS 6 n/a 33† n/a -ISU-122 n/a CS 6 s8 34 G† -ISU-152 n/a CS 6 n/a 34 G† -SU-85 n/a CS 5 A5 HE7 s7 35 n/a -SU-100 n/a CS 5 HE7 36 n/a -SU-57(a) n/a CS 4 A5 HE7 37 K -BA-20 ® CS 3 n/a 38 n/a -BA-6 ® CS 4 A4 39 n/a -BA-64B n/a CS 2 n/a 40† A† -ZSU-37 n/a CS 4 n/a 41† A† -SU-12 n/a CS 4 AP7 s8 42 F† -GAZ-4M-AA n/a CS 4 n/a 43† A† -ZIS-42-AA n/a CS 4 n/a 44 A† F† -LANO AT ® CS 5 A4 44.1 n/a -LANO AA ® CS 5 n/a 44.2† A†1 -IAG-10-AA n/a CS 4 AP7 45 A† F† -GAZ-67B n/a CS 2 n/a 46 L† -Komsomolet n/a CS 2† n/a 46.1† n/a -STZ-3 n/a cs 4 n/a 46.2 n/a -STZ-5 n/a cs 7 n/a 46.3 n/a -GAZ-MM n/a cs 6 n/a 47 n/a -ZIS-5 n/a cs 7 n/a 47 n/a -IAG-6 n/a cs 7 n/a 47 n/a -NKL-6 n/a CS 2† n/a 47.1† S†1 -NKL-16 n/a cs 2 n/a 47.1† S†1 -NKL-26 n/a CS 2 n/a 47.2† Q S†1 -RF-8-GAZ-98 n/a CS 3 n/a 47.3† S†1 -Stuart III(a) n/a CS 4 C6 48 N O LL -Lee(a) n/a CS 7 C4† s8† 49† B†1 N O LL -Sherman III(a) n/a CS 5 (brew up) s8 50† N O R†1 LL -Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 50.1 N O R† LL -Matilda II(b) n/a CS 5 sD6 51† M†1 N LL -Valentine V(b) n/a CS 4 sM8 52.1 N LL -Valentine VIII(b) n/a CS 4 HE7 sD6 52.2 N LL -Churchill III(b) n/a CS 7 sM8† 53† N LL -M3A1 Scout Car(a) n/a CS 4 n/a 54† N LL -Jeep GPA(a) n/a cs 2 n/a 59 H† L†1 -DUKW(a) n/a cs 7 n/a 60† n/a +Name Radio Crew survival Capabilities (effective) # Notes +----------------- ------- ------------------------------------ ------------------------------------------ ------------- ----- --------------------- +T-37 ® CS 2 n/a n/a 1 H† M +T-27 ® CS 2 n/a n/a 1.1† M Q +T-40 ® CS 2 n/a n/a 2† H† +T-50 ® CS 4 A4[2] A4 3 n/a +T-60 M40 ® CS 2 n/a n/a 4 n/a +T-60 M42 ®† CS 2 n/a n/a 4 C† +T-70 ®† CS 2 A4[2] A4 5 C† +T-26 M33 ® CS 3 n/a n/a 6 D I† M P +T-26 M37/39 ® CS 3 n/a n/a 6 D M P +T-26 M31 ® CS 3 n/a n/a 6.1† M P +T-26 M32 ® CS 3 n/a n/a 6.2† M P +OT-26 ® CS 3 (brew up) n/a n/a 6.3† M P +ST-26 Bridgelayer n/a CS 3 n/a n/a 6.4† M +OT-133 ® CS 3 n/a n/a 7† M P +BT-2A ® CS 3 n/a n/a 7.1† M +BT-5 M34 ® CS 3 n/a n/a 8† M P +BT-7 M37 ® CS 3 n/a n/a 9 D I† M P +BT-7A n/a CS 3 AP7 s9 AP7 s9 10 M P +T-28 M34 ® CS 5 s8 s8 11† M +T-28 M34(L) ® CS 5 s8 s8 11.1† M +T-28E M40 ® CS 6 s8 s8 12† M +T-28E M40(L) ® CS 6 s8 s8 12.1† M +T-34 M40 ® CS 5 n/a n/a 13 M +T-34 M41 ®† CS 5 A4[2] A4 14† C† M +OT-34 ®† CS 4 A2[2] AP7 A2 AP7 15† C† M +T-34 M43 n/a CS 5 A4[2] A4 16† n/a +T-43 ®† CS 5 A4[2] A4 17 C† M +T-34/85 n/a CS 6 A5[4] sD6† sD6† 18† J† +M4/76(a) n/a CS 6 A3[4] s8 sM8 s8 sM8 19† N +T-44 n/a CS 5 A6[5] n/a 20 B† M +T-35 ® CS 8 s9 s9 21† M +SMK n/a CS 7 n/a n/a 21.1 M T† +T-100 n/a CS 7 n/a n/a 22.1 M T† +KV-1 M39/40 n/a CS 6 n/a n/a 22† M +KV-1E n/a CS 6 n/a n/a 23 D M +KV-1 M41 n/a CS 6 A4[2] A4 23 D M +KV-1 M42 n/a CS 6 A4[2] A4 23 D M +KV-2 n/a CS 7 AP9 AP9 24† M +KV-8 n/a CS 6 A4[2] AP7 A4 AP7 15† D M +KV-1S n/a CS 6 A4[2] A4 25† n/a +KV-85 n/a CS 5 A4[3]5[4] A4 26 B† +IS-2 n/a CS 6 n/a n/a 27 B† +IS-2m n/a CS 6 n/a n/a 28 B† G† +IS-3 n/a CS 6 sD6† sD6† 29 G† J† +SU-76M n/a CS 4 (brew up) A5[3] A5 30† n/a +SU-76i(g) n/a CS 5 A5[3] A5 31 K +SU-122 n/a CS 5 H9 s8 H9 s8 32 n/a +SU-152 n/a CS 6 n/a n/a 33† n/a +ISU-122 n/a CS 6 s8 s8 34 G† +ISU-152 n/a CS 6 n/a n/a 34 G† +SU-85 n/a CS 5 A5[3] HE7 s7 A5 HE7 s7 35 n/a +SU-100 n/a CS 5 HE7 HE7 36 n/a +SU-57(a) n/a CS 4 A5[3] HE7 A5 HE7 37 K +BA-20 ® CS 3 n/a n/a 38 n/a +BA-6 ® CS 4 A4[2] A4 39 n/a +BA-64B n/a CS 2 n/a n/a 40† A† +ZSU-37 n/a CS 4 n/a n/a 41† A† +SU-12 n/a CS 4 AP7 s8 AP7 s8 42 F† +GAZ-4M-AA n/a CS 4 n/a n/a 43† A† +ZIS-42-AA n/a CS 4 n/a n/a 44 A† F† +LANO AT ® CS 5 A4[2+] A4 44.1 n/a +LANO AA ® CS 5 n/a n/a 44.2† A†1 +IAG-10-AA n/a CS 4 AP7 AP7 45 A† F† +GAZ-67B n/a CS 2 n/a n/a 46 L† +Komsomolet n/a CS 2† n/a n/a 46.1† n/a +STZ-3 n/a cs 4 n/a n/a 46.2 n/a +STZ-5 n/a cs 7 n/a n/a 46.3 n/a +GAZ-MM n/a cs 6 n/a n/a 47 n/a +ZIS-5 n/a cs 7 n/a n/a 47 n/a +IAG-6 n/a cs 7 n/a n/a 47 n/a +NKL-6 n/a CS 2† n/a n/a 47.1† S†1 +NKL-16 n/a cs 2 n/a n/a 47.1† S†1 +NKL-26 n/a CS 2 n/a n/a 47.2† Q S†1 +RF-8-GAZ-98 n/a CS 3 n/a n/a 47.3† S†1 +Stuart III(a) n/a CS 4 C6 C6 48 N O LL +Lee(a) n/a CS 7 C4† s8† C4† s8† 49† B†1 N O LL +Sherman III(a) n/a CS 5 (brew up) WP6[J4+]†[] s8 s8 50† N O R†1 LL +Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 50.1 N O R† LL +Matilda II(b) n/a CS 5 sD6 sD6 51† M†1 N LL +Valentine V(b) n/a CS 4 sM8 sM8 52.1 N LL +Valentine VIII(b) n/a CS 4 HE7 sD6 HE7 sD6 52.2 N LL +Churchill III(b) n/a CS 7 D6[J4]7[5]†[] HE7[F3]8[4+]†[] sD6[4+] sM8† sM8† 53† N LL +M3A1 Scout Car(a) n/a CS 4 n/a n/a 54† N LL +Jeep GPA(a) n/a cs 2 n/a n/a 59 H† L†1 +DUKW(a) n/a cs 7 n/a n/a 60† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt index d1cd740..9e6a30d 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt @@ -1,89 +1,89 @@ === vehicles/russian/1944 === -Name Radio Crew survival Capabilities # Notes ------------------ ------- ------------------------------------ -------------- ----- --------------------- -T-37 ® CS 2 n/a 1 H† M -T-27 ® CS 2 n/a 1.1† M Q -T-40 ® CS 2 n/a 2† H† -T-50 ® CS 4 A4 3 n/a -T-60 M40 ® CS 2 n/a 4 n/a -T-60 M42 ®† CS 2 n/a 4 C† -T-70 ®† CS 2 A4 5 C† -T-26 M33 ® CS 3 n/a 6 D I† M P -T-26 M37/39 ® CS 3 n/a 6 D M P -T-26 M31 ® CS 3 n/a 6.1† M P -T-26 M32 ® CS 3 n/a 6.2† M P -OT-26 ® CS 3 (brew up) n/a 6.3† M P -ST-26 Bridgelayer n/a CS 3 n/a 6.4† M -OT-133 ® CS 3 n/a 7† M P -BT-2A ® CS 3 n/a 7.1† M -BT-5 M34 ® CS 3 n/a 8† M P -BT-7 M37 ® CS 3 n/a 9 D I† M P -BT-7A n/a CS 3 AP7 s9 10 M P -T-28 M34 ® CS 5 s8 11† M -T-28 M34(L) ® CS 5 s8 11.1† M -T-28E M40 ® CS 6 s8 12† M -T-28E M40(L) ® CS 6 s8 12.1† M -T-34 M40 ® CS 5 n/a 13 M -T-34 M41 ®† CS 5 A4 14† C† M -OT-34 ®† CS 4 A2 AP7 15† C† M -T-34 M43 n/a CS 5 A4 16† n/a -T-43 ®† CS 5 A4 17 C† M -T-34/85 n/a CS 6 A5 sD6† 18† J† -M4/76(a) n/a CS 6 A3 s8 sM8 19† N -T-44 n/a CS 5 n/a 20 B† M -T-35 ® CS 8 s9 21† M -SMK n/a CS 7 n/a 21.1 M T† -T-100 n/a CS 7 n/a 22.1 M T† -KV-1 M39/40 n/a CS 6 n/a 22† M -KV-1E n/a CS 6 n/a 23 D M -KV-1 M41 n/a CS 6 A4 23 D M -KV-1 M42 n/a CS 6 A4 23 D M -KV-2 n/a CS 7 AP9 24† M -KV-8 n/a CS 6 A4 AP7 15† D M -KV-1S n/a CS 6 A4 25† n/a -KV-85 n/a CS 5 A5 26 B† -IS-2 n/a CS 6 n/a 27 B† -IS-2m n/a CS 6 n/a 28 B† G† -IS-3 n/a CS 6 sD6† 29 G† J† -SU-76M n/a CS 4 (brew up) A5 30† n/a -SU-76i(g) n/a CS 5 A5 31 K -SU-122 n/a CS 5 H9 s8 32 n/a -SU-152 n/a CS 6 n/a 33† n/a -ISU-122 n/a CS 6 s8 34 G† -ISU-152 n/a CS 6 n/a 34 G† -SU-85 n/a CS 5 A5 HE7 s7 35 n/a -SU-100 n/a CS 5 HE7 36 n/a -SU-57(a) n/a CS 4 A5 HE7 37 K -BA-20 ® CS 3 n/a 38 n/a -BA-6 ® CS 4 A4 39 n/a -BA-64B n/a CS 2 n/a 40† A† -ZSU-37 n/a CS 4 n/a 41† A† -SU-12 n/a CS 4 AP7 s8 42 F† -GAZ-4M-AA n/a CS 4 n/a 43† A† -ZIS-42-AA n/a CS 4 n/a 44 A† F† -LANO AT ® CS 5 A4 44.1 n/a -LANO AA ® CS 5 n/a 44.2† A†1 -IAG-10-AA n/a CS 4 AP7 45 A† F† -GAZ-67B n/a CS 2 n/a 46 L† -Komsomolet n/a CS 2† n/a 46.1† n/a -STZ-3 n/a cs 4 n/a 46.2 n/a -STZ-5 n/a cs 7 n/a 46.3 n/a -GAZ-MM n/a cs 6 n/a 47 n/a -ZIS-5 n/a cs 7 n/a 47 n/a -IAG-6 n/a cs 7 n/a 47 n/a -NKL-6 n/a CS 2† n/a 47.1† S†1 -NKL-16 n/a cs 2 n/a 47.1† S†1 -NKL-26 n/a CS 2 n/a 47.2† Q S†1 -RF-8-GAZ-98 n/a CS 3 n/a 47.3† S†1 -Stuart III(a) n/a CS 4 C6 48 N O LL -Lee(a) n/a CS 7 C4† s8† 49† B†1 N O LL -Sherman III(a) n/a CS 5 (brew up) s8 50† N O R†1 LL -Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 50.1 N O R† LL -Matilda II(b) n/a CS 5 sD6 51† M†1 N LL -Valentine V(b) n/a CS 4 sM8 52.1 N LL -Valentine VIII(b) n/a CS 4 HE7 sD6 52.2 N LL -Churchill III(b) n/a CS 7 HE8 sD6 sM8† 53† N LL -M3A1 Scout Car(a) n/a CS 4 n/a 54† N LL -Jeep GPA(a) n/a cs 2 n/a 59 H† L†1 -DUKW(a) n/a cs 7 n/a 60† n/a +Name Radio Crew survival Capabilities (effective) # Notes +----------------- ------- ------------------------------------ ------------------------------------------ ------------- ----- --------------------- +T-37 ® CS 2 n/a n/a 1 H† M +T-27 ® CS 2 n/a n/a 1.1† M Q +T-40 ® CS 2 n/a n/a 2† H† +T-50 ® CS 4 A4[2] A4 3 n/a +T-60 M40 ® CS 2 n/a n/a 4 n/a +T-60 M42 ®† CS 2 n/a n/a 4 C† +T-70 ®† CS 2 A4[2] A4 5 C† +T-26 M33 ® CS 3 n/a n/a 6 D I† M P +T-26 M37/39 ® CS 3 n/a n/a 6 D M P +T-26 M31 ® CS 3 n/a n/a 6.1† M P +T-26 M32 ® CS 3 n/a n/a 6.2† M P +OT-26 ® CS 3 (brew up) n/a n/a 6.3† M P +ST-26 Bridgelayer n/a CS 3 n/a n/a 6.4† M +OT-133 ® CS 3 n/a n/a 7† M P +BT-2A ® CS 3 n/a n/a 7.1† M +BT-5 M34 ® CS 3 n/a n/a 8† M P +BT-7 M37 ® CS 3 n/a n/a 9 D I† M P +BT-7A n/a CS 3 AP7 s9 AP7 s9 10 M P +T-28 M34 ® CS 5 s8 s8 11† M +T-28 M34(L) ® CS 5 s8 s8 11.1† M +T-28E M40 ® CS 6 s8 s8 12† M +T-28E M40(L) ® CS 6 s8 s8 12.1† M +T-34 M40 ® CS 5 n/a n/a 13 M +T-34 M41 ®† CS 5 A4[2] A4 14† C† M +OT-34 ®† CS 4 A2[2] AP7 A2 AP7 15† C† M +T-34 M43 n/a CS 5 A4[2] A4 16† n/a +T-43 ®† CS 5 A4[2] A4 17 C† M +T-34/85 n/a CS 6 A5[4] sD6† A5 sD6† 18† J† +M4/76(a) n/a CS 6 A3[4] s8 sM8 A3 s8 sM8 19† N +T-44 n/a CS 5 A6[5] n/a 20 B† M +T-35 ® CS 8 s9 s9 21† M +SMK n/a CS 7 n/a n/a 21.1 M T† +T-100 n/a CS 7 n/a n/a 22.1 M T† +KV-1 M39/40 n/a CS 6 n/a n/a 22† M +KV-1E n/a CS 6 n/a n/a 23 D M +KV-1 M41 n/a CS 6 A4[2] A4 23 D M +KV-1 M42 n/a CS 6 A4[2] A4 23 D M +KV-2 n/a CS 7 AP9 AP9 24† M +KV-8 n/a CS 6 A4[2] AP7 A4 AP7 15† D M +KV-1S n/a CS 6 A4[2] A4 25† n/a +KV-85 n/a CS 5 A4[3]5[4] A5 26 B† +IS-2 n/a CS 6 n/a n/a 27 B† +IS-2m n/a CS 6 n/a n/a 28 B† G† +IS-3 n/a CS 6 sD6† sD6† 29 G† J† +SU-76M n/a CS 4 (brew up) A5[3] A5 30† n/a +SU-76i(g) n/a CS 5 A5[3] A5 31 K +SU-122 n/a CS 5 H9 s8 H9 s8 32 n/a +SU-152 n/a CS 6 n/a n/a 33† n/a +ISU-122 n/a CS 6 s8 s8 34 G† +ISU-152 n/a CS 6 n/a n/a 34 G† +SU-85 n/a CS 5 A5[3] HE7 s7 A5 HE7 s7 35 n/a +SU-100 n/a CS 5 HE7 HE7 36 n/a +SU-57(a) n/a CS 4 A5[3] HE7 A5 HE7 37 K +BA-20 ® CS 3 n/a n/a 38 n/a +BA-6 ® CS 4 A4[2] A4 39 n/a +BA-64B n/a CS 2 n/a n/a 40† A† +ZSU-37 n/a CS 4 n/a n/a 41† A† +SU-12 n/a CS 4 AP7 s8 AP7 s8 42 F† +GAZ-4M-AA n/a CS 4 n/a n/a 43† A† +ZIS-42-AA n/a CS 4 n/a n/a 44 A† F† +LANO AT ® CS 5 A4[2+] A4 44.1 n/a +LANO AA ® CS 5 n/a n/a 44.2† A†1 +IAG-10-AA n/a CS 4 AP7 AP7 45 A† F† +GAZ-67B n/a CS 2 n/a n/a 46 L† +Komsomolet n/a CS 2† n/a n/a 46.1† n/a +STZ-3 n/a cs 4 n/a n/a 46.2 n/a +STZ-5 n/a cs 7 n/a n/a 46.3 n/a +GAZ-MM n/a cs 6 n/a n/a 47 n/a +ZIS-5 n/a cs 7 n/a n/a 47 n/a +IAG-6 n/a cs 7 n/a n/a 47 n/a +NKL-6 n/a CS 2† n/a n/a 47.1† S†1 +NKL-16 n/a cs 2 n/a n/a 47.1† S†1 +NKL-26 n/a CS 2 n/a n/a 47.2† Q S†1 +RF-8-GAZ-98 n/a CS 3 n/a n/a 47.3† S†1 +Stuart III(a) n/a CS 4 C6 C6 48 N O LL +Lee(a) n/a CS 7 C4† s8† C4† s8† 49† B†1 N O LL +Sherman III(a) n/a CS 5 (brew up) WP6[J4+]†[] s8 s8 50† N O R†1 LL +Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 50.1 N O R† LL +Matilda II(b) n/a CS 5 sD6 sD6 51† M†1 N LL +Valentine V(b) n/a CS 4 sM8 sM8 52.1 N LL +Valentine VIII(b) n/a CS 4 HE7 sD6 HE7 sD6 52.2 N LL +Churchill III(b) n/a CS 7 D6[J4]7[5]†[] HE7[F3]8[4+]†[] sD6[4+] sM8† HE8 sD6 sM8† 53† N LL +M3A1 Scout Car(a) n/a CS 4 n/a n/a 54† N LL +Jeep GPA(a) n/a cs 2 n/a n/a 59 H† L†1 +DUKW(a) n/a cs 7 n/a n/a 60† n/a diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt index 747657b..7501495 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt @@ -1,89 +1,89 @@ === vehicles/russian/1945 === -Name Radio Crew survival Capabilities # Notes ------------------ ------- ------------------------------------ --------------- ----- --------------------- -T-37 ® CS 2 n/a 1 H† M -T-27 ® CS 2 n/a 1.1† M Q -T-40 ® CS 2 n/a 2† H† -T-50 ® CS 4 A4 3 n/a -T-60 M40 ® CS 2 n/a 4 n/a -T-60 M42 ®† CS 2 n/a 4 C† -T-70 ®† CS 2 A4 5 C† -T-26 M33 ® CS 3 n/a 6 D I† M P -T-26 M37/39 ® CS 3 n/a 6 D M P -T-26 M31 ® CS 3 n/a 6.1† M P -T-26 M32 ® CS 3 n/a 6.2† M P -OT-26 ® CS 3 (brew up) n/a 6.3† M P -ST-26 Bridgelayer n/a CS 3 n/a 6.4† M -OT-133 ® CS 3 n/a 7† M P -BT-2A ® CS 3 n/a 7.1† M -BT-5 M34 ® CS 3 n/a 8† M P -BT-7 M37 ® CS 3 n/a 9 D I† M P -BT-7A n/a CS 3 AP7 s9 10 M P -T-28 M34 ® CS 5 s8 11† M -T-28 M34(L) ® CS 5 s8 11.1† M -T-28E M40 ® CS 6 s8 12† M -T-28E M40(L) ® CS 6 s8 12.1† M -T-34 M40 ® CS 5 n/a 13 M -T-34 M41 ®† CS 5 A4 14† C† M -OT-34 ®† CS 4 A2 AP7 15† C† M -T-34 M43 n/a CS 5 A4 16† n/a -T-43 ®† CS 5 A4 17 C† M -T-34/85 n/a CS 6 A5 sD6† 18† J† -M4/76(a) n/a CS 6 A3 s8 sM8 19† N -T-44 n/a CS 5 A6 20 B† M -T-35 ® CS 8 s9 21† M -SMK n/a CS 7 n/a 21.1 M T† -T-100 n/a CS 7 n/a 22.1 M T† -KV-1 M39/40 n/a CS 6 n/a 22† M -KV-1E n/a CS 6 n/a 23 D M -KV-1 M41 n/a CS 6 A4 23 D M -KV-1 M42 n/a CS 6 A4 23 D M -KV-2 n/a CS 7 AP9 24† M -KV-8 n/a CS 6 A4 AP7 15† D M -KV-1S n/a CS 6 A4 25† n/a -KV-85 n/a CS 5 A5 26 B† -IS-2 n/a CS 6 n/a 27 B† -IS-2m n/a CS 6 n/a 28 B† G† -IS-3 n/a CS 6 sD6† 29 G† J† -SU-76M n/a CS 4 (brew up) A5 30† n/a -SU-76i(g) n/a CS 5 A5 31 K -SU-122 n/a CS 5 H9 s8 32 n/a -SU-152 n/a CS 6 n/a 33† n/a -ISU-122 n/a CS 6 s8 34 G† -ISU-152 n/a CS 6 n/a 34 G† -SU-85 n/a CS 5 A5 HE7 s7 35 n/a -SU-100 n/a CS 5 HE7 36 n/a -SU-57(a) n/a CS 4 A5 HE7 37 K -BA-20 ® CS 3 n/a 38 n/a -BA-6 ® CS 4 A4 39 n/a -BA-64B n/a CS 2 n/a 40† A† -ZSU-37 n/a CS 4 n/a 41† A† -SU-12 n/a CS 4 AP7 s8 42 F† -GAZ-4M-AA n/a CS 4 n/a 43† A† -ZIS-42-AA n/a CS 4 n/a 44 A† F† -LANO AT ® CS 5 A4 44.1 n/a -LANO AA ® CS 5 n/a 44.2† A†1 -IAG-10-AA n/a CS 4 AP7 45 A† F† -GAZ-67B n/a CS 2 n/a 46 L† -Komsomolet n/a CS 2† n/a 46.1† n/a -STZ-3 n/a cs 4 n/a 46.2 n/a -STZ-5 n/a cs 7 n/a 46.3 n/a -GAZ-MM n/a cs 6 n/a 47 n/a -ZIS-5 n/a cs 7 n/a 47 n/a -IAG-6 n/a cs 7 n/a 47 n/a -NKL-6 n/a CS 2† n/a 47.1† S†1 -NKL-16 n/a cs 2 n/a 47.1† S†1 -NKL-26 n/a CS 2 n/a 47.2† Q S†1 -RF-8-GAZ-98 n/a CS 3 n/a 47.3† S†1 -Stuart III(a) n/a CS 4 C6 48 N O LL -Lee(a) n/a CS 7 C4† s8† 49† B†1 N O LL -Sherman III(a) n/a CS 5 (brew up) WP6 s8 50† N O R†1 LL -Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 50.1 N O R† LL -Matilda II(b) n/a CS 5 sD6 51† M†1 N LL -Valentine V(b) n/a CS 4 sM8 52.1 N LL -Valentine VIII(b) n/a CS 4 HE7 sD6 52.2 N LL -Churchill III(b) n/a CS 7 D7 HE8 sD6 sM8† 53† N LL -M3A1 Scout Car(a) n/a CS 4 n/a 54† N LL -Jeep GPA(a) n/a cs 2 n/a 59 H† L†1 -DUKW(a) n/a cs 7 n/a 60† n/a +Name Radio Crew survival Capabilities (effective) # Notes +----------------- ------- ------------------------------------ ------------------------------------------ --------------- ----- --------------------- +T-37 ® CS 2 n/a n/a 1 H† M +T-27 ® CS 2 n/a n/a 1.1† M Q +T-40 ® CS 2 n/a n/a 2† H† +T-50 ® CS 4 A4[2] A4 3 n/a +T-60 M40 ® CS 2 n/a n/a 4 n/a +T-60 M42 ®† CS 2 n/a n/a 4 C† +T-70 ®† CS 2 A4[2] A4 5 C† +T-26 M33 ® CS 3 n/a n/a 6 D I† M P +T-26 M37/39 ® CS 3 n/a n/a 6 D M P +T-26 M31 ® CS 3 n/a n/a 6.1† M P +T-26 M32 ® CS 3 n/a n/a 6.2† M P +OT-26 ® CS 3 (brew up) n/a n/a 6.3† M P +ST-26 Bridgelayer n/a CS 3 n/a n/a 6.4† M +OT-133 ® CS 3 n/a n/a 7† M P +BT-2A ® CS 3 n/a n/a 7.1† M +BT-5 M34 ® CS 3 n/a n/a 8† M P +BT-7 M37 ® CS 3 n/a n/a 9 D I† M P +BT-7A n/a CS 3 AP7 s9 AP7 s9 10 M P +T-28 M34 ® CS 5 s8 s8 11† M +T-28 M34(L) ® CS 5 s8 s8 11.1† M +T-28E M40 ® CS 6 s8 s8 12† M +T-28E M40(L) ® CS 6 s8 s8 12.1† M +T-34 M40 ® CS 5 n/a n/a 13 M +T-34 M41 ®† CS 5 A4[2] A4 14† C† M +OT-34 ®† CS 4 A2[2] AP7 A2 AP7 15† C† M +T-34 M43 n/a CS 5 A4[2] A4 16† n/a +T-43 ®† CS 5 A4[2] A4 17 C† M +T-34/85 n/a CS 6 A5[4] sD6† A5 sD6† 18† J† +M4/76(a) n/a CS 6 A3[4] s8 sM8 A3 s8 sM8 19† N +T-44 n/a CS 5 A6[5] A6 20 B† M +T-35 ® CS 8 s9 s9 21† M +SMK n/a CS 7 n/a n/a 21.1 M T† +T-100 n/a CS 7 n/a n/a 22.1 M T† +KV-1 M39/40 n/a CS 6 n/a n/a 22† M +KV-1E n/a CS 6 n/a n/a 23 D M +KV-1 M41 n/a CS 6 A4[2] A4 23 D M +KV-1 M42 n/a CS 6 A4[2] A4 23 D M +KV-2 n/a CS 7 AP9 AP9 24† M +KV-8 n/a CS 6 A4[2] AP7 A4 AP7 15† D M +KV-1S n/a CS 6 A4[2] A4 25† n/a +KV-85 n/a CS 5 A4[3]5[4] A5 26 B† +IS-2 n/a CS 6 n/a n/a 27 B† +IS-2m n/a CS 6 n/a n/a 28 B† G† +IS-3 n/a CS 6 sD6† sD6† 29 G† J† +SU-76M n/a CS 4 (brew up) A5[3] A5 30† n/a +SU-76i(g) n/a CS 5 A5[3] A5 31 K +SU-122 n/a CS 5 H9 s8 H9 s8 32 n/a +SU-152 n/a CS 6 n/a n/a 33† n/a +ISU-122 n/a CS 6 s8 s8 34 G† +ISU-152 n/a CS 6 n/a n/a 34 G† +SU-85 n/a CS 5 A5[3] HE7 s7 A5 HE7 s7 35 n/a +SU-100 n/a CS 5 HE7 HE7 36 n/a +SU-57(a) n/a CS 4 A5[3] HE7 A5 HE7 37 K +BA-20 ® CS 3 n/a n/a 38 n/a +BA-6 ® CS 4 A4[2] A4 39 n/a +BA-64B n/a CS 2 n/a n/a 40† A† +ZSU-37 n/a CS 4 n/a n/a 41† A† +SU-12 n/a CS 4 AP7 s8 AP7 s8 42 F† +GAZ-4M-AA n/a CS 4 n/a n/a 43† A† +ZIS-42-AA n/a CS 4 n/a n/a 44 A† F† +LANO AT ® CS 5 A4[2+] A4 44.1 n/a +LANO AA ® CS 5 n/a n/a 44.2† A†1 +IAG-10-AA n/a CS 4 AP7 AP7 45 A† F† +GAZ-67B n/a CS 2 n/a n/a 46 L† +Komsomolet n/a CS 2† n/a n/a 46.1† n/a +STZ-3 n/a cs 4 n/a n/a 46.2 n/a +STZ-5 n/a cs 7 n/a n/a 46.3 n/a +GAZ-MM n/a cs 6 n/a n/a 47 n/a +ZIS-5 n/a cs 7 n/a n/a 47 n/a +IAG-6 n/a cs 7 n/a n/a 47 n/a +NKL-6 n/a CS 2† n/a n/a 47.1† S†1 +NKL-16 n/a cs 2 n/a n/a 47.1† S†1 +NKL-26 n/a CS 2 n/a n/a 47.2† Q S†1 +RF-8-GAZ-98 n/a CS 3 n/a n/a 47.3† S†1 +Stuart III(a) n/a CS 4 C6 C6 48 N O LL +Lee(a) n/a CS 7 C4† s8† C4† s8† 49† B†1 N O LL +Sherman III(a) n/a CS 5 (brew up) WP6[J4+]†[] s8 WP6 s8 50† N O R†1 LL +Sherman III(L)(a) n/a CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 50.1 N O R† LL +Matilda II(b) n/a CS 5 sD6 sD6 51† M†1 N LL +Valentine V(b) n/a CS 4 sM8 sM8 52.1 N LL +Valentine VIII(b) n/a CS 4 HE7 sD6 HE7 sD6 52.2 N LL +Churchill III(b) n/a CS 7 D6[J4]7[5]†[] HE7[F3]8[4+]†[] sD6[4+] sM8† D7 HE8 sD6 sM8† 53† N LL +M3A1 Scout Car(a) n/a CS 4 n/a n/a 54† N LL +Jeep GPA(a) n/a cs 2 n/a n/a 59 H† L†1 +DUKW(a) n/a cs 7 n/a n/a 60† n/a diff --git a/vasl_templates/webapp/tests/test_vehicles_ordnance.py b/vasl_templates/webapp/tests/test_vehicles_ordnance.py index 9e2443a..b72cb3f 100644 --- a/vasl_templates/webapp/tests/test_vehicles_ordnance.py +++ b/vasl_templates/webapp/tests/test_vehicles_ordnance.py @@ -141,7 +141,8 @@ def test_snippets( webapp, webdriver ): '[German] ; width=', '[*] a german {}: #=1'.format( vo_type ), '- notes: "A" "B†"', - '- capabilities: "QSU" "IR" "A1" "H2" "can do other stuff"' + '- capabilities: "QSU" "IR" "A1" "H2" "can do other stuff"', + '- raw capabilities: "QSU" "IR" "A1" "H2" "can do other stuff"' ] if vo_type == "vehicle": expected.insert( 3, "- CS 5" ) @@ -156,7 +157,8 @@ def test_snippets( webapp, webdriver ): expected = [ '[German] ; width=', '[*] another german {}: #=2'.format( vo_type ), - '- capabilities: "QSU"' + '- capabilities: "QSU"', + '- raw capabilities: "QSU"' ] if vo_type == "vehicle": expected.insert( 2, '- cs 4 (brew up)' ) @@ -196,8 +198,7 @@ def test_variable_capabilities( webapp, webdriver ): submit = find_child( "input.generate[data-id='vehicles_2']" ) submit.click() buf = get_clipboard() - mo = re.search( r"capabilities: (.*)$", buf ) - print( mo.group(1) ) + mo = re.search( r"^- capabilities: (.*)$", buf, re.MULTILINE ) assert mo.group(1) == expected do_test( 1, 1940, '"sM8\u2020"' ) diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py index 89ebfd0..f95ede6 100644 --- a/vasl_templates/webapp/tests/test_vo_reports.py +++ b/vasl_templates/webapp/tests/test_vo_reports.py @@ -3,8 +3,9 @@ import os import io import shutil -import tabulate +import re +import tabulate import pytest from vasl_templates.webapp.tests.utils import find_child, find_children, wait_for @@ -33,16 +34,29 @@ def test_vo_reports( webapp, webdriver ): for vo_type in ["vehicles","ordnance"]: for year in range(1940,1945+1): - # generate the next report + # get the next report buf = io.StringIO() results = get_vo_report( webapp, webdriver, nat, vo_type, year ) + + # FUDGE! The "capabilities" and "notes" columns span 2 columns each, + # so we add dummy header columns to stop tabulate from getting confused :-/ + assert results[0][-1] == "Notes" + results[0].insert( len(results[0])-1, "#" ) + assert results[0][-3] == "Capabilities" + results[0].insert( len(results[0])-2, "(effective)" ) + + # fix up date-based capabilities + assert results[0][-4] == "Capabilities" + for i in range(1,len(results)): + results[i][-4] = re.sub( + r"(.*?)", + lambda mo: "[{}]".format( mo.group(1) ), + results[i][-4] + ) + + # output the report print( "=== {}/{}/{} ===".format( vo_type, nat, year ), file=buf ) print( "", file=buf ) - # FUDGE! The last "notes" column spans 2 columns, so we add a dummy header - # to stop tabulate from getting confused :-/ - assert results[0][-1] == "Notes" - results[0][-1] = "#" - results[0].append( "Notes" ) print( tabulate.tabulate( results, headers="firstrow" ), file = buf