oier animation tweaks, say_to_camera command

README.md

@@ -17,4 +17,9 @@ Point-and-click adventure game developed using Escoria framework and Godot engin
 ## Export
 - Web: `godot -v --export "HTML5" ../gymkhana-export-html/index.html`
 - Linux: `godot -v --export "Linux/X11" ../LasGymkhanikasDeUli-1.0-RC1.appimage`
-- ~~Windows: godot -v --export "Windows Desktop x64" ../LasGymkhanikasDeUli-1.0-RC1.exe~~
+- ~~Windows: godot -v --export "Windows Desktop x64" ../LasGymkhanikasDeUli-1.0-RC1.exe~~
+
+
+## Sound attributions:
+- button_clicking.ogg | Button Clicking 1 by Sheyvan -- https://freesound.org/s/475188/ -- License: Creative Commons 0
+- menu_button.ogg | Videogame Menu BUTTON CLICK by Christopherderp -- https://freesound.org/s/342200/ -- License: Creative Commons 0

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_to_camera.gd

@@ -0,0 +1,139 @@
+# `say_to_camera player text [type]`
+#
+# Displays the specified string as dialog spoken by the player. This command
+# blocks further event execution until the dialog has finished being 'said'
+# (either as displayed text or as audible speech from a file).
+#
+# Global variables can be substituted into the text by wrapping the global
+# name in braces.
+# e.g. say player "I have {coin_count} coins remaining".
+#
+# **Parameters**
+#
+# - *player*: Global ID of the `ESCPlayer` or `ESCItem` object that is active.
+#	You can specify `current_player` in order to refer to the currently active
+#	player, e.g. in cases where multiple players are playable such as in games
+#	like Maniac Mansion or Day of the Tentacle.
+# - *text*: Text to display.
+# - *key*: Translation key (default: nil)
+# - *type*: Dialog type to use. One of `floating` or `avatar`.
+#   (default: the value set in the setting "Escoria/UI/Default Dialog Type")
+#
+# The text supports translation keys by prepending the key followed by
+# a colon (`:`) to the text.
+# For more details see: https://docs.escoria-framework.org/en/devel/getting_started/dialogs.html#translations
+#
+# Playing an audio file while the text is being
+# displayed is also supported by this mechanism.
+# For more details see: https://docs.escoria-framework.org/en/devel/getting_started/dialogs.html#recorded_speech
+#
+# Example: `say(player, "Picture's looking good.", "ROOM1_PICTURE")`
+#
+# @ESC
+extends ESCBaseCommand
+class_name SayToCameraCommand
+
+
+const CURRENT_PLAYER_KEYWORD = "CURRENT_PLAYER"
+
+const DEFAULT_CAMERA_DIRECTION = 4
+
+var globals_regex : RegEx		# Regex to match global variables in strings
+
+
+
+# Constructor
+func _init() -> void:
+	globals_regex = RegEx.new()
+	# Use look-ahead/behind to capture the term (i.e. global) in braces
+	globals_regex.compile("(?<=\\{)(.*)(?=\\})")
+
+
+# Return the descriptor of the arguments of this command
+func configure() -> ESCCommandArgumentDescriptor:
+	return ESCCommandArgumentDescriptor.new(
+		2,
+		[TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING],
+		[
+			null,
+			null,
+			"",
+			""
+		],
+		[
+			true,
+			false,
+			false,
+			true
+		]
+	)
+
+
+# Validate whether the given arguments match the command descriptor
+func validate(arguments: Array):
+	if not super.validate(arguments):
+		return false
+
+	if arguments[0].to_upper() != CURRENT_PLAYER_KEYWORD \
+		and not escoria.object_manager.has(arguments[0]):
+		raise_invalid_object_error(self, arguments[0])
+		return false
+
+	return true
+
+
+# Run the command
+func run(command_params: Array) -> int:
+	var dict: Dictionary
+
+	escoria.current_state = escoria.GAME_STATE.DIALOG
+
+	if !escoria.dialog_player:
+		raise_error(
+			self,
+			"No dialog player was registered and the 'say' command was encountered."
+		)
+		escoria.current_state = escoria.GAME_STATE.DEFAULT
+		return ESCExecution.RC_ERROR
+
+	if not escoria.main.current_scene.player:
+		escoria.logger.warn(
+			self,
+			"[%s]: No player item in the current scene was registered and the say command was encountered."
+					% get_command_name()
+		)
+		escoria.current_state = escoria.GAME_STATE.DEFAULT
+		return ESCExecution.RC_CANCEL
+
+	# Replace the names of any globals in "{ }" with their value
+	command_params[1] = escoria.globals_manager.replace_globals(command_params[1])
+
+	
+
+	var speaking_character_global_id = escoria.main.current_scene.player.global_id \
+		if command_params[0].to_upper() == CURRENT_PLAYER_KEYWORD \
+		else command_params[0]
+	var node = escoria.object_manager.get_object(command_params[0]).node
+
+
+	escoria.object_manager.get_object(command_params[0]).node\
+			.set_direction(DEFAULT_CAMERA_DIRECTION)
+
+	escoria.dialog_player.say(
+		speaking_character_global_id,
+		command_params[3],
+		command_params[1],
+		command_params[2]
+	)
+	await escoria.dialog_player.say_finished
+	escoria.current_state = escoria.GAME_STATE.DEFAULT
+	
+	return ESCExecution.RC_OK
+
+
+# Function called when the command is interrupted.
+func interrupt():
+	escoria.logger.debug(
+		self,
+		"[%s] interrupt() function not implemented." % get_command_name()
+	)

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_to_camera.gd.uid

