Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn

@@ -7,9 +7,6 @@
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( 3 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 slot_ui_scene = ExtResource( 2 )
 
 [node name="Panel" type="Panel" parent="."]
@@ -32,7 +29,7 @@ __meta__ = {
 
 [node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
 margin_right = 623.0
-margin_bottom = 336.0
+margin_bottom = 276.0
 size_flags_vertical = 3
 scroll_horizontal_enabled = false
 __meta__ = {
@@ -41,7 +38,7 @@ __meta__ = {
 
 [node name="slots" type="VBoxContainer" parent="VBoxContainer/ScrollContainer"]
 margin_right = 623.0
-margin_bottom = 336.0
+margin_bottom = 276.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 __meta__ = {
@@ -49,9 +46,9 @@ __meta__ = {
 }
 
 [node name="back" type="Button" parent="VBoxContainer"]
-margin_top = 340.0
+margin_top = 280.0
 margin_right = 623.0
-margin_bottom = 360.0
+margin_bottom = 300.0
 text = "OPTIONS_BACK"
 __meta__ = {
 "_edit_use_anchors_": false

addons/escoria-core/ui_library/menus/main_menu/main_menu.gd

@@ -14,7 +14,7 @@ func _on_load_game_pressed():
 	$load_game.show()
 
 
-# Show the options panel
+# Show the optiset_gui_visible trueons panel
 func _on_options_pressed():
 	$main.hide()
 	$options.show()

addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn

@@ -9,9 +9,6 @@
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="load_game" parent="." instance=ExtResource( 5 )]
 visible = false
@@ -44,18 +41,18 @@ __meta__ = {
 }
 
 [node name="TextureRect" type="TextureRect" parent="main/main"]
-margin_top = 162.0
+margin_top = 92.0
 margin_right = 616.0
-margin_bottom = 398.0
+margin_bottom = 318.0
 texture = ExtResource( 3 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="buttons" type="VBoxContainer" parent="main/main"]
-margin_top = 498.0
+margin_top = 418.0
 margin_right = 616.0
-margin_bottom = 738.0
+margin_bottom = 658.0
 custom_constants/separation = 10
 __meta__ = {
 "_edit_use_anchors_": false

addons/escoria-core/ui_library/menus/options/options.tscn

@@ -25,9 +25,9 @@ __meta__ = {
 
 [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
 margin_left = 391.0
-margin_top = 340.0
+margin_top = 265.0
 margin_right = 888.0
-margin_bottom = 535.0
+margin_bottom = 460.0
 size_flags_horizontal = 6
 custom_constants/margin_right = 20
 custom_constants/margin_top = 20
@@ -132,9 +132,9 @@ max_value = 1.0
 step = 0.001
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
-margin_top = 539.0
+margin_top = 464.0
 margin_right = 1280.0
-margin_bottom = 559.0
+margin_bottom = 484.0
 custom_constants/separation = 20
 alignment = 1
 

gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://addons/escoria-dialog-simple/chooser/simple.gd" type="Script" id=1]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=2]
 
 [sub_resource type="Gradient" id=1]
 colors = PoolColorArray( 1, 0, 0, 1, 1, 0, 0, 1 )
@@ -11,6 +12,9 @@ gradient = SubResource( 1 )
 [node name="text_dialog_choice" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_top = 547.0
+margin_right = 7.0
+theme = ExtResource( 2 )
 script = ExtResource( 1 )
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
@@ -21,9 +25,6 @@ margin_bottom = 900.0
 mouse_filter = 2
 custom_constants/margin_top = 20
 custom_constants/margin_left = 20
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
 margin_left = 20.0
@@ -53,9 +54,6 @@ anchor_right = 1.0
 rect_min_size = Vector2( 0, 20 )
 texture_progress = SubResource( 2 )
 nine_patch_stretch = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="AvatarContainer" type="Node2D" parent="."]
 position = Vector2( 94, 68 )

gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres

@@ -16,3 +16,4 @@ corner_radius_bottom_left = 8
 [resource]
 default_font = ExtResource( 1 )
 RichTextLabel/styles/normal = SubResource( 1 )
+VBoxContainer/constants/separation = 1

gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn

@@ -9,7 +9,7 @@ margin_bottom = 97.0
 theme = ExtResource( 2 )
 bbcode_enabled = true
 bbcode_text = "[center]Here be some text.[/center]"
-text = "Here be some text."
+text = "[center]Here be some text.[/center]"
 fit_content_height = true
 script = ExtResource( 1 )
 

gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd

@@ -16,10 +16,10 @@ export(int) var action1_y = 0
 export(String) var tooltip2_name
 
 # Action1 tooltip text in inventory
-export(String) var inventory_action1_text
+export(String) var action3_text
 
 # Action2 tooltip text in inventory
-export(String) var inventory_action2_text
+export(String) var action4_text
 
 	#$tooltips.visible = true;
 var action1Tooltip: Object

gymkhana/addons/escoria-ui-return-monkey-island/game.gd

@@ -1,7 +1,13 @@
 extends ESCGame
 
+# Left mouse button on item
 const ACTION1 = "action1"
+# Right mouse button on item
 const ACTION2 = "action2"
+# Left mouse button on inventory item
+const ACTION3 = "action3"
+# Right mouse button on inventory item
+const ACTION4 = "action4"
 
 const VERB_USE = "use"
 const VERB_WALK = "walk"
@@ -219,10 +225,11 @@ func left_double_click_on_bg(position: Vector2) -> void:
 
 func element_focused(element_id: String) -> void:
 	var target_obj = escoria.object_manager.get_object(element_id).node
-	if target_obj is ESCItem:
+	if target_obj is ESCItem or ESCItemWithTooltip:
+		$tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
+		#$tooltip_layer/tooltip2.set_target(target_obj.tooltip2_name)
+	if target_obj is ESCPlayer:
 		$tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
-	if target_obj is ESCItemWithTooltip:
-		$tooltip_layer/tooltip2.set_target(target_obj.tooltip2_name)
 
 func element_unfocused() -> void:
 	$tooltip_layer/tooltip.set_target("")
@@ -272,25 +279,36 @@ func click_on_inventory_item(item_global_id: String, event: InputEvent, action:
 		true
 	)
 	
-	if (target_obj is ESCItemWithTooltip) && (action == ACTION1 && target_obj.inventory_action1_text != "") || (action == ACTION2 && target_obj.inventory_action2_text != ""):
+	if (target_obj is ESCItemWithTooltip) && (action == ACTION3 && target_obj.action3_text != "") || (action == ACTION4 && target_obj.action4_text != ""):
 		$tooltip_layer/tooltip.hide()
 		$tooltip_layer/tooltip2.hide()
 
 func left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
 	var target_obj = escoria.object_manager.get_object(inventory_item_global_id).node
-	if ACTION1 in target_obj.combine_when_selected_action_is_in:
+	if ACTION3 in target_obj.combine_when_selected_action_is_in:
 		Input.set_custom_mouse_cursor(target_obj.inventory_texture)
-	click_on_inventory_item(inventory_item_global_id, event, ACTION1)
+	click_on_inventory_item(inventory_item_global_id, event, ACTION3)
 
 func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
-	click_on_inventory_item(inventory_item_global_id, event, ACTION2)
+<<<<<<< Updated upstream
+	click_on_inventory_item(inventory_item_global_id, event, ACTION4)
+=======
+	click_on_inventory_item(inventory_item_global_id, event, VERB_USE)
+>>>>>>> Stashed changes
 
 
 func inventory_item_focused(inventory_item_global_id: String) -> void:
 	var target_obj = escoria.object_manager.get_object(inventory_item_global_id).node
 	if target_obj is ESCItemWithTooltip:
+<<<<<<< Updated upstream
+		$tooltip_layer/tooltip.set_target(target_obj.action3_text)
+		$tooltip_layer/tooltip2.set_target(target_obj.action4_text)
+=======
 		$tooltip_layer/tooltip.set_target(target_obj.inventory_action1_text)
 		$tooltip_layer/tooltip2.set_target(target_obj.inventory_action2_text)
+	if target_obj is ESCPlayer:
+		$tooltip_layer/tooltip.set_target(target_obj.inventory_action1_text)
+>>>>>>> Stashed changes
 
 
 func inventory_item_unfocused() -> void:

gymkhana/addons/escoria-ui-return-monkey-island/game.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn" type="PackedScene" id=1]
 [ext_resource path="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" type="Script" id=2]
 [ext_resource path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" type="PackedScene" id=3]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip/ESCTooltipWithIcon.tscn" type="PackedScene" id=4]
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/game.gd" type="Script" id=5]
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip/target_tooltip.tscn" type="PackedScene" id=6]
 [ext_resource path="res://addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn" type="PackedScene" id=7]
@@ -25,9 +26,6 @@ layer = 3
 [node name="ESCDialogsPlayer" type="Control" parent="dialog_layer"]
 theme = ExtResource( 9 )
 script = ExtResource( 2 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
@@ -48,7 +46,7 @@ size_flags_vertical = 3
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/ui/HBoxContainer"]
 margin_right = 58.0
-margin_bottom = 90.0
+margin_bottom = 101.0
 
 [node name="MenuButton" type="Button" parent="CanvasLayer/ui/HBoxContainer/VBoxContainer"]
 margin_right = 58.0
@@ -57,8 +55,8 @@ text = "Menu"
 
 [node name="Spacer" type="Control" parent="CanvasLayer/ui/HBoxContainer"]
 margin_left = 62.0
-margin_right = 1186.0
+margin_right = 1280.0
-margin_bottom = 90.0
+margin_bottom = 101.0
 size_flags_horizontal = 3
 
 [node name="inventory_ui" parent="CanvasLayer/ui/HBoxContainer" instance=ExtResource( 1 )]
@@ -79,16 +77,18 @@ visible = false
 [node name="tooltip_layer" type="CanvasLayer" parent="."]
 layer = 2
 
-[node name="tooltip" parent="tooltip_layer" instance=ExtResource( 6 )]
+[node name="tooltipOld" parent="tooltip_layer" instance=ExtResource( 6 )]
 mouse_filter = 2
-theme = ExtResource( 9 )
 bbcode_text = "[center][color=#000000][/color][/center]"
 fit_content_height = true
+offset_from_cursor = Vector2( -10, -50 )
 
 [node name="tooltip2" parent="tooltip_layer" instance=ExtResource( 10 )]
 mouse_filter = 2
-theme = ExtResource( 9 )
 bbcode_text = "[center][color=#000000][/color][/center]"
 fit_content_height = true
+offset_from_cursor = Vector2( -10, 50 )
+
+[node name="tooltip" parent="tooltip_layer" instance=ExtResource( 4 )]
 
 [connection signal="pressed" from="CanvasLayer/ui/HBoxContainer/VBoxContainer/MenuButton" to="." method="_on_MenuButton_pressed"]

gymkhana/addons/escoria-ui-return-monkey-island/theme.tres

@@ -26,6 +26,10 @@ corner_radius_top_left = 5
 corner_radius_top_right = 5
 corner_radius_bottom_right = 5
 corner_radius_bottom_left = 5
+expand_margin_left = 5.0
+expand_margin_right = 5.0
+expand_margin_top = 5.0
+expand_margin_bottom = 5.0
 
 [resource]
 default_font = ExtResource( 1 )

gymkhana/addons/escoria-ui-return-monkey-island/tooltip/target_tooltip.tscn

@@ -1,8 +1,10 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
 
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=1]
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip/tooltip_target.gd" type="Script" id=2]
 
 [node name="tooltip" type="RichTextLabel"]
+theme = ExtResource( 1 )
 bbcode_enabled = true
 bbcode_text = "[center][color=#ffffff][/color][/center]"
 scroll_active = false

gymkhana/addons/escoria-ui-return-monkey-island/tooltip/target_tooltip2.tscn

@@ -1,8 +1,10 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
 
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=1]
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip/tooltip2_target.gd" type="Script" id=2]
 
 [node name="tooltip" type="RichTextLabel"]
+theme = ExtResource( 1 )
 bbcode_enabled = true
 bbcode_text = "[center][color=#ffffff][/color][/center]"
 scroll_active = false

gymkhana/addons/escoria-ui-return-monkey-island/tooltip/tooltip2_target.gd

@@ -29,13 +29,12 @@ func update_tooltip_text():
 	# tooltips are presently dependent on the size of the bounding box around
 	# the rendered string.
 	emit_signal("tooltip2_size_updated")
-	bbcode_text = "[center]"
+	bbcode_text = "";
-	#if(texturePath != null):
+	#bbcode_text += "[img]" + "res://gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_right.png" + "[/img]"
-	bbcode_text += "[img]" + "res://gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_right.png" + "[/img]"
+	#bbcode_text += "[color=#" + color.to_html(false) + "]"
 	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)

gymkhana/addons/escoria-ui-return-monkey-island/tooltip/tooltip_target.gd

@@ -6,7 +6,7 @@ func _init(tooltip_id = 0):
 	id = tooltip_id
 
 signal tooltip_size_updated
-
+# Update the tooltip size according to the text.
 
 func update_tooltip_text():
 	# Need to update size of bbcode rect before updating the text itself otherwise on the
@@ -19,14 +19,12 @@ func update_tooltip_text():
 	# tooltips are presently dependent on the size of the bounding box around
 	# the rendered string.
 	emit_signal("tooltip_size_updated")
-	
+	bbcode_text = "";
-	bbcode_text = "[center]"
+	#bbcode_text = "[img]" + "res://gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_left.png" + "[/img]"
-	bbcode_text = "[center]"
+	#bbcode_text += "[color=#" + color.to_html(false) + "]"
-	bbcode_text += "[img]" + "res://gymkhana/addons/escoria-ui-return-monkey-island/cursors/mouse_left.png" + "[/img]"
 	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)

gymkhana/characters/mark/mark.tscn

@@ -551,9 +551,6 @@ shape = SubResource( 32 )
 [node name="debug" type="Label" parent="."]
 margin_right = 40.0
 margin_bottom = 14.0
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="dialog_position" type="Position2D" parent="."]
 position = Vector2( 0, -320 )

gymkhana/characters/mark/mark_think.tscn

@@ -4,34 +4,42 @@
 [ext_resource path="res://gymkhana/characters/mark/png/mark_thinking.png" type="Texture" id=2]
 
 [sub_resource type="AtlasTexture" id=1]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=2]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 189, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=3]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 162, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=4]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 135, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=5]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 108, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=6]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 81, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=7]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 54, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=8]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 27, 0, 27, 27 )
 
