4 files changed, 83 insertions, 4 deletions

@@ -128,6 +128,7 @@ var _puzzle_skips = 0
 var _cached_slowness = 0
 var _cached_iceland = 0
 var _cached_atbash = 0
+var _geronimo_skip = false
 
 signal could_not_connect
 signal connect_status
@@ -329,6 +330,11 @@ func _on_data():
                                 else:
                                         _cached_atbash = 0
 
+                                if localdata.size() > 5:
+                                        _geronimo_skip = localdata[5]
+                                else:
+                                        _geronimo_skip = false
+
                         requestSync()
 
                         emit_signal("client_connected")
@@ -488,7 +494,8 @@ func saveLocaldata():
                 _puzzle_skips,
                 effects_node.slowness_remaining,
                 effects_node.iceland_remaining,
-                effects_node.atbash_remaining
+                effects_node.atbash_remaining,
+                _geronimo_skip
         ]
         file.store_var(data, true)
         file.close()
@@ -733,6 +740,15 @@ func usePuzzleSkip():
         saveLocaldata()
 
 
+func geronimo():
+        if !_geronimo_skip:
+                messages.showMessage("Geronimo! You found a puzzle skip.")
+
+                _puzzle_skips += 1
+                _geronimo_skip = true
+                saveLocaldata()
+
+
 func colorForItemType(flags):
         var int_flags = int(flags)
         if int_flags & 1:  # progression
@@ -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")
@@ -418,6 +423,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)
 
@@ -442,6 +449,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):
@@ -449,6 +459,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
@@ -569,6 +599,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")
@@ -652,8 +693,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):
@@ -1,5 +1,13 @@
 extends "res://scripts/player.gd"
 
+var april_fools = false
+
+
+func _ready():
+        var date = Time.get_date_dict_from_system()
+        if date["month"] == 4 && date["day"] == 1:
+                april_fools = true
+
 
 func _solving():
         ._solving()
@@ -22,3 +30,10 @@ func _unhandled_input(event):
                 if event.pressed and event.scancode == KEY_P:
                         var effects_node = get_tree().get_root().get_node("Spatial/AP_Effects")
                         effects_node.skip_puzzle()
+
+
+func rotate_y(amount):
+        if april_fools:
+                .rotate_y(-amount)
+        else:
+                .rotate_y(amount)
@@ -104,8 +104,13 @@ func connectionSuccessful():
 
         # Switch to LL1
         Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
-        global.map = "level1"
         global.save_file = apclient.getSaveFileName()
+
+        if Directory.new().file_exists("user://level1/%s.save" % global.save_file):
+                global.map = "level1"
+        else:
+                global.map = "level1_stable"
+
         var _discard = get_tree().change_scene("res://scenes/load_screen.tscn")