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

Big refactor: Fix plugin issues when disabling/reenabling plugins (#598)

Browse Source 
Co-authored-by: balloonpopper <5151242+balloonpopper@users.noreply.github.com>
Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
This commit is contained in:
Julian Murgia
2022-07-10 20:40:08 +02:00
committed by GitHub
parent dfbceadd1c
commit ad79aa69d1
113 changed files with 2977 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
addons/escoria-ui-9verbs/game.gd
View File

@@ -45,10 +45,9 @@ onready var verbs_menu = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/VerbsMargin/verbs_menu
onready var tooltip = $ui/Control/panel_down/VBoxContainer/MarginContainer\
/tooltip
onready var room_select = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/MainMargin/VBoxContainer/room_select
onready var inventory_ui = $ui/Control/panel_down/VBoxContainer/HBoxContainer\
/InventoryMargin/inventory_ui
var room_select
func _enter_tree():
var room_selector_parent = $ui/Control/panel_down/VBoxContainer\
@@ -56,12 +55,11 @@ func _enter_tree():
if ProjectSettings.get_setting("escoria/debug/enable_room_selector") and \
room_selector_parent.get_node_or_null("room_select") == null:
room_selector_parent.add_child(
preload(
"res://addons/escoria-core/ui_library/tools/room_select" +\
"/room_select.tscn"
).instance()
)
room_select = preload(
"res://addons/escoria-core/ui_library/tools/room_select" +\
"/room_select.tscn"
).instance()
room_selector_parent.add_child(room_select)
## BACKGROUND ##
@@ -121,7 +119,8 @@ func element_focused(element_id: String) -> void:
tooltip.set_target(target_obj.tooltip_name)
# Hovering an ESCItem highlights its default action
if escoria.action_manager.current_action != VERB_USE and target_obj is ESCItem:
if escoria.action_manager.current_action != VERB_USE \
and target_obj is ESCItem:
verbs_menu.set_by_name(target_obj.default_action)
ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM:
@@ -302,7 +301,7 @@ func mousewheel_action(_direction: int):
func hide_ui():
$ui/Control.hide()
verbs_menu.hide()
if ProjectSettings.get("escoria/debug/enable_room_selector") == true:
if ESCProjectSettingsManager.get_setting(ESCProjectSettingsManager.ENABLE_ROOM_SELECTOR):
room_select.hide()
inventory_ui.hide()
tooltip.hide()
@@ -311,7 +310,7 @@ func hide_ui():
func show_ui():
$ui/Control.show()
verbs_menu.show()
if ProjectSettings.get("escoria/debug/enable_room_selector") == true:
if ESCProjectSettingsManager.get_setting(ESCProjectSettingsManager.ENABLE_ROOM_SELECTOR):
room_select.show()
inventory_ui.show()
tooltip.show()
@@ -363,8 +362,9 @@ func _on_event_done(_return_code: int, _event_name: String):
func apply_custom_settings(custom_settings: Dictionary):
if custom_settings.has("a_custom_setting"):
escoria.logger.info(
"custom setting value loaded:",
[custom_settings["a_custom_setting"]]
self,
"custom setting value loaded: %s."
% str(custom_settings["a_custom_setting"])
)

20
addons/escoria-ui-9verbs/plugin.gd
View File

@@ -3,16 +3,22 @@ tool
extends EditorPlugin
# Register UI
func _enter_tree() -> void:
call_deferred("_register")
# Override function to return the plugin name.
func get_plugin_name():
return "escoria-ui-9verbs"
# Deregister UI
func _exit_tree() -> void:
escoria.deregister_ui("res://addons/escoria-ui-9verbs/game.tscn")
func disable_plugin():
print("Disabling plugin Escoria UI 9-verbs.")
EscoriaPlugin.deregister_ui("res://addons/escoria-ui-9verbs/game.tscn")
# Register UI with Escoria
func _register():
escoria.register_ui("res://addons/escoria-ui-9verbs/game.tscn")
func enable_plugin():
print("Enabling plugin Escoria UI 9-verbs.")
if not EscoriaPlugin.register_ui(self, "res://addons/escoria-ui-9verbs/game.tscn"):
get_editor_interface().set_plugin_enabled(
get_plugin_name(),
false
)