1 files changed, 12 insertions, 14 deletions

@@ -31,16 +31,16 @@ func _ready():
                 apclient_instance.add_child(apdata_instance)
 
                 # Let's also inject any scripts we need to inject now.
-                installScriptExtension("user://maps/Archipelago/doorControl.gd")
-                installScriptExtension("user://maps/Archipelago/load.gd")
-                installScriptExtension("user://maps/Archipelago/painting_eye.gd")
-                installScriptExtension("user://maps/Archipelago/painting_scenery.gd")
-                installScriptExtension("user://maps/Archipelago/panelLevelSwitch.gd")
-                installScriptExtension("user://maps/Archipelago/panelEnd.gd")
-                installScriptExtension("user://maps/Archipelago/panelInput.gd")
-                installScriptExtension("user://maps/Archipelago/pause_menu.gd")
-                installScriptExtension("user://maps/Archipelago/player.gd")
-                installScriptExtension("user://maps/Archipelago/worldTransporter.gd")
+                installScriptExtension(apclient_instance.SCRIPT_doorControl)
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/load.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_eye.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_scenery.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelLevelSwitch.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelEnd.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelInput.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pause_menu.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldTransporter.gd"))
 
         var apclient = global.get_node("Archipelago")
         apclient.connect("client_connected", self, "connectionSuccessful")
@@ -67,9 +67,7 @@ func _ready():
 
 
 # Adapted from https://gitlab.com/Delta-V-Modding/Mods/-/blob/main/game/ModLoader.gd
-func installScriptExtension(childScriptPath: String):
-        var childScript = ResourceLoader.load(childScriptPath)
-
+func installScriptExtension(childScript: Resource):
         # Force Godot to compile the script now.
         # We need to do this here to ensure that the inheritance chain is
         # properly set up, and multiple mods can chain-extend the same
@@ -82,7 +80,7 @@ func installScriptExtension(childScriptPath: String):
         var parentScript = childScript.get_base_script()
         var parentScriptPath = parentScript.resource_path
         global._print(
-                "ModLoader: Installing script extension: %s <- %s" % [parentScriptPath, childScriptPath]
+                "ModLoader: Installing script extension over %s" % parentScriptPath
         )
         childScript.take_over_path(parentScriptPath)