oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

cleanup

Browse Source
This commit is contained in:
Eneko Nieto
2023-02-16 18:06:53 +01:00
parent 551aa1fd05
commit 8ad4d1ff4f
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gymkhana/rooms/trasera_cocina/esc/i_bombona.esc
View File

@@ -3,10 +3,13 @@ say player "Es naranja" [!i/i_bombona]
say player "Es el segundo bolsillo más grande que he visto" [i/i_bombona] say player "Es el segundo bolsillo más grande que he visto" [i/i_bombona]
:action2 :action2
say player "Antes era una bombona pero ahora es una llave inglesa." [i/i_bombona] > [!i/i_bombona]
say player "¿Esto es real?" [i/i_bombona] say player "Voy a cogerla"
say player "¿Vivo en Matrix?" [i/i_bombona] set_active i_bombona false
inventory_add i_bombona
stop
say player "Voy a cogerla" [!i/i_bombona] > [i/i_bombona]
set_active i_bombona false [!i/i_bombona] say player "Antes era una bombona pero ahora es una llave inglesa."
inventory_add i_bombona [!i/i_bombona] say player "¿Esto es real?"
say player "¿Vivo en Matrix?"

15
gymkhana/rooms/trasera_cocina/trasera_cocina.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=32 format=2] [gd_scene load_steps=30 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2]
@@ -7,7 +7,7 @@
[ext_resource path="res://gymkhana/rooms/trasera_cocina/HoverStartAnimation.gd" type="Script" id=5] [ext_resource path="res://gymkhana/rooms/trasera_cocina/HoverStartAnimation.gd" type="Script" id=5]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png" type="Texture" id=6] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png" type="Texture" id=6]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=7] [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=7]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=8] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=8]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=9] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=9]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png" type="Texture" id=10] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png" type="Texture" id=10]
[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png" type="Texture" id=11] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png" type="Texture" id=11]
@@ -62,7 +62,7 @@ script = ExtResource( 2 )
position = Vector2( 1476, 363 ) position = Vector2( 1476, 363 )
scale = Vector2( 0.634168, 0.634168 ) scale = Vector2( 0.634168, 0.634168 )
frames = SubResource( 2 ) frames = SubResource( 2 )
frame = 11 frame = 3
playing = true playing = true
flip_h = true flip_h = true
@@ -70,7 +70,7 @@ flip_h = true
position = Vector2( 1018, 333 ) position = Vector2( 1018, 333 )
scale = Vector2( 0.867751, 0.867751 ) scale = Vector2( 0.867751, 0.867751 )
frames = SubResource( 2 ) frames = SubResource( 2 )
frame = 10 frame = 2
playing = true playing = true
offset = Vector2( -0.09375, 20.0582 ) offset = Vector2( -0.09375, 20.0582 )
@@ -97,10 +97,9 @@ global_id = "l_exit"
esc_script = "res://gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc" esc_script = "res://gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc"
is_exit = true is_exit = true
tooltip_name = "Esto es una puerta" tooltip_name = "Esto es una puerta"
tooltip2_name = "Entrar!"
default_action = "action2"
combine_when_selected_action_is_in = [ ] combine_when_selected_action_is_in = [ ]
dialog_color = Color( 1, 1, 1, 1 ) dialog_color = Color( 1, 1, 1, 1 )
tooltip2_name = "Entrar!"
animations = null animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/entrada_cocina"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/entrada_cocina"]
@@ -112,6 +111,8 @@ polygon = PoolVector2Array( 21, 575, 22, 331, 135, 339, 137, 581 )
position = Vector2( 748, 465 ) position = Vector2( 748, 465 )
script = ExtResource( 3 ) script = ExtResource( 3 )
[node name="bombona" parent="Hotspots" instance=ExtResource( 27 )]
[node name="Columna" type="Sprite" parent="."] [node name="Columna" type="Sprite" parent="."]
position = Vector2( 253.25, 294.5 ) position = Vector2( 253.25, 294.5 )
scale = Vector2( 0.973684, 1.02358 ) scale = Vector2( 0.973684, 1.02358 )
@@ -141,8 +142,6 @@ offset = Vector2( -0.09375, 20.0582 )
margin_right = 40.0 margin_right = 40.0
margin_bottom = 40.0 margin_bottom = 40.0
[node name="bombona" parent="Hotspots" instance=ExtResource( 27 )]
[connection signal="mouse_entered" from="TextureRect" to="Area2D/CollisionPolygon2D" method="_on_TextureRect_mouse_entered"] [connection signal="mouse_entered" from="TextureRect" to="Area2D/CollisionPolygon2D" method="_on_TextureRect_mouse_entered"]
[connection signal="mouse_entered" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_entered"] [connection signal="mouse_entered" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_entered"]
[connection signal="mouse_exited" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_exited"] [connection signal="mouse_exited" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_exited"]