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

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

Browse Source
This commit is contained in:
Oier Bravo
2023-02-24 18:20:42 +01:00
parent 8cc48d620d e75c41ff9b
commit b4c2806cce
29 changed files with 136 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc
View File

@@ -1,7 +1,4 @@
:action1
say player "Parece que veo a Mikel"
:action1 i_bombona2
:action3 i_bombona2
say player "He usado la 'bombona' con la puerta"
# > [eq r5_dialog_advance 2]
# say player "I already fixed the water leak."
@@ -13,6 +10,9 @@ say player "He usado la 'bombona' con la puerta"
# set_global r5_dialog_advance 2
# accept_input ALL
:action1
say player "Parece que veo a Mikel"
:action2
#say player "Esta cerrada por dentro."
play_snd res://game/sfx/sounds/doorOpen_2.ogg

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

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

22
gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc
View File

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
[gd_scene load_steps=32 format=2]
[gd_scene load_steps=34 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_background.gd" type="Script" id=2]
@@ -29,6 +29,8 @@
[ext_resource path="res://gymkhana/items/inventory/I_Bombona.tscn" type="PackedScene" id=27]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=28]
[ext_resource path="res://gymkhana/items/inventory/assets/bombona-inv.png" type="Texture" id=29]
[ext_resource path="res://gymkhana/characters/eneko/eneko-smoking.tscn" type="PackedScene" id=30]
[ext_resource path="res://gymkhana/items/inventory/I_caja_herramientas.tscn" type="PackedScene" id=31]
[sub_resource type="SpriteFrames" id=2]
animations = [ {
@@ -39,9 +41,9 @@ animations = [ {
} ]
[sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( 155, 425, 129, 383, 242, 376, 1511, 445, 1512, 574, 193, 574, 1133, 474, 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 1318, 435, 1367, 411, 1420, 441, 725, 472, 794, 462, 846, 467, 864, 482, 749, 460, 584, 468, 1249, 454, 981, 480 )
polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 5, 6 ), PoolIntArray( 5, 0, 2, 7, 8, 9 ), PoolIntArray( 9, 10, 11, 5 ), PoolIntArray( 5, 11, 12 ), PoolIntArray( 13, 14, 15 ), PoolIntArray( 16, 17, 18, 19, 5 ), PoolIntArray( 16, 20, 17 ), PoolIntArray( 5, 12, 21 ), PoolIntArray( 22, 13, 15 ), PoolIntArray( 5, 21, 16 ), PoolIntArray( 22, 15, 3, 6 ), PoolIntArray( 23, 6, 5 ), PoolIntArray( 5, 19, 23 ) ]
outlines = [ PoolVector2Array( 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 584, 468, 725, 472, 749, 460, 794, 462, 846, 467, 864, 482, 981, 480, 1133, 474, 1249, 454, 1318, 435, 1367, 411, 1420, 441, 1511, 445, 1512, 574, 193, 574, 155, 425, 129, 383, 242, 376 ) ]
vertices = PoolVector2Array( 155, 425, 129, 383, 242, 376, 1511, 445, 1512, 574, 193, 574, 1133, 474, 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 725, 472, 794, 462, 846, 467, 864, 482, 1318, 435, 1367, 411, 1425, 417, 749, 460, 584, 468, 1249, 454, 981, 480 )
polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 5, 6 ), PoolIntArray( 5, 0, 2, 7, 8, 9 ), PoolIntArray( 9, 10, 11, 5 ), PoolIntArray( 5, 11, 12 ), PoolIntArray( 13, 14, 15, 16, 5 ), PoolIntArray( 17, 18, 19, 3 ), PoolIntArray( 13, 20, 14 ), PoolIntArray( 5, 12, 21 ), PoolIntArray( 22, 17, 3 ), PoolIntArray( 5, 21, 13 ), PoolIntArray( 6, 22, 3 ), PoolIntArray( 23, 6, 5 ), PoolIntArray( 5, 16, 23 ) ]
outlines = [ PoolVector2Array( 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 584, 468, 725, 472, 749, 460, 794, 462, 846, 467, 864, 482, 981, 480, 1133, 474, 1249, 454, 1318, 435, 1367, 411, 1425, 417, 1511, 445, 1512, 574, 193, 574, 155, 425, 129, 383, 242, 376 ) ]
[node name="ESCRoom" type="Node2D"]
script = ExtResource( 1 )
@@ -60,19 +62,10 @@ mouse_filter = 2
texture = ExtResource( 6 )
script = ExtResource( 2 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
position = Vector2( 1476, 363 )
scale = Vector2( 0.634168, 0.634168 )
frames = SubResource( 2 )
frame = 3
playing = true
flip_h = true
[node name="AnimatedSprite2" type="AnimatedSprite" parent="."]
position = Vector2( 953, 329 )
position = Vector2( 1154, 358 )
scale = Vector2( 0.867751, 0.867751 )
frames = SubResource( 2 )
frame = 2
playing = true
offset = Vector2( -0.09375, 20.0582 )
@@ -85,7 +78,7 @@ scale_min = 0.5
navpoly = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."]
position = Vector2( 786, 501 )
position = Vector2( 796, 480 )
script = ExtResource( 3 )
global_id = "trasera_cocina_start"
is_start_location = true
@@ -123,8 +116,8 @@ combine_when_selected_action_is_in = [ ]
inventory_texture = ExtResource( 29 )
dialog_color = Color( 1, 1, 1, 1 )
tooltip2_name = "TT2 Coger bombona"
inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
inventory_action2_text = "¿Por qué es una llave inglesa?"
action3_text = "¿Cómo ha entrado en mi bolsillo?"
action4_text = "¿Por qué es una llave inglesa?"
animations = null
[node name="bombona2" parent="Hotspots" instance=ExtResource( 27 )]
@@ -133,72 +126,12 @@ script = ExtResource( 28 )
global_id = "i_bombona2"
esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc"
tooltip_name = "TT Mirar bombona"
combine_when_selected_action_is_in = [ "action1" ]
combine_when_selected_action_is_in = [ "action3" ]
inventory_texture = ExtResource( 29 )
dialog_color = Color( 1, 1, 1, 1 )
tooltip2_name = "TT2 Coger bombona"
inventory_action1_text = "Usar"
inventory_action2_text = "¿Por qué es una llave inglesa?"
animations = null
[node name="bombona3" parent="Hotspots" instance=ExtResource( 27 )]
visible = false
position = Vector2( 857, 508 )
script = ExtResource( 28 )
global_id = "i_bombona3"
esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona3.esc"
tooltip_name = "TT Mirar bombona"
combine_when_selected_action_is_in = [ ]
inventory_texture = ExtResource( 8 )
dialog_color = Color( 1, 1, 1, 1 )
tooltip2_name = "TT2 Coger bombona"
inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
inventory_action2_text = "¿Por qué es una llave inglesa?"
animations = null
[node name="bombona4" parent="Hotspots" instance=ExtResource( 27 )]
visible = false
position = Vector2( 757, 508 )
script = ExtResource( 28 )
global_id = "i_bombona4"
esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona4.esc"
tooltip_name = "TT Mirar bombona"
combine_when_selected_action_is_in = [ ]
inventory_texture = ExtResource( 8 )
dialog_color = Color( 1, 1, 1, 1 )
tooltip2_name = "TT2 Coger bombona"
inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
inventory_action2_text = "¿Por qué es una llave inglesa?"
animations = null
[node name="bombona5" parent="Hotspots" instance=ExtResource( 27 )]
visible = false
position = Vector2( 557, 508 )
script = ExtResource( 28 )
global_id = "i_bombona5"
esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona5.esc"
tooltip_name = "TT Mirar bombona"
combine_when_selected_action_is_in = [ ]
inventory_texture = ExtResource( 8 )
dialog_color = Color( 1, 1, 1, 1 )
tooltip2_name = "TT2 Coger bombona"
inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
inventory_action2_text = "¿Por qué es una llave inglesa?"
animations = null
[node name="bombona6" parent="Hotspots" instance=ExtResource( 27 )]
visible = false
position = Vector2( 1057, 508 )
script = ExtResource( 28 )
global_id = "i_bombona6"
esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona6.esc"
tooltip_name = "TT Mirar bombona"
combine_when_selected_action_is_in = [ ]
inventory_texture = ExtResource( 8 )
dialog_color = Color( 1, 1, 1, 1 )
tooltip2_name = "TT2 Coger bombona"
inventory_action1_text = "¿Cómo ha entrado en mi bolsillo?"
inventory_action2_text = "¿Por qué es una llave inglesa?"
action3_text = "Usar"
action4_text = "¿Por qué es una llave inglesa?"
animations = null
[node name="Columna" type="Sprite" parent="."]
@@ -230,6 +163,19 @@ offset = Vector2( -0.09375, 20.0582 )
margin_right = 40.0
margin_bottom = 40.0
[node name="EnekoSmoking" parent="." instance=ExtResource( 30 )]
position = Vector2( 961, 382 )
is_movable = true
dialog_color = Color( 0, 1, 0.462745, 1 )
selectable = true
[node name="ESCLocation" type="Position2D" parent="EnekoSmoking"]
position = Vector2( -111, 102 )
script = ExtResource( 3 )
[node name="ESCItemWithTooltip" parent="." instance=ExtResource( 31 )]
position = Vector2( 728, 424 )
[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_exited" from="Area2D" to="Area2D/CollisionPolygon2D" method="_on_Area2D_mouse_exited"]