From b30dcbc29d27864fa0582303baefe30036bfbe0c Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sun, 27 Aug 2023 00:47:13 +0200 Subject: [PATCH] cocina_peso --- gymkhana/items/inventory/turno_cocina_peso.esc | 9 +++++++-- gymkhana/items/inventory/turno_cocina_peso.tscn | 14 +++----------- .../inventory/turno_cocina_peso_inventario.esc | 9 +++++++-- gymkhana/items/inventory/turno_cocina_salero.esc | 1 - gymkhana/rooms/turno_cocina/cocina/cocina.tscn | 16 ++++++++++++++-- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/gymkhana/items/inventory/turno_cocina_peso.esc b/gymkhana/items/inventory/turno_cocina_peso.esc index db47f32c..889390e5 100644 --- a/gymkhana/items/inventory/turno_cocina_peso.esc +++ b/gymkhana/items/inventory/turno_cocina_peso.esc @@ -1,6 +1,11 @@ :action1 -say player "Que cosa tan curiosa" +say player "Es un peso, con esto podría coger la cantidad exacta de algún ingrediente" :action2 -say player "No lo quiero coger" +say player "NOT IMPLEMENTED" +:action3 +say player "Es un peso, con esto podría coger la cantidad exacta de algún ingrediente" + +:action4 +say player "NOT IMPLEMENTED" diff --git a/gymkhana/items/inventory/turno_cocina_peso.tscn b/gymkhana/items/inventory/turno_cocina_peso.tscn index 677c4f03..71afaee8 100644 --- a/gymkhana/items/inventory/turno_cocina_peso.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 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.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture" id=3] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=4] [node name="turno_cocina_peso" type="Area2D"] pause_mode = 1 @@ -20,13 +19,6 @@ action4_text = "Usar" animations = null [node name="Sprite" type="Sprite" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) +rotation = -0.0698132 +scale = Vector2( 0.18, 0.18 ) texture = ExtResource( 2 ) - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PoolVector2Array( -21, -20, -19, -20, -19, -23, -17, -24, 19, -22, 20, -18, 22, -18, 23, -16, 23, -10, 22, 23, 19, 25, -25, 22, -23, -18 ) - -[node name="ESCLocation" type="Position2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 4 ) diff --git a/gymkhana/items/inventory/turno_cocina_peso_inventario.esc b/gymkhana/items/inventory/turno_cocina_peso_inventario.esc index db47f32c..889390e5 100644 --- a/gymkhana/items/inventory/turno_cocina_peso_inventario.esc +++ b/gymkhana/items/inventory/turno_cocina_peso_inventario.esc @@ -1,6 +1,11 @@ :action1 -say player "Que cosa tan curiosa" +say player "Es un peso, con esto podría coger la cantidad exacta de algún ingrediente" :action2 -say player "No lo quiero coger" +say player "NOT IMPLEMENTED" +:action3 +say player "Es un peso, con esto podría coger la cantidad exacta de algún ingrediente" + +:action4 +say player "NOT IMPLEMENTED" diff --git a/gymkhana/items/inventory/turno_cocina_salero.esc b/gymkhana/items/inventory/turno_cocina_salero.esc index db47f32c..2872b1f4 100644 --- a/gymkhana/items/inventory/turno_cocina_salero.esc +++ b/gymkhana/items/inventory/turno_cocina_salero.esc @@ -3,4 +3,3 @@ say player "Que cosa tan curiosa" :action2 say player "No lo quiero coger" - diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index ea1ba079..476738f1 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=11 format=2] +[gd_scene load_steps=12 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] @@ -9,6 +9,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/depth.png" type="Texture" id=7] [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] [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 ) @@ -31,7 +32,6 @@ texture = ExtResource( 3 ) position = Vector2( 302.5, 0 ) script = ExtResource( 4 ) scales = ExtResource( 7 ) -scale_min = 0.3 scale_max = 1.4 player_speed_multiplier = 1.2 player_doubleclick_speed_multiplier = 2.0 @@ -92,3 +92,15 @@ polygon = PoolVector2Array( 9.34229, 531.646, 10.3804, 161.013, 124.564, 97.2152 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="CollisionPolygon2D" 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 )