From 646c35385ec43ea82223ebc509a98203b1220110 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Tue, 14 Feb 2023 00:51:17 +0100 Subject: [PATCH] Room selector --- gymkhana/addons/escoria-ui-return-monkey-island/game.tscn | 3 --- gymkhana/rooms/home/{room01.tscn => home.tscn} | 2 +- gymkhana/start_game.esc | 2 +- project.godot | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) rename gymkhana/rooms/home/{room01.tscn => home.tscn} (99%) diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn index 82943f16..b17a023f 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.tscn @@ -91,7 +91,4 @@ theme = ExtResource( 9 ) bbcode_text = "[center][color=#000000][/color][/center]" fit_content_height = true -[node name="mouse_layer" type="CanvasLayer" parent="."] -layer = 2 - [connection signal="pressed" from="CanvasLayer/ui/HBoxContainer/VBoxContainer/MenuButton" to="." method="_on_MenuButton_pressed"] diff --git a/gymkhana/rooms/home/room01.tscn b/gymkhana/rooms/home/home.tscn similarity index 99% rename from gymkhana/rooms/home/room01.tscn rename to gymkhana/rooms/home/home.tscn index 92274bef..00d1ab06 100644 --- a/gymkhana/rooms/home/room01.tscn +++ b/gymkhana/rooms/home/home.tscn @@ -21,7 +21,7 @@ script = ExtResource( 6 ) __meta__ = { "_edit_vertical_guides_": [ ] } -global_id = "room1" +global_id = "home" esc_script = "res://gymkhana/rooms/home/esc/room01.esc" player_scene = ExtResource( 4 ) camera_limits = [ Rect2( 0, 0, 1280, 550 ) ] diff --git a/gymkhana/start_game.esc b/gymkhana/start_game.esc index 076d31a3..50b623f0 100644 --- a/gymkhana/start_game.esc +++ b/gymkhana/start_game.esc @@ -8,4 +8,4 @@ play_snd res://game/sfx/Game-Menu_Looping.mp3 _music :newgame # 1/ Simple scene -change_scene res://gymkhana/rooms/home/room01.tscn +change_scene res://gymkhana/rooms/home/home.tscn diff --git a/project.godot b/project.godot index c76f65e5..4fb4cd49 100644 --- a/project.godot +++ b/project.godot @@ -876,7 +876,7 @@ debug/crash_message="We're sorry, but the game crashed. Please send us the follo %s" debug/enable_room_selector=true -debug/room_selector_room_dir="res://game/rooms" +debug/room_selector_room_dir="res://gymkhana/rooms" ui/game_scene="res://gymkhana/addons/escoria-ui-return-monkey-island/game.tscn" ui/inventory_items_path="res://game/items/inventory" ui/default_transition="instant"