3 files changed, 58 insertions, 1 deletions

@@ -67,6 +67,7 @@ const kEndingNameByVictoryValue = {
 }
 
 var apworld_version = [0, 0, 0]
+var custom_mint_ending = ""
 var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_only = false
 var daedalus_roof_access = false
@@ -76,6 +77,7 @@ var endings_requirement = 0
 var fast_travel_access = 0
 var keyholder_sanity = false
 var masteries_requirement = 0
+var music_mapping = {}
 var port_pairings = {}
 var rte_mapping = []
 var shuffle_control_center_colors = false
@@ -84,6 +86,7 @@ var shuffle_gallery_paintings = false
 var shuffle_letters = kSHUFFLE_LETTERS_VANILLA
 var shuffle_symbols = false
 var shuffle_worldports = false
+var slot_rng = null
 var strict_cyan_ending = false
 var strict_purple_ending = false
 var victory_condition = -1
@@ -476,6 +479,7 @@ func _client_connected(slot_data):
                         _last_new_item = localdata[0]
 
         # Read slot data.
+        custom_mint_ending = slot_data.get("custom_mint_ending", "")
         cyan_door_behavior = int(slot_data.get("cyan_door_behavior", 0))
         daedalus_only = bool(slot_data.get("daedalus_only", false))
         daedalus_roof_access = bool(slot_data.get("daedalus_roof_access", false))
@@ -514,6 +518,15 @@ func _client_connected(slot_data):
         if slot_data.has("rte"):
                 rte_mapping = slot_data.get("rte")
 
+        slot_rng = RandomNumberGenerator.new()
+        slot_rng.seed = int(slot_data.get("seed", 0))
+
+        music_mapping.clear()
+        if bool(slot_data.get("shuffle_music", false)):
+                for map_name in global.reserved_scenes:
+                        var track_index = slot_rng.randi_range(0, musicPlayer.all_tracks.size() - 1)
+                        music_mapping[map_name] = musicPlayer.all_tracks.keys()[track_index]
+
         # Set up item locks.
         _item_locks = {}
 
@@ -79,7 +79,7 @@ func on_map_load(root):
         var mastery_count = 0
         for key in unlocks.data:
                 if unlocks.data[key] == "unlocked":
-                        if key.ends_with("_ending"):
+                        if key.ends_with("_ending") and key != "free_ending":
                                 ending_count += 1
                         elif key.ends_with("_mastery"):
                                 mastery_count += 1
@@ -96,6 +96,39 @@ func on_map_load(root):
         sign2.text = "Masteries: %d/%d" % [mastery_count, ap.masteries_requirement]
         root.get_node("/root/scene").add_child.call_deferred(sign2)
 
+        # Handle custom Mint Ending.
+        if ap.custom_mint_ending != "":
+                var panel_prefab = preload("res://objects/nodes/panel.tscn")
+                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+
+                var mint_ending = root.get_node("/root/scene/Components/Endings/mint_ending")
+
+                var mint_panel = panel_prefab.instantiate()
+                mint_panel.name = "mint_panel"
+                mint_panel.clue = ap.custom_mint_ending
+                mint_panel.symbol = ""
+                mint_panel.answer = ap.custom_mint_ending
+                mint_panel.position = Vector3(-63, 3, -29)
+                mint_panel.rotation_degrees = Vector3(-45, 90, 0)
+                root.get_node("/root/scene").add_child.call_deferred(mint_panel)
+
+                var mint_tpl = tpl_prefab.instantiate()
+                mint_tpl.name = "mint_tpl"
+                mint_tpl.teleport_point = mint_ending.position
+                mint_tpl.teleport_rotate = mint_ending.rotation_degrees
+                mint_tpl.target_path = mint_ending
+                mint_tpl.senders.append(NodePath("/root/scene/mint_panel"))
+                root.get_node("/root/scene").add_child.call_deferred(mint_tpl)
+
+                var mint_tpl2 = tpl_prefab.instantiate()
+                mint_tpl2.name = "mint_tpl2"
+                mint_tpl2.teleport_point = Vector3(0, -1000, 0)
+                mint_tpl2.target_path = mint_panel
+                mint_tpl2.senders.append(NodePath("/root/scene/mint_panel"))
+                root.get_node("/root/scene").add_child.call_deferred(mint_tpl2)
+
+                mint_ending.position.y = -1000
+
 
 func _set_up_mastery_listener(root, name):
         var prefab = preload("res://objects/nodes/listeners/unlockReaderListener.tscn")
@@ -196,6 +196,17 @@ func _ready():
         minimap.visible = ap.show_minimap
         get_parent().add_child.call_deferred(minimap)
 
+        if ap.music_mapping.has(global.map):
+                var song_setter = get_node_or_null("/root/scene/songSetter")
+                if song_setter:
+                        song_setter.song_name = ap.music_mapping[global.map]
+                else:
+                        var song_setter_prefab = preload("res://objects/nodes/songSetter.tscn")
+                        song_setter = song_setter_prefab.instantiate()
+                        song_setter.name = "songSetter"
+                        song_setter.song_name = ap.music_mapping[global.map]
+                        get_parent().add_child.call_deferred(song_setter)
+
         super._ready()
 
         await get_tree().process_frame