Implemented tooltip follows mouse (not perfect).

Fixed bug when using mousewheel action on inventory items.
Added a debug mode for tooltip following mouse

game/items/escitems/bottle_escitem.tscn

@@ -18,10 +18,10 @@ use_from_inventory_only = true
 inventory_item_scene_file = ExtResource( 3 )
 dialog_color = Color( 1, 1, 1, 1 )
 interact_positions = {
-"default": Vector2( 59.3937, 58.8658 )
+"default": Vector2( 0, 0 )
 }
 
-[node name="Sprite" type="Sprite" parent="."]
+[node name="sprite" type="Sprite" parent="."]
 texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

game/items/escitems/pen_escitem.tscn

@@ -16,11 +16,12 @@ default_action = "look"
 combine_if_action_used_among = PoolStringArray( "use", "give" )
 use_from_inventory_only = true
 inventory_item_scene_file = ExtResource( 3 )
+dialog_color = Color( 1, 1, 1, 1 )
 interact_positions = {
-"default": null
+"default": Vector2( 0, 0 )
 }
 
-[node name="pen" type="Sprite" parent="."]
+[node name="sprite" type="Sprite" parent="."]
 texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

game/rooms/room2/room2.tscn

@@ -16,8 +16,18 @@ player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
 
 [node name="walkable_area" parent="." instance=ExtResource( 1 )]
+scales = null
+bitmaps_scale = Vector2( 1, 1 )
+lightmap = null
+player_speed_multiplier = 1.0
+player_doubleclick_speed_multiplier = 1.5
+lightmap_modulate = Color( 1, 1, 1, 1 )
+debug_mode = 1
+scale_min = 0.3
+scale_max = 1.0
 
 [node name="background" parent="." instance=ExtResource( 2 )]
+esc_script = ""
 
 [node name="room_label" type="Label" parent="background"]
 margin_right = 40.0
@@ -34,13 +44,26 @@ __meta__ = {
 script = ExtResource( 7 )
 global_id = "r2_right_platform"
 esc_script = "res://game/rooms/room2/esc/right_platform.esc"
+is_exit = false
+is_trigger = false
+trigger_in_verb = "trigger_in"
+trigger_out_verb = "trigger_out"
+is_interactive = true
+player_orients_on_arrival = true
 interaction_direction = 3
 tooltip_name = "Right platform"
 default_action = "look"
+combine_if_action_used_among = PoolStringArray(  )
+combine_is_one_way = false
+use_from_inventory_only = false
+inventory_item_scene_file = null
 dialog_color = Color( 1, 1, 1, 1 )
 interact_positions = {
 "default": Vector2( 430.893, 451.052 )
 }
+animations = null
+speed = 300
+v_speed_damp = 1.0
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_platform"]
 polygon = PoolVector2Array( 870.974, 538.342, 827.536, 353.995, 1181.4, 357.174, 1287.34, 413.325, 1289.46, 545.758 )
@@ -53,12 +76,25 @@ script = ExtResource( 7 )
 global_id = "r2_r_exit"
 esc_script = "res://game/rooms/room2/esc/right_exit.esc"
 is_exit = true
+is_trigger = false
+trigger_in_verb = "trigger_in"
+trigger_out_verb = "trigger_out"
+is_interactive = true
+player_orients_on_arrival = true
+interaction_direction = 0
 tooltip_name = "Right exit"
 default_action = "walk"
+combine_if_action_used_among = PoolStringArray(  )
+combine_is_one_way = false
+use_from_inventory_only = false
+inventory_item_scene_file = null
 dialog_color = Color( 1, 1, 1, 1 )
 interact_positions = {
 "default": Vector2( 1225.47, 353.99 )
 }
+animations = null
+speed = 300
+v_speed_damp = 1.0
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"]
 polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 )
@@ -71,12 +107,25 @@ script = ExtResource( 7 )
 global_id = "r2_l_exit"
 esc_script = "res://game/rooms/room2/esc/left_exit.esc"
 is_exit = true
+is_trigger = false
+trigger_in_verb = "trigger_in"
+trigger_out_verb = "trigger_out"
+is_interactive = true
+player_orients_on_arrival = true
+interaction_direction = 0
 tooltip_name = "Left exit"
 default_action = "walk"
