about summary refs log tree commit diff stats
path: root/Archipelago
diff options
context:
space:
mode:
Diffstat (limited to 'Archipelago')
-rw-r--r--Archipelago/client.gd5
-rw-r--r--Archipelago/load.gd5
-rw-r--r--Archipelago/settings_buttons.gd1
-rw-r--r--Archipelago/settings_screen.gd1
4 files changed, 9 insertions, 3 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
3var ap_server = "" 3var ap_server = ""
4var ap_user = "" 4var ap_user = ""
5var ap_pass = "" 5var ap_pass = ""
6var confusify_world = false
6 7
7const my_version = "0.14.0" 8const my_version = "0.14.0"
8const ap_version = {"major": 0, "minor": 4, "build": 0, "class": "Version"} 9const ap_version = {"major": 0, "minor": 4, "build": 0, "class": "Version"}
@@ -128,6 +129,8 @@ func _init():
128 ap_pass = data[2] 129 ap_pass = data[2]
129 if data.size() > 3: 130 if data.size() > 3:
130 _datapackages = data[3] 131 _datapackages = data[3]
132 if data.size() > 4:
133 confusify_world = data[4]
131 134
132 processDatapackages() 135 processDatapackages()
133 136
@@ -422,7 +425,7 @@ func saveSettings():
422 var file = File.new() 425 var file = File.new()
423 file.open("user://settings/archipelago", File.WRITE) 426 file.open("user://settings/archipelago", File.WRITE)
424 427
425 var data = [ap_server, ap_user, ap_pass, _datapackages] 428 var data = [ap_server, ap_user, ap_pass, _datapackages, confusify_world]
426 file.store_var(data, true) 429 file.store_var(data, true)
427 file.close() 430 file.close()
428 431
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():
181 set_gridmap_tile(-88.5, 4.5, -41.5, "MeshInstance8") 181 set_gridmap_tile(-88.5, 4.5, -41.5, "MeshInstance8")
182 set_gridmap_tile(-89.5, 4.5, -41.5, "MeshInstance4") 182 set_gridmap_tile(-89.5, 4.5, -41.5, "MeshInstance4")
183 183
184 # Remove welcome back / color hallway / sunwarp indicators. 184 if apclient.confusify_world:
185 $Decorations/Signs/"Welcome Back Signs".queue_free() 185 # Remove welcome back / color hallway / sunwarp indicators.
186 $Decorations/Signs/"Welcome Back Signs".queue_free()
186 187
187 if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE: 188 if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE:
188 # Make The Wondrous's FIRE solely midred. 189 # 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():
12 apclient.ap_server = self.get_parent().get_node("server_box").text 12 apclient.ap_server = self.get_parent().get_node("server_box").text
13 apclient.ap_user = self.get_parent().get_node("player_box").text 13 apclient.ap_user = self.get_parent().get_node("player_box").text
14 apclient.ap_pass = self.get_parent().get_node("password_box").text 14 apclient.ap_pass = self.get_parent().get_node("password_box").text
15 apclient.confusify_world = self.get_parent().get_node("confusing_box").pressed
15 apclient.saveSettings() 16 apclient.saveSettings()
16 17
17 apclient.connectToServer() 18 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():
43 self.get_node("Panel/server_box").text = apclient.ap_server 43 self.get_node("Panel/server_box").text = apclient.ap_server
44 self.get_node("Panel/player_box").text = apclient.ap_user 44 self.get_node("Panel/player_box").text = apclient.ap_user
45 self.get_node("Panel/password_box").text = apclient.ap_pass 45 self.get_node("Panel/password_box").text = apclient.ap_pass
46 self.get_node("Panel/confusing_box").pressed = apclient.confusify_world
46 47
47 # Show client version. 48 # Show client version.
48 self.get_node("Panel/title").text = "ARCHIPELAGO (%s)" % apclient.my_version 49 self.get_node("Panel/title").text = "ARCHIPELAGO (%s)" % apclient.my_version