public
/
vasl-templates
1
0
Fork 0
Code Issues Pull Requests Projects Releases 29 Wiki Activity

Made APCR ETO-only for the M10 GMC and M18 GMC.

Browse Source
master
Pacman Ghost 6 years ago
parent c8a666b511
commit fbb8a48adc
9 changed files with 64 additions and 14 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      vasl_templates/webapp/data/vehicles/american.json
  2. 16
      vasl_templates/webapp/tests/fixtures/data/vehicles/american.json
  3. 4
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt
  4. 4
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt
  5. 4
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt
  6. 4
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt
  7. 4
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt
  8. 4
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt
  9. 34
      vasl_templates/webapp/tests/test_capabilities.py

4
vasl_templates/webapp/data/vehicles/american.json
Unescape View File

@ -145,13 +145,13 @@
},
{ "name": "M10 GMC",
"CS#": 7,
"capabilities2": { "A": [ [5,"A4"], [6,5], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
"capabilities2": { "A": [ [5,"A4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
"note_number": "23\u2020",
"notes": [ "A\u2020<sup>1</sup>", "N", "Y" ]
},
{ "name": "M18 GMC",
"CS#": 6,
"capabilities2": { "A": [ [5,4], [6,5], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
"capabilities2": { "A": [ [5,"4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
"note_number": "24\u2020",
"notes": [ "A\u2020<sup>1</sup>" ]
},

16
vasl_templates/webapp/tests/fixtures/data/vehicles/american.json vendored
Unescape View File

@ -0,0 +1,16 @@
[
{ "name": "M10 GMC",
"CS#": 7,
"capabilities2": { "A": [ [5,"A4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
"note_number": "23\u2020",
"notes": [ "A\u2020<sup>1</sup>", "N", "Y" ]
},
{ "name": "M18 GMC",
"CS#": 6,
"capabilities2": { "A": [ [5,"4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
"note_number": "24\u2020",
"notes": [ "A\u2020<sup>1</sup>" ]
}
]

4
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt vendored
Unescape View File

@ -26,8 +26,8 @@ T1E3 n/a yes CS 5 <small><i>(brew up)</i></small> WP7 s5
Sherman Crab n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†<sup>1</sup> BB†<sup>2</sup>
POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
M26 n/a yes CS 6 A7 A7 22† <s>P</s>
M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 sP5 24† A†<sup>1</sup>
M10 GMC n/a yes CS 7 A5[A4E]6[5E]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4E]6[5E]†[1] s5[5] sP5 sP5 24† A†<sup>1</sup>
M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† <s>P</s>
M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 <s>P</s>
M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N

4
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt vendored
Unescape View File

@ -26,8 +26,8 @@ T1E3 n/a yes CS 5 <small><i>(brew up)</i></small> WP7 s5
Sherman Crab n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†<sup>1</sup> BB†<sup>2</sup>
POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
M26 n/a yes CS 6 A7 A7 22† <s>P</s>
M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 sP5 24† A†<sup>1</sup>
M10 GMC n/a yes CS 7 A5[A4E]6[5E]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4E]6[5E]†[1] s5[5] sP5 sP5 24† A†<sup>1</sup>
M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† <s>P</s>
M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 <s>P</s>
M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N

4
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt vendored
Unescape View File

@ -26,8 +26,8 @@ T1E3 n/a yes CS 5 <small><i>(brew up)</i></small> WP7 s5
Sherman Crab n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†<sup>1</sup> BB†<sup>2</sup>
POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
M26 n/a yes CS 6 A7 A7 22† <s>P</s>
M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 sP5 24† A†<sup>1</sup>
M10 GMC n/a yes CS 7 A5[A4E]6[5E]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4E]6[5E]†[1] s5[5] sP5 sP5 24† A†<sup>1</sup>
M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† <s>P</s>
M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 <s>P</s>
M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N

4
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt vendored
Unescape View File

@ -26,8 +26,8 @@ T1E3 n/a yes CS 5 <small><i>(brew up)</i></small> WP7 s5
Sherman Crab n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†<sup>1</sup> BB†<sup>2</sup>
POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
M26 n/a yes CS 6 A7 A7 22† <s>P</s>
M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 sP5 24† A†<sup>1</sup>
M10 GMC n/a yes CS 7 A5[A4E]6[5E]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4E]6[5E]†[1] s5[5] sP5 sP5 24† A†<sup>1</sup>
M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† <s>P</s>
M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 <s>P</s>
M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N

4
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt vendored
Unescape View File

@ -26,8 +26,8 @@ T1E3 n/a yes CS 5 <small><i>(brew up)</i></small> WP7 s5
Sherman Crab n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†<sup>1</sup> BB†<sup>2</sup>
POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
M26 n/a yes CS 6 A7 A7 22† <s>P</s>
M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 A5†[1] sP5 24† A†<sup>1</sup>
M10 GMC n/a yes CS 7 A5[A4E]6[5E]†[1] s5[5] sP5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4E]6[5E]†[1] s5[5] sP5 A5†[1] sP5 24† A†<sup>1</sup>
M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† <s>P</s>
M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 <s>P</s>
M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N

4
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt vendored
Unescape View File

@ -26,8 +26,8 @@ T1E3 n/a yes CS 5 <small><i>(brew up)</i></small> WP7 s5
Sherman Crab n/a yes CS 5 <small><i>(brew up)</i></small> WP7[J4+]†[2] s5[J4+] sM4 WP7†[2] s5 sM4 20† G R†<sup>1</sup> BB†<sup>2</sup>
POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
M26 n/a yes CS 6 A7 A7 22† <s>P</s>
M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 A6†[1] s5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 A6†[1] s5 sP5 24† A†<sup>1</sup>
M10 GMC n/a yes CS 7 A5[A4E]6[5E]†[1] s5[5] sP5 A6†[1] s5 sP5 23† A†<sup>1</sup> N Y
M18 GMC n/a yes CS 6 A5[4E]6[5E]†[1] s5[5] sP5 A6†[1] s5 sP5 24† A†<sup>1</sup>
M36 GMC n/a yes CS 7 A5[5] sP5 A5 sP5 25† <s>P</s>
M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 <s>P</s>
M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N

34
vasl_templates/webapp/tests/test_capabilities.py
Unescape View File

@ -111,6 +111,40 @@ def test_scenario_theater( webapp, webdriver ):
_check_snippet( "ETO", "01/01/1940", "ordnance", '"NT" "H7" "WP8" "s7"' )
_check_snippet( "PTO", "01/01/1940", "ordnance", '"NT" "C7\u2020<sup>1</sup>" "H7" "WP8" "s7"' )
# NOTE: We do a bit of hackery for the APCR specification for the M10 GMC and M18 GMC,
# to flag them as ETO-only, so we make sure everything's working properly here.
# M10 GMC: A(E)5(A4)/6(5)†1
new_scenario()
load_scenario_params( {
"scenario": {
"PLAYER_1": "american",
},
"ob1": {
"OB_VEHICLES_1": [ "M10 GMC" ],
}
} )
_check_snippet( "ETO", "07/31/1944", "vehicles", '"sP5"' )
_check_snippet( "ETO", "08/01/1944", "vehicles", '"A5\u2020<sup>1</sup>" "sP5"' )
_check_snippet( "ETO", "01/01/1945", "vehicles", '"A6\u2020<sup>1</sup>" "s5" "sP5"' )
_check_snippet( "other", "01/01/1945", "vehicles", '"s5" "sP5"' )
# M18 GMC: A(E)5(4)/6(5)†1
new_scenario()
load_scenario_params( {
"scenario": {
"PLAYER_1": "american",
},
"ob1": {
"OB_VEHICLES_1": [ "M18 GMC" ],
}
} )
_check_snippet( "ETO", "12/31/1943", "vehicles", '"sP5"' )
_check_snippet( "ETO", "01/01/1944", "vehicles", '"A5\u2020<sup>1</sup>" "sP5"' )
_check_snippet( "ETO", "01/01/1945", "vehicles", '"A6\u2020<sup>1</sup>" "s5" "sP5"' )
_check_snippet( "other", "01/01/1945", "vehicles", '"s5" "sP5"' )
# ---------------------------------------------------------------------
def _check_snippet( scenario_theater, scenario_date, vo_type, expected ):

Write Preview
Loading…
Cancel
Save