+combine_if_action_used_among = PoolStringArray(  )
+combine_is_one_way = false
+use_from_inventory_only = false
+inventory_item_scene_file = null
 dialog_color = Color( 1, 1, 1, 1 )
 interact_positions = {
 "default": Vector2( 52.1462, 384.691 )
 }
+animations = null
+speed = 300
+v_speed_damp = 1.0
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"]
 polygon = PoolVector2Array( -1.37926, 443.158, 7.96461, 122.796, 84.0504, 77.4118, 88.055, 377.751 )
@@ -88,10 +137,24 @@ position = Vector2( 52.1462, 384.691 )
 position = Vector2( 958.107, 176.401 )
 global_id = "r2_button_right"
 esc_script = "res://game/rooms/room2/esc/button.esc"
+is_exit = false
+is_trigger = false
+trigger_in_verb = "trigger_in"
+trigger_out_verb = "trigger_out"
+is_interactive = true
+player_orients_on_arrival = true
+interaction_direction = 0
+combine_if_action_used_among = PoolStringArray(  )
+combine_is_one_way = false
+use_from_inventory_only = false
+inventory_item_scene_file = null
 dialog_color = Color( 0, 1, 0.109804, 1 )
 interact_positions = {
 "default": Vector2( 987.537, 371.812 )
 }
+animations = null
+speed = 300
+v_speed_damp = 1.0
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_right"]
 position = Vector2( 29.4302, 195.411 )
