Implemented tooltip follows mouse (not perfect).

Fixed bug when using mousewheel action on inventory items.
Added a debug mode for tooltip following mouse
This commit is contained in:
Julian Murgia
2021-02-19 07:53:45 +01:00
parent 52d19c34bd
commit 38f554b496
24 changed files with 421 additions and 174 deletions

View File

@@ -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"):

View File

@@ -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

View File

@@ -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]"

View File

@@ -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
}

View File

@@ -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()