diff --git a/res/mus/hatred.wav b/res/mus/hatred.wav index ea883c5..f12837b 100644 Binary files a/res/mus/hatred.wav and b/res/mus/hatred.wav differ diff --git a/res/sprite/podium.png b/res/sprite/podium.png index 210284a..0bcc982 100644 Binary files a/res/sprite/podium.png and b/res/sprite/podium.png differ diff --git a/res/sprite/skeleton.png b/res/sprite/skeleton.png new file mode 100644 index 0000000..cce1fa7 Binary files /dev/null and b/res/sprite/skeleton.png differ diff --git a/res/sprite/skeleton_dead.png b/res/sprite/skeleton_dead.png new file mode 100644 index 0000000..b5cac03 Binary files /dev/null and b/res/sprite/skeleton_dead.png differ diff --git a/res/sprite/skeleton_low.png b/res/sprite/skeleton_low.png new file mode 100644 index 0000000..33835ed Binary files /dev/null and b/res/sprite/skeleton_low.png differ diff --git a/res/sprite/witch.png b/res/sprite/witch.png new file mode 100644 index 0000000..9373136 Binary files /dev/null and b/res/sprite/witch.png differ diff --git a/res/sprite/witch_dead.png b/res/sprite/witch_dead.png new file mode 100644 index 0000000..622e2b2 Binary files /dev/null and b/res/sprite/witch_dead.png differ diff --git a/res/sprite/witch_low.png b/res/sprite/witch_low.png new file mode 100644 index 0000000..d11d55d Binary files /dev/null and b/res/sprite/witch_low.png differ diff --git a/res/sprite/zombie.png b/res/sprite/zombie.png new file mode 100644 index 0000000..cd33a39 Binary files /dev/null and b/res/sprite/zombie.png differ diff --git a/res/sprite/zombie_dead.png b/res/sprite/zombie_dead.png new file mode 100644 index 0000000..6399ad7 Binary files /dev/null and b/res/sprite/zombie_dead.png differ diff --git a/res/sprite/zombie_low.png b/res/sprite/zombie_low.png new file mode 100644 index 0000000..bdf8ed6 Binary files /dev/null and b/res/sprite/zombie_low.png differ diff --git a/src/assets.py b/src/assets.py index 201fc2c..19fe327 100644 --- a/src/assets.py +++ b/src/assets.py @@ -11,6 +11,15 @@ sprites = { "dwagon" : arcade.load_texture("res/sprite/dwagon.png"), "dwagon_low" : arcade.load_texture("res/sprite/dwagon_low.png"), "dwagon_dead" : arcade.load_texture("res/sprite/dwagon_dead.png"), + "zombie" : arcade.load_texture("res/sprite/zombie.png"), + "zombie_low" : arcade.load_texture("res/sprite/zombie_low.png"), + "zombie_dead" : arcade.load_texture("res/sprite/zombie_dead.png"), + "skeleton" : arcade.load_texture("res/sprite/skeleton.png"), + "skeleton_low" : arcade.load_texture("res/sprite/skeleton_low.png"), + "skeleton_dead" : arcade.load_texture("res/sprite/skeleton_dead.png"), + "witch" : arcade.load_texture("res/sprite/witch.png"), + "witch_low" : arcade.load_texture("res/sprite/witch_low.png"), + "witch_dead" : arcade.load_texture("res/sprite/witch_dead.png"), "herojoe" : arcade.load_texture("res/sprite/herojoe.png"), "herojoe_low" : arcade.load_texture("res/sprite/herojoe_low.png"), "herojoe_dead" : arcade.load_texture("res/sprite/herojoe_dead.png"), diff --git a/src/battle_data.py b/src/battle_data.py index 2a7b31c..04be197 100644 --- a/src/battle_data.py +++ b/src/battle_data.py @@ -258,7 +258,7 @@ battles = [ ], "party_sprites": [ ["kefka", "kefka", "kefka"], - ["cursor", "cursor", "cursor"] + ["skeleton", "skeleton_low", "skeleton_dead"], ], "enemy_turn_func": hero_turn_rookies, "mus_id": "mus_getrickrolled", @@ -374,9 +374,9 @@ battles = [ Combatant("Csontmágus", 90, 20, 95, 5, 0, 0, False, False), ], "party_sprites": [ - ["kefka", "kefka", "kefka"], - ["cursor", "cursor", "cursor"], - ["cursor", "cursor", "cursor"] + ["zombie", "zombie_low", "zombie_dead"], + ["zombie", "zombie_low", "zombie_dead"], + ["skeleton", "skeleton_low", "skeleton_dead"], ], "enemy_turn_func": hero_turn_healers, "mus_id": "mus_fnafsux", @@ -447,8 +447,8 @@ battles = [ ], "party_sprites": [ ["kefka", "kefka", "kefka"], - ["cursor", "cursor", "cursor"], - ["cursor", "cursor", "cursor"] + ["witch", "witch_low", "witch_dead"], + ["skeleton", "skeleton_low", "skeleton_dead"], ], "enemy_turn_func": hero_turn_final, "mus_id": "mus_finale", diff --git a/src/gamestates/overworld.py b/src/gamestates/overworld.py index d7eb195..f40b01a 100644 --- a/src/gamestates/overworld.py +++ b/src/gamestates/overworld.py @@ -92,6 +92,7 @@ def start_battle(battle_id): def switch(game): if len(objects) == 1: gamestate.switch_gamestate(game, "credits") + return global music_box in_battle_transition = False