@@ -103,10 +166,24 @@ __meta__ = {
 position = Vector2( 288.82, 171.439 )
 global_id = "r2_button"
 esc_script = "res://game/rooms/room2/esc/button.esc"
+is_exit = false
+is_trigger = false
+trigger_in_verb = "trigger_in"
+trigger_out_verb = "trigger_out"
+is_interactive = true
+player_orients_on_arrival = true
+interaction_direction = 0
+combine_if_action_used_among = PoolStringArray(  )
+combine_is_one_way = false
+use_from_inventory_only = false
+inventory_item_scene_file = null
 dialog_color = Color( 0, 1, 0.109804, 1 )
 interact_positions = {
 "default": Vector2( 313.488, 368.437 )
 }
+animations = null
+speed = 300
+v_speed_damp = 1.0
 
 [node name="Position2D" type="Position2D" parent="Hotspots/button_left"]
 position = Vector2( 24.6681, 196.998 )

game/rooms/room5/room5.tscn

@@ -77,6 +77,15 @@ text = "ROOM 5"
 
 [node name="walkable_area" type="Navigation2D" parent="."]
 script = ExtResource( 1 )
+scales = null
+bitmaps_scale = Vector2( 1, 1 )
+lightmap = null
+player_speed_multiplier = 1.0
+player_doubleclick_speed_multiplier = 1.5
+lightmap_modulate = Color( 1, 1, 1, 1 )
+debug_mode = 1
+scale_min = 0.3
+scale_max = 1.0
 
 [node name="platform" type="NavigationPolygonInstance" parent="walkable_area"]
 position = Vector2( 6.73163, -264.779 )
@@ -150,7 +159,6 @@ position = Vector2( -77.4207, 0 )
 
 [node name="pen" parent="Hotspots" instance=ExtResource( 10 )]
 position = Vector2( 909.908, 443.451 )
-dialog_color = Color( 1, 1, 1, 1 )
 interact_positions = {
 "default": Vector2( 909.908, 443.451 )
 }

game/ui/ui_9verbs/game.gd

@@ -31,9 +31,6 @@ Implement methods to react to inputs.
 - _on_event_done(event_name: String)
 """
 
-func _ready():
-	escoria.esc_runner.connect("event_done", self, "_on_event_done")
-
 
 func _input(event):
 	if event.is_action_pressed("switch_action_verb"):

game/ui/ui_9verbs/game.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://game/ui/ui_9verbs/tooltip/action_target_tooltip.tscn" type="PackedScene" id=1]
 [ext_resource path="res://game/ui/ui_9verbs/inventory/inventory_ui.tscn" type="PackedScene" id=2]
@@ -7,6 +7,7 @@
 [ext_resource path="res://game/ui/ui_9verbs/game.gd" type="Script" id=5]
 [ext_resource path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" type="PackedScene" id=6]
 [ext_resource path="res://game/ui/commons/room_select.tscn" type="PackedScene" id=7]
+[ext_resource path="res://game/ui/ui_9verbs/tooltip/tooltip_action_target.gd" type="Script" id=8]
 
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0.6, 0.6, 0.6, 0.5 )
@@ -54,14 +55,15 @@ margin_bottom = 615.331
 layer = 2
 
 [node name="tooltip" parent="ui/tooltip_layer" instance=ExtResource( 1 )]
-anchor_left = 0.208
-anchor_top = 0.722
-anchor_right = 0.734
-anchor_bottom = 0.77
-margin_left = 0.383453
-margin_top = 0.364075
-margin_right = 0.103394
-margin_bottom = -0.0359497
+anchor_left = 0.132
+anchor_top = 0.719
+anchor_right = 0.832
+anchor_bottom = 0.767
+margin_left = 0.0272522
+margin_top = 0.320557
+margin_right = -0.252686
+margin_bottom = -0.0794678
+script = ExtResource( 8 )
 
 [node name="dialog_layer" type="CanvasLayer" parent="ui"]
 layer = 3

game/ui/ui_9verbs/tooltip/action_target_tooltip.gd

@@ -1,55 +0,0 @@
-extends RichTextLabel
-
-# Infinitive verb
-var current_action : String
-# Target item/hotspot
-var current_target : String
-# Preposition: on, with...
-var current_prep : String = "with"
-# Target 2 item/hotspot
-var current_target2 : String
-
-var waiting_for_target2 = false
-
-func _ready():
-	escoria.esc_runner.connect("action_changed", self, "on_action_selected")
-
-
-func on_action_selected() -> void:
-	current_action = escoria.esc_runner.current_action
-	update_tooltip_text()
-
-
-func set_target(target : String, needs_second_target : bool = false) -> void:
-	current_target = target
-	if needs_second_target:
-		waiting_for_target2 = true
-	
-	update_tooltip_text()
-
-
-func set_target2(target2 : String) -> void:
-	current_target2 = target2
-	update_tooltip_text()
-
-
-func update_tooltip_text():
-	bbcode_text = "[center]"
-	
-	if !current_action.empty():
-		bbcode_text += current_action
-		bbcode_text += "\t"
-		
-	bbcode_text += current_target
-	
-	if waiting_for_target2 and current_target2.empty():
-		bbcode_text += "\t"
-		bbcode_text += current_prep
-		
-	if !current_target2.empty():
-		bbcode_text += "\t"
-		bbcode_text += current_prep
-		bbcode_text += "\t"
-		bbcode_text += current_target2
-	
-	bbcode_text += "[/center]"

game/ui/ui_9verbs/tooltip/action_target_tooltip.tscn

@@ -1,7 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/assets/fonts/onesize/ONESIZE_.TTF" type="DynamicFontData" id=1]
-[ext_resource path="res://game/ui/ui_9verbs/tooltip/action_target_tooltip.gd" type="Script" id=2]
 
 [sub_resource type="DynamicFont" id=1]
 size = 30
@@ -11,16 +10,44 @@ font_data = ExtResource( 1 )
 size = 30
 font_data = ExtResource( 1 )
 
+[sub_resource type="GDScript" id=3]
+script/source = "extends ESCTooltip
+
+
+func update_tooltip_text():
+	bbcode_text = \"[center]\"
+	
+	if !current_action.empty():
+		bbcode_text += current_action
+		bbcode_text += \"\\t\"
+		
+	bbcode_text += current_target
+	
+	if waiting_for_target2 and current_target2.empty():
+		bbcode_text += \"\\t\"
+		bbcode_text += current_prep
+		
+	if !current_target2.empty():
+		bbcode_text += \"\\t\"
+		bbcode_text += current_prep
+		bbcode_text += \"\\t\"
+		bbcode_text += current_target2
+	
+	bbcode_text += \"[/center]\"
+"
+
 [node name="tooltip" type="RichTextLabel"]
-anchor_right = 0.526
+anchor_right = 0.7
 anchor_bottom = 0.06
-margin_right = -0.280029
+margin_left = 1.49829
+margin_right = 1.21826
 margin_bottom = -10.0
 custom_fonts/mono_font = SubResource( 1 )
 custom_fonts/normal_font = SubResource( 2 )
 bbcode_enabled = true
+bbcode_text = "[center][/center]"
 scroll_active = false
-script = ExtResource( 2 )
+script = SubResource( 3 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

game/ui/ui_9verbs/tooltip/tooltip_action_target.gd

@@ -0,0 +1,17 @@
+extends ESCTooltip
+
+func update_tooltip_text():
+	push_align(RichTextLabel.ALIGN_CENTER)
+
+	if !current_action.empty():
+		add_text(current_action + "\t")
+
+	add_text(current_target)
+
+	if waiting_for_target2 and current_target2.empty():
+		add_text("\t" + current_prep)
+
+	if !current_target2.empty():
+		add_text("\t" + current_prep + "\t" + current_target2)
+
+	pop()

game/ui/ui_mouse_icons/game.gd

@@ -11,17 +11,15 @@ Implement methods to react to inputs.
 - element_focused(element_id : String)
 - element_unfocused()
 
-- left_click_on_hotspot(hotspot_global_id : String, event : InputEvent)
-- right_click_on_hotspot(hotspot_global_id : String, event : InputEvent)
-- left_double_click_on_hotspot(hotspot_global_id : String, event : InputEvent)
-
 - left_click_on_item(item_global_id : String, event : InputEvent)
 - right_click_on_item(item_global_id : String, event : InputEvent)
 - left_double_click_on_item(item_global_id : String, event : InputEvent)
 
-- inventory_item_focused(inventory_item_global_id : String) -> void
-- inventory_item_unfocused() -> void
-
+- left_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
+- right_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
+- left_double_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
+- inventory_item_focused(inventory_item_global_id : String)
+- inventory_item_unfocused()
 - open_inventory()
 - close_inventory()
 
@@ -31,7 +29,6 @@ Implement methods to react to inputs.
 - show_ui()
 
 - _on_event_done(event_name: String)
-- update_tooltip_position(p_position : Vector2)
 
 """
 
@@ -40,27 +37,32 @@ Implement methods to react to inputs.
 func left_click_on_bg(position : Vector2) -> void:
 	escoria.do("walk", ["player", position])
 	$ui/verbs_layer/verbs_menu.set_by_name("walk")
+	$ui/verbs_layer/verbs_menu.clear_tool_texture()
 	
 func right_click_on_bg(position : Vector2) -> void:
 	escoria.do("walk", ["player", position])
 	$ui/verbs_layer/verbs_menu.set_by_name("walk")
+	$ui/verbs_layer/verbs_menu.clear_tool_texture()
 	
 func left_double_click_on_bg(position : Vector2) -> void:
 	escoria.do("walk", ["player", position, true])
 	$ui/verbs_layer/verbs_menu.set_by_name("walk")
+	$ui/verbs_layer/verbs_menu.clear_tool_texture()
 
 ## ITEM/HOTSPOT FOCUS ## 
 
 func element_focused(element_id : String) -> void:
 	var target_obj = escoria.esc_runner.get_object(element_id)
-	$ui/tooltip_layer/tooltip.text = target_obj.tooltip_name
-	
+	$ui/tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
+	$ui/tooltip_layer/tooltip.show()
+
 	if escoria.esc_runner.current_action != "use" && escoria.esc_runner.current_tool == null:
 		if target_obj is ESCItem:
 			$ui/verbs_layer/verbs_menu.set_by_name(target_obj.default_action)
 
 func element_unfocused() -> void:
-	$ui/tooltip_layer/tooltip.text = ""
+	$ui/tooltip_layer/tooltip.set_target("")
+	$ui/tooltip_layer/tooltip.hide()
 
 
 ## ITEMS ##
@@ -80,8 +82,8 @@ func left_click_on_inventory_item(inventory_item_global_id : String, event : Inp
 	escoria.do("item_left_click", [inventory_item_global_id, event])
 	if escoria.esc_runner.current_action == "use":
 		var item = escoria.esc_runner.get_object(inventory_item_global_id)
-		if item.texture:
-			$ui/verbs_layer/verbs_menu.set_tool_texture(item.texture)
+		if item.get_node("sprite").texture:
+			$ui/verbs_layer/verbs_menu.set_tool_texture(item.get_node("sprite").texture)
 		elif item.inventory_item_scene_file.instance().texture_normal:
 			$ui/verbs_layer/verbs_menu.set_tool_texture(item.inventory_item_scene_file.instance().texture_normal)
 			
@@ -117,8 +119,4 @@ func show_ui():
 
 func _on_event_done(event_name: String):
 	escoria.esc_runner.clear_current_action()
-
-
-func update_tooltip_position(p_position : Vector2):
-#	 + Vector2(-200,-50)
-	$ui/tooltip_layer/tooltip.global_position = p_position
+	$ui/verbs_layer/verbs_menu.clear_tool_texture()

game/ui/ui_mouse_icons/game.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://game/ui/ui_mouse_icons/inventory/inventory_ui.tscn" type="PackedScene" id=1]
 [ext_resource path="res://addons/escoria-core/game/scenes/dialogs/dialog_player.tscn" type="PackedScene" id=2]
@@ -6,9 +6,11 @@
 [ext_resource path="res://game/ui/ui_mouse_icons/verbs_mouseicons.tscn" type="PackedScene" id=4]
 [ext_resource path="res://game/ui/ui_mouse_icons/game.gd" type="Script" id=5]
 [ext_resource path="res://game/ui/ui_mouse_icons/tooltip/target_tooltip.tscn" type="PackedScene" id=6]
+[ext_resource path="res://game/ui/commons/room_select.tscn" type="PackedScene" id=7]
 
 [node name="game" type="Node2D"]
 script = ExtResource( 5 )
+editor_debug_mode = 1
 
 [node name="ui" type="CanvasLayer" parent="."]
 
@@ -35,10 +37,20 @@ layer = 2
 
 [node name="tooltip" parent="ui/tooltip_layer" instance=ExtResource( 6 )]
 mouse_filter = 2
+bbcode_text = "[center][color=#000000][/color][/center]"
+color = Color( 0, 0, 0, 1 )
+offset_from_cursor = Vector2( 75, 10 )
+debug_mode = true
 
 [node name="dialog_layer" type="CanvasLayer" parent="ui"]
 layer = 3
 
 [node name="dialog_player" parent="ui/dialog_layer" instance=ExtResource( 2 )]
 
+[node name="room_select" parent="ui" instance=ExtResource( 7 )]
+margin_left = 75.5099
+margin_top = 751.323
+margin_right = 138.51
+margin_bottom = 791.324
+
 [node name="camera" parent="." instance=ExtResource( 3 )]

game/ui/ui_mouse_icons/tooltip/target_tooltip.gd

@@ -1,10 +0,0 @@
-extends RichTextLabel
-
-var current_target : String
-
-func set_target(target : String) -> void:
-	current_target = target
-	update_tooltip_text()
-
-func update_tooltip_text():
-	bbcode_text = current_target

game/ui/ui_mouse_icons/tooltip/target_tooltip.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/assets/fonts/onesize/ONESIZE_.TTF" type="DynamicFontData" id=1]
-[ext_resource path="res://game/ui/ui_mouse_icons/tooltip/target_tooltip.gd" type="Script" id=2]
+[ext_resource path="res://game/ui/ui_mouse_icons/tooltip/tooltip_target.gd" type="Script" id=2]
 
 [sub_resource type="DynamicFont" id=1]
 size = 30
@@ -12,17 +12,17 @@ size = 30
 font_data = ExtResource( 1 )
 
 [node name="tooltip" type="RichTextLabel"]
-anchor_right = 0.7
-anchor_bottom = 0.06
-margin_left = 1.49829
-margin_right = 1.21826
-margin_bottom = -10.0
+margin_right = 200.0
+margin_bottom = 32.0
+rect_min_size = Vector2( 200, 32 )
 custom_fonts/mono_font = SubResource( 1 )
 custom_fonts/normal_font = SubResource( 2 )
 bbcode_enabled = true
-bbcode_text = "[center][/center]"
+bbcode_text = "[center][color=#ffffff][/color][/center]"
 scroll_active = false
 script = ExtResource( 2 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
+color = Color( 1, 1, 1, 1 )
+offset_from_cursor = Vector2( 100, 10 )

game/ui/ui_mouse_icons/tooltip/tooltip_target.gd

@@ -0,0 +1,16 @@
+tool
+extends ESCTooltip
+
+func update_tooltip_text():
+	print("new color " + str(color))
+	bbcode_text = "[center]"
+	bbcode_text += "[color=#" + color.to_html(false) + "]"
+	bbcode_text += current_target
+	bbcode_text += "[/color]"
+	bbcode_text += "[/center]"
+#	push_align(RichTextLabel.ALIGN_CENTER)
+#	push_color(color)
+#	append_bbcode(current_target)
+#	pop()
+#	pop()
+	update_size()