From 9746391bfbd806e4a791f6a4417d98d5aff0cd46 Mon Sep 17 00:00:00 2001 From: Taka Date: Mon, 6 Jul 2020 02:02:58 +0000 Subject: [PATCH] Added smart comments for vehicle radios. --- vasl_templates/webapp/data/vehicles/italian.json | 1 + vasl_templates/webapp/data/vo-comments.json | 4 ++++ .../fixtures/vo-reports/vehicles/italian/1940.txt | 2 +- .../fixtures/vo-reports/vehicles/italian/1941.txt | 2 +- .../fixtures/vo-reports/vehicles/italian/1942.txt | 2 +- .../fixtures/vo-reports/vehicles/italian/1943.txt | 2 +- .../fixtures/vo-reports/vehicles/italian/1944.txt | 2 +- .../fixtures/vo-reports/vehicles/italian/1945.txt | 2 +- .../fixtures/vo-reports/vehicles/japanese/1940.txt | 4 ++-- .../fixtures/vo-reports/vehicles/japanese/1941.txt | 4 ++-- .../fixtures/vo-reports/vehicles/japanese/1942.txt | 4 ++-- .../fixtures/vo-reports/vehicles/japanese/1943.txt | 4 ++-- .../fixtures/vo-reports/vehicles/japanese/1944.txt | 4 ++-- .../fixtures/vo-reports/vehicles/japanese/1945.txt | 4 ++-- .../fixtures/vo-reports/vehicles/russian/1940.txt | 12 ++++++------ .../fixtures/vo-reports/vehicles/russian/1941.txt | 12 ++++++------ .../fixtures/vo-reports/vehicles/russian/1942.txt | 12 ++++++------ .../fixtures/vo-reports/vehicles/russian/1943.txt | 12 ++++++------ .../fixtures/vo-reports/vehicles/russian/1944.txt | 12 ++++++------ .../fixtures/vo-reports/vehicles/russian/1945.txt | 12 ++++++------ 20 files changed, 59 insertions(+), 54 deletions(-) diff --git a/vasl_templates/webapp/data/vehicles/italian.json b/vasl_templates/webapp/data/vehicles/italian.json index eda7067..3754a11 100644 --- a/vasl_templates/webapp/data/vehicles/italian.json +++ b/vasl_templates/webapp/data/vehicles/italian.json @@ -81,6 +81,7 @@ "CS#": 4, "note_number": "8\u2020", "notes": [ "B\u20201", "C\u20202", "N" ], + "comments": [ "{? 11/1941- | Radio | No Radio | Radio11/41+ ?}" ], "id": "it/v:008", "gpid": [ 3483, 3485 ] }, diff --git a/vasl_templates/webapp/data/vo-comments.json b/vasl_templates/webapp/data/vo-comments.json index 4350c34..6e06d12 100644 --- a/vasl_templates/webapp/data/vo-comments.json +++ b/vasl_templates/webapp/data/vo-comments.json @@ -33,6 +33,7 @@ "vehicles": { "A": "MA & CMG: AA ok", "B": "BMG: +1 DRM vs Moving/Motion", + "C": "{? 01/1943- | Radio | No Radio | Radio43+ ?}", "F": "MA: VCA ≤ level NA", "H": "+3 Target Size & HD if in Water", "J": "sD: single-use", @@ -162,6 +163,9 @@ }, "japanese": { + "vehicles": { + "C": "{? 01/1945- | Radio | No radio | Radio45+ ?}" + }, "ordnance": { "A": "Animal-Packed", "B": "As 82mm MTR", diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt index bba853e..a5209a6 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt @@ -10,7 +10,7 @@ L3 cc ® CS 2 ® CS 2 4† E J†11 N Trailer (AF 0) | Stun = Recall, CE & Fire NA | BMG: HD Fire OK L6/40 CS 2 CS 2 6† N R M11/39 ® CS 3 ® CS 3 7† A†1 N B11: SA only | 2 TK DR -M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N AAMG: VCA only +M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N No Radio | AAMG: VCA only M14/41 CS 4 CS 4 9† B†1 C†2 N AAMG: VCA only M15/42 CS 4 CS 4 10† B†1 C†2 AAMG: VCA only MR/35(f) CS 2 CS 2 11† I†1 CMG: AA ok (TCA only) | CE: +1 Rear Turret & Indirect Fire | French ESB+ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt index 249df24..12bcb7e 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt @@ -10,7 +10,7 @@ L3 cc ® CS 2 ® CS 2 4† E J†11 N Trailer (AF 0) | Stun = Recall, CE & Fire NA | BMG: HD Fire OK L6/40 CS 2 CS 2 6† N R M11/39 ® CS 3 ® CS 3 7† A†1 N B11: SA only | 2 TK DR -M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N AAMG: VCA only +M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N No Radio | AAMG: VCA only M14/41 CS 4 CS 4 9† B†1 C†2 N AAMG: VCA only M15/42 CS 4 CS 4 10† B†1 C†2 AAMG: VCA only MR/35(f) CS 2 CS 2 11† I†1 CMG: AA ok (TCA only) | CE: +1 Rear Turret & Indirect Fire | French ESB+ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt index c2cc0c2..1edcc99 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt @@ -10,7 +10,7 @@ L3 cc ® CS 2 ® CS 2 4† E J†11 N Trailer (AF 0) | Stun = Recall, CE & Fire NA | BMG: HD Fire OK L6/40 CS 2 CS 2 6† N R M11/39 ® CS 3 ® CS 3 7† A†1 N B11: SA only | 2 TK DR -M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N AAMG: VCA only +M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N Radio | AAMG: VCA only M14/41 CS 4 CS 4 9† B†1 C†2 N AAMG: VCA only M15/42 CS 4 CS 4 10† B†1 C†2 AAMG: VCA only MR/35(f) CS 2 CS 2 11† I†1 CMG: AA ok (TCA only) | CE: +1 Rear Turret & Indirect Fire | French ESB+ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt index 6e19a3f..11679d6 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt @@ -10,7 +10,7 @@ L3 cc ® CS 2 ® CS 2 4† E J†11 N Trailer (AF 0) | Stun = Recall, CE & Fire NA | BMG: HD Fire OK L6/40 CS 2 CS 2 6† N R M11/39 ® CS 3 ® CS 3 7† A†1 N B11: SA only | 2 TK DR -M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N AAMG: VCA only +M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N Radio | AAMG: VCA only M14/41 CS 4 CS 4 9† B†1 C†2 N AAMG: VCA only M15/42 CS 4 CS 4 10† B†1 C†2 AAMG: VCA only MR/35(f) CS 2 CS 2 11† I†1 CMG: AA ok (TCA only) | CE: +1 Rear Turret & Indirect Fire | French ESB+ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt index 45b54cf..3df57d8 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt @@ -10,7 +10,7 @@ L3 cc ® CS 2 ® CS 2 4† E J†11 N Trailer (AF 0) | Stun = Recall, CE & Fire NA | BMG: HD Fire OK L6/40 CS 2 CS 2 6† N R M11/39 ® CS 3 ® CS 3 7† A†1 N B11: SA only | 2 TK DR -M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N AAMG: VCA only +M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N Radio | AAMG: VCA only M14/41 CS 4 CS 4 9† B†1 C†2 N AAMG: VCA only M15/42 CS 4 CS 4 10† B†1 C†2 AAMG: VCA only MR/35(f) CS 2 CS 2 11† I†1 CMG: AA ok (TCA only) | CE: +1 Rear Turret & Indirect Fire | French ESB+ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt index 717061b..69c19e8 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt @@ -10,7 +10,7 @@ L3 cc ® CS 2 ® CS 2 4† E J†11 N Trailer (AF 0) | Stun = Recall, CE & Fire NA | BMG: HD Fire OK L6/40 CS 2 CS 2 6† N R M11/39 ® CS 3 ® CS 3 7† A†1 N B11: SA only | 2 TK DR -M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N AAMG: VCA only +M13/40 ®† CS 4 ®† CS 4 8† B†1 C†2 N Radio | AAMG: VCA only M14/41 CS 4 CS 4 9† B†1 C†2 N AAMG: VCA only M15/42 CS 4 CS 4 10† B†1 C†2 AAMG: VCA only MR/35(f) CS 2 CS 2 11† I†1 CMG: AA ok (TCA only) | CE: +1 Rear Turret & Indirect Fire | French ESB+ diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt index 4645254..a3e6aca 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt @@ -8,12 +8,12 @@ Type 94 ® CS 2 ® CS 2 Type 95 SO-KI ® CS 5 ® CS 5 3† n/a MA: Normal Range = 8 | MA: Removal/Scrounge OK Type 97A TE-KE ® CS 2 ® CS 2 4† n/a Type 97B TE-KE ® CS 2 ® CS 2 4† n/a No IF -Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA +Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA | No radio Type 2 KA-MI CS 5† CS 5† 6† n/a Amphibious | Movement restrictions | Near misses Type 2 KA-MI (without pontoons) CS 5† CS 5† 6† n/a Type 89A CHI-RO ® CS 4 ® CS 4 7† A†1 AP TK# = 8 Type 89B CHI-RO ® CS 4 ® CS 4 7† n/a Rear MG: 8:00 from MA | AP TK# = 8 -Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] CS 4 8† B†1 C†2 +Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] CS 4 8† B†1 C†2 No radio Type 97B CHI-HA sD5 CS 4 sD5 CS 4 8† n/a Type 1 CHI-HE sD5 CS 5 sD5 CS 5 9† n/a Type 91 CS 6 CS 6 10† A†1 BMG: Normal Range = 8 | Reverse MP ×3 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt index c869537..d5fc7ab 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt @@ -8,12 +8,12 @@ Type 94 ® CS 2 ® CS 2 Type 95 SO-KI ® CS 5 ® CS 5 3† n/a MA: Normal Range = 8 | MA: Removal/Scrounge OK Type 97A TE-KE ® CS 2 ® CS 2 4† n/a Type 97B TE-KE ® CS 2 ® CS 2 4† n/a No IF -Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA +Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA | No radio Type 2 KA-MI CS 5† CS 5† 6† n/a Amphibious | Movement restrictions | Near misses Type 2 KA-MI (without pontoons) CS 5† CS 5† 6† n/a Type 89A CHI-RO ® CS 4 ® CS 4 7† A†1 AP TK# = 8 Type 89B CHI-RO ® CS 4 ® CS 4 7† n/a Rear MG: 8:00 from MA | AP TK# = 8 -Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 +Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 No radio Type 97B CHI-HA sD5 CS 4 sD5 CS 4 8† n/a Type 1 CHI-HE sD5 CS 5 sD5 CS 5 9† n/a Type 91 CS 6 CS 6 10† A†1 BMG: Normal Range = 8 | Reverse MP ×3 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt index a0d65ef..ef86634 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt @@ -8,12 +8,12 @@ Type 94 ® CS 2 ® CS 2 Type 95 SO-KI ® CS 5 ® CS 5 3† n/a MA: Normal Range = 8 | MA: Removal/Scrounge OK Type 97A TE-KE ® CS 2 ® CS 2 4† n/a Type 97B TE-KE ® CS 2 ® CS 2 4† n/a No IF -Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA +Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA | No radio Type 2 KA-MI CS 5† CS 5† 6† n/a Amphibious | Movement restrictions | Near misses Type 2 KA-MI (without pontoons) CS 5† CS 5† 6† n/a Type 89A CHI-RO ® CS 4 ® CS 4 7† A†1 AP TK# = 8 Type 89B CHI-RO ® CS 4 ® CS 4 7† n/a Rear MG: 8:00 from MA | AP TK# = 8 -Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 +Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 No radio Type 97B CHI-HA sD5 CS 4 sD5 CS 4 8† n/a Type 1 CHI-HE sD5 CS 5 sD5 CS 5 9† n/a Type 91 CS 6 CS 6 10† A†1 BMG: Normal Range = 8 | Reverse MP ×3 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt index c7e4c44..a465c9a 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt @@ -8,12 +8,12 @@ Type 94 ® CS 2 ® CS 2 Type 95 SO-KI ® CS 5 ® CS 5 3† n/a MA: Normal Range = 8 | MA: Removal/Scrounge OK Type 97A TE-KE ® CS 2 ® CS 2 4† n/a Type 97B TE-KE ® CS 2 ® CS 2 4† n/a No IF -Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA +Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA | No radio Type 2 KA-MI CS 5† CS 5† 6† n/a Amphibious | Movement restrictions | Near misses Type 2 KA-MI (without pontoons) CS 5† CS 5† 6† n/a Type 89A CHI-RO ® CS 4 ® CS 4 7† A†1 AP TK# = 8 Type 89B CHI-RO ® CS 4 ® CS 4 7† n/a Rear MG: 8:00 from MA | AP TK# = 8 -Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 +Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 No radio Type 97B CHI-HA sD5 CS 4 sD5 CS 4 8† n/a Type 1 CHI-HE sD5 CS 5 sD5 CS 5 9† n/a Type 91 CS 6 CS 6 10† A†1 BMG: Normal Range = 8 | Reverse MP ×3 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt index fdd1d67..f32e06b 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt @@ -8,12 +8,12 @@ Type 94 ® CS 2 ® CS 2 Type 95 SO-KI ® CS 5 ® CS 5 3† n/a MA: Normal Range = 8 | MA: Removal/Scrounge OK Type 97A TE-KE ® CS 2 ® CS 2 4† n/a Type 97B TE-KE ® CS 2 ® CS 2 4† n/a No IF -Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] sD5†[1] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA +Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] sD5†[1] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA | No radio Type 2 KA-MI CS 5† CS 5† 6† n/a Amphibious | Movement restrictions | Near misses Type 2 KA-MI (without pontoons) CS 5† CS 5† 6† n/a Type 89A CHI-RO ® CS 4 ® CS 4 7† A†1 AP TK# = 8 Type 89B CHI-RO ® CS 4 ® CS 4 7† n/a Rear MG: 8:00 from MA | AP TK# = 8 -Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 +Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 No radio Type 97B CHI-HA sD5 CS 4 sD5 CS 4 8† n/a Type 1 CHI-HE sD5 CS 5 sD5 CS 5 9† n/a Type 91 CS 6 CS 6 10† A†1 BMG: Normal Range = 8 | Reverse MP ×3 diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt index 972ed03..2af2d55 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt @@ -8,12 +8,12 @@ Type 94 ® CS 2 ® CS 2 Type 95 SO-KI ® CS 5 ® CS 5 3† n/a MA: Normal Range = 8 | MA: Removal/Scrounge OK Type 97A TE-KE ® CS 2 ® CS 2 4† n/a Type 97B TE-KE ® CS 2 ® CS 2 4† n/a No IF -Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] sD5†[1] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA +Type 95 HA-GO ®†[2] sD5[4+]†[1] CS 3 ®†[2] sD5†[1] CS 3 5† B†1 C†2 Rear MG: 4:00 from MA | Radio Type 2 KA-MI CS 5† CS 5† 6† n/a Amphibious | Movement restrictions | Near misses Type 2 KA-MI (without pontoons) CS 5† CS 5† 6† n/a Type 89A CHI-RO ® CS 4 ® CS 4 7† A†1 AP TK# = 8 Type 89B CHI-RO ® CS 4 ® CS 4 7† n/a Rear MG: 8:00 from MA | AP TK# = 8 -Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 +Type 97A CHI-HA ®†[2] sD5[1+]†[1] CS 4 ®†[2] sD5†[1] CS 4 8† B†1 C†2 Radio Type 97B CHI-HA sD5 CS 4 sD5 CS 4 8† n/a Type 1 CHI-HE sD5 CS 5 sD5 CS 5 9† n/a Type 91 CS 6 CS 6 10† A†1 BMG: Normal Range = 8 | Reverse MP ×3 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 04db84c..0175160 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 @@ -7,8 +7,8 @@ T-27 ® CS 2 ® CS 2 T-40 ® CS 2 ® CS 2 2† H† 2 TK DR (12.7 & MG) | +3 Target Size & HD if in Water T-50 ® A4[2] CS 4 ® CS 4 3 n/a T-60 M40 ® CS 2 ® CS 2 4 n/a -T-60 M42 ®† CS 2 ®† CS 2 4 C† -T-70 ®† A4[2] CS 2 ®† CS 2 5 C† +T-60 M42 ®† CS 2 ®† CS 2 4 C† No Radio +T-70 ®† A4[2] CS 2 ®† CS 2 5 C† No Radio T-26 M33 ® CS 3 ® CS 3 6 D I† M P 12: Immob, 11: Stall T-26 M37/39 ® CS 3 ® CS 3 6 D M P 12: Immob, 11: Stall T-26 M31 ® CS 3 ® CS 3 6.1† M P CMG: Scrounge OK | 12: Immob, 11: Stall @@ -25,10 +25,10 @@ T-28 M34(L) ® s8 CS 5 ® s8 CS 5 T-28E M40 ® s8 CS 6 ® s8 CS 6 12† M 12: Immob, 11: Stall T-28E M40(L) ® s8 CS 6 ® s8 CS 6 12.1† M 12: Immob, 11: Stall T-34 M40 ® CS 5 ® CS 5 13 M 12: Immob, 11: Stall -T-34 M41 ®† A4[2] CS 5 ®† CS 5 14† C† M 12: Immob, 11: Stall -OT-34 ®† A2[2] AP7 CS 4 ®† AP7 CS 4 15† C† M No IF | 12: Immob, 11: Stall +T-34 M41 ®† A4[2] CS 5 ®† CS 5 14† C† M No Radio | 12: Immob, 11: Stall +OT-34 ®† A2[2] AP7 CS 4 ®† AP7 CS 4 15† C† M No IF | No Radio | 12: Immob, 11: Stall T-34 M43 A4[2] CS 5 CS 5 16† n/a -T-43 ®† A4[2] CS 5 ®† CS 5 17 C† M 12: Immob, 11: Stall +T-43 ®† A4[2] CS 5 ®† CS 5 17 C† M No Radio | 12: Immob, 11: Stall T-34/85 A5[4] sD6† CS 6 sD6† CS 6 18† J† sD: single-use M4/76(a) A3[4] s8 sM8 CS 6 s8 sM8 CS 6 19† N Black TH# | U.S. AP & APCR TK #'s | American ESB T-44 A6[5] CS 5 CS 5 20 B† M BMG: +1 DRM vs Moving/Motion | 12: Immob, 11: Stall @@ -40,7 +40,7 @@ KV-1E CS 6 CS 6 KV-1 M41 A4[2] CS 6 CS 6 23 D M 12: Immob, 11: Stall KV-1 M42 A4[2] CS 6 CS 6 23 D M 12: Immob, 11: Stall KV-2 AP9 CS 7 AP9 CS 7 24† M Pays NT TCA DRM | No IF | 12: Immob, 11: Stall -KV-8 A4[2] AP7 CS 6 AP7 CS 6 15† C M 12: Immob, 11: Stall +KV-8 A4[2] AP7 CS 6 AP7 CS 6 15† C M No Radio | 12: Immob, 11: Stall KV-1S A4[2] CS 6 CS 6 25† n/a KV-85 A4[3]5[4] CS 5 CS 5 26 B† BMG: +1 DRM vs Moving/Motion IS-2 CS 6 CS 6 27 B† No IF | BMG: +1 DRM vs Moving/Motion 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 172776c..2ecd177 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 @@ -7,8 +7,8 @@ T-27 ® CS 2 ® CS 2 T-40 ® CS 2 ® CS 2 2† H† 2 TK DR (12.7 & MG) | +3 Target Size & HD if in Water T-50 ® A4[2] CS 4 ® CS 4 3 n/a T-60 M40 ® CS 2 ® CS 2 4 n/a -T-60 M42 ®† CS 2 ®† CS 2 4 C† -T-70 ®† A4[2] CS 2 ®† CS 2 5 C† +T-60 M42 ®† CS 2 ®† CS 2 4 C† No Radio +T-70 ®† A4[2] CS 2 ®† CS 2 5 C† No Radio T-26 M33 ® CS 3 ® CS 3 6 D I† M P 12: Immob, 11: Stall T-26 M37/39 ® CS 3 ® CS 3 6 D M P 12: Immob, 11: Stall T-26 M31 ® CS 3 ® CS 3 6.1† M P CMG: Scrounge OK | 12: Immob, 11: Stall @@ -25,10 +25,10 @@ T-28 M34(L) ® s8 CS 5 ® s8 CS 5 T-28E M40 ® s8 CS 6 ® s8 CS 6 12† M 12: Immob, 11: Stall T-28E M40(L) ® s8 CS 6 ® s8 CS 6 12.1† M 12: Immob, 11: Stall T-34 M40 ® CS 5 ® CS 5 13 M 12: Immob, 11: Stall -T-34 M41 ®† A4[2] CS 5 ®† CS 5 14† C† M 12: Immob, 11: Stall -OT-34 ®† A2[2] AP7 CS 4 ®† AP7 CS 4 15† C† M No IF | 12: Immob, 11: Stall +T-34 M41 ®† A4[2] CS 5 ®† CS 5 14† C† M No Radio | 12: Immob, 11: Stall +OT-34 ®† A2[2] AP7 CS 4 ®† AP7 CS 4 15† C† M No IF | No Radio | 12: Immob, 11: Stall T-34 M43 A4[2] CS 5 CS 5 16† n/a -T-43 ®† A4[2] CS 5 ®† CS 5 17 C† M 12: Immob, 11: Stall +T-43 ®† A4[2] CS 5 ®† CS 5 17 C† M No Radio | 12: Immob, 11: Stall T-34/85 A5[4] sD6† CS 6 sD6† CS 6 18† J† sD: single-use M4/76(a) A3[4] s8 sM8 CS 6 s8 sM8 CS 6 19† N Black TH# | U.S. AP & APCR TK #'s | American ESB T-44 A6[5] CS 5 CS 5 20 B† M BMG: +1 DRM vs Moving/Motion | 12: Immob, 11: Stall @@ -40,7 +40,7 @@ KV-1E CS 6 CS 6 KV-1 M41 A4[2] CS 6 CS 6 23 D M 12: Immob, 11: Stall KV-1 M42 A4[2] CS 6 CS 6 23 D M 12: Immob, 11: Stall KV-2 AP9 CS 7 AP9 CS 7 24† M Pays NT TCA DRM | No IF | 12: Immob, 11: Stall -KV-8 A4[2] AP7 CS 6 AP7 CS 6 15† C M 12: Immob, 11: Stall +KV-8 A4[2] AP7 CS 6 AP7 CS 6 15† C M No Radio | 12: Immob, 11: Stall KV-1S A4[2] CS 6 CS 6 25† n/a KV-85 A4[3]5[4] CS 5 CS 5 26 B† BMG: +1 DRM vs Moving/Motion IS-2 CS 6 CS 6 27 B† No IF | BMG: +1 DRM vs Moving/Motion 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 4c75177..724022d 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 @@ -7,8 +7,8 @@ T-27 ® CS 2 ® CS 2 T-40 ® CS 2 ® CS 2 2† H† 2 TK DR (12.7 & MG) | +3 Target Size & HD if in Water T-50 ® A4[2] CS 4 ® A4 CS 4 3 n/a T-60 M40 ® CS 2 ® CS 2 4 n/a -T-60 M42 ®† CS 2 ®† CS 2 4 C† -T-70 ®† A4[2] CS 2 ®† A4 CS 2 5 C† +T-60 M42 ®† CS 2 ®† CS 2 4 C† No Radio +T-70 ®† A4[2] CS 2 ®† A4 CS 2 5 C† No Radio T-26 M33 ® CS 3 ® CS 3 6 D I† M P 12: Immob, 11: Stall T-26 M37/39 ® CS 3 ® CS 3 6 D M P 12: Immob, 11: Stall T-26 M31 ® CS 3 ® CS 3 6.1† M P CMG: Scrounge OK | 12: Immob, 11: Stall @@ -25,10 +25,10 @@ T-28 M34(L) ® s8 CS 5 ® s8 CS 5 T-28E M40 ® s8 CS 6 ® s8 CS 6 12† M 12: Immob, 11: Stall T-28E M40(L) ® s8 CS 6 ® s8 CS 6 12.1† M 12: Immob, 11: Stall T-34 M40 ® CS 5 ® CS 5 13 M 12: Immob, 11: Stall -T-34 M41 ®† A4[2] CS 5 ®† A4 CS 5 14† C† M 12: Immob, 11: Stall -OT-34 ®† A2[2] AP7 CS 4 ®† A2 AP7 CS 4 15† C† M No IF | 12: Immob, 11: Stall +T-34 M41 ®† A4[2] CS 5 ®† A4 CS 5 14† C† M No Radio | 12: Immob, 11: Stall +OT-34 ®† A2[2] AP7 CS 4 ®† A2 AP7 CS 4 15† C† M No IF | No Radio | 12: Immob, 11: Stall T-34 M43 A4[2] CS 5 A4 CS 5 16† n/a -T-43 ®† A4[2] CS 5 ®† A4 CS 5 17 C† M 12: Immob, 11: Stall +T-43 ®† A4[2] CS 5 ®† A4 CS 5 17 C† M No Radio | 12: Immob, 11: Stall T-34/85 A5[4] sD6† CS 6 sD6† CS 6 18† J† sD: single-use M4/76(a) A3[4] s8 sM8 CS 6 s8 sM8 CS 6 19† N Black TH# | U.S. AP & APCR TK #'s | American ESB T-44 A6[5] CS 5 CS 5 20 B† M BMG: +1 DRM vs Moving/Motion | 12: Immob, 11: Stall @@ -40,7 +40,7 @@ KV-1E CS 6 CS 6 KV-1 M41 A4[2] CS 6 A4 CS 6 23 D M 12: Immob, 11: Stall KV-1 M42 A4[2] CS 6 A4 CS 6 23 D M 12: Immob, 11: Stall KV-2 AP9 CS 7 AP9 CS 7 24† M Pays NT TCA DRM | No IF | 12: Immob, 11: Stall -KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 15† C M 12: Immob, 11: Stall +KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 15† C M No Radio | 12: Immob, 11: Stall KV-1S A4[2] CS 6 A4 CS 6 25† n/a KV-85 A4[3]5[4] CS 5 CS 5 26 B† BMG: +1 DRM vs Moving/Motion IS-2 CS 6 CS 6 27 B† No IF | BMG: +1 DRM vs Moving/Motion 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 eb77fad..9080368 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 @@ -7,8 +7,8 @@ T-27 ® CS 2 ® CS 2 T-40 ® CS 2 ® CS 2 2† H† 2 TK DR (12.7 & MG) | +3 Target Size & HD if in Water T-50 ® A4[2] CS 4 ® A4 CS 4 3 n/a T-60 M40 ® CS 2 ® CS 2 4 n/a -T-60 M42 ®† CS 2 ®† CS 2 4 C† -T-70 ®† A4[2] CS 2 ®† A4 CS 2 5 C† +T-60 M42 ®† CS 2 ®† CS 2 4 C† Radio +T-70 ®† A4[2] CS 2 ®† A4 CS 2 5 C† Radio T-26 M33 ® CS 3 ® CS 3 6 D I† M P 12: Immob, 11: Stall T-26 M37/39 ® CS 3 ® CS 3 6 D M P 12: Immob, 11: Stall T-26 M31 ® CS 3 ® CS 3 6.1† M P CMG: Scrounge OK | 12: Immob, 11: Stall @@ -25,10 +25,10 @@ T-28 M34(L) ® s8 CS 5 ® s8 CS 5 T-28E M40 ® s8 CS 6 ® s8 CS 6 12† M 12: Immob, 11: Stall T-28E M40(L) ® s8 CS 6 ® s8 CS 6 12.1† M 12: Immob, 11: Stall T-34 M40 ® CS 5 ® CS 5 13 M 12: Immob, 11: Stall -T-34 M41 ®† A4[2] CS 5 ®† A4 CS 5 14† C† M 12: Immob, 11: Stall -OT-34 ®† A2[2] AP7 CS 4 ®† A2 AP7 CS 4 15† C† M No IF | 12: Immob, 11: Stall +T-34 M41 ®† A4[2] CS 5 ®† A4 CS 5 14† C† M Radio | 12: Immob, 11: Stall +OT-34 ®† A2[2] AP7 CS 4 ®† A2 AP7 CS 4 15† C† M No IF | Radio | 12: Immob, 11: Stall T-34 M43 A4[2] CS 5 A4 CS 5 16† n/a -T-43 ®† A4[2] CS 5 ®† A4 CS 5 17 C† M 12: Immob, 11: Stall +T-43 ®† A4[2] CS 5 ®† A4 CS 5 17 C† M Radio | 12: Immob, 11: Stall T-34/85 A5[4] sD6† CS 6 sD6† CS 6 18† J† sD: single-use M4/76(a) A3[4] s8 sM8 CS 6 s8 sM8 CS 6 19† N Black TH# | U.S. AP & APCR TK #'s | American ESB T-44 A6[5] CS 5 CS 5 20 B† M BMG: +1 DRM vs Moving/Motion | 12: Immob, 11: Stall @@ -40,7 +40,7 @@ KV-1E CS 6 CS 6 KV-1 M41 A4[2] CS 6 A4 CS 6 23 D M 12: Immob, 11: Stall KV-1 M42 A4[2] CS 6 A4 CS 6 23 D M 12: Immob, 11: Stall KV-2 AP9 CS 7 AP9 CS 7 24† M Pays NT TCA DRM | No IF | 12: Immob, 11: Stall -KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 15† C M 12: Immob, 11: Stall +KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 15† C M Radio | 12: Immob, 11: Stall KV-1S A4[2] CS 6 A4 CS 6 25† n/a KV-85 A4[3]5[4] CS 5 A4 CS 5 26 B† BMG: +1 DRM vs Moving/Motion IS-2 CS 6 CS 6 27 B† No IF | BMG: +1 DRM vs Moving/Motion 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 50067f3..0931164 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 @@ -7,8 +7,8 @@ T-27 ® CS 2 ® CS 2 T-40 ® CS 2 ® CS 2 2† H† 2 TK DR (12.7 & MG) | +3 Target Size & HD if in Water T-50 ® A4[2] CS 4 ® A4 CS 4 3 n/a T-60 M40 ® CS 2 ® CS 2 4 n/a -T-60 M42 ®† CS 2 ®† CS 2 4 C† -T-70 ®† A4[2] CS 2 ®† A4 CS 2 5 C† +T-60 M42 ®† CS 2 ®† CS 2 4 C† Radio +T-70 ®† A4[2] CS 2 ®† A4 CS 2 5 C† Radio T-26 M33 ® CS 3 ® CS 3 6 D I† M P 12: Immob, 11: Stall T-26 M37/39 ® CS 3 ® CS 3 6 D M P 12: Immob, 11: Stall T-26 M31 ® CS 3 ® CS 3 6.1† M P CMG: Scrounge OK | 12: Immob, 11: Stall @@ -25,10 +25,10 @@ T-28 M34(L) ® s8 CS 5 ® s8 CS 5 T-28E M40 ® s8 CS 6 ® s8 CS 6 12† M 12: Immob, 11: Stall T-28E M40(L) ® s8 CS 6 ® s8 CS 6 12.1† M 12: Immob, 11: Stall T-34 M40 ® CS 5 ® CS 5 13 M 12: Immob, 11: Stall -T-34 M41 ®† A4[2] CS 5 ®† A4 CS 5 14† C† M 12: Immob, 11: Stall -OT-34 ®† A2[2] AP7 CS 4 ®† A2 AP7 CS 4 15† C† M No IF | 12: Immob, 11: Stall +T-34 M41 ®† A4[2] CS 5 ®† A4 CS 5 14† C† M Radio | 12: Immob, 11: Stall +OT-34 ®† A2[2] AP7 CS 4 ®† A2 AP7 CS 4 15† C† M No IF | Radio | 12: Immob, 11: Stall T-34 M43 A4[2] CS 5 A4 CS 5 16† n/a -T-43 ®† A4[2] CS 5 ®† A4 CS 5 17 C† M 12: Immob, 11: Stall +T-43 ®† A4[2] CS 5 ®† A4 CS 5 17 C† M Radio | 12: Immob, 11: Stall T-34/85 A5[4] sD6† CS 6 A5 sD6† CS 6 18† J† sD: single-use M4/76(a) A3[4] s8 sM8 CS 6 A3 s8 sM8 CS 6 19† N Black TH# | U.S. AP & APCR TK #'s | American ESB T-44 A6[5] CS 5 CS 5 20 B† M BMG: +1 DRM vs Moving/Motion | 12: Immob, 11: Stall @@ -40,7 +40,7 @@ KV-1E CS 6 CS 6 KV-1 M41 A4[2] CS 6 A4 CS 6 23 D M 12: Immob, 11: Stall KV-1 M42 A4[2] CS 6 A4 CS 6 23 D M 12: Immob, 11: Stall KV-2 AP9 CS 7 AP9 CS 7 24† M Pays NT TCA DRM | No IF | 12: Immob, 11: Stall -KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 15† C M 12: Immob, 11: Stall +KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 15† C M Radio | 12: Immob, 11: Stall KV-1S A4[2] CS 6 A4 CS 6 25† n/a KV-85 A4[3]5[4] CS 5 A5 CS 5 26 B† BMG: +1 DRM vs Moving/Motion IS-2 CS 6 CS 6 27 B† No IF | BMG: +1 DRM vs Moving/Motion 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 601978a..ea76201 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 @@ -7,8 +7,8 @@ T-27 ® CS 2 ® CS 2 T-40 ® CS 2 ® CS 2 2† H† 2 TK DR (12.7 & MG) | +3 Target Size & HD if in Water T-50 ® A4[2] CS 4 ® A4 CS 4 3 n/a T-60 M40 ® CS 2 ® CS 2 4 n/a -T-60 M42 ®† CS 2 ®† CS 2 4 C† -T-70 ®† A4[2] CS 2 ®† A4 CS 2 5 C† +T-60 M42 ®† CS 2 ®† CS 2 4 C† Radio +T-70 ®† A4[2] CS 2 ®† A4 CS 2 5 C† Radio T-26 M33 ® CS 3 ® CS 3 6 D I† M P 12: Immob, 11: Stall T-26 M37/39 ® CS 3 ® CS 3 6 D M P 12: Immob, 11: Stall T-26 M31 ® CS 3 ® CS 3 6.1† M P CMG: Scrounge OK | 12: Immob, 11: Stall @@ -25,10 +25,10 @@ T-28 M34(L) ® s8 CS 5 ® s8 CS 5 T-28E M40 ® s8 CS 6 ® s8 CS 6 12† M 12: Immob, 11: Stall T-28E M40(L) ® s8 CS 6 ® s8 CS 6 12.1† M 12: Immob, 11: Stall T-34 M40 ® CS 5 ® CS 5 13 M 12: Immob, 11: Stall -T-34 M41 ®† A4[2] CS 5 ®† A4 CS 5 14† C† M 12: Immob, 11: Stall -OT-34 ®† A2[2] AP7 CS 4 ®† A2 AP7 CS 4 15† C† M No IF | 12: Immob, 11: Stall +T-34 M41 ®† A4[2] CS 5 ®† A4 CS 5 14† C† M Radio | 12: Immob, 11: Stall +OT-34 ®† A2[2] AP7 CS 4 ®† A2 AP7 CS 4 15† C† M No IF | Radio | 12: Immob, 11: Stall T-34 M43 A4[2] CS 5 A4 CS 5 16† n/a -T-43 ®† A4[2] CS 5 ®† A4 CS 5 17 C† M 12: Immob, 11: Stall +T-43 ®† A4[2] CS 5 ®† A4 CS 5 17 C† M Radio | 12: Immob, 11: Stall T-34/85 A5[4] sD6† CS 6 A5 sD6† CS 6 18† J† sD: single-use M4/76(a) A3[4] s8 sM8 CS 6 A3 s8 sM8 CS 6 19† N Black TH# | U.S. AP & APCR TK #'s | American ESB T-44 A6[5] CS 5 A6 CS 5 20 B† M BMG: +1 DRM vs Moving/Motion | 12: Immob, 11: Stall @@ -40,7 +40,7 @@ KV-1E CS 6 CS 6 KV-1 M41 A4[2] CS 6 A4 CS 6 23 D M 12: Immob, 11: Stall KV-1 M42 A4[2] CS 6 A4 CS 6 23 D M 12: Immob, 11: Stall KV-2 AP9 CS 7 AP9 CS 7 24† M Pays NT TCA DRM | No IF | 12: Immob, 11: Stall -KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 15† C M 12: Immob, 11: Stall +KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 15† C M Radio | 12: Immob, 11: Stall KV-1S A4[2] CS 6 A4 CS 6 25† n/a KV-85 A4[3]5[4] CS 5 A5 CS 5 26 B† BMG: +1 DRM vs Moving/Motion IS-2 CS 6 CS 6 27 B† No IF | BMG: +1 DRM vs Moving/Motion