From 9f9b8516ec3f410245c123f9f5c90217a31dca41 Mon Sep 17 00:00:00 2001 From: TVanteeffelen Date: Mon, 4 May 2026 00:27:27 -0400 Subject: [PATCH] Added in debug menu, level 5, removed test levels. --- Scenes/Levels/level_1.tscn | 2 +- Scenes/Levels/level_2.tscn | 2 +- Scenes/Levels/level_3.tscn | 2 +- Scenes/Levels/level_4.tscn | 4 ++-- Scenes/Levels/level_5.tscn | 15 ++++++++++++ Scenes/Levels/test.tscn | 16 ------------- Scenes/main.tscn | 15 ------------ Scenes/player.tscn | 44 +++++++++++++++++++++++++++++++++++ Scripts/Levels/level_4.gd | 2 +- Scripts/Levels/level_5.gd | 6 +++++ Scripts/Levels/level_5.gd.uid | 1 + Scripts/Levels/main.gd | 6 ----- Scripts/Levels/main.gd.uid | 1 - Scripts/Levels/test.gd | 14 ----------- Scripts/Levels/test.gd.uid | 1 - Scripts/debug_info.gd | 38 ++++++++++++++++++++++++++++++ Scripts/debug_info.gd.uid | 1 + project.godot | 6 +++++ 18 files changed, 117 insertions(+), 59 deletions(-) create mode 100644 Scenes/Levels/level_5.tscn delete mode 100644 Scenes/Levels/test.tscn delete mode 100644 Scenes/main.tscn create mode 100644 Scripts/Levels/level_5.gd create mode 100644 Scripts/Levels/level_5.gd.uid delete mode 100644 Scripts/Levels/main.gd delete mode 100644 Scripts/Levels/main.gd.uid delete mode 100644 Scripts/Levels/test.gd delete mode 100644 Scripts/Levels/test.gd.uid create mode 100644 Scripts/debug_info.gd create mode 100644 Scripts/debug_info.gd.uid diff --git a/Scenes/Levels/level_1.tscn b/Scenes/Levels/level_1.tscn index c4bac18..fd41ccc 100644 --- a/Scenes/Levels/level_1.tscn +++ b/Scenes/Levels/level_1.tscn @@ -4,7 +4,7 @@ [ext_resource type="TileSet" uid="uid://bxbrytgrtnaie" path="res://Sprites/Tile Sets/main.tres" id="2_iixi8"] [ext_resource type="PackedScene" uid="uid://syx6ov00a585" path="res://Scenes/player.tscn" id="3_cyadu"] -[node name="Main" type="Node2D" unique_id=1790453106] +[node name="Level1" type="Node2D" unique_id=1790453106] script = ExtResource("1_3mqfk") [node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=1662317524] diff --git a/Scenes/Levels/level_2.tscn b/Scenes/Levels/level_2.tscn index 1086bbf..7d5c756 100644 --- a/Scenes/Levels/level_2.tscn +++ b/Scenes/Levels/level_2.tscn @@ -4,7 +4,7 @@ [ext_resource type="TileSet" uid="uid://bxbrytgrtnaie" path="res://Sprites/Tile Sets/main.tres" id="2_w2ac1"] [ext_resource type="PackedScene" uid="uid://syx6ov00a585" path="res://Scenes/player.tscn" id="3_ovj6s"] -[node name="Main" type="Node2D" unique_id=1790453106] +[node name="Level2" type="Node2D" unique_id=1790453106] script = ExtResource("1_oylv5") [node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=1662317524] diff --git a/Scenes/Levels/level_3.tscn b/Scenes/Levels/level_3.tscn index 019bbe4..268b468 100644 --- a/Scenes/Levels/level_3.tscn +++ b/Scenes/Levels/level_3.tscn @@ -4,7 +4,7 @@ [ext_resource type="TileSet" uid="uid://bxbrytgrtnaie" path="res://Sprites/Tile Sets/main.tres" id="2_t8c31"] [ext_resource type="PackedScene" uid="uid://syx6ov00a585" path="res://Scenes/player.tscn" id="3_rc141"] -[node name="Main" type="Node2D" unique_id=1790453106] +[node name="Level3" type="Node2D" unique_id=1790453106] script = ExtResource("1_nfly3") [node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=1662317524] diff --git a/Scenes/Levels/level_4.tscn b/Scenes/Levels/level_4.tscn index cfca87f..f89855b 100644 --- a/Scenes/Levels/level_4.tscn +++ b/Scenes/Levels/level_4.tscn @@ -1,10 +1,10 @@ [gd_scene format=4 uid="uid://cf2eony45smar"] -[ext_resource type="Script" uid="uid://cwhqka60plgqp" path="res://Scripts/Levels/level_3.gd" id="1_6grq2"] +[ext_resource type="Script" uid="uid://dvxyil8cxwkqi" path="res://Scripts/Levels/level_4.gd" id="1_6grq2"] [ext_resource type="TileSet" uid="uid://bxbrytgrtnaie" path="res://Sprites/Tile Sets/main.tres" id="2_vwhew"] [ext_resource type="PackedScene" uid="uid://syx6ov00a585" path="res://Scenes/player.tscn" id="3_jqrsn"] -[node name="Main" type="Node2D" unique_id=1790453106] +[node name="Level4" type="Node2D" unique_id=1790453106] script = ExtResource("1_6grq2") [node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=1662317524] diff --git a/Scenes/Levels/level_5.tscn b/Scenes/Levels/level_5.tscn new file mode 100644 index 0000000..cb2de8f --- /dev/null +++ b/Scenes/Levels/level_5.tscn @@ -0,0 +1,15 @@ +[gd_scene format=4 uid="uid://cn2w8mxwyrk5l"] + +[ext_resource type="Script" uid="uid://7cfw0jmh6nh5" path="res://Scripts/Levels/level_5.gd" id="1_arbu7"] +[ext_resource type="TileSet" uid="uid://bxbrytgrtnaie" path="res://Sprites/Tile Sets/main.tres" id="2_25y23"] +[ext_resource type="PackedScene" uid="uid://syx6ov00a585" path="res://Scenes/player.tscn" id="3_sanrf"] + +[node name="Level5" type="Node2D" unique_id=1790453106] +script = ExtResource("1_arbu7") + +[node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=1662317524] +tile_map_data = PackedByteArray("AAABAAwAAAAAAAEAAAACAAwAAAAAAAEAAAADAAwAAAAAAAEAAAAEAAwAAAAAAAEAAAAIABMAAAAAAAEAAAAIABQAAAAAAAEAAAAIABUAAAAAAAEAAAAIABYAAAAAAAEAAAAIABcAAAAAAAEAAAAMAAUAAAAAAAEAAAAMAAQAAAAAAAEAAAAMAAMAAAAAAAEAAAAMAAIAAAAAAAEAAAAMAAEAAAAAAAEAAAAQABAAAAAAAAEAAAAQABEAAAAAAAEAAAAQABIAAAAAAAEAAAAQABMAAAAAAAEAAAAQABQAAAAAAAEAAAAUAAgAAAAAAAEAAAAUAAcAAAAAAAEAAAAUAAUAAAAAAAEAAAAUAAYAAAAAAAEAAAAUAAQAAAAAAAEAAAAYAA0AAAAAAAEAAAAYAA4AAAAAAAEAAAAYAA8AAAAAAAEAAAAZAA0AAAAAAAEAAAAaAA0AAAAAAAEAAAAbAA0AAAAAAAEAAAAbAAwAAAACAAAAAAA=") +tile_set = ExtResource("2_25y23") + +[node name="Player" parent="." unique_id=748235082 instance=ExtResource("3_sanrf")] +position = Vector2(24, 184) diff --git a/Scenes/Levels/test.tscn b/Scenes/Levels/test.tscn deleted file mode 100644 index 829edae..0000000 --- a/Scenes/Levels/test.tscn +++ /dev/null @@ -1,16 +0,0 @@ -[gd_scene format=4 uid="uid://croa7q6fdkfup"] - -[ext_resource type="TileSet" uid="uid://bxbrytgrtnaie" path="res://Sprites/Tile Sets/main.tres" id="1_4te2q"] -[ext_resource type="Script" uid="uid://c1x6111kr1dqa" path="res://Scripts/Levels/test.gd" id="1_q1p36"] -[ext_resource type="PackedScene" uid="uid://syx6ov00a585" path="res://Scenes/player.tscn" id="2_q1p36"] - -[node name="Main" type="Node2D" unique_id=441925255] -script = ExtResource("1_q1p36") - -[node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=1288252359] -position = Vector2(3, 0) -tile_map_data = PackedByteArray("AAADAAgAAAAAAAEAAAAEAAgAAAAAAAEAAAAFAAgAAAAAAAEAAAAGAAgAAAAAAAEAAAAHAAgAAAAAAAEAAAALAAgAAAAAAAEAAAALAAUAAAAAAAEAAAALAAYAAAAAAAEAAAALAAcAAAAAAAEAAAALAAQAAAAAAAEAAAACAAQAAAAAAAEAAAACAAUAAAAAAAEAAAACAAYAAAAAAAEAAAACAAcAAAAAAAEAAAACAAgAAAAAAAEAAAAHAAkAAAAAAAEAAAAHAAoAAAAAAAEAAAAHAAsAAAAAAAEAAAAHAAwAAAAAAAEAAAAIAAwAAAAAAAEAAAAJAAwAAAAAAAEAAAAKAAwAAAAAAAEAAAALAAwAAAAAAAEAAAAMAAwAAAAAAAEAAAANAAwAAAAAAAEAAAAOAAwAAAAAAAEAAAAMAAgAAAAAAAEAAAANAAgAAAAAAAEAAAAOAAgAAAAAAAEAAAAPAAwAAAAAAAEAAAAQAAwAAAAAAAEAAAAQAAsAAAAAAAEAAAAQAAoAAAAAAAEAAAAQAAkAAAAAAAEAAAAQAAgAAAAAAAEAAAAPAAgAAAAAAAEAAAAIAAgAAAACAAEAAAAJAAgAAAACAAEAAAAKAAgAAAACAAEAAAAJAAEAAAABAAIAAAAPAAsAAAABAAAAAAA=") -tile_set = ExtResource("1_4te2q") - -[node name="Player" parent="." unique_id=791571 instance=ExtResource("2_q1p36")] -position = Vector2(56, 119) diff --git a/Scenes/main.tscn b/Scenes/main.tscn deleted file mode 100644 index f02c043..0000000 --- a/Scenes/main.tscn +++ /dev/null @@ -1,15 +0,0 @@ -[gd_scene format=4 uid="uid://c741imf2la5yt"] - -[ext_resource type="Script" uid="uid://b228yv3gle864" path="res://Scripts/Levels/main.gd" id="1_8gbba"] -[ext_resource type="TileSet" uid="uid://bxbrytgrtnaie" path="res://Sprites/Tile Sets/main.tres" id="2_8gbba"] -[ext_resource type="PackedScene" uid="uid://syx6ov00a585" path="res://Scenes/player.tscn" id="2_bo1nx"] - -[node name="Main" type="Node2D" unique_id=1938519826] -script = ExtResource("1_8gbba") - -[node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=1914263914] -tile_map_data = PackedByteArray("AAACABUAAAAAAAEAAAADABUAAAAAAAEAAAAEABUAAAAAAAEAAAAFABUAAAAAAAEAAAAGABUAAAAAAAEAAAAHAA8AAAAAAAEAAAAHABAAAAABAAEAADAHABUAAAAAAAEAAAAIAA8AAAAAAAEAAAAIABQAAAABAAEAAAAIABUAAAAAAAEAAAAJAA8AAAAAAAEAAAAKAA8AAAAAAAEAAAALAA8AAAAAAAEAAAAMAA8AAAAAAAEAAAANAA8AAAAAAAEAAAAOAA8AAAAAAAEAAAAOABQAAAABAAEAAAAOABUAAAAAAAEAAAAPAA8AAAAAAAEAAAAPABAAAAABAAEAADAPABUAAAAAAAEAAAAQABUAAAAAAAEAAAARABUAAAAAAAEAAAASABUAAAAAAAEAAAATABUAAAAAAAEAAAAUABUAAAAAAAEAAAAVAA8AAAAAAAEAAAAVABAAAAABAAEAADAVABUAAAAAAAEAAAAWAA8AAAAAAAEAAAAWABQAAAABAAEAAAAWABUAAAAAAAEAAAAXAA8AAAAAAAEAAAAYAA8AAAAAAAEAAAAZAA8AAAAAAAEAAAAaAA8AAAAAAAEAAAAbAA8AAAAAAAEAAAAcAA8AAAAAAAEAAAAcABQAAAABAAEAAAAcABUAAAAAAAEAAAAdAA8AAAAAAAEAAAAdABAAAAABAAEAADAdABUAAAAAAAEAAAAeABUAAAAAAAEAAAAfABUAAAAAAAEAAAAgABUAAAAAAAEAAAAhABQAAAACAAAAAAAhABUAAAAAAAEAAAA=") -tile_set = ExtResource("2_8gbba") - -[node name="Player" parent="." unique_id=1895836457 instance=ExtResource("2_bo1nx")] -position = Vector2(40, 276) diff --git a/Scenes/player.tscn b/Scenes/player.tscn index 72dd7c1..d22c4dc 100644 --- a/Scenes/player.tscn +++ b/Scenes/player.tscn @@ -6,10 +6,20 @@ [ext_resource type="Script" uid="uid://de1fdvk35epdt" path="res://Scripts/player_camera.gd" id="4_vgqql"] [ext_resource type="PackedScene" uid="uid://botdddpmgoc8o" path="res://Scenes/scene_transition_rect.tscn" id="5_fkybt"] [ext_resource type="Script" uid="uid://cbj4o4syiqn74" path="res://Scripts/background_particles.gd" id="6_x3wgy"] +[ext_resource type="Script" uid="uid://wxkd002cqmui" path="res://Scripts/debug_info.gd" id="7_3smsa"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_jjgbg"] size = Vector2(16, 16) +[sub_resource type="LabelSettings" id="LabelSettings_3smsa"] +font_color = Color(0, 0, 0, 1) + +[sub_resource type="LabelSettings" id="LabelSettings_8erm5"] +font_color = Color(0, 0, 0, 1) + +[sub_resource type="LabelSettings" id="LabelSettings_f1ek2"] +font_color = Color(0, 0, 0, 1) + [node name="Player" type="CharacterBody2D" unique_id=178862163] script = ExtResource("1_cvnsp") @@ -44,6 +54,40 @@ offset_top = -5000.0 offset_right = 5000.0 offset_bottom = 5000.0 +[node name="DebugInfo" type="Control" parent="." unique_id=571159506] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +script = ExtResource("7_3smsa") + +[node name="txt_gravity" type="Label" parent="DebugInfo" unique_id=1223052517] +visible = false +layout_mode = 0 +offset_left = -570.0 +offset_top = -320.0 +offset_right = -530.0 +offset_bottom = -297.0 +label_settings = SubResource("LabelSettings_3smsa") + +[node name="txt_pos" type="Label" parent="DebugInfo" unique_id=392465904] +visible = false +layout_mode = 0 +offset_left = -570.0 +offset_top = -300.0 +offset_right = -530.0 +offset_bottom = -277.0 +label_settings = SubResource("LabelSettings_8erm5") + +[node name="txt_level" type="Label" parent="DebugInfo" unique_id=1638261896] +visible = false +layout_mode = 0 +offset_left = -570.0 +offset_top = -280.0 +offset_right = -530.0 +offset_bottom = -257.0 +label_settings = SubResource("LabelSettings_f1ek2") + [connection signal="input_event" from="." to="BackgroundParticles" method="_on_player_input_event"] [connection signal="player_respawned" from="." to="BackgroundParticles" method="_on_player_player_respawned"] [connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"] diff --git a/Scripts/Levels/level_4.gd b/Scripts/Levels/level_4.gd index b0462da..bf8c609 100644 --- a/Scripts/Levels/level_4.gd +++ b/Scripts/Levels/level_4.gd @@ -3,4 +3,4 @@ extends Node2D var startPosX : int = 24 var startPosY : int = 184 -var next_level : String = "res://Scenes/main.tscn" +var next_level : String = "res://Scenes/Levels/level_5.tscn" diff --git a/Scripts/Levels/level_5.gd b/Scripts/Levels/level_5.gd new file mode 100644 index 0000000..b0462da --- /dev/null +++ b/Scripts/Levels/level_5.gd @@ -0,0 +1,6 @@ +extends Node2D + +var startPosX : int = 24 +var startPosY : int = 184 + +var next_level : String = "res://Scenes/main.tscn" diff --git a/Scripts/Levels/level_5.gd.uid b/Scripts/Levels/level_5.gd.uid new file mode 100644 index 0000000..58e48ed --- /dev/null +++ b/Scripts/Levels/level_5.gd.uid @@ -0,0 +1 @@ +uid://7cfw0jmh6nh5 diff --git a/Scripts/Levels/main.gd b/Scripts/Levels/main.gd deleted file mode 100644 index 67cc6ea..0000000 --- a/Scripts/Levels/main.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Node2D - -var startPosX : int = 40 -var startPosY : int = 328 - -var next_level : String = "res://Scenes/Levels/level_1.tscn" diff --git a/Scripts/Levels/main.gd.uid b/Scripts/Levels/main.gd.uid deleted file mode 100644 index bf41f1a..0000000 --- a/Scripts/Levels/main.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b228yv3gle864 diff --git a/Scripts/Levels/test.gd b/Scripts/Levels/test.gd deleted file mode 100644 index 3e732de..0000000 --- a/Scripts/Levels/test.gd +++ /dev/null @@ -1,14 +0,0 @@ -extends Node2D - -@onready var tile_layer : TileMapLayer = $TileMapLayer - -var startPosX : int = 56 -var startPosY : int = 120 - -var next_level : String = "res://Scenes/main.tscn" - -func event(): - tile_layer.set_cell(Vector2i(3,7), 0, Vector2i(2,0), 0) - tile_layer.erase_cell(Vector2i(8,8)) - tile_layer.erase_cell(Vector2i(9,8)) - tile_layer.erase_cell(Vector2i(10,8)) diff --git a/Scripts/Levels/test.gd.uid b/Scripts/Levels/test.gd.uid deleted file mode 100644 index 86380ac..0000000 --- a/Scripts/Levels/test.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://c1x6111kr1dqa diff --git a/Scripts/debug_info.gd b/Scripts/debug_info.gd new file mode 100644 index 0000000..3148807 --- /dev/null +++ b/Scripts/debug_info.gd @@ -0,0 +1,38 @@ +extends Control + +@onready var gravityText : Label = $txt_gravity +@onready var posText : Label = $txt_pos +@onready var levelText : Label = $txt_level +@onready var currentLevel : Node2D +@onready var player : Node2D = $".." + +var textVisible: bool = false + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + currentLevel = player.get_owner() + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + gravityText.text = str(al_globals.y_gravity) + posText.text = str(player.position.x) + ", " + str(player.position.y) + levelText.text = str(currentLevel.name) + + if Input.is_action_just_pressed("toggle_debug"): + print("detected!") + if textVisible: + textVisible = false + else: + textVisible = true + toggle_visibilty() + +func toggle_visibilty(): + if textVisible: + gravityText.visible = true + posText.visible = true + levelText.visible = true + else: + gravityText.visible = false + posText.visible = false + levelText.visible = false diff --git a/Scripts/debug_info.gd.uid b/Scripts/debug_info.gd.uid new file mode 100644 index 0000000..41fa399 --- /dev/null +++ b/Scripts/debug_info.gd.uid @@ -0,0 +1 @@ +uid://wxkd002cqmui diff --git a/project.godot b/project.godot index 4ea63dd..6dca32d 100644 --- a/project.godot +++ b/project.godot @@ -57,6 +57,12 @@ move_right={ , 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":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } +toggle_debug={ +"deadzone": 0.2, +"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":96,"key_label":0,"unicode":96,"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":true,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":96,"key_label":0,"unicode":126,"location":0,"echo":false,"script":null) +] +} [rendering]