Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

This commit is contained in:
2023-08-27 01:34:56 +02:00
5 changed files with 31 additions and 18 deletions

View File

@@ -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"

View File

@@ -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 )

View File

@@ -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"

View File

@@ -3,4 +3,3 @@ say player "Que cosa tan curiosa"
:action2
say player "No lo quiero coger"