diff --git a/chapter-h/chapter-h-placeholders.zip b/chapter-h/chapter-h-placeholders.zip index ad2f132..c47ec03 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 d18f152..294d29f 100755 --- a/vasl_templates/tools/make_chapter_h_placeholders.py +++ b/vasl_templates/tools/make_chapter_h_placeholders.py @@ -66,10 +66,7 @@ def make_chapter_h_placeholders( output_fname, log=None \ notes, ma_notes = load_vo_data( fname, nat ) if nat not in results: results[ nat ] = {} - if nat == "landing-craft": - results[ nat ][ vo_type ] = { "notes": notes, "ma_notes": ma_notes } - else: - results[ nat ][ vo_type ] = { "notes": notes, "ma_notes": ma_notes } + results[ nat ][ vo_type ] = { "notes": notes, "ma_notes": ma_notes } # insert the K:FW vehicles/ordnance kfw_vo_data = load_kfw_vo_data() @@ -109,6 +106,11 @@ def make_chapter_h_placeholders( output_fname, log=None \ results[nat][vo_type][key] = [] results[nat][vo_type][key].extend( extn_data[nat][vo_type].get( key, [] ) ) + # FUDGE! Allied Ordnance Note D is not in the Allied Minor common.json file (it's referenced + # by some of the nationality-specific Guns e.g. Belgian DBT), so we add it in manually. + assert "D" not in results["allied-minor"]["ordnance"]["ma_notes"] + results["allied-minor"]["ordnance"]["ma_notes"].append( "D" ) + # generate the placeholder files with zipfile.ZipFile( output_fname, "w" ) as zip_file: nats = sorted( results.keys() ) diff --git a/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt b/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt index d1c4e2f..d16fe3b 100644 --- a/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt +++ b/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt @@ -15,6 +15,7 @@ allied-minor/ordnance/36.png allied-minor/ordnance/a.html allied-minor/ordnance/b.html allied-minor/ordnance/c.html +allied-minor/ordnance/d.html allied-minor/ordnance/de.html allied-minor/ordnance/gr.html allied-minor/ordnance/n.html