diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn index 98ac434a..e670b198 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn +++ b/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 = "[center]Here be some text.[/center]" +text = "Here be some text." fit_content_height = true script = ExtResource( 1 ) diff --git a/gymkhana/characters/eneko/assets/speak.xcf b/gymkhana/characters/eneko/assets/speak.xcf new file mode 100644 index 00000000..f2d83ced Binary files /dev/null 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 055db242..aa760042 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2] @@ -18,7 +18,6 @@ [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png" type="Texture" id=16] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png" type="Texture" id=17] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=18] -[ext_resource path="res://gymkhana/characters/eneko/assets/speak-3.png" type="Texture" id=19] [ext_resource path="res://gymkhana/characters/eneko/assets/speak-2.png" type="Texture" id=20] [sub_resource type="AtlasTexture" id=2] @@ -33,7 +32,7 @@ animations = [ { "name": "idle", "speed": 5.0 }, { -"frames": [ ExtResource( 7 ), SubResource( 2 ), ExtResource( 19 ) ], +"frames": [ ExtResource( 7 ), SubResource( 2 ) ], "loop": true, "name": "speak", "speed": 5.0 diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc index 4c120f33..5c1a37a4 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc @@ -1,2 +1,3 @@ :action1 +play_snd res://gymkhana/sounds/cocina_delante_open.ogg change_scene "res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn" diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc index dd326dbe..aa647530 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc @@ -1,2 +1,3 @@ :action1 +play_snd res://gymkhana/sounds/cocina_detras_open.ogg change_scene "res://gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn" diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc index e011479d..dc18c743 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc @@ -1,2 +1,3 @@ :action1 +play_snd res://gymkhana/sounds/cocina_delante_open.ogg change_scene "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn" diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc index 12cdab82..cbbda34c 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc @@ -1,2 +1,3 @@ :action1 +play_snd res://gymkhana/sounds/despensa_open.ogg change_scene "res://gymkhana/rooms/turno_cocina/despensa/despensa.tscn" diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc index e011479d..e6a65b9e 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc @@ -1,2 +1,3 @@ :action1 +play_snd res://gymkhana/sounds/cocina_detras_open.ogg change_scene "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn" diff --git a/gymkhana/rooms/turno_cocina/despensa/esc/puerta_exterior.esc b/gymkhana/rooms/turno_cocina/despensa/esc/puerta_exterior.esc index 4c120f33..4be9bafa 100644 --- a/gymkhana/rooms/turno_cocina/despensa/esc/puerta_exterior.esc +++ b/gymkhana/rooms/turno_cocina/despensa/esc/puerta_exterior.esc @@ -1,2 +1,3 @@ :action1 +play_snd res://gymkhana/sounds/despensa_open.ogg change_scene "res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn" diff --git a/gymkhana/sounds/cocina_delante_open.ogg b/gymkhana/sounds/cocina_delante_open.ogg new file mode 100644 index 00000000..02d91a7d Binary files /dev/null and b/gymkhana/sounds/cocina_delante_open.ogg differ diff --git a/gymkhana/sounds/cocina_detras_open.ogg b/gymkhana/sounds/cocina_detras_open.ogg new file mode 100644 index 00000000..5cf5845a Binary files /dev/null and b/gymkhana/sounds/cocina_detras_open.ogg differ diff --git a/gymkhana/sounds/despensa_open.ogg b/gymkhana/sounds/despensa_open.ogg new file mode 100644 index 00000000..71872241 Binary files /dev/null and b/gymkhana/sounds/despensa_open.ogg differ