diff --git a/src/gamestates/battle.py b/src/gamestates/battle.py index 19bcd01..9683315 100644 --- a/src/gamestates/battle.py +++ b/src/gamestates/battle.py @@ -32,12 +32,12 @@ action_text = TextRenderer(110, 215, 210) menu_open = 0 menu_queue = [] menu = [] +enemy_selector = [] battle_id = 0 def switch(game): global enemies, party_members, battle_music, enemy_turn, enemy_ai_data, party_menus, spells, inventory - print("asdfasdfasdf") enemies = copy.deepcopy(battle_data.battles[battle_id]["enemies"]) party_members = copy.deepcopy(battle_data.battles[battle_id]["party_members"]) enemy_turn = copy.deepcopy(battle_data.battles[battle_id]["enemy_turn_func"]) @@ -47,10 +47,15 @@ def switch(game): inventory = copy.deepcopy(battle_data.battles[battle_id]["inventory"]) battle_music = assets.sounds[battle_data.battles[battle_id]["mus_id"]].play(loops=True) -def open_menu(whose): +def open_menu(data): + global menu + + whose, junk, aparty, eparty = data + menu = [] + party_idx = party_members.index(whose) for i, m in enumerate(party_menus[party_idx]): - menu.append(MenuItem(m[0], 19, 64-(i*13), None, None, None, None, menu_action, (whose, party_members, enemies, m[1]))) + menu.append(MenuItem(m[0], 19, 64-(i*13), None, None, None, None, menu_action, (whose, aparty, eparty, m[1]))) for i, m in enumerate(menu): m.up = menu[(i - 1) % len(menu)] @@ -85,7 +90,8 @@ def open_spell_menu(user, aparty, eparty): None, None, spell_action, - (user, spell, aparty, eparty) + (user, spell, aparty, eparty), + open_menu ) ) @@ -130,7 +136,8 @@ def open_item_menu(user, aparty, eparty): None, None, item_action, - (user, item, aparty, eparty) + (user, item, aparty, eparty), + open_menu ) ) @@ -242,7 +249,7 @@ def update(game, dt): menu_open = whose menu_text.reset(f"{whose.name}'s Menu") menu_text.type_all() - open_menu(whose) + open_menu((whose, 67, party_members, enemies)) for m in menu: m.update() @@ -268,6 +275,9 @@ def draw(game): for m in menu: m.render() + for s in enemy_selector: + s.render() + party_text.render() ene_text.render() menu_text.render()