1 files changed, 22 insertions, 2 deletions

@@ -36,6 +36,7 @@ func _ready():
                 global.add_child(ap_instance)
 
                 # Let's also inject any scripts we need to inject now.
+                installScriptExtension(runtime.load_script("allowNumbers.gd"))
                 installScriptExtension(runtime.load_script("animationListener.gd"))
                 installScriptExtension(runtime.load_script("collectable.gd"))
                 installScriptExtension(runtime.load_script("door.gd"))
@@ -43,12 +44,14 @@ func _ready():
                 installScriptExtension(runtime.load_script("keyHolderChecker.gd"))
                 installScriptExtension(runtime.load_script("keyHolderResetterListener.gd"))
                 installScriptExtension(runtime.load_script("painting.gd"))
+                installScriptExtension(runtime.load_script("paintingAuto.gd"))
                 installScriptExtension(runtime.load_script("panel.gd"))
                 installScriptExtension(runtime.load_script("pauseMenu.gd"))
                 installScriptExtension(runtime.load_script("player.gd"))
                 installScriptExtension(runtime.load_script("saver.gd"))
                 installScriptExtension(runtime.load_script("teleport.gd"))
                 installScriptExtension(runtime.load_script("teleportListener.gd"))
+                installScriptExtension(runtime.load_script("unlockReaderListener.gd"))
                 installScriptExtension(runtime.load_script("visibilityListener.gd"))
                 installScriptExtension(runtime.load_script("worldport.gd"))
                 installScriptExtension(runtime.load_script("worldportListener.gd"))
@@ -66,6 +69,11 @@ func _ready():
                 messages_instance.SCRIPT_rainbowText = runtime.load_script("rainbowText.gd")
                 global.add_child(messages_instance)
 
+                var effects_script = runtime.load_script("effects.gd")
+                var effects_instance = effects_script.new()
+                effects_instance.name = "Effects"
+                global.add_child(effects_instance)
+
                 var textclient_script = runtime.load_script("textclient.gd")
                 var textclient_instance = textclient_script.new()
                 textclient_instance.name = "Textclient"
@@ -77,6 +85,13 @@ func _ready():
                 compass_overlay_instance.SCRIPT_compass = runtime.load_script("compass.gd")
                 global.add_child(compass_overlay_instance)
 
+                unlocks.data["advanced_mastery"] = ""
+                unlocks.data["charismatic_mastery"] = ""
+                unlocks.data["crystalline_mastery"] = ""
+                unlocks.data["fuzzy_mastery"] = ""
+                unlocks.data["icarus_mastery"] = ""
+                unlocks.data["stellar_mastery"] = ""
+
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
         ap.ap_connected.connect(connectionSuccessful)
@@ -218,11 +233,11 @@ func startGame():
 
         unlocks.resetCollectables()
         unlocks.resetData()
+        unlocks.loadCollectables()
+        unlocks.loadData()
 
         ap.setup_keys()
 
-        unlocks.loadCollectables()
-        unlocks.loadData()
         unlocks.unlockKey("capslock", 1)
 
         if ap.shuffle_worldports:
@@ -231,6 +246,7 @@ func startGame():
                 settings.worldport_fades = "never"
 
         clearResourceCache("res://objects/meshes/gridDoor.tscn")
+        clearResourceCache("res://objects/nodes/allowNumbers.tscn")
         clearResourceCache("res://objects/nodes/collectable.tscn")
         clearResourceCache("res://objects/nodes/door.tscn")
         clearResourceCache("res://objects/nodes/keyHolder.tscn")
@@ -238,6 +254,7 @@ func startGame():
         clearResourceCache("res://objects/nodes/listeners/keyHolderChecker.tscn")
         clearResourceCache("res://objects/nodes/listeners/keyHolderResetterListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/teleportListener.tscn")
+        clearResourceCache("res://objects/nodes/listeners/unlockReaderListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/visibilityListener.tscn")
         clearResourceCache("res://objects/nodes/listeners/worldportListener.tscn")
         clearResourceCache("res://objects/nodes/panel.tscn")
@@ -274,6 +291,9 @@ func versionMismatchDeclined():
         get_node("../Panel/AcceptDialog").hide()
         get_node("../Panel/connect_button").disabled = false
 
+        var ap = global.get_node("Archipelago")
+        ap.disconnect_from_ap()
+
 
 func historySelected(index):
         var ap = global.get_node("Archipelago")