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

Update SMOKE Depletion Numbers correctly for Elite units.

Browse Source
master
Pacman Ghost 3 years ago
parent 903f2f29ff
commit f23329a3c1
9 changed files with 12 additions and 12 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. 2
      vasl_templates/webapp/data/extensions/bfp-bj-v403.json
  2. 2
      vasl_templates/webapp/static/snippets.js
  3. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
  4. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
  5. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
  6. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
  7. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
  8. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
  9. 8
      vasl_templates/webapp/tests/test_capabilities.py

2
vasl_templates/webapp/data/extensions/bfp-bj-v403.json
Unescape View File

@ -738,7 +738,7 @@
{ "name": "Type 89 Heavy Grenade Launcher",
"type": "MTR",
"capabilities2": { "WP": [ [5,5] ], "S": [ [6,5] ] },
"capabilities2": { "WP": [ [5,5] ], "s": [ [6,5] ] },
"comments": [ "HE: Range ≤ 2, ROF 1", "Smoke: [3-10]", "WP: [1-5], ROF 1" ],
"note_number": "1",
"id": "ina/o:900",

2
vasl_templates/webapp/static/snippets.js
Unescape View File

@ -1426,7 +1426,7 @@ function adjust_capabilities_for_elite( capabilities, delta )
if ( capabilities[i].indexOf( "<sup>" ) !== -1 )
continue ; // nb: ignore raw capabilities (e.g. if the scenario date hasn't been set)
// NOTE: Elite status doesn't apply to vehicular smoke dispensers (C8.9).
var match = capabilities[i].match( /^(A|M|H|C|D|HE|AP|WP|S)([1-9][0-9]?)/ ) ;
var match = capabilities[i].match( /^(A|M|H|C|D|HE|AP|WP|s)([1-9][0-9]?)/ ) ;
if ( match )
capabilities[i] = match[1] + (parseInt(match[2]) + delta) + capabilities[i].substr(match[1].length+match[2].length) ;
}

2
vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt vendored
Unescape View File

@ -2,7 +2,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------------- -------------- ------------- --- ------- -------------------------------------------------------------
Type 89 Heavy Grenade Launcher S6[5] WP5[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 89 Heavy Grenade Launcher WP5[5] s6[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 97 Automatic Gun 2 Jp A No Long Range | Animal-Packed
Year-11 Flat-Trajectory INF Gun 3 Jp A Crewed | Animal-Packed
Type 94 Rapid-Fire Gun 4 Jp A QSU | Horse-Drawn | Animal-Packed

2
vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt vendored
Unescape View File

@ -2,7 +2,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------------- -------------- ------------- --- ------- -------------------------------------------------------------
Type 89 Heavy Grenade Launcher S6[5] WP5[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 89 Heavy Grenade Launcher WP5[5] s6[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 97 Automatic Gun 2 Jp A No Long Range | Animal-Packed
Year-11 Flat-Trajectory INF Gun 3 Jp A Crewed | Animal-Packed
Type 94 Rapid-Fire Gun 4 Jp A QSU | Horse-Drawn | Animal-Packed

2
vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt vendored
Unescape View File

@ -2,7 +2,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------------- -------------- ------------- --- ------- -------------------------------------------------------------
Type 89 Heavy Grenade Launcher S6[5] WP5[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 89 Heavy Grenade Launcher WP5[5] s6[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 97 Automatic Gun 2 Jp A No Long Range | Animal-Packed
Year-11 Flat-Trajectory INF Gun 3 Jp A Crewed | Animal-Packed
Type 94 Rapid-Fire Gun 4 Jp A QSU | Horse-Drawn | Animal-Packed

2
vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt vendored
Unescape View File

@ -2,7 +2,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------------- -------------- ------------- --- ------- -------------------------------------------------------------
Type 89 Heavy Grenade Launcher S6[5] WP5[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 89 Heavy Grenade Launcher WP5[5] s6[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 97 Automatic Gun 2 Jp A No Long Range | Animal-Packed
Year-11 Flat-Trajectory INF Gun 3 Jp A Crewed | Animal-Packed
Type 94 Rapid-Fire Gun 4 Jp A QSU | Horse-Drawn | Animal-Packed

2
vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt vendored
Unescape View File

@ -2,7 +2,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------------- -------------- ------------- --- ------- -------------------------------------------------------------
Type 89 Heavy Grenade Launcher S6[5] WP5[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 89 Heavy Grenade Launcher WP5[5] s6[5] 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 97 Automatic Gun 2 Jp A No Long Range | Animal-Packed
Year-11 Flat-Trajectory INF Gun 3 Jp A Crewed | Animal-Packed
Type 94 Rapid-Fire Gun 4 Jp A QSU | Horse-Drawn | Animal-Packed

2
vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt vendored
Unescape View File

@ -2,7 +2,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------------- -------------- ------------- --- ------- -------------------------------------------------------------
Type 89 Heavy Grenade Launcher S6[5] WP5[5] S6 WP5 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 89 Heavy Grenade Launcher WP5[5] s6[5] WP5 s6 1 n/a HE: Range &#8804; 2, ROF 1 | Smoke: [3-10] | WP: [1-5], ROF 1
Type 97 Automatic Gun 2 Jp A No Long Range | Animal-Packed
Year-11 Flat-Trajectory INF Gun 3 Jp A Crewed | Animal-Packed
Type 94 Rapid-Fire Gun 4 Jp A QSU | Horse-Drawn | Animal-Packed

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

@ -878,7 +878,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
caps = [ c.text for c in find_children(".vo-capability",get_sortable_elem()) ]
if expected:
assert vo_name.endswith( "\u24ba" )
expected = [ "H9", "s9", "sD7", "CS 5" ]
expected = [ "H9", "s10", "sD7", "CS 5" ]
if custom:
expected.append( "HE11" )
assert caps == expected
@ -894,7 +894,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
caps = [ c.get_attribute("value") for c in find_children("#vo_capabilities-sortable input[type='text']") ]
if expected:
assert vo_name.endswith( "\u24ba" )
expected = [ "H9", "s9", "sD7", "CS 5" ]
expected = [ "H9", "s10", "sD7", "CS 5" ]
if custom:
expected.append( "HE11" )
assert caps == expected
@ -939,7 +939,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
assert len(saved_scenario["OB_VEHICLES_1"]) == 1
assert saved_scenario["OB_VEHICLES_1"][0]["elite"]
assert saved_scenario["OB_VEHICLES_1"][0]["custom_capabilities"] == \
[ "H9", "s9", "sD7", "CS 5", "HE11" ]
[ "H9", "s10", "sD7", "CS 5", "HE11" ]
select_menu_option( "new_scenario" )
load_scenario( saved_scenario )
select_tab( "ob1" )
@ -978,7 +978,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
saved_scenario = save_scenario()
assert len(saved_scenario["OB_VEHICLES_1"]) == 1
assert saved_scenario["OB_VEHICLES_1"][0]["elite"]
assert saved_scenario["OB_VEHICLES_1"][0]["custom_capabilities"] == [ "H9", "s9", "sD7", "CS 5" ]
assert saved_scenario["OB_VEHICLES_1"][0]["custom_capabilities"] == [ "H9", "s10", "sD7", "CS 5" ]
select_menu_option( "new_scenario" )
load_scenario( saved_scenario )
select_tab( "ob1" )

Write Preview
Loading…
Cancel
Save