diff --git a/vasl_templates/webapp/data/default-template-pack/ob_vo.j2 b/vasl_templates/webapp/data/default-template-pack/ob_vo.j2
index d401e60..7dd1101 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_vo.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_vo.j2
@@ -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 ; }
diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js
index 05dd695..11d0976 100644
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@@ -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) + " (brew up)" + crew_survival.substring(pos+7) ;
+ if ( pos !== -1 ) {
+ crew_survival = "" +
+ crew_survival.substring(0,pos) + crew_survival.substring(pos+7) +
+ "" ;
+ }
return crew_survival ;
}
diff --git a/vasl_templates/webapp/templates/vo-report.html b/vasl_templates/webapp/templates/vo-report.html
index 74ea00c..2a8ffcb 100644
--- a/vasl_templates/webapp/templates/vo-report.html
+++ b/vasl_templates/webapp/templates/vo-report.html
@@ -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 ; }
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
index a659ce1..0375c0a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 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†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†2 Z†1 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†1 Always CE | Combined (un)hooking/(un)loading
-Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
+Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†1 Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†1 As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†1 EE†2 MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
-Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
+Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†1 As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP ×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†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
index ee747a9..5ae06c6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 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†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†2 Z†1 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†1 Always CE | Combined (un)hooking/(un)loading
-Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
+Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†1 Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†1 As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†1 EE†2 MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
-Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
+Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†1 As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP ×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†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
index 679b4fa..1728095 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 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†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†2 Z†1 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†1 Always CE | Combined (un)hooking/(un)loading
-Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
+Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†1 Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†1 As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†1 EE†2 MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
-Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
+Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†1 As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP ×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†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
index 41f0612..0ad4a3e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 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†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†2 Z†1 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†1 Always CE | Combined (un)hooking/(un)loading
-Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
+Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†1 Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†1 As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†1 EE†2 MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
-Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
+Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†1 As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP ×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†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
index fb6435e..e75fb40 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 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†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†2 Z†1 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†1 Always CE | Combined (un)hooking/(un)loading
-Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
+Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†1 Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†1 As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†1 EE†2 MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
-Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
+Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†1 As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP ×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†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
index 061a42e..b282eab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 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†1 Always CE | BMG: AA ok | Combined (un)hooking/(un)loading
Carrier C sD5 CS 3 sD5 CS 3 43† N U†2 Z†1 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†1 Always CE | Combined (un)hooking/(un)loading
-Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
+Carrier, 3-in. Mtr CS 4[brewup] CS 4[brewup] 45† U MM†1 NN Always CE | Pas: 1 SMC and/or 1PP SW | Combined (un)hooking/(un)loading | Inherent dm 81* MTR | Inherent Infantry Crew
Oxford Carrier CS 5† CS 5† 46† EE†1 Inherent Crew | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, MMG CS 5 CS 5 47† EE†1 As fully-tracked OT AFV | Always CE | Unpossessed SW ok
Oxford Carrier, HMG CS 5 CS 5 47† G†1 EE†2 MA: 12.7 | As fully-tracked OT AFV | Always CE | Unpossessed SW ok
-Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
+Oxford Carrier, 3-in Mtr CS 5 CS 5 48† EE†2 MM†1 NN As fully-tracked OT AFV | Always CE | Unpossessed SW ok | Inherent dm 81* MTR | Inherent Infantry Crew
IP Carrier AOV CS 4 CS 4 49† N W†1 As wheeled OT AFV [EXC: D6.82-.83] | Unpossessed SW ok | Reverse MP ×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†1 No Bnd (F)F, Motion Fire | MA & CMG: AA ok
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1940.txt
index b89348e..da90037 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1940.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1941.txt
index e9df150..76a15d4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1941.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1942.txt
index 9042bd1..bb7686f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1942.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1943.txt
index fe398ca..c6cf6f5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1943.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1944.txt
index 217314e..675acbe 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1944.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1945.txt
index 4b11e1c..defb70b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~canadian/1945.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1940.txt
index 4286fa5..56e35e0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1940.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1941.txt
index 5bda060..414d20b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1941.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1942.txt
index 92d9223..247afc2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1942.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1943.txt
index 858ec5a..9e29543 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1943.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1944.txt
index ea52827..91ec62e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1944.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1945.txt
index 013a3c3..100dcf8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british~newzealand/1945.txt
@@ -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†1 U†2 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†2 BB†1 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†1 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†1 N P U BB†2 Always CE | Inherent dm 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†1 N P U BB†2 Always CE | Inherent dm 76* MTR | 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 ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
Ram Kangaroo(a) CS 7 CS 7 68† A D K†1 American ESB+ | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal NA
White(a) SC cs 4†[1] cs 4†[1] 69† A I†1 N American ESB+ | Unpossessed SW ok | Pas: No Mounted Fire penalty | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/test_capabilities.py b/vasl_templates/webapp/tests/test_capabilities.py
index ad1632a..37c9977 100644
--- a/vasl_templates/webapp/tests/test_capabilities.py
+++ b/vasl_templates/webapp/tests/test_capabilities.py
@@ -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 (brew up)"' )
+ check_snippet( '"XYZ" "cs 4"' )
# 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 (brew up)" ] )
+ elems = check_capabilities_in_dialog( [ "XYZ", "cs 4" ] )
# 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 (brew up)"' )
+ check_snippet( '"XYZ" "cs 4"' )
# 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 (brew up)" )
+ elems[1].send_keys( "cs 4" )
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( "(brew up)", "[brewup]" )
+ capabilities = re.sub( '(.*?)', r'\1 [brewup]', capabilities )
capabilities = re.sub( "\u2020(\\d)", lambda mo: "[!{}]".format(mo.group(1)), capabilities )
capabilities = capabilities.replace( "\u2020", "[!]" )
return capabilities
diff --git a/vasl_templates/webapp/tests/test_vehicles_ordnance.py b/vasl_templates/webapp/tests/test_vehicles_ordnance.py
index d7a1fff..25bfba3 100644
--- a/vasl_templates/webapp/tests/test_vehicles_ordnance.py
+++ b/vasl_templates/webapp/tests/test_vehicles_ordnance.py
@@ -161,7 +161,7 @@ def test_snippets( webapp, webdriver ):
btn.click()
caps = '"XYZ"'
if vo_type == "vehicles":
- caps += ' "cs 4 (brew up)"'
+ caps += ' "cs 4"'
expected = [
'[German] ; width=',
'[*] another german {}: #=2'.format( vo_type0 ),
diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py
index f481732..93ad3d9 100644
--- a/vasl_templates/webapp/tests/test_vo_reports.py
+++ b/vasl_templates/webapp/tests/test_vo_reports.py
@@ -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( " (brew up)", "[brewup]" )
+ results[i][col] = re.sub(
+ r'(.*?)(\u2020.*)?',
+ 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 == "n/a":
return "n/a"
- val = val.replace( '', "" ).replace( "", "" )
+ val = re.sub( '(.*?)', r"\1", val )
val = val.replace( "†", "\u2020" ).replace( "®", "\u00ae" )
val = val.replace( "✓", "yes" )
return val