gymkhana/item_count (#16)

Item can now be countable objects, like money, bullets or even potatoes!

Reviewed-on: gymkhana/gymkhana#16

gymkhana/rooms/turno_cocina/cocina/cocina.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=14 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]
@@ -11,6 +11,7 @@
 [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]
+[ext_resource path="res://gymkhana/items/inventory/turno_cocina_patata.tscn" type="PackedScene" id=12]
 
 [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 )
@@ -39,7 +40,7 @@ player_doubleclick_speed_multiplier = 2.0
 
 [node name="Foreground-mesa" type="Sprite" parent="ESCTerrain"]
 position = Vector2( 1786, 424 )
-z_index = 4096
+z_index = 1000
 texture = ExtResource( 8 )
 
 [node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"]
@@ -60,7 +61,7 @@ is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "Ir detrás"
+"action1": "Ir detrás"
 }
 animations = null
 
@@ -84,7 +85,7 @@ is_exit = true
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "Salir de la cocina"
+"action1": "Salir de la cocina"
 }
 animations = null
 
@@ -130,8 +131,8 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "Mirar fregadero",
-    "action2": "Usar"
+"action1": "Mirar fregadero",
+"action2": "Usar"
 }
 action3_target_texts = {
 "turno_cocina_bol": "Llenar el bol de agua",
@@ -155,8 +156,8 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "Mirar fregadero",
-    "action2": "Usar"
+"action1": "Mirar el fregadero",
+"action2": "Usar"
 }
 action3_target_texts = {
 "turno_cocina_bol": "Llenar el bol de agua",
@@ -180,11 +181,11 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc"
 combine_when_selected_action_is_in = [ "action4" ]
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
-    "action1": "Mirar debajo del sofa",
-    "action2": "Meter la mano"
+"action1": "Mirar debajo del sofa",
+"action2": "Meter la mano"
 }
 action3_target_texts = {
-"turno_cocina_frontal": "Mirar denajo del sofa"
+"turno_cocina_frontal": "Alumbrar debajo del sofa"
 }
 target_when_selected_action_is_in = [ "action3" ]
 animations = null
@@ -195,3 +196,19 @@ polygon = PoolVector2Array( 484, 406, 485, 421, 556, 423, 551, 415, 550, 409, 55
 [node name="ESCLocation" type="Position2D" parent="debajo_sofa"]
 position = Vector2( 420, 494 )
 script = ExtResource( 5 )
+
+[node name="turno_cocina_patata" parent="." instance=ExtResource( 12 )]
+position = Vector2( 2202, 343 )
+rotation = -0.270526
+scale = Vector2( 0.35, 0.35 )
+z_index = 1001
+combine_when_selected_action_is_in = [  ]
+
+[node name="turno_cocina_patata_collision" type="CollisionPolygon2D" parent="turno_cocina_patata"]
+position = Vector2( 9.0867, -13.5233 )
+z_index = 1001
+polygon = PoolVector2Array( 6.50781, 0.0583801, 20.7368, 12.8992, 7.896, 27.1279, -19.937, 31.269, -42.4258, 16.1375, -26.0684, -0.0810547 )
+
+[node name="turno_cocina_patata_location" type="Position2D" parent="turno_cocina_patata"]
+position = Vector2( 93.1357, 65.3632 )
+script = ExtResource( 5 )

gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc

@@ -8,15 +8,10 @@
         stop
 
     say player "Bieen! una patata!"
+    item_count_add turno_cocina_patata
     inventory_add turno_cocina_patata
     set_active cocina_debajo_sofa false
 
-:action3 turno_cocina_bol_lentejas
-    say player "Agua a ojo... en su justa medida."
-    inventory_remove turno_cocina_peso_bol
-    inventory_add turno_cocina_bol_lentejas
-    inventory_add turno_cocina_peso
-
 :action3 turno_cocina_frontal
     say player "Veo una patata!!"
     set_global turno_cocina_frontal_debajo_sofa true

gymkhana/rooms/turno_cocina/despensa/despensa.tscn

@@ -141,7 +141,7 @@ pause_mode = 1
 position = Vector2( 941, 385 )
 script = ExtResource( 6 )
 global_id = "turno_cocina_despensa_bidon_izq"
-esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_der.esc"
+esc_script = "res://gymkhana/rooms/turno_cocina/despensa/esc/bidon_izq.esc"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
 tooltips = {
@@ -163,7 +163,10 @@ script = ExtResource( 5 )
 position = Vector2( 440, 161 )
 scale = Vector2( 0.880435, 0.88735 )
 tooltips = {
-    "action1": "Mirar"
+    "action1": "Mirar",
+    "action2": "Rascar por el fondo",
+    "action3": "Mirar",
+    "action4": "Usar"
 }
 
 [node name="ESCLocation2" type="Position2D" parent="turno_cocina_patata_grande"]

gymkhana/rooms/turno_cocina/despensa/esc/bidon_izq.esc

@@ -1,5 +1,5 @@
 :action1
-say player "Está lleno de algo que no se que es."
+say player "Está lleno de algo que no sé que es."
 
 :action2
-say player "Lo que hay dentro no lo necesito para nada."
+say player "Lo que hay dentro no lo necesito para nada."