diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd index 95f19344..a213de82 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd @@ -179,14 +179,14 @@ func _process_input(event: InputEvent, is_default_state: bool) -> bool: escoria.inputs_manager._on_left_click_on_bg(get_global_mouse_position()) return true elif event.is_action_pressed(ESC_UI_CHANGE_VERB_ACTION): - mousewheel_action(1) + escoria.logger.error("Someone invoked ESC_UI_CHANGE_VERB_ACTION:", [event.as_text()]) return true return false ## BACKGROUND ## -func left_click_on_bg(position: Vector2) -> void: +func click_on_bg(position: Vector2) -> void: if escoria.main.current_scene.player: escoria.action_manager.do( escoria.action_manager.ACTION.BACKGROUND_CLICK, @@ -196,8 +196,11 @@ func left_click_on_bg(position: Vector2) -> void: $mouse_layer/verbs_menu.set_by_name(VERB_WALK) $mouse_layer/verbs_menu.clear_tool_texture() +func left_click_on_bg(position: Vector2) -> void: + click_on_bg(position) + func right_click_on_bg(position: Vector2) -> void: - mousewheel_action(1) + click_on_bg(position) func left_double_click_on_bg(position: Vector2) -> void: if escoria.main.current_scene.player: @@ -233,7 +236,7 @@ func element_unfocused() -> void: ## ITEMS ## -func left_click_on_item(item_global_id: String, event: InputEvent) -> void: +func click_on_item(item_global_id: String, event: InputEvent) -> void: var target_obj = escoria.object_manager.get_object(item_global_id).node # current_action will be empty if an event completes between when you stop @@ -249,8 +252,14 @@ func left_click_on_item(item_global_id: String, event: InputEvent) -> void: [item_global_id, event], true ) + +func left_click_on_item(item_global_id: String, event: InputEvent) -> void: + escoria.action_manager.set_current_action("action1") + click_on_item(item_global_id, event) + func right_click_on_item(item_global_id: String, event: InputEvent) -> void: - mousewheel_action(1) + escoria.action_manager.set_current_action("action2") + click_on_item(item_global_id, event) func left_double_click_on_item(item_global_id: String, event: InputEvent) -> void: escoria.action_manager.do( @@ -280,12 +289,12 @@ func left_click_on_inventory_item(inventory_item_global_id: String, event: Input item.inventory_item.texture_normal ) -func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: - mousewheel_action(1) +# func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: +# mousewheel_action(1) -func left_double_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: - pass +# func left_double_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: +# pass func inventory_item_focused(inventory_item_global_id: String) -> void: @@ -308,8 +317,8 @@ func close_inventory(): $CanvasLayer/ui/HBoxContainer/inventory_ui.hide_inventory() -func mousewheel_action(direction: int): - $mouse_layer/verbs_menu.iterate_actions_cursor(direction) +# func mousewheel_action(direction: int): +# $mouse_layer/verbs_menu.iterate_actions_cursor(direction) func hide_ui(): diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/verbs_mouseicons.gd b/gymkhana/addons/escoria-ui-return-monkey-island/verbs_mouseicons.gd index 39df5aef..0e050e28 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/verbs_mouseicons.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/verbs_mouseicons.gd @@ -30,7 +30,7 @@ func iterate_actions_cursor(direction: int): elif current_cursor_id < 0: current_cursor_id = cursors.size() - 1 - Input.set_custom_mouse_cursor(cursors[current_cursor_id].texture) + # Input.set_custom_mouse_cursor(cursors[current_cursor_id].texture) escoria.action_manager.set_current_action(cursors[current_cursor_id].name) if $mouse_position/tool.texture != null: clear_tool_texture() @@ -41,7 +41,7 @@ func set_by_name(name: String) -> void: current_cursor_id = i break - Input.set_custom_mouse_cursor(cursors[current_cursor_id].texture) + # Input.set_custom_mouse_cursor(cursors[current_cursor_id].texture) escoria.action_manager.set_current_action(cursors[current_cursor_id].name) func set_tool_texture(texture: Texture): diff --git a/gymkhana/rooms/home/esc/wall_item.esc b/gymkhana/rooms/home/esc/wall_item.esc index d03fedc6..29d62db6 100755 --- a/gymkhana/rooms/home/esc/wall_item.esc +++ b/gymkhana/rooms/home/esc/wall_item.esc @@ -1,13 +1,5 @@ +:action1 +say player "Action 1" + :action2 -> [eq dialog_advance 0] - say player ROOM1_look_wall_item_1:"I don't know what that stuff is." - set_global dialog_advance 1 - stop -> [eq dialog_advance 1] - say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is." - set_global dialog_advance 2 - stop -> [eq dialog_advance 2] - say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!" - say player ROOM1_look_wall_item_4:"Please stop asking me that!" - stop +say player "Action 2"