@@ -0,0 +1 @@
+uid://d0sdlkjqr8f67

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

@@ -5,17 +5,17 @@
 [ext_resource type="PackedScene" uid="uid://dmw5gicuenj53" path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" id="3"]
 [ext_resource type="PackedScene" uid="uid://d2kogebvoxy51" path="res://addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn" id="4"]
 [ext_resource type="Script" uid="uid://lkc4isk3g0rj" path="res://addons/escoria-ui-return-monkey-island/game.gd" id="5"]
-[ext_resource type="Texture2D" uid="uid://c0rchilnmxyd" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" id="6"]
+[ext_resource type="Texture2D" uid="uid://ce2rx8nm1s6gh" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" id="6"]
 [ext_resource type="PackedScene" uid="uid://d3wdxi18u52c5" path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn" id="7"]
 [ext_resource type="PackedScene" uid="uid://dl7w8oqk1rmhw" path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn" id="8"]
 [ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="9"]
-[ext_resource type="Texture2D" uid="uid://ch7vmpx5l23fy" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" id="10"]
-[ext_resource type="Texture2D" uid="uid://btng6bg3t644v" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64.svg" id="11"]
+[ext_resource type="Texture2D" uid="uid://doahvd61d05u8" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" id="10"]
+[ext_resource type="Texture2D" uid="uid://cvxd4tjmdwj5l" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64.svg" id="11"]
 [ext_resource type="PackedScene" uid="uid://ctg3fukoficqk" path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.tscn" id="12"]
-[ext_resource type="Texture2D" uid="uid://dwkquq28fkf8n" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" id="13"]
+[ext_resource type="Texture2D" uid="uid://dghklsdy5nmcg" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" id="13"]
 [ext_resource type="Script" uid="uid://chas0xyx88njl" path="res://addons/escoria-ui-return-monkey-island/MusicButton.gd" id="14"]
-[ext_resource type="Texture2D" uid="uid://p214fv1y4fr4" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" id="15"]
-[ext_resource type="Texture2D" uid="uid://bcurldbc1pvn2" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"]
+[ext_resource type="Texture2D" uid="uid://d2sehci16hioi" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" id="15"]
+[ext_resource type="Texture2D" uid="uid://e2xk0aimdte" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"]
 
 [node name="game" type="Node2D"]
 script = ExtResource("5")
@@ -91,10 +91,16 @@ texture_normal = ExtResource("11")
 texture_hover = ExtResource("10")
 
 [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui"]
-layout_mode = 0
+layout_mode = 1
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = 18.0
+offset_left = -2.0
+offset_top = -8.0
+offset_right = -2.0
+offset_bottom = -16.0
+grow_horizontal = 2
+grow_vertical = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 

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

@@ -19,6 +19,7 @@ inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/Scrol
 [node name="FloatingInventory" type="CanvasLayer" parent="."]
 
 [node name="inventory_bg" type="Polygon2D" parent="FloatingInventory"]
+position = Vector2(0, -16)
 color = Color(0.156863, 0.0627451, 0, 1)
 polygon = PackedVector2Array(-3, 578, 1280, 578, 1280, 752, -3, 757)
 

addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd

@@ -0,0 +1,16 @@
+extends Button
+class_name RTMIMenuButton
+
+@onready var hover_sound = AudioStreamPlayer.new()
+@onready var click_sound = AudioStreamPlayer.new()
+
+func _ready() -> void:
+	hover_sound.stream = load("res://addons/escoria-ui-return-monkey-island/sounds/menu_button.ogg")
+	click_sound.stream = load("res://addons/escoria-ui-return-monkey-island/sounds/menu_button.ogg")
+	hover_sound.volume_db = -20
+	click_sound.volume_db = -20
+	click_sound.pitch_scale = 1.5
+	pressed.connect(func(): click_sound.play())
+	mouse_entered.connect(func(): hover_sound.play())
+	add_child(hover_sound)
+	add_child(click_sound)

addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd.uid

@@ -0,0 +1 @@
+uid://igjijrs4qngp

addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd

@@ -1,8 +1,8 @@
-extends Button
+extends RTMIMenuButton
+class_name RTMIMenuButtonWithSaveFeature
 
 
 var save_enabled = ESCProjectSettingsManager.get_setting( RTMIUiSettings.SAVEGAME_ENABLED)
 	
 func _process(_delta):
 	self.visible = ProjectSettings.get_setting( RTMIUiSettings.SAVEGAME_ENABLED)
-

addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd.uid

@@ -0,0 +1 @@
+uid://bfi05b2x5srm2

addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn

@@ -1,35 +1,39 @@
-[gd_scene load_steps=6 format=3 uid="uid://d3wdxi18u52c5"]
+[gd_scene load_steps=7 format=3 uid="uid://d3wdxi18u52c5"]
 
 [ext_resource type="Script" uid="uid://cnlvmkxk41x6j" path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd" id="1"]
-[ext_resource type="Script" uid="uid://c7y2f4rocpq4h" path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" id="2"]
-[ext_resource type="Texture2D" uid="uid://budal8dqwrifr" path="res://gymkhana/logo-small.png" id="3"]
-[ext_resource type="PackedScene" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="4"]
+[ext_resource type="Script" uid="uid://c7y2f4rocpq4h" path="res://addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd" id="2"]
+[ext_resource type="Texture2D" uid="uid://bgfi7t6khinjw" path="res://gymkhana/logo-small.png" id="3"]
+[ext_resource type="PackedScene" uid="uid://csxvnrljbqkr8" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="4"]
 [ext_resource type="PackedScene" uid="uid://j3wkbyhedkpr" path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" id="5"]
+[ext_resource type="Script" uid="uid://igjijrs4qngp" path="res://addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd" id="5_4i6cp"]
 
 [node name="main_menu" type="Control"]
+layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource("1")
 
 [node name="load_game" parent="." instance=ExtResource("5")]
 visible = false
+layout_mode = 1
 
 [node name="options" parent="." instance=ExtResource("4")]
 visible = false
+anchors_preset = 0
 
 [node name="main" type="Control" parent="."]
+anchors_preset = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
 
 [node name="Panel" type="Panel" parent="main"]
+layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
-__meta__ = {
-"_edit_use_anchors_": false,
-"_editor_description_": ""
-}
 
 [node name="main" type="VBoxContainer" parent="main"]
+layout_mode = 0
 anchor_left = 0.5
 anchor_right = 0.5
 anchor_bottom = 1.0
@@ -37,65 +41,40 @@ offset_left = -308.0
 offset_right = 308.0
 theme_override_constants/separation = 100
 alignment = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="TextureRect" type="TextureRect" parent="main/main"]
-offset_top = 55.0
-offset_right = 616.0
-offset_bottom = 355.0
+layout_mode = 2
 texture = ExtResource("3")
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="buttons" type="VBoxContainer" parent="main/main"]
-offset_top = 455.0
-offset_right = 616.0
-offset_bottom = 695.0
+layout_mode = 2
 theme_override_constants/separation = 10
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="new_game" type="Button" parent="main/main/buttons"]
-offset_right = 616.0
-offset_bottom = 150.0
 custom_minimum_size = Vector2(0, 150)
+layout_mode = 2
 size_flags_vertical = 3
 text = "NEW_GAME"
-__meta__ = {
-"_edit_use_anchors_": false
-}
+script = ExtResource("5_4i6cp")
 
 [node name="load_game" type="Button" parent="main/main/buttons"]
-offset_top = 160.0
-offset_right = 616.0
-offset_bottom = 180.0
+layout_mode = 2
 text = "LOAD_GAME"
 script = ExtResource("2")
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="options" type="Button" parent="main/main/buttons"]
-offset_top = 190.0
-offset_right = 616.0
-offset_bottom = 210.0
+layout_mode = 2
 text = "OPTIONS"
+script = ExtResource("5_4i6cp")
 
 [node name="quit" type="Button" parent="main/main/buttons"]
-offset_top = 220.0
-offset_right = 616.0
-offset_bottom = 240.0
+layout_mode = 2
 text = "QUIT"
-__meta__ = {
-"_edit_use_anchors_": false
-}
+script = ExtResource("5_4i6cp")
 
 [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="mouse_entered" from="main/main/buttons/new_game" to="main/main/buttons/new_game" method="_on_mouse_entered"]
 [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"]

addons/escoria-ui-return-monkey-island/menus/menu_button.gd.uid

@@ -0,0 +1 @@
+uid://7r52k008dvrx

addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn

@@ -1,117 +1,98 @@
-[gd_scene load_steps=7 format=3 uid="uid://dl7w8oqk1rmhw"]
+[gd_scene load_steps=8 format=3 uid="uid://dl7w8oqk1rmhw"]
 
 [ext_resource type="Script" uid="uid://ctu22fcrvjv4t" path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://csxvnrljbqkr8" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="2"]
-[ext_resource type="Texture2D" uid="uid://budal8dqwrifr" path="res://gymkhana/logo-small.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://bgfi7t6khinjw" path="res://gymkhana/logo-small.png" id="3"]
 [ext_resource type="PackedScene" uid="uid://cj440t8pub603" path="res://addons/escoria-core/ui_library/menus/load_save/save/save_game.tscn" id="4"]
 [ext_resource type="PackedScene" uid="uid://j3wkbyhedkpr" path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" id="5"]
-[ext_resource type="Script" uid="uid://c7y2f4rocpq4h" path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" id="6"]
+[ext_resource type="Script" uid="uid://igjijrs4qngp" path="res://addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd" id="6_31lra"]
+[ext_resource type="Script" uid="uid://bfi05b2x5srm2" path="res://addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd" id="7_e0gqa"]
 
 [node name="pause_menu" type="Control"]
+layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 script = ExtResource("1")
 
 [node name="Panel" type="Panel" parent="."]
+layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="save_game" parent="." instance=ExtResource("4")]
 visible = false
+layout_mode = 1
 
 [node name="load_game" parent="." instance=ExtResource("5")]
 visible = false
+layout_mode = 1
 
 [node name="options" parent="." instance=ExtResource("2")]
 visible = false
+anchors_preset = 0
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 13
 anchor_left = 0.5
 anchor_right = 0.5
 anchor_bottom = 1.0
 offset_left = -308.0
+offset_top = 9.0
 offset_right = 308.0
+offset_bottom = 44.0
+grow_horizontal = 2
+grow_vertical = 2
+scale = Vector2(0.92, 0.92)
 theme_override_constants/separation = 100
 alignment = 1
 
 [node name="TextureRect" type="TextureRect" parent="VBoxContainer"]
-offset_top = 25.0
-offset_right = 616.0
-offset_bottom = 325.0
+layout_mode = 2
 texture = ExtResource("3")
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="menuitems" type="VBoxContainer" parent="VBoxContainer"]
-offset_top = 425.0
-offset_right = 616.0
-offset_bottom = 725.0
+layout_mode = 2
 theme_override_constants/separation = 10
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="continue" type="Button" parent="VBoxContainer/menuitems"]
-offset_right = 616.0
-offset_bottom = 150.0
 custom_minimum_size = Vector2(0, 150)
+layout_mode = 2
 size_flags_vertical = 3
 text = "CONTINUE_GAME"
-__meta__ = {
-"_edit_use_anchors_": false
-}
+script = ExtResource("6_31lra")
 
 [node name="new_game" type="Button" parent="VBoxContainer/menuitems"]
-offset_top = 160.0
-offset_right = 616.0
-offset_bottom = 180.0
+layout_mode = 2
 size_flags_vertical = 3
 text = "NEW_GAME"
-__meta__ = {
-"_edit_use_anchors_": false
-}
+script = ExtResource("6_31lra")
 
 [node name="save_game" type="Button" parent="VBoxContainer/menuitems"]
-offset_top = 190.0
-offset_right = 616.0
-offset_bottom = 210.0
+layout_mode = 2
 size_flags_vertical = 3
 text = "SAVE_GAME"
-script = ExtResource("6")
-__meta__ = {
-"_edit_use_anchors_": false
-}
+script = ExtResource("7_e0gqa")
 
 [node name="load_game" type="Button" parent="VBoxContainer/menuitems"]
-offset_top = 220.0
-offset_right = 616.0
-offset_bottom = 240.0
+layout_mode = 2
 size_flags_vertical = 3
 text = "LOAD_GAME"
-script = ExtResource("6")
-__meta__ = {
-"_edit_use_anchors_": false
-}
+script = ExtResource("7_e0gqa")
 
 [node name="options" type="Button" parent="VBoxContainer/menuitems"]
-offset_top = 250.0
-offset_right = 616.0
-offset_bottom = 270.0
+layout_mode = 2
 text = "OPTIONS"
+script = ExtResource("6_31lra")
 
 [node name="quit" type="Button" parent="VBoxContainer/menuitems"]
-offset_top = 280.0
-offset_right = 616.0
-offset_bottom = 300.0
+layout_mode = 2
 size_flags_vertical = 3
 text = "QUIT"
-__meta__ = {
-"_edit_use_anchors_": false
-}
+script = ExtResource("6_31lra")
 
 [connection signal="back_button_pressed" from="save_game" to="." method="_on_save_game_back_button_pressed"]
 [connection signal="back_button_pressed" from="load_game" to="." method="_on_load_game_back_button_pressed"]

gymkhana/characters/oier/oier.tscn

@@ -1,9 +1,9 @@
-[gd_scene load_steps=33 format=3 uid="uid://cjmsexhyhi4vs"]
+[gd_scene load_steps=37 format=3 uid="uid://cjmsexhyhi4vs"]
 
 [ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="1"]
-[ext_resource type="Texture2D" uid="uid://b2msjygw7oyi0" path="res://gymkhana/characters/oier/oier-mod.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://da1kd8lccd24" path="res://gymkhana/characters/oier/oier-mod.png" id="2"]
 [ext_resource type="Resource" uid="uid://cyjo7aq0e4hbe" path="res://gymkhana/characters/oier/oier_animations.tres" id="3"]
-[ext_resource type="Texture2D" uid="uid://bcs6kqj5w23vk" path="res://gymkhana/characters/oier/oier-mod-talk.png" id="4"]
+[ext_resource type="Texture2D" uid="uid://dayds4a0t1ldv" path="res://gymkhana/characters/oier/oier-mod-talk.png" id="4"]
 [ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="5_10x32"]
 
 [sub_resource type="AtlasTexture" id="22"]
@@ -38,6 +38,22 @@ region = Rect2(5733, 0, 273, 795)
 atlas = ExtResource("4")
 region = Rect2(5733, 0, 273, 795)
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_10x32"]
+atlas = ExtResource("4")
+region = Rect2(5460, 0, 273, 795)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_b64d8"]
+atlas = ExtResource("4")
+region = Rect2(4368, 0, 273, 795)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_c4eys"]
+atlas = ExtResource("4")
+region = Rect2(5187, 0, 273, 795)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_obf0k"]
+atlas = ExtResource("4")
+region = Rect2(4641, 0, 273, 795)
+
 [sub_resource type="AtlasTexture" id="46"]
 atlas = ExtResource("2")
 region = Rect2(3549, 0, 273, 795)
@@ -169,6 +185,50 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
+"texture": SubResource("23")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_10x32")
+}],
+"loop": true,
+"name": &"speak_down_left",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("24")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_b64d8")
+}],
+"loop": true,
+"name": &"speak_down_right",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("25")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_c4eys")
+}],
+"loop": true,
+"name": &"speak_left",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("26")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_obf0k")
+}],
+"loop": true,
+"name": &"speak_right",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
 "texture": SubResource("46")
 }, {
 "duration": 1.0,

gymkhana/items/inventory/turno_cocina_mechero.esc

@@ -1,20 +1,16 @@
 :action1
-	set_angle($player, 270)
-	say($player, "Mi mechero, que bien!!", "mechero_action1_say_1")
-	set_angle($player,270)
-	say($player, "Ayer lo dejé un segundo encima de la mesa y desapareció.", "mechero_action1_say_2")
+	say_to_camera($player, "Mi mechero, que bien!!", "mechero_action1_say_1")
+	say_to_camera($player, "Ayer lo dejé un segundo encima de la mesa y desapareció.", "mechero_action1_say_2")
 
 :action2
-	set_angle($player,270)
-	say($player, "A la saca!", "mechero_action2_say")
+	say_to_camera($player, "A la saca!", "mechero_action2_say")
 	set_active($turno_cocina_mechero, false)
 	inventory_add("turno_cocina_mechero")
 
 :action3
 	say($player, "Parece que no tiene gas.", "mechero_action3_say_1")
 	say($player, "Eso explica que lo hayan abandonado.", "mechero_action3_say_2")
-	set_angle($player, 180)
-	say($player, "Si vienes a Uli vigila tu mechero.", "mechero_action3_say_3")
+	say_to_camera($player, "Si vienes a Uli vigila tu mechero.", "mechero_action3_say_3")
 
 :action4 "turno_cocina_carton"
 	say($player, "Fuego!", "mechero_action4") #ToDo: tiene sentido?

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

@@ -24,5 +24,7 @@
 
 :action3 "turno_cocina_frontal"
 	global turno_cocina_frontal_debajo_sofa
+	play_lib_snd("button_clicking")
+	wait(1)
 	say($player, "Veo una patata!!", "cocina_debajo_sofa_action3_frontal_say")
 	turno_cocina_frontal_debajo_sofa = true