diff --git a/chapter-h/chapter-h-placeholders.zip b/chapter-h/chapter-h-placeholders.zip index 9fc92b9..e802ce7 100644 Binary files a/chapter-h/chapter-h-placeholders.zip and b/chapter-h/chapter-h-placeholders.zip differ diff --git a/vasl_templates/tools/make_chapter_h_placeholders.py b/vasl_templates/tools/make_chapter_h_placeholders.py index 01d678b..bc955f8 100755 --- a/vasl_templates/tools/make_chapter_h_placeholders.py +++ b/vasl_templates/tools/make_chapter_h_placeholders.py @@ -100,7 +100,7 @@ def make_chapter_h_placeholders( output_fname, log=None \ if isinstance(val, str): # NOTE: Filenames are always lower-case, unless the note ID itself is lower-case, # in which case we indicate this with a trailing underscore - if re.search( r"^([a-z]+:)?[A-Z][A-Za-z]?$", val ): + if re.search( r"^([-a-z]+:)?[A-Z][A-Za-z]?$", val ): val = val.lower() elif re.search( r"^[a-z]{1,2}?$", val ): val += "_" @@ -208,7 +208,7 @@ def _extract_ma_note_ids( val ): return ma_note_ids def _ignore_ma_notes( nat, extn_id=None ): - if extn_id == "adf" and nat == "american": + if extn_id == "adf-bj" and nat == "american": return True if extn_id is None and nationalities.get( nat, {} ).get( "type" ) in ("allied-minor","axis-minor"): return True diff --git a/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt b/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt index db73a66..57f4b76 100644 --- a/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt +++ b/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt @@ -63,7 +63,7 @@ american/ordnance/7.png american/ordnance/8.png american/ordnance/9.png american/ordnance/a.html -american/ordnance/adf/1.png +american/ordnance/adf-bj/1.png american/ordnance/b.html american/ordnance/c.html american/ordnance/d.html @@ -131,34 +131,34 @@ american/vehicles/8.png american/vehicles/9.png american/vehicles/a.html american/vehicles/aa.html -american/vehicles/adf/1.png -american/vehicles/adf/10.png -american/vehicles/adf/11.png -american/vehicles/adf/2.png -american/vehicles/adf/3.png -american/vehicles/adf/4.png -american/vehicles/adf/5.png -american/vehicles/adf/6.png -american/vehicles/adf/7.png -american/vehicles/adf/8.png -american/vehicles/adf/9.png +american/vehicles/adf-bj/1.png +american/vehicles/adf-bj/10.png +american/vehicles/adf-bj/11.png +american/vehicles/adf-bj/2.png +american/vehicles/adf-bj/3.png +american/vehicles/adf-bj/4.png +american/vehicles/adf-bj/5.png +american/vehicles/adf-bj/6.png +american/vehicles/adf-bj/7.png +american/vehicles/adf-bj/8.png +american/vehicles/adf-bj/9.png +american/vehicles/adf-cobra/12.png +american/vehicles/adf-cobra/13.png +american/vehicles/adf-cobra/15.png +american/vehicles/adf-cobra/16.png +american/vehicles/adf-cobra/17.png +american/vehicles/adf-cobra/23.png +american/vehicles/adf-cobra/43.png +american/vehicles/adf-cobra/5.png +american/vehicles/adf-cobra/8.png +american/vehicles/adf-cobra/9.png +american/vehicles/adf-cobra/a.html +american/vehicles/adf-cobra/b.html +american/vehicles/adf-cobra/c.html american/vehicles/b.html american/vehicles/bb.html american/vehicles/c.html american/vehicles/cc.html -american/vehicles/cobra/12.png -american/vehicles/cobra/13.png -american/vehicles/cobra/15.png -american/vehicles/cobra/16.png -american/vehicles/cobra/17.png -american/vehicles/cobra/23.png -american/vehicles/cobra/43.png -american/vehicles/cobra/5.png -american/vehicles/cobra/8.png -american/vehicles/cobra/9.png -american/vehicles/cobra/a.html -american/vehicles/cobra/b.html -american/vehicles/cobra/c.html american/vehicles/d.html american/vehicles/e.html american/vehicles/f.html @@ -181,10 +181,10 @@ american/vehicles/w.html american/vehicles/x.html american/vehicles/y.html american/vehicles/z.html -anzac/vehicles/adf/1.png -anzac/vehicles/adf/2.png -anzac/vehicles/adf/3.png -anzac/vehicles/adf/4.png +anzac/vehicles/adf-bj/1.png +anzac/vehicles/adf-bj/2.png +anzac/vehicles/adf-bj/3.png +anzac/vehicles/adf-bj/4.png axis-minor/ordnance/44.png axis-minor/ordnance/45.png axis-minor/ordnance/46.png @@ -473,19 +473,19 @@ chinese/vehicles/7.png chinese/vehicles/8.png chinese/vehicles/9.png chinese/vehicles/a.html -chinese/vehicles/adf/1.png -chinese/vehicles/adf/2.png -chinese/vehicles/adf/3.png -chinese/vehicles/adf/4.png -chinese/vehicles/adf/5.png -chinese/vehicles/adf/6.png -chinese/vehicles/adf/7.png -chinese/vehicles/adf/8.png -chinese/vehicles/adf/9.png -chinese/vehicles/adf/a.html -chinese/vehicles/adf/b.html -chinese/vehicles/adf/c.html -chinese/vehicles/adf/d.html +chinese/vehicles/adf-bj/1.png +chinese/vehicles/adf-bj/2.png +chinese/vehicles/adf-bj/3.png +chinese/vehicles/adf-bj/4.png +chinese/vehicles/adf-bj/5.png +chinese/vehicles/adf-bj/6.png +chinese/vehicles/adf-bj/7.png +chinese/vehicles/adf-bj/8.png +chinese/vehicles/adf-bj/9.png +chinese/vehicles/adf-bj/a.html +chinese/vehicles/adf-bj/b.html +chinese/vehicles/adf-bj/c.html +chinese/vehicles/adf-bj/d.html chinese/vehicles/b.html chinese/vehicles/c.html chinese/vehicles/d.html @@ -502,24 +502,24 @@ croatian/vehicles/27.png danish/ordnance/19.png danish/vehicles/24.png dutch/ordnance/15.png -dutch/ordnance/adf/1.png -dutch/ordnance/adf/2.png -dutch/ordnance/adf/3.png -dutch/ordnance/adf/4.png -dutch/ordnance/adf/6.png +dutch/ordnance/adf-bj/1.png +dutch/ordnance/adf-bj/2.png +dutch/ordnance/adf-bj/3.png +dutch/ordnance/adf-bj/4.png +dutch/ordnance/adf-bj/6.png dutch/vehicles/25.png dutch/vehicles/26.png dutch/vehicles/27.png dutch/vehicles/28.png dutch/vehicles/29.png dutch/vehicles/30.png -dutch/vehicles/adf/1.png -dutch/vehicles/adf/2.png -dutch/vehicles/adf/3.png -dutch/vehicles/adf/4.png -dutch/vehicles/adf/5.png -dutch/vehicles/adf/6.png -dutch/vehicles/adf/a.html +dutch/vehicles/adf-bj/1.png +dutch/vehicles/adf-bj/2.png +dutch/vehicles/adf-bj/3.png +dutch/vehicles/adf-bj/4.png +dutch/vehicles/adf-bj/5.png +dutch/vehicles/adf-bj/6.png +dutch/vehicles/adf-bj/a.html finnish/ordnance/1.png finnish/ordnance/10.png finnish/ordnance/11.png @@ -712,15 +712,15 @@ german/ordnance/7.png german/ordnance/8.png german/ordnance/9.png german/ordnance/a.html +german/ordnance/adf-pif/1.png +german/ordnance/adf-pif/2.png +german/ordnance/adf-pif/3.png +german/ordnance/adf-pif/4.png german/ordnance/b.html german/ordnance/c.html german/ordnance/n.html german/ordnance/o.html german/ordnance/p.html -german/ordnance/pif/1.png -german/ordnance/pif/2.png -german/ordnance/pif/3.png -german/ordnance/pif/4.png german/vehicles/1.png german/vehicles/10.png german/vehicles/11.png @@ -822,6 +822,15 @@ german/vehicles/98.png german/vehicles/99.png german/vehicles/a.html german/vehicles/a_.html +german/vehicles/adf-pif/1.png +german/vehicles/adf-pif/2.png +german/vehicles/adf-pif/3.png +german/vehicles/adf-pif/4.png +german/vehicles/adf-pif/5.png +german/vehicles/adf-pif/6.png +german/vehicles/adf-pif/7.png +german/vehicles/adf-pif/a.html +german/vehicles/adf-pif/b.html german/vehicles/b.html german/vehicles/b_.html german/vehicles/c.html @@ -842,15 +851,6 @@ german/vehicles/m.html german/vehicles/n.html german/vehicles/o.html german/vehicles/p.html -german/vehicles/pif/1.png -german/vehicles/pif/2.png -german/vehicles/pif/3.png -german/vehicles/pif/4.png -german/vehicles/pif/5.png -german/vehicles/pif/6.png -german/vehicles/pif/7.png -german/vehicles/pif/a.html -german/vehicles/pif/b.html german/vehicles/q.html german/vehicles/r.html german/vehicles/s.html @@ -872,29 +872,29 @@ hungarian/vehicles/16.png hungarian/vehicles/7.png hungarian/vehicles/8.png hungarian/vehicles/9.png -indonesian/ordnance/adf/1.png -indonesian/ordnance/adf/2.png -indonesian/ordnance/adf/3.png -indonesian/ordnance/adf/4.png -indonesian/ordnance/adf/5.png -indonesian/ordnance/adf/6.png -indonesian/vehicles/adf/1.png -indonesian/vehicles/adf/10.png -indonesian/vehicles/adf/11.png -indonesian/vehicles/adf/12.png -indonesian/vehicles/adf/13.png -indonesian/vehicles/adf/2.png -indonesian/vehicles/adf/3.png -indonesian/vehicles/adf/4.png -indonesian/vehicles/adf/5.png -indonesian/vehicles/adf/6.png -indonesian/vehicles/adf/7.png -indonesian/vehicles/adf/8.png -indonesian/vehicles/adf/9.png -indonesian/vehicles/adf/b.html -indonesian/vehicles/adf/c.html -indonesian/vehicles/adf/d.html -indonesian/vehicles/adf/e.html +indonesian/ordnance/adf-bj/1.png +indonesian/ordnance/adf-bj/2.png +indonesian/ordnance/adf-bj/3.png +indonesian/ordnance/adf-bj/4.png +indonesian/ordnance/adf-bj/5.png +indonesian/ordnance/adf-bj/6.png +indonesian/vehicles/adf-bj/1.png +indonesian/vehicles/adf-bj/10.png +indonesian/vehicles/adf-bj/11.png +indonesian/vehicles/adf-bj/12.png +indonesian/vehicles/adf-bj/13.png +indonesian/vehicles/adf-bj/2.png +indonesian/vehicles/adf-bj/3.png +indonesian/vehicles/adf-bj/4.png +indonesian/vehicles/adf-bj/5.png +indonesian/vehicles/adf-bj/6.png +indonesian/vehicles/adf-bj/7.png +indonesian/vehicles/adf-bj/8.png +indonesian/vehicles/adf-bj/9.png +indonesian/vehicles/adf-bj/b.html +indonesian/vehicles/adf-bj/c.html +indonesian/vehicles/adf-bj/d.html +indonesian/vehicles/adf-bj/e.html italian/ordnance/1.png italian/ordnance/10.png italian/ordnance/11.png @@ -991,10 +991,10 @@ japanese/ordnance/7.png japanese/ordnance/8.png japanese/ordnance/9.png japanese/ordnance/a.html -japanese/ordnance/adf/1.png -japanese/ordnance/adf/2.png -japanese/ordnance/adf/3.png -japanese/ordnance/adf/4.png +japanese/ordnance/adf-bj/1.png +japanese/ordnance/adf-bj/2.png +japanese/ordnance/adf-bj/3.png +japanese/ordnance/adf-bj/4.png japanese/ordnance/b.html japanese/ordnance/c.html japanese/ordnance/d.html @@ -1019,34 +1019,34 @@ japanese/vehicles/7.png japanese/vehicles/8.png japanese/vehicles/9.png japanese/vehicles/a.html -japanese/vehicles/adf/1.png -japanese/vehicles/adf/10.png -japanese/vehicles/adf/11.png -japanese/vehicles/adf/12.png -japanese/vehicles/adf/13.png -japanese/vehicles/adf/14.png -japanese/vehicles/adf/15.png -japanese/vehicles/adf/16.png -japanese/vehicles/adf/17.png -japanese/vehicles/adf/18.png -japanese/vehicles/adf/19.png -japanese/vehicles/adf/2.png -japanese/vehicles/adf/20.png -japanese/vehicles/adf/21.png -japanese/vehicles/adf/22.png -japanese/vehicles/adf/23.png -japanese/vehicles/adf/24.png -japanese/vehicles/adf/25.png -japanese/vehicles/adf/3.png -japanese/vehicles/adf/4.png -japanese/vehicles/adf/5.png -japanese/vehicles/adf/6.png -japanese/vehicles/adf/7.png -japanese/vehicles/adf/8.png -japanese/vehicles/adf/9.png -japanese/vehicles/adf/a.html -japanese/vehicles/adf/b.html -japanese/vehicles/adf/c.html +japanese/vehicles/adf-bj/1.png +japanese/vehicles/adf-bj/10.png +japanese/vehicles/adf-bj/11.png +japanese/vehicles/adf-bj/12.png +japanese/vehicles/adf-bj/13.png +japanese/vehicles/adf-bj/14.png +japanese/vehicles/adf-bj/15.png +japanese/vehicles/adf-bj/16.png +japanese/vehicles/adf-bj/17.png +japanese/vehicles/adf-bj/18.png +japanese/vehicles/adf-bj/19.png +japanese/vehicles/adf-bj/2.png +japanese/vehicles/adf-bj/20.png +japanese/vehicles/adf-bj/21.png +japanese/vehicles/adf-bj/22.png +japanese/vehicles/adf-bj/23.png +japanese/vehicles/adf-bj/24.png +japanese/vehicles/adf-bj/25.png +japanese/vehicles/adf-bj/3.png +japanese/vehicles/adf-bj/4.png +japanese/vehicles/adf-bj/5.png +japanese/vehicles/adf-bj/6.png +japanese/vehicles/adf-bj/7.png +japanese/vehicles/adf-bj/8.png +japanese/vehicles/adf-bj/9.png +japanese/vehicles/adf-bj/a.html +japanese/vehicles/adf-bj/b.html +japanese/vehicles/adf-bj/c.html japanese/vehicles/b.html japanese/vehicles/c.html landing-craft/1.png @@ -1069,18 +1069,18 @@ polish/ordnance/2.png polish/ordnance/3.png polish/ordnance/4.png polish/ordnance/5.png -polish/ordnance/pif/1.png -polish/ordnance/pif/10.png -polish/ordnance/pif/2.png -polish/ordnance/pif/3.png -polish/ordnance/pif/4.png -polish/ordnance/pif/5.png -polish/ordnance/pif/6.png -polish/ordnance/pif/7.png -polish/ordnance/pif/8.png -polish/ordnance/pif/9.png -polish/ordnance/pif/a.html -polish/ordnance/pif/b.html +polish/ordnance/adf-pif/1.png +polish/ordnance/adf-pif/10.png +polish/ordnance/adf-pif/2.png +polish/ordnance/adf-pif/3.png +polish/ordnance/adf-pif/4.png +polish/ordnance/adf-pif/5.png +polish/ordnance/adf-pif/6.png +polish/ordnance/adf-pif/7.png +polish/ordnance/adf-pif/8.png +polish/ordnance/adf-pif/9.png +polish/ordnance/adf-pif/a.html +polish/ordnance/adf-pif/b.html polish/vehicles/1.png polish/vehicles/10.png polish/vehicles/11.png @@ -1094,22 +1094,22 @@ polish/vehicles/6.png polish/vehicles/7.png polish/vehicles/8.png polish/vehicles/9.png -polish/vehicles/pif/1.png -polish/vehicles/pif/10.png -polish/vehicles/pif/11.png -polish/vehicles/pif/12.png -polish/vehicles/pif/2.png -polish/vehicles/pif/3.png -polish/vehicles/pif/4.png -polish/vehicles/pif/5.png -polish/vehicles/pif/6.png -polish/vehicles/pif/7.png -polish/vehicles/pif/8.png -polish/vehicles/pif/9.png -polish/vehicles/pif/a.html -polish/vehicles/pif/b.html -polish/vehicles/pif/c.html -polish/vehicles/pif/d.html +polish/vehicles/adf-pif/1.png +polish/vehicles/adf-pif/10.png +polish/vehicles/adf-pif/11.png +polish/vehicles/adf-pif/12.png +polish/vehicles/adf-pif/2.png +polish/vehicles/adf-pif/3.png +polish/vehicles/adf-pif/4.png +polish/vehicles/adf-pif/5.png +polish/vehicles/adf-pif/6.png +polish/vehicles/adf-pif/7.png +polish/vehicles/adf-pif/8.png +polish/vehicles/adf-pif/9.png +polish/vehicles/adf-pif/a.html +polish/vehicles/adf-pif/b.html +polish/vehicles/adf-pif/c.html +polish/vehicles/adf-pif/d.html romanian/ordnance/1.png romanian/ordnance/10.png romanian/ordnance/11.png @@ -1166,11 +1166,11 @@ russian/ordnance/7.png russian/ordnance/8.png russian/ordnance/9.png russian/ordnance/a.html -russian/ordnance/pif/1.png -russian/ordnance/pif/2.png -russian/ordnance/pif/3.png -russian/ordnance/pif/a.html -russian/ordnance/pif/b.html +russian/ordnance/adf-pif/1.png +russian/ordnance/adf-pif/2.png +russian/ordnance/adf-pif/3.png +russian/ordnance/adf-pif/a.html +russian/ordnance/adf-pif/b.html russian/vehicles/1.png russian/vehicles/10.png russian/vehicles/11.png @@ -1228,6 +1228,26 @@ russian/vehicles/7.png russian/vehicles/8.png russian/vehicles/9.png russian/vehicles/a.html +russian/vehicles/adf-pif/1.png +russian/vehicles/adf-pif/10.png +russian/vehicles/adf-pif/11.png +russian/vehicles/adf-pif/12.png +russian/vehicles/adf-pif/13.png +russian/vehicles/adf-pif/14.png +russian/vehicles/adf-pif/15.png +russian/vehicles/adf-pif/16.png +russian/vehicles/adf-pif/17.png +russian/vehicles/adf-pif/18.png +russian/vehicles/adf-pif/2.png +russian/vehicles/adf-pif/3.png +russian/vehicles/adf-pif/4.png +russian/vehicles/adf-pif/5.png +russian/vehicles/adf-pif/6.png +russian/vehicles/adf-pif/7.png +russian/vehicles/adf-pif/8.png +russian/vehicles/adf-pif/9.png +russian/vehicles/adf-pif/b.html +russian/vehicles/adf-pif/c.html russian/vehicles/b.html russian/vehicles/c.html russian/vehicles/d.html @@ -1243,26 +1263,6 @@ russian/vehicles/m.html russian/vehicles/n.html russian/vehicles/o.html russian/vehicles/p.html -russian/vehicles/pif/1.png -russian/vehicles/pif/10.png -russian/vehicles/pif/11.png -russian/vehicles/pif/12.png -russian/vehicles/pif/13.png -russian/vehicles/pif/14.png -russian/vehicles/pif/15.png -russian/vehicles/pif/16.png -russian/vehicles/pif/17.png -russian/vehicles/pif/18.png -russian/vehicles/pif/2.png -russian/vehicles/pif/3.png -russian/vehicles/pif/4.png -russian/vehicles/pif/5.png -russian/vehicles/pif/6.png -russian/vehicles/pif/7.png -russian/vehicles/pif/8.png -russian/vehicles/pif/9.png -russian/vehicles/pif/b.html -russian/vehicles/pif/c.html russian/vehicles/q.html russian/vehicles/r.html russian/vehicles/s.html @@ -1281,18 +1281,18 @@ slovakian/vehicles/20.png slovakian/vehicles/21.png slovakian/vehicles/22.png slovakian/vehicles/23.png -thai/ordnance/adf/4.png -thai/ordnance/adf/5.png -thai/ordnance/adf/8.png -thai/ordnance/adf/9.png -thai/vehicles/adf/1.png -thai/vehicles/adf/2.png -thai/vehicles/adf/3.png -thai/vehicles/adf/4.png -thai/vehicles/adf/5.png -thai/vehicles/adf/6.png -thai/vehicles/adf/a.html -thai/vehicles/adf/e.html +thai/ordnance/adf-bj/4.png +thai/ordnance/adf-bj/5.png +thai/ordnance/adf-bj/8.png +thai/ordnance/adf-bj/9.png +thai/vehicles/adf-bj/1.png +thai/vehicles/adf-bj/2.png +thai/vehicles/adf-bj/3.png +thai/vehicles/adf-bj/4.png +thai/vehicles/adf-bj/5.png +thai/vehicles/adf-bj/6.png +thai/vehicles/adf-bj/a.html +thai/vehicles/adf-bj/e.html yugoslavian/ordnance/20.png yugoslavian/ordnance/21.png yugoslavian/ordnance/22.png diff --git a/vasl_templates/webapp/data/extensions/bfp-bj-v403.json b/vasl_templates/webapp/data/extensions/bfp-bj-v403.json new file mode 100644 index 0000000..e85fad0 --- /dev/null +++ b/vasl_templates/webapp/data/extensions/bfp-bj-v403.json @@ -0,0 +1,939 @@ +{ + +"parentExtensionId": "adf", +"extensionId": "adf-bj", +"version": "4.03", +"id_range": [ 900, 999 ], + +"japanese": { + +"vehicles": [ + +{ "name": "FT-17M Ko(f)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "1\u2020", + "notes": [ "A", "Fr C", "Ru M\u2020" ], + "comments": [ "1 MP minimum road movement rate, even if CE." ], + "id": "ja/v:900", + "gpid": "adf:278" +}, +{ "name": "FT-17C Ko(f)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "2\u2020", + "notes": [ "A", "B", "Fr C", "Ru M\u2020" ], + "comments": [ "1 MP minimum road movement rate, even if CE." ], + "id": "ja/v:901", + "gpid": "adf:280" +}, +{ "name": "NC-27M Otsu(f)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "3\u2020", + "notes": [ "A", "Fr C", "Ge H\u2020" ], + "comments": [ "1 MP minimum road movement rate, even if CE." ], + "id": "ja/v:902", + "gpid": "adf:282" +}, +{ "name": "NC-27C Otsu(f)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "4\u2020", + "notes": [ "A", "B", "Fr C", "Ge H\u2020" ], + "comments": [ "1 MP minimum road movement rate, even if CE." ], + "id": "ja/v:903", + "gpid": "adf:284" +}, +{ "name": "Type 88 LAV(b)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "5", + "notes": [ "A", "AllM D", "Ch H\u2020" ] , + "id": "ja/v:904", + "gpid": "adf:286" +}, +{ "name": "VCL(b)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "6\u2020", + "notes": [ "A", "C", "Ru M\u20201" ], + "id": "ja/v:905", + "gpid": "adf:288" +}, +{ "name": "Type 98 Ke-Ni", + "type": "LT", + "no_radio": "\u00ae", + "CS#": 3, + "note_number": "7\u2020", + "notes": [ "Jp C" ], + "id": "ja/v:906", + "gpid": "adf:316" +}, +{ "name": "Type 2 Ke-To", + "type": "LT", + "no_radio": "\u00ae", + "CS#": 3, + "note_number": "8\u2020", + "notes": [ "Jp C" ], + "id": "ja/v:907", + "gpid": "adf:318" +}, +{ "name": "M3(a)", + "type": "LT", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "9", + "notes": [ "A", "B", "C", "Jp A\u2020", "US B\u20201" ], + "id": "ja/v:908", + "gpid": "adf:320" +}, +{ "name": "Stuart I(a)", + "type": "LT", + "no_radio": "\u00ae", + "CS#": 4, + "capabilities2": { "sD": 4 }, + "note_number": "10", + "notes": [ "A", "B", "C", "Jp A\u2020" ], + "id": "ja/v:909", + "gpid": "adf:322" +}, +{ "name": "Type 97B Shi-Ki", + "type": "MT", + "CS#": 4, + "capabilities2": { "sD": 6 }, + "note_number": "11\u2020", + "comments": [ "Moved/Motion: Fire NA" ], + "id": "ja/v:910", + "gpid": "adf:324" +}, +{ "name": "Type 3 Ka-Chi", + "type": "MT", + "CS#": 5, + "capabilities2": { "sD": 5 }, + "note_number": "12", + "notes": [ "Jp 6\u2020" ], + "comments": [ "Refer to Japanese Note 6 on Pontoons for amphibious data and wreck." ], + "id": "ja/v:911", + "gpid": "adf:326" +}, +{ "name": "Type 3 Ka-Chi (without pontoons)", + "type": "MT", + "CS#": 5, + "capabilities2": { "sD": 5 }, + "note_number": "12", + "notes": [ "Jp 6\u2020" ], + "id": "ja/v:912", + "gpid": "adf:328" +}, +{ "name": "Armored Eng Veh SS", + "type": "MTv", + "no_radio": "\u00ae", + "CS#": 5, + "capabilities2": { "sD": 7 }, + "note_number": "13\u2020", + "comments": [ "Has 2 side FT with limited traverse.", "May remove wire as if a Dozer (B24.7)." ], + "id": "ja/v:913", + "gpid": "adf:331" +}, +{ "name": "Type 2587(b)", + "type": "AC", + "no_radio": "\u00ae", + "CS#": 5, + "capabilities": [ "2 TK DR's\u2020" ], + "note_number": "14\u2020", + "notes": [ "Ch F\u2020" ], + "comments": [ "REV x4" ], + "id": "ja/v:914", + "gpid": "adf:333" +}, +{ "name": "Marmon-Herrington III(b)", + "type": "AC", + "no_radio": "\u00ae", + "CS#": 4, + "capabilities": [ "2 TK DR's\u2020" ], + "note_number": "15\u2020", + "notes": [ "C", "Ch F\u2020" ], + "id": "ja/v:915", + "gpid": "adf:335" +}, +{ "name": "Type 1 Ho-Ha", + "type": "ht", + "CS#": 5, + "note_number": "16\u2020", + "comments": [ "2MA&2&2" ], + "id": "ja/v:916", + "gpid": "adf:337" +}, +{ "name": "M3A1 Scout Car(a)", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "17", + "notes": [ "A", "C", "AllM 34\u20202", "Jp A\u20201", "Ch F\u2020" ], + "comments": [ "Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS]." ], + "id": "ja/v:917", + "gpid": "adf:339" +}, +{ "name": "Carrier A(b)", + "type": "APC", + "no_radio": "\u00ae", + "CS#": 3, + "note_number": "18", + "notes": [ "A", "C", "Br Note 64\u2020" ], + "comments": [ "The Inherent Crew is a 2-3-7 HS (D6.82).", "Refer to British Vehicle Note 64 for switching the BMG to an AAMG." ], + "id": "ja/v:918", + "gpid": "adf:341" +}, +{ "name": "Type 2 Ho-I", + "type": "SPA", + "CS#": 5, + "capabilities2": { "WP": 5, "sD": 5 }, + "note_number": "19", + "id": "ja/v:919", + "gpid": "adf:343" +}, +{ "name": "Type 1 Ho-Ni II", + "type": "SPA", + "CS#": 5, + "capabilities2": { "H": 5 }, + "note_number": "20\u2020", + "id": "ja/v:920", + "gpid": "adf:345" +}, +{ "name": "M3 75 SPA(a)", + "type": "SPAht", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "21", + "notes": [ "B", "C", "US U", "Ru M\u2020" ], + "id": "ja/v:921", + "gpid": "adf:347" +}, +{ "name": "Type 97B Chi-Ha", + "type": "SPA", + "CS#": 4, + "capabilities2": { "H": 9 }, + "note_number": "22", + "id": "ja/v:922", + "gpid": "adf:349" +}, +{ "name": "Type 3 Ho-Ni III", + "type": "TD", + "CS#": 5, + "capabilities2": { "WP": 5 }, + "note_number": "23", + "id": "ja/v:923", + "gpid": "adf:351" +}, +{ "name": "Type 97 AA Truck", + "type": "AAtr", + "CS#": 7, + "note_number": "24\u2020", + "comments": [ "MA: AA" ], + "id": "ja/v:924", + "gpid": "adf:353" +}, +{ "name": "Type 98 MCT", + "type": "AAtr", + "CS#": 5, + "note_number": "25", + "notes": [ "Br H", "Ge A\u2020" ], + "comments": [ "Bnd FF NA VCA", "MA: AA", "(Un)load: Portee" ], + "id": "ja/v:925", + "gpid": "adf:355" +} + +], + +"ordnance": [ + +{ "name": "Type 45 (1912) 24cm Howitzer", + "type": "ART", + "capabilities": [ "NT", "NM", "No IF", "HE TK# 23", "Tow NA" ], + "note_number": "1\u2020", + "notes": [ "Jp D\u20201" ], + "id": "ja/o:900", + "gpid": "adf:274" +}, +{ "name": "Type 91 Vickers AA Gun", + "type": "AA", + "capabilities": [ "AP TK# 8" ], + "capabilities2": { "LF": [ "40(4)", "1 ROF", "B10"] }, + "note_number": "2\u2020", + "id": "ja/o:901", + "gpid": "adf:275" +}, +{ "name": "Type 91 Twin-mount Vickers AA Gun", + "type": "AA", + "capabilities": [ "AP TK# 8", "2 TK DR's\u2020" ], + "capabilities2": { "LF": [ "40(8)", "1 ROF", "B10" ] }, + "note_number": "3\u2020", + "id": "ja/o:902", + "gpid": "adf:276" +}, +{ "name": "Type 4 75mm AA", + "type": "AA", + "capabilities": [ "T" ], + "capabilities2": { "LF": [ "75", "1 ROF", "B11" ], "AP": [ [6,"44-"] ] }, + "note_number": "4\u2020", + "notes": [ "Ch G"], + "id": "ja/o:903", + "gpid": "adf:277" +} + +] + +}, + +"chinese": { + +"vehicles": [ + +{ "name": "FT-17(f)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "1\u2020", + "notes": [ "A", "Fr C", "Ru M\u2020" ], + "id": "ch/v:900", + "gpid": "adf:233" +}, +{ "name": "Type 94 Lt Armored Vehicle(j)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "2", + "notes": [ "A", "D", "Ru M\u2020" ], + "id": "ch/v:901", + "gpid": "adf:235" +}, +{ "name": "Type 97A Te-Ke(j)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "3", + "notes": [ "A", "D" ], + "id": "ch/v:902", + "gpid": "adf:237" +}, +{ "name": "Type 97B Te-Ke(j)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "4", + "notes": [ "A", "C", "D" ], + "id": "ch/v:903", + "gpid": "adf:239" +}, +{ "name": "Type 95 Ha-Go(j)", + "type": "LT", + "no_radio": "\u00ae", + "CS#": 3, + "note_number": "5", + "notes": [ "A", "B\u2020", "C", "D", "Jp 5\u20201" ], + "id": "ch/v:904", + "gpid": "adf:241" +}, +{ "name": "BT-5(r)", + "type": "LT", + "no_radio": "\u00ae", + "CS#": 3, + "note_number": "6", + "notes": [ "A", "B\u20201", "Ru M\u2020" ], + "id": "ch/v:905", + "gpid": "adf:243" +}, +{ "name": "Type 89A Chi-Ro(j)", + "type": "MT", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "7", + "notes": [ "A", "B\u2020", "C", "D" ], + "id": "ch/v:906", + "gpid": "adf:245" +}, +{ "name": "Type 97A Chi-Ha(j)", + "type": "MT", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "8", + "notes": [ "A", "B\u2020", "C", "D" ], + "id": "ch/v:907", + "gpid": "adf:247" +}, +{ "name": "Type 31 Armored Car", + "type": "AC", + "no_radio": "\u00ae", + "CS#": 3, + "note_number": "9\u2020", + "notes": [ "B\u20201", "Ch F\u2020" ], + "id": "ch/v:908", + "gpid": "adf:249" +} + +] + +}, + +"dutch": { + +"vehicles": [ + +{ "name": "Alvis-Straussler AC3D", + "type": "AC", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "1\u20202", + "notes": [ "AllM V\u2020", "Ch F\u20201" ], + "comments": [ "CMG uses AP TK 12.7 column." ], + "id": "du/v:900", + "gpid": "adf:10" +}, +{ "name": "Braat Overvalwagen APC", + "type": "AC", + "no_radio": "\u00ae", + "CS#": 5, + "note_number": "2\u20202", + "notes": [ "A\u20201", "Ch F\u2020" ], + "comments": [ "CMG: VCA only", "Mounted Fire: Full FP" ], + "id": "du/v:901", + "gpid": "adf:12" +}, +{ "name": "Braat Overvalwagen AA", + "type": "AC", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "3\u20201", + "notes": [ "AllM AA\u20202", "Ch F\u2020" ], + "comments": [ "AAMG uses AP TK 12.7 column." ], + "id": "du/v:902", + "gpid": "adf:14" +}, +{ "name": "Kanonwagen Armored Car", + "type": "AC", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "4\u2020\u20201", + "notes": [ "A\u20202", "AllM V\u2020", "Ch F\u20201" ], + "comments": [ "VCA MA: VCA ≤ level NA", "CMG may only fire within VCA.", "Rear turret is unarmored when TCA = VCA." ], + "id": "du/v:903", + "gpid": "adf:16" +}, +{ "name": "Stadswacht Overvalwagen APC", + "type": "AC", + "CS#": 6, + "note_number": "5\u20201", + "notes": [ "Ch F\u2020" ], + "comments": [ "Mounted Fire: Full FP", "Passengers may fire 2 LMG's without losing inherent FP." ], + "id": "du/v:904", + "gpid": "adf:18" +}, +{ "name": "PLA Wagen", + "type": "AAtr", + "CS#": 5, + "note_number": "6\u2020", + "notes": [ "AllM AA\u20201" ], + "comments": [ "AP TK: use 12.7 column." ], + "id": "du/v:905", + "gpid": "adf:20" +} + +], + +"ordnance": [ + +{ "name": "Brandt 47mm Mortar", + "type": "MTR", + "note_number": "1", + "id": "du/o:900", + "gpid": "adf:1948" +}, +{ "name": "Krupp 75mm M1933 Field Gun", + "type": "ART", + "capabilities": [ "NT", "QSU" ], + "capabilities2": { "C": "4\u2020" }, + "note_number": "2", + "notes": [ "US C\u2020" ], + "id": "du/o:901", + "gpid": "adf:5" +}, +{ "name": "Bofors 105mm M1924 Howitzer", + "type": "ART", + "capabilities": [ "T" ], + "capabilities2": { "LF": [ "NT", "B11" ] }, + "note_number": "3", + "id": "du/o:902", + "gpid": "adf:6" +}, +{ "name": "20mm Rheinmetall AA", + "type": "AA", + "capabilities": [ "T" ], + "capabilities2": { "LF": [ "20\u2020", "2 ROF", "B11", "NT" ] }, + "note_number": "4", + "notes": [ "Gr C\u2020" ], + "id": "du/o:903", + "gpid": "adf:7" +}, +{ "name": "Bofors 80mm M29/38", + "type": "AA", + "capabilities": [ "T" ], + "capabilities2": { "LF": [ "80\u2020", "1 ROF", "B11" ] }, + "capabilities_other": [ "AP TK# 17" ], + "note_number": "6", + "notes": [ "AxM G\u2020" ], + "id": "du/o:904", + "gpid": "adf:9" +} + +] + +}, + +"thai": { + +"vehicles": [ + +{ "name": "VCL Mk VI(b)", + "type": "Tt", + "no_radio": "\u00ae", + "CS#": 2, + "note_number": "1", + "notes": [ "A", "Ch H", "AllM D" ], + "id": "th/v:900", + "gpid": "adf:92" +}, +{ "name": "Vickers 6-Ton MkE-B(b)", + "type": "LT", + "no_radio": "\u00ae", + "CS#": 3, + "note_number": "2", + "notes": [ "A" ], + "id": "th/v:901", + "gpid": "adf:94" +}, +{ "name": "Type 83(j)", + "type": "LT", + "no_radio": "\u00ae", + "CS#": 3, + "note_number": "3", + "notes": [ "A", "E\u2020" ], + "comments": [ "Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions." ], + "id": "th/v:902", + "gpid": "adf:96" +}, +{ "name": "Vickers 6-Ton AA(b)", + "type": "SPAA", + "no_radio": "\u00ae", + "CS#": 3, + "capabilities": [ "AP TK# 8" ], + "note_number": "4", + "notes": [ "A", "AllM AA\u2020" ], + "id": "th/v:903", + "gpid": "adf:98" +}, +{ "name": "Citroen-Kegresse P17(f)", + "type": "ht", + "CS#": 3, + "note_number": "5\u2020", + "notes": [ "A" ], + "id": "th/v:904", + "gpid": "adf:100" +}, +{ "name": "Vickers Morris M1930(b)", + "type": "AC", + "no_radio": "\u00ae", + "CS#": 4, + "note_number": "6", + "notes": [ "Br X\u2020", "Ch F\u2020" ], + "comments": [ "REV x4" ], + "id": "th/v:905", + "gpid": "adf:102" +} + +], + +"ordnance": [ + +{ "name": "50mm Krupp M1906", + "type": "INF", + "capabilities": [ "NT", "QSU", "h-d" ], + "comments": [ "No Gunshield." ], + "note_number": "4", + "id": "th/o:900", + "gpid": "adf:81" +}, +{ "name": "75mm Krupp M1908", + "type": "INF", + "capabilities": [ "NT", "QSU", "h-d" ], + "capabilities2": { "AP": 8, "WP": 5 }, + "note_number": "5", + "id": "th/o:901", + "gpid": "adf:82" +}, +{ "name": "Vickers 12.7mm AA Class D", + "type": "AA", + "capabilities": [ "T", "QSU" ], + "note_number": "8", + "id": "th/o:902", + "gpid": "adf:85" +}, +{ "name": "Bofors M30 75mm AA", + "type": "AA", + "capabilities": [ "T" ], + "capabilities2": { "LF": [ "75", "1 ROF", "B11" ], "AP":6 }, + "note_number": "9", + "notes": [ "Ch G\u2020"], + "id": "th/o:902", + "gpid": "adf:86" +} + +] + +}, + +"indonesian": { + +"vehicles": [ + +{ "name": "Type 94 Light Armoured Vehicle (j)", + "type": "Tt", + "CS#": 2, + "note_number": "1", + "notes": [ "C", "Ru M\u2020" ], + "id": "ina/v:900", + "gpid": "adf:123" +}, +{ "name": "Type 97A Te-Ke Light Armored Vehicle (j)", + "type": "Tt", + "CS#": 2, + "note_number": "2", + "notes": [ "C" ], + "id": "ina/v:901", + "gpid": "adf:125" +}, +{ "name": "Type 97B Te-Ke Light Armored Vehicle (j)", + "type": "Tt", + "CS#": 2, + "note_number": "3", + "notes": [ "C" ], + "id": "ina/v:902", + "gpid": "adf:127" +}, +{ "name": "Universal Carrier (b)", + "type": "Tt", + "CS#": 3, + "note_number": "4", + "notes": [ "C" ], + "id": "ina/v:903", + "gpid": "adf:129" +}, +{ "name": "Type 95 Ha-Go(j)", + "type": "LT", + "CS#": 3, + "note_number": "5", + "notes": [ "B", "C", "D\u2020", "E\u20201" ], + "comments": [ "Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions." ], + "id": "ina/v:904", + "gpid": "adf:131" +}, +{ "name": "VCL M1936 (b)", + "type": "aTt", + "CS#": 2, + "note_number": "6", + "notes": [ "C" ], + "id": "ina/v:905", + "gpid": "adf:133" +}, +{ "name": "CTLS-4 (a)", + "type": "Tt", + "CS#": 2, + "note_number": "7", + "notes": [ "C", "Ru M\u2020", "AllM 26\u20201" ], + "comments": [ "Port VCA NA (see Allied Minor Vehicle Note 26)." ], + "id": "ina/v:906", + "gpid": "adf:135" +}, +{ "name": "Marmon-Herrington III Armored Car (b)", + "type": "AC", + "CS#": 4, + "capabilities": [ "2 TK DR's\u2020" ], + "note_number": "8", + "notes": [ "Ch F\u2020" ], + "id": "ina/v:907", + "gpid": "adf:137" +}, +{ "name": "M3A1 Scout Car (a)", + "type": "SC", + "CS#": 4, + "note_number": "8", + "capabilities_other": [ "9PP" ], + "note_number": "9\u2020", + "notes": [ "D\u20201", "AllM 34\u20202" ], + "comments": [ "AP TK: use 12.7 column.", "Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS]." ], + "id": "ina/v:908", + "gpid": "adf:139" +}, +{ "name": "Braat Overvalwagen AA", + "type": "AC", + "CS#": 4, + "note_number": "8", + "note_number": "10\u20201", + "notes": [ "Ch F\u2020", "AllM AA\u20201" ], + "comments": [ "AP TK: use 12.7 column." ], + "id": "ina/v:909", + "gpid": "adf:14" +}, +{ "name": "Braat Overvalwagen APC", + "type": "AC", + "CS#": 5, + "note_number": "8", + "capabilities_other": [ "12PP" ], + "note_number": "11\u20202", + "notes": [ "D\u20201", "Ch F\u2020" ], + "comments": [ "CMG: VCA only", "Mounted Fire: Full FP" ], + "id": "ina/v:910", + "gpid": "adf:12" +}, +{ "name": "Alvis-Straussler AC3D", + "type": "AC", + "CS#": 4, + "note_number": "8", + "note_number": "12\u20201", + "notes": [ "D\u20202", "Ru M\u2020" ], + "comments": [ "AP TK: use 12.7 column." ], + "id": "ina/v:911", + "gpid": "adf:10" +}, +{ "name": "PLA Wagen", + "type": "AAtr", + "CS#": 5, + "note_number": "13\u20201", + "notes": [ "AllM AA\u20201", "Ch F\u2020" ], + "comments": [ "AP TK: use 12.7 column." ], + "id": "ina/v:912", + "gpid": "adf:147" +} + +], + +"ordnance": [ + +{ "name": "Type 89 Heavy Grenade Launcher", + "type": "MTR", + "capabilities2": { "WP": [ [5,5] ], "S": [ [6,5] ] }, + "capabilities_other": [ "4PP" ], + "note_number": "1", + "id": "ina/o:900", + "gpid": "adf:75" +}, +{ "name": "Type 97 Automatic Gun", + "type": "ATR", + "capabilities": [ "Long Range is NA" ], + "capabilities_other": [ "5PP" ], + "note_number": "2", + "notes": [ "Jp A" ], + "id": "ina/o:901", + "gpid": "adf:77" +}, +{ "name": "Year-11 Flat-Trajectory INF Gun", + "type": "INF", + "capabilities_other": [ "5PP (3PP dm)" ], + "note_number": "3", + "notes": [ "Jp A" ], + "id": "ina/o:902", + "gpid": "adf:76" +}, +{ "name": "Type 94 Rapid-Fire Gun", + "type": "AT", + "capabilities": [ "NT", "QSU", "h-d" ], + "note_number": "4", + "notes": [ "Jp A" ], + "id": "ina/o:903", + "gpid": "adf:87" +}, +{ "name": "Type 1 Machine-Moved Gun", + "type": "AT", + "capabilities_other": [ "NT", "QSU" ], + "note_number": "5", + "id": "ina/o:904", + "gpid": "adf:88" +}, +{ "name": "Year-38 Type Field Gun (Improved)", + "type": "ART", + "capabilities2": { "WP": [ [5,5] ] }, + "capabilities_other": [ "NT", "QSU", "h-d", "AP TK#12" ], + "note_number": "6", + "id": "ina/o:905", + "gpid": "adf:89" +} + +] + +}, + +"anzac": { + +"vehicles": [ + +{ "name": "Matilda Frog", + "type": "HTv", + "CS#": 5, + "capabilities2": { "sD": "6" }, + "note_number": "1\u2020", + "id": "anz/v:900", + "gpid": "adf:211" +}, +{ "name": "Matilda II(L)", + "type": "HT", + "CS#": 5, + "capabilities2": { "sD": "6" }, + "note_number": "2\u2020", + "notes": [ "Br B\u20201" ], + "id": "anz/v:901", + "gpid": [ "adf:213", "adf:215" ] +}, +{ "name": "Matilda II CS(L)", + "type": "HT", + "CS#": 5, + "capabilities2": { "s": "9", "sD": "6" }, + "note_number": "3\u2020", + "notes": [ "Br S\u20201" ], + "id": "anz/v:902", + "gpid": [ "adf:217", "adf:219" ] +}, +{ "name": "Valentine III CS", + "type": "HT", + "CS#": 5, + "capabilities2": { "s": "9", "sM": "8" }, + "note_number": "4\u2020", + "notes": [ "Br S\u20201" ], + "id": "anz/v:903", + "gpid": "adf:221" +} + +] + +}, + +"american": { + +"vehicles": [ + +{ "name": "LVT(A)1(L)", + "type": "aLT", + "CS#": 6, + "capabilities2": { "C": [ [10,"P"], "\u20202" ] }, + "note_number": "1", + "notes": [ "US 46\u20203", "C\u20202", "G", "H", "P", "T\u2020", "X" ], + "comments": [ "Refer to U.S. Vehicle Note 46 and diagram for the AAMG." ], + "id": "am/v:900", + "gpid": "adf:196" +}, +{ "name": "LVT(A)2F", + "type": "aAPCv", + "CS#": 7, + "note_number": "2", + "notes": [ "US H", "P", "Q\u20201", "T\u20201"], + "id": "am/v:901", + "gpid": "adf:198" +}, +{ "name": "LVT4F", + "type": "aAPCv", + "cs#": 7, + "note_number": "3\u20202", + "notes": [ "US 51\u2020", "D\u20203", "H", "P", "T\u20201"], + "id": "am/v:902", + "gpid": "adf:200" +}, +{ "name": "LVT(A)2FS", + "type": "aAPCv", + "CS#": 7, + "note_number": "4\u20201", + "notes": [ "US D\u20202", "H", "P", "T\u2020"], + "id": "am/v:903", + "gpid": "adf:202" +}, +{ "name": "LVT4(L)", + "type": "aAPC", + "CS#": 7, + "note_number": "5", + "notes": [ "US 51\u2020", "D\u20204", "H", "Q\u20203", "T\u20201", "X\u20202"], + "id": "am/v:904", + "gpid": "adf:205" +}, +{ "name": "LVT(A)4(L)", + "type": "aLT", + "CS#": 6, + "capabilities2": { "C": [ [7,"P"], "\u20203" ], "H": 8, "WP": 9 }, + "note_number": "6", + "notes": [ "US 46\u20202", "C\u20203", "G", "H", "P", "T\u2020", "X\u20201"], + "id": "am/v:905", + "gpid": "adf:207" +}, +{ "name": "M3A1F", + "type": "LTv", + "CS#": 4, + "capabilities2": { "C": [ [7,"P"], "\u2020" ] }, + "note_number": "7", + "notes": [ "US C\u2020", "G", "P" ], + "id": "am/v:906", + "gpid": "adf:152" +}, +{ "name": "M5A1 Satan", + "CS#": 4, + "note_number": "8\u2020", + "notes": [ "US P" ], + "id": "am/v:907", + "gpid": "adf:158" +}, +{ "name": "M4A2F", + "type": "MTv", + "cs#": 5, + "capabilities2": { "s": 5, "WP": 7, "sM": 5 }, + "note_number": "9", + "notes": [ "US G", "P", "R" ], + "id": "am/v:908", + "gpid": "adf:168" +}, +{ "name": "M4A2(L)F", + "type": "MTv", + "cs#": 6, + "capabilities2": { "s": 5, "WP": 7, "sM": 8 }, + "note_number": "10", + "notes": [ "US G", "P", "R" ], + "id": "am/v:909", + "gpid": "adf:170" +}, +{ "name": "Carrier .50cal(b)", + "type": "APC", + "CS#": 3, + "note_number": "11\u2020", + "id": "am/v:910", + "gpid": "adf:209" +} + +], + +"ordnance": [ + +{ "name": "20mm Oerlikon Mk4", + "type": "AA", + "capabilities": [ "T", "2 TK DR's\u2020" ], + "comments": [ "Multiple Hits (C3.8) are NA." ], + "note_number": "1\u2020", + "notes": [ "US P" ], + "id": "am/o:900", + "gpid": "adf:34" +} + +] + +} + +} diff --git a/vasl_templates/webapp/data/extensions/bfp-cobra.json b/vasl_templates/webapp/data/extensions/bfp-cobra-v403.json similarity index 99% rename from vasl_templates/webapp/data/extensions/bfp-cobra.json rename to vasl_templates/webapp/data/extensions/bfp-cobra-v403.json index 9f178dc..cd3a831 100644 --- a/vasl_templates/webapp/data/extensions/bfp-cobra.json +++ b/vasl_templates/webapp/data/extensions/bfp-cobra-v403.json @@ -1,7 +1,7 @@ { "parentExtensionId": "adf", -"extensionId": "cobra", +"extensionId": "adf-cobra", "version": "4.03", "id_range": [ 850, 899 ], "comment": "These are F (flamethrower) and C (Culin) versions of the same vehicles (from Operation Cobra).", diff --git a/vasl_templates/webapp/data/extensions/bfp-pif.json b/vasl_templates/webapp/data/extensions/bfp-pif-v403.json similarity index 99% rename from vasl_templates/webapp/data/extensions/bfp-pif.json rename to vasl_templates/webapp/data/extensions/bfp-pif-v403.json index e19c423..4c9beea 100644 --- a/vasl_templates/webapp/data/extensions/bfp-pif.json +++ b/vasl_templates/webapp/data/extensions/bfp-pif-v403.json @@ -1,7 +1,7 @@ { "parentExtensionId": "adf", -"extensionId": "pif", +"extensionId": "adf-pif", "version": "4.03", "id_range": [ 800, 849 ], diff --git a/vasl_templates/webapp/data/extensions/bfp-v403.json b/vasl_templates/webapp/data/extensions/bfp-v403.json index f6953cc..5e59e43 100644 --- a/vasl_templates/webapp/data/extensions/bfp-v403.json +++ b/vasl_templates/webapp/data/extensions/bfp-v403.json @@ -2,937 +2,6 @@ "extensionId": "adf", "version": "4.03", -"id_range": [ 900, 999 ], - -"japanese": { - -"vehicles": [ - -{ "name": "FT-17M Ko(f)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "1\u2020", - "notes": [ "A", "Fr C", "Ru M\u2020" ], - "comments": [ "1 MP minimum road movement rate, even if CE." ], - "id": "ja/v:900", - "gpid": "adf:278" -}, -{ "name": "FT-17C Ko(f)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "2\u2020", - "notes": [ "A", "B", "Fr C", "Ru M\u2020" ], - "comments": [ "1 MP minimum road movement rate, even if CE." ], - "id": "ja/v:901", - "gpid": "adf:280" -}, -{ "name": "NC-27M Otsu(f)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "3\u2020", - "notes": [ "A", "Fr C", "Ge H\u2020" ], - "comments": [ "1 MP minimum road movement rate, even if CE." ], - "id": "ja/v:902", - "gpid": "adf:282" -}, -{ "name": "NC-27C Otsu(f)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "4\u2020", - "notes": [ "A", "B", "Fr C", "Ge H\u2020" ], - "comments": [ "1 MP minimum road movement rate, even if CE." ], - "id": "ja/v:903", - "gpid": "adf:284" -}, -{ "name": "Type 88 LAV(b)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "5", - "notes": [ "A", "AllM D", "Ch H\u2020" ] , - "id": "ja/v:904", - "gpid": "adf:286" -}, -{ "name": "VCL(b)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "6\u2020", - "notes": [ "A", "C", "Ru M\u20201" ], - "id": "ja/v:905", - "gpid": "adf:288" -}, -{ "name": "Type 98 Ke-Ni", - "type": "LT", - "no_radio": "\u00ae", - "CS#": 3, - "note_number": "7\u2020", - "notes": [ "Jp C" ], - "id": "ja/v:906", - "gpid": "adf:316" -}, -{ "name": "Type 2 Ke-To", - "type": "LT", - "no_radio": "\u00ae", - "CS#": 3, - "note_number": "8\u2020", - "notes": [ "Jp C" ], - "id": "ja/v:907", - "gpid": "adf:318" -}, -{ "name": "M3(a)", - "type": "LT", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "9", - "notes": [ "A", "B", "C", "Jp A\u2020", "US B\u20201" ], - "id": "ja/v:908", - "gpid": "adf:320" -}, -{ "name": "Stuart I(a)", - "type": "LT", - "no_radio": "\u00ae", - "CS#": 4, - "capabilities2": { "sD": 4 }, - "note_number": "10", - "notes": [ "A", "B", "C", "Jp A\u2020" ], - "id": "ja/v:909", - "gpid": "adf:322" -}, -{ "name": "Type 97B Shi-Ki", - "type": "MT", - "CS#": 4, - "capabilities2": { "sD": 6 }, - "note_number": "11\u2020", - "comments": [ "Moved/Motion: Fire NA" ], - "id": "ja/v:910", - "gpid": "adf:324" -}, -{ "name": "Type 3 Ka-Chi", - "type": "MT", - "CS#": 5, - "capabilities2": { "sD": 5 }, - "note_number": "12", - "notes": [ "Jp 6\u2020" ], - "comments": [ "Refer to Japanese Note 6 on Pontoons for amphibious data and wreck." ], - "id": "ja/v:911", - "gpid": "adf:326" -}, -{ "name": "Type 3 Ka-Chi (without pontoons)", - "type": "MT", - "CS#": 5, - "capabilities2": { "sD": 5 }, - "note_number": "12", - "notes": [ "Jp 6\u2020" ], - "id": "ja/v:912", - "gpid": "adf:328" -}, -{ "name": "Armored Eng Veh SS", - "type": "MTv", - "no_radio": "\u00ae", - "CS#": 5, - "capabilities2": { "sD": 7 }, - "note_number": "13\u2020", - "comments": [ "Has 2 side FT with limited traverse.", "May remove wire as if a Dozer (B24.7)." ], - "id": "ja/v:913", - "gpid": "adf:331" -}, -{ "name": "Type 2587(b)", - "type": "AC", - "no_radio": "\u00ae", - "CS#": 5, - "capabilities": [ "2 TK DR's\u2020" ], - "note_number": "14\u2020", - "notes": [ "Ch F\u2020" ], - "comments": [ "REV x4" ], - "id": "ja/v:914", - "gpid": "adf:333" -}, -{ "name": "Marmon-Herrington III(b)", - "type": "AC", - "no_radio": "\u00ae", - "CS#": 4, - "capabilities": [ "2 TK DR's\u2020" ], - "note_number": "15\u2020", - "notes": [ "C", "Ch F\u2020" ], - "id": "ja/v:915", - "gpid": "adf:335" -}, -{ "name": "Type 1 Ho-Ha", - "type": "ht", - "CS#": 5, - "note_number": "16\u2020", - "comments": [ "2MA&2&2" ], - "id": "ja/v:916", - "gpid": "adf:337" -}, -{ "name": "M3A1 Scout Car(a)", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "17", - "notes": [ "A", "C", "AllM 34\u20202", "Jp A\u20201", "Ch F\u2020" ], - "comments": [ "Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS]." ], - "id": "ja/v:917", - "gpid": "adf:339" -}, -{ "name": "Carrier A(b)", - "type": "APC", - "no_radio": "\u00ae", - "CS#": 3, - "note_number": "18", - "notes": [ "A", "C", "Br Note 64\u2020" ], - "comments": [ "The Inherent Crew is a 2-3-7 HS (D6.82).", "Refer to British Vehicle Note 64 for switching the BMG to an AAMG." ], - "id": "ja/v:918", - "gpid": "adf:341" -}, -{ "name": "Type 2 Ho-I", - "type": "SPA", - "CS#": 5, - "capabilities2": { "WP": 5, "sD": 5 }, - "note_number": "19", - "id": "ja/v:919", - "gpid": "adf:343" -}, -{ "name": "Type 1 Ho-Ni II", - "type": "SPA", - "CS#": 5, - "capabilities2": { "H": 5 }, - "note_number": "20\u2020", - "id": "ja/v:920", - "gpid": "adf:345" -}, -{ "name": "M3 75 SPA(a)", - "type": "SPAht", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "21", - "notes": [ "B", "C", "US U", "Ru M\u2020" ], - "id": "ja/v:921", - "gpid": "adf:347" -}, -{ "name": "Type 97B Chi-Ha", - "type": "SPA", - "CS#": 4, - "capabilities2": { "H": 9 }, - "note_number": "22", - "id": "ja/v:922", - "gpid": "adf:349" -}, -{ "name": "Type 3 Ho-Ni III", - "type": "TD", - "CS#": 5, - "capabilities2": { "WP": 5 }, - "note_number": "23", - "id": "ja/v:923", - "gpid": "adf:351" -}, -{ "name": "Type 97 AA Truck", - "type": "AAtr", - "CS#": 7, - "note_number": "24\u2020", - "comments": [ "MA: AA" ], - "id": "ja/v:924", - "gpid": "adf:353" -}, -{ "name": "Type 98 MCT", - "type": "AAtr", - "CS#": 5, - "note_number": "25", - "notes": [ "Br H", "Ge A\u2020" ], - "comments": [ "Bnd FF NA VCA", "MA: AA", "(Un)load: Portee" ], - "id": "ja/v:925", - "gpid": "adf:355" -} - -], - -"ordnance": [ - -{ "name": "Type 45 (1912) 24cm Howitzer", - "type": "ART", - "capabilities": [ "NT", "NM", "No IF", "HE TK# 23", "Tow NA" ], - "note_number": "1\u2020", - "notes": [ "Jp D\u20201" ], - "id": "ja/o:900", - "gpid": "adf:274" -}, -{ "name": "Type 91 Vickers AA Gun", - "type": "AA", - "capabilities": [ "AP TK# 8" ], - "capabilities2": { "LF": [ "40(4)", "1 ROF", "B10"] }, - "note_number": "2\u2020", - "id": "ja/o:901", - "gpid": "adf:275" -}, -{ "name": "Type 91 Twin-mount Vickers AA Gun", - "type": "AA", - "capabilities": [ "AP TK# 8", "2 TK DR's\u2020" ], - "capabilities2": { "LF": [ "40(8)", "1 ROF", "B10" ] }, - "note_number": "3\u2020", - "id": "ja/o:902", - "gpid": "adf:276" -}, -{ "name": "Type 4 75mm AA", - "type": "AA", - "capabilities": [ "T" ], - "capabilities2": { "LF": [ "75", "1 ROF", "B11" ], "AP": [ [6,"44-"] ] }, - "note_number": "4\u2020", - "notes": [ "Ch G"], - "id": "ja/o:903", - "gpid": "adf:277" -} - -] - -}, - -"chinese": { - -"vehicles": [ - -{ "name": "FT-17(f)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "1\u2020", - "notes": [ "A", "Fr C", "Ru M\u2020" ], - "id": "ch/v:900", - "gpid": "adf:233" -}, -{ "name": "Type 94 Lt Armored Vehicle(j)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "2", - "notes": [ "A", "D", "Ru M\u2020" ], - "id": "ch/v:901", - "gpid": "adf:235" -}, -{ "name": "Type 97A Te-Ke(j)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "3", - "notes": [ "A", "D" ], - "id": "ch/v:902", - "gpid": "adf:237" -}, -{ "name": "Type 97B Te-Ke(j)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "4", - "notes": [ "A", "C", "D" ], - "id": "ch/v:903", - "gpid": "adf:239" -}, -{ "name": "Type 95 Ha-Go(j)", - "type": "LT", - "no_radio": "\u00ae", - "CS#": 3, - "note_number": "5", - "notes": [ "A", "B\u2020", "C", "D", "Jp 5\u20201" ], - "id": "ch/v:904", - "gpid": "adf:241" -}, -{ "name": "BT-5(r)", - "type": "LT", - "no_radio": "\u00ae", - "CS#": 3, - "note_number": "6", - "notes": [ "A", "B\u20201", "Ru M\u2020" ], - "id": "ch/v:905", - "gpid": "adf:243" -}, -{ "name": "Type 89A Chi-Ro(j)", - "type": "MT", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "7", - "notes": [ "A", "B\u2020", "C", "D" ], - "id": "ch/v:906", - "gpid": "adf:245" -}, -{ "name": "Type 97A Chi-Ha(j)", - "type": "MT", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "8", - "notes": [ "A", "B\u2020", "C", "D" ], - "id": "ch/v:907", - "gpid": "adf:247" -}, -{ "name": "Type 31 Armored Car", - "type": "AC", - "no_radio": "\u00ae", - "CS#": 3, - "note_number": "9\u2020", - "notes": [ "B\u20201", "Ch F\u2020" ], - "id": "ch/v:908", - "gpid": "adf:249" -} - -] - -}, - -"dutch": { - -"vehicles": [ - -{ "name": "Alvis-Straussler AC3D", - "type": "AC", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "1\u20202", - "notes": [ "AllM V\u2020", "Ch F\u20201" ], - "comments": [ "CMG uses AP TK 12.7 column." ], - "id": "du/v:900", - "gpid": "adf:10" -}, -{ "name": "Braat Overvalwagen APC", - "type": "AC", - "no_radio": "\u00ae", - "CS#": 5, - "note_number": "2\u20202", - "notes": [ "A\u20201", "Ch F\u2020" ], - "comments": [ "CMG: VCA only", "Mounted Fire: Full FP" ], - "id": "du/v:901", - "gpid": "adf:12" -}, -{ "name": "Braat Overvalwagen AA", - "type": "AC", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "3\u20201", - "notes": [ "AllM AA\u20202", "Ch F\u2020" ], - "comments": [ "AAMG uses AP TK 12.7 column." ], - "id": "du/v:902", - "gpid": "adf:14" -}, -{ "name": "Kanonwagen Armored Car", - "type": "AC", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "4\u2020\u20201", - "notes": [ "A\u20202", "AllM V\u2020", "Ch F\u20201" ], - "comments": [ "VCA MA: VCA ≤ level NA", "CMG may only fire within VCA.", "Rear turret is unarmored when TCA = VCA." ], - "id": "du/v:903", - "gpid": "adf:16" -}, -{ "name": "Stadswacht Overvalwagen APC", - "type": "AC", - "CS#": 6, - "note_number": "5\u20201", - "notes": [ "Ch F\u2020" ], - "comments": [ "Mounted Fire: Full FP", "Passengers may fire 2 LMG's without losing inherent FP." ], - "id": "du/v:904", - "gpid": "adf:18" -}, -{ "name": "PLA Wagen", - "type": "AAtr", - "CS#": 5, - "note_number": "6\u2020", - "notes": [ "AllM AA\u20201" ], - "comments": [ "AP TK: use 12.7 column." ], - "id": "du/v:905", - "gpid": "adf:20" -} - -], - -"ordnance": [ - -{ "name": "Brandt 47mm Mortar", - "type": "MTR", - "note_number": "1", - "id": "du/o:900", - "gpid": "adf:1948" -}, -{ "name": "Krupp 75mm M1933 Field Gun", - "type": "ART", - "capabilities": [ "NT", "QSU" ], - "capabilities2": { "C": "4\u2020" }, - "note_number": "2", - "notes": [ "US C\u2020" ], - "id": "du/o:901", - "gpid": "adf:5" -}, -{ "name": "Bofors 105mm M1924 Howitzer", - "type": "ART", - "capabilities": [ "T" ], - "capabilities2": { "LF": [ "NT", "B11" ] }, - "note_number": "3", - "id": "du/o:902", - "gpid": "adf:6" -}, -{ "name": "20mm Rheinmetall AA", - "type": "AA", - "capabilities": [ "T" ], - "capabilities2": { "LF": [ "20\u2020", "2 ROF", "B11", "NT" ] }, - "note_number": "4", - "notes": [ "Gr C\u2020" ], - "id": "du/o:903", - "gpid": "adf:7" -}, -{ "name": "Bofors 80mm M29/38", - "type": "AA", - "capabilities": [ "T" ], - "capabilities2": { "LF": [ "80\u2020", "1 ROF", "B11" ] }, - "capabilities_other": [ "AP TK# 17" ], - "note_number": "6", - "notes": [ "AxM G\u2020" ], - "id": "du/o:904", - "gpid": "adf:9" -} - -] - -}, - -"thai": { - -"vehicles": [ - -{ "name": "VCL Mk VI(b)", - "type": "Tt", - "no_radio": "\u00ae", - "CS#": 2, - "note_number": "1", - "notes": [ "A", "Ch H", "AllM D" ], - "id": "th/v:900", - "gpid": "adf:92" -}, -{ "name": "Vickers 6-Ton MkE-B(b)", - "type": "LT", - "no_radio": "\u00ae", - "CS#": 3, - "note_number": "2", - "notes": [ "A" ], - "id": "th/v:901", - "gpid": "adf:94" -}, -{ "name": "Type 83(j)", - "type": "LT", - "no_radio": "\u00ae", - "CS#": 3, - "note_number": "3", - "notes": [ "A", "E\u2020" ], - "comments": [ "Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions." ], - "id": "th/v:902", - "gpid": "adf:96" -}, -{ "name": "Vickers 6-Ton AA(b)", - "type": "SPAA", - "no_radio": "\u00ae", - "CS#": 3, - "capabilities": [ "AP TK# 8" ], - "note_number": "4", - "notes": [ "A", "AllM AA\u2020" ], - "id": "th/v:903", - "gpid": "adf:98" -}, -{ "name": "Citroen-Kegresse P17(f)", - "type": "ht", - "CS#": 3, - "note_number": "5\u2020", - "notes": [ "A" ], - "id": "th/v:904", - "gpid": "adf:100" -}, -{ "name": "Vickers Morris M1930(b)", - "type": "AC", - "no_radio": "\u00ae", - "CS#": 4, - "note_number": "6", - "notes": [ "Br X\u2020", "Ch F\u2020" ], - "comments": [ "REV x4" ], - "id": "th/v:905", - "gpid": "adf:102" -} - -], - -"ordnance": [ - -{ "name": "50mm Krupp M1906", - "type": "INF", - "capabilities": [ "NT", "QSU", "h-d" ], - "comments": [ "No Gunshield." ], - "note_number": "4", - "id": "th/o:900", - "gpid": "adf:81" -}, -{ "name": "75mm Krupp M1908", - "type": "INF", - "capabilities": [ "NT", "QSU", "h-d" ], - "capabilities2": { "AP": 8, "WP": 5 }, - "note_number": "5", - "id": "th/o:901", - "gpid": "adf:82" -}, -{ "name": "Vickers 12.7mm AA Class D", - "type": "AA", - "capabilities": [ "T", "QSU" ], - "note_number": "8", - "id": "th/o:902", - "gpid": "adf:85" -}, -{ "name": "Bofors M30 75mm AA", - "type": "AA", - "capabilities": [ "T" ], - "capabilities2": { "LF": [ "75", "1 ROF", "B11" ], "AP":6 }, - "note_number": "9", - "notes": [ "Ch G\u2020"], - "id": "th/o:902", - "gpid": "adf:86" -} - -] - -}, - -"indonesian": { - -"vehicles": [ - -{ "name": "Type 94 Light Armoured Vehicle (j)", - "type": "Tt", - "CS#": 2, - "note_number": "1", - "notes": [ "C", "Ru M\u2020" ], - "id": "ina/v:900", - "gpid": "adf:123" -}, -{ "name": "Type 97A Te-Ke Light Armored Vehicle (j)", - "type": "Tt", - "CS#": 2, - "note_number": "2", - "notes": [ "C" ], - "id": "ina/v:901", - "gpid": "adf:125" -}, -{ "name": "Type 97B Te-Ke Light Armored Vehicle (j)", - "type": "Tt", - "CS#": 2, - "note_number": "3", - "notes": [ "C" ], - "id": "ina/v:902", - "gpid": "adf:127" -}, -{ "name": "Universal Carrier (b)", - "type": "Tt", - "CS#": 3, - "note_number": "4", - "notes": [ "C" ], - "id": "ina/v:903", - "gpid": "adf:129" -}, -{ "name": "Type 95 Ha-Go(j)", - "type": "LT", - "CS#": 3, - "note_number": "5", - "notes": [ "B", "C", "D\u2020", "E\u20201" ], - "comments": [ "Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions." ], - "id": "ina/v:904", - "gpid": "adf:131" -}, -{ "name": "VCL M1936 (b)", - "type": "aTt", - "CS#": 2, - "note_number": "6", - "notes": [ "C" ], - "id": "ina/v:905", - "gpid": "adf:133" -}, -{ "name": "CTLS-4 (a)", - "type": "Tt", - "CS#": 2, - "note_number": "7", - "notes": [ "C", "Ru M\u2020", "AllM 26\u20201" ], - "comments": [ "Port VCA NA (see Allied Minor Vehicle Note 26)." ], - "id": "ina/v:906", - "gpid": "adf:135" -}, -{ "name": "Marmon-Herrington III Armored Car (b)", - "type": "AC", - "CS#": 4, - "capabilities": [ "2 TK DR's\u2020" ], - "note_number": "8", - "notes": [ "Ch F\u2020" ], - "id": "ina/v:907", - "gpid": "adf:137" -}, -{ "name": "M3A1 Scout Car (a)", - "type": "SC", - "CS#": 4, - "note_number": "8", - "capabilities_other": [ "9PP" ], - "note_number": "9\u2020", - "notes": [ "D\u20201", "AllM 34\u20202" ], - "comments": [ "AP TK: use 12.7 column.", "Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS]." ], - "id": "ina/v:908", - "gpid": "adf:139" -}, -{ "name": "Braat Overvalwagen AA", - "type": "AC", - "CS#": 4, - "note_number": "8", - "note_number": "10\u20201", - "notes": [ "Ch F\u2020", "AllM AA\u20201" ], - "comments": [ "AP TK: use 12.7 column." ], - "id": "ina/v:909", - "gpid": "adf:14" -}, -{ "name": "Braat Overvalwagen APC", - "type": "AC", - "CS#": 5, - "note_number": "8", - "capabilities_other": [ "12PP" ], - "note_number": "11\u20202", - "notes": [ "D\u20201", "Ch F\u2020" ], - "comments": [ "CMG: VCA only", "Mounted Fire: Full FP" ], - "id": "ina/v:910", - "gpid": "adf:12" -}, -{ "name": "Alvis-Straussler AC3D", - "type": "AC", - "CS#": 4, - "note_number": "8", - "note_number": "12\u20201", - "notes": [ "D\u20202", "Ru M\u2020" ], - "comments": [ "AP TK: use 12.7 column." ], - "id": "ina/v:911", - "gpid": "adf:10" -}, -{ "name": "PLA Wagen", - "type": "AAtr", - "CS#": 5, - "note_number": "13\u20201", - "notes": [ "AllM AA\u20201", "Ch F\u2020" ], - "comments": [ "AP TK: use 12.7 column." ], - "id": "ina/v:912", - "gpid": "adf:147" -} - -], - -"ordnance": [ - -{ "name": "Type 89 Heavy Grenade Launcher", - "type": "MTR", - "capabilities2": { "WP": [ [5,5] ], "S": [ [6,5] ] }, - "capabilities_other": [ "4PP" ], - "note_number": "1", - "id": "ina/o:900", - "gpid": "adf:75" -}, -{ "name": "Type 97 Automatic Gun", - "type": "ATR", - "capabilities": [ "Long Range is NA" ], - "capabilities_other": [ "5PP" ], - "note_number": "2", - "notes": [ "Jp A" ], - "id": "ina/o:901", - "gpid": "adf:77" -}, -{ "name": "Year-11 Flat-Trajectory INF Gun", - "type": "INF", - "capabilities_other": [ "5PP (3PP dm)" ], - "note_number": "3", - "notes": [ "Jp A" ], - "id": "ina/o:902", - "gpid": "adf:76" -}, -{ "name": "Type 94 Rapid-Fire Gun", - "type": "AT", - "capabilities": [ "NT", "QSU", "h-d" ], - "note_number": "4", - "notes": [ "Jp A" ], - "id": "ina/o:903", - "gpid": "adf:87" -}, -{ "name": "Type 1 Machine-Moved Gun", - "type": "AT", - "capabilities_other": [ "NT", "QSU" ], - "note_number": "5", - "id": "ina/o:904", - "gpid": "adf:88" -}, -{ "name": "Year-38 Type Field Gun (Improved)", - "type": "ART", - "capabilities2": { "WP": [ [5,5] ] }, - "capabilities_other": [ "NT", "QSU", "h-d", "AP TK#12" ], - "note_number": "6", - "id": "ina/o:905", - "gpid": "adf:89" -} - -] - -}, - -"anzac": { - -"vehicles": [ - -{ "name": "Matilda Frog", - "type": "HTv", - "CS#": 5, - "capabilities2": { "sD": "6" }, - "note_number": "1\u2020", - "id": "anz/v:900", - "gpid": "adf:211" -}, -{ "name": "Matilda II(L)", - "type": "HT", - "CS#": 5, - "capabilities2": { "sD": "6" }, - "note_number": "2\u2020", - "notes": [ "Br B\u20201" ], - "id": "anz/v:901", - "gpid": [ "adf:213", "adf:215" ] -}, -{ "name": "Matilda II CS(L)", - "type": "HT", - "CS#": 5, - "capabilities2": { "s": "9", "sD": "6" }, - "note_number": "3\u2020", - "notes": [ "Br S\u20201" ], - "id": "anz/v:902", - "gpid": [ "adf:217", "adf:219" ] -}, -{ "name": "Valentine III CS", - "type": "HT", - "CS#": 5, - "capabilities2": { "s": "9", "sM": "8" }, - "note_number": "4\u2020", - "notes": [ "Br S\u20201" ], - "id": "anz/v:903", - "gpid": "adf:221" -} - -] - -}, - -"american": { - -"vehicles": [ - -{ "name": "LVT(A)1(L)", - "type": "aLT", - "CS#": 6, - "capabilities2": { "C": [ [10,"P"], "\u20202" ] }, - "note_number": "1", - "notes": [ "US 46\u20203", "C\u20202", "G", "H", "P", "T\u2020", "X" ], - "comments": [ "Refer to U.S. Vehicle Note 46 and diagram for the AAMG." ], - "id": "am/v:900", - "gpid": "adf:196" -}, -{ "name": "LVT(A)2F", - "type": "aAPCv", - "CS#": 7, - "note_number": "2", - "notes": [ "US H", "P", "Q\u20201", "T\u20201"], - "id": "am/v:901", - "gpid": "adf:198" -}, -{ "name": "LVT4F", - "type": "aAPCv", - "cs#": 7, - "note_number": "3\u20202", - "notes": [ "US 51\u2020", "D\u20203", "H", "P", "T\u20201"], - "id": "am/v:902", - "gpid": "adf:200" -}, -{ "name": "LVT(A)2FS", - "type": "aAPCv", - "CS#": 7, - "note_number": "4\u20201", - "notes": [ "US D\u20202", "H", "P", "T\u2020"], - "id": "am/v:903", - "gpid": "adf:202" -}, -{ "name": "LVT4(L)", - "type": "aAPC", - "CS#": 7, - "note_number": "5", - "notes": [ "US 51\u2020", "D\u20204", "H", "Q\u20203", "T\u20201", "X\u20202"], - "id": "am/v:904", - "gpid": "adf:205" -}, -{ "name": "LVT(A)4(L)", - "type": "aLT", - "CS#": 6, - "capabilities2": { "C": [ [7,"P"], "\u20203" ], "H": 8, "WP": 9 }, - "note_number": "6", - "notes": [ "US 46\u20202", "C\u20203", "G", "H", "P", "T\u2020", "X\u20201"], - "id": "am/v:905", - "gpid": "adf:207" -}, -{ "name": "M3A1F", - "type": "LTv", - "CS#": 4, - "capabilities2": { "C": [ [7,"P"], "\u2020" ] }, - "note_number": "7", - "notes": [ "US C\u2020", "G", "P" ], - "id": "am/v:906", - "gpid": "adf:152" -}, -{ "name": "M5A1 Satan", - "CS#": 4, - "note_number": "8\u2020", - "notes": [ "US P" ], - "id": "am/v:907", - "gpid": "adf:158" -}, -{ "name": "M4A2F", - "type": "MTv", - "cs#": 5, - "capabilities2": { "s": 5, "WP": 7, "sM": 5 }, - "note_number": "9", - "notes": [ "US G", "P", "R" ], - "id": "am/v:908", - "gpid": "adf:168" -}, -{ "name": "M4A2(L)F", - "type": "MTv", - "cs#": 6, - "capabilities2": { "s": 5, "WP": 7, "sM": 8 }, - "note_number": "10", - "notes": [ "US G", "P", "R" ], - "id": "am/v:909", - "gpid": "adf:170" -}, -{ "name": "Carrier .50cal(b)", - "type": "APC", - "CS#": 3, - "note_number": "11\u2020", - "id": "am/v:910", - "gpid": "adf:209" -} - -], - -"ordnance": [ - -{ "name": "20mm Oerlikon Mk4", - "type": "AA", - "capabilities": [ "T", "2 TK DR's\u2020" ], - "comments": [ "Multiple Hits (C3.8) are NA." ], - "note_number": "1\u2020", - "notes": [ "US P" ], - "id": "am/o:900", - "gpid": "adf:34" -} - -] - -} +"comment": "This is a dummy extension file that acts as a parent for the various BFP child files." } diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js index f39c6f1..9bf08cf 100644 --- a/vasl_templates/webapp/static/snippets.js +++ b/vasl_templates/webapp/static/snippets.js @@ -442,7 +442,7 @@ function get_ma_notes_keys( nat, vo_entries, vo_type ) var vo_id = vo_entry.id.split( ":", 1 )[0] ; var is_extra = ( nat !== "landing-craft" && vo_id === "sh/v" ) ; var key = match[1] ; - if ( vo_entry.extn_id && !( vo_entry.extn_id === "adf" && nat === "american" && key.length === 1 ) ) { + if ( vo_entry.extn_id && !( vo_entry.extn_id === "adf-bj" && nat === "american" && key.length === 1 ) ) { // NOTE: We include the extension ID as part of the key, except for BFP American vehicles, // whose multi-applicable notes refer to the main American multi-applicable notes, // not the BFP ones (there aren't any). diff --git a/vasl_templates/webapp/tests/test_vasl_extensions.py b/vasl_templates/webapp/tests/test_vasl_extensions.py index 055447f..4e554bb 100644 --- a/vasl_templates/webapp/tests/test_vasl_extensions.py +++ b/vasl_templates/webapp/tests/test_vasl_extensions.py @@ -122,8 +122,8 @@ def test_dedupe_ma_notes( webapp, webdriver ): # NOTE: The vehicles used in this test have the following multi-applicable notes: # - Type 92A: A - # - M3(a): adf:A ; adf:B ; adf:C ; adf:Jp A ; adf:US B - # - Type 98 MCT: adf:Br H ; adf:Ge A + # - M3(a): adf-bj:A ; adf-bj:B ; adf-bj:C ; adf-bj:Jp A ; adf-bj:US B + # - Type 98 MCT: adf-bj:Br H ; adf-bj:Ge A # do the tests do_test( [ "Type 92A (Tt)", "M3(a) (LT)" ], [ @@ -298,7 +298,7 @@ def test_bfp_extensions( webapp, webdriver ): elems[0].click() wait_for_clipboard( 2, re.compile( r'' ) ) elems[1].click() - wait_for_clipboard( 2, re.compile( r'' ) ) + wait_for_clipboard( 2, re.compile( r'' ) ) # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -