Libro cocina tooltip fix

addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn

@@ -1,68 +1,66 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=3 format=3 uid="uid://bl50queikqfjc"]
 
-[ext_resource path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" type="Script" id=1]
-[ext_resource path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" type="Script" id=3]
+[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" id="1"]
+[ext_resource type="Script" path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" id="3"]
 
 [node name="inventory_ui" type="Control"]
+custom_minimum_size = Vector2(90, 90)
+layout_mode = 3
 anchor_right = 0.5
 anchor_bottom = 0.5
 offset_right = 768.0
 offset_bottom = 540.0
-custom_minimum_size = Vector2( 90, 90 )
-scale = Vector2( 0.4, 0.4 )
+scale = Vector2(0.4, 0.4)
 size_flags_horizontal = 0
 size_flags_vertical = 3
-script = ExtResource( 1 )
-__meta__ = {
-"_edit_use_anchors_": true
-}
+script = ExtResource("1")
 inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/ScrollContainer/container")
 
 [node name="FloatingInventory" type="CanvasLayer" parent="."]
 
 [node name="inventory_bg" type="Polygon2D" parent="FloatingInventory"]
-color = Color( 0.156863, 0.0627451, 0, 1 )
-polygon = PackedVector2Array( -3, 578, 1280, 578, 1280, 752, -3, 757 )
+color = Color(0.156863, 0.0627451, 0, 1)
+polygon = PackedVector2Array(-3, 578, 1280, 578, 1280, 752, -3, 757)
 
 [node name="panel" type="TextureRect" parent="FloatingInventory"]
+custom_minimum_size = Vector2(0, 160)
+anchors_preset = 3
 anchor_left = 1.0
 anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = -1276.0
 offset_top = -160.0
-custom_minimum_size = Vector2( 0, 160 )
 size_flags_horizontal = 3
 size_flags_vertical = 3
-expand = true
+expand_mode = 1
 
 [node name="MarginContainer" type="MarginContainer" parent="FloatingInventory/panel"]
+layout_mode = 1
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = -4.0
 offset_top = 2.0
 offset_right = -16.0
+grow_horizontal = 2
+grow_vertical = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-theme_override_constants/margin_right = 20
-theme_override_constants/margin_top = 20
 theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
 theme_override_constants/margin_bottom = 20
 
 [node name="ScrollContainer" type="ScrollContainer" parent="FloatingInventory/panel/MarginContainer"]
-offset_left = 20.0
-offset_top = 79.0
-offset_right = 1244.0
-offset_bottom = 79.0
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 6
-scroll_vertical_enabled = false
+vertical_scroll_mode = 0
 
 [node name="container" type="HBoxContainer" parent="FloatingInventory/panel/MarginContainer/ScrollContainer"]
-offset_right = 1224.0
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme_override_constants/separation = 20
-script = ExtResource( 3 )
-
-[node name="InventoryTween" type="Tween" parent="FloatingInventory"]
+script = ExtResource("3")

gymkhana/characters/eneko/eneko_smoking.esc

@@ -1,3 +1,5 @@
+:setup
+	global turno_cocina_tutorial_done
 :ready
 	var cocina_delante_intro_dialog_option1_done = false
 
@@ -80,6 +82,7 @@
 	say($player, "Si vuelves a leer el libro de recetas sabrás la lista con los ingredientes necesarios.", "cocina_delante_intro_dialog2_player_decision_to_user2")
 	say($player, "Si consigues el ingrediente secreto harás unas lentejas buenísimas y Eneko se pondrá muy contento, pero no es nada fácil.", "cocina_delante_intro_dialog2_player_decision_to_user3")
 	say($player, "Espero que disfrutes el juego y buena suerte!", "cocina_delante_intro_dialog2_player_decision_to_user4")
+	turno_cocina_tutorial_done = true
 
 :pan_mojado_dialog
 	say($player, "Se ha caído un poco de agua sobre el pan y está blando.", "cocina_delante_pan_mojado_dialog_1")

gymkhana/items/inventory/turno_cocina_frontal.tscn

@@ -16,8 +16,8 @@ inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 custom_data = {
     "tooltips": {
-        "action3": "frontal_action3",
-        "action4": "Usar"
+        "action3": "tooltip_frontal_action3",
+        "action4": "tooltip_frontal_action4"
     }
 }
 combine_when_selected_action_is_in = [ "action4" ]

gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc

@@ -13,7 +13,6 @@
 :action3
 	if !cocina_intro_played:
 		accept_input("SKIP")
-		set_global("cocina_intro_played", true)
 		set_active($turno_cocina_economica, true)
 		set_interactive($turno_cocina_peso, true)
 		set_active($turno_cocina_cocina_gas, true)
@@ -26,7 +25,7 @@
 		set_active($turno_cocina_cuerno, false)
 		set_interactive($cocina_patata, true)
 		set_active($cocina_debajo_sofa, true)
-		set_angle($player, 90, "")
+		set_angle($player, 90)
 		say($player, "'Carpaccio de gambas aderezadas con huevas de lumpo negras'", "cocina_libro_de_cocina_intro_action3_1")
 		say($player, "No, es demasiado sencillo y vulgar.", "cocina_libro_de_cocina_intro_action3_2")
 		set_angle($player, 270)
@@ -41,7 +40,7 @@
 		walk_block($player, $puerta_delante_start)
 		set_global("intro_dialog2_playing", true)
 		# Go to delante_cocina
-			queue_event($cocina_puerta_delante, "action1")
+		queue_event($cocina_puerta_delante, "action1")
 		stop
 	say($player, "A ver....", "cocina_libro_de_cocina_action3_1")
 	say($player, "Lentejas con patatas:", "cocina_libro_de_cocina_action3_2")

gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn

@@ -12,8 +12,10 @@ combine_when_selected_action_is_in = [  ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 custom_data = {
-    "tooltips": {
-        "action3": "Leer"
-    }
+	"tooltips": {
+		"action1": "tooltip_turno_cocina_libro_de_cocina_action1",
+		"action2": "tooltip_turno_cocina_libro_de_cocina_action2",
+		"action3": "tooltip_turno_cocina_libro_de_cocina_action3"
+	}
 }
 animations = null

gymkhana/rooms/turno_cocina/cocina/cocina.tscn

@@ -372,12 +372,7 @@ script = ExtResource("5")
 position = Vector2(2547, 244)
 scale = Vector2(1.06318, 1.06318)
 combine_when_selected_action_is_in = PackedStringArray()
-custom_data = {
-"tooltips": {
-"action1": "cocina_libro_de_cocina_action1",
-"action2": "cocina_libro_de_cocina_action2"
-}
-}
+
 
 [node name="ESCLocation" type="Marker2D" parent="turno_cocina_libro_de_cocina"]
 position = Vector2(-16.9304, 145.789)

gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc

@@ -1,5 +1,10 @@
 :setup
-	global cocina_delante_intro_played
+	global turno_cocina_tutorial_done
+	global cocina_patata_picked
+	global cocina_debajo_sofa_picked
+	global turno_cocina_pan_mojado
+	global turno_cocina_mikel_playing
+	global turno_cocina_economica_con_olla
 
 	# Disable cocina_patata if already picked.
 	# We cannot look in inventory because the countable item is a different item.
@@ -12,7 +17,11 @@
 		set_active($cocina_debajo_sofa, false)
 
 	# Enable/disable olla on economica item if olla already put on the economica
-	set_active($turno_cocina_olla_llena, turno_cocina_economica_con_olla)
+	if turno_cocina_economica_con_olla:
+		set_active($turno_cocina_olla_llena, true)
+	else:
+		set_active($turno_cocina_olla_llena, false)
+
 
 	# Enable/disable jarra items depending if bread is wet
 	if turno_cocina_pan_mojado:
@@ -23,7 +32,7 @@
 		set_active($turno_cocina_jarra_volcada, false)
 	
 	# Position player depending of last scene
-	if ESC_LAST_SCENE == cocina_detras:
+	if ESC_LAST_SCENE == "cocina_detras":
 		teleport($player, $puerta_detras_start)
 		set_angle($player, 180)
 	else:
@@ -31,7 +40,7 @@
 		set_angle($player, 270)
 
 :ready
-	if !cocina_delante_intro_played:
+	if !turno_cocina_tutorial_done:
 		set_active($turno_cocina_economica, false)
 		set_interactive($turno_cocina_peso, false)
 		set_active($turno_cocina_cocina_gas, false)
@@ -46,15 +55,15 @@
 		set_active($cocina_debajo_sofa, false)
 		set_active($turno_cocina_jarra, false)
 		set_active($cocina_pan, false)
-		accept_input(SKIP)
+		accept_input("SKIP")
 		set_angle($player, 180)
 		say($player, "No se me ocurre ningún plato, debería buscar un libro de recetas.", "cocina_intro_1")
 		say($player, "Si mantienes MAYÚSCULAS pulsado los objetos con los que puedes interactuar aparecerán marcados.", "cocina_intro_2")
-		accept_input(ALL)
+		accept_input("ALL")
 	if turno_cocina_mikel_playing:
 		# TODO: in 3.6 a bug prevented walk_block working in this situation, test again with 4.3
 		# walk_block $player new_game_start_location
 		# set_angle $player 180
 		say($player, "Ya no está, que raro...", "cocina_mikel_playing")
-		accept_input(ALL)
+		accept_input("ALL")
 		global turno_cocina_mikel_playing = false

gymkhana/translations/turno_cocina.csv

@@ -1,8 +1,8 @@
 keys,en,fr,es
 action_default_say,"I can't use this!",,"No puedo usar eso!"
-frontal_action3,"Admire","Admire","Admirar"
-frontal_action3_say,,,""
-frontal_action4,"Use","Utiliser","Usar"
+tooltip_frontal_action3,"Admire","Admire","Admirar"
+frontal_action3_say,,,"Me la ha dejado Eneko. Me ha dicho que la cuide, que se la regaló su abuelo."
+tooltip_frontal_action4,"Use","Utiliser","Usar"
 cocina_delante_intro_dialog_eneko,,,"¿Vas a hacer algo de provecho o te vas a pasar toda la mañana fumando porros?"
 cocina_delante_intro_dialog_option1,,,"Uyuyuy, parece que alguien se ha despertado con el pie izquierdo."
 cocina_delante_intro_dialog_option1_res,,,"Grr..."
@@ -170,8 +170,6 @@ cocina_cuerno_action2_say,,,"A la saca!"
 cocina_cuerno_action3_say,,,"Parece un cuerno de algún animal. Lo usan para llamar a comer."
 cocina_cuerno_action4_hint,,,"Debería pedirle a Eneko que pruebe las lentejas antes de llamar a la gente."
 cocina_cuerno_action4_say,,,"Si lo toco aquí no me va a oir la gente que esté en la huerta, debería buscar un sitio mejor."
-cocina_libro_de_cocina_action1,,,"Mirar"
-cocina_libro_de_cocina_action2,,,"Coger"
 cocina_libro_de_cocina_action1_say,,,"Hay varios libros de recetas. Debería coger uno."
 cocina_libro_de_cocina_action2_say_1,,,"Este libro de recetas tiene buena pinta."
 cocina_libro_de_cocina_action2_say_2,,,"He guardado el libro en el inventario. Lo verás abajo a la izquierda de la pantalla."
@@ -322,4 +320,6 @@ turno_cocina_creditos_7,,,"No tengo, quieres cartón?"
 turno_cocina_creditos_8,,,"Hmm, mejor no."
 turno_cocina_creditos_9,,,"Lanzamos los créditos?"
 turno_cocina_creditos_10,,,"Daleee!"
-
+tooltip_turno_cocina_libro_de_cocina_action1,,,"Mirar"
+tooltip_turno_cocina_libro_de_cocina_action2,,,"Coger"
+tooltip_turno_cocina_libro_de_cocina_action3,,,"Leer"