diff --git a/mkenv.sh b/mkenv.sh index bc72dd5..4d13bc2 100644 --- a/mkenv.sh +++ b/mkenv.sh @@ -1,2 +1,2 @@ python -m venv venv -./venv/bin/pip install arcade +./venv/bin/pip install arcade pygame diff --git a/mkvenv.bat b/mkvenv.bat index cf7ba84..729076a 100644 --- a/mkvenv.bat +++ b/mkvenv.bat @@ -1,2 +1,2 @@ python -m venv venv -.\venv\Scripts\pip install arcade +.\venv\Scripts\pip install arcade pygame diff --git a/res/mus/fnafsux.wav b/res/mus/fnafsux.wav new file mode 100644 index 0000000..7e51b26 Binary files /dev/null and b/res/mus/fnafsux.wav differ diff --git a/src/assets.py b/src/assets.py index 12e0d74..1e6c824 100644 --- a/src/assets.py +++ b/src/assets.py @@ -1,4 +1,7 @@ import arcade +import pygame + +pygame.mixer.init() sprites = { "cursor" : arcade.load_texture("res/sprite/handcursor.png"), @@ -7,3 +10,7 @@ sprites = { "balthasar": arcade.load_spritesheet("res/sprite/balthasar.png"), "overworld": arcade.load_spritesheet("res/sprite/overworld_sheet.png"), } + +sounds = { + "mus_fnafsux": pygame.mixer.Sound("res/mus/fnafsux.wav") +} diff --git a/src/gamestate.py b/src/gamestate.py index ef334d1..6055255 100644 --- a/src/gamestate.py +++ b/src/gamestate.py @@ -1,11 +1,13 @@ import gamestates.none import gamestates.title import gamestates.overworld +import gamestates.battle gamestates = { "none": gamestates.none, "title": gamestates.title, - "overworld": gamestates.overworld + "overworld": gamestates.overworld, + "battle": gamestates.battle } gamestate = "none" diff --git a/src/gamestates/battle.py b/src/gamestates/battle.py new file mode 100644 index 0000000..b49babd --- /dev/null +++ b/src/gamestates/battle.py @@ -0,0 +1,19 @@ +import arcade +import assets +import controls +import text + +text = text.TextRenderer(100, 186, 210) +battle_music = None + +def switch(game): + global battle_music + battle_music = assets.sounds["mus_fnafsux"].play(loops=True) + text.reset("ASDF") + text.type_all() + +def update(game, dt): + pass + +def draw(game): + text.render() diff --git a/src/gamestates/none.py b/src/gamestates/none.py index 8bb4861..f37c04b 100644 --- a/src/gamestates/none.py +++ b/src/gamestates/none.py @@ -2,4 +2,4 @@ import gamestate # Azért létezik ez a "none" gamestate hogy meghívja az elsö gamestate init() funkcióját def update(game, dt): - gamestate.switch_gamestate(game, "overworld") + gamestate.switch_gamestate(game, "battle")