1 files changed, 26 insertions, 17 deletions

@@ -120,6 +120,7 @@ func _load():
         new_master_cdp.translation = old_master_cdp.translation
         new_master_cdp.rotation = old_master_cdp.rotation
         get_node("CountdownPanels").add_child(new_master_cdp)
+        old_master_cdp.total = 5000
         old_master_cdp.queue_free()
 
         # Configure AN OTHER WAY.
@@ -513,23 +514,6 @@ func _load():
                 fearless_door.name = "Door_hider_new1"
                 fearless_door.translation.y = 5
                 get_node("Doors/Naps Room Doors").add_child(fearless_door)
-
-        # Set up notifiers for each achievement panel, for the tracker.
-        var notifier_script = apclient.SCRIPT_notifier
-        for panel in gamedata.panels:
-                if "achievement" in panel:
-                        var panel_node = panels_parent.get_node(panel["id"])
-                        var script_instance = notifier_script.new()
-                        script_instance.name = "Achievement_Notifier"
-                        script_instance.key = "Achievement|%s" % panel["achievement"]
-                        panel_node.add_child(script_instance)
-
-                if "hunt" in panel and panel["hunt"] and not (gamedata.classification_by_location_id[panel["loc"]] & apclient._location_classification_bit):
-                        var panel_node = panels_parent.get_node(panel["id"])
-                        var script_instance = notifier_script.new()
-                        script_instance.name = "Hunt_Notifier"
-                        script_instance.key = "Hunt|%d" % panel["loc"]
-                        panel_node.add_child(script_instance)
         
         # Make stack/double puzzles into proxies, unless panelsanity is on.
         if apclient._location_classification_bit != apclient.kCLASSIFICATION_LOCAL_INSANITY:
@@ -551,6 +535,20 @@ func _load():
                                 proxynode.exact_proxy = true
                                 proxynode.request_ready()
                                 oldparent.add_child(proxynode)
+        
+        # If the world was generated on 0.5.1, apply the hotfix for the number hunt doors.
+        if apclient._panel_door_shuffle && apclient.wasGeneratedOnVersion(0, 5, 1):
+                var number_hunt_parent = get_node("Doors/Count Up Room Area Doors")
+                var extradata_051_fix = apclient.get_node("Extradata").panels_mode_051_door_fixes
+                for template_door_path in extradata_051_fix:
+                        var template_door = number_hunt_parent.get_node(template_door_path)
+                        var impacted_doors = extradata_051_fix[template_door_path]
+                        for impacted_door_path in impacted_doors:
+                                var impacted_door = number_hunt_parent.get_node(impacted_door_path)
+                                var copied_door = impacted_door.duplicate()
+                                copied_door.panels = template_door.panels
+                                number_hunt_parent.add_child(copied_door)
+                                impacted_door.queue_free()
 
         # Attach a script to every panel so that we can do things like conditionally
         # disable them.
@@ -564,9 +562,14 @@ func _load():
                 var script_instance = panel_script.new()
                 script_instance.name = "AP_Panel"
                 script_instance.data = panel
+                script_instance.solve_index = panel["solve_index"]
+                if apclient._panel_door_shuffle and gamedata.mentioned_panels.has(panel["id"]):
+                        script_instance.locked = true
                 panel_node.add_child(script_instance)
                 apclient.connect("evaluate_solvability", script_instance, "evaluate_solvability")
 
+                apclient._panelsBySolveIndex[panel["solve_index"]] = panel["id"]
+
         # Hook up the goal panel.
         if apclient._victory_condition == apclient.kTHE_MASTER:
                 var the_master = self.get_node("Panels/Countdown Panels/Panel_master_master")
@@ -676,6 +679,12 @@ func _load():
                 multiplayer_node.ghost_mode = true
                 add_child(multiplayer_node)
         
+        # Create the autotracker node.
+        var autotracker_script = apclient.SCRIPT_tracker
+        var autotracker = autotracker_script.new()
+        autotracker.set_name("AP_Tracker")
+        self.add_child(autotracker)
+        
         # Hook up Geronimo handler.
         $player.connect("player_jumped", apclient, "geronimo")