peso+bol

gymkhana/items/inventory/turno_cocina_bol.esc

@@ -1,6 +1,12 @@
 :action1
-say player "Que cosa tan curiosa"
+inventory_add turno_cocina_bol
 
-:action2
+:action3
-say player "No lo quiero coger"
+say player "Un bol donde poner ingredientes"
 
+:action3 turno_cocina_peso
+inventory_remove turno_cocina_peso
+inventory_remove turno_cocina_bol
+inventory_add turno_cocina_peso_bol
+say current_player "Ya puedo pesar ingredientes!"
+# set_global caja_herramientas_with_wrench true

gymkhana/items/inventory/turno_cocina_bol.tscn

@@ -12,23 +12,14 @@ pause_mode = 1
 script = ExtResource( 1 )
 global_id = "turno_cocina_bol"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_bol.esc"
+combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
-action1_text = "¿Que es esto?"
+action1_text = "Coger un bol"
-action2_text = "Coger"
 action3_text = "Mirar"
 action4_text = "Usar"
+action3_target_texts = {
+"turno_cocina_peso": "Poner el bol sobre el peso"
+}
+target_when_selected_action_is_in = [ "action3" ]
 animations = null
-
-[node name="Sprite" type="Sprite" parent="."]
-position = Vector2( -2, 0 )
-scale = Vector2( 0.5, 0.5 )
-texture = ExtResource( 2 )
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( -1.5, -0.5 )
-shape = SubResource( 1 )
-
-[node name="ESCLocation" type="Position2D" parent="."]
-position = Vector2( -51, 69 )
-script = ExtResource( 3 )

gymkhana/items/inventory/turno_cocina_peso.esc

@@ -2,10 +2,15 @@
 say player "Es un peso, con esto podría coger la cantidad exacta de algún ingrediente"
 
 :action2
-say player "NOT IMPLEMENTED"
+say current_player "Podria ser útil!!"
+set_active turno_cocina_peso false
+inventory_add turno_cocina_peso
 
 :action3
 say player "Es un peso, con esto podría coger la cantidad exacta de algún ingrediente"
 
-:action4
+:action3 turno_cocina_bol
-say player "NOT IMPLEMENTED"
+inventory_remove turno_cocina_peso
+inventory_remove turno_cocina_bol
+inventory_add turno_cocina_peso_bol
+say current_player "Ya puedo pesar ingredientes!"

gymkhana/items/inventory/turno_cocina_peso.tscn

@@ -9,13 +9,17 @@ pause_mode = 1
 script = ExtResource( 1 )
 global_id = "turno_cocina_peso"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc"
-combine_when_selected_action_is_in = [  ]
+combine_when_selected_action_is_in = [ "action4" ]
 inventory_texture = ExtResource( 3 )
 dialog_color = Color( 1, 1, 1, 1 )
 action1_text = "¿Que es esto?"
 action2_text = "Coger"
-action3_text = "Mirar"
+action3_text = "¿Que es esto?"
 action4_text = "Usar"
+action3_target_texts = {
+"turno_cocina_bol": "Poner el bol sobre el peso"
+}
+target_when_selected_action_is_in = [ "action3" ]
 animations = null
 
 [node name="Sprite" type="Sprite" parent="."]

gymkhana/items/inventory/turno_cocina_peso_bol.tscn

@@ -1,17 +1,17 @@
 [gd_scene load_steps=5 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_peso_bol_inventario.png" type="Texture" id=2]
+[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_bol.png" type="Texture" id=2]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 22.5, 12.5 )
 
-[node name="turno_cocina_peso_bol_inventario" type="Area2D"]
+[node name="turno_cocina_peso_bol" type="Area2D"]
 pause_mode = 1
 script = ExtResource( 1 )
-global_id = "turno_cocina_peso_bol_inventario"
+global_id = "turno_cocina_peso_bol"
-esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_bol_inventario.esc"
+esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_bol.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 target_when_selected_action_is_in = [ "action3" ]
 inventory_texture = ExtResource( 2 )

gymkhana/rooms/turno_cocina/cocina/cocina.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=2]
+[gd_scene load_steps=13 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]
@@ -10,11 +10,12 @@
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png" type="Texture" id=8]
 [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" type="Texture" 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]
 
 [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, 1466, 514, 1345, 505, 1320, 485, 1382, 439, 1466, 412, 1493, 479, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1788, 325, 1787, 383, 2018, 419, 2238, 386, 2109, 424 )
+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 )
-polygons = [ PoolIntArray( 0, 1, 2, 3, 4 ), PoolIntArray( 5, 6, 7, 8, 9 ), PoolIntArray( 9, 8, 10, 11 ), PoolIntArray( 12, 11, 10 ), PoolIntArray( 12, 10, 13 ), PoolIntArray( 14, 12, 13 ), PoolIntArray( 15, 16, 17, 4, 3 ), PoolIntArray( 18, 19, 20, 21, 22, 23 ), PoolIntArray( 24, 14, 13, 25, 26 ), PoolIntArray( 27, 24, 26, 28 ), PoolIntArray( 29, 30, 27, 28, 31, 32 ), PoolIntArray( 32, 31, 33, 34 ), PoolIntArray( 18, 34, 33, 19 ), PoolIntArray( 23, 22, 35, 36 ), PoolIntArray( 37, 36, 35, 38, 39 ), PoolIntArray( 4, 17, 39, 38 ) ]
+polygons = [ PoolIntArray( 0, 1, 2, 3, 4 ), PoolIntArray( 5, 6, 7, 8, 9 ), PoolIntArray( 9, 8, 10, 11 ), PoolIntArray( 12, 11, 10 ), PoolIntArray( 12, 10, 13 ), PoolIntArray( 14, 12, 13 ), PoolIntArray( 15, 16, 17, 4, 3 ), PoolIntArray( 18, 14, 13, 19, 20 ), PoolIntArray( 21, 18, 20, 22 ), PoolIntArray( 23, 24, 21, 22, 25, 26 ), PoolIntArray( 26, 25, 27, 28 ), PoolIntArray( 29, 28, 27, 30, 31 ), PoolIntArray( 4, 17, 32, 33 ), PoolIntArray( 34, 33, 32, 35, 36 ), PoolIntArray( 37, 34, 36, 38, 31 ), PoolIntArray( 31, 38, 29 ), PoolIntArray( 39, 40, 31, 30, 41 ) ]
-outlines = [ PoolVector2Array( 1347, 563, 1345, 505, 1320, 485, 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 ) ]
+outlines = [ PoolVector2Array( 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 ) ]
 
 [node name="ESCRoom" type="Node2D"]
 script = ExtResource( 1 )
@@ -97,10 +98,22 @@ global_id = "puerta_delante_start"
 position = Vector2( 2505, 160 )
 scale = Vector2( 0.880435, 0.88735 )
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_peso"]
+[node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"]
 position = Vector2( 15.9014, -11.2695 )
 polygon = PoolVector2Array( -5.6792, 1.12694, -4.54321, 21.412, -25, 22, -24.9878, 1.12694 )
 
 [node name="turno_cocina_peso_location" type="Position2D" parent="turno_cocina_peso"]
 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_collision" type="CollisionPolygon2D" parent="turno_cocina_bol"]
+position = Vector2( 169.235, 210.74 )
+polygon = PoolVector2Array( -7.95056, -30.4277, -4.54321, 21.412, -56.79, 37.1894, -73.827, -13.5234 )
+
+[node name="turno_cocina_bol_location" type="Position2D" parent="turno_cocina_bol"]
+position = Vector2( 198.765, 339.212 )
+script = ExtResource( 5 )