Refactor Map to PauseMenu

8 files changed, 59 insertions, 61 deletions

diff --git a/.gitignore b/.gitignore
index 3cc6d0c..497a702 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 
 .DS_Store
 macos-export/
+assets.untracked
 
diff --git a/map.tscn b/map.tscn
deleted file mode 100644
index 5889b43..0000000
--- a/map.tscn
+++ /dev/null
@@ -1,42 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://cseqghymhiyqo"]
-
-[ext_resource type="Script" uid="uid://dh0b4xa4f8h1o" path="res://map.gd" id="1_wijl4"]
-[ext_resource type="PackedScene" uid="uid://clm2kocuhjqbb" path="res://map_room.tscn" id="2_e0an3"]
-
-[node name="Map" type="CanvasLayer"]
-process_mode = 3
-script = ExtResource("1_wijl4")
-
-[node name="Bg" type="ColorRect" parent="."]
-z_index = 1
-offset_right = 192.0
-offset_bottom = 108.0
-mouse_filter = 2
-color = Color(0, 0.019607844, 0.039215688, 0.81960785)
-
-[node name="Rooms" type="CanvasGroup" parent="."]
-z_index = 3
-
-[node name="RoomTest1" parent="Rooms" instance=ExtResource("2_e0an3")]
-offset_left = 63.0
-offset_top = 41.0
-offset_right = 79.0
-offset_bottom = 51.0
-
-[node name="Line2D" type="Line2D" parent="Rooms/RoomTest1"]
-z_index = -1
-points = PackedVector2Array(8, 19, 8, 5, 30, 5)
-width = 2.0
-default_color = Color(0.7372549, 0.69803923, 0.43529412, 1)
-
-[node name="RoomTest2" parent="Rooms" instance=ExtResource("2_e0an3")]
-offset_left = 83.0
-offset_top = 41.0
-offset_right = 99.0
-offset_bottom = 51.0
-
-[node name="RoomTest3" parent="Rooms" instance=ExtResource("2_e0an3")]
-offset_left = 63.0
-offset_top = 55.0
-offset_right = 79.0
-offset_bottom = 65.0
diff --git a/map_room.tscn b/map_room.tscn
index 742d134..28f5f68 100644
--- a/map_room.tscn
+++ b/map_room.tscn
@@ -4,6 +4,7 @@
 [ext_resource type="Texture2D" uid="uid://bkfsgbkx3t3oe" path="res://assets.bak/kenney_1-bit-platformer-pack/Tiles/Transparent/tile_0241.png" id="2_vqn3c"]
 
 [node name="MapRoom" type="ColorRect"]
+z_index = 5
 offset_right = 16.0
 offset_bottom = 10.0
 script = ExtResource("1_oc81s")
@@ -11,6 +12,7 @@ inactive_color = Color(0.21960784, 0.5294118, 0.44313726, 1)
 active_color = Color(0.3529412, 0.61960787, 0.36078432, 1)
 
 [node name="PlayerIcon" type="TextureRect" parent="."]
+z_index = 1
 layout_mode = 0
 offset_left = 4.0
 offset_right = 20.0
diff --git a/map.gd b/pause_menu.gd
index 49e39b4..e5a3129 100644
--- a/map.gd
+++ b/pause_menu.gd
@@ -1,28 +1,27 @@
-class_name Map
+class_name PauseMenu
 extends CanvasLayer
 
 var active_map_room: MapRoom
 
 func _ready():
-	hide_map()
+	deactivate()
 
-func set_active_name(map_room_name: String):
+func set_room_name(map_room_name: String):
 	if active_map_room: active_map_room.unhighlight()
 
-	active_map_room = get_node_or_null("Rooms/" + map_room_name)
+	active_map_room = $Map.get_node_or_null(map_room_name)
 
 	if active_map_room:
 		active_map_room.highlight()
 		var pos = active_map_room.position
 		var size = get_viewport().get_visible_rect().size
 		var delta = Vector2(size.x / 2, size.y / 2)
-		$Rooms.position = -pos + delta - active_map_room.size / 2
-		#$Rooms.position = -pos + Vector2(10, 10)
+		$Map.position = -pos + delta - active_map_room.size / 2
 
-func show_map():
+func activate():
 	visible = true
 	get_tree().call_group("ui_movement", "set_visible", false)
 	
-func hide_map():
+func deactivate():
 	visible = false
 	get_tree().call_group("ui_movement", "set_visible", true)
diff --git a/map.gd.uid b/pause_menu.gd.uid
index 25fe05c..25fe05c 100644
--- a/map.gd.uid
+++ b/pause_menu.gd.uid
diff --git a/top.gd b/top.gd
index 843dafa..3483118 100644
--- a/top.gd
+++ b/top.gd
@@ -8,7 +8,7 @@ var active_room_name: String
 
 func _ready() -> void:
 	print("data_dir: \"%s\"" % OS.get_user_data_dir())
-	$Map.hide_map()
+	$PauseMenu.deactivate()
 	get_tree().call_group("ui_movement", "set_visible", false)
 	get_tree().call_group("ui_menu", "set_visible", false)
 
@@ -20,7 +20,7 @@ func _ready() -> void:
 
 func _process(_delta: float):
 	if Input.is_action_just_pressed("menu"):
