refactor scene tree of all overlays to be children of Overlays

1 files changed, 22 insertions, 20 deletions

diff --git a/client/game.gd b/client/game.gd
index d89988ff..8fa4a2cc 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -67,10 +67,12 @@ var spectating_mode: SpectatingMode = SpectatingMode.CENTER
 
 @onready var mp: Multiplayer = $Multiplayer
 @onready var map: Map = $Map
-@onready var lobby: Lobby = $"../Lobby"
-@onready var overlay: Overlay = $"../Overlay"
-@onready var popup_message: PopupMessage = $"../PopupMessage"
-@onready var pinned_items: PinnedItemMessages = $"../PinnedItemMessages"
+# TODO move all of this somewhere else
+@onready var overlay_lobby: Lobby = $"../Overlays/Lobby"
+@onready var overlay_score: Overlay = $"../Overlays/Score"
+@onready var overlay_popup_message: PopupMessage = $"../Overlays/PopupMessage"
+@onready var overlay_pinned_messages: PinnedItemMessages = $"../Overlays/PinnedMessages"
+@onready var overlay_announce_title: AnnounceTitle = $"../Overlays/AnnounceTitle"
 @onready var menu: GameMenu = $".."
 @onready var follow_camera: FollowCamera = $FollowCamera
 
@@ -127,7 +129,7 @@ func handle_packet(p):
 				return
 			if player.is_customer and player.current_item_message != null:
 				tutorial_queue.erase(player.current_item_message)
-			pinned_items.clear_item(p.id)
+			overlay_pinned_messages.clear_item(p.id)
 			if p.id == my_player_id:
 				set_join_state(JoinState.SPECTATING)
 				follow_camera.target = $Center
@@ -221,7 +223,7 @@ func handle_packet(p):
 					ingredients.append_array(parsed_item.contents)
 					
 					if pinned:
-						pinned_items.pin_item(item_name, timeout_initial, timeout_remaining, p.player)
+						overlay_pinned_messages.pin_item(item_name, timeout_initial, timeout_remaining, p.player)
 					
 					var player: Player = players[p.player]
 					player.item_message(item_name, timeout_initial, timeout_remaining)
@@ -263,12 +265,12 @@ func handle_packet(p):
 				if player.is_customer and player.current_item_message != null:
 					tutorial_queue.erase(player.current_item_message)
 				player.clear_message()
-				pinned_items.clear_item(p.player)
+				overlay_pinned_messages.clear_item(p.player)
 		"effect":
 			players[p.player].effect_message(p.name)
 		"set_ingame":
 			in_lobby = p.lobby
-			overlay.set_ingame(p.state, p.lobby)
+			overlay_score.set_ingame(p.state, p.lobby)
 			follow_camera.set_ingame(p.state, p.lobby)
 			
 			if p.state:
@@ -281,16 +283,16 @@ func handle_packet(p):
 				map.autobake = false
 				await get_parent()._menu_exit()
 			
-			lobby.visible = in_lobby
-			if in_lobby: lobby.select_map(0)
-			if lobby and join_state == JoinState.SPECTATING:
+			overlay_lobby.visible = in_lobby
+			if in_lobby: overlay_lobby.select_map(0)
+			if overlay_lobby and join_state == JoinState.SPECTATING:
 				if in_lobby:
 					toggle_join()
 				elif not is_replay:
 					menu.submenu("res://gui/menus/ingame/ingame.tscn")
 		"score":
 			if p.time_remaining != null:
-				overlay.update(p.demands_failed, p.demands_completed, p.points, p.time_remaining)
+				overlay_score.update(p.demands_failed, p.demands_completed, p.points, p.time_remaining)
 		"tutorial_ended":
 			if p.player != my_player_id: return
 			
@@ -321,14 +323,14 @@ func handle_packet(p):
 				"score":
 					menu.submenu("res://gui/menus/rating/rating.tscn", [p.data.stars, p.data.points])
 				"announce_start":
-					overlay.announce_start()
+					overlay_announce_title.announce_start()
 		"server_message":
 			var mstr := get_message_str(p.message)
 			if p.error:
-				popup_message.display_server_msg(tr("c.error.server").format([mstr]))
+				overlay_popup_message.display_server_msg(tr("c.error.server").format([mstr]))
 				push_error(tr("c.error.server").format([mstr]))
 			else:
-				popup_message.display_server_msg(mstr)
+				overlay_popup_message.display_server_msg(mstr)
 		"server_hint":
 			if p.player != my_player_id: return
 			
@@ -338,15 +340,15 @@ func handle_packet(p):
 			if position_ == null:
 				# Global hint message
 				if message == null:
-					popup_message.clear_server_msg()
+					overlay_popup_message.clear_server_msg()
 				else:
-					popup_message.display_server_msg(get_message_str(message), false)
+					overlay_popup_message.display_server_msg(get_message_str(message), false)
 			else:
 				# Positional hint message
 				if message == null:
-					popup_message.clear_server_msg(position_)
+					overlay_popup_message.clear_server_msg(position_)
 				else:
-					popup_message.display_server_msg_positional(get_message_str(message), position_, false)
+					overlay_popup_message.display_server_msg_positional(get_message_str(message), position_, false)
 		"environment":
 			$Environment.update(p.effects)
 		"redirect":
@@ -357,7 +359,7 @@ func handle_packet(p):
 			if is_replay and OS.has_feature("movie"):
 				menu.exit()
 		"pause":
-			overlay.timer.paused = p.state
+			overlay_score.timer.paused = p.state
 			Global.game_paused = p.state
 		
 		_: push_error("Unrecognized packet type: %s" % p.type)