@@ -54,5 +62,5 @@ texture = ExtResource( 2 )
 position = Vector2( 54, 0 )
 scale = Vector2( 4, 4 )
 frames = SubResource( 9 )
-frame = 6
+frame = 7
 playing = true

gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc

@@ -1,7 +1,4 @@
-:action1
+:action3 i_bombona2
-say player "Parece que veo a Mikel"
-
-:action1 i_bombona2
 say player "He usado la 'bombona' con la puerta"
 # > [eq r5_dialog_advance 2]
 # 	say player "I already fixed the water leak."
@@ -13,6 +10,9 @@ say player "He usado la 'bombona' con la puerta"
 # set_global r5_dialog_advance 2
 # accept_input ALL
 
+:action1
+say player "Parece que veo a Mikel"
+
 :action2
 #say player "Esta cerrada por dentro."
 play_snd res://game/sfx/sounds/doorOpen_2.ogg

gymkhana/rooms/trasera_cocina/esc/i_bombona.esc

@@ -1,15 +1,15 @@
 :action1
-say player "Es naranja" [!i/i_bombona]
+say player "Es naranja"
-say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona]
 
 :action2
-> [!i/i_bombona]
 say player "Voy a cogerla"
 set_active i_bombona false
 inventory_add i_bombona
-  stop
 
