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

14
addons/escoria-core/game/scenes/camera_player/esccamera.gd
View File

@@ -6,8 +6,9 @@ onready var tween = $"tween"
var default_limits = {} # This does not change once set
var speed = 0.0
# Target can be object or Vector2. See resove_target_pos()
var target
var target_pos
var target_pos : Vector2
var zoom_time
var zoom_target
@@ -72,6 +73,7 @@ func set_target(p_target, p_speed : float = 0.0):
target = p_target
resolve_target_pos()
escoria.logger.info("Current camera position = " + str(self.global_position))
if speed == 0.0:
self.global_position = target_pos
@@ -80,7 +82,7 @@ func set_target(p_target, p_speed : float = 0.0):
if tween.is_active():
var tweenstat = String(tween.tell()) + "/" + String(tween.get_runtime())
escoria.report_warnings("camera.gd:set_target()",
escoria.logger.report_warnings("camera.gd:set_target()",
["Tween still active running camera_set_target: " + tweenstat])
tween.emit_signal("tween_completed")
@@ -90,7 +92,7 @@ func set_target(p_target, p_speed : float = 0.0):
func set_camera_zoom(p_zoom_level, p_time):
if p_zoom_level <= 0.0:
escoria.report_errors("camera.gd:set_camera_zoom()",
escoria.logger.report_errors("camera.gd:set_camera_zoom()",
["Tried to set negative or zero zoom level"])
zoom_time = p_time
@@ -101,7 +103,7 @@ func set_camera_zoom(p_zoom_level, p_time):
else:
if tween.is_active():
var tweenstat = String(tween.tell()) + "/" + String(tween.get_runtime())
escoria.report_warnings("camera",
escoria.logger.report_warnings("camera",
["Tween still active running camera_set_zoom: " + tweenstat])
tween.emit_signal("tween_completed")
@@ -132,7 +134,7 @@ func push(p_target, p_time, p_type):
else:
if tween.is_active():
var tweenstat = String(tween.tell()) + "/" + String(tween.get_runtime())
escoria.report_warnings("camera",
escoria.logger.report_warnings("camera",
["Tween still active running camera_push: " + tweenstat])
tween.emit_signal("tween_completed")
@@ -156,7 +158,7 @@ func shift(p_x, p_y, p_time, p_type):
if tween.is_active():
var tweenstat = String(tween.tell()) + "/" + String(tween.get_runtime())
escoria.report_warnings("camera",
escoria.logger.report_warnings("camera",
["Tween still active running camera_shift: " + tweenstat])
tween.emit_signal("tween_completed")

4
addons/escoria-core/game/scenes/dialogs/dialog_player.gd
View File

@@ -40,7 +40,7 @@ func preload_resources(path : String):
add_resource(basename, dialog_scene)
file_name = dialog_folder.get_next()
else:
escoria.report_errors("dialog_player.gd:preload_resources()", ["An error occurred when trying to access the path: {_}.".format(path)])
escoria.logger.report_errors("dialog_player.gd:preload_resources()", ["An error occurred when trying to access the path: {_}.".format(path)])
func say(character : String, params : Dictionary):
@@ -60,7 +60,7 @@ func finish_fast():
# timeout_option: (default value 0) option selected when timeout is reached.
func start_dialog_choices(answers : Array, options : Array):
if answers.empty():
escoria.report_errors("dialog_player.gd:start_dialog_choices()", ["Received answers array was empty."])
escoria.logger.report_errors("dialog_player.gd:start_dialog_choices()", ["Received answers array was empty."])
dialog_chooser_ui = get_resource("text_dialog_choice").instance()
get_parent().add_child(dialog_chooser_ui)
dialog_chooser_ui.set_answers(answers)

10
addons/escoria-core/game/scenes/inventory/inventory_ui.gd
View File

@@ -31,7 +31,7 @@ func _ready():
escoria.register_object(self)
if items_container == null or items_container.is_empty():
escoria.report_errors(self.get_path(), ["Items container is empty."])
escoria.logger.report_errors(self.get_path(), ["Items container is empty."])
return
for c in get_node(items_container).get_items():
items_ids_in_inventory[c.item_id] = c
@@ -46,11 +46,11 @@ func add_new_item_by_id(item_id : String) -> void:
item_id = item_id.rsplit("i/", false)[0]
if !items_ids_in_inventory.has(item_id):
if !escoria.esc_runner.check_obj(item_id, "add_new_item_by_id"):
escoria.report_errors("inventory_ui.gd:add_new_item_by_id()",
escoria.logger.report_errors("inventory_ui.gd:add_new_item_by_id()",
["Item global id '"+ item_id + "' does not exist.",
"Check item's id in ESCORIA_ALL_ITEMS scene."])
if !all_items.get_inventory_item(item_id):
escoria.report_errors("inventory_ui.gd:add_new_item_by_id()",
escoria.logger.report_errors("inventory_ui.gd:add_new_item_by_id()",
["Item global id '"+ item_id + "' doesn't have corresponding inventory item.",
"Check item's id in ESCORIA_ALL_ITEMS scene."])
var item_inventory_button = all_items.get_inventory_item(item_id).duplicate()
@@ -104,7 +104,7 @@ func _on_escoria_global_changed(global : String) -> void:
elif escoria.esc_runner.globals[global] == "false":
remove_item_by_id(item[0])
else:
escoria.report_warnings("inventory_ui.gd:_on_escoria_global_changed()", \
escoria.logger.report_warnings("inventory_ui.gd:_on_escoria_global_changed()", \
["Inventory global " + global + " is neither 'true' nor 'false' (was " + escoria.esc_runner.globals[global] + "). "])
else:
escoria.report_errors("inventory_ui.gd:_on_escoria_global_changed()", ["Global must contain 1 item name.", "(received: " + global + ")"])
escoria.logger.report_errors("inventory_ui.gd:_on_escoria_global_changed()", ["Global must contain 1 item name.", "(received: " + global + ")"])