diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e0b2bb..82472da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: script-name: run.py nofollow-import-to: "*tk*,_codecs,encodings,multiprocessing,gi" disable-plugins: tk-inter,dill-compat,eventlet,gevent,pyqt5,pyqt6,pyside2,pyside6,delvewheel,pywebview,matplotlib,spacy,enum-compat,pbr-compat,gevent,pmw-freezer,transformers,upx,kivy,options-nanny,multiprocessing,gi - include-data-dir: assets=assets,enemy_images=enemy_images + include-data-dir: assets=assets include-data-files: CREDITS=CREDITS mode: standalone output-file: AimTrainer diff --git a/enemy_images/red_rectangle.png b/assets/graphics/enemy/red_rectangle.png similarity index 100% rename from enemy_images/red_rectangle.png rename to assets/graphics/enemy/red_rectangle.png diff --git a/game/game.py b/game/game.py index c71a934..d76ac7b 100644 --- a/game/game.py +++ b/game/game.py @@ -6,7 +6,7 @@ from ursina import * from ursina.shaders import lit_with_shadows_shader import os -file_names = os.listdir("enemy_images") +enemy_file_names = os.listdir("assets/graphics/enemy") class Game(): def __init__(self, pypresence_client) -> None: @@ -43,7 +43,7 @@ class Game(): def summon_enemy(self): if not len(self.enemies) >= 50: - self.enemies.append(Enemy(self.player, self.shootables_parent, self.player.x + (random.randint(12, 24) * random.choice([1, -1])), random.randint(min_enemy_y, max_enemy_y), self.player.z + (random.randint(12, 24) * random.choice([1, -1])), "enemy_images/" + random.choice(file_names))) + self.enemies.append(Enemy(self.player, self.shootables_parent, self.player.x + (random.randint(12, 24) * random.choice([1, -1])), random.randint(min_enemy_y, max_enemy_y), self.player.z + (random.randint(12, 24) * random.choice([1, -1])), "assets/graphics/enemy/" + random.choice(file_names))) def update(self): Sky.update(self.sky)