-> [i/i_bombona]
+:action3
+say player "Es el segundo bolsillo más grande que he visto nunca"
+
+:action4
 say player "Antes era una bombona pero ahora es una llave inglesa."
 say player "¿Esto es real?"
 say player "¿Vivo en Matrix?"

gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc

@@ -1,15 +1,15 @@
 :action1
-say player "Es naranja" [!i/i_bombona2]
+say player "Es naranja"
-say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona2]
 
 :action2
-> [!i/i_bombona2]
 say player "Voy a cogerla"
 set_active i_bombona2 false
 inventory_add i_bombona2
-  stop
 
-> [i/i_bombona2]
+:action3
+say player "Es el segundo bolsillo más grande que he visto nunca"
+
+:action4
 say player "Antes era una bombona pero ahora es una llave inglesa."
 say player "¿Esto es real?"
 say player "¿Vivo en Matrix?"

gymkhana/rooms/trasera_cocina/esc/i_bombona3.esc

@@ -1,15 +0,0 @@
-:action1
-say player "Es naranja" [!i/i_bombona3]
-say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona3]
-
-:action2
-> [!i/i_bombona3]
-  say player "Voy a cogerla"
-  set_active i_bombona3 false
-  inventory_add i_bombona3
-  stop
-
-> [i/i_bombona3]
-  say player "Antes era una bombona pero ahora es una llave inglesa."
-  say player "¿Esto es real?"
-  say player "¿Vivo en Matrix?"

