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 20:38:47 +01:00
parent 1d483479e5 c633e4bd23
commit 04474d5012
4 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
:action3 i_bombona2
:action1 i_bombona2
say player "He usado la 'bombona' con la puerta"
# > [eq r5_dialog_advance 2]
# say player "I already fixed the water leak."

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

@@ -6,8 +6,8 @@ say player "Voy a cogerla"
set_active i_bombona false
inventory_add i_bombona
:action3
say player "Es el segundo bolsillo más grande que he visto nunca"
# :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."

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

@@ -93,7 +93,8 @@ 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 = [ "action3" ]
combine_when_selected_action_is_in = [ "action1", "action3" ]
use_from_inventory_only = true
inventory_texture = ExtResource( 29 )
dialog_color = Color( 1, 1, 1, 1 )
tooltip2_name = "TT2 Coger bombona"