-		if $Map.visible:
+		if $PauseMenu.visible:
 			close_pause_menu()
 		elif active_room_name != "MainMenu":
 			open_pause_menu()
@@ -40,19 +40,19 @@ func replace_active_room(new_room: Node, on_changed: Callable):
 	new_room.process_mode = Node.PROCESS_MODE_PAUSABLE
 	add_child(new_room)
 
-func get_map() -> Map:
-	return $Map
+func get_pause_menu() -> PauseMenu:
+	return $PauseMenu
 	
 func get_transition_player() -> TransitionPlayer:
 	return $TransitionPlayer
 
 func open_pause_menu():
 	get_tree().paused = true
-	$Map.show_map()
+	$PauseMenu.activate()
 
 func close_pause_menu():
 	get_tree().paused = false
-	$Map.hide_map()
+	$PauseMenu.deactivate()
 
 # Save state logic
 
diff --git a/top.tscn b/top.tscn
index 9c4b657..52e868b 100644
--- a/top.tscn
+++ b/top.tscn
@@ -1,11 +1,12 @@
-[gd_scene load_steps=11 format=3 uid="uid://cey3jxnpmommt"]
+[gd_scene load_steps=12 format=3 uid="uid://cey3jxnpmommt"]
 
 [ext_resource type="Material" uid="uid://bb4b8jm2tyy81" path="res://mat_palette.tres" id="1_edsjh"]
 [ext_resource type="Script" uid="uid://dxbspy72bg0db" path="res://top.gd" id="1_on2c2"]
-[ext_resource type="PackedScene" uid="uid://cseqghymhiyqo" path="res://map.tscn" id="3_58ij3"]
 [ext_resource type="Script" uid="uid://cph2apstgper1" path="res://palette_shader.gd" id="5_ch5ua"]
 [ext_resource type="PackedScene" uid="uid://cciwccvljuuyq" path="res://touch_screen_ui.tscn" id="5_edsjh"]
 [ext_resource type="Script" uid="uid://civ5a43u5151a" path="res://transition_player.gd" id="6_ch5ua"]
+[ext_resource type="Script" uid="uid://dh0b4xa4f8h1o" path="res://pause_menu.gd" id="6_ql50d"]
+[ext_resource type="PackedScene" uid="uid://clm2kocuhjqbb" path="res://map_room.tscn" id="7_ql50d"]
 
 [sub_resource type="Animation" id="Animation_58ij3"]
 length = 0.001
@@ -146,8 +147,6 @@ process_mode = 3
 material = ExtResource("1_edsjh")
 script = ExtResource("1_on2c2")
 
-[node name="Map" parent="." instance=ExtResource("3_58ij3")]
-
 [node name="TouchScreenUI" parent="." instance=ExtResource("5_edsjh")]
 
 [node name="TransitionPlayer" type="AnimationPlayer" parent="."]
@@ -157,7 +156,46 @@ libraries = {
 speed_scale = 3.0
 script = ExtResource("6_ch5ua")
 
+[node name="PauseMenu" type="CanvasLayer" parent="."]
+script = ExtResource("6_ql50d")
+
+[node name="Bg" type="ColorRect" parent="PauseMenu"]
+offset_right = 192.0
+offset_bottom = 108.0
+mouse_filter = 2
+color = Color(0, 0.019607844, 0.039215688, 0.88235295)
+
+[node name="Map" type="CanvasGroup" parent="PauseMenu"]
+
+[node name="RoomTest1" parent="PauseMenu/Map" instance=ExtResource("7_ql50d")]
+offset_left = 63.0
+offset_top = 41.0
+offset_right = 79.0
+offset_bottom = 51.0
+metadata/_edit_use_anchors_ = true
+
+[node name="Line2D" type="Line2D" parent="PauseMenu/Map/RoomTest1"]
+z_index = -1
+points = PackedVector2Array(8, 19, 8, 5, 30, 5)
+width = 2.0
+default_color = Color(0.86000663, 0.84067386, 1.92523e-06, 1)
+
+[node name="RoomTest2" parent="PauseMenu/Map" instance=ExtResource("7_ql50d")]
+offset_left = 83.0
+offset_top = 41.0
+offset_right = 99.0
+offset_bottom = 51.0
+metadata/_edit_use_anchors_ = true
+
+[node name="RoomTest3" parent="PauseMenu/Map" instance=ExtResource("7_ql50d")]
+offset_left = 63.0
+offset_top = 55.0
+offset_right = 79.0
+offset_bottom = 65.0
+metadata/_edit_use_anchors_ = true
+
 [node name="PaletteShader" type="CanvasLayer" parent="."]
+layer = 10
 script = ExtResource("5_ch5ua")
 
 [node name="ColorRect" type="ColorRect" parent="PaletteShader"]
diff --git a/transition_player.gd b/transition_player.gd
index 0960497..b7b4918 100644
--- a/transition_player.gd
+++ b/transition_player.gd
@@ -34,7 +34,7 @@ func _transition_start():
 	while _transition_room == null:
 		await get_tree().create_timer(0.1).timeout
 
-	top.get_map().set_active_name(_transition_room.name)
+	top.get_pause_menu().set_room_name(_transition_room.name)
 	top.replace_active_room(_transition_room, _on_room_changed)
 	
 func _on_room_changed():