From 62f48621a42e6666a246ef6951d482035835db4b Mon Sep 17 00:00:00 2001 From: balloonpopper Date: Mon, 28 Nov 2022 07:17:47 +0000 Subject: [PATCH] chore: storing version and changelog --- CHANGELOG.md | 9 +++++++++ addons/escoria-core/game/core-scripts/esc_item.gd | 2 +- addons/escoria-core/game/esc_inputs_manager.gd | 10 +++++----- addons/escoria-wizard/item_creator.gd | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 844b758b..c0b1139a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [4.0.0-alpha.232](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.232) (2022-11-28) + + +### Bug Fixes + +* Wizard - verify that inventory items are written to valid folders ([36c199a](https://github.com/godot-escoria/escoria-demo-game/commit/36c199a5f56757f1ba346599c201c027acb28fa6)) + + + ## [4.0.0-alpha.231](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.231) (2022-11-21) diff --git a/addons/escoria-core/game/core-scripts/esc_item.gd b/addons/escoria-core/game/core-scripts/esc_item.gd index 84a097ad..8fb0669f 100644 --- a/addons/escoria-core/game/core-scripts/esc_item.gd +++ b/addons/escoria-core/game/core-scripts/esc_item.gd @@ -326,7 +326,7 @@ func _on_input_event(_viewport: Object, event: InputEvent, _shape_idx: int): if c.collider.get("global_id") \ and escoria.action_manager.is_object_actionable(c.collider.global_id): colliding_nodes.push_back(c.collider) - + if colliding_nodes.empty(): return colliding_nodes.sort_custom(HoverStackSorter, "sort_ascending_z_index") diff --git a/addons/escoria-core/game/esc_inputs_manager.gd b/addons/escoria-core/game/esc_inputs_manager.gd index 150e8912..ae51adbc 100644 --- a/addons/escoria-core/game/esc_inputs_manager.gd +++ b/addons/escoria-core/game/esc_inputs_manager.gd @@ -364,7 +364,7 @@ func _on_mouse_entered_item(item: ESCItem) -> void: hotspot_focused = hover_stack.back().global_id escoria.main.current_scene.game.element_focused(hotspot_focused) return - + if not escoria.action_manager.is_object_actionable(item.global_id): escoria.logger.debug( self, @@ -446,7 +446,7 @@ func _on_mouse_left_clicked_item(item: ESCItem, event: InputEvent) -> void: "Ignoring left click on player %s: Player not selectable." % [item.global_id] ) - + # Get next object in hover stack and forward event to it if not hover_stack.empty(): var next_item = hover_stack.pop_back() @@ -463,7 +463,7 @@ func _on_mouse_left_clicked_item(item: ESCItem, event: InputEvent) -> void: hotspot_focused = "" _on_left_click_on_bg(event.position) return - + # Finally, execute the action on the ESCItem hotspot_focused = item.global_id escoria.main.current_scene.game.left_click_on_item( @@ -490,7 +490,7 @@ func _on_mouse_left_double_clicked_item( "Ignoring double left click on player %s: Player not selectable." % [item.global_id] ) - + # Get next object in hover stack and forward event to it if not hover_stack.empty(): var next_item = hover_stack.pop_back() @@ -507,7 +507,7 @@ func _on_mouse_left_double_clicked_item( hotspot_focused = "" _on_double_left_click_on_bg(event.position) return - + # Finally, execute the action on the ESCItem hotspot_focused = item.global_id escoria.main.current_scene.game.left_double_click_on_item( diff --git a/addons/escoria-wizard/item_creator.gd b/addons/escoria-wizard/item_creator.gd index a2bb1c0d..53d81c1d 100644 --- a/addons/escoria-wizard/item_creator.gd +++ b/addons/escoria-wizard/item_creator.gd @@ -40,7 +40,7 @@ func _ready() -> void: # Capture the size of the window before we update its contents so we have # the absolute size before it gets scaled contents applied to it preview_size = get_node(PREVIEW_NODE).rect_size - inventory_mode = not get_node(BACKGROUND_OBJ_NODE).pressed + inventory_mode = not get_node(BACKGROUND_OBJ_NODE).pressed item_creator_reset() @@ -133,7 +133,7 @@ func _on_CreateButton_pressed() -> void: "Folder %s does not exist. Please create or change the destination" % inventory_path get_node(ERROR_WINDOW_NODE).popup_centered() return - + if not image_has_been_loaded: get_node(ERROR_WINDOW_NODE).dialog_text = \ "No image has been loaded."