From d80e3d4b36fc6b1f7741c7a578e4d134f2abb475 Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Wed, 13 Nov 2024 01:28:04 +0100 Subject: [PATCH] Debug shortcuts: loadgame, new game without intro --- .../menus/main_menu/main_menu.gd | 10 +++++++++- .../menus/pause_menu/pause_menu.gd | 12 ++++++++++++ .../cocina_delante/esc/cocina_delante.esc | 1 + project.godot | 12 +++++++++++- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd index e9f2f37a..496d58cc 100644 --- a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd +++ b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd @@ -1,6 +1,12 @@ # A simple main menu extends Control +func _input(event: InputEvent) -> void: + if event.is_action_pressed("debug_loadgame"): + _on_load_game_pressed() + if event.is_action_pressed("debug_no_intro"): + _on_new_without_intro_pressed() + # Start the game func _on_new_game_pressed(): escoria.new_game() @@ -41,6 +47,8 @@ func reset(): $main.show() func _on_new_without_intro_pressed(): + escoria.new_game() + escoria.globals_manager.set_global("skip_intro",true) escoria.globals_manager.set_global("cocina_delante_intro_played",true) escoria.globals_manager.set_global("cocina_intro_played",true) - escoria.new_game() + diff --git a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd index 6bf0769a..4b543a6d 100644 --- a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd +++ b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd @@ -1,6 +1,11 @@ # A menu shown in game extends Control +func _input(event: InputEvent) -> void: + if event.is_action_pressed("debug_loadgame"): + _on_load_game_pressed() + if event.is_action_pressed("debug_no_intro"): + _on_new_without_intro_pressed() # Make the pause menu process in pause mode and hide it just to be sure func _ready(): @@ -74,3 +79,10 @@ func _on_new_game_pressed(): #yield(escoria.new_game(), "completed") escoria.new_game() escoria.main.current_scene.game.unpause_game() + +func _on_new_without_intro_pressed(): + escoria.new_game() + escoria.globals_manager.set_global("skip_intro",true) + escoria.globals_manager.set_global("cocina_delante_intro_played",true) + escoria.globals_manager.set_global("cocina_intro_played",true) + diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc index 757d238c..f478886d 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -6,6 +6,7 @@ play_video res://gymkhana/videos/turno_cocina/intro.ogv inventory_add turno_cocina_frontal [!turno_cocina_frontal_entregado] +inventory_add turno_cocina_libro_de_cocina [skip_intro] set_active turno_cocina_ajo false [!turno_cocina_eneko_catando] diff --git a/project.godot b/project.godot index 6d5c97f0..ee5ad626 100644 --- a/project.godot +++ b/project.godot @@ -897,7 +897,7 @@ _global_script_class_icons={ "InventoryAddCommand": "", "InventoryRemoveCommand": "", "ItemCountAddCommand": "", -"ItemOutline": "", +"ItemOutline": "res://addons/escoria-core/design/esc_item.svg", "MusicEnableCommand": "", "PlayLibSound": "", "PlaySndCommand": "", @@ -1061,6 +1061,16 @@ ui_show_room_selector={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":16777246,"unicode":0,"echo":false,"script":null) ] } +debug_loadgame={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":true,"meta":false,"command":true,"pressed":false,"scancode":76,"physical_scancode":0,"unicode":0,"echo":false,"script":null) + ] +} +debug_no_intro={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":true,"meta":false,"command":true,"pressed":false,"scancode":0,"physical_scancode":78,"unicode":0,"echo":false,"script":null) + ] +} [locale]