From 29d594e43f986c82f90bfb8b19335e21ef8f3727 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Wed, 28 Jul 2021 09:51:48 +0200 Subject: [PATCH] Fixes an issue with calculating the hover stack which resulted in #324 Fixes #324 Co-authored-by: Dennis Ploeger Co-authored-by: dploeger --- addons/escoria-core/game/escoria.gd | 2 +- addons/escoria-core/game/inputs_manager.gd | 6 +++--- docs/esc.md | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/escoria-core/game/escoria.gd b/addons/escoria-core/game/escoria.gd index e4cd68c4..9dff4506 100644 --- a/addons/escoria-core/game/escoria.gd +++ b/addons/escoria-core/game/escoria.gd @@ -315,7 +315,7 @@ func _ev_left_click_on_item(obj, event, default_action = false): "arrived" ) - self.logger.info("Context arrived: ", [context]) + self.logger.info("Context arrived: %s" % var2str(context)) if context.target_object and \ context.target_object.global_id != walk_context.\ diff --git a/addons/escoria-core/game/inputs_manager.gd b/addons/escoria-core/game/inputs_manager.gd index 94c9960c..34de5991 100644 --- a/addons/escoria-core/game/inputs_manager.gd +++ b/addons/escoria-core/game/inputs_manager.gd @@ -120,9 +120,9 @@ func _on_mouse_entered_item(item: ESCItem) -> void: escoria.logger.info("Item focused: ", [item.global_id]) _clean_hover_stack() - if !hover_stack.empty(): - if item.z_index > hover_stack.back().z_index: - hover_stack.insert(hover_stack.size()-1, item) + if not hover_stack.empty(): + if item.z_index < hover_stack.back().z_index: + hover_stack.insert(hover_stack.size() - 1, item) else: hover_stack.push_back(item) else: diff --git a/docs/esc.md b/docs/esc.md index 727f7500..68e92c15 100644 --- a/docs/esc.md +++ b/docs/esc.md @@ -403,6 +403,7 @@ Makes the `player` walk to the position `x`/`y`. + ## Dialogs Dialogs are specified by writing `?` with optional parameters, followed by a list of dialog options starting with `-`. Use `!` to end the dialog.