gymkhana/rooms/trasera_cocina/esc/i_bombona4.esc

@@ -1,15 +0,0 @@
-:action1
-say player "Es naranja" [!i/i_bombona4]
-say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona4]
-
-:action2
-> [!i/i_bombona4]
-  say player "Voy a cogerla"
-  set_active i_bombona4 false
-  inventory_add i_bombona4
-  stop
-
-> [i/i_bombona4]
-  say player "Antes era una bombona pero ahora es una llave inglesa."
-  say player "¿Esto es real?"
-  say player "¿Vivo en Matrix?"

gymkhana/rooms/trasera_cocina/esc/i_bombona5.esc

@@ -1,15 +0,0 @@
-:action1
-say player "Es naranja" [!i/i_bombona5]
-say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona5]
-
-:action2
-> [!i/i_bombona5]
-  say player "Voy a cogerla"
-  set_active i_bombona5 false
-  inventory_add i_bombona5
-  stop
-
-> [i/i_bombona5]
-  say player "Antes era una bombona pero ahora es una llave inglesa."
-  say player "¿Esto es real?"
-  say player "¿Vivo en Matrix?"

gymkhana/rooms/trasera_cocina/esc/i_bombona6.esc

@@ -1,15 +0,0 @@
-:action1
-say player "Es naranja" [!i/i_bombona6]
-say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona6]
-
-:action2
-> [!i/i_bombona6]
-  say player "Voy a cogerla"
-  set_active i_bombona6 false
-  inventory_add i_bombona6
-  stop
-
-> [i/i_bombona6]
-  say player "Antes era una bombona pero ahora es una llave inglesa."
-  say player "¿Esto es real?"
-  say player "¿Vivo en Matrix?"

