Update to ChamberCourt’s fallback asset paths

All assets must be in a `levels` directory, but we no longer need symlinks to sound files in the test levels.
rrthomas · Jan 10, 2025 · ca4776a · ca4776a
1 parent 26467d1
commit ca4776a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 12 deletions.
diff --git a/test-levels/02 Map with missing tiles.tmx b/test-levels/02 Map with missing tiles.tmx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.8" tiledversion="1.8.2" orientation="orthogonal" renderorder="right-down" width="8" height="8" tilewidth="16" tileheight="16" infinite="0" backgroundcolor="#000000" nextlayerid="2" nextobjectid="1">
  <properties>
-  <property name="Title" value="Tiny map"/>
+  <property name="Title" value="Map with missing tiles"/>
  </properties>
  <tileset firstgid="1" source="WinColl.tsx"/>
  <layer id="1" name="Tile Layer 1" width="8" height="8">

diff --git a/test-levels/Collect.wav b/test-levels/Collect.wav
diff --git a/test-levels/Die.wav b/test-levels/Die.wav
diff --git a/test-levels/Slide.wav b/test-levels/Slide.wav
diff --git a/test-levels/Unlock.wav b/test-levels/Unlock.wav
diff --git a/wincoll/app-icon.png → wincoll/levels/app-icon.png b/wincoll/app-icon.png → wincoll/levels/app-icon.png
diff --git a/wincoll/title.png → wincoll/levels/title.png b/wincoll/title.png → wincoll/levels/title.png
diff --git a/wincoll/wincoll_game.py b/wincoll/wincoll_game.py
@@ -6,10 +6,10 @@
 
 import gettext
 import importlib
+import importlib.resources
 import os
 import warnings
 from enum import StrEnum, auto
-from pathlib import Path
 
 from chambercourt.game import DEFAULT_VOLUME, Game
 
@@ -89,16 +89,16 @@ def instructions() -> str:
 
     window_scale = 2
 
-    def load_assets(self, path: Path, levels_path: Path) -> None:
-        super().load_assets(path, levels_path)
+    def load_assets(self) -> None:
+        super().load_assets()
         global DIAMOND_IMAGE
         global COLLECT_SOUND, SLIDE_SOUND, UNLOCK_SOUND
-        DIAMOND_IMAGE = pygame.image.load(levels_path / "Diamond.png")
-        COLLECT_SOUND = pygame.mixer.Sound(levels_path / "Collect.wav")
+        DIAMOND_IMAGE = pygame.image.load(self.find_asset("Diamond.png"))
+        COLLECT_SOUND = pygame.mixer.Sound(self.find_asset("Collect.wav"))
         COLLECT_SOUND.set_volume(DEFAULT_VOLUME)
-        SLIDE_SOUND = pygame.mixer.Sound(levels_path / "Slide.wav")
+        SLIDE_SOUND = pygame.mixer.Sound(str(self.find_asset("Slide.wav")))
         SLIDE_SOUND.set_volume(DEFAULT_VOLUME)
-        UNLOCK_SOUND = pygame.mixer.Sound(levels_path / "Unlock.wav")
+        UNLOCK_SOUND = pygame.mixer.Sound(str(self.find_asset("Unlock.wav")))
         UNLOCK_SOUND.set_volume(DEFAULT_VOLUME)
 
     def init_physics(self) -> None: