Issue 320 (#396) - Mobile fixes

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

View File

@@ -30,18 +30,22 @@ Implement methods to react to inputs.
- _on_event_done(event_name: String)
"""
onready var verbs_menu = $ui/panel_down/verbs_layer/verbs_menu
onready var tooltip = $ui/panel_down/tooltip_layer/tooltip
onready var verbs_menu = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/VerbsMargin/verbs_menu
onready var tooltip = $ui/Control/panel_down/VBoxContainer/tooltip
onready var room_select = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/MainMargin/VBoxContainer/room_select
onready var pause_menu = $ui/pause_menu
onready var inventory_ui = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/InventoryMargin/inventory_ui
func _ready():
ProjectSettings.set_setting("escoria/ui/tooltip_follows_mouse", false)
func _input(event):
if event.is_action_pressed("switch_action_verb"):
if event.button_index == BUTTON_WHEEL_UP:
escoria.inputs_manager._on_mousewheel_action(-1)
elif event.button_index == BUTTON_WHEEL_DOWN:
escoria.inputs_manager._on_mousewheel_action(1)
escoria.action_manager.connect(
"action_finished",
self,
"_on_action_finished"
)
## BACKGROUND ##
@@ -90,7 +94,6 @@ func element_focused(element_id: String) -> void:
func element_unfocused() -> void:
tooltip.clear()
verbs_menu.unselect_actions()
## ITEMS ##
@@ -151,18 +154,18 @@ func mousewheel_action(_direction: int):
func hide_ui():
$ui/panel_down.hide()
$ui/Control.hide()
verbs_menu.hide()
$ui/panel_down/verbs_layer/room_select.hide()
$ui/panel_down/inventory_layer/inventory_ui.hide()
room_select.hide()
inventory_ui.hide()
tooltip.hide()
func show_ui():
$ui/panel_down.show()
$ui/Control.show()
verbs_menu.show()
$ui/panel_down/verbs_layer/room_select.show()
$ui/panel_down/inventory_layer/inventory_ui.show()
room_select.show()
inventory_ui.show()
tooltip.show()
func _on_event_done(_event_name: String):
@@ -171,16 +174,24 @@ func _on_event_done(_event_name: String):
func pause_game():
if $ui/pause_menu.visible:
$ui/pause_menu.hide()
if pause_menu.visible:
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()
escoria.set_game_paused(false)
else:
$ui/pause_menu.set_save_enabled(escoria.save_manager.save_enabled)
$ui/pause_menu.show()
pause_menu.set_save_enabled(escoria.save_manager.save_enabled)
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()
escoria.set_game_paused(true)
func _on_MenuButton_pressed() -> void:
pause_game()
func _on_action_finished() -> void:
verbs_menu.unselect_actions()