diff --git a/addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn b/addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn
index 1a5e0676..b7b22f66 100644
--- a/addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn
+++ b/addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn
@@ -41,18 +41,18 @@ __meta__ = {
}
[node name="TextureRect" type="TextureRect" parent="main/main"]
-margin_top = 92.0
+margin_top = 55.0
margin_right = 616.0
-margin_bottom = 318.0
+margin_bottom = 355.0
texture = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="buttons" type="VBoxContainer" parent="main/main"]
-margin_top = 418.0
+margin_top = 455.0
margin_right = 616.0
-margin_bottom = 658.0
+margin_bottom = 695.0
custom_constants/separation = 10
__meta__ = {
"_edit_use_anchors_": false
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/MusicButton.gd b/gymkhana/addons/escoria-ui-return-monkey-island/MusicButton.gd
new file mode 100644
index 00000000..d3f6fc9b
--- /dev/null
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/MusicButton.gd
@@ -0,0 +1,20 @@
+extends TextureButton
+
+export(Texture) var musicEnabledTexture: Texture
+export(Texture) var musicEnabledHoverTexture: Texture
+
+export(Texture) var musicDisabledTexture: Texture
+export(Texture) var musicDisabledHoverTexture: Texture
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+ pass # Replace with function body.
+
+func _process(delta: float):
+ if escoria.game_scene.musicEnabled == true:
+ texture_normal = musicEnabledTexture
+ texture_hover = musicEnabledHoverTexture
+ else:
+ texture_normal = musicDisabledTexture
+ texture_hover = musicDisabledHoverTexture
+
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd b/gymkhana/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd
new file mode 100644
index 00000000..be1c77e2
--- /dev/null
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd
@@ -0,0 +1,10 @@
+extends Button
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+ pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+# pass
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
index d9a68de1..0e260799 100644
--- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
@@ -94,13 +94,13 @@ func _ready():
var time = OS.get_datetime()
var day = time["day"]
var month = time["month"]
- if(day == 8 and month ==2):
+ if( day == 8 and month ==2 ):
escoria.globals_manager.set_global('zorionak_eneko', true)
func _enter_tree():
- var room_selector_parent = $CanvasLayer/ui/menu_button/VBoxContainer
+ var room_selector_parent = $CanvasLayer/ui/menu_button/HBoxContainer
if ESCProjectSettingsManager.get_setting(ESCProjectSettingsManager.ENABLE_ROOM_SELECTOR) \
and room_selector_parent.get_node_or_null("room_select") == null:
@@ -494,3 +494,24 @@ func play_video(video_file: String) -> void:
func clear_tooltip():
if tooltip_node != null:
(tooltip_node as ESCRichTooltip).clear()
+
+
+var musicEnabled = true
+
+func _on_MusicButton_pressed():
+ if musicEnabled:
+ AudioServer.set_bus_volume_db(
+ AudioServer.get_bus_index(escoria.BUS_MUSIC),
+ linear2db(0)
+ )
+ musicEnabled = false
+ else:
+ AudioServer.set_bus_volume_db(
+ AudioServer.get_bus_index(escoria.BUS_MUSIC),
+ linear2db(
+ ESCProjectSettingsManager.get_setting(
+ ESCProjectSettingsManager.MUSIC_VOLUME
+ )
+ )
+ )
+ musicEnabled = true
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn
index d0d2febb..72fcc128 100644
--- a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn
@@ -1,20 +1,27 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=17 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/esc_rich_tooltip.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://addons/escoria-core/ui_library/menus/main_menu/main_menu.tscn" type="PackedScene" id=7]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" type="Texture" id=6]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn" type="PackedScene" id=7]
[ext_resource path="res://addons/escoria-core/ui_library/menus/pause_menu/pause_menu.tscn" type="PackedScene" id=8]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=9]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" type="Texture" id=10]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64.svg" type="Texture" id=11]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn" type="PackedScene" id=12]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" type="Texture" id=13]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/MusicButton.gd" type="Script" id=14]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" type="Texture" id=15]
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" type="Texture" id=16]
[node name="game" type="Node2D"]
script = ExtResource( 5 )
main_menu = NodePath("CanvasLayer/main_menu")
pause_menu = NodePath("CanvasLayer/pause_menu")
+mouse_tooltip_margin = 70.0
editor_debug_mode = 1
ui_parent_control_node = NodePath("CanvasLayer/ui")
@@ -40,21 +47,35 @@ theme = ExtResource( 9 )
[node name="menu_button" type="Control" parent="CanvasLayer/ui"]
margin_left = 1245.0
-margin_top = -644.0
-margin_right = 1322.0
-margin_bottom = -606.0
+margin_top = -643.0
+margin_right = 1245.0
+margin_bottom = -643.0
+grow_horizontal = 2
+grow_vertical = 2
-[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/ui/menu_button"]
-margin_left = -52.0
+[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui/menu_button"]
+margin_left = -135.0
margin_top = 6.0
-margin_right = 24.0
-margin_bottom = 80.0
+margin_right = 21.0
+margin_bottom = 76.0
+alignment = 1
-[node name="MenuButton" type="Button" parent="CanvasLayer/ui/menu_button/VBoxContainer"]
-margin_right = 76.0
+[node name="MusicButton" type="TextureButton" parent="CanvasLayer/ui/menu_button/HBoxContainer"]
+margin_left = 44.0
+margin_right = 44.0
margin_bottom = 70.0
-icon = ExtResource( 11 )
-flat = true
+script = ExtResource( 14 )
+musicEnabledTexture = ExtResource( 6 )
+musicEnabledHoverTexture = ExtResource( 13 )
+musicDisabledTexture = ExtResource( 16 )
+musicDisabledHoverTexture = ExtResource( 15 )
+
+[node name="MenuButton" type="TextureButton" parent="CanvasLayer/ui/menu_button/HBoxContainer"]
+margin_left = 48.0
+margin_right = 112.0
+margin_bottom = 70.0
+texture_normal = ExtResource( 11 )
+texture_hover = ExtResource( 10 )
[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui"]
anchor_right = 1.0
@@ -97,4 +118,5 @@ offset_from_cursor_action2 = Vector2( 0, -20 )
offset_from_cursor_action3 = Vector2( 0, 55 )
offset_from_cursor_action4 = Vector2( 0, -55 )
-[connection signal="pressed" from="CanvasLayer/ui/menu_button/VBoxContainer/MenuButton" to="." method="_on_MenuButton_pressed"]
+[connection signal="pressed" from="CanvasLayer/ui/menu_button/HBoxContainer/MusicButton" to="." method="_on_MusicButton_pressed"]
+[connection signal="pressed" from="CanvasLayer/ui/menu_button/HBoxContainer/MenuButton" to="." method="_on_MenuButton_pressed"]
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg
new file mode 100644
index 00000000..b26da9a1
--- /dev/null
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg
@@ -0,0 +1,69 @@
+
+
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg
new file mode 100644
index 00000000..eecbc359
--- /dev/null
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg
@@ -0,0 +1,69 @@
+
+
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg
new file mode 100644
index 00000000..96294c2f
--- /dev/null
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg
@@ -0,0 +1,61 @@
+
+
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note.svg b/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note.svg
new file mode 100644
index 00000000..1c46694d
--- /dev/null
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note.svg
@@ -0,0 +1,58 @@
+
+
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd b/gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd
new file mode 100644
index 00000000..41666cd1
--- /dev/null
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd
@@ -0,0 +1,47 @@
+# A simple main menu
+extends Control
+
+
+# Start the game
+func _on_new_game_pressed():
+ escoria.new_game()
+
+
+# Show the load slots
+func _on_load_game_pressed():
+ $main.hide()
+ $load_game.refresh_savegames()
+ $load_game.show()
+
+
+# Show the options panel
+func _on_options_pressed():
+ $main.hide()
+ $options.show()
+
+
+# Quit the game
+func _on_quit_pressed():
+ escoria.quit()
+
+
+# Hide the options panel again
+func _on_options_back_button_pressed():
+ reset()
+
+
+# Hide the load panel
+func _on_load_game_back_button_pressed():
+ reset()
+
+
+# Resets the UI to initial state
+func reset():
+ $load_game.hide()
+ $options.hide()
+ $main.show()
+
+func _on_new_without_intro_pressed():
+ escoria.globals_manager.set_global("cocina_delante_intro_played",true)
+ escoria.globals_manager.set_global("cocina_intro_played",true)
+ escoria.new_game()
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn
new file mode 100644
index 00000000..fc7c9c05
--- /dev/null
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn
@@ -0,0 +1,111 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd" type="Script" id=1]
+[ext_resource path="res://addons/escoria-core/design/escoria-logo-small.png" type="Texture" id=3]
+[ext_resource path="res://addons/escoria-core/ui_library/menus/options/options.tscn" type="PackedScene" id=4]
+[ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" type="PackedScene" id=5]
+
+[node name="main_menu" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( 1 )
+
+[node name="load_game" parent="." instance=ExtResource( 5 )]
+visible = false
+
+[node name="options" parent="." instance=ExtResource( 4 )]
+visible = false
+
+[node name="main" type="Control" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+
+[node name="Panel" type="Panel" parent="main"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+__meta__ = {
+"_edit_use_anchors_": false,
+"_editor_description_": ""
+}
+
+[node name="main" type="VBoxContainer" parent="main"]
+anchor_left = 0.5
+anchor_right = 0.5
+anchor_bottom = 1.0
+margin_left = -308.0
+margin_right = 308.0
+custom_constants/separation = 100
+alignment = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="TextureRect" type="TextureRect" parent="main/main"]
+margin_top = 55.0
+margin_right = 616.0
+margin_bottom = 355.0
+texture = ExtResource( 3 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="buttons" type="VBoxContainer" parent="main/main"]
+margin_top = 455.0
+margin_right = 616.0
+margin_bottom = 695.0
+custom_constants/separation = 10
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="new_game" type="Button" parent="main/main/buttons"]
+margin_right = 616.0
+margin_bottom = 150.0
+rect_min_size = Vector2( 0, 150 )
+size_flags_vertical = 3
+text = "NEW_GAME"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+[node name="new_game_without_intro" type="Button" parent="main/main/buttons"]
+margin_right = 616.0
+margin_bottom = 270.0
+size_flags_vertical = 3
+text = "NEW_GAME (without intro)"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="load_game" type="Button" parent="main/main/buttons"]
+margin_top = 160.0
+margin_right = 616.0
+margin_bottom = 180.0
+text = "LOAD_GAME"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="options" type="Button" parent="main/main/buttons"]
+margin_top = 190.0
+margin_right = 616.0
+margin_bottom = 210.0
+text = "OPTIONS"
+
+[node name="quit" type="Button" parent="main/main/buttons"]
+margin_top = 220.0
+margin_right = 616.0
+margin_bottom = 240.0
+text = "QUIT"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+
+
+[connection signal="back_button_pressed" from="load_game" to="." method="_on_load_game_back_button_pressed"]
+[connection signal="back_button_pressed" from="options" to="." method="_on_options_back_button_pressed"]
+[connection signal="pressed" from="main/main/buttons/new_game" to="." method="_on_new_game_pressed"]
+[connection signal="pressed" from="main/main/buttons/load_game" to="." method="_on_load_game_pressed"]
+[connection signal="pressed" from="main/main/buttons/options" to="." method="_on_options_pressed"]
+[connection signal="pressed" from="main/main/buttons/quit" to="." method="_on_quit_pressed"]
+[connection signal="pressed" from="main/main/buttons/new_game_without_intro" to="." method="_on_new_without_intro_pressed"]
diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn
index 96b75831..17daefd9 100644
--- a/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn
@@ -27,10 +27,10 @@ stream = SubResource( 1 )
expand = false
[node name="Skip" type="Button" parent="."]
-margin_left = 598.0
-margin_top = 662.0
-margin_right = 685.0
-margin_bottom = 694.0
+margin_left = 1163.0
+margin_top = 680.0
+margin_right = 1250.0
+margin_bottom = 712.0
shortcut = SubResource( 3 )
text = "Saltar video"
flat = true
diff --git a/gymkhana/characters/eneko/assets/speak-1.png b/gymkhana/characters/eneko/assets/speak-1.png
index 2fbda8c1..d6c3d6c6 100644
Binary files a/gymkhana/characters/eneko/assets/speak-1.png and b/gymkhana/characters/eneko/assets/speak-1.png differ
diff --git a/gymkhana/characters/eneko/assets/speak-2.png b/gymkhana/characters/eneko/assets/speak-2.png
index 4a3a3667..fd55d25e 100644
Binary files a/gymkhana/characters/eneko/assets/speak-2.png and b/gymkhana/characters/eneko/assets/speak-2.png differ
diff --git a/gymkhana/characters/eneko/assets/speak-3.png b/gymkhana/characters/eneko/assets/speak-3.png
index 7e6a7733..8a87730e 100644
Binary files a/gymkhana/characters/eneko/assets/speak-3.png and b/gymkhana/characters/eneko/assets/speak-3.png differ
diff --git a/gymkhana/characters/eneko/assets/speak.xcf b/gymkhana/characters/eneko/assets/speak.xcf
index f2d83ced..c06d494c 100644
Binary files a/gymkhana/characters/eneko/assets/speak.xcf and b/gymkhana/characters/eneko/assets/speak.xcf differ
diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn
index 2313d738..177eb54a 100644
--- a/gymkhana/characters/eneko/eneko_smoking.tscn
+++ b/gymkhana/characters/eneko/eneko_smoking.tscn
@@ -43,8 +43,8 @@ script = ExtResource( 2 )
global_id = "eneko_smoking"
esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc"
is_movable = true
-dialog_color = Color( 1, 1, 1, 1 )
-animations = ExtResource( 1 )
+combine_when_selected_action_is_in = [ ]
+dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 )
tooltips = {
"action1": "cocina_delante_eneko_smoking_action1",
"action2": "cocina_delante_eneko_smoking_action2"
@@ -52,10 +52,11 @@ tooltips = {
action3_target_texts = {
"caja_herramientas": "Regalar",
"turno_cocina_frontal": "Ofrecer",
-"turno_cocina_madera": "Ofrecerle leña",
+"turno_cocina_madera": "Ofrecerle leña"
}
target_when_selected_action_is_in = [ "action3" ]
selectable = true
+animations = ExtResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
position = Vector2( 32.625, -50.56 )
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-001.png b/gymkhana/characters/eneko/smoking_animation/unscreen-001.png
index 2fbda8c1..01d42239 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-001.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-001.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-002.png b/gymkhana/characters/eneko/smoking_animation/unscreen-002.png
index 7eb916a8..59d7f171 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-002.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-002.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-003.png b/gymkhana/characters/eneko/smoking_animation/unscreen-003.png
index a22aa2ab..3a9ae610 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-003.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-003.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-004.png b/gymkhana/characters/eneko/smoking_animation/unscreen-004.png
index 4f1ad403..dfe97129 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-004.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-004.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-005.png b/gymkhana/characters/eneko/smoking_animation/unscreen-005.png
index c24980c0..ed0188cc 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-005.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-005.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-006.png b/gymkhana/characters/eneko/smoking_animation/unscreen-006.png
index 5ba10a56..6f99e5f0 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-006.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-006.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-007.png b/gymkhana/characters/eneko/smoking_animation/unscreen-007.png
index 52f5b179..dbaa2e86 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-007.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-007.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-008.png b/gymkhana/characters/eneko/smoking_animation/unscreen-008.png
index f5a55ef7..885b005b 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-008.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-008.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-009.png b/gymkhana/characters/eneko/smoking_animation/unscreen-009.png
index 8a12b369..ba0f56b3 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-009.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-009.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-010.png b/gymkhana/characters/eneko/smoking_animation/unscreen-010.png
index b5d5880d..e3413a8f 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-010.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-010.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-011.png b/gymkhana/characters/eneko/smoking_animation/unscreen-011.png
index 2198fe38..7e260bf7 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-011.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-011.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-012.png b/gymkhana/characters/eneko/smoking_animation/unscreen-012.png
index 0228624a..c662bc10 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-012.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-012.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-013.png b/gymkhana/characters/eneko/smoking_animation/unscreen-013.png
index 67b8f1bc..4f44c38a 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-013.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-013.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-014.png b/gymkhana/characters/eneko/smoking_animation/unscreen-014.png
index 6df5a0f8..b7781e1d 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-014.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-014.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-015.png b/gymkhana/characters/eneko/smoking_animation/unscreen-015.png
index 4d9bca3e..b0b5025c 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-015.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-015.png differ
diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-016.png b/gymkhana/characters/eneko/smoking_animation/unscreen-016.png
index a0042b23..6003f036 100644
Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-016.png and b/gymkhana/characters/eneko/smoking_animation/unscreen-016.png differ
diff --git a/gymkhana/items/inventory/assets/turno_cocina_carton.png b/gymkhana/items/inventory/assets/turno_cocina_carton.png
index 84c170f0..9c063b39 100644
Binary files a/gymkhana/items/inventory/assets/turno_cocina_carton.png and b/gymkhana/items/inventory/assets/turno_cocina_carton.png differ
diff --git a/gymkhana/items/inventory/assets/turno_cocina_cuerno.png b/gymkhana/items/inventory/assets/turno_cocina_cuerno.png
index 4fa83a67..dccfd279 100644
Binary files a/gymkhana/items/inventory/assets/turno_cocina_cuerno.png and b/gymkhana/items/inventory/assets/turno_cocina_cuerno.png differ
diff --git a/gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png b/gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png
new file mode 100644
index 00000000..4fa83a67
Binary files /dev/null and b/gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png differ
diff --git a/gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png b/gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png
index ea33de42..bef942b0 100644
Binary files a/gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png and b/gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png differ
diff --git a/gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png b/gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png
index c2c19493..77cd74ab 100644
Binary files a/gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png and b/gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png differ
diff --git a/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd b/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd
new file mode 100644
index 00000000..73756e6e
--- /dev/null
+++ b/gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd
@@ -0,0 +1,8 @@
+extends Node
+
+
+func _process(delta: float):
+ if(escoria.globals_manager.get_global("turno_cocina_economica_encendida") == true):
+ self.visible = true
+ else:
+ self.visible = false
diff --git a/gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd b/gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd
new file mode 100644
index 00000000..2322cd0c
--- /dev/null
+++ b/gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd
@@ -0,0 +1,8 @@
+extends Node
+
+
+func _process(delta: float):
+ if escoria.globals_manager.get_global("turno_cocina_economica_encendida") and not escoria.globals_manager.get_global("turno_cocina_economica_con_olla"):
+ self.visible = true
+ else:
+ self.visible = false
diff --git a/gymkhana/items/inventory/turno_cocina_carton.tscn b/gymkhana/items/inventory/turno_cocina_carton.tscn
index b06fea5a..0046a93e 100644
--- a/gymkhana/items/inventory/turno_cocina_carton.tscn
+++ b/gymkhana/items/inventory/turno_cocina_carton.tscn
@@ -4,10 +4,8 @@
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton.png" type="Texture" id=2]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" type="Texture" id=3]
-
[node name="turno_cocina_carton" type="Area2D"]
pause_mode = 1
-rotation = 1.11177
script = ExtResource( 1 )
global_id = "turno_cocina_carton"
esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc"
@@ -20,17 +18,14 @@ tooltips = {
"action3": "Mirar",
"action4": "Usar"
}
-animations = null
-
action3_target_texts = {
"turno_cocina_mechero": "Encender el cartón"
}
target_when_selected_action_is_in = [ "action3" ]
+animations = null
[node name="Sprite" type="Sprite" parent="."]
-position = Vector2( -2, 0 )
-scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
-polygon = PoolVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 )
+polygon = PoolVector2Array( -23, -11, -24, 2, -24, 11, -21, 13, -6, 16, 5, 17, 21, 12, 25, 8, 25, -13, 0, -16, -9, -17 )
diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.esc b/gymkhana/items/inventory/turno_cocina_cuerno.esc
index a2f38b14..8355f249 100644
--- a/gymkhana/items/inventory/turno_cocina_cuerno.esc
+++ b/gymkhana/items/inventory/turno_cocina_cuerno.esc
@@ -2,10 +2,12 @@
say player "Que cosa tan curiosa"
:action2
-say player "No lo quiero coger"
+say current_player "A la saca!"
+set_active turno_cocina_cuerno false
+inventory_add turno_cocina_cuerno
:action3
-say player "Que cosa tan curiosa"
+say player "Parece un cuerno de algo."
:action4
-say player "No lo quiero coger"
+say player "No tengo claro como funciona."
diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.tscn b/gymkhana/items/inventory/turno_cocina_cuerno.tscn
index 2ac56862..0fe37ed6 100644
--- a/gymkhana/items/inventory/turno_cocina_cuerno.tscn
+++ b/gymkhana/items/inventory/turno_cocina_cuerno.tscn
@@ -1,28 +1,28 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=4 format=2]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" type="Texture" id=2]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
+[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png" type="Texture" id=3]
[node name="turno_cocina_cuerno" type="Area2D"]
pause_mode = 1
script = ExtResource( 1 )
global_id = "turno_cocina_cuerno"
esc_script = "res://gymkhana/items/inventory/turno_cocina_cuerno.esc"
-inventory_texture = ExtResource( 2 )
+combine_when_selected_action_is_in = [ ]
+inventory_texture = ExtResource( 3 )
dialog_color = Color( 1, 1, 1, 1 )
tooltips = {
- "action1": "Mirar el cuerno",
- "action2": "Coger el cuerno",
- "action3": "Mirar",
- "action4": "Usar"
+"action1": "Mirar el cuerno",
+"action2": "Coger el cuerno",
+"action3": "Mirar",
+"action4": "Usar"
}
animations = null
[node name="Sprite" type="Sprite" parent="."]
-position = Vector2( -2, 0 )
-scale = Vector2( 0.5, 0.5 )
+position = Vector2( 8.125, -8.125 )
texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
-polygon = PoolVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 )
+polygon = PoolVector2Array( -11, -22, -11, -32, -10, -42, -7, -46, 0, -49, 3, -49, 9, -48, 13, -43, 12, -33, 7, -24, 5, -13, 5, -4, 7, 4, 11, 13, 16, 19, 23, 24, 28, 27, 27, 32, 24, 33, 18, 32, 11, 28, 3, 22, -3, 15, -8, 5, -10, -4, -11, -15 )
diff --git a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc
index db443772..3511d729 100644
--- a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc
+++ b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc
@@ -18,12 +18,12 @@ say player "Por ahora, con leer el libro de recetas bastará."
set_interactive turno_cocina_peso true
set_active turno_cocina_cocina_gas true
set_active turno_cocina_bol true
- set_interactive turno_cocina_carton true
set_active cocina_cuchillos true
set_active cocina_fregadero_izq true
set_active cocina_fregadero_der true
set_active cocina_puerta_delante true
set_active cocina_puerta_detras true
+ set_active turno_cocina_cuerno false
set_interactive cocina_patata true
set_active cocina_debajo_sofa true
set_angle player 90
diff --git a/gymkhana/items/inventory/turno_cocina_olla_llena.tscn b/gymkhana/items/inventory/turno_cocina_olla_llena.tscn
index 138d4f55..5271da5c 100644
--- a/gymkhana/items/inventory/turno_cocina_olla_llena.tscn
+++ b/gymkhana/items/inventory/turno_cocina_olla_llena.tscn
@@ -1,8 +1,10 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=6 format=2]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" type="Texture" id=2]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture" id=3]
+[ext_resource path="res://gymkhana/particles/SmokeParticles.tscn" type="PackedScene" id=4]
+[ext_resource path="res://gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd" type="Script" id=5]
[node name="turno_cocina_olla_llena" type="Area2D"]
pause_mode = 1
@@ -21,9 +23,9 @@ tooltips = {
action3_target_texts = {
"turno_cocina_ajo": "Echar en la olla.",
"turno_cocina_bol_lentejas": "Echar en la olla.",
+"turno_cocina_madera": "Meter leña en la económica",
"turno_cocina_patata": "Echar en la olla.",
-"turno_cocina_romero": "Echar en la olla.",
-"turno_cocina_madera": "Meter leña en la económica"
+"turno_cocina_romero": "Echar en la olla."
}
target_when_selected_action_is_in = [ "action3" ]
animations = null
@@ -33,3 +35,6 @@ texture = ExtResource( 3 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -59, 25, -59, 47, -35, 56, 7, 58, 54, 52, 55, -13, 61, -50, 35, -60, -18, -60, -62, -54 )
+
+[node name="SmokeParticles" parent="." instance=ExtResource( 4 )]
+script = ExtResource( 5 )
diff --git a/gymkhana/items/inventory/turno_cocina_olla_llena_observer.esc b/gymkhana/items/inventory/turno_cocina_olla_llena_observer.esc
new file mode 100644
index 00000000..9a0aedcc
--- /dev/null
+++ b/gymkhana/items/inventory/turno_cocina_olla_llena_observer.esc
@@ -0,0 +1,5 @@
+:observe
+> [!turno_cocina_economica_encendida]
+ custom turno_cocina_olla_llena SmokeParticles hidden
+> [turno_cocina_economica_encendida]
+ custom turno_cocina_olla_llena SmokeParticles hidden
diff --git a/gymkhana/particles/SmokeParticles.tscn b/gymkhana/particles/SmokeParticles.tscn
new file mode 100644
index 00000000..285eca10
--- /dev/null
+++ b/gymkhana/particles/SmokeParticles.tscn
@@ -0,0 +1,31 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://gymkhana/particles/assets/smoke.png" type="Texture" id=1]
+
+[sub_resource type="Curve" id=1]
+min_value = -360.0
+max_value = 360.0
+_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 13.0909 ), 0.0, 0.0, 0, 0 ]
+
+[sub_resource type="Gradient" id=2]
+colors = PoolColorArray( 0.8125, 0.8125, 0.8125, 1, 0.917647, 0.917647, 0.917647, 0 )
+
+[node name="SmokeParticles" type="CPUParticles2D"]
+position = Vector2( -2, -63 )
+scale = Vector2( 1.48, 1 )
+amount = 20
+lifetime = 2.0
+speed_scale = 0.63
+explosiveness = 0.06
+randomness = 0.84
+lifetime_randomness = 0.55
+texture = ExtResource( 1 )
+emission_shape = 1
+emission_sphere_radius = 1.0
+direction = Vector2( 0, 1 )
+spread = 103.24
+gravity = Vector2( 0, -98 )
+angular_velocity = 42.36
+angular_velocity_curve = SubResource( 1 )
+scale_amount_random = 0.1
+color_ramp = SubResource( 2 )
diff --git a/gymkhana/particles/assets/smoke.png b/gymkhana/particles/assets/smoke.png
new file mode 100644
index 00000000..981928d4
Binary files /dev/null and b/gymkhana/particles/assets/smoke.png differ
diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background-depth.xcf b/gymkhana/rooms/turno_cocina/cocina/assets/background-depth.xcf
index 0bec3abd..c9226034 100644
Binary files a/gymkhana/rooms/turno_cocina/cocina/assets/background-depth.xcf and b/gymkhana/rooms/turno_cocina/cocina/assets/background-depth.xcf differ
diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background.png b/gymkhana/rooms/turno_cocina/cocina/assets/background.png
index 96f27bc0..7ab0dac7 100644
Binary files a/gymkhana/rooms/turno_cocina/cocina/assets/background.png and b/gymkhana/rooms/turno_cocina/cocina/assets/background.png differ
diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf b/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf
index 0bf70bb3..683c6cce 100644
Binary files a/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf and b/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf differ
diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/depth.png b/gymkhana/rooms/turno_cocina/cocina/assets/depth.png
index 0a71da09..04e189ce 100644
Binary files a/gymkhana/rooms/turno_cocina/cocina/assets/depth.png and b/gymkhana/rooms/turno_cocina/cocina/assets/depth.png differ
diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
index 56b4952b..0f7ea670 100644
--- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=2]
+[gd_scene load_steps=24 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
@@ -18,8 +18,9 @@
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" type="Texture" id=16]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" type="Texture" id=17]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" type="Texture" id=18]
-[ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=19]
+[ext_resource path="res://gymkhana/particles/SmokeParticles.tscn" type="PackedScene" id=19]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_cuerno.tscn" type="PackedScene" id=20]
+[ext_resource path="res://gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd" type="Script" id=21]
[sub_resource type="NavigationPolygon" id=3]
vertices = PoolVector2Array( 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2283, 493, 144, 568, 3, 570, -56, 524, 111, 445, 162, 471, 229, 445, 200, 465, 252, 478, 305, 524, 273, 570, 2287, 687, 2062, 635, 2113, 565, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1466, 514, 1345, 505, 1382, 439, 2109, 424, 2238, 386, 1788, 325, 2018, 419, 1787, 383, 1466, 412, 1493, 479, 1305.5, 467, 1337.5, 449, 1306.5, 498 )
@@ -119,7 +120,7 @@ animations = null
[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"]
position = Vector2( 2385, -81 )
scale = Vector2( 0.963362, 0.9875 )
-polygon = PoolVector2Array( 9.34229, 531.646, 10.3804, 161.013, 124.564, 97.2152, 107.955, 583.291 )
+polygon = PoolVector2Array( 44.1165, 551.899, 44.1165, 541.772, 38.9263, 515.443, 36.8501, 487.089, 25.4319, 459.747, 7.7854, 437.468, 10.3804, 161.013, 124.564, 97.2152, 120.751, 208.793, 108.474, 210.633, 104.322, 228.861, 105.36, 255.19, 109.512, 271.392, 114.703, 279.494, 106.398, 457.721, 103.284, 469.873, 83.5615, 487.089, 70.0671, 524.557, 59.6868, 555.949 )
[node name="puerta_delante_start" type="Position2D" parent="puerta_delante"]
position = Vector2( 2379, 526 )
@@ -372,6 +373,7 @@ position = Vector2( -56, 78 )
script = ExtResource( 5 )
[node name="turno_cocina_olla_llena" parent="." instance=ExtResource( 12 )]
+visible = false
position = Vector2( 1281, 491 )
scale = Vector2( 1.06318, 1.06318 )
@@ -380,29 +382,14 @@ position = Vector2( -160.838, 201.283 )
script = ExtResource( 5 )
interaction_direction = 3
-[node name="turno_cocina_carton" parent="." instance=ExtResource( 19 )]
-position = Vector2( 1586, 536 )
-rotation = 1.44513
-scale = Vector2( 0.8, 0.8 )
-
-[node name="turno_cocina_carton_collision" type="CollisionPolygon2D" parent="turno_cocina_carton"]
-position = Vector2( 15.9014, -11.2695 )
-polygon = PoolVector2Array( 8.0011, -8.38965, 1.29077, 24.7809, -8.50018, 42.443, -45.2213, 23.9447, -30.6265, 8.14941, -31.2399, 3.03223, -28.1329, -1.61511, -29.5033, -20.6873, -14.7783, -17.5671, -15.0916, -15.0868 )
-
-[node name="turno_cocina_carton_location" type="Position2D" parent="turno_cocina_carton"]
-position = Vector2( 93.7431, -73.8329 )
-script = ExtResource( 5 )
-
[node name="turno_cocina_cuerno" parent="." instance=ExtResource( 20 )]
-position = Vector2( 2805, 151 )
-rotation = 1.44513
-scale = Vector2( 0.8, 0.8 )
-combine_when_selected_action_is_in = [ ]
+position = Vector2( 2801, 175 )
-[node name="turno_cocina_cuerno_collision" type="CollisionPolygon2D" parent="turno_cocina_cuerno"]
-position = Vector2( 15.9014, -11.2695 )
-polygon = PoolVector2Array( 8.0011, -8.38965, 1.29077, 24.7809, -8.50018, 42.443, -45.2213, 23.9447, -30.6265, 8.14941, -31.2399, 3.03223, -28.133, -1.61509, -29.5033, -20.6873, -14.7783, -17.5671, -15.0916, -15.0868 )
-
-[node name="turno_cocina_cuerno_location" type="Position2D" parent="turno_cocina_cuerno"]
-position = Vector2( 421.503, 164.124 )
+[node name="ESCLocation" type="Position2D" parent="turno_cocina_cuerno"]
+position = Vector2( -81, 334 )
script = ExtResource( 5 )
+
+[node name="SmokeParticles" parent="." instance=ExtResource( 19 )]
+position = Vector2( 1297, 504 )
+scale = Vector2( 1.07999, 1 )
+script = ExtResource( 21 )
diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
index 43adef65..a4de3386 100644
--- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc
@@ -12,10 +12,8 @@
> [turno_cocina_economica_con_olla]
set_active turno_cocina_olla_llena true
- set_active turno_cocina_economica false
> [!turno_cocina_economica_con_olla]
set_active turno_cocina_olla_llena false
- set_active turno_cocina_economica true
# Position player depending of last scene
> [eq ESC_LAST_SCENE cocina_detras]
@@ -37,12 +35,12 @@ set_active turno_cocina_economica false [turno_cocina_economica_con_olla]
set_interactive turno_cocina_peso false
set_active turno_cocina_cocina_gas false
set_active turno_cocina_bol false
- set_interactive turno_cocina_carton false
set_active cocina_cuchillos false
set_active cocina_fregadero_izq false
set_active cocina_fregadero_der false
set_active cocina_puerta_delante false
set_active cocina_puerta_detras false
+ set_active turno_cocina_cuerno false
set_interactive cocina_patata false
set_active cocina_debajo_sofa false
accept_input SKIP
diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc
index 88ea9de3..e7e9acb1 100644
--- a/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/economica.esc
@@ -9,14 +9,14 @@ say current_player "Debería llenar la olla de agua primero."
:action3 turno_cocina_olla_llena
set_active turno_cocina_olla_llena true
-say current_player "Me siento un cocinero de verdad."
set_global turno_cocina_economica_con_olla true
inventory_remove turno_cocina_olla_llena
+say current_player "Me siento un cocinero de verdad."
:action3 turno_cocina_madera
-say current_player "Más madera que es la guerra!"
set_global turno_cocina_economica_con_madera true
inventory_remove turno_cocina_madera
+say current_player "Más madera que es la guerra!"
:action3 turno_cocina_carton
say current_player "Prefiero meter el cartón cuando esté encendido."
@@ -26,6 +26,7 @@ say current_player "Prefiero meter el cartón cuando esté encendido."
say current_player "Debería meter leña primero."
stop
> [turno_cocina_economica_con_madera]
- say current_player "He encendido la cocina, a cocinar!"
set_global turno_cocina_economica_encendida true
inventory_remove turno_cocina_carton_encendido
+ say current_player "He encendido la cocina, a cocinar!"
+
diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc
index 514606c4..85420f70 100644
--- a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc
@@ -1,10 +1,11 @@
:action1
say player "Parece que funciona."
+ play_lib_snd cocina_fregadero_der
:action2
say player "No tengo donde meter el agua."
:action3 turno_cocina_olla_vacia
- # play_lib_snd cocina_fregader_izq
+ play_lib_snd cocina_fregadero_der
say player "Agua a ojo... en su justa medida."
inventory_remove turno_cocina_olla_vacia
inventory_add turno_cocina_olla_llena
\ No newline at end of file
diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc
index 5380de40..e728df94 100644
--- a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc
@@ -1,11 +1,12 @@
:action1
+ play_lib_snd cocina_fregadero_izq
say player "Parece que funciona."
:action2
say player "No tengo donde meter el agua."
:action3 turno_cocina_olla_vacia
- # play_lib_snd cocina_fregader_izq
+ play_lib_snd cocina_fregadero_izq
say player "Agua a ojo... en su justa medida."
inventory_remove turno_cocina_olla_vacia
inventory_add turno_cocina_olla_llena
\ No newline at end of file
diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png
index 59350fe8..2439560e 100644
Binary files a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png and b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png differ
diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf
index d06e17a4..109cbf35 100644
Binary files a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf and b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf differ
diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
index 54d75190..5942cc76 100644
--- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=14 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
@@ -11,6 +11,7 @@
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" type="Texture" id=9]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" type="PackedScene" id=10]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" type="PackedScene" id=11]
+[ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=12]
[sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 )
@@ -110,7 +111,6 @@ global_id = "puerta_detras_start"
[node name="EnekoSmoking" parent="." instance=ExtResource( 8 )]
position = Vector2( 813, 440 )
combine_when_selected_action_is_in = [ ]
-dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 )
[node name="ESCLocation" type="Position2D" parent="EnekoSmoking"]
position = Vector2( -44, 82 )
@@ -164,3 +164,10 @@ script = ExtResource( 5 )
[node name="turno_cocina_ajo" parent="." instance=ExtResource( 11 )]
position = Vector2( 858, 399 )
+
+[node name="turno_cocina_carton" parent="." instance=ExtResource( 12 )]
+position = Vector2( 1221, 423 )
+
+[node name="ESCLocation" type="Position2D" parent="turno_cocina_carton"]
+position = Vector2( -52, 34 )
+script = ExtResource( 5 )
diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
index 2b4536c3..436db042 100644
--- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
+++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc
@@ -1,4 +1,12 @@
:setup
+# Uncomment to disable intro scene
+#set_global cocina_delante_intro_played true
+#set_global cocina_intro_played true
+> [!cocina_delante_intro_played]
+ accept_input SKIP
+ stop_snd
+ play_video res://gymkhana/videos/turno_cocina/intro_subs.ogv
+
inventory_add turno_cocina_frontal
set_active turno_cocina_ajo false [!turno_cocina_eneko_catando]
anim eneko_smoking idle
@@ -19,14 +27,10 @@ set_angle player 90
:ready
-# Uncomment to disable intro scene
-set_global cocina_delante_intro_played true
-set_global cocina_intro_played true
> [!cocina_delante_intro_played]
set_global cocina_delante_intro_played true
accept_input SKIP
stop_snd
- play_video res://gymkhana/videos/turno_cocina/intro.ogv
queue_event eneko_smoking intro_dialog intro_dialog_channel true
set_gui_visible true
walk_block player puerta_cocina_start
diff --git a/gymkhana/sounds/cocina_fregadero_der.ogg b/gymkhana/sounds/cocina_fregadero_der.ogg
index e3e0618d..a9e3ed51 100644
Binary files a/gymkhana/sounds/cocina_fregadero_der.ogg and b/gymkhana/sounds/cocina_fregadero_der.ogg differ
diff --git a/gymkhana/sounds/cocina_fregadero_izq.ogg b/gymkhana/sounds/cocina_fregadero_izq.ogg
index b74f73df..82a0e66f 100644
Binary files a/gymkhana/sounds/cocina_fregadero_izq.ogg and b/gymkhana/sounds/cocina_fregadero_izq.ogg differ
diff --git a/gymkhana/videos/turno_cocina/intro.ogv b/gymkhana/videos/turno_cocina/intro_no_subs.ogv
similarity index 100%
rename from gymkhana/videos/turno_cocina/intro.ogv
rename to gymkhana/videos/turno_cocina/intro_no_subs.ogv
diff --git a/gymkhana/videos/turno_cocina/intro_subs.ogv b/gymkhana/videos/turno_cocina/intro_subs.ogv
new file mode 100644
index 00000000..b29d89b0
Binary files /dev/null and b/gymkhana/videos/turno_cocina/intro_subs.ogv differ