diff --git a/vasl_templates/webapp/data/vehicles/german.json b/vasl_templates/webapp/data/vehicles/german.json index c3a5b3c..8163164 100644 --- a/vasl_templates/webapp/data/vehicles/german.json +++ b/vasl_templates/webapp/data/vehicles/german.json @@ -910,6 +910,7 @@ "CS#": 5, "note_number": "85\u2020", "notes": [ "A\u2020" ], + "comments": [ "Moving: ", "Firing: " ], "id": "ge/v:101", "gpid": 2765 }, 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 1152123..6fb1caa 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 @@ -103,7 +103,7 @@ PzA LrS(f) H4 s8 CS 4 H4 s8 CS 4 GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 82.1 a e French ESB PzA III/IV H5 s8 CS 6 H5 s8 CS 6 83 n/a No IF FlaKPz 38(t) CS 4 CS 4 84 A† E CE: +1 | MA & CMG: AA ok | ESB: 0 DRM -37 FlaK/Pz IV CS 5 CS 5 85† A† MA & CMG: AA ok +37 FlaK/Pz IV CS 5 CS 5 85† A† Moving: [{ *:Fire ≤ level NA }] | Firing: [{ *:No CE DRM *:Random SW Destruction for MA }] | MA & CMG: AA ok FlaKPz IV/20 CS 6 CS 6 86 A† 4 TK DR | MA & CMG: AA ok FlaKPz IV/37 CS 6 CS 6 87 A† MA & CMG: AA ok SdKfz 10/4 CS 5 CS 5 88 A† D† N MA & CMG: AA ok | Ammo trailer 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 085413e..84c60c6 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 @@ -103,7 +103,7 @@ PzA LrS(f) H4 s8 CS 4 H4 s8 CS 4 GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 82.1 a e French ESB PzA III/IV H5 s8 CS 6 H5 s8 CS 6 83 n/a No IF FlaKPz 38(t) CS 4 CS 4 84 A† E CE: +1 | MA & CMG: AA ok | ESB: 0 DRM -37 FlaK/Pz IV CS 5 CS 5 85† A† MA & CMG: AA ok +37 FlaK/Pz IV CS 5 CS 5 85† A† Moving: [{ *:Fire ≤ level NA }] | Firing: [{ *:No CE DRM *:Random SW Destruction for MA }] | MA & CMG: AA ok FlaKPz IV/20 CS 6 CS 6 86 A† 4 TK DR | MA & CMG: AA ok FlaKPz IV/37 CS 6 CS 6 87 A† MA & CMG: AA ok SdKfz 10/4 CS 5 CS 5 88 A† D† N MA & CMG: AA ok | Ammo trailer 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 ec6be31..1948132 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 @@ -103,7 +103,7 @@ PzA LrS(f) H4 s8 CS 4 H4 s8 CS 4 GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 82.1 a e French ESB PzA III/IV H5 s8 CS 6 H5 s8 CS 6 83 n/a No IF FlaKPz 38(t) CS 4 CS 4 84 A† E CE: +1 | MA & CMG: AA ok | ESB: 0 DRM -37 FlaK/Pz IV CS 5 CS 5 85† A† MA & CMG: AA ok +37 FlaK/Pz IV CS 5 CS 5 85† A† Moving: [{ *:Fire ≤ level NA }] | Firing: [{ *:No CE DRM *:Random SW Destruction for MA }] | MA & CMG: AA ok FlaKPz IV/20 CS 6 CS 6 86 A† 4 TK DR | MA & CMG: AA ok FlaKPz IV/37 CS 6 CS 6 87 A† MA & CMG: AA ok SdKfz 10/4 CS 5 CS 5 88 A† D† N MA & CMG: AA ok | Ammo trailer 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 eb33190..63f0419 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 @@ -103,7 +103,7 @@ PzA LrS(f) H4 s8 CS 4 H4 s8 CS 4 GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 82.1 a e French ESB PzA III/IV H5 s8 CS 6 H5 s8 CS 6 83 n/a No IF FlaKPz 38(t) CS 4 CS 4 84 A† E CE: +1 | MA & CMG: AA ok | ESB: 0 DRM -37 FlaK/Pz IV CS 5 CS 5 85† A† MA & CMG: AA ok +37 FlaK/Pz IV CS 5 CS 5 85† A† Moving: [{ *:Fire ≤ level NA }] | Firing: [{ *:No CE DRM *:Random SW Destruction for MA }] | MA & CMG: AA ok FlaKPz IV/20 CS 6 CS 6 86 A† 4 TK DR | MA & CMG: AA ok FlaKPz IV/37 CS 6 CS 6 87 A† MA & CMG: AA ok SdKfz 10/4 CS 5 CS 5 88 A† D† N MA & CMG: AA ok | Ammo trailer 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 04cc1dd..29d99b7 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 @@ -103,7 +103,7 @@ PzA LrS(f) H4 s8 CS 4 H4 s8 CS 4 GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 82.1 a e French ESB PzA III/IV H5 s8 CS 6 H5 s8 CS 6 83 n/a No IF FlaKPz 38(t) CS 4 CS 4 84 A† E CE: +1 | MA & CMG: AA ok | ESB: 0 DRM -37 FlaK/Pz IV CS 5 CS 5 85† A† MA & CMG: AA ok +37 FlaK/Pz IV CS 5 CS 5 85† A† Moving: [{ *:Fire ≤ level NA }] | Firing: [{ *:No CE DRM *:Random SW Destruction for MA }] | MA & CMG: AA ok FlaKPz IV/20 CS 6 CS 6 86 A† 4 TK DR | MA & CMG: AA ok FlaKPz IV/37 CS 6 CS 6 87 A† MA & CMG: AA ok SdKfz 10/4 CS 5 CS 5 88 A† D† N MA & CMG: AA ok | Ammo trailer 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 21ac3a3..dca5e44 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 @@ -103,7 +103,7 @@ PzA LrS(f) H4 s8 CS 4 H4 s8 CS 4 GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 82.1 a e French ESB PzA III/IV H5 s8 CS 6 H5 s8 CS 6 83 n/a No IF FlaKPz 38(t) CS 4 CS 4 84 A† E CE: +1 | MA & CMG: AA ok | ESB: 0 DRM -37 FlaK/Pz IV CS 5 CS 5 85† A† MA & CMG: AA ok +37 FlaK/Pz IV CS 5 CS 5 85† A† Moving: [{ *:Fire ≤ level NA }] | Firing: [{ *:No CE DRM *:Random SW Destruction for MA }] | MA & CMG: AA ok FlaKPz IV/20 CS 6 CS 6 86 A† 4 TK DR | MA & CMG: AA ok FlaKPz IV/37 CS 6 CS 6 87 A† MA & CMG: AA ok SdKfz 10/4 CS 5 CS 5 88 A† D† N MA & CMG: AA ok | Ammo trailer