Refactor

5 files changed, 8 insertions, 11 deletions

diff --git a/door.gd b/door.gd
index 101b052..9197812 100644
--- a/door.gd
+++ b/door.gd
@@ -2,8 +2,6 @@
 class_name Door
 extends Area2D
 
-@onready var top: Top = get_tree().root.get_node("Top")
-
 var _target_room: Variant
 var _target_door: Variant
 
@@ -30,6 +28,7 @@ func _get(property):
 
 func _on_body_entered(_player: Player) -> void:
 	if not Engine.is_editor_hint():
+		var top: Top = get_tree().root.get_node("Top")
 		top.get_transition_manager().room_transition(self, _target_room, _target_door)
 	
 func _get_property_list() -> Array[Dictionary]:
diff --git a/map.gd b/map.gd
index 425dee4..49e39b4 100644
--- a/map.gd
+++ b/map.gd
@@ -1,7 +1,6 @@
 class_name Map
 extends CanvasLayer
 
-@onready var top: Top = get_tree().root.get_node("Top")
 var active_map_room: MapRoom
 
 func _ready():
diff --git a/player.gd b/player.gd
index 6c5d142..88d0c6d 100644
--- a/player.gd
+++ b/player.gd
@@ -1,8 +1,6 @@
 class_name Player
 extends CharacterBody2D
 
-@onready var top: Top = get_tree().root.get_node("Top")
-
 @export var speed: float
 @export var jump_strength: float
 @export var coyote_max: int
diff --git a/tileset_kenney_platformer.tres b/tileset_kenney_platformer.tres
index 850ef52..bd687f1 100644
--- a/tileset_kenney_platformer.tres
+++ b/tileset_kenney_platformer.tres
@@ -1,11 +1,10 @@
-[gd_resource type="TileSet" load_steps=5 format=3 uid="uid://0cd30n67d6k5"]
+[gd_resource type="TileSet" load_steps=4 format=3 uid="uid://0cd30n67d6k5"]
 
-[ext_resource type="Texture2D" uid="uid://o0yy2jkyp0dy" path="res://assets.bak/kenney_1-bit-platformer-pack/Tilemap/monochrome_tilemap_transparent_packed.png" id="1_a0n5x"]
-[ext_resource type="Texture2D" uid="uid://o0yy2jkyp0dy" path="res://assets/kenney_1-bit-platformer-pack/Tilemap/monochrome_tilemap_transparent_packed.png" id="2_at7kb"]
+[ext_resource type="Texture2D" uid="uid://o0yy2jkyp0dy" path="res://assets.bak/kenney_1-bit-platformer-pack/Tilemap/monochrome_tilemap_transparent_packed.png" id="2_at7kb"]
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_0e48y"]
 resource_name = "solid trans"
-texture = ExtResource("1_a0n5x")
+texture = ExtResource("2_at7kb")
 1:0/0 = 0
 1:0/0/modulate = Color(0.84705883, 0.58431375, 0.26666668, 1)
 2:0/0 = 0
diff --git a/transition_manager.gd b/transition_manager.gd
index 374e837..390f854 100644
--- a/transition_manager.gd
+++ b/transition_manager.gd
@@ -1,12 +1,11 @@
 class_name TransitionManager
 extends CanvasLayer
 
-@onready var top: Top = get_tree().root.get_node("Top")
-
 var _transition_room: Node
 var _transition_door_name: Variant # String or null
 
 func room_transition(from_door: Door, to_room_path: String, door_name: Variant):
+	var top: Top = get_tree().root.get_node("Top")
 	# Do not transition if there is already a transition in process
 	if _transition_room != null:
 		#print_debug("Tried to transition to ", room_name, " but a transition was already in process")
@@ -28,6 +27,7 @@ func room_transition(from_door: Door, to_room_path: String, door_name: Variant):
 	top.game_set(Top.SAVE_LAST_DOOR_NAME, door_name)
 
 func _transition_start():
+	var top: Top = get_tree().root.get_node("Top")
 	#print_debug("_transition_start")
 	
 	# If the room hasn't loaded yet, loop until it is
@@ -38,6 +38,7 @@ func _transition_start():
 	top.replace_active_room(_transition_room, _on_room_changed)
 	
 func _on_room_changed():
+	var top: Top = get_tree().root.get_node("Top")
 	#print_debug("_on_room_changed")
 	var room = top.get_node("ActiveRoom")
 	var player: Player = room.find_child("Player")
@@ -50,6 +51,7 @@ func _on_room_changed():
 	top.game_save()
 	
 func _transition_end():
+	var top: Top = get_tree().root.get_node("Top")
 	#print_debug("_transition_end")
 	_transition_room = null
 	_transition_door_name = null