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

10
game/ui/commons/room_select.gd
View File

@@ -6,19 +6,19 @@ var options_paths = []
func _ready():
var rooms_folder = "res://game/rooms/"
var dir = Directory.new()
var i = 1
if dir.open(rooms_folder) == OK:
dir.list_dir_begin(true)
var file_name = dir.get_next()
while file_name != "":
if dir.current_is_dir():
add_item(file_name)
options_paths.push_back("res://game/rooms/" + file_name + "/" + file_name + ".tscn")
i += 1
options_paths.push_back("res://game/rooms/" + file_name + "/" +
file_name + ".tscn")
file_name = dir.get_next()
else:
escoria.report_errors("room_select.gd:_ready()",
escoria.logger.report_errors("room_select.gd:_ready()",
["A problem occurred while opening rooms folder."])
@@ -30,7 +30,7 @@ func _on_button_pressed():
if errors.empty():
#past_actions.text += str(events)
var ret = escoria.esc_runner.run_event(events["debug"])
var _ret = escoria.esc_runner.run_event(events["debug"])
func _on_option_item_selected(index):
selected_id = index

4
game/ui/ui_9verbs/inventory/inventory_ui_container.gd
View File

@@ -23,7 +23,7 @@ func add_item(inventory_item : ESCInventoryItem):
center_container.size_flags_horizontal = SIZE_EXPAND_FILL
center_container.connect("mouse_entered", inventory_item, "_on_inventory_item_mouse_enter")
center_container.connect("mouse_exited", inventory_item, "_on_inventory_item_mouse_exit")
center_container.connect("gui_input", self, "_on_gui_input", [inventory_item])
# center_container.connect("gui_input", self, "_on_gui_input", [inventory_item])
center_container.add_child(inventory_item)
add_child(center_container)
current_nodes_in_container[inventory_item] = center_container
@@ -33,7 +33,7 @@ func remove_item(inventory_item : ESCInventoryItem):
current_nodes_in_container.erase(node_to_remove)
node_to_remove.disconnect("mouse_entered", inventory_item, "_on_inventory_item_mouse_enter")
node_to_remove.disconnect("mouse_exited", inventory_item, "_on_inventory_item_mouse_exit")
node_to_remove.disconnect("pressed", self, "_on_gui_input")
# node_to_remove.disconnect("pressed", self, "_on_gui_input")
remove_child(node_to_remove)
node_to_remove.queue_free()