gymkhana/rooms/trasera_cocina/trasera_cocina.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=32 format=2]
+[gd_scene load_steps=34 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2]
@@ -29,6 +29,8 @@
 [ext_resource path="res://gymkhana/items/inventory/I_Bombona.tscn" type="PackedScene" id=27]
 [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=28]
 [ext_resource path="res://gymkhana/items/inventory/assets/bombona-inv.png" type="Texture" id=29]
+[ext_resource path="res://gymkhana/characters/eneko/eneko-smoking.tscn" type="PackedScene" id=30]
+[ext_resource path="res://gymkhana/items/inventory/I_caja_herramientas.tscn" type="PackedScene" id=31]
 
 [sub_resource type="SpriteFrames" id=2]
 animations = [ {
@@ -39,9 +41,9 @@ animations = [ {
 } ]
 
 [sub_resource type="NavigationPolygon" id=1]
-vertices = PoolVector2Array( 155, 425, 129, 383, 242, 376, 1511, 445, 1512, 574, 193, 574, 1133, 474, 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 1318, 435, 1367, 411, 1420, 441, 725, 472, 794, 462, 846, 467, 864, 482, 749, 460, 584, 468, 1249, 454, 981, 480 )
+vertices = PoolVector2Array( 155, 425, 129, 383, 242, 376, 1511, 445, 1512, 574, 193, 574, 1133, 474, 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 725, 472, 794, 462, 846, 467, 864, 482, 1318, 435, 1367, 411, 1425, 417, 749, 460, 584, 468, 1249, 454, 981, 480 )
-polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 5, 6 ), PoolIntArray( 5, 0, 2, 7, 8, 9 ), PoolIntArray( 9, 10, 11, 5 ), PoolIntArray( 5, 11, 12 ), PoolIntArray( 13, 14, 15 ), PoolIntArray( 16, 17, 18, 19, 5 ), PoolIntArray( 16, 20, 17 ), PoolIntArray( 5, 12, 21 ), PoolIntArray( 22, 13, 15 ), PoolIntArray( 5, 21, 16 ), PoolIntArray( 22, 15, 3, 6 ), PoolIntArray( 23, 6, 5 ), PoolIntArray( 5, 19, 23 ) ]
+polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 5, 6 ), PoolIntArray( 5, 0, 2, 7, 8, 9 ), PoolIntArray( 9, 10, 11, 5 ), PoolIntArray( 5, 11, 12 ), PoolIntArray( 13, 14, 15, 16, 5 ), PoolIntArray( 17, 18, 19, 3 ), PoolIntArray( 13, 20, 14 ), PoolIntArray( 5, 12, 21 ), PoolIntArray( 22, 17, 3 ), PoolIntArray( 5, 21, 13 ), PoolIntArray( 6, 22, 3 ), PoolIntArray( 23, 6, 5 ), PoolIntArray( 5, 16, 23 ) ]
-outlines = [ PoolVector2Array( 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 584, 468, 725, 472, 749, 460, 794, 462, 846, 467, 864, 482, 981, 480, 1133, 474, 1249, 454, 1318, 435, 1367, 411, 1420, 441, 1511, 445, 1512, 574, 193, 574, 155, 425, 129, 383, 242, 376 ) ]
+outlines = [ PoolVector2Array( 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 584, 468, 725, 472, 749, 460, 794, 462, 846, 467, 864, 482, 981, 480, 1133, 474, 1249, 454, 1318, 435, 1367, 411, 1425, 417, 1511, 445, 1512, 574, 193, 574, 155, 425, 129, 383, 242, 376 ) ]
 
 [node name="ESCRoom" type="Node2D"]
 script = ExtResource( 1 )
