Fixed a bug where bottle in magical closet room 9 had wrong interaction position.

addons/escoria-core/game/core-scripts/behaviors/movable.gd

@@ -105,15 +105,20 @@ func teleport(target, angle : Object = null) -> void:
 	Teleports the item on target position.
 	target can be Vector2 or Object
 	"""
-	if typeof(target) == TYPE_VECTOR2:
-		escoria.logger.info("Object " + target + " teleported at position" + 
-			str(target) + "with angle", [angle])
+	if typeof(target) == TYPE_VECTOR2 :
+		escoria.logger.info("Object " + parent.global_id + " teleported at position " + 
+			str(target) + " with angle", [angle])
 		parent.position = target
+	elif target is Position2D:
+		escoria.logger.info("Object " + parent.global_id + " teleported at position " + 
+			str(target.position) + " with angle", [angle])
+		parent.position = target.position
 	elif typeof(target) == TYPE_OBJECT:
-		if target.get("interact_positions") != null:
-			parent.position = target.interact_positions.default #.global_position
-		else:
-			parent.position = target.position
+#		if target.get("interact_positions") != null:
+#			parent.position = target.interact_positions.default #.global_position
+#		else:
+#			parent.position = target.position
+		parent.position = target.get_interact_position()
 		escoria.logger.info("Object " + target.name + " teleported at position " 
 			+ str(parent.position) + " with angle ", str(angle))
 	else:
@@ -221,6 +226,8 @@ func update_terrain(on_event_finished_name = null):
 		return
 	if parent.get("is_exit"):
 		return
+	if parent.get("dont_apply_terrain_scaling"):
+		return
 		
 	var pos = parent.position
 	parent.z_index = pos.y if pos.y <= VisualServer.CANVAS_ITEM_Z_MAX else VisualServer.CANVAS_ITEM_Z_MAX

addons/escoria-core/game/core-scripts/escitem.gd

@@ -53,12 +53,13 @@ export(bool) var use_from_inventory_only = false
 # Scene used in inventory for the object if it is picked up
 export(PackedScene) var inventory_item_scene_file : PackedScene 
 
+# Color used for dialogs
 export(Color) var dialog_color = ColorN("white")
 
 
 # Detected interact position set by a Position2D node OUTSIDE OF THE SCENE.
 # You have to add a child to the INSTANCED SCENE, IN THE ROOM SCENE.
-export(Dictionary) var interact_positions : Dictionary = { "default": null}
+#var interact_positions : Dictionary = { "default": null}
 
 # Animation node (null if none was found)
 var animation_sprite
@@ -72,6 +73,9 @@ var terrain : ESCTerrain
 var terrain_is_scalenodes : bool
 var check_maps = true
 var collision
+# If dont_apply_terrain_scaling is true, terrain scaling will not be applied and
+# node will remain at the scale set in the scene.
+export(bool) var dont_apply_terrain_scaling = false
 
 export(int) var speed : int = 300
 export(float) var v_speed_damp : float = 1.0
@@ -111,10 +115,13 @@ func _ready():
 	connect("mouse_entered", self, "_on_mouse_entered")
 	connect("mouse_exited", self, "_on_mouse_exited")
 	connect("input_event", self, "manage_input")
-		
-	init_interact_position_with_node()
 	
-		
+	# Initialize collision variable.
+	for c in get_children():
+		if c is CollisionShape2D or c is CollisionPolygon2D:
+			collision = c
+	
+	# Register and connect all elements to Escoria backoffice.
 	if !Engine.is_editor_hint():
 		escoria.register_object(self)
 		terrain = escoria.room_terrain
@@ -131,7 +138,8 @@ func _ready():
 			connect("body_entered", self, "element_entered")
 			connect("body_exited", self, "element_exited")
 	
-	if !is_exit:
+	# Perform a first terrain scaling if we have to.
+	if !is_exit or dont_apply_terrain_scaling:
 		Movable.last_scale = scale
 		Movable.update_terrain()
 
@@ -144,28 +152,46 @@ func get_animation_player():
 	return animation_sprite
 
 
-"""
-Initialize the interact_position attribute by searching for a Position2D
-node in children nodes. 
-If any is found, the first one is used as interaction position with this hotspot.
-If none is found, we use the CollisionShape2D or CollisionPolygon2D child node's 
-position instead.
-"""
-func init_interact_position_with_node():
-	interact_positions.default = null
+#"""
+#Initialize the interact_position attribute by searching for a Position2D
+#node in children nodes. 
+#If any is found, the first one is used as interaction position with this hotspot.
+#If none is found, we use the CollisionShape2D or CollisionPolygon2D child node's 
+#position instead.
+#"""
+#func init_interact_position_with_node():
+#	interact_positions.default = null
+#	for c in get_children():
+#		if c is Position2D:
+#			# If the position2D node is part of the hotspot, it means it is not an interact position
+#			# but a dialog position for example. Interact position node must be set in the room scene.
+#			if c.get_owner() == self:
+#				continue
+#			var globalpos = c.global_position
+#			interact_positions.default = c.global_position
+#
+#		if c is CollisionShape2D or c is CollisionPolygon2D:
+#			collision = c
+#			if interact_positions.default == null:
+#				interact_positions.default = c.global_position
+
+func get_interact_position() -> Vector2:
+	var interact_position = null
 	for c in get_children():
 		if c is Position2D:
 			# If the position2D node is part of the hotspot, it means it is not an interact position
 			# but a dialog position for example. Interact position node must be set in the room scene.
 			if c.get_owner() == self:
 				continue
