diff options
| -rw-r--r-- | debug_info.gd | 11 | ||||
| -rw-r--r-- | player.gd | 5 | ||||
| -rw-r--r-- | player.tscn | 2 | ||||
| -rw-r--r-- | project.godot | 1 | ||||
| -rw-r--r-- | room.gd | 5 | ||||
| -rw-r--r-- | room.gd.uid | 1 | ||||
| -rw-r--r-- | room_main_menu.gd | 2 | ||||
| -rw-r--r-- | room_main_menu.tscn | 2 | ||||
| -rw-r--r-- | room_test1.tscn | 6 | ||||
| -rw-r--r-- | room_test2.tscn | 12 | ||||
| -rw-r--r-- | room_test3.tscn | 8 |
11 files changed, 31 insertions, 24 deletions
diff --git a/debug_info.gd b/debug_info.gd index af11e24..c8c9e10 100644 --- a/debug_info.gd +++ b/debug_info.gd @@ -11,13 +11,8 @@ func _update(): text += "FPS: %d\n" % Engine.get_frames_per_second() - var room: Node = get_tree().root.get_node_or_null("Top/ActiveRoom") - var player: Player - if room: player = room.find_child("Player") - - if room: - text += "Room: %s\n" % room.scene_file_path - if player: - text += "%s\n" % player.state.to_string() + var nodes = get_tree().get_nodes_in_group("debug_info") + for node in nodes: + text += node._debug_info() $Label.text = text @@ -12,6 +12,9 @@ var state: PlayerState = PlayerStateInit.new(self) var gravity = ProjectSettings.get_setting("physics/2d/default_gravity") +func _debug_info(): + return "%s\n" % state.to_string() + # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: state._handle(delta) @@ -53,6 +56,6 @@ func handle_action_input(): var hook: HookHanging = hook_any var dist = (hook.global_position - global_position).length() - print_debug("found hook: ", hook, ", dist: ", dist) + #print_debug("found hook: ", hook, ", dist: ", dist) if dist < hook_distance_max: request_state_hanging(hook, hook.hang_distance) diff --git a/player.tscn b/player.tscn index 3d0026a..905bf74 100644 --- a/player.tscn +++ b/player.tscn @@ -101,7 +101,7 @@ animations = [{ [sub_resource type="RectangleShape2D" id="RectangleShape2D_onrkg"] size = Vector2(6, 6) -[node name="Player" type="CharacterBody2D"] +[node name="Player" type="CharacterBody2D" groups=["debug_info"]] script = ExtResource("2_onrkg") speed = 70.0 jump_strength = 200.0 diff --git a/project.godot b/project.godot index 03a6f5b..609e23c 100644 --- a/project.godot +++ b/project.godot @@ -32,6 +32,7 @@ ui_movement="" ui_menu="" hook_hanging="" ui_action="" +debug_info="" [input] @@ -0,0 +1,5 @@ +class_name Room +extends Node2D + +func _debug_info(): + return "Room: %s\n" % scene_file_path diff --git a/room.gd.uid b/room.gd.uid new file mode 100644 index 0000000..bd32f85 --- /dev/null +++ b/room.gd.uid @@ -0,0 +1 @@ +uid://cbhily4o7e2r3 diff --git a/room_main_menu.gd b/room_main_menu.gd index f9ec9d1..2b3e3eb 100644 --- a/room_main_menu.gd +++ b/room_main_menu.gd @@ -1,5 +1,5 @@ class_name RoomMainMenu -extends Node2D +extends Room func _ready() -> void: $PlayButton.grab_focus.call_deferred() diff --git a/room_main_menu.tscn b/room_main_menu.tscn index bad7ab6..9469646 100644 --- a/room_main_menu.tscn +++ b/room_main_menu.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://dufnvsfxreqq8" path="res://room_main_menu.gd" id="1_rbk04"] [ext_resource type="TileSet" uid="uid://0cd30n67d6k5" path="res://tileset_kenney_platformer.tres" id="2_ftmdk"] -[node name="MainMenu" type="Node2D"] +[node name="MainMenu" type="Node2D" groups=["debug_info"]] process_mode = 1 script = ExtResource("1_rbk04") diff --git a/room_test1.tscn b/room_test1.tscn index 7648f1b..53f3132 100644 --- a/room_test1.tscn +++ b/room_test1.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=9 format=4 uid="uid://cfj21o6wsd3hv"] +[gd_scene load_steps=10 format=4 uid="uid://cfj21o6wsd3hv"] [ext_resource type="Texture2D" uid="uid://dkek11j5dh6as" path="res://assets.untracked/kenney_1-bit-platformer-pack/Tiles/Default/tile_0338.png" id="1_m3rqw"] +[ext_resource type="Script" uid="uid://cbhily4o7e2r3" path="res://room.gd" id="1_mrrx3"] [ext_resource type="PackedScene" uid="uid://coxnsharboouu" path="res://player.tscn" id="2_qglt1"] [ext_resource type="PackedScene" uid="uid://dfyvkc2qlcdac" path="res://game_camera.tscn" id="3_mrrx3"] [ext_resource type="PackedScene" uid="uid://df0loiahar23o" path="res://door.tscn" id="6_lfjh7"] @@ -15,8 +16,9 @@ _data = { } point_count = 12 -[node name="RoomTest1" type="Node2D"] +[node name="RoomTest1" type="Node2D" groups=["debug_info"]] process_mode = 1 +script = ExtResource("1_mrrx3") [node name="BgParallax" type="Parallax2D" parent="."] modulate = Color(0.7, 0.7, 0.7, 1) diff --git a/room_test2.tscn b/room_test2.tscn index b28a91b..e1a4193 100644 --- a/room_test2.tscn +++ b/room_test2.tscn @@ -1,13 +1,15 @@ -[gd_scene load_steps=6 format=4 uid="uid://cm4xqhbvyndt1"] +[gd_scene load_steps=7 format=4 uid="uid://cm4xqhbvyndt1"] -[ext_resource type="Texture2D" uid="uid://dkek11j5dh6as" path="res://assets.bak/kenney_1-bit-platformer-pack/Tiles/Default/tile_0338.png" id="1_0kik6"] +[ext_resource type="Texture2D" uid="uid://dkek11j5dh6as" path="res://assets.untracked/kenney_1-bit-platformer-pack/Tiles/Default/tile_0338.png" id="1_0kik6"] +[ext_resource type="Script" uid="uid://cbhily4o7e2r3" path="res://room.gd" id="1_vjuef"] [ext_resource type="PackedScene" uid="uid://coxnsharboouu" path="res://player.tscn" id="2_0kik6"] [ext_resource type="TileSet" uid="uid://0cd30n67d6k5" path="res://tileset_kenney_platformer.tres" id="2_otugw"] [ext_resource type="PackedScene" uid="uid://dfyvkc2qlcdac" path="res://game_camera.tscn" id="3_vjuef"] [ext_resource type="PackedScene" uid="uid://df0loiahar23o" path="res://door.tscn" id="6_0kik6"] -[node name="RoomTest2" type="Node2D"] +[node name="RoomTest2" type="Node2D" groups=["debug_info"]] process_mode = 1 +script = ExtResource("1_vjuef") [node name="Parallax2D" type="Parallax2D" parent="."] modulate = Color(0.7, 0.7, 0.7, 1) @@ -28,10 +30,6 @@ tile_set = ExtResource("2_otugw") [node name="Player" parent="." instance=ExtResource("2_0kik6")] collision_layer = 2 -speed = 70.0 -jump_strength = 200.0 -coyote_max = 10 -jump_held_coef = 0.8 [node name="GameCamera" parent="Player" instance=ExtResource("3_vjuef")] unique_name_in_owner = true diff --git a/room_test3.tscn b/room_test3.tscn index 720a5bd..8d4d54c 100644 --- a/room_test3.tscn +++ b/room_test3.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=10 format=4 uid="uid://3o7g1rxy06sb"] +[gd_scene load_steps=11 format=4 uid="uid://3o7g1rxy06sb"] [ext_resource type="Texture2D" uid="uid://dkek11j5dh6as" path="res://assets.untracked/kenney_1-bit-platformer-pack/Tiles/Default/tile_0338.png" id="1_pwspw"] +[ext_resource type="Script" uid="uid://cbhily4o7e2r3" path="res://room.gd" id="1_w1h0g"] [ext_resource type="PackedScene" uid="uid://coxnsharboouu" path="res://player.tscn" id="2_bml3v"] -[ext_resource type="Texture2D" uid="uid://jokhiukm54o2" path="res://assets/kenney_1-bit-platformer-pack/Tiles/Default/tile_0185.png" id="2_mtemi"] +[ext_resource type="Texture2D" uid="uid://jokhiukm54o2" path="res://assets.untracked/kenney_1-bit-platformer-pack/Tiles/Default/tile_0185.png" id="2_mtemi"] [ext_resource type="TileSet" uid="uid://0cd30n67d6k5" path="res://tileset_kenney_platformer.tres" id="2_pwspw"] [ext_resource type="Script" uid="uid://b77ngd0fnqxi5" path="res://computer.gd" id="3_bml3v"] [ext_resource type="PackedScene" uid="uid://dfyvkc2qlcdac" path="res://game_camera.tscn" id="3_w1h0g"] @@ -17,8 +18,9 @@ _data = { } point_count = 6 -[node name="RoomTest3" type="Node2D"] +[node name="RoomTest3" type="Node2D" groups=["debug_info"]] process_mode = 1 +script = ExtResource("1_w1h0g") [node name="Parallax2D" type="Parallax2D" parent="."] modulate = Color(0.7, 0.7, 0.7, 1) |