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

Finished ESC camera commands reimplementation.

Browse Source 
Some cleaning done, and all logging commands put in escoria.logger script.
This commit is contained in:
Julian Murgia
2021-02-09 08:56:30 +01:00
parent 4f2977ea98
commit 6aa466d6d2
36 changed files with 462 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/escoria-core/template_scenes/dialog_scenes/dialog_box_inset.gd
View File

@@ -43,7 +43,7 @@ func say(character : String, params : Dictionary) :
set_current_character(character)
if !params["line"]:
escoria.report_errors("dialog_box_inset.gd:say()", ["No line field in params!"])
escoria.logger.report_errors("dialog_box_inset.gd:say()", ["No line field in params!"])
return
text_node.bbcode_text = params["line"]

2
addons/escoria-core/template_scenes/dialog_scenes/dialog_label.gd
View File

@@ -29,7 +29,7 @@ func say(character : String, params : Dictionary) :
show()
if !params["line"]:
escoria.report_errors("dialog_box_inset.gd:say()", ["No line field in params!"])
escoria.logger.report_errors("dialog_box_inset.gd:say()", ["No line field in params!"])
return
# Position the RichTextLabel on the character's dialog position, if any.

26
addons/escoria-core/template_scenes/label/action_target_tooltip.gd
View File

@@ -19,32 +19,6 @@ func on_action_selected() -> void:
current_action = escoria.esc_runner.current_action
update_tooltip_text()
#func element_focused(element_id : String) -> void:
# printt("action_target_tooltip.gd:on_element_focused()", "Element focused: ", element_id)
#
# if element_id == "":
# set_target("")
# return
#
# var object = escoria.esc_runner.get_object(element_id)
#
# if object == null or !is_instance_valid(object):
# escoria.report_warnings("action_target_tooltip.gd:on_element_focused()",
# ["Object exists but is not loaded for id " + element_id])
# set_target(element_id)
# return
#
# if !escoria.esc_runner.get_interactive(element_id) and !object is ESCInventoryItem:
# set_target("")
# return
#
# var wait_for_target = false
# if object is ESCItem or object is ESCInventoryItem:
# if current_action in object.combine_if_action_used_among:
# wait_for_target = true
#
# set_target(object.tooltip_name, wait_for_target)
func set_target(target : String, needs_second_target : bool = false) -> void:
current_target = target