From 75e5821d9b128ffd68609b0842fe8e235ebde5db Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 21 Nov 2023 14:39:30 -0500
Subject: confusing world is now an option

---
 Archipelago/client.gd           | 5 ++++-
 Archipelago/load.gd             | 5 +++--
 Archipelago/settings_buttons.gd | 1 +
 Archipelago/settings_screen.gd  | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'Archipelago')

diff --git a/Archipelago/client.gd b/Archipelago/client.gd
index 5273216..9744c0d 100644
--- a/Archipelago/client.gd
+++ b/Archipelago/client.gd
@@ -3,6 +3,7 @@ extends Node
 var ap_server = ""
 var ap_user = ""
 var ap_pass = ""
+var confusify_world = false
 
 const my_version = "0.14.0"
 const ap_version = {"major": 0, "minor": 4, "build": 0, "class": "Version"}
@@ -128,6 +129,8 @@ func _init():
 			ap_pass = data[2]
 		if data.size() > 3:
 			_datapackages = data[3]
+		if data.size() > 4:
+			confusify_world = data[4]
 
 		processDatapackages()
 
@@ -422,7 +425,7 @@ func saveSettings():
 	var file = File.new()
 	file.open("user://settings/archipelago", File.WRITE)
 
-	var data = [ap_server, ap_user, ap_pass, _datapackages]
+	var data = [ap_server, ap_user, ap_pass, _datapackages, confusify_world]
 	file.store_var(data, true)
 	file.close()
 
diff --git a/Archipelago/load.gd b/Archipelago/load.gd
index ce97918..b6d0fba 100644
--- a/Archipelago/load.gd
+++ b/Archipelago/load.gd
@@ -181,8 +181,9 @@ func _load():
 	set_gridmap_tile(-88.5, 4.5, -41.5, "MeshInstance8")
 	set_gridmap_tile(-89.5, 4.5, -41.5, "MeshInstance4")
 
-	# Remove welcome back / color hallway / sunwarp indicators.
-	$Decorations/Signs/"Welcome Back Signs".queue_free()
+	if apclient.confusify_world:
+		# Remove welcome back / color hallway / sunwarp indicators.
+		$Decorations/Signs/"Welcome Back Signs".queue_free()
 
 	if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE:
 		# Make The Wondrous's FIRE solely midred.
diff --git a/Archipelago/settings_buttons.gd b/Archipelago/settings_buttons.gd
index 0050504..a6bba2a 100644
--- a/Archipelago/settings_buttons.gd
+++ b/Archipelago/settings_buttons.gd
@@ -12,6 +12,7 @@ func _connect_pressed():
 	apclient.ap_server = self.get_parent().get_node("server_box").text
 	apclient.ap_user = self.get_parent().get_node("player_box").text
 	apclient.ap_pass = self.get_parent().get_node("password_box").text
+	apclient.confusify_world = self.get_parent().get_node("confusing_box").pressed
 	apclient.saveSettings()
 
 	apclient.connectToServer()
diff --git a/Archipelago/settings_screen.gd b/Archipelago/settings_screen.gd
index 3f56962..3769809 100644
--- a/Archipelago/settings_screen.gd
+++ b/Archipelago/settings_screen.gd
@@ -43,6 +43,7 @@ func _ready():
 	self.get_node("Panel/server_box").text = apclient.ap_server
 	self.get_node("Panel/player_box").text = apclient.ap_user
 	self.get_node("Panel/password_box").text = apclient.ap_pass
+	self.get_node("Panel/confusing_box").pressed = apclient.confusify_world
 
 	# Show client version.
 	self.get_node("Panel/title").text = "ARCHIPELAGO (%s)" % apclient.my_version
-- 
cgit 1.4.1