diff options
Diffstat (limited to 'apworld/client/main.gd')
| -rw-r--r-- | apworld/client/main.gd | 16 |
1 files changed, 14 insertions, 2 deletions
| diff --git a/apworld/client/main.gd b/apworld/client/main.gd index e1f9610..c90d6e7 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")) |
| @@ -43,12 +44,14 @@ func _ready(): | |||
| 43 | installScriptExtension(runtime.load_script("keyHolderChecker.gd")) | 44 | installScriptExtension(runtime.load_script("keyHolderChecker.gd")) |
| 44 | installScriptExtension(runtime.load_script("keyHolderResetterListener.gd")) | 45 | installScriptExtension(runtime.load_script("keyHolderResetterListener.gd")) |
| 45 | installScriptExtension(runtime.load_script("painting.gd")) | 46 | installScriptExtension(runtime.load_script("painting.gd")) |
| 47 | installScriptExtension(runtime.load_script("paintingAuto.gd")) | ||
| 46 | installScriptExtension(runtime.load_script("panel.gd")) | 48 | installScriptExtension(runtime.load_script("panel.gd")) |
| 47 | installScriptExtension(runtime.load_script("pauseMenu.gd")) | 49 | installScriptExtension(runtime.load_script("pauseMenu.gd")) |
| 48 | installScriptExtension(runtime.load_script("player.gd")) | 50 | installScriptExtension(runtime.load_script("player.gd")) |
| 49 | installScriptExtension(runtime.load_script("saver.gd")) | 51 | installScriptExtension(runtime.load_script("saver.gd")) |
| 50 | installScriptExtension(runtime.load_script("teleport.gd")) | 52 | installScriptExtension(runtime.load_script("teleport.gd")) |
| 51 | installScriptExtension(runtime.load_script("teleportListener.gd")) | 53 | installScriptExtension(runtime.load_script("teleportListener.gd")) |
| 54 | installScriptExtension(runtime.load_script("unlockReaderListener.gd")) | ||
| 52 | installScriptExtension(runtime.load_script("visibilityListener.gd")) | 55 | installScriptExtension(runtime.load_script("visibilityListener.gd")) |
| 53 | installScriptExtension(runtime.load_script("worldport.gd")) | 56 | installScriptExtension(runtime.load_script("worldport.gd")) |
| 54 | installScriptExtension(runtime.load_script("worldportListener.gd")) | 57 | installScriptExtension(runtime.load_script("worldportListener.gd")) |
| @@ -82,6 +85,13 @@ func _ready(): | |||
| 82 | compass_overlay_instance.SCRIPT_compass = runtime.load_script("compass.gd") | 85 | compass_overlay_instance.SCRIPT_compass = runtime.load_script("compass.gd") |
| 83 | global.add_child(compass_overlay_instance) | 86 | global.add_child(compass_overlay_instance) |
| 84 | 87 | ||
| 88 | unlocks.data["advanced_mastery"] = "" | ||
| 89 | unlocks.data["charismatic_mastery"] = "" | ||
| 90 | unlocks.data["crystalline_mastery"] = "" | ||
| 91 | unlocks.data["fuzzy_mastery"] = "" | ||
| 92 | unlocks.data["icarus_mastery"] = "" | ||
| 93 | unlocks.data["stellar_mastery"] = "" | ||
| 94 | |||
| 85 | var ap = global.get_node("Archipelago") | 95 | var ap = global.get_node("Archipelago") |
| 86 | var gamedata = global.get_node("Gamedata") | 96 | var gamedata = global.get_node("Gamedata") |
| 87 | ap.ap_connected.connect(connectionSuccessful) | 97 | ap.ap_connected.connect(connectionSuccessful) |
| @@ -223,11 +233,11 @@ func startGame(): | |||
| 223 | 233 | ||
| 224 | unlocks.resetCollectables() | 234 | unlocks.resetCollectables() |
| 225 | unlocks.resetData() | 235 | unlocks.resetData() |
| 236 | unlocks.loadCollectables() | ||
| 237 | unlocks.loadData() | ||
| 226 | 238 | ||
| 227 | ap.setup_keys() | 239 | ap.setup_keys() |
| 228 | 240 | ||
| 229 | unlocks.loadCollectables() | ||
| 230 | unlocks.loadData() | ||
| 231 | unlocks.unlockKey("capslock", 1) | 241 | unlocks.unlockKey("capslock", 1) |
| 232 | 242 | ||
| 233 | if ap.shuffle_worldports: | 243 | if ap.shuffle_worldports: |
| @@ -236,6 +246,7 @@ func startGame(): | |||
| 236 | settings.worldport_fades = "never" | 246 | settings.worldport_fades = "never" |
| 237 | 247 | ||
| 238 | clearResourceCache("res://objects/meshes/gridDoor.tscn") | 248 | clearResourceCache("res://objects/meshes/gridDoor.tscn") |
| 249 | clearResourceCache("res://objects/nodes/allowNumbers.tscn") | ||
| 239 | clearResourceCache("res://objects/nodes/collectable.tscn") | 250 | clearResourceCache("res://objects/nodes/collectable.tscn") |
| 240 | clearResourceCache("res://objects/nodes/door.tscn") | 251 | clearResourceCache("res://objects/nodes/door.tscn") |
| 241 | clearResourceCache("res://objects/nodes/keyHolder.tscn") | 252 | clearResourceCache("res://objects/nodes/keyHolder.tscn") |
| @@ -243,6 +254,7 @@ func startGame(): | |||
| 243 | clearResourceCache("res://objects/nodes/listeners/keyHolderChecker.tscn") | 254 | clearResourceCache("res://objects/nodes/listeners/keyHolderChecker.tscn") |
| 244 | clearResourceCache("res://objects/nodes/listeners/keyHolderResetterListener.tscn") | 255 | clearResourceCache("res://objects/nodes/listeners/keyHolderResetterListener.tscn") |
| 245 | clearResourceCache("res://objects/nodes/listeners/teleportListener.tscn") | 256 | clearResourceCache("res://objects/nodes/listeners/teleportListener.tscn") |
| 257 | clearResourceCache("res://objects/nodes/listeners/unlockReaderListener.tscn") | ||
| 246 | clearResourceCache("res://objects/nodes/listeners/visibilityListener.tscn") | 258 | clearResourceCache("res://objects/nodes/listeners/visibilityListener.tscn") |
| 247 | clearResourceCache("res://objects/nodes/listeners/worldportListener.tscn") | 259 | clearResourceCache("res://objects/nodes/listeners/worldportListener.tscn") |
| 248 | clearResourceCache("res://objects/nodes/panel.tscn") | 260 | clearResourceCache("res://objects/nodes/panel.tscn") |
