diff --git a/res/mus/credits.wav b/res/mus/credits.wav new file mode 100644 index 0000000..bbd0ed8 Binary files /dev/null and b/res/mus/credits.wav differ diff --git a/res/mus/decisive.wav b/res/mus/decisive.wav new file mode 100644 index 0000000..75d9a3b Binary files /dev/null and b/res/mus/decisive.wav differ diff --git a/res/mus/finale.wav b/res/mus/finale.wav new file mode 100644 index 0000000..f974d94 Binary files /dev/null and b/res/mus/finale.wav differ diff --git a/res/mus/getrickrolled.wav b/res/mus/getrickrolled.wav new file mode 100644 index 0000000..182ae47 Binary files /dev/null and b/res/mus/getrickrolled.wav differ diff --git a/res/mus/hatred.wav b/res/mus/hatred.wav new file mode 100644 index 0000000..ea883c5 Binary files /dev/null and b/res/mus/hatred.wav differ diff --git a/src/assets.py b/src/assets.py index 7544ce6..300923f 100644 --- a/src/assets.py +++ b/src/assets.py @@ -24,6 +24,11 @@ sprites = { } sounds = { - "mus_fnafsux": pygame.mixer.Sound("res/mus/fnafsux.wav"), - "sfx_encounter": pygame.mixer.Sound("res/sfx/encounter.wav") + "mus_hatred" : pygame.mixer.Sound("res/mus/hatred.wav"), + "mus_getrickrolled" : pygame.mixer.Sound("res/mus/getrickrolled.wav"), + "mus_decisive" : pygame.mixer.Sound("res/mus/decisive.wav"), + "mus_fnafsux" : pygame.mixer.Sound("res/mus/fnafsux.wav"), + "mus_finale" : pygame.mixer.Sound("res/mus/finale.wav"), + "mus_credits" : pygame.mixer.Sound("res/mus/credits.wav"), + "sfx_encounter" : pygame.mixer.Sound("res/sfx/encounter.wav"), } diff --git a/src/battle_data.py b/src/battle_data.py index 9112b62..2a7b31c 100644 --- a/src/battle_data.py +++ b/src/battle_data.py @@ -261,7 +261,7 @@ battles = [ ["cursor", "cursor", "cursor"] ], "enemy_turn_func": hero_turn_rookies, - "mus_id": "mus_fnafsux", + "mus_id": "mus_getrickrolled", "init_ai_data": _hero_moves(can_petrify=False), "menus": [ [ # Mordrak @@ -319,7 +319,7 @@ battles = [ ["dwagon", "dwagon_low", "dwagon_dead"], ], "enemy_turn_func": hero_turn_elemental, - "mus_id": "mus_fnafsux", + "mus_id": "mus_decisive", "init_ai_data": _hero_moves(can_petrify=False), "menus": [ [ # Ignisza @@ -451,7 +451,7 @@ battles = [ ["cursor", "cursor", "cursor"] ], "enemy_turn_func": hero_turn_final, - "mus_id": "mus_fnafsux", + "mus_id": "mus_finale", "init_ai_data": _hero_moves(can_petrify=True), "menus": [ [ # Zagorath diff --git a/src/gamestates/credits.py b/src/gamestates/credits.py index 8fac8b3..e2c0d06 100644 --- a/src/gamestates/credits.py +++ b/src/gamestates/credits.py @@ -3,18 +3,18 @@ import text import assets import gamestate -CREDITS_MUSIC = "mus_fnafsux" +CREDITS_MUSIC = "mus_credits" CREDITS_LENGTH = 10 -SCROLL_SPEED = 10 +SCROLL_SPEED = 5 -cred_text = text.TextRenderer(90, 180, 210) +cred_text = text.TextRenderer(128, 180, None, True) end_text = text.TextRenderer(128, 100, None, True) end_visible = False t = 0 def switch(game): assets.sounds[CREDITS_MUSIC].play() - cred_text.reset("Gratulálunk, sikerült kivinni a játékot!") + cred_text.reset("Gratulálunk, sikerült kivinni a játékot!\n\n\n\n\n\n\n==Programozás==\nMarkó József Attila\n\n") cred_text.type_all() end_text.reset("Vége!") end_text.type_all() diff --git a/src/gamestates/overworld.py b/src/gamestates/overworld.py index 885e000..d7eb195 100644 --- a/src/gamestates/overworld.py +++ b/src/gamestates/overworld.py @@ -8,7 +8,7 @@ from objects import BalthasarRenderer, OverworldMap, BattlePodium, DIR_UP, DIR_L WALK_SPEED = 48 -OVERWORLD_MUSIC = "mus_fnafsux" +OVERWORLD_MUSIC = "mus_hatred" music_box = None balthasar = BalthasarRenderer(96,16)