diff --git a/vasl_templates/webapp/data/vehicles/german.json b/vasl_templates/webapp/data/vehicles/german.json index 53d6413..58615d4 100644 --- a/vasl_templates/webapp/data/vehicles/german.json +++ b/vasl_templates/webapp/data/vehicles/german.json @@ -373,7 +373,7 @@ "note_number": "37.1\u2020", "notes": [ "K" ], "id": "ge/v:042", - "gpid": null + "gpid": 2670 }, { "name": "PzJg Tiger", "type": "AG/TD", @@ -892,13 +892,6 @@ "id": "ge/v:101", "gpid": 2765 }, -{ "name": "(Moebelwagen)", - "CS#": 6, - "note_number": "85\u2020", - "notes": [ "A\u2020" ], - "id": "ge/v:102", - "gpid": null -}, { "name": "FlaKPz IV/20", "type": "SPAA", "CS#": 6, diff --git a/vasl_templates/webapp/data/vehicles/japanese.json b/vasl_templates/webapp/data/vehicles/japanese.json index fc044b1..ac5d8d9 100644 --- a/vasl_templates/webapp/data/vehicles/japanese.json +++ b/vasl_templates/webapp/data/vehicles/japanese.json @@ -196,7 +196,7 @@ { "name": "Vickers 8-in. Costal Defense Gun Turret", "note_number": "19\u2020", "id": "ja/v:024", - "gpid": null + "gpid": 3299 } ] diff --git a/vasl_templates/webapp/data/vehicles/landing-craft.json b/vasl_templates/webapp/data/vehicles/landing-craft.json index 85206ca..004885a 100644 --- a/vasl_templates/webapp/data/vehicles/landing-craft.json +++ b/vasl_templates/webapp/data/vehicles/landing-craft.json @@ -23,13 +23,6 @@ "id": "sh/v:002", "gpid": [ 403, 405 ] }, -{ "name": "LCV", - "CS#": 5, - "damage_points": 3, - "note_number": "3\u2020", - "id": "sh/v:003", - "gpid": null -}, { "name": "LCM(3)", "CS#": 6, "damage_points": 5, diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt index c904850..4086fc7 100644 --- a/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt +++ b/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt @@ -5,7 +5,6 @@ Name Capabilities (effective) # Notes LCP(L) DP 2 CS 4 DP 2 CS 4 1† A†1 B†3 C†2 D LCA DP 3 CS 6 DP 3 CS 6 2† n/a LCVP DP 3 CS 5 DP 3 CS 5 3† B†2 C†1 -LCV DP 3 CS 5 DP 3 CS 5 3† n/a LCM(3) DP 5 CS 6 DP 5 CS 6 4† B†2 C†1 LCI(S) DP 14 CS 10 DP 14 CS 10 5† C†3 D E†2 F†1 G LCT(4) DP 10 CS 9 DP 10 CS 9 6† C†3 E†2 F†1 G 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 9ecf1a1..4ff4417 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 @@ -104,7 +104,6 @@ GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 PzA III/IV no IF H5 s8 CS 6 no IF H5 s8 CS 6 83 n/a FlaKPz 38(t) CS 4 CS 4 84 A† E 37 FlaK/Pz IV CS 5 CS 5 85† A† -(Moebelwagen) CS 6 CS 6 85† A† FlaKPz IV/20 CS 6 CS 6 86 A† FlaKPz IV/37 CS 6 CS 6 87 A† SdKfz 10/4 CS 5 CS 5 88 A† D† 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 c2d8a94..54dc722 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 @@ -104,7 +104,6 @@ GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 PzA III/IV no IF H5 s8 CS 6 no IF H5 s8 CS 6 83 n/a FlaKPz 38(t) CS 4 CS 4 84 A† E 37 FlaK/Pz IV CS 5 CS 5 85† A† -(Moebelwagen) CS 6 CS 6 85† A† FlaKPz IV/20 CS 6 CS 6 86 A† FlaKPz IV/37 CS 6 CS 6 87 A† SdKfz 10/4 CS 5 CS 5 88 A† D† 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 6777d8e..90a483e 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 @@ -104,7 +104,6 @@ GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 PzA III/IV no IF H5 s8 CS 6 no IF H5 s8 CS 6 83 n/a FlaKPz 38(t) CS 4 CS 4 84 A† E 37 FlaK/Pz IV CS 5 CS 5 85† A† -(Moebelwagen) CS 6 CS 6 85† A† FlaKPz IV/20 CS 6 CS 6 86 A† FlaKPz IV/37 CS 6 CS 6 87 A† SdKfz 10/4 CS 5 CS 5 88 A† D† 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 f151928..d96c98d 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 @@ -104,7 +104,6 @@ GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 PzA III/IV no IF H5 s8 CS 6 no IF H5 s8 CS 6 83 n/a FlaKPz 38(t) CS 4 CS 4 84 A† E 37 FlaK/Pz IV CS 5 CS 5 85† A† -(Moebelwagen) CS 6 CS 6 85† A† FlaKPz IV/20 CS 6 CS 6 86 A† FlaKPz IV/37 CS 6 CS 6 87 A† SdKfz 10/4 CS 5 CS 5 88 A† D† 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 7fb7cd0..91b96ed 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 @@ -104,7 +104,6 @@ GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 PzA III/IV no IF H5 s8 CS 6 no IF H5 s8 CS 6 83 n/a FlaKPz 38(t) CS 4 CS 4 84 A† E 37 FlaK/Pz IV CS 5 CS 5 85† A† -(Moebelwagen) CS 6 CS 6 85† A† FlaKPz IV/20 CS 6 CS 6 86 A† FlaKPz IV/37 CS 6 CS 6 87 A† SdKfz 10/4 CS 5 CS 5 88 A† D† 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 74b92cc..97cd1fe 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 @@ -104,7 +104,6 @@ GSW 39H(f) H4 s7 CS 4 H4 s7 CS 4 PzA III/IV no IF H5 s8 CS 6 no IF H5 s8 CS 6 83 n/a FlaKPz 38(t) CS 4 CS 4 84 A† E 37 FlaK/Pz IV CS 5 CS 5 85† A† -(Moebelwagen) CS 6 CS 6 85† A† FlaKPz IV/20 CS 6 CS 6 86 A† FlaKPz IV/37 CS 6 CS 6 87 A† SdKfz 10/4 CS 5 CS 5 88 A† D† N