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 +
 archipelago.tscn                | 47 +++++++++++++++++++++++++++++------------
 5 files changed, 43 insertions(+), 16 deletions(-)

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
diff --git a/archipelago.tscn b/archipelago.tscn
index bad8631..884cbb5 100644
--- a/archipelago.tscn
+++ b/archipelago.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://nodes/label.tscn" type="PackedScene" id=1]
 [ext_resource path="res://fonts/Lingo.tres" type="DynamicFont" id=2]
@@ -6,6 +6,8 @@
 [ext_resource path="user://maps/Archipelago/settings_buttons.gd" type="Script" id=4]
 [ext_resource path="user://maps/Archipelago/settings_screen.gd" type="Script" id=5]
 [ext_resource path="res://fonts/Lingo35.tres" type="DynamicFont" id=6]
+[ext_resource path="res://images/unchecked.png" type="Texture" id=7]
+[ext_resource path="res://images/checked.png" type="Texture" id=8]
 
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 0, 0, 0, 0 )
@@ -73,19 +75,28 @@ text = "BACK"
 script = ExtResource( 4 )
 
 [node name="credit2" parent="Panel" instance=ExtResource( 1 )]
-margin_left = 75.0
+margin_left = -105.0
 margin_top = 346.0
-margin_right = 665.0
+margin_right = 485.0
 margin_bottom = 410.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/normal = SubResource( 1 )
 text = "SERVER"
 align = 2
 
+[node name="credit5" parent="Panel" instance=ExtResource( 1 )]
+margin_left = 1239.0
+margin_top = 271.0
+margin_right = 1829.0
+margin_bottom = 335.0
+custom_fonts/font = ExtResource( 2 )
+custom_styles/normal = SubResource( 1 )
+text = "OPTIONS"
+
 [node name="credit3" parent="Panel" instance=ExtResource( 1 )]
-margin_left = 75.0
+margin_left = -105.0
 margin_top = 519.0
-margin_right = 665.0
+margin_right = 485.0
 margin_bottom = 583.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/normal = SubResource( 1 )
@@ -93,9 +104,9 @@ text = "PLAYER"
 align = 2
 
 [node name="credit4" parent="Panel" instance=ExtResource( 1 )]
-margin_left = 75.0
+margin_left = -105.0
 margin_top = 704.0
-margin_right = 665.0
+margin_right = 485.0
 margin_bottom = 768.0
 custom_fonts/font = ExtResource( 2 )
 custom_styles/normal = SubResource( 1 )
@@ -103,9 +114,9 @@ text = "PASSWORD"
 align = 2
 
 [node name="server_box" type="LineEdit" parent="Panel"]
-margin_left = 682.0
+margin_left = 502.0
 margin_top = 295.0
-margin_right = 1324.0
+margin_right = 1144.0
 margin_bottom = 445.0
 custom_colors/selection_color = Color( 0.482353, 0, 0, 1 )
 custom_colors/cursor_color = Color( 0, 0, 0, 1 )
@@ -115,9 +126,9 @@ align = 1
 caret_blink = true
 
 [node name="player_box" type="LineEdit" parent="Panel"]
-margin_left = 682.0
+margin_left = 502.0
 margin_top = 477.0
-margin_right = 1324.0
+margin_right = 1144.0
 margin_bottom = 627.0
 custom_colors/selection_color = Color( 0.482353, 0, 0, 1 )
 custom_colors/cursor_color = Color( 0, 0, 0, 1 )
@@ -127,9 +138,9 @@ align = 1
 caret_blink = true
 
 [node name="password_box" type="LineEdit" parent="Panel"]
-margin_left = 682.0
+margin_left = 502.0
 margin_top = 659.0
-margin_right = 1324.0
+margin_right = 1144.0
 margin_bottom = 809.0
 custom_colors/selection_color = Color( 0.482353, 0, 0, 1 )
 custom_colors/cursor_color = Color( 0, 0, 0, 1 )
@@ -142,5 +153,15 @@ caret_blink = true
 margin_right = 83.0
 margin_bottom = 58.0
 
+[node name="confusing_box" type="CheckBox" parent="Panel"]
+margin_left = 1227.0
+margin_top = 351.0
+margin_right = 1832.0
+margin_bottom = 439.0
+custom_fonts/font = ExtResource( 6 )
+custom_icons/checked = ExtResource( 8 )
+custom_icons/unchecked = ExtResource( 7 )
+text = "Make world more confusing"
+
 [connection signal="pressed" from="Panel/connect_button" to="Panel/connect_button" method="_connect_pressed"]
 [connection signal="pressed" from="Panel/quit_button" to="Panel/quit_button" method="_back_pressed"]
-- 
cgit 1.4.1