Merge branch 'main' into renovate/actions-setup-python-4.x

Lucas-C · Jan 30, 2024 · 790208f · 790208f
2 parents a696f46 + d9ba236
commit 790208f
Show file tree

Hide file tree

Showing 116 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Install dependencies

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Install dependencies

diff --git a/README.md b/README.md
@@ -1,4 +1,7 @@
 <!-- NEXT STEPS:
+- submit on https://www.dungeoncrawlers.org
+- make online MP3s to loop forever
+- map bug on cedar village : a door appears initially at the portal position, when it's not open
 - provide a smaller .rar compressed PDF
 - size optims:
   * 10 bytes could be removed from the uncompressed stream of every page without text: "2 J\n0.57 w"

diff --git a/assets/arrow-right.png b/assets/arrow-right.png
diff --git a/assets/backgrounds/bloodsplat.png b/assets/backgrounds/bloodsplat.png
diff --git a/assets/backgrounds/boat.png b/assets/backgrounds/boat.png
diff --git a/assets/backgrounds/chapel_empty.png b/assets/backgrounds/chapel_empty.png
diff --git a/assets/backgrounds/chapel_with_monk.png b/assets/backgrounds/chapel_with_monk.png
diff --git a/assets/backgrounds/cloudy_town.png b/assets/backgrounds/cloudy_town.png
diff --git a/assets/backgrounds/depths.png b/assets/backgrounds/depths.png
diff --git a/assets/backgrounds/distant_castle.png b/assets/backgrounds/distant_castle.png
diff --git a/assets/backgrounds/dominik.png b/assets/backgrounds/dominik.png
diff --git a/assets/backgrounds/forest_trees_with_seamus.png b/assets/backgrounds/forest_trees_with_seamus.png
diff --git a/assets/backgrounds/hangman.png b/assets/backgrounds/hangman.png
diff --git a/assets/backgrounds/mountains.png b/assets/backgrounds/mountains.png
diff --git a/assets/backgrounds/palace_hall.png b/assets/backgrounds/palace_hall.png
diff --git a/assets/backgrounds/ruins.png b/assets/backgrounds/ruins.png
diff --git a/assets/backgrounds/snow_house1.png b/assets/backgrounds/snow_house1.png
diff --git a/assets/backgrounds/snow_house2.png b/assets/backgrounds/snow_house2.png
diff --git a/assets/backgrounds/st_knight_tale_1.png b/assets/backgrounds/st_knight_tale_1.png
diff --git a/assets/backgrounds/st_knight_tale_2.png b/assets/backgrounds/st_knight_tale_2.png
diff --git a/assets/backgrounds/st_knight_tale_3.png b/assets/backgrounds/st_knight_tale_3.png
diff --git a/assets/backgrounds/st_knight_tale_4.png b/assets/backgrounds/st_knight_tale_4.png
diff --git a/assets/backgrounds/st_knight_tale_5.png b/assets/backgrounds/st_knight_tale_5.png
diff --git a/assets/backgrounds/temple.png b/assets/backgrounds/temple.png
diff --git a/assets/backgrounds/the_end_1.png b/assets/backgrounds/the_end_1.png
diff --git a/assets/backgrounds/the_end_2.png b/assets/backgrounds/the_end_2.png
diff --git a/assets/backgrounds/valley_village_with_seamus.png b/assets/backgrounds/valley_village_with_seamus.png
diff --git a/assets/black_bird.png b/assets/black_bird.png
diff --git a/assets/blobfish.png b/assets/blobfish.png
diff --git a/assets/blood-signed-pact.png b/assets/blood-signed-pact.png
diff --git a/assets/boulder_small.png b/assets/boulder_small.png
diff --git a/assets/coat-of-arms.png b/assets/coat-of-arms.png
diff --git a/assets/compass.png b/assets/compass.png
diff --git a/assets/dead_tree.png b/assets/dead_tree.png
diff --git a/assets/demons-of-time.png b/assets/demons-of-time.png
diff --git a/assets/dominik-small.png b/assets/dominik-small.png
diff --git a/assets/dungeon-door-opening.png b/assets/dungeon-door-opening.png
diff --git a/assets/empress-defeated.png b/assets/empress-defeated.png
diff --git a/assets/empress-portrait.png b/assets/empress-portrait.png
diff --git a/assets/empress-scepter.png b/assets/empress-scepter.png
diff --git a/assets/explosion.png b/assets/explosion.png
diff --git a/assets/extra_action_buttons.png b/assets/extra_action_buttons.png
diff --git a/assets/extra_treasure.png b/assets/extra_treasure.png
diff --git a/assets/fountain.png b/assets/fountain.png
diff --git a/assets/gorgon-head.png b/assets/gorgon-head.png
diff --git a/assets/gorgon-in-mirror.png b/assets/gorgon-in-mirror.png
diff --git a/assets/gorgon-petrified-in-mirror.png b/assets/gorgon-petrified-in-mirror.png
diff --git a/assets/healthbar.png b/assets/healthbar.png
diff --git a/assets/lever-staff-0.png b/assets/lever-staff-0.png
diff --git a/assets/lever-staff-1.png b/assets/lever-staff-1.png
diff --git a/assets/lever-staff-2.png b/assets/lever-staff-2.png
diff --git a/assets/lever-staff-3.png b/assets/lever-staff-3.png
diff --git a/assets/lever-staff-4.png b/assets/lever-staff-4.png
diff --git a/assets/lever-staff-5.png b/assets/lever-staff-5.png
diff --git a/assets/lever-staff-6.png b/assets/lever-staff-6.png
diff --git a/assets/lever-staff-7.png b/assets/lever-staff-7.png
diff --git a/assets/map.png b/assets/map.png
diff --git a/assets/mimics.png b/assets/mimics.png
diff --git a/assets/minimap_cursor.png b/assets/minimap_cursor.png
diff --git a/assets/monk-portrait.png b/assets/monk-portrait.png
diff --git a/assets/open-book.png b/assets/open-book.png
diff --git a/assets/open-chest-and-treasure.png b/assets/open-chest-and-treasure.png
diff --git a/assets/page-up-hint.png b/assets/page-up-hint.png
diff --git a/assets/phial-green.png b/assets/phial-green.png
diff --git a/assets/phial-red.png b/assets/phial-red.png
diff --git a/assets/portraits.png b/assets/portraits.png
diff --git a/assets/runes.png b/assets/runes.png
diff --git a/assets/sfx.png b/assets/sfx.png
diff --git a/assets/small-pentacle.png b/assets/small-pentacle.png
diff --git a/assets/storm-dragon-small.png b/assets/storm-dragon-small.png
diff --git a/assets/take-crucifix.png b/assets/take-crucifix.png
diff --git a/assets/tiles/boulder_ceiling.png b/assets/tiles/boulder_ceiling.png
diff --git a/assets/tiles/boulder_floor.png b/assets/tiles/boulder_floor.png
diff --git a/assets/tiles/boulder_grass.png b/assets/tiles/boulder_grass.png
diff --git a/assets/tiles/box_exterior.png b/assets/tiles/box_exterior.png
diff --git a/assets/tiles/box_interior.png b/assets/tiles/box_interior.png
diff --git a/assets/tiles/cauldron.png b/assets/tiles/cauldron.png
diff --git a/assets/tiles/dead_tree.png b/assets/tiles/dead_tree.png
diff --git a/assets/tiles/dungeon_black_passage.png b/assets/tiles/dungeon_black_passage.png
diff --git a/assets/tiles/dungeon_bookshelf.png b/assets/tiles/dungeon_bookshelf.png
diff --git a/assets/tiles/dungeon_bookshelf_torch.png b/assets/tiles/dungeon_bookshelf_torch.png
diff --git a/assets/tiles/dungeon_torch.png b/assets/tiles/dungeon_torch.png
diff --git a/assets/tiles/dungeon_wall_lever_down.png b/assets/tiles/dungeon_wall_lever_down.png
diff --git a/assets/tiles/dungeon_wall_lever_slot.png b/assets/tiles/dungeon_wall_lever_slot.png
diff --git a/assets/tiles/dungeon_wall_lever_up.png b/assets/tiles/dungeon_wall_lever_up.png
diff --git a/assets/tiles/dungeon_wall_lever_up_with_fish.png b/assets/tiles/dungeon_wall_lever_up_with_fish.png
diff --git a/assets/tiles/dungeon_wall_small_window.png b/assets/tiles/dungeon_wall_small_window.png
diff --git a/assets/tiles/dungeon_wall_tagged.png b/assets/tiles/dungeon_wall_tagged.png
diff --git a/assets/tiles/dungeon_wall_with_ivy.png b/assets/tiles/dungeon_wall_with_ivy.png
diff --git a/assets/tiles/fire.png b/assets/tiles/fire.png
diff --git a/assets/tiles/fountain.png b/assets/tiles/fountain.png
diff --git a/assets/tiles/hay_pile_exterior.png b/assets/tiles/hay_pile_exterior.png
diff --git a/assets/tiles/petrified_gorgon.png b/assets/tiles/petrified_gorgon.png
diff --git a/assets/tiles/petrified_gorgon_with_staff.png b/assets/tiles/petrified_gorgon_with_staff.png
diff --git a/assets/tiles/portal_interior.png b/assets/tiles/portal_interior.png
diff --git a/assets/tiles/portal_interior_closed.png b/assets/tiles/portal_interior_closed.png
diff --git a/assets/tiles/portcullis_exterior.png b/assets/tiles/portcullis_exterior.png
diff --git a/assets/tiles/portcullis_interior.png b/assets/tiles/portcullis_interior.png
diff --git a/assets/tiles/seamus_on_floor.png b/assets/tiles/seamus_on_floor.png
diff --git a/assets/tiles/seamus_on_grass.png b/assets/tiles/seamus_on_grass.png
diff --git a/assets/tiles/sign_grass.png b/assets/tiles/sign_grass.png
diff --git a/assets/tiles/skull_pile2.png b/assets/tiles/skull_pile2.png
diff --git a/assets/tiles/statue.png b/assets/tiles/statue.png
diff --git a/assets/tiles/statue_with_amulet.png b/assets/tiles/statue_with_amulet.png
diff --git a/assets/tiles/stump.png b/assets/tiles/stump.png
diff --git a/assets/tiles/stump_with_bottle.png b/assets/tiles/stump_with_bottle.png
diff --git a/assets/tiles/tree_alt.png b/assets/tiles/tree_alt.png
diff --git a/assets/tiles/well.png b/assets/tiles/well.png
diff --git a/assets/tomb-stone.png b/assets/tomb-stone.png
diff --git a/assets/tongue.png b/assets/tongue.png
diff --git a/assets/water-trail.png b/assets/water-trail.png
diff --git a/assets/white_arrows.png b/assets/white_arrows.png
diff --git a/assets/window-bars.png b/assets/window-bars.png
diff --git a/assets/yellow-star.png b/assets/yellow-star.png
diff --git a/gen_pdf.py b/gen_pdf.py
@@ -78,7 +78,7 @@ def parse_args():
 
 
 def init_pdf(args, start_page_id):
-    if args.no_marked_content:  # only adds ~4MB
+    if args.no_marked_content:  # currently adds ~66MB
         class PdfClass(fpdf.FPDF):
             @contextmanager
             def _marked_sequence(self, **kwargs):