feat: mechero en silla

This commit is contained in:
2024-01-26 22:40:42 +01:00
parent 09269a28d6
commit c62f42f4f6
11 changed files with 35 additions and 56 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 B

View File

@@ -1,6 +1,20 @@
:action1
say player "Que cosa tan curiosa"
set_angle player 270
say player "Mi mechero, que bien!!"
set_angle player 270
say player "Ayer lo dejé un segundo encima de la mesa y desapareció."
:action2
say player "No lo quiero coger"
set_angle player 270
say current_player "A la saca!"
set_active turno_cocina_mechero false
inventory_add turno_cocina_mechero
:action3
say player "Parece que no tiene gas."
say player "Eso explica que lo hayan abandonado."
set_angle player 180
say player "Si vienes a Uli vigila tu mechero."
:action4 turno_cocina_carton
say player "Fuego!"

View File

@@ -15,11 +15,12 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc"
inventory_texture = ExtResource( 2 )
dialog_color = Color( 1, 1, 1, 1 )
tooltips = {
"action1": "¿Que es esto?",
"action2": "Coger",
"action3": "Mirar",
"action4": "Usar"
"action1": "Mirar",
"action2": "Coger",
"action3": "Mirar",
"action4": "Usar"
}
combine_when_selected_action_is_in = [ "action4" ]
animations = null
[node name="Sprite" type="Sprite" parent="."]
@@ -33,4 +34,4 @@ shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."]
position = Vector2( -51, 69 )
script = ExtResource( 3 )
script = ExtResource( 3 )

View File

@@ -1,10 +0,0 @@
:action1
say player "That's a wrench on the floor."
stop
:action2
set_active wrench false
inventory_add wrench
:action3
say player "It seems even more useful now that I picked it up."

View File

@@ -1,36 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://gymkhana/items/inventory/assets/wrench.png" type="Texture" id=1]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=2]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 37, 33.5 )
[node name="wrench" type="Area2D"]
pause_mode = 1
script = ExtResource( 3 )
global_id = "wrench"
esc_script = "res://gymkhana/items/inventory/wrench.esc"
tooltips = {
"action1": "¿Que es esto?",
"action2": "Coger",
"action3": "¿Que es esto?",
"action4": "Usar"
}
combine_when_selected_action_is_in = [ "action4" ]
inventory_texture = ExtResource( 1 )
dialog_color = Color( 1, 1, 1, 1 )
animations = null
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0, 0 )
texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 0 )
shape = SubResource( 2 )
[node name="ESCLocation" type="Position2D" parent="."]
position = Vector2( 0, 0 )
script = ExtResource( 2 )

View File

@@ -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]
@@ -9,7 +9,8 @@
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture" id=7]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" type="Texture" id=8]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" type="PackedScene" id=9]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=10]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_mechero.tscn" type="PackedScene" id=10]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=11]
[sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 )
@@ -109,7 +110,16 @@ scale = Vector2( 0.5, 0.5 )
position = Vector2( 1, 96 )
script = ExtResource( 5 )
[node name="turno_cocina_romero" parent="." instance=ExtResource( 10 )]
[node name="turno_cocina_mechero" parent="." instance=ExtResource( 10 )]
position = Vector2( 108, 438 )
rotation = 1.44513
scale = Vector2( 0.4, 0.4 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_mechero"]
position = Vector2( 296.645, -154.035 )
script = ExtResource( 5 )
[node name="turno_cocina_romero" parent="." instance=ExtResource( 11 )]
position = Vector2( 61, 341 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_romero"]