From 97c365e5d2932f6cd1a871d82072aab5d78a653e Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 11 May 2023 12:44:41 -0400
Subject: Use base game messages node

Now that it's been integrated into the game itself.
---
 Archipelago/client.gd   |  6 ++---
 Archipelago/load.gd     |  8 +------
 Archipelago/messages.gd | 62 -------------------------------------------------
 3 files changed, 4 insertions(+), 72 deletions(-)
 delete mode 100644 Archipelago/messages.gd

(limited to 'Archipelago')

diff --git a/Archipelago/client.gd b/Archipelago/client.gd
index b7050b6..12e5e99 100644
--- a/Archipelago/client.gd
+++ b/Archipelago/client.gd
@@ -362,7 +362,7 @@ func _on_data():
 
 			var item_color = colorForItemType(message["item"]["flags"])
 
-			var messages_node = get_tree().get_root().get_node("Spatial/AP_Messages")
+			var messages_node = get_tree().get_root().get_node("Spatial/Messages")
 			if message["type"] == "Hint":
 				var is_for = ""
 				if message["receiving"] != _slot:
@@ -387,7 +387,7 @@ func _on_data():
 				and message.has("data")
 				and message["tags"].has("DeathLink")
 			):
-				var messages_node = get_tree().get_root().get_node("Spatial/AP_Messages")
+				var messages_node = get_tree().get_root().get_node("Spatial/Messages")
 				var first_sentence = "Received Death"
 				var second_sentence = ""
 				if message["data"].has("source"):
@@ -613,7 +613,7 @@ func processItem(item, index, from, flags):
 
 		var item_color = colorForItemType(flags)
 
-		var messages_node = get_tree().get_root().get_node("Spatial/AP_Messages")
+		var messages_node = get_tree().get_root().get_node("Spatial/Messages")
 		if from == _slot:
 			messages_node.showMessage("Found [color=%s]%s[/color]" % [item_color, item_name])
 		else:
diff --git a/Archipelago/load.gd b/Archipelago/load.gd
index c637ccb..6deafa9 100644
--- a/Archipelago/load.gd
+++ b/Archipelago/load.gd
@@ -289,12 +289,6 @@ func _load():
 			"answer_correct", apclient, "completedGoal"
 		)
 
-	# Create the messages node.
-	var messages_script = ResourceLoader.load("user://maps/Archipelago/messages.gd")
-	var messages = messages_script.new()
-	messages.set_name("AP_Messages")
-	self.add_child(messages)
-
 	# Create the effects node.
 	var effects_script = ResourceLoader.load("user://maps/Archipelago/effects.gd")
 	var effects = effects_script.new()
@@ -366,5 +360,5 @@ func set_gridmap_tile(x, y, z, tile):
 
 
 func archipelago_disconnected(reason):
-	var messages_node = self.get_node("AP_Messages")
+	var messages_node = self.get_node("Messages")
 	messages_node.show_message(reason)
diff --git a/Archipelago/messages.gd b/Archipelago/messages.gd
deleted file mode 100644
index fbe7564..0000000
--- a/Archipelago/messages.gd
+++ /dev/null
@@ -1,62 +0,0 @@
-extends Node
-
-var _message_queue = []
-var _font
-var _container
-var _ordered_labels = []
-
-
-func _ready():
-	_container = VBoxContainer.new()
-	_container.set_name("Container")
-	_container.anchor_bottom = 1
-	_container.margin_left = 20.0
-	_container.margin_right = 1920.0
-	_container.margin_top = 0.0
-	_container.margin_bottom = -20.0
-	_container.alignment = BoxContainer.ALIGN_END
-	_container.mouse_filter = Control.MOUSE_FILTER_IGNORE
-	self.add_child(_container)
-
-	_font = DynamicFont.new()
-	_font.font_data = load("res://fonts/Lingo.ttf")
-	_font.size = 36
-	_font.outline_color = Color(0, 0, 0, 1)
-	_font.outline_size = 2
-
-
-func _add_message(text):
-	var new_label = RichTextLabel.new()
-	new_label.push_font(_font)
-	new_label.append_bbcode(text)
-	new_label.fit_content_height = true
-
-	_container.add_child(new_label)
-	_ordered_labels.push_back(new_label)
-
-
-func showMessage(text):
-	if _ordered_labels.size() >= 9:
-		_message_queue.append(text)
-		return
-
-	_add_message(text)
-
-	if _ordered_labels.size() > 1:
-		return
-
-	var timeout = 10.0
-	while !_ordered_labels.empty():
-		yield(get_tree().create_timer(timeout), "timeout")
-
-		var to_remove = _ordered_labels.pop_front()
-		var to_tween = get_tree().create_tween().bind_node(to_remove)
-		to_tween.tween_property(to_remove, "modulate:a", 0.0, 0.5)
-		to_tween.tween_callback(to_remove, "queue_free")
-
-		if !_message_queue.empty():
-			var next_msg = _message_queue.pop_front()
-			_add_message(next_msg)
-
-		if timeout > 4:
-			timeout -= 3
-- 
cgit 1.4.1