oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Issue 320 (#396) - Mobile fixes

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: dploeger <dploeger@users.noreply.github.com>
This commit is contained in:
Dennis Ploeger
2021-09-23 08:32:08 +02:00
committed by GitHub
parent bb93dc1ef3
commit 60ea4d851b
82 changed files with 897 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
addons/escoria-ui-simplemouse/game.gd
View File

@@ -32,6 +32,11 @@ Implement methods to react to inputs.
func _ready():
ProjectSettings.set_setting("escoria/ui/tooltip_follows_mouse", true)
escoria.action_manager.connect(
"action_finished",
self,
"_on_action_finished"
)
## BACKGROUND ##
@@ -42,17 +47,11 @@ func left_click_on_bg(position: Vector2) -> void:
[escoria.main.current_scene.player.global_id, position],
true
)
$ui/verbs_layer/verbs_menu.set_by_name("walk")
$ui/verbs_layer/verbs_menu.clear_tool_texture()
$CanvasLayer/ui/HBoxContainer/verbs_menu.set_by_name("walk")
$CanvasLayer/ui/HBoxContainer/verbs_menu.clear_tool_texture()
func right_click_on_bg(position: Vector2) -> void:
escoria.do(
"walk",
[escoria.main.current_scene.player.global_id, position],
true
)
$ui/verbs_layer/verbs_menu.set_by_name("walk")
$ui/verbs_layer/verbs_menu.clear_tool_texture()
mousewheel_action(1)
func left_double_click_on_bg(position: Vector2) -> void:
escoria.do(
@@ -60,22 +59,24 @@ func left_double_click_on_bg(position: Vector2) -> void:
[escoria.main.current_scene.player.global_id, position, true],
true
)
$ui/verbs_layer/verbs_menu.set_by_name("walk")
$ui/verbs_layer/verbs_menu.clear_tool_texture()
$CanvasLayer/ui/HBoxContainer/verbs_menu.set_by_name("walk")
$CanvasLayer/ui/HBoxContainer/verbs_menu.clear_tool_texture()
## ITEM/HOTSPOT FOCUS ##
func element_focused(element_id: String) -> void:
var target_obj = escoria.object_manager.get_object(element_id).node
$ui/tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
$tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
if escoria.action_manager.current_action != "use" \
and escoria.action_manager.current_tool == null:
if target_obj is ESCItem:
$ui/verbs_layer/verbs_menu.set_by_name(target_obj.default_action)
$CanvasLayer/ui/HBoxContainer/verbs_menu.set_by_name(
target_obj.default_action
)
func element_unfocused() -> void:
$ui/tooltip_layer/tooltip.set_target("")
$tooltip_layer/tooltip.set_target("")
## ITEMS ##
@@ -84,7 +85,7 @@ func left_click_on_item(item_global_id: String, event: InputEvent) -> void:
escoria.do("item_left_click", [item_global_id, event], true)
func right_click_on_item(item_global_id: String, event: InputEvent) -> void:
escoria.do("item_right_click", [item_global_id, event], true)
mousewheel_action(1)
func left_double_click_on_item(item_global_id: String, event: InputEvent) -> void:
escoria.do("item_left_click", [item_global_id, event], true)
@@ -98,17 +99,17 @@ func left_click_on_inventory_item(inventory_item_global_id: String, event: Input
inventory_item_global_id
).node
if item.has_method("get_sprite") and item.get_sprite().texture:
$ui/verbs_layer/verbs_menu.set_tool_texture(
$CanvasLayer/ui/HBoxContainer/verbs_menu.set_tool_texture(
item.get_sprite().texture
)
elif item.inventory_item.texture_normal:
$ui/verbs_layer/verbs_menu.set_tool_texture(
$CanvasLayer/ui/HBoxContainer/verbs_menu.set_tool_texture(
item.inventory_item.texture_normal
)
func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
escoria.do("item_right_click", [inventory_item_global_id, event], true)
mousewheel_action(1)
func left_double_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
@@ -116,7 +117,7 @@ func left_double_click_on_inventory_item(inventory_item_global_id: String, event
func inventory_item_focused(inventory_item_global_id: String) -> void:
$ui/tooltip_layer/tooltip.set_target(
$tooltip_layer/tooltip.set_target(
escoria.object_manager.get_object(
inventory_item_global_id
).node.tooltip_name
@@ -124,43 +125,53 @@ func inventory_item_focused(inventory_item_global_id: String) -> void:
func inventory_item_unfocused() -> void:
$ui/tooltip_layer/tooltip.set_target("")
$tooltip_layer/tooltip.set_target("")
func open_inventory():
$ui/inventory_layer/inventory_ui/inventory_button.show_inventory()
$CanvasLayer/ui/HBoxContainer/inventory_ui.show_inventory()
func close_inventory():
$ui/inventory_layer/inventory_ui/inventory_button.close_inventory()
$CanvasLayer/ui/HBoxContainer/inventory_ui.hide_inventory()
func mousewheel_action(direction: int):
$ui/verbs_layer/verbs_menu.iterate_actions_cursor(direction)
$CanvasLayer/ui/HBoxContainer/verbs_menu.iterate_actions_cursor(direction)
func hide_ui():
$ui/inventory_layer/inventory_ui.hide()
$CanvasLayer/ui/HBoxContainer/inventory_ui.hide()
func show_ui():
$ui/inventory_layer/inventory_ui.show()
$CanvasLayer/ui/HBoxContainer/inventory_ui.show()
func _on_event_done(event_name: String):
escoria.action_manager.clear_current_action()
$ui/verbs_layer/verbs_menu.clear_tool_texture()
$CanvasLayer/ui/HBoxContainer/verbs_menu.clear_tool_texture()
func pause_game():
if $ui/pause_menu.visible:
$ui/pause_menu.hide()
if $CanvasLayer/pause_menu.visible:
$CanvasLayer/pause_menu.hide()
escoria.main.current_scene.game.get_node("camera").current = true
escoria.main.current_scene.game.show_ui()
escoria.main.current_scene.show()
else:
$ui/pause_menu.set_save_enabled(escoria.save_manager.save_enabled)
$ui/pause_menu.show()
$CanvasLayer/pause_menu.set_save_enabled(
escoria.save_manager.save_enabled
)
$CanvasLayer/pause_menu.show()
escoria.main.current_scene.game.get_node("camera").current = false
escoria.main.current_scene.game.hide_ui()
escoria.main.current_scene.hide()
func _on_action_finished():
$CanvasLayer/ui/HBoxContainer/verbs_menu.clear_tool_texture()
func _on_MenuButton_pressed() -> void:
pause_game()