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_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/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 8f512c5f..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=22 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,7 +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/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 ) @@ -371,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 ) @@ -385,3 +388,8 @@ position = Vector2( 2801, 175 ) [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 65d4b8bb..a97cd153 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] 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_delante/esc/cocina_delante.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc index 599befb6..eedcebe1 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -1,7 +1,7 @@ :setup # Uncomment to disable intro scene -#set_global cocina_delante_intro_played true -#set_global cocina_intro_played true +set_global cocina_delante_intro_played true +set_global cocina_intro_played true > [!cocina_delante_intro_played] accept_input SKIP stop_snd