Inventory hover texture

This commit is contained in:
2025-09-05 22:59:38 +02:00
parent 37ab5a4511
commit 80c19824a0
8 changed files with 38 additions and 90 deletions

View File

@@ -49,3 +49,9 @@ func set_custom_data(data: Dictionary) -> void:
super.set_custom_data(data) super.set_custom_data(data)
if custom_data.has("count"): if custom_data.has("count"):
ESCItemCountManager.new().updateSprite(self) ESCItemCountManager.new().updateSprite(self)
func _get_inventory_texture_hovered() -> Texture2D:
if inventory_texture_hovered == null:
return _get_inventory_texture()
else:
return inventory_texture_hovered

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://bxwikger8m82p"] [gd_scene load_steps=5 format=3 uid="uid://bxwikger8m82p"]
[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"] [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://p4ng8m5u1w58" path="res://gymkhana/items/inventory/assets/turno_cocina_frontal.png" id="2"] [ext_resource type="Texture2D" uid="uid://chgror44d1jqk" path="res://gymkhana/items/inventory/assets/turno_cocina_frontal.png" id="2"]
[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"] [ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"]
[sub_resource type="RectangleShape2D" id="1"] [sub_resource type="RectangleShape2D" id="1"]
@@ -14,7 +14,6 @@ global_id = "turno_cocina_frontal"
esc_script = "res://gymkhana/items/inventory/turno_cocina_frontal.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_frontal.esc"
combine_when_selected_action_is_in = PackedStringArray("action4") combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture = ExtResource("2") inventory_texture = ExtResource("2")
inventory_texture_hovered = ExtResource("2")
custom_data = { custom_data = {
"tooltips": { "tooltips": {
"action3": "tooltip_frontal_action3", "action3": "tooltip_frontal_action3",

View File

@@ -1,27 +1,14 @@
[gd_scene load_steps=6 format=3 uid="uid://d1ust40cvfjtw"] [gd_scene load_steps=6 format=3 uid="uid://d1ust40cvfjtw"]
[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"] [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://dhh7ya2ab1eax" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" id="2"] [ext_resource type="Texture2D" uid="uid://breq706ufjdyy" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" id="2"]
[ext_resource type="Texture2D" uid="uid://cgiy5l5e3c642" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="3"] [ext_resource type="Texture2D" uid="uid://bhdcferfexcgb" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="3"]
[ext_resource type="PackedScene" path="res://gymkhana/particles/SmokeParticles.tscn" id="4"] [ext_resource type="PackedScene" uid="uid://d7l30s558mvd" path="res://gymkhana/particles/SmokeParticles.tscn" id="4"]
[ext_resource type="Script" uid="uid://con0lpnpm1118" path="res://gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd" id="5"] [ext_resource type="Script" uid="uid://con0lpnpm1118" path="res://gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd" id="5"]
[node name="turno_cocina_olla_llena" type="Area2D"] [node name="turno_cocina_olla_llena" type="Area2D"]
process_mode = 1 process_mode = 1
script = ExtResource("1") script = ExtResource("1")
global_id = "turno_cocina_olla_llena"
esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_llena.esc"
interaction_direction = 3
combine_when_selected_action_is_in = ["action4"]
inventory_texture = ExtResource("2")
dialog_color = Color(1, 1, 1, 1)
custom_data = {
"tooltips": {
"action1": "tooltip_common_look_inside",
"action3": "tooltip_common_look",
"action4": "tooltip_common_use"
}
}
action3_target_texts = { action3_target_texts = {
"turno_cocina_ajo": "tooltip_turno_cocina_olla_llena_action3_drop_in", "turno_cocina_ajo": "tooltip_turno_cocina_olla_llena_action3_drop_in",
"turno_cocina_bol_lentejas": "tooltip_turno_cocina_olla_llena_action3_drop_in", "turno_cocina_bol_lentejas": "tooltip_turno_cocina_olla_llena_action3_drop_in",
@@ -30,7 +17,17 @@ action3_target_texts = {
"turno_cocina_romero": "tooltip_turno_cocina_olla_llena_action3_drop_in" "turno_cocina_romero": "tooltip_turno_cocina_olla_llena_action3_drop_in"
} }
target_when_selected_action_is_in = ["action3"] target_when_selected_action_is_in = ["action3"]
animations = null global_id = "turno_cocina_olla_llena"
esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_llena.esc"
combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture = ExtResource("2")
custom_data = {
"tooltips": {
"action1": "tooltip_common_look_inside",
"action3": "tooltip_common_look",
"action4": "tooltip_common_use"
}
}
[node name="Sprite2D" type="Sprite2D" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("3") texture = ExtResource("3")

View File

@@ -1,18 +1,23 @@
[gd_scene load_steps=4 format=3 uid="uid://dgucic2086suo"] [gd_scene load_steps=4 format=3 uid="uid://dgucic2086suo"]
[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"] [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://pxtnkcvfou4s" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png" id="2"] [ext_resource type="Texture2D" uid="uid://brjb1fkbo0so" path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png" id="2"]
[ext_resource type="Texture2D" uid="uid://cgiy5l5e3c642" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="3"] [ext_resource type="Texture2D" uid="uid://bhdcferfexcgb" path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" id="3"]
[node name="turno_cocina_olla_vacia" type="Area2D"] [node name="turno_cocina_olla_vacia" type="Area2D"]
process_mode = 1 process_mode = 1
script = ExtResource("1") script = ExtResource("1")
action3_target_texts = {
"turno_cocina_ajo": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
"turno_cocina_bol_lentejas": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
"turno_cocina_patata": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
"turno_cocina_romero": "tooltip_turno_cocina_olla_vacia_action3_drop_in"
}
target_when_selected_action_is_in = ["action3"]
global_id = "turno_cocina_olla_vacia" global_id = "turno_cocina_olla_vacia"
esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_vacia.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_vacia.esc"
combine_when_selected_action_is_in = ["action4"] combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture = ExtResource("2") inventory_texture = ExtResource("2")
inventory_texture_hovered = ExtResource("2")
dialog_color = Color(1, 1, 1, 1)
custom_data = { custom_data = {
"tooltips": { "tooltips": {
"action1": "tooltip_common_look", "action1": "tooltip_common_look",
@@ -21,14 +26,6 @@ custom_data = {
"action4": "tooltip_common_use" "action4": "tooltip_common_use"
} }
} }
animations = null
action3_target_texts = {
"turno_cocina_ajo": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
"turno_cocina_bol_lentejas": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
"turno_cocina_patata": "tooltip_turno_cocina_olla_vacia_action3_drop_in",
"turno_cocina_romero": "tooltip_turno_cocina_olla_vacia_action3_drop_in"
}
target_when_selected_action_is_in = ["action3"]
[node name="Sprite2D" type="Sprite2D" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("3") texture = ExtResource("3")

View File

@@ -1,18 +1,20 @@
[gd_scene load_steps=4 format=3 uid="uid://cwlq5pqwktbul"] [gd_scene load_steps=4 format=3 uid="uid://cwlq5pqwktbul"]
[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"] [ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://bhomm5rmi8fnr" path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" id="2"] [ext_resource type="Texture2D" uid="uid://dtxqb3363mlxa" path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" id="2"]
[ext_resource type="Texture2D" uid="uid://76sr0us2tmli" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="3"] [ext_resource type="Texture2D" uid="uid://bk7lml882oihk" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="3"]
[node name="turno_cocina_peso" type="Area2D"] [node name="turno_cocina_peso" type="Area2D"]
process_mode = 1 process_mode = 1
script = ExtResource("1") script = ExtResource("1")
action3_target_texts = {
"turno_cocina_bol": "tooltip_cocina_peso_action3_bol"
}
target_when_selected_action_is_in = ["action3"]
global_id = "turno_cocina_peso" global_id = "turno_cocina_peso"
esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc"
combine_when_selected_action_is_in = ["action4"] combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture = ExtResource("3") inventory_texture = ExtResource("3")
inventory_textur_hovered = ExtResource("3")
dialog_color = Color(1, 1, 1, 1)
custom_data = { custom_data = {
"tooltips": { "tooltips": {
"action1": "tooltip_common_whats_this", "action1": "tooltip_common_whats_this",
@@ -21,11 +23,6 @@ custom_data = {
"action4": "tooltip_common_use" "action4": "tooltip_common_use"
} }
} }
action3_target_texts = {
"turno_cocina_bol": "tooltip_cocina_peso_action3_bol"
}
target_when_selected_action_is_in = ["action3"]
animations = null
[node name="Sprite2D" type="Sprite2D" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
rotation = -0.0698132 rotation = -0.0698132

View File

@@ -1,8 +0,0 @@
:action1
#ToDo: tiene sentido? al ser el del inventario... posiblemente action1 no llegue nunca.
say($player,"Es un peso, con esto podría coger la cantidad exacta de algún ingrediente", "peso_inventario_action1_say")
:action3
say($player,"Es un peso, con esto podría coger la cantidad exacta de algún ingrediente", "peso_inventario_action3_say")

View File

@@ -1,38 +0,0 @@
[gd_scene load_steps=5 format=3 uid="uid://bo0acekt13ip2"]
[ext_resource type="Script" uid="uid://ceym82rf2qnxu" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://76sr0us2tmli" path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" id="2"]
[ext_resource type="Script" uid="uid://beh3ds4eapldu" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="3"]
[sub_resource type="RectangleShape2D" id="1"]
size = Vector2(45, 25)
[node name="turno_cocina_peso_inventario" type="Area2D"]
process_mode = 1
script = ExtResource("1")
global_id = "turno_cocina_peso_inventario"
esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_inventario.esc"
inventory_texture = ExtResource("2")
dialog_color = Color(1, 1, 1, 1)
custom_data = {
"tooltips": {
"action1": "tooltip_common_whats_this",
"action2": "tooltip_common_pick",
"action3": "tooltip_common_look",
"action4": "tooltip_common_use"
}
}
animations = null
[node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2(-2, 0)
scale = Vector2(0.5, 0.5)
texture = ExtResource("2")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(-1.5, -0.5)
shape = SubResource("1")
[node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2(-51, 69)
script = ExtResource("3")

View File

@@ -145,7 +145,6 @@ global_id = "puerta_delante_start"
position = Vector2(2505, 160) position = Vector2(2505, 160)
scale = Vector2(0.880435, 0.88735) scale = Vector2(0.880435, 0.88735)
combine_when_selected_action_is_in = PackedStringArray("action4") combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("11_wxxpa")
[node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"] [node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"]
position = Vector2(15.9014, -11.2695) position = Vector2(15.9014, -11.2695)
@@ -419,7 +418,6 @@ visible = false
position = Vector2(1281, 491) position = Vector2(1281, 491)
scale = Vector2(1.06318, 1.06318) scale = Vector2(1.06318, 1.06318)
combine_when_selected_action_is_in = PackedStringArray("action4") combine_when_selected_action_is_in = PackedStringArray("action4")
inventory_texture_hovered = ExtResource("21_kafnq")
[node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_llena"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_llena"]
position = Vector2(-160.838, 201.283) position = Vector2(-160.838, 201.283)