From c9458f3627babadb27de90572fee91b06023c56e Mon Sep 17 00:00:00 2001 From: Luca Junge Date: Sun, 29 Sep 2024 21:52:34 +0200 Subject: [PATCH] now correctly removes player and enemy monster node --- entities/player/player.gd | 2 ++ ui/ingame_menu/ingame_menu.gd | 5 +++-- ui/ingame_menu/party_list_entry.gd | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/entities/player/player.gd b/entities/player/player.gd index 64a8e99..d7e57fd 100644 --- a/entities/player/player.gd +++ b/entities/player/player.gd @@ -127,6 +127,8 @@ func handle_battle() -> void: UI.battle_ui.set_message("You won!") await get_tree().create_timer(3.0).timeout battle_state = Global.BattleState.NOT_IN_BATTLE + enemy.queue_free() + player_monster.queue_free() UI.ingame_menu.update() UI.show_battle_ui(false) UI.show_ingame_controls(true) diff --git a/ui/ingame_menu/ingame_menu.gd b/ui/ingame_menu/ingame_menu.gd index 7e5d85d..bab8ffd 100644 --- a/ui/ingame_menu/ingame_menu.gd +++ b/ui/ingame_menu/ingame_menu.gd @@ -12,9 +12,10 @@ func _on_close_button_pressed() -> void: pass # Replace with function body. func update() -> void: - _update_monster_list() - + pass + func _update_monster_list() -> void: + print("update list") for i in SaveManager.current_save.party.size(): var monster = SaveManager.current_save.party[i] var entry = monster_list_entry.instantiate() diff --git a/ui/ingame_menu/party_list_entry.gd b/ui/ingame_menu/party_list_entry.gd index cfa77f7..214b383 100644 --- a/ui/ingame_menu/party_list_entry.gd +++ b/ui/ingame_menu/party_list_entry.gd @@ -1,11 +1,11 @@ extends HBoxContainer class_name PartyListEntry -func populate(monster) -> void: +func populate(monster: MonsterData) -> void: %MonsterID.text = str(0) %MonsterName.text = monster.name %MonsterLevel.text = "Lvl. %s" % monster.level - %HealthProgressBar.value = monster.health + %HealthProgressBar.value = monster.current_health %HealthProgressBar.max_value = monster.health %ExperienceProgressBar.value = monster.xp %ExperienceProgressBar.max_value = monster.base_xp