diff --git a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd index 5b5218a6..877f341c 100644 --- a/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd +++ b/addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd @@ -75,6 +75,11 @@ var action_state = ACTION_INPUT_STATE.AWAITING_VERB_OR_ITEM \ # # - action: type of the action to run # - 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 # before it is finished func do(action: int, params: Array = [], can_interrupt: bool = false) -> void: diff --git a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn index 39bb170b..6b0bcedc 100644 --- a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn +++ b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn @@ -178,7 +178,7 @@ dialog_color = Color( 1, 1, 1, 1 ) action1_text = "Mirar dentro" action2_text = "Coger" 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" ] animations = null diff --git a/gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc b/gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc index b0ef0ad0..28fbc076 100644 --- a/gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc +++ b/gymkhana/rooms/turno_cocina/despensa/esc/bidon_cntr.esc @@ -4,9 +4,8 @@ :action2 say player "Necesito cogerlas con algo." -:action3 turno_cocina_peso_bol_inventario +:action3 turno_cocina_peso_bol 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_peso - diff --git a/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc b/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc index 6393c687..47595a83 100644 --- a/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc +++ b/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc @@ -3,4 +3,3 @@ say player "Cebollas!" :action2 say player "mmm, quizas... no!" -inventory_add turno_cocina_peso_bol_inventario \ No newline at end of file diff --git a/project.godot b/project.godot index f2d3ab69..33e4665e 100644 --- a/project.godot +++ b/project.godot @@ -204,7 +204,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd" }, { -"base": "Node", +"base": "StateMachine", "class": "ESCDialogPlayer", "language": "GDScript", "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" @@ -344,7 +344,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/esc_project_settings_manager.gd" }, { -"base": "Node", +"base": "Reference", "class": "ESCResourceCache", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc_resource_cache.gd"