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

Changed how "brewup" CS #'s are shown into snippets.

Browse Source
master
Pacman Ghost 4 years ago
parent b89cd2bd23
commit fee5bbb2f7
24 changed files with 49 additions and 40 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. 1
      vasl_templates/webapp/data/default-template-pack/ob_vo.j2
  2. 7
      vasl_templates/webapp/static/snippets.js
  3. 1
      vasl_templates/webapp/templates/vo-report.html
  4. 6
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
  5. 6
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
  6. 6
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
  7. 6
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
  8. 6
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
  9. 6
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
  10. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1940.txt
  11. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1941.txt
  12. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1942.txt
  13. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1943.txt
  14. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1944.txt
  15. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1945.txt
  16. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1940.txt
  17. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1941.txt
  18. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1942.txt
  19. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1943.txt
  20. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1944.txt
  21. 2
      vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1945.txt
  22. 10
      vasl_templates/webapp/tests/test_capabilities.py
  23. 2
      vasl_templates/webapp/tests/test_vehicles_ordnance.py
  24. 8
      vasl_templates/webapp/tests/test_vo_reports.py

1
vasl_templates/webapp/data/default-template-pack/ob_vo.j2
Unescape View File

@ -6,6 +6,7 @@
{{CSS:common}}
.note { font-size: 90% ; font-style: italic ; color: #808080 ; }
.capability {}
.capability .brewup { color: #a04010 ; }
.comment { font-size: 96% ; font-style: italic ; color: #404040 ; white-space: nowrap ; }
.comment .split-mg-red { color: #a04010 ; }
.comment .exc { color: #606060 ; }

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

@ -1279,8 +1279,11 @@ function make_crew_survival( vo_entry )
// check if the vehicle is subject to brew up
var pos = crew_survival.indexOf( ":brewup" ) ;
if ( pos !== -1 )
crew_survival = crew_survival.substring(0,pos) + " <small><i>(brew up)</i></small>" + crew_survival.substring(pos+7) ;
if ( pos !== -1 ) {
crew_survival = "<span class='brewup'>" +
crew_survival.substring(0,pos) + crew_survival.substring(pos+7) +
"</span>" ;
}
return crew_survival ;
}

1
vasl_templates/webapp/templates/vo-report.html
Unescape View File

@ -10,6 +10,7 @@ th { text-align: left ; padding: 0.2em 0.5em ; background: #eee ; border: 1px so
tr { border-bottom: 1px dotted #ccc ; }
td { padding: 0.2em 0.5em ; vertical-align: top ; }
.val { padding: 0.1em 0.25em ; background: #eee ; }
.brewup { color: #a04010 ; }
</style>
</head>

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

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
@ -143,11 +143,11 @@ Daimler sD4 CS 2
Carrier A sD5 CS 3 sD5 CS 3 43† N U†<sup>1</sup> Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†<sup>2</sup> Z†<sup>1</sup> Always CE | MA: Removal NA | Combined (un)hooking/(un)loading | BAZ/PIAT Removal by crew/passenger only, or Scrounge.
Carrier, MMG A sD5 CS 3 sD5 CS 3 44† N U†<sup>1</sup> Always CE | Combined (un)hooking/(un)loading
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†<sup>1</sup> Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†<sup>1</sup> As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†<sup>1</sup> EE†<sup>2</sup> MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†<sup>1</sup> As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP &#215;4
Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 50† N U Always CE | sD: 2 hexes | Combined (un)hooking/(un)loading
Morris C9/B CS 4 CS 4 51† N AA†<sup>1</sup> No Bnd (F)F, Motion Fire | MA &amp; CMG: AA ok

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

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
@ -143,11 +143,11 @@ Daimler sD4 CS 2
Carrier A sD5 CS 3 sD5 CS 3 43† N U†<sup>1</sup> Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†<sup>2</sup> Z†<sup>1</sup> Always CE | MA: Removal NA | Combined (un)hooking/(un)loading | BAZ/PIAT Removal by crew/passenger only, or Scrounge.
Carrier, MMG A sD5 CS 3 sD5 CS 3 44† N U†<sup>1</sup> Always CE | Combined (un)hooking/(un)loading
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†<sup>1</sup> Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†<sup>1</sup> As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†<sup>1</sup> EE†<sup>2</sup> MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†<sup>1</sup> As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP &#215;4
Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 50† N U Always CE | sD: 2 hexes | Combined (un)hooking/(un)loading
Morris C9/B CS 4 CS 4 51† N AA†<sup>1</sup> No Bnd (F)F, Motion Fire | MA &amp; CMG: AA ok

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

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
@ -143,11 +143,11 @@ Daimler sD4 CS 2
Carrier A sD5 CS 3 sD5 CS 3 43† N U†<sup>1</sup> Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†<sup>2</sup> Z†<sup>1</sup> Always CE | MA: Removal NA | Combined (un)hooking/(un)loading | BAZ/PIAT Removal by crew/passenger only, or Scrounge.
Carrier, MMG A sD5 CS 3 sD5 CS 3 44† N U†<sup>1</sup> Always CE | Combined (un)hooking/(un)loading
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†<sup>1</sup> Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†<sup>1</sup> As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†<sup>1</sup> EE†<sup>2</sup> MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†<sup>1</sup> As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP &#215;4
Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 50† N U Always CE | sD: 2 hexes | Combined (un)hooking/(un)loading
Morris C9/B CS 4 CS 4 51† N AA†<sup>1</sup> No Bnd (F)F, Motion Fire | MA &amp; CMG: AA ok

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

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
@ -143,11 +143,11 @@ Daimler sD4 CS 2
Carrier A sD5 CS 3 sD5 CS 3 43† N U†<sup>1</sup> Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†<sup>2</sup> Z†<sup>1</sup> Always CE | MA: Removal NA | Combined (un)hooking/(un)loading | BAZ/PIAT Removal by crew/passenger only, or Scrounge.
Carrier, MMG A sD5 CS 3 sD5 CS 3 44† N U†<sup>1</sup> Always CE | Combined (un)hooking/(un)loading
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†<sup>1</sup> Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†<sup>1</sup> As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†<sup>1</sup> EE†<sup>2</sup> MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†<sup>1</sup> As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP &#215;4
Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 50† N U Always CE | sD: 2 hexes | Combined (un)hooking/(un)loading
Morris C9/B CS 4 CS 4 51† N AA†<sup>1</sup> No Bnd (F)F, Motion Fire | MA &amp; CMG: AA ok

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

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 sD5†[2] CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, MMG B sD5[4+]†[2] CS 4 sD5†[2] CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
@ -143,11 +143,11 @@ Daimler sD4 CS 2
Carrier A sD5 CS 3 sD5 CS 3 43† N U†<sup>1</sup> Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†<sup>2</sup> Z†<sup>1</sup> Always CE | MA: Removal NA | PIAT | Combined (un)hooking/(un)loading | BAZ/PIAT Removal by crew/passenger only, or Scrounge.
Carrier, MMG A sD5 CS 3 sD5 CS 3 44† N U†<sup>1</sup> Always CE | Combined (un)hooking/(un)loading
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†<sup>1</sup> Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†<sup>1</sup> As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†<sup>1</sup> EE†<sup>2</sup> MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†<sup>1</sup> As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP &#215;4
Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 50† N U Always CE | sD: 2 hexes | Combined (un)hooking/(un)loading
Morris C9/B CS 4 CS 4 51† N AA†<sup>1</sup> No Bnd (F)F, Motion Fire | MA &amp; CMG: AA ok

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

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 sD5†[2] CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, MMG B sD5[4+]†[2] CS 4 sD5†[2] CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
@ -143,11 +143,11 @@ Daimler sD4 CS 2
Carrier A sD5 CS 3 sD5 CS 3 43† N U†<sup>1</sup> Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†<sup>2</sup> Z†<sup>1</sup> Always CE | MA: Removal NA | PIAT | Combined (un)hooking/(un)loading | BAZ/PIAT Removal by crew/passenger only, or Scrounge.
Carrier, MMG A sD5 CS 3 sD5 CS 3 44† N U†<sup>1</sup> Always CE | Combined (un)hooking/(un)loading
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†<sup>1</sup> NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†<sup>1</sup> Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†<sup>1</sup> As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†<sup>1</sup> EE†<sup>2</sup> MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR | Inherent Infantry Crew
Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†<sup>2</sup> MM†<sup>1</sup> NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm <span style="text-decoration:overline;">81* MTR</span> | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†<sup>1</sup> As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP &#215;4
Wasp sD5† CS 3[brewup] sD5† CS 3[brewup] 50† N U Always CE | sD: 2 hexes | Combined (un)hooking/(un)loading
Morris C9/B CS 4 CS 4 51† N AA†<sup>1</sup> No Bnd (F)F, Motion Fire | MA &amp; CMG: AA ok

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1940.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1941.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1942.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1943.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1944.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 sD5†[2] CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, MMG B sD5[4+]†[2] CS 4 sD5†[2] CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1945.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 sD5†[2] CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, MMG B sD5[4+]†[2] CS 4 sD5†[2] CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1940.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1941.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1942.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1943.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, MMG B sD5[4+]†[2] CS 4 CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing NA
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing NA | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1944.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 sD5†[2] CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, MMG B sD5[4+]†[2] CS 4 sD5†[2] CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

2
vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1945.txt vendored
Unescape View File

@ -102,7 +102,7 @@ Carrier C sD5[4+]†[1] CS 3
Carrier, MMG A sD5[4+]†[2] CS 3 sD5†[2] CS 3 65† N P Q†<sup>1</sup> U†<sup>2</sup> Always CE | BATR SA: HD VCA Fire OK | ATR: [12] TH | ATR: Removal/Scrounge OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, MMG B sD5[4+]†[2] CS 4 sD5†[2] CS 4 65† U†<sup>2</sup> BB†<sup>1</sup> Always CE | Normal Range = 14 | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 2-in. MTR IR[2+]† s7 CS 3 IR† s7 CS 3 66† N P U†<sup>1</sup> Always CE | MA: Removal OK | Combined (un)hooking/(un)loading | Towing OK
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Carrier, 3-in. MTR CS 4[brewup]†[1] CS 4[brewup]†[1] 67† H†<sup>1</sup> N P U BB†<sup>2</sup> Always CE | Inherent dm <span style="text-decoration:overline;">76* MTR</span> | Inherent Infantry Crew | Combined (un)hooking/(un)loading | Towing OK | Pas: 1 SMC or 1PP SW
Priest Kangaroo(a) CS 7 CS 7 68† A D American ESB+ | MA: 12.7(a) | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†<sup>1</sup> American ESB+ | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†<sup>1</sup> N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)

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

@ -540,14 +540,14 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
return elems
# check the vehicle's snippet
check_snippet( '"XYZ" "cs 4 <small><i>(brew up)</i></small>"' )
check_snippet( '"XYZ" "<span class=\'brewup\'>cs 4</span>"' )
# edit the vehicle's capabilities
vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
elems = find_children( "li", vehicles_sortable )
assert len(elems) == 1
ActionChains( webdriver ).double_click( elems[0] ).perform()
elems = check_capabilities_in_dialog( [ "XYZ", "cs 4 <small><i>(brew up)</i></small>" ] )
elems = check_capabilities_in_dialog( [ "XYZ", "<span class='brewup'>cs 4</span>" ] )
# edit one of the capabilities
elem = find_child( "input[type='text']", elems[0] )
@ -607,7 +607,7 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
btn = find_child( "#vo_capabilities-reset" )
btn.click()
click_dialog_button( "OK" )
check_snippet( '"XYZ" "cs 4 <small><i>(brew up)</i></small>"' )
check_snippet( '"XYZ" "<span class=\'brewup\'>cs 4</span>"' )
# make sure the custom capabilities are no longer saved in the scenario
saved_scenario2 = save_scenario()
@ -625,7 +625,7 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
elems[0].clear()
elems[0].send_keys( "XYZ" )
elems[1].clear()
elems[1].send_keys( "cs 4 <small><i>(brew up)</i></small>" )
elems[1].send_keys( "<span class='brewup'>cs 4</span>" )
click_dialog_button( "OK" )
# make sure the custom capabilities are no longer saved in the scenario
@ -1078,7 +1078,7 @@ def _get_capabilities( webdriver, webapp,
# check the capabilities
assert "Capabilities" in results[0][1]
capabilities = results[row_no][2]
capabilities = capabilities.replace( "<small><i>(brew up)</i></small>", "[brewup]" )
capabilities = re.sub( '<span class="brewup">(.*?)</span>', r'\1 [brewup]', capabilities )
capabilities = re.sub( "\u2020<sup>(\\d)</sup>", lambda mo: "[!{}]".format(mo.group(1)), capabilities )
capabilities = capabilities.replace( "\u2020", "[!]" )
return capabilities

2
vasl_templates/webapp/tests/test_vehicles_ordnance.py
Unescape View File

@ -161,7 +161,7 @@ def test_snippets( webapp, webdriver ):
btn.click()
caps = '"XYZ"'
if vo_type == "vehicles":
caps += ' "cs 4 <small><i>(brew up)</i></small>"'
caps += ' "<span class=\'brewup\'>cs 4</span>"'
expected = [
'[German] ; width=',
'[*] another german {}: #=2'.format( vo_type0 ),

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

@ -50,7 +50,11 @@ def test_vo_reports( webapp, webdriver ): #pylint: disable=too-many-locals
lambda mo: "[{}]".format( mo.group(1) ),
results[i][col]
)
results[i][col] = results[i][col].replace( " <small><i>(brew up)</i></small>", "[brewup]" )
results[i][col] = re.sub(
r'<span class="brewup">(.*?)(\u2020.*)?</span>',
r"\1[brewup]\2",
results[i][col]
)
# check each vehicle/ordnance report
nationalities = list( get_nationalities( webapp ).keys() )
@ -187,7 +191,7 @@ def _parse_report( buf ):
val = mo.group(2)
if val == "<small><em>n/a</em></small>":
return "n/a"
val = val.replace( '<span class="val">', "" ).replace( "</span>", "" )
val = re.sub( '<span class="val">(.*?)</span>', r"\1", val )
val = val.replace( "&#8224;", "\u2020" ).replace( "&#174;", "\u00ae" )
val = val.replace( "&#10003;", "yes" )
return val

Write Preview
Loading…
Cancel
Save