From a4b7333e6fc2fea70c34343bfe1fa64f9c5607e7 Mon Sep 17 00:00:00 2001 From: Taka Date: Mon, 6 Jul 2020 12:22:07 +0000 Subject: [PATCH] Minor tweaks and corrections to smart comments. --- vasl_templates/webapp/data/vo-comments.json | 1 + .../tests/fixtures/vo-reports/vehicles/russian/1940.txt | 8 ++++---- .../tests/fixtures/vo-reports/vehicles/russian/1941.txt | 8 ++++---- .../tests/fixtures/vo-reports/vehicles/russian/1942.txt | 8 ++++---- .../tests/fixtures/vo-reports/vehicles/russian/1943.txt | 8 ++++---- .../tests/fixtures/vo-reports/vehicles/russian/1944.txt | 8 ++++---- .../tests/fixtures/vo-reports/vehicles/russian/1945.txt | 8 ++++---- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/vasl_templates/webapp/data/vo-comments.json b/vasl_templates/webapp/data/vo-comments.json index 6e06d12..40348e6 100644 --- a/vasl_templates/webapp/data/vo-comments.json +++ b/vasl_templates/webapp/data/vo-comments.json @@ -35,6 +35,7 @@ "B": "BMG: +1 DRM vs Moving/Motion", "C": "{? 01/1943- | Radio | No Radio | Radio43+ ?}", "F": "MA: VCA ≤ level NA", + "G": "AAMG: 12.7", "H": "+3 Target Size & HD if in Water", "J": "sD: single-use", "K": "Red TH#", 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 0175160..b339ac3 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 @@ -44,14 +44,14 @@ KV-8 A4[2] AP7 CS 6 AP7 CS 6 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 -IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion -IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | sD: single-use +IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion | AAMG: 12.7 +IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | AAMG: 12.7 | sD: single-use SU-76M A5[3] CS 4[brewup] CS 4[brewup] 30† n/a SU-76i(g) A5[3] CS 5 CS 5 31 K German ESB | Red TH# SU-122 H9 s8 CS 5 H9 s8 CS 5 32 n/a No IF SU-152 CS 6 CS 6 33† n/a No IF -ISU-122 s8 CS 6 s8 CS 6 34 G† No IF -ISU-152 CS 6 CS 6 34 G† No IF +ISU-122 s8 CS 6 s8 CS 6 34 G† No IF | AAMG: 12.7 +ISU-152 CS 6 CS 6 34 G† No IF | AAMG: 12.7 SU-85 A5[3] HE7 s7 CS 5 HE7 s7 CS 5 35 n/a SU-100 HE7 CS 5 HE7 CS 5 36 n/a SU-57(a) A5[3] HE7 CS 4 HE7 CS 4 37 K American ESB | Red TH# 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 2ecd177..09ec4a2 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 @@ -44,14 +44,14 @@ KV-8 A4[2] AP7 CS 6 AP7 CS 6 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 -IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion -IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | sD: single-use +IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion | AAMG: 12.7 +IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | AAMG: 12.7 | sD: single-use SU-76M A5[3] CS 4[brewup] CS 4[brewup] 30† n/a SU-76i(g) A5[3] CS 5 CS 5 31 K German ESB | Red TH# SU-122 H9 s8 CS 5 H9 s8 CS 5 32 n/a No IF SU-152 CS 6 CS 6 33† n/a No IF -ISU-122 s8 CS 6 s8 CS 6 34 G† No IF -ISU-152 CS 6 CS 6 34 G† No IF +ISU-122 s8 CS 6 s8 CS 6 34 G† No IF | AAMG: 12.7 +ISU-152 CS 6 CS 6 34 G† No IF | AAMG: 12.7 SU-85 A5[3] HE7 s7 CS 5 HE7 s7 CS 5 35 n/a SU-100 HE7 CS 5 HE7 CS 5 36 n/a SU-57(a) A5[3] HE7 CS 4 HE7 CS 4 37 K American ESB | Red TH# 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 724022d..68a3478 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 @@ -44,14 +44,14 @@ KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 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 -IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion -IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | sD: single-use +IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion | AAMG: 12.7 +IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | AAMG: 12.7 | sD: single-use SU-76M A5[3] CS 4[brewup] CS 4[brewup] 30† n/a SU-76i(g) A5[3] CS 5 CS 5 31 K German ESB | Red TH# SU-122 H9 s8 CS 5 H9 s8 CS 5 32 n/a No IF SU-152 CS 6 CS 6 33† n/a No IF -ISU-122 s8 CS 6 s8 CS 6 34 G† No IF -ISU-152 CS 6 CS 6 34 G† No IF +ISU-122 s8 CS 6 s8 CS 6 34 G† No IF | AAMG: 12.7 +ISU-152 CS 6 CS 6 34 G† No IF | AAMG: 12.7 SU-85 A5[3] HE7 s7 CS 5 HE7 s7 CS 5 35 n/a SU-100 HE7 CS 5 HE7 CS 5 36 n/a SU-57(a) A5[3] HE7 CS 4 HE7 CS 4 37 K American ESB | Red TH# 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 9080368..d9d9554 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 @@ -44,14 +44,14 @@ KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 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 -IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion -IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | sD: single-use +IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion | AAMG: 12.7 +IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | AAMG: 12.7 | sD: single-use SU-76M A5[3] CS 4[brewup] A5 CS 4[brewup] 30† n/a SU-76i(g) A5[3] CS 5 A5 CS 5 31 K German ESB | Red TH# SU-122 H9 s8 CS 5 H9 s8 CS 5 32 n/a No IF SU-152 CS 6 CS 6 33† n/a No IF -ISU-122 s8 CS 6 s8 CS 6 34 G† No IF -ISU-152 CS 6 CS 6 34 G† No IF +ISU-122 s8 CS 6 s8 CS 6 34 G† No IF | AAMG: 12.7 +ISU-152 CS 6 CS 6 34 G† No IF | AAMG: 12.7 SU-85 A5[3] HE7 s7 CS 5 A5 HE7 s7 CS 5 35 n/a SU-100 HE7 CS 5 HE7 CS 5 36 n/a SU-57(a) A5[3] HE7 CS 4 A5 HE7 CS 4 37 K American ESB | Red TH# 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 0931164..0eed916 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 @@ -44,14 +44,14 @@ KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 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 -IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion -IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | sD: single-use +IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion | AAMG: 12.7 +IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | AAMG: 12.7 | sD: single-use SU-76M A5[3] CS 4[brewup] A5 CS 4[brewup] 30† n/a SU-76i(g) A5[3] CS 5 A5 CS 5 31 K German ESB | Red TH# SU-122 H9 s8 CS 5 H9 s8 CS 5 32 n/a No IF SU-152 CS 6 CS 6 33† n/a No IF -ISU-122 s8 CS 6 s8 CS 6 34 G† No IF -ISU-152 CS 6 CS 6 34 G† No IF +ISU-122 s8 CS 6 s8 CS 6 34 G† No IF | AAMG: 12.7 +ISU-152 CS 6 CS 6 34 G† No IF | AAMG: 12.7 SU-85 A5[3] HE7 s7 CS 5 A5 HE7 s7 CS 5 35 n/a SU-100 HE7 CS 5 HE7 CS 5 36 n/a SU-57(a) A5[3] HE7 CS 4 A5 HE7 CS 4 37 K American ESB | Red TH# 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 ea76201..f1b9539 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 @@ -44,14 +44,14 @@ KV-8 A4[2] AP7 CS 6 A4 AP7 CS 6 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 -IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion -IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | sD: single-use +IS-2m CS 6 CS 6 28 B† G† No IF | BMG: +1 DRM vs Moving/Motion | AAMG: 12.7 +IS-3 sD6† CS 6 sD6† CS 6 29 G† J† No IF | AAMG: 12.7 | sD: single-use SU-76M A5[3] CS 4[brewup] A5 CS 4[brewup] 30† n/a SU-76i(g) A5[3] CS 5 A5 CS 5 31 K German ESB | Red TH# SU-122 H9 s8 CS 5 H9 s8 CS 5 32 n/a No IF SU-152 CS 6 CS 6 33† n/a No IF -ISU-122 s8 CS 6 s8 CS 6 34 G† No IF -ISU-152 CS 6 CS 6 34 G† No IF +ISU-122 s8 CS 6 s8 CS 6 34 G† No IF | AAMG: 12.7 +ISU-152 CS 6 CS 6 34 G† No IF | AAMG: 12.7 SU-85 A5[3] HE7 s7 CS 5 A5 HE7 s7 CS 5 35 n/a SU-100 HE7 CS 5 HE7 CS 5 36 n/a SU-57(a) A5[3] HE7 CS 4 A5 HE7 CS 4 37 K American ESB | Red TH#