-			interact_positions.default = c.global_position
+			interact_position = c.global_position
 			
 		if c is CollisionShape2D or c is CollisionPolygon2D:
-			collision = c
-			if interact_positions.default == null:
-				interact_positions.default = c.global_position	
+			if interact_position == null:
+				interact_position = c.global_position
 		
+	return interact_position
+
+	
 	
 func manage_input(viewport : Viewport, event : InputEvent, shape_idx : int):
 	if event is InputEventMouseButton:

addons/escoria-core/game/core-scripts/esctooltip.gd

@@ -94,7 +94,7 @@ func update_size():
 	var nb_visible_characters = visible_characters
 	var nb_visible_lines = get_visible_line_count()
 	
-	printt("BEFORE", "text_height", content_height, "rtl_height", rect_size.y)
+#	printt("BEFORE", "text_height", content_height, "rtl_height", rect_size.y)
 	
 	# if text is too long and is wrapped
 #	var nblines = float(get_content_height()) / float(ONE_LINE_HEIGHT)
@@ -127,7 +127,7 @@ func update_size():
 	anchor_right = 0.0
 	anchor_bottom = 0.0
 	anchor_left = 0.0
-	printt("AFTER", "text_height", get_content_height(), "rtl_height", rect_size.y)
+#	printt("AFTER", "text_height", get_content_height(), "rtl_height", rect_size.y)
 
 
 func _offset(position):
@@ -151,3 +151,8 @@ func tooltip_distance_to_edge_left(position : Vector2):
 
 func tooltip_distance_to_edge_right(position : Vector2):
 	return escoria.game_size.x - position.x
+
+
+func clear():
+	set_target("")
+	set_target2("")

addons/escoria-core/game/core-scripts/log/logging.gd

@@ -8,8 +8,15 @@ func warning(string : String, args = []):
 
 
 func info(string : String, args = []):
-	var argsstr = str(args) if !args.empty() else ""
-	print("(I)\t" + string + " \t" + argsstr)
+	var argsstr = []
+	if !args.empty():
+		for arg in args:
+			if arg is Array:
+				for p in arg:
+					argsstr.append(p.global_id)
+			else:
+				argsstr.append(str(arg))
+	print("(I)\t" + string + " \t" + str(argsstr))
 	
 	
 func error(string : String, args = []):

addons/escoria-core/game/escoria.gd

@@ -202,8 +202,13 @@ func ev_left_click_on_item(obj, event, default_action = false):
 		var clicked_object_has_interact_position = false
 
 		if esc_runner.get_interactive(obj.global_id):
-			if obj.interact_positions.default != null:
-				destination_position = obj.interact_positions.default#.global_position
+#			if obj.interact_positions.default != null:
+#				destination_position = obj.interact_positions.default#.global_position
+#				clicked_object_has_interact_position = true
+#			else:
+#				destination_position = obj.position
+			if obj.get_interact_position() != null:
+				destination_position = obj.get_interact_position()
 				clicked_object_has_interact_position = true
 			else:
 				destination_position = obj.position