diff --git a/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn b/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn index c626dd1..03c17e8 100644 --- a/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn +++ b/gmtk_2024/levels/Level_3_Rooms/level_3_room_2.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=6 format=4 uid="uid://bafs3yuts8e3v"] +[gd_scene load_steps=5 format=4 uid="uid://bafs3yuts8e3v"] [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_t601r"] [ext_resource type="PackedScene" uid="uid://biaxahxft1xo0" path="res://objects/box_pushable_2.tscn" id="2_12bbn"] [ext_resource type="PackedScene" uid="uid://cys3y6mvx2r51" path="res://objects/OneTimeBlock.tscn" id="3_rf2v0"] [ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="4_3ywhr"] -[ext_resource type="PackedScene" uid="uid://n2culjgg5aji" path="res://objects/LevelComplete.tscn" id="5_112df"] [node name="LevelBase" instance=ExtResource("1_t601r")] @@ -23,4 +22,3 @@ position = Vector2(-255, -31) [node name="Goal" parent="." index="9" instance=ExtResource("4_3ywhr")] position = Vector2(-160, 95) -next = ExtResource("5_112df") diff --git a/gmtk_2024/levels/level_3.tscn b/gmtk_2024/levels/level_3.tscn index 43664b0..f139cf3 100644 --- a/gmtk_2024/levels/level_3.tscn +++ b/gmtk_2024/levels/level_3.tscn @@ -2,10 +2,10 @@ [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_eq270"] [ext_resource type="PackedScene" uid="uid://d0q0sfati8wk0" path="res://objects/ResizableBlock.tscn" id="2_fn1kh"] -[ext_resource type="PackedScene" uid="uid://bafs3yuts8e3v" path="res://levels/Level_3_Rooms/level_3_room_2.tscn" id="3_xtvsr"] [ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="4_c4pjs"] [ext_resource type="PackedScene" uid="uid://d17jpcgayfg6i" path="res://objects/BoxPushable_1.tscn" id="4_jr6tv"] [ext_resource type="PackedScene" uid="uid://cys3y6mvx2r51" path="res://objects/OneTimeBlock.tscn" id="5_1h3gw"] +[ext_resource type="PackedScene" uid="uid://dg4x0lmww373x" path="res://levels/Level_2_Rooms/level_2_room_3.tscn" id="5_6b3nj"] [node name="LevelBase" instance=ExtResource("1_eq270")] @@ -17,7 +17,7 @@ tile_map_data = PackedByteArray("AAD2//v/AAADAAAAAAD2//z/AAACAAEAAAD2//3/AAACAAE [node name="Goal" parent="." index="7" instance=ExtResource("4_c4pjs")] position = Vector2(-257, -95) -next = ExtResource("3_xtvsr") +next = ExtResource("5_6b3nj") [node name="BoxPushable1" parent="." index="8" instance=ExtResource("4_jr6tv")] position = Vector2(-75, 112) diff --git a/gmtk_2024/project.godot b/gmtk_2024/project.godot index 7a8c4e3..21ab848 100644 --- a/gmtk_2024/project.godot +++ b/gmtk_2024/project.godot @@ -17,10 +17,11 @@ config/icon="res://temp_assets/icon.svg" [display] -window/size/viewport_width=640 -window/size/viewport_height=320 +window/size/viewport_width=1280 +window/size/viewport_height=720 window/size/mode=2 window/stretch/mode="viewport" +window/stretch/scale=2.0 mouse_cursor/custom_image="res://textures/cursor_normal.png" [input] @@ -37,7 +38,8 @@ player_left={ } player_jump={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) ] } click={ diff --git a/gmtk_2024/scripts/level_menu_level_button.gd b/gmtk_2024/scripts/level_menu_level_button.gd index 45a99e6..3e6f1b9 100644 --- a/gmtk_2024/scripts/level_menu_level_button.gd +++ b/gmtk_2024/scripts/level_menu_level_button.gd @@ -22,5 +22,4 @@ func level_state(value: bool) -> void: func _on_pressed(): - level_selected.emit(level_num) diff --git a/gmtk_2024/scripts/level_select.gd b/gmtk_2024/scripts/level_select.gd index 9ff2c85..69248b8 100644 --- a/gmtk_2024/scripts/level_select.gd +++ b/gmtk_2024/scripts/level_select.gd @@ -17,7 +17,7 @@ func connect_level_selected_to_level_box(): func change_to_scene(level_num: int): var next_level: String = "res://levels/level_" + str(level_num) + ".tscn" - get_tree().change_scene_to_file(next_level) + if FileAccess.file_exists(next_level): get_tree().change_scene_to_file(next_level) func _on_quit_button_pressed():