Merge branch 'main' into sunwarps

1 files changed, 57 insertions, 13 deletions

@@ -25,6 +25,11 @@ func _load():
         var apclient = global.get_node("Archipelago")
         var panels_parent = self.get_node("Panels")
 
+        var date = Time.get_date_dict_from_system()
+        var april_fools = false
+        if date["month"] == 4 && date["day"] == 1:
+                april_fools = true
+
         # Add a wall-blocked raycast to the player.
         var wallcast = RayCast.new()
         wallcast.name = "wallcast"
@@ -64,7 +69,7 @@ func _load():
         wanderer_entrance.rotation = Vector3(0, -PI / 2, 0)
         wanderer_entrance.scale = Vector3(1, 1.5, 1)
         wanderer_entrance.set_script(door_script)
-        wanderer_entrance.panels.append("../../../Panels/Tower Room/Panel_wanderlust_1234567890")
+        wanderer_entrance.panels = ["../../../Panels/Tower Room/Panel_wanderlust_1234567890"]
         get_node("Doors/Tower Room Area Doors").add_child(wanderer_entrance)
 
         var wanderer_achieve = get_node("Panels/Tower Room/Panel_1234567890_wanderlust")
@@ -91,18 +96,19 @@ func _load():
 
         wanderer_achieve.translation = Vector3(-51, -33, 35)  # way under the map
 
-        # Turn THE COLORFUL into a cdp.
-        var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful")
         var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn")
-        var colorful_cdp = cdp_auto_scene.instance()
-        colorful_cdp.name = "CountdownPanel_colorful"
-        colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful"
-        colorful_cdp.panels = "../../Panels/Doorways Room"
-        colorful_cdp.translation = real_colorful.translation
-        colorful_cdp.rotation = real_colorful.rotation
-        get_node("CountdownPanels").add_child(colorful_cdp)
-        real_colorful.translation = Vector3(-51, -35, 35)  # way under the map
-        get_node("Doors/Doorway Room Doors/Door_gray2").queue_free()
+        if !apclient.wasGeneratedBeforeVersion(0, 4, 5):
+                # Turn THE COLORFUL into a cdp.
+                var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful")
+                var colorful_cdp = cdp_auto_scene.instance()
+                colorful_cdp.name = "CountdownPanel_colorful"
+                colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful"
+                colorful_cdp.panels = "../../Panels/Doorways Room"
+                colorful_cdp.translation = real_colorful.translation
+                colorful_cdp.rotation = real_colorful.rotation
+                get_node("CountdownPanels").add_child(colorful_cdp)
+                real_colorful.translation = Vector3(-51, -35, 35)  # way under the map
+                get_node("Doors/Doorway Room Doors/Door_gray2").queue_free()
 
         # Set up The Master to be variable.
         var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16")
@@ -420,6 +426,8 @@ func _load():
                         if not classes.has(painting):
                                 var i = rng.randi_range(0, all_paintings.size() - 1)
                                 var chosen = all_paintings[i]
+                                if april_fools:
+                                        chosen = "bg_notnerb"
                                 classes[painting] = chosen
                                 all_paintings.remove(i)
 
@@ -444,6 +452,9 @@ func _load():
                         var j = rng.randi_range(0, all_paintings.size() - 1)
                         remaining.append(all_paintings[j])
                         all_paintings.remove(j)
+                
+                if april_fools:
+                        remaining = ["bg_notnerb"]
 
                 for painting in gamedata.paintings.keys():
                         if randomized.has(painting):
@@ -451,6 +462,26 @@ func _load():
 
                         var chosen_painting = remaining[rng.randi_range(0, remaining.size() - 1)]
                         instantiate_painting(painting, chosen_painting)
+                
+                # Replace the roof of The Artistic.
+                var artistic_paintings = [
+                        ["smile_painting_9", -49.5, 44.5],
+                        ["cherry_painting3", -38.5, 44.5],
+                        ["boxes_painting2", -38.5, 55.5],
+                        ["panda_painting_3", -49.5, 55.5]
+                ]
+                for painting in artistic_paintings:
+                        var painting_node = get_node("AP_Paintings").get_node(painting[0]).get_node("GridMap")
+                        var small_mesh_library = painting_node.mesh_library
+
+                        for x in range(0,10):
+                                for y in range(0,10):
+                                        var cellitem = painting_node.get_cell_item(-5 + x, 1+y, 0)
+                                        var meshitem = small_mesh_library.get_item_name(cellitem)
+                                        if meshitem.begins_with("Tiny"):
+                                                meshitem = meshitem.substr(4)
+                                        set_gridmap_tile(painting[1]+9-y, 8.5, painting[2]+x, meshitem)
+
 
         # We need to make some changes to the Art Gallery. The player should always
         # have access to the backroom, but they shouldn't have access to ORDER until
@@ -644,6 +675,17 @@ func _load():
                 var multiplayer_node = apclient.SCRIPT_multiplayer.new()
                 multiplayer_node.ghost_mode = true
                 add_child(multiplayer_node)
+        
+        # Hook up Geronimo handler.
+        $player.connect("player_jumped", apclient, "geronimo")
+
+        if april_fools:
+                # Change the appearance of every painting.
+                var notnerb_painting = load("res://nodes/paintings/bg_notnerb.tscn").instance()
+                for child in $Decorations/Paintings.get_children():
+                        if child.get_node_or_null("GridMap") != null:
+                                child.get_node("GridMap").queue_free()
+                                child.add_child(notnerb_painting.get_node("GridMap").duplicate(true))
 
         # Hook up the scene to be able to handle connection failures.
         apclient.connect("could_not_connect", self, "archipelago_disconnected")
@@ -727,8 +769,10 @@ func set_gridmap_tile(x, y, z, tile):
         var gridmap = self.get_node("GridMap")
         var mesh_library = gridmap.mesh_library
         var mapvec = gridmap.world_to_map(gridmap.to_local(Vector3(x, y, z)))
+        var cellitem = mesh_library.find_item_by_name(tile)
 
-        gridmap.set_cell_item(mapvec.x, mapvec.y, mapvec.z, mesh_library.find_item_by_name(tile))
+        if cellitem != GridMap.INVALID_CELL_ITEM:
+                gridmap.set_cell_item(mapvec.x, mapvec.y, mapvec.z, cellitem)
 
 
 func clear_gridmap_tile(x, y, z):