Support fixes (#445)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
@@ -92,6 +92,7 @@ func activate(
|
|||||||
if event_returned[0] == ESCExecution.RC_OK:
|
if event_returned[0] == ESCExecution.RC_OK:
|
||||||
escoria.action_manager\
|
escoria.action_manager\
|
||||||
.clear_current_action()
|
.clear_current_action()
|
||||||
|
emit_signal("action_finished")
|
||||||
return event_returned[0]
|
return event_returned[0]
|
||||||
elif combine_with.events.has(combine_with_event)\
|
elif combine_with.events.has(combine_with_event)\
|
||||||
and not combine_with.node.combine_is_one_way:
|
and not combine_with.node.combine_is_one_way:
|
||||||
@@ -137,8 +138,10 @@ func activate(
|
|||||||
escoria.logger.report_warnings(
|
escoria.logger.report_warnings(
|
||||||
"ESCActionManager.activate: Invalid action on item",
|
"ESCActionManager.activate: Invalid action on item",
|
||||||
[
|
[
|
||||||
"Trying to combine object %s with %s, "+
|
(
|
||||||
"but %s is not in inventory." % [
|
"Trying to combine object %s with %s, "+
|
||||||
|
"but %s is not in inventory."
|
||||||
|
) % [
|
||||||
target.global_id,
|
target.global_id,
|
||||||
combine_with.global_id,
|
combine_with.global_id,
|
||||||
combine_with.global_id
|
combine_with.global_id
|
||||||
|
|||||||
@@ -62,8 +62,10 @@ func _ready():
|
|||||||
if camera_limits.empty():
|
if camera_limits.empty():
|
||||||
camera_limits.push_back(Rect2())
|
camera_limits.push_back(Rect2())
|
||||||
if camera_limits.size() == 1 and camera_limits[0].has_no_area():
|
if camera_limits.size() == 1 and camera_limits[0].has_no_area():
|
||||||
camera_limits[0] = \
|
for child in get_children():
|
||||||
Rect2(0, 0, $background.rect_size.x, $background.rect_size.y)
|
if child is ESCBackground:
|
||||||
|
camera_limits[0] = \
|
||||||
|
Rect2(0, 0, child.rect_size.x, child.rect_size.y)
|
||||||
|
|
||||||
if Engine.is_editor_hint():
|
if Engine.is_editor_hint():
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -183,7 +183,8 @@ func mousewheel_action(_direction: int):
|
|||||||
func hide_ui():
|
func hide_ui():
|
||||||
$ui/Control.hide()
|
$ui/Control.hide()
|
||||||
verbs_menu.hide()
|
verbs_menu.hide()
|
||||||
room_select.hide()
|
if ProjectSettings.get("escoria/debug/enable_room_selector") == true:
|
||||||
|
room_select.hide()
|
||||||
inventory_ui.hide()
|
inventory_ui.hide()
|
||||||
tooltip.hide()
|
tooltip.hide()
|
||||||
|
|
||||||
@@ -191,7 +192,8 @@ func hide_ui():
|
|||||||
func show_ui():
|
func show_ui():
|
||||||
$ui/Control.show()
|
$ui/Control.show()
|
||||||
verbs_menu.show()
|
verbs_menu.show()
|
||||||
room_select.show()
|
if ProjectSettings.get("escoria/debug/enable_room_selector") == true:
|
||||||
|
room_select.show()
|
||||||
inventory_ui.show()
|
inventory_ui.show()
|
||||||
tooltip.show()
|
tooltip.show()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user