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

bol+lentejas

Browse Source
This commit is contained in:
Eneko Nieto
2023-08-27 02:19:04 +02:00
parent 1ee9c339db
commit 73b2a8be5d
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd
View File

@@ -75,6 +75,11 @@ var action_state = ACTION_INPUT_STATE.AWAITING_VERB_OR_ITEM \
# #
# - action: type of the action to run # - action: type of the action to run
# - params: Parameters for the action # - params: Parameters for the action
# - BACKGROUND_CLICK: [moving_obj, target, walk_fast]
# - ITEM_LEFT_CLICK: [item, input_event]
# - ITEM_RIGHT_CLICK: [item, input_event]
# - TRIGGER_IN: [trigger_id, object_id, trigger_in_verb]
# - TRIGGER_OUT: [trigger_id, object_id, trigger_out_verb]
# - can_interrupt: if true, this command will interrupt any ongoing event # - can_interrupt: if true, this command will interrupt any ongoing event
# before it is finished # before it is finished
func do(action: int, params: Array = [], can_interrupt: bool = false) -> void: func do(action: int, params: Array = [], can_interrupt: bool = false) -> void:

2
gymkhana/rooms/turno_cocina/despensa/despensa.tscn
View File

@@ -178,7 +178,7 @@ dialog_color = Color( 1, 1, 1, 1 )
action1_text = "Mirar dentro" action1_text = "Mirar dentro"
action2_text = "Coger" action2_text = "Coger"
action3_target_texts = { action3_target_texts = {
"turno_cocina_peso_bol_inventario": "Coger las lentejas exactas" "turno_cocina_peso_bol": "Coger las lentejas exactas"
} }
target_when_selected_action_is_in = [ "action3" ] target_when_selected_action_is_in = [ "action3" ]
animations = null animations = null

5
gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc
View File

@@ -4,9 +4,8 @@
:action2 :action2
say player "Necesito cogerlas con algo." say player "Necesito cogerlas con algo."
:action3 turno_cocina_peso_bol_inventario :action3 turno_cocina_peso_bol
say player "Con esto suficiente" say player "Con esto suficiente"
inventory_remove turno_cocina_peso_bol_inventario inventory_remove turno_cocina_peso_bol
inventory_add turno_cocina_bol_lentejas inventory_add turno_cocina_bol_lentejas
inventory_add turno_cocina_peso inventory_add turno_cocina_peso

1
gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc
View File

@@ -3,4 +3,3 @@ say player "Cebollas!"
:action2 :action2
say player "mmm, quizas... no!" say player "mmm, quizas... no!"
inventory_add turno_cocina_peso_bol_inventario

4
project.godot
View File

@@ -204,7 +204,7 @@ _global_script_classes=[ {
"language": "GDScript", "language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd" "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd"
}, { }, {
"base": "Node", "base": "StateMachine",
"class": "ESCDialogPlayer", "class": "ESCDialogPlayer",
"language": "GDScript", "language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd"
@@ -344,7 +344,7 @@ _global_script_classes=[ {
"language": "GDScript", "language": "GDScript",
"path": "res://addons/escoria-core/game/esc_project_settings_manager.gd" "path": "res://addons/escoria-core/game/esc_project_settings_manager.gd"
}, { }, {
"base": "Node", "base": "Reference",
"class": "ESCResourceCache", "class": "ESCResourceCache",
"language": "GDScript", "language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_resource_cache.gd" "path": "res://addons/escoria-core/game/core-scripts/esc_resource_cache.gd"