diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn index ad21da6f..8ea7d9ac 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn @@ -1,61 +1,54 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://nbnsf3pmh4jg"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2] +[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd" id="1"] +[ext_resource type="Theme" uid="uid://dvwfrnya2nhxu" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" id="2"] -[sub_resource type="Gradient" id=1] -colors = PackedColorArray( 1, 0, 0, 1, 1, 0, 0, 1 ) +[sub_resource type="Gradient" id="1"] +colors = PackedColorArray(1, 0, 0, 1, 1, 0, 0, 1) -[sub_resource type="GradientTexture2D" id=2] -gradient = SubResource( 1 ) +[sub_resource type="GradientTexture2D" id="2"] +gradient = SubResource("1") [node name="text_dialog_choice" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 offset_top = 560.0 offset_right = 7.0 -theme = ExtResource( 2 ) -script = ExtResource( 1 ) +theme = ExtResource("2") +script = ExtResource("1") [node name="MarginContainer" type="MarginContainer" parent="."] +layout_mode = 0 offset_left = 20.0 offset_top = 10.0 offset_right = 1280.0 offset_bottom = 185.0 mouse_filter = 2 -theme_override_constants/margin_top = 20 theme_override_constants/margin_left = 20 +theme_override_constants/margin_top = 20 [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"] -offset_left = 20.0 -offset_top = 20.0 -offset_right = 1260.0 -offset_bottom = 175.0 -scroll_horizontal_enabled = false -__meta__ = { -"_edit_use_anchors_": false -} +layout_mode = 2 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"] -offset_right = 1240.0 -offset_bottom = 155.0 +layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme_override_constants/separation = 10 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Timer" type="Timer" parent="."] one_shot = true [node name="TimerProgress" type="TextureProgressBar" parent="."] +custom_minimum_size = Vector2(0, 20) +layout_mode = 0 anchor_right = 1.0 -custom_minimum_size = Vector2( 0, 20 ) -texture_progress = SubResource( 2 ) nine_patch_stretch = true +texture_progress = SubResource("2") [node name="AvatarContainer" type="Node2D" parent="."] -position = Vector2( 94, 68 ) +position = Vector2(94, 68) [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn index ccb553b6..5ac2b4bc 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn @@ -1,13 +1,13 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=3 format=3 uid="uid://dyi4lxm20wgne"] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres" type="FontFile" id=1] -[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd" type="Script" id=2] +[ext_resource type="FontFile" path="res://addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres" id="1"] +[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd" id="2"] [node name="Label" type="Label"] offset_left = 1057.0 offset_top = 533.0 offset_right = 1259.0 offset_bottom = 551.0 -theme_override_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "Haz click para acelerar el texto" -script = ExtResource( 2 ) +script = ExtResource("2") diff --git a/gymkhana/characters/eneko/eneko_smoking.esc3 b/gymkhana/characters/eneko/eneko_smoking.esc3 index 03052db6..8463d294 100644 --- a/gymkhana/characters/eneko/eneko_smoking.esc3 +++ b/gymkhana/characters/eneko/eneko_smoking.esc3 @@ -31,7 +31,7 @@ say eneko_smoking cocina_delante_intro_dialog_eneko:"¿Vas a hacer algo de prove say eneko_smoking cocina_delante_intro_dialog_option2_4_res:"Y que lo digas." set_global cocina_delante_intro_dialog_option2_done true ! - - cocina_delante_intro_dialog_option3:"Me gustaría comtemplar el paisaje y escribir un bonito poema sobre la vida en el campo." [!cocina_delante_intro_dialog_option3_done] + - cocina_delante_intro_dialog_option3:"Me gustaría contemplar el paisaje y escribir un bonito poema sobre la vida en el campo." [!cocina_delante_intro_dialog_option3_done] say_last_dialog_option say eneko_smoking cocina_delante_intro_dialog_option3_res:"¿En qué cabeza cabe que eso pueda ser algo de provecho?" set_global cocina_delante_intro_dialog_option3_done true @@ -218,4 +218,4 @@ say eneko_smoking "Te advierto que soy cinturón negro de Kung Fu!" inventory_remove turno_cocina_cuchillo :action3 turno_cocina_mechero - say eneko_smoking "Enserio!?!? Me das un mechero sin gas? No lo quiero." \ No newline at end of file + say eneko_smoking "Enserio!?!? Me das un mechero sin gas? No lo quiero." diff --git a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn index 25fb8f7c..6623fc44 100644 --- a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn +++ b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn @@ -13,10 +13,7 @@ inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) custom_data = { "tooltips": { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "Mirar dentro", - "action4": "Usar" + "action3": "Leer" } } animations = null diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index c7ddd86f..a21cd4fb 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -1,301 +1,309 @@ -[gd_scene load_steps=29 format=2] +[gd_scene load_steps=29 format=3 uid="uid://dowbdjo7ka0sq"] -[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] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/background.png" type="Texture2D" id=3] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] -[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/depth.png" type="Texture2D" id=7] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png" type="Texture2D" id=8] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" type="Texture2D" id=9] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" type="PackedScene" id=10] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" type="PackedScene" id=11] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" type="PackedScene" id=12] -[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture2D" id=13] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" type="PackedScene" id=14] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" type="Texture2D" id=15] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" type="Texture2D" id=16] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" type="Texture2D" id=17] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" type="Texture2D" id=18] -[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] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/jarra.tscn" type="PackedScene" id=22] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" type="Texture2D" id=23] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" type="Texture2D" id=24] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn" type="PackedScene" id=25] -[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd" type="Script" id=26] +[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_room.gd" id="1"] +[ext_resource type="PackedScene" path="res://gymkhana/characters/oier/oier.tscn" id="2"] +[ext_resource type="Texture2D" uid="uid://btinfddpynakn" path="res://gymkhana/rooms/turno_cocina/cocina/assets/background.png" id="3"] +[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" id="4"] +[ext_resource type="Script" path="res://addons/escoria-core/game/core-scripts/esc_location.gd" id="5"] +[ext_resource type="Script" path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" id="6"] +[ext_resource type="Texture2D" uid="uid://crhfjda62540d" path="res://gymkhana/rooms/turno_cocina/cocina/assets/depth.png" id="7"] +[ext_resource type="Texture2D" uid="uid://bss0jcop7w5cx" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png" id="8"] +[ext_resource type="Texture2D" uid="uid://bna12h746ucar" path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" id="9"] +[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" id="10"] +[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" id="11"] +[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" id="12"] +[ext_resource type="Texture2D" uid="uid://djkmw4bj8siok" path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" id="13"] +[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" id="14"] +[ext_resource type="Texture2D" uid="uid://chy7hyrqi6imp" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" id="15"] +[ext_resource type="Texture2D" uid="uid://bebo52w582216" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" id="16"] +[ext_resource type="Texture2D" uid="uid://c13mgcko6vbd0" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" id="17"] +[ext_resource type="Texture2D" uid="uid://da2sep4pylffj" path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" id="18"] +[ext_resource type="PackedScene" path="res://gymkhana/particles/SmokeParticles.tscn" id="19"] +[ext_resource type="PackedScene" path="res://gymkhana/items/inventory/turno_cocina_cuerno.tscn" id="20"] +[ext_resource type="Script" path="res://gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd" id="21"] +[ext_resource type="PackedScene" path="res://gymkhana/rooms/turno_cocina/cocina/jarra.tscn" id="22"] +[ext_resource type="Texture2D" uid="uid://bfrdglprxc04e" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" id="23"] +[ext_resource type="Texture2D" uid="uid://d00ocqj5ow3n6" path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" id="24"] +[ext_resource type="PackedScene" path="res://gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn" id="25"] +[ext_resource type="Script" path="res://gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd" id="26"] -[sub_resource type="NavigationPolygon" id=3] -vertices = PackedVector2Array( 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 ) -polygons = [ PackedInt32Array( 0, 1, 2, 3, 4 ), PackedInt32Array( 5, 6, 7, 8, 9 ), PackedInt32Array( 9, 8, 10, 11 ), PackedInt32Array( 12, 11, 10 ), PackedInt32Array( 12, 10, 13 ), PackedInt32Array( 14, 12, 13 ), PackedInt32Array( 15, 16, 17, 4, 3 ), PackedInt32Array( 18, 14, 13, 19, 20 ), PackedInt32Array( 21, 18, 20, 22 ), PackedInt32Array( 23, 24, 21, 22, 25, 26 ), PackedInt32Array( 26, 25, 27, 28 ), PackedInt32Array( 29, 28, 27, 30, 31 ), PackedInt32Array( 4, 17, 32, 33 ), PackedInt32Array( 34, 33, 32, 35, 36 ), PackedInt32Array( 37, 34, 36, 38, 31 ), PackedInt32Array( 31, 38, 29 ), PackedInt32Array( 39, 40, 31, 30, 41 ) ] -outlines = [ PackedVector2Array( 1347, 563, 1345, 505, 1306.5, 498, 1305.5, 467, 1337.5, 449, 1382, 439, 1466, 412, 1788, 325, 2238, 386, 2283, 493, 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2287, 687, 2062, 635, 2113, 565, 2109, 424, 2018, 419, 1787, 383, 1493, 479, 1466, 514, 1480, 587, 1489, 627, 1502, 646, 1409, 752, 1269, 739, 696, 737, 273, 570, 252, 478, 200, 465, 162, 471, 144, 568, 3, 570, -56, 524, 111, 445, 229, 445, 305, 524, 512, 591, 703, 699, 1241, 699, 1345, 667 ) ] +[sub_resource type="NavigationPolygon" id="3"] +vertices = PackedVector2Array(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) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3, 4), PackedInt32Array(5, 6, 7, 8, 9), PackedInt32Array(9, 8, 10, 11), PackedInt32Array(12, 11, 10), PackedInt32Array(12, 10, 13), PackedInt32Array(14, 12, 13), PackedInt32Array(15, 16, 17, 4, 3), PackedInt32Array(18, 14, 13, 19, 20), PackedInt32Array(21, 18, 20, 22), PackedInt32Array(23, 24, 21, 22, 25, 26), PackedInt32Array(26, 25, 27, 28), PackedInt32Array(29, 28, 27, 30, 31), PackedInt32Array(4, 17, 32, 33), PackedInt32Array(34, 33, 32, 35, 36), PackedInt32Array(37, 34, 36, 38, 31), PackedInt32Array(31, 38, 29), PackedInt32Array(39, 40, 31, 30, 41)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(1347, 563, 1345, 505, 1306.5, 498, 1305.5, 467, 1337.5, 449, 1382, 439, 1466, 412, 1788, 325, 2238, 386, 2283, 493, 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2287, 687, 2062, 635, 2113, 565, 2109, 424, 2018, 419, 1787, 383, 1493, 479, 1466, 514, 1480, 587, 1489, 627, 1502, 646, 1409, 752, 1269, 739, 696, 737, 273, 570, 252, 478, 200, 465, 162, 471, 144, 568, 3, 570, -56, 524, 111, 445, 229, 445, 305, 524, 512, 591, 703, 699, 1241, 699, 1345, 667)]) -[sub_resource type="SpriteFrames" id=4] -animations = [ { -"frames": [ ExtResource( 15 ) ], +[sub_resource type="SpriteFrames" id="4"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("15") +}], "loop": true, -"name": "apagada", +"name": &"apagada", "speed": 5.0 }, { -"frames": [ ExtResource( 17 ), ExtResource( 18 ), ExtResource( 16 ) ], +"frames": [{ +"duration": 1.0, +"texture": ExtResource("17") +}, { +"duration": 1.0, +"texture": ExtResource("18") +}, { +"duration": 1.0, +"texture": ExtResource("16") +}], "loop": true, -"name": "encendida", +"name": &"encendida", "speed": 5.0 -} ] +}] [node name="ESCRoom" type="Node2D"] -script = ExtResource( 1 ) -__meta__ = { -"_edit_lock_": true -} +script = ExtResource("1") global_id = "cocina" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc" -player_scene = ExtResource( 2 ) -camera_limits = [ Rect2( 0, 0, 2925, 577 ) ] +player_scene = ExtResource("2") +camera_limits = [Rect2(0, 0, 2925, 577)] editor_debug_mode = 1 [node name="background" type="Sprite2D" parent="."] -position = Vector2( 1462.5, 289 ) -texture = ExtResource( 3 ) -__meta__ = { -"_edit_lock_": true -} +position = Vector2(1462.5, 289) +texture = ExtResource("3") -[node name="ESCTerrain" type="Navigation2D" parent="."] -position = Vector2( 302.5, 0 ) -script = ExtResource( 4 ) -scales = ExtResource( 7 ) +[node name="ESCTerrain" type="Node2D" parent="."] +position = Vector2(302.5, 0) +script = ExtResource("4") +scales = ExtResource("7") scale_max = 1.4 player_speed_multiplier = 1.2 player_doubleclick_speed_multiplier = 2.0 [node name="Foreground-mesa" type="Sprite2D" parent="ESCTerrain"] -position = Vector2( 1786, 424 ) z_index = 1000 -texture = ExtResource( 8 ) +position = Vector2(1786, 424) +texture = ExtResource("8") [node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"] -navigation_polygon = SubResource( 3 ) +navigation_polygon = SubResource("3") [node name="Foreground-silla" type="Sprite2D" parent="ESCTerrain/NavigationRegion2D"] -position = Vector2( 202, 499 ) z_index = 4096 -texture = ExtResource( 9 ) +position = Vector2(202, 499) +texture = ExtResource("9") [node name="puerta_detras" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 302.5, 0 ) -script = ExtResource( 6 ) +position = Vector2(302.5, 0) +script = ExtResource("6") global_id = "cocina_puerta_detras" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc" is_exit = true -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = PackedStringArray() custom_data = { "tooltips": { -"action1": "Ir detrás" +"action1": "cocina_puerta_detras_action1" } } animations = null [node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"] -position = Vector2( 1710, -167 ) -scale = Vector2( 0.963362, 0.9875 ) -polygon = PackedVector2Array( 30.1029, 490.127, 25.9508, 330.127, 78.8904, 318.987, 127.678, 327.089, 130.792, 486.076 ) +position = Vector2(1710, -167) +scale = Vector2(0.963362, 0.9875) +polygon = PackedVector2Array(30.1029, 490.127, 25.9508, 330.127, 78.8904, 318.987, 127.678, 327.089, 130.792, 486.076) [node name="puerta_detras_start" type="Marker2D" parent="puerta_detras"] -position = Vector2( 1791, 370 ) -script = ExtResource( 5 ) +position = Vector2(1791, 370) +script = ExtResource("5") global_id = "puerta_detras_start" [node name="puerta_delante" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 302.5, 0 ) -script = ExtResource( 6 ) +position = Vector2(302.5, 0) +script = ExtResource("6") global_id = "cocina_puerta_delante" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc" is_exit = true -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = PackedStringArray() custom_data = { "tooltips": { -"action1": "Salir de la cocina" +"action1": "cocina_puerta_delante_action1" } } animations = null [node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] -position = Vector2( 2385, -81 ) -scale = Vector2( 0.963362, 0.9875 ) -polygon = PackedVector2Array( 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 ) +position = Vector2(2385, -81) +scale = Vector2(0.963362, 0.9875) +polygon = PackedVector2Array(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, 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="Marker2D" parent="puerta_delante"] -position = Vector2( 2379, 526 ) -script = ExtResource( 5 ) +position = Vector2(2379, 526) +script = ExtResource("5") global_id = "puerta_delante_start" -[node name="turno_cocina_peso" parent="." instance=ExtResource( 10 )] -position = Vector2( 2505, 160 ) -scale = Vector2( 0.880435, 0.88735 ) +[node name="turno_cocina_peso" parent="." instance=ExtResource("10")] +position = Vector2(2505, 160) +scale = Vector2(0.880435, 0.88735) +combine_when_selected_action_is_in = PackedStringArray("action4") [node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"] -position = Vector2( 15.9014, -11.2695 ) -polygon = PackedVector2Array( -2.27197, 1.12694, -2.27197, 23.666, -27.2595, 24.7929, -27.2595, 1.12694 ) +position = Vector2(15.9014, -11.2695) +polygon = PackedVector2Array(-2.27197, 1.12694, -2.27197, 23.666, -27.2595, 24.7929, -27.2595, 1.12694) [node name="turno_cocina_peso_location" type="Marker2D" parent="turno_cocina_peso"] -position = Vector2( -3.40724, 268.214 ) -script = ExtResource( 5 ) +position = Vector2(-3.40724, 268.214) +script = ExtResource("5") -[node name="turno_cocina_bol" parent="." instance=ExtResource( 11 )] -position = Vector2( 1505, 160 ) -scale = Vector2( 0.880435, 0.88735 ) +[node name="turno_cocina_bol" parent="." instance=ExtResource("11")] +position = Vector2(1505, 160) +scale = Vector2(0.880435, 0.88735) +combine_when_selected_action_is_in = PackedStringArray("action4") [node name="turno_cocina_bol_collision" type="CollisionPolygon2D" parent="turno_cocina_bol"] -position = Vector2( 169.235, 210.74 ) -polygon = PackedVector2Array( -7.95056, -30.4277, -4.54321, 21.412, -56.79, 37.1894, -73.827, -13.5234 ) +position = Vector2(169.235, 210.74) +polygon = PackedVector2Array(-7.95056, -30.4277, -4.54321, 21.412, -56.79, 37.1894, -73.827, -13.5234) [node name="turno_cocina_bol_location" type="Marker2D" parent="turno_cocina_bol"] -position = Vector2( 198.765, 339.212 ) -script = ExtResource( 5 ) +position = Vector2(198.765, 339.212) +script = ExtResource("5") -[node name="turno_cocina_pan" parent="." instance=ExtResource( 11 )] -position = Vector2( 1505, 160 ) -scale = Vector2( 0.880435, 0.88735 ) +[node name="turno_cocina_pan" parent="." instance=ExtResource("11")] +position = Vector2(1505, 160) +scale = Vector2(0.880435, 0.88735) global_id = "cocina_pan" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/pan.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = PackedStringArray() custom_data = { "tooltips": { -"action1": "Mirar", -"action2": "Picotear" +"action1": "cocina_pan_action1", +"action2": "cocina_pan_action2" } } [node name="turno_cocina_pan_collision" type="CollisionPolygon2D" parent="turno_cocina_pan"] -position = Vector2( 590.712, 122.292 ) -scale = Vector2( 1.02084, 1.32813 ) -polygon = PackedVector2Array( -14.7654, -1.12695, -14.7654, 7.88867, -48.8394, 7.88867, -48.8394, -1.12695 ) +position = Vector2(590.712, 122.292) +scale = Vector2(1.02084, 1.32813) +polygon = PackedVector2Array(-14.7654, -1.12695, -14.7654, 7.88867, -48.8394, 7.88867, -48.8394, -1.12695) [node name="turno_cocina_pan_location" type="Marker2D" parent="turno_cocina_pan"] -position = Vector2( 603.111, 223.136 ) -script = ExtResource( 5 ) +position = Vector2(603.111, 223.136) +script = ExtResource("5") [node name="fregadero_der" type="Area2D" parent="."] process_mode = 1 -script = ExtResource( 6 ) +script = ExtResource("6") +action3_target_texts = { +"turno_cocina_bol": "cocina_fregadero_action3_bol", +"turno_cocina_olla_vacia": "cocina_fregadero_action3_olla_vacia" +} +target_when_selected_action_is_in = ["action3"] global_id = "cocina_fregadero_der" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = PackedStringArray() custom_data = { "tooltips": { -"action1": "Mirar fregadero", -"action2": "Usar" +"action1": "cocina_fregadero_action1", +"action2": "cocina_fregadero_action2" } } -action3_target_texts = { -"turno_cocina_olla_vacia": "Llenar la olla de agua", -"turno_cocina_bol": "Llenar de agua" -} -target_when_selected_action_is_in = [ "action3" ] animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der"] -polygon = PackedVector2Array( 2327, 294, 2327, 302, 2395, 307, 2395, 296, 2401, 290, 2401, 257, 2334, 257, 2334, 286 ) +polygon = PackedVector2Array(2327, 294, 2327, 302, 2395, 307, 2395, 296, 2401, 290, 2401, 257, 2334, 257, 2334, 286) [node name="ESCLocation" type="Marker2D" parent="fregadero_der"] -position = Vector2( 2370, 395 ) -script = ExtResource( 5 ) +position = Vector2(2370, 395) +script = ExtResource("5") [node name="fregadero_izq" type="Area2D" parent="."] process_mode = 1 -script = ExtResource( 6 ) +script = ExtResource("6") +action3_target_texts = { +"turno_cocina_bol": "cocina_fregadero_action3_bol", +"turno_cocina_olla_vacia": "cocina_fregadero_action3_olla_vacia" +} +target_when_selected_action_is_in = ["action3"] global_id = "cocina_fregadero_izq" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc" -combine_when_selected_action_is_in = [ "action4" ] +combine_when_selected_action_is_in = PackedStringArray("action4") custom_data = { "tooltips": { -"action1": "Mirar el fregadero", -"action2": "Usar" +"action1": "cocina_fregadero_action1", +"action2": "cocina_fregadero_action2" } } -action3_target_texts = { -"turno_cocina_olla_vacia": "Llenar la olla de agua", -"turno_cocina_bol": "Llenar de agua" -} -target_when_selected_action_is_in = [ "action3" ] animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq"] -polygon = PackedVector2Array( 1806, 295, 1899, 287, 1900, 268, 1891, 245, 1851, 244, 1799, 240, 1798, 273 ) +polygon = PackedVector2Array(1806, 295, 1899, 287, 1900, 268, 1891, 245, 1851, 244, 1799, 240, 1798, 273) [node name="ESCLocation" type="Marker2D" parent="fregadero_izq"] -position = Vector2( 1855, 400 ) -script = ExtResource( 5 ) +position = Vector2(1855, 400) +script = ExtResource("5") [node name="cuchillos" type="Area2D" parent="."] process_mode = 1 -script = ExtResource( 6 ) +script = ExtResource("6") +action3_target_texts = { +"turno_cocina_cuchillo": "cocina_cuchillos_action3_cuchillo" +} +target_when_selected_action_is_in = ["action3"] global_id = "cocina_cuchillos" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cuchillos.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = PackedStringArray() custom_data = { "tooltips": { -"action1": "Contar los cuchillos", -"action2": "Coger un buen cuchillo" +"action1": "cocina_cuchillos_action1", +"action2": "cocina_cuchillos_action2" } } -action3_target_texts = { -"turno_cocina_cuchillo": "Dejar en su sitio" -} -target_when_selected_action_is_in = [ "action3" ] animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cuchillos"] -position = Vector2( 1452, -245 ) -polygon = PackedVector2Array( 469, 375, 454, 391, 508, 399, 530, 385 ) +position = Vector2(1452, -245) +polygon = PackedVector2Array(469, 375, 454, 391, 508, 399, 530, 385) [node name="ESCLocation" type="Marker2D" parent="cuchillos"] -position = Vector2( 1987, 370 ) -script = ExtResource( 5 ) +position = Vector2(1987, 370) +script = ExtResource("5") [node name="debajo_sofa" type="Area2D" parent="."] process_mode = 1 -script = ExtResource( 6 ) +script = ExtResource("6") +action3_target_texts = { +"turno_cocina_frontal": "cocina_debajo_sofa_action3_frontal" +} +target_when_selected_action_is_in = ["action3"] global_id = "cocina_debajo_sofa" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc" -combine_when_selected_action_is_in = [ "action4" ] +combine_when_selected_action_is_in = PackedStringArray("action4") custom_data = { "tooltips": { -"action1": "Mirar debajo del sofa", -"action2": "Meter la mano" +"action1": "cocina_debajo_sofa_action1", +"action2": "cocina_debajo_sofa_action2" } } -action3_target_texts = { -"turno_cocina_frontal": "Alumbrar debajo del sofa" -} -target_when_selected_action_is_in = [ "action3" ] animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="debajo_sofa"] -polygon = PackedVector2Array( 466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 561, 386 ) +polygon = PackedVector2Array(466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 561, 386) [node name="ESCLocation" type="Marker2D" parent="debajo_sofa"] -position = Vector2( 420, 494 ) -script = ExtResource( 5 ) +position = Vector2(420, 494) +script = ExtResource("5") [node name="cocina_patata" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 2202, 343 ) -rotation = -0.270526 -scale = Vector2( 0.65, 0.65 ) z_index = 1001 -script = ExtResource( 6 ) +position = Vector2(2202, 343) +rotation = -0.270526 +scale = Vector2(0.65, 0.65) +script = ExtResource("6") global_id = "cocina_patata" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/patata.esc" -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 13 ) +combine_when_selected_action_is_in = PackedStringArray() +inventory_texture = ExtResource("13") custom_data = { -"count_textures": [ { +"count_textures": [{ "start": 1, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_patata.png" }, { @@ -307,161 +315,162 @@ custom_data = { }, { "start": 4, "texture": "res://gymkhana/items/inventory/assets/turno_cocina_cuatro_patatas.png" -} ], +}], "tooltips": { -"action1": "Admirar la patata", -"action2": "Cogerla" +"action1": "cocina_patata_action1", +"action2": "cocina_patata_action2" } } animations = null [node name="Sprite2D" type="Sprite2D" parent="cocina_patata"] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 13 ) +position = Vector2(-2, 0) +scale = Vector2(0.5, 0.5) +texture = ExtResource("13") [node name="turno_cocina_patata_collision" type="CollisionPolygon2D" parent="cocina_patata"] -position = Vector2( 9.0867, -13.5233 ) z_index = 1001 -polygon = PackedVector2Array( 1.61475, 3.71887, 8.86548, 12.1157, 5.32715, 19.1171, -2.24731, 23.4026, -16.8235, 24.1499, -29.7551, 18.9672, -29.593, 12.626, -23.5007, 7.92932, -14.0325, 2.57251 ) +position = Vector2(9.0867, -13.5233) +polygon = PackedVector2Array(1.61475, 3.71887, 8.86548, 12.1157, 5.32715, 19.1171, -2.24731, 23.4026, -16.8235, 24.1499, -29.7551, 18.9672, -29.593, 12.626, -23.5007, 7.92932, -14.0325, 2.57251) [node name="turno_cocina_patata_location" type="Marker2D" parent="cocina_patata"] -position = Vector2( 93.1357, 65.3632 ) -script = ExtResource( 5 ) +position = Vector2(93.1357, 65.3632) +script = ExtResource("5") [node name="turno_cocina_economica" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 1299, 506 ) -script = ExtResource( 6 ) +position = Vector2(1299, 506) +script = ExtResource("6") +action3_target_texts = { +"turno_cocina_carton": "cocina_economica_action3_carton", +"turno_cocina_carton_encendido": "cocina_economica_action3_carton_encendido", +"turno_cocina_madera": "cocina_economica_action3_madera", +"turno_cocina_olla_llena": "cocina_economica_action3_olla_llena", +"turno_cocina_olla_vacia": "cocina_economica_action3_olla_vacia" +} +target_when_selected_action_is_in = ["action3"] global_id = "turno_cocina_economica" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/economica.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = PackedStringArray() custom_data = { "tooltips": { -"action1": "Mirar", -"action2": "Usar" +"action1": "cocina_economica_action1", +"action2": "cocina_economica_action2" } } -action3_target_texts = { -"turno_cocina_carton": "Meter cartón en la económica", -"turno_cocina_carton_encendido": "Encender la económica", -"turno_cocina_madera": "Meter leña en la económica", -"turno_cocina_olla_llena": "Poner encima de la económica", -"turno_cocina_olla_vacia": "Poner encima de la económica" -} -target_when_selected_action_is_in = [ "action3" ] animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_economica"] -position = Vector2( -6, -4 ) -polygon = PackedVector2Array( -65, -18, -138, 48, -37, 73, 226, 71, 253, -5 ) +position = Vector2(-6, -4) +polygon = PackedVector2Array(-65, -18, -138, 48, -37, 73, 226, 71, 253, -5) [node name="ESCLocation" type="Marker2D" parent="turno_cocina_economica"] -position = Vector2( -182, 205 ) -script = ExtResource( 5 ) +position = Vector2(-182, 205) +script = ExtResource("5") -[node name="turno_cocina_libro_de_cocina" parent="." instance=ExtResource( 14 )] -position = Vector2( 2547, 244 ) -scale = Vector2( 1.06318, 1.06318 ) +[node name="turno_cocina_libro_de_cocina" parent="." instance=ExtResource("14")] +position = Vector2(2547, 244) +scale = Vector2(1.06318, 1.06318) +combine_when_selected_action_is_in = PackedStringArray() custom_data = { "tooltips": { -"action1": "Mirar", -"action2": "Coger", -"action3": "Leer" +"action1": "cocina_libro_de_cocina_action1", +"action2": "cocina_libro_de_cocina_action2" } } [node name="ESCLocation" type="Marker2D" parent="turno_cocina_libro_de_cocina"] -position = Vector2( -16.9304, 145.789 ) -script = ExtResource( 5 ) +position = Vector2(-16.9304, 145.789) +script = ExtResource("5") [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_libro_de_cocina"] -polygon = PackedVector2Array( -44.207, -15.9898, -44.207, 23.5143, 41.3853, 22.5738, 42.3259, 10.3463, 56.4346, 10.3463, 55.4939, 2.82172, 63.959, 1.88113, 63.0186, -16.9304 ) +polygon = PackedVector2Array(-44.207, -15.9898, -44.207, 23.5143, 41.3853, 22.5738, 42.3259, 10.3463, 56.4346, 10.3463, 55.4939, 2.82172, 63.959, 1.88113, 63.0186, -16.9304) [node name="turno_cocina_cocina_gas" type="Area2D" parent="."] process_mode = 1 -position = Vector2( 2219, 272 ) -script = ExtResource( 6 ) +position = Vector2(2219, 272) +script = ExtResource("6") +action3_target_texts = { +"turno_cocina_carton": "cocina_gas_action3_carton", +"turno_cocina_mechero": "cocina_gas_action3_mechero", +"turno_cocina_olla_llena": "cocina_gas_action3_olla", +"turno_cocina_olla_vacia": "cocina_gas_action3_olla" +} +target_when_selected_action_is_in = ["action3"] global_id = "turno_cocina_cocina_gas" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc" -combine_when_selected_action_is_in = [ ] +combine_when_selected_action_is_in = PackedStringArray() custom_data = { "tooltips": { -"action1": "Mirar", -"action2": "Encender" +"action1": "cocina_gas_action1", +"action2": "cocina_gas_action2" } } -action3_target_texts = { -"turno_cocina_carton": "Prender el cartón", -"turno_cocina_mechero": "Encender el gas", -"turno_cocina_olla_llena": "Cocinar al gas", -"turno_cocina_olla_vacia": "Cocinar al gas" -} -target_when_selected_action_is_in = [ "action3" ] animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"] -position = Vector2( 2, -33 ) z_index = 5 -polygon = PackedVector2Array( -17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5 ) +position = Vector2(2, -33) +polygon = PackedVector2Array(-17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5) [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="turno_cocina_cocina_gas"] -position = Vector2( 7, -8 ) z_as_relative = false -frames = SubResource( 4 ) -animation = "apagada" -playing = true -script = ExtResource( 26 ) +position = Vector2(7, -8) +sprite_frames = SubResource("4") +animation = &"apagada" +script = ExtResource("26") [node name="ESCLocation" type="Marker2D" parent="turno_cocina_cocina_gas"] -position = Vector2( -56, 78 ) -script = ExtResource( 5 ) +position = Vector2(-56, 78) +script = ExtResource("5") -[node name="turno_cocina_olla_llena" parent="." instance=ExtResource( 12 )] +[node name="turno_cocina_olla_llena" parent="." instance=ExtResource("12")] visible = false -position = Vector2( 1281, 491 ) -scale = Vector2( 1.06318, 1.06318 ) +position = Vector2(1281, 491) +scale = Vector2(1.06318, 1.06318) +combine_when_selected_action_is_in = PackedStringArray("action4") [node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_llena"] -position = Vector2( -160.838, 201.283 ) -script = ExtResource( 5 ) +position = Vector2(-160.838, 201.283) +script = ExtResource("5") -[node name="turno_cocina_cuerno" parent="." instance=ExtResource( 20 )] -position = Vector2( 2801, 175 ) +[node name="turno_cocina_cuerno" parent="." instance=ExtResource("20")] +position = Vector2(2801, 175) +combine_when_selected_action_is_in = PackedStringArray() [node name="ESCLocation" type="Marker2D" parent="turno_cocina_cuerno"] -position = Vector2( -81, 334 ) -script = ExtResource( 5 ) +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 ) +[node name="SmokeParticles" parent="." instance=ExtResource("19")] +position = Vector2(1297, 504) +scale = Vector2(1.07999, 1) +script = ExtResource("21") -[node name="turno_cocina_jarra" parent="." instance=ExtResource( 22 )] -position = Vector2( 1974, 236 ) -scale = Vector2( 0.880435, 0.88735 ) -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 23 ) +[node name="turno_cocina_jarra" parent="." instance=ExtResource("22")] +position = Vector2(1974, 236) +scale = Vector2(0.880435, 0.88735) +combine_when_selected_action_is_in = PackedStringArray() +inventory_texture = ExtResource("23") [node name="turno_cocina_jarra_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra"] -position = Vector2( 15.9011, -12.3964 ) -polygon = PackedVector2Array( -4.54248, 1.12698, -11.3574, 24.793, -27.2595, 24.7929, -27.2595, 1.12694 ) +position = Vector2(15.9011, -12.3964) +polygon = PackedVector2Array(-4.54248, 1.12698, -11.3574, 24.793, -27.2595, 24.7929, -27.2595, 1.12694) [node name="turno_cocina_jarra_location" type="Marker2D" parent="turno_cocina_jarra"] -position = Vector2( -55.6546, 169.043 ) -script = ExtResource( 5 ) +position = Vector2(-55.6546, 169.043) +script = ExtResource("5") -[node name="turno_cocina_jarra_volcada" parent="." instance=ExtResource( 25 )] -position = Vector2( 1965, 282 ) -scale = Vector2( 0.880435, 0.88735 ) -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 24 ) +[node name="turno_cocina_jarra_volcada" parent="." instance=ExtResource("25")] +position = Vector2(1965, 282) +scale = Vector2(0.880435, 0.88735) +combine_when_selected_action_is_in = PackedStringArray() +inventory_texture = ExtResource("24") [node name="turno_cocina_jarra_volcada_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra_volcada"] -position = Vector2( 18.1726, -12.3964 ) -polygon = PackedVector2Array( -4.54272, 12.3965, -6.81445, 16.9043, -14.7651, 19.1582, -20.4441, 22.539, -29.5305, 20.2851, -29.5305, 9.01559, -17.0366, 2.25391 ) +position = Vector2(18.1726, -12.3964) +polygon = PackedVector2Array(-4.54272, 12.3965, -6.81445, 16.9043, -14.7651, 19.1582, -20.4441, 22.539, -29.5305, 20.2851, -29.5305, 9.01559, -17.0366, 2.25391) [node name="turno_cocina_jarra_volcada_location" type="Marker2D" parent="turno_cocina_jarra_volcada"] -position = Vector2( 45.4321, 92.4099 ) -script = ExtResource( 5 ) +position = Vector2(45.4321, 92.4099) +script = ExtResource("5") diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc index 1c368946..ee819849 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc @@ -1,63 +1,58 @@ :setup + # Disable cocina_patata if already picked. + # We cannot look in inventory because the countable item is a different item. + if cocina_patata_picked: + set_active(cocina_patata, false) -# Disable cocina_patata if already picked. -# We cannot look in inventory because the countable item is a different item. -> [cocina_patata_picked] - set_active cocina_patata false + # Disable cocina_debajo_sofa if already picked. + # We cannot look in inventory because the countable item is a different item. + if cocina_debajo_sofa_picked: + set_active(cocina_debajo_sofa, false) -# Disable cocina_debajo_sofa if already picked. -# We cannot look in inventory because the countable item is a different item. -> [cocina_debajo_sofa_picked] - set_active cocina_debajo_sofa false + # Enable/disable olla on economica item if olla already put on the economica + set_active(turno_cocina_olla_llena, turno_cocina_economica_con_olla) -> [turno_cocina_economica_con_olla] - set_active turno_cocina_olla_llena true -> [!turno_cocina_economica_con_olla] - set_active turno_cocina_olla_llena false - -# Disable/enable jarra items depending if bread is wet -> [turno_cocina_pan_mojado] - set_active turno_cocina_jarra false - set_active turno_cocina_jarra_volcada true -> [!turno_cocina_pan_mojado] - set_active turno_cocina_jarra true - set_active turno_cocina_jarra_volcada false - -# Position player depending of last scene -> [eq ESC_LAST_SCENE cocina_detras] - teleport player puerta_detras_start - set_angle player 180 - stop - -teleport player puerta_delante_start -set_angle player 270 -set_active turno_cocina_olla_llena true [turno_cocina_economica_con_olla] -set_active turno_cocina_olla_llena false [!turno_cocina_economica_con_olla] + # Enable/disable jarra items depending if bread is wet + if turno_cocina_pan_mojado: + set_active(turno_cocina_jarra, false) + set_active(turno_cocina_jarra_volcada, true) + if !turno_cocina_pan_mojado: + set_active(turno_cocina_jarra, true) + set_active(turno_cocina_jarra_volcada, false) + + # Position player depending of last scene + if ESC_LAST_SCENE == cocina_detras: + teleport($player, puerta_detras_start) + set_angle($player, 180) + else: + teleport($player, puerta_delante_start) + set_angle($player, 270) :ready -> [!cocina_intro_played] - set_active turno_cocina_economica false - set_interactive turno_cocina_peso false - set_active turno_cocina_cocina_gas false - set_active turno_cocina_bol 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 - set_active turno_cocina_jarra false - set_active cocina_pan false - accept_input SKIP - set_angle player 180 - say player "No se me ocurre ningún plato, debería buscar un libro de recetas." - say player "Si mantienes MAYÚSCULAS pulsado los objetos con los que puedes interactuar aparecerán marcados." - accept_input ALL -> [turno_cocina_mikel_playing] - # walk_block player new_game_start_location - # set_angle player 180 - say player "Ya no está, que raro..." - accept_input ALL - set_global turno_cocina_mikel_playing false + if !cocina_intro_played: + set_active(turno_cocina_economica, false) + set_interactive(turno_cocina_peso, false) + set_active(turno_cocina_cocina_gas, false) + set_active(turno_cocina_bol, 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) + set_active(turno_cocina_jarra, false) + set_active(cocina_pan, false) + accept_input(SKIP) + set_angle($player, 180) + say($player, "No se me ocurre ningún plato, debería buscar un libro de recetas.", "cocina_intro_1") + say($player, "Si mantienes MAYÚSCULAS pulsado los objetos con los que puedes interactuar aparecerán marcados.", "cocina_intro_2") + accept_input(ALL) + if turno_cocina_mikel_playing: + # TODO: in 3.6 a bug prevented walk_block working in this situation, test again with 4.3 + # walk_block $player new_game_start_location + # set_angle $player 180 + say($player, "Ya no está, que raro...", "cocina_mikel_playing") + accept_input(ALL) + global turno_cocina_mikel_playing = false diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc index ab8d5f1c..593ffad6 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina_gas.esc @@ -1,27 +1,31 @@ :action1 -say player "Rápido y sencillo. El gas mola." - + say($player, "Rápido y sencillo. El gas mola.", "cocina_gas_action1_say") + :action2 -say player "Necesito usar un mechero para encenderla." [!turno_cocina_cocina_gas_encendida] -say player "Ya está encendida!." [turno_cocina_cocina_gas_encendida] + if turno_cocina_cocina_gas_encendida: + say($player, "Ya está encendida!", "cocina_gas_action2_say_encendida") + else: + say($player, "Necesito usar un mechero para encenderla.", "cocina_gas_action2_say_apagada") :action3 turno_cocina_mechero -set_global turno_cocina_cocina_gas_encendida true [!turno_cocina_cocina_gas_encendida] -say player "Ya tengo fuego, que listo soy!" [!turno_cocina_cocina_gas_encendida] -say player "Ya está encendida." [turno_cocina_cocina_gas_encendida] + if turno_cocina_cocina_gas_encendida: + say($player, "Ya está encendida!", "cocina_gas_action2_say_encendida") + else: + global turno_cocina_cocina_gas_encendida = true + say($player, "Ya tengo fuego, que listo soy!", "cocina_gas_action3_mechero_say") :action3 turno_cocina_carton -> [!turno_cocina_cocina_gas_encendida] - say player "No puedo hacerlo con la cocina apagada." [!turno_cocina_cocina_gas_encendida] -> [turno_cocina_cocina_gas_encendida] - say player "Muy bien, ya tengo una llama portable!" - set_global turno_cocina_cocina_gas_encendida false - inventory_remove turno_cocina_carton - inventory_add turno_cocina_carton_encendido + if turno_cocina_cocina_gas_encendida: + say($player, "Muy bien, ya tengo una llama portable!", "cocina_gas_action3_carton_say_encendida") + global turno_cocina_cocina_gas_encendida = false + inventory_remove($turno_cocina_carton) + inventory_add($turno_cocina_carton_encendido) + else: + say($player, "No puedo hacerlo con la cocina apagada.", "cocina_gas_action3_carton_say_apagada") :action3 turno_cocina_olla_vacia -say player "Mejor uso la económica, sino seguro que Eneko me riñe." + say($player, "Mejor uso la económica, sino seguro que Eneko me riñe.", "cocina_gas_action3_olla_say") :action3 turno_cocina_olla_llena -say player "Mejor uso la económica, sino seguro que Eneko me riñe." + say($player, "Mejor uso la económica, sino seguro que Eneko me riñe.", "cocina_gas_action3_olla_say") diff --git a/gymkhana/translations/turno_cocina.csv b/gymkhana/translations/turno_cocina.csv index 5ff85f75..aa90f72b 100644 --- a/gymkhana/translations/turno_cocina.csv +++ b/gymkhana/translations/turno_cocina.csv @@ -1,22 +1,22 @@ keys,en,fr,es -hello_start_game,Alo Uli!,Alo Uli!,Alo Uli! +action_default_say,I can't use this!,,No puedo usar eso! frontal_action3,Admire,Admire,Admirar frontal_action3_say,,, frontal_action4,Use,Utiliser,Usar cocina_delante_intro_dialog_eneko,,, cocina_delante_intro_dialog_option1,,, cocina_delante_intro_dialog_option1_res,,, -cocina_delante_intro_dialog_option2,,,"En algunas culturas fumar se considera una actividad de provecho." +cocina_delante_intro_dialog_option2,,,En algunas culturas fumar se considera una actividad de provecho. cocina_delante_intro_dialog_option2_res,,, -cocina_delante_intro_dialog_option2_1,,,"Los nativos americanos fumaban la pipa de la paz." +cocina_delante_intro_dialog_option2_1,,,Los nativos americanos fumaban la pipa de la paz. cocina_delante_intro_dialog_option2_1_res,,, cocina_delante_intro_dialog_option2_2,,,"Históricamente, el cannabis se ha utilizado para inducir experiencias espirituales." cocina_delante_intro_dialog_option2_2_res,,, -cocina_delante_intro_dialog_option2_3,,,"Hay estudios que relacionan el consumo de cannabis con la revolución industrial del siglo XVIII." +cocina_delante_intro_dialog_option2_3,,,Hay estudios que relacionan el consumo de cannabis con la revolución industrial del siglo XVIII. cocina_delante_intro_dialog_option2_3_res,,, cocina_delante_intro_dialog_option2_4,,,"Bueno, igual me he pasado con 'actividad de provecho'." cocina_delante_intro_dialog_option2_4_res,,, -cocina_delante_intro_dialog_option3,,,"Me gustaría comtemplar el paisaje y escribir un bonito poema sobre la vida en el campo." +cocina_delante_intro_dialog_option3,,,Me gustaría contemplar el paisaje y escribir un bonito poema sobre la vida en el campo. cocina_delante_intro_dialog_option3_res,,, cocina_delante_intro_dialog_option4,,, cocina_delante_intro_dialog_option4_res,,, @@ -30,22 +30,61 @@ cocina_delante_intro_dialog_option6_res_player,,, cocina_delante_intro_dialog_option6_res3,,, cocina_delante_intro_dialog_option6_res_player2,,, cocina_delante_intro_dialog_option6_res4,,, -cocina_delante_intro_dialog_end,,,"¿Que te parece que haga la comida?" +cocina_delante_intro_dialog_end,,,¿Que te parece que haga la comida? cocina_delante_intro_dialog_end_res,,, cocina_delante_intro_dialog_end_res_player,,, -cocina_delante_pegatinas_action1,,,"Observar pegatinas" -cocina_delante_pegatinas_action2,,,"Coger una pegatina" -pegatinas_action2_eneko_smoking_say,"Eh! las pegatinas no se tocan","Eh! las pegatinas no se tocan","Eh! las pegatinas no se tocan" -cocina_delante_eneko_smoking_action1,,,"Observar sujeto" -cocina_delante_eneko_smoking_action2,,,"Hablar" -cocina_delante_puerta_detras_action1,,,"Ir detrás" -cocina_delante_puerta_despensa_action1,,,"Bajar a la despensa" -cocina_delante_puerta_cocina_action1,,,"Entrar en la cocina" -cocina_delante_madera_action1,,,"Mirar el leñero" +cocina_delante_pegatinas_action1,,,Observar pegatinas +cocina_delante_pegatinas_action2,,,Coger una pegatina +pegatinas_action2_eneko_smoking_say,,,Eh! las pegatinas no se tocan +cocina_delante_eneko_smoking_action1,,,Observar sujeto +cocina_delante_eneko_smoking_action2,,,Hablar +cocina_delante_puerta_detras_action1,,,Ir detrás +cocina_delante_puerta_despensa_action1,,,Bajar a la despensa +cocina_delante_puerta_cocina_action1,,,Entrar en la cocina +cocina_delante_madera_action1,,,Mirar el leñero cocina_delante_madera_action1_say,,, -cocina_delante_madera_action2,,,"Coger leña" +cocina_delante_madera_action2,,,Coger leña cocina_delante_madera_action2_say,,, -cocina_delante_madera_action3,,,"Mirar" +cocina_delante_madera_action3,,,Mirar cocina_delante_madera_action2_say,,, -cocina_delante_madera_action4,,,"Usar" -action_default_say,"I can't use this!",,"No puedo usar eso!" \ No newline at end of file +cocina_delante_madera_action4,,,Usar +cocina_intro_1,,,"No se me ocurre ningún plato, debería buscar un libro de recetas." +cocina_intro_2,,,Si mantienes MAYÚSCULAS pulsado los objetos con los que puedes interactuar aparecerán marcados. +cocina_gas_action1,,,Mirar +cocina_gas_action1_say,,,Rápido y sencillo. El gas mola. +cocina_gas_action2,,,Encender +cocina_gas_action2_say_encendida,,,Ya está encendida! +cocina_gas_action2_say_apagada,,,Necesito usar un mechero para encenderla. +cocina_gas_action3_mechero,,,Encender el gas +cocina_gas_action3_mechero_say,,,"Ya tengo fuego, que listo soy!" +cocina_gas_action3_carton,,,Prender el cartón +cocina_gas_action3_carton_say_encendida,,,"Muy bien, ya tengo una llama portable!" +cocina_gas_action3_carton_say_apagada,,,No puedo hacerlo con la cocina apagada. +cocina_gas_action3_olla,,,Cocinar al gas +cocina_gas_action3_olla_say,,,"Mejor uso la económica, sino seguro que Eneko me riñe." +cocina_mikel_playing,,,"Ya no está, que raro..." +cocina_puerta_delante_action1,,,Salir de la cocina +cocina_puerta_detras_action1,,,Ir detrás +cocina_pan_action1,,,Mirar +cocina_pan_action2,,,Picotear +cocina_fregadero_action1,,,Mirar fregadero +cocina_fregadero_action2,,,Usar +cocina_fregadero_action3_bol,,,Llenar de agua +cocina_fregadero_action3_olla_vacia,,,Llenar la olla de agua +cocina_cuchillos_action1,,,Contar los cuchillos +cocina_cuchillos_action2,,,Coger un buen cuchillo +cocina_cuchillos_action3_cuchillo,,,Dejar en su sitio +cocina_debajo_sofa_action1,,,Mirar debajo del sofa +cocina_debajo_sofa_action2,,,Meter la mano +cocina_debajo_sofa_action3_frontal,,,Alumbrar debajo del sofa +cocina_patata_action1,,,Admirar la patata +cocina_patata_action2,,,Cogerla +cocina_economica_action1,,,Mirar +cocina_economica_action2,,,Usar +cocina_economica_action3_carton,,,Meter cartón en la económica +cocina_economica_action3_carton_encendido,,,Encender la económica +cocina_economica_action3_madera,,,Meter leña en la económica +cocina_economica_action3_olla_llena,,,Poner encima de la económica +cocina_economica_action3_olla_vacia,,,Poner encima de la económica +cocina_libro_de_cocina_action1,,,Mirar +cocina_libro_de_cocina_action2,,,Coger diff --git a/project.godot b/project.godot index e309c602..291905a6 100644 --- a/project.godot +++ b/project.godot @@ -154,5 +154,6 @@ limits/debugger/max_chars_per_second=99999999 [rendering] textures/canvas_textures/default_texture_filter=0 +renderer/rendering_method="gl_compatibility" textures/vram_compression/import_etc2_astc=true environment/defaults/default_environment="res://default_env.tres"