about summary refs log tree commit diff stats
path: root/apworld/client/main.gd
diff options
context:
space:
mode:
Diffstat (limited to 'apworld/client/main.gd')
-rw-r--r--apworld/client/main.gd13
1 files changed, 11 insertions, 2 deletions
diff --git a/apworld/client/main.gd b/apworld/client/main.gd index 3a62f81..a543678 100644 --- a/apworld/client/main.gd +++ b/apworld/client/main.gd
@@ -36,6 +36,7 @@ func _ready():
36 global.add_child(ap_instance) 36 global.add_child(ap_instance)
37 37
38 # Let's also inject any scripts we need to inject now. 38 # Let's also inject any scripts we need to inject now.
39 installScriptExtension(runtime.load_script("allowNumbers.gd"))
39 installScriptExtension(runtime.load_script("animationListener.gd")) 40 installScriptExtension(runtime.load_script("animationListener.gd"))
40 installScriptExtension(runtime.load_script("collectable.gd")) 41 installScriptExtension(runtime.load_script("collectable.gd"))
41 installScriptExtension(runtime.load_script("door.gd")) 42 installScriptExtension(runtime.load_script("door.gd"))
@@ -83,6 +84,13 @@ func _ready():
83 compass_overlay_instance.SCRIPT_compass = runtime.load_script("compass.gd") 84 compass_overlay_instance.SCRIPT_compass = runtime.load_script("compass.gd")
84 global.add_child(compass_overlay_instance) 85 global.add_child(compass_overlay_instance)
85 86
87 unlocks.data["advanced_mastery"] = ""
88 unlocks.data["charismatic_mastery"] = ""
89 unlocks.data["crystalline_mastery"] = ""
90 unlocks.data["fuzzy_mastery"] = ""
91 unlocks.data["icarus_mastery"] = ""
92 unlocks.data["stellar_mastery"] = ""
93
86 var ap = global.get_node("Archipelago") 94 var ap = global.get_node("Archipelago")
87 var gamedata = global.get_node("Gamedata") 95 var gamedata = global.get_node("Gamedata")
88 ap.ap_connected.connect(connectionSuccessful) 96 ap.ap_connected.connect(connectionSuccessful)
@@ -224,11 +232,11 @@ func startGame():
224 232
225 unlocks.resetCollectables() 233 unlocks.resetCollectables()
226 unlocks.resetData() 234 unlocks.resetData()
235 unlocks.loadCollectables()
236 unlocks.loadData()
227 237
228 ap.setup_keys() 238 ap.setup_keys()
229 239
230 unlocks.loadCollectables()
231 unlocks.loadData()
232 unlocks.unlockKey("capslock", 1) 240 unlocks.unlockKey("capslock", 1)
233 241
234 if ap.shuffle_worldports: 242 if ap.shuffle_worldports:
@@ -237,6 +245,7 @@ func startGame():
237 settings.worldport_fades = "never" 245 settings.worldport_fades = "never"
238 246
239 clearResourceCache("res://objects/meshes/gridDoor.tscn") 247 clearResourceCache("res://objects/meshes/gridDoor.tscn")
248 clearResourceCache("res://objects/nodes/allowNumbers.tscn")
240 clearResourceCache("res://objects/nodes/collectable.tscn") 249 clearResourceCache("res://objects/nodes/collectable.tscn")
241 clearResourceCache("res://objects/nodes/door.tscn") 250 clearResourceCache("res://objects/nodes/door.tscn")
242 clearResourceCache("res://objects/nodes/keyHolder.tscn") 251 clearResourceCache("res://objects/nodes/keyHolder.tscn")