@@ -60,19 +62,10 @@ mouse_filter = 2
 texture = ExtResource( 6 )
 script = ExtResource( 2 )
 
-[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
-position = Vector2( 1476, 363 )
-scale = Vector2( 0.634168, 0.634168 )
-frames = SubResource( 2 )
-frame = 3
-playing = true
-flip_h = true
-
 [node name="AnimatedSprite2" type="AnimatedSprite" parent="."]
-position = Vector2( 953, 329 )
+position = Vector2( 1154, 358 )
 scale = Vector2( 0.867751, 0.867751 )
 frames = SubResource( 2 )
-frame = 2
 playing = true
 offset = Vector2( -0.09375, 20.0582 )
 
@@ -85,7 +78,7 @@ scale_min = 0.5
 navpoly = SubResource( 1 )
 
 [node name="ESCLocation" type="Position2D" parent="."]
-position = Vector2( 786, 501 )
+position = Vector2( 796, 480 )
 script = ExtResource( 3 )
 global_id = "trasera_cocina_start"
 is_start_location = true
@@ -123,8 +116,8 @@ combine_when_selected_action_is_in = [  ]
 inventory_texture = ExtResource( 29 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltip2_name = "TT2 Coger bombona"
-inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
+action3_text = "¿Cómo ha entrado en mi bolsillo?"
-inventory_action2_text = "¿Por qué es una llave inglesa?"
+action4_text = "¿Por qué es una llave inglesa?"
 animations = null
 
 [node name="bombona2" parent="Hotspots" instance=ExtResource( 27 )]
@@ -133,72 +126,12 @@ script = ExtResource( 28 )
 global_id = "i_bombona2"
 esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc"
 tooltip_name = "TT Mirar bombona"
-combine_when_selected_action_is_in = [ "action1" ]
+combine_when_selected_action_is_in = [ "action3" ]
 inventory_texture = ExtResource( 29 )
 dialog_color = Color( 1, 1, 1, 1 )
 tooltip2_name = "TT2 Coger bombona"
-inventory_action1_text = "Usar"
+action3_text = "Usar"
-inventory_action2_text = "¿Por qué es una llave inglesa?"
+action4_text = "¿Por qué es una llave inglesa?"
-animations = null
-
-[node name="bombona3" parent="Hotspots" instance=ExtResource( 27 )]
-visible = false
-position = Vector2( 857, 508 )
-script = ExtResource( 28 )
-global_id = "i_bombona3"
-esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona3.esc"
-tooltip_name = "TT Mirar bombona"
-combine_when_selected_action_is_in = [  ]
-inventory_texture = ExtResource( 8 )
-dialog_color = Color( 1, 1, 1, 1 )
-tooltip2_name = "TT2 Coger bombona"
-inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
-inventory_action2_text = "¿Por qué es una llave inglesa?"
-animations = null
-
-[node name="bombona4" parent="Hotspots" instance=ExtResource( 27 )]
-visible = false
-position = Vector2( 757, 508 )
-script = ExtResource( 28 )
-global_id = "i_bombona4"
-esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona4.esc"
-tooltip_name = "TT Mirar bombona"
-combine_when_selected_action_is_in = [  ]
-inventory_texture = ExtResource( 8 )
-dialog_color = Color( 1, 1, 1, 1 )
-tooltip2_name = "TT2 Coger bombona"
-inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
-inventory_action2_text = "¿Por qué es una llave inglesa?"
-animations = null
-
-[node name="bombona5" parent="Hotspots" instance=ExtResource( 27 )]
-visible = false
-position = Vector2( 557, 508 )
-script = ExtResource( 28 )
-global_id = "i_bombona5"
-esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona5.esc"
-tooltip_name = "TT Mirar bombona"
-combine_when_selected_action_is_in = [  ]
-inventory_texture = ExtResource( 8 )
-dialog_color = Color( 1, 1, 1, 1 )
-tooltip2_name = "TT2 Coger bombona"
-inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
-inventory_action2_text = "¿Por qué es una llave inglesa?"
-animations = null
-
-[node name="bombona6" parent="Hotspots" instance=ExtResource( 27 )]
-visible = false
-position = Vector2( 1057, 508 )
-script = ExtResource( 28 )
-global_id = "i_bombona6"
-esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona6.esc"
-tooltip_name = "TT Mirar bombona"
-combine_when_selected_action_is_in = [  ]
-inventory_texture = ExtResource( 8 )
-dialog_color = Color( 1, 1, 1, 1 )
-tooltip2_name = "TT2 Coger bombona"
-inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
-inventory_action2_text = "¿Por qué es una llave inglesa?"
 animations = null
 
 [node name="Columna" type="Sprite" parent="."]
@@ -230,6 +163,19 @@ offset = Vector2( -0.09375, 20.0582 )
 margin_right = 40.0
 margin_bottom = 40.0
 
+[node name="EnekoSmoking" parent="." instance=ExtResource( 30 )]
+position = Vector2( 961, 382 )
+is_movable = true
+dialog_color = Color( 0, 1, 0.462745, 1 )
+selectable = true
+
+[node name="ESCLocation" type="Position2D" parent="EnekoSmoking"]
+position = Vector2( -111, 102 )
+script = ExtResource( 3 )
+
+[node name="ESCItemWithTooltip" parent="." instance=ExtResource( 31 )]
+position = Vector2( 728, 424 )
+
 [connection signal="mouse_entered" from="TextureRect" to="Area2D/CollisionPolygon2D" method="_on_TextureRect_mouse_entered"]
 [connection signal="mouse_entered" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_entered"]
 [connection signal="mouse_exited" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_exited"]

project.godot

@@ -866,7 +866,7 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" )
 
 [editor_plugins]
 
-enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-dialog-simple/plugin.cfg", "res://gymkhana/addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-wizard/plugin.cfg" )
+enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://gymkhana/addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-wizard/plugin.cfg" )
 
 [escoria]