diff --git a/gymkhana/items/inventory/turno_cocina_bol.esc b/gymkhana/items/inventory/turno_cocina_bol.esc index 52f619c7..c98d5f04 100644 --- a/gymkhana/items/inventory/turno_cocina_bol.esc +++ b/gymkhana/items/inventory/turno_cocina_bol.esc @@ -1,5 +1,6 @@ :action1 inventory_add turno_cocina_bol +set_active turno_cocina_bol false :action3 say player "Un bol donde poner ingredientes" diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 2d840007..750cba66 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -137,6 +137,10 @@ animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der"] polygon = PoolVector2Array( 2327, 294, 2395, 296, 2401, 290, 2367, 286, 2365, 260, 2362, 259, 2362, 278, 2356, 286, 2334, 286 ) +[node name="ESCLocation" type="Position2D" parent="fregadero_der"] +position = Vector2( 2322, 300 ) +script = ExtResource( 5 ) + [node name="fregadero_izq" type="Area2D" parent="."] pause_mode = 1 script = ExtResource( 6 ) @@ -156,6 +160,10 @@ animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq"] polygon = PoolVector2Array( 1800, 276, 1804, 280, 1895, 273, 1883, 266, 1863, 267, 1839, 268, 1835, 264, 1835, 259, 1838, 254, 1848, 248, 1854, 252, 1858, 252, 1856, 246, 1851, 244, 1843, 247, 1836, 251, 1831, 258, 1830, 263, 1828, 265, 1826, 264, 1823, 265, 1822, 269, 1824, 270, 1822, 272, 1809, 272, 1798, 273 ) +[node name="ESCLocation" type="Position2D" parent="fregadero_izq"] +position = Vector2( 1800, 300 ) +script = ExtResource( 5 ) + [node name="debajo_sofa" type="Area2D" parent="."] pause_mode = 1 script = ExtResource( 6 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc b/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc index 0671dcac..364e2ccb 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc @@ -1,9 +1,14 @@ :action1 - say player "No se ve nada." + say player "No se ve nada." [!turno_cocina_frontal_debajo_sofa] + say player "No la veo pero se que hay una patata." [turno_cocina_frontal_debajo_sofa] + :action2 - say player "No pienso meter la mano está muy oscuro." [!turno_cocina_frontal_debajo_sofa] - say player "Bieen! una patata!" [turno_cocina_frontal_debajo_sofa] - inventory_add turno_cocina_patata [turno_cocina_frontal_debajo_sofa] + > [!turno_cocina_frontal_debajo_sofa] + say player "No pienso meter la mano está muy oscuro." + stop + + say player "Bieen! una patata!" + inventory_add turno_cocina_patata set_active cocina_debajo_sofa false :action3 turno_cocina_bol_lentejas diff --git a/project.godot b/project.godot index f2d3ab69..33e4665e 100644 --- a/project.godot +++ b/project.godot @@ -204,7 +204,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd" }, { -"base": "Node", +"base": "StateMachine", "class": "ESCDialogPlayer", "language": "GDScript", "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" @@ -344,7 +344,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/esc_project_settings_manager.gd" }, { -"base": "Node", +"base": "Reference", "class": "ESCResourceCache", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc_resource_cache.gd"