Merge branch 'future' into sunwarps

1 files changed, 36 insertions, 5 deletions

@@ -14,7 +14,8 @@ const EXCLUDED_PAINTINGS = [
         "scenery_3.tscn",
         "scenery_4.tscn",
         "scenery_5.tscn",
-        "pilgrim.tscn"
+        "pilgrim.tscn",
+        "so_pearl_bk.tscn"
 ]
 
 
@@ -24,6 +25,15 @@ func _load():
         var apclient = global.get_node("Archipelago")
         var panels_parent = self.get_node("Panels")
 
+        # Add a wall-blocked raycast to the player.
+        var wallcast = RayCast.new()
+        wallcast.name = "wallcast"
+        wallcast.cast_to = Vector3(0, 0, -15)
+        wallcast.set_collision_mask_bit(1, true)
+        wallcast.set_collision_mask_bit(3, true)
+        wallcast.collide_with_areas = true
+        $player/pivot/camera.add_child(wallcast)
+
         # Override the YOU panel with the AP slot name.
         if self.get_node_or_null("Panels/Color Arrow Room/Panel_you") != null:
                 self.get_node("Panels/Color Arrow Room/Panel_you").answer = apclient.ap_user
@@ -198,6 +208,10 @@ func _load():
         set_gridmap_tile(-88.5, 4.5, -41.5, "MeshInstance8")
         set_gridmap_tile(-89.5, 4.5, -41.5, "MeshInstance4")
 
+        # Remove black block from THE RED.
+        clear_gridmap_tile(68.5, 6.5, 76.5)
+        get_node("Decorations/PanelSign/sign19").queue_free()
+
         if apclient.confusify_world:
                 # Remove welcome back / color hallway / sunwarp indicators.
                 get_node("Decorations/Signs/Welcome Back Signs").queue_free()
@@ -245,12 +259,12 @@ func _load():
 
         if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE:
                 # Make The Wondrous's FIRE solely midred.
-                set_gridmap_tile(-76.5, 1.5, -73.5, "MeshInstance18")
+                clear_gridmap_tile(-76.5, 1.5, -73.5)
 
                 # Reduce double/triple length puzzles in Knight/Night.
-                set_gridmap_tile(24.5, 1.5, 11.5, "MeshInstance18")
-                set_gridmap_tile(25.5, 1.5, 11.5, "MeshInstance18")
-                set_gridmap_tile(47.5, 1.5, 11.5, "MeshInstance18")
+                clear_gridmap_tile(24.5, 1.5, 11.5)
+                clear_gridmap_tile(25.5, 1.5, 11.5)
+                clear_gridmap_tile(47.5, 1.5, 11.5)
 
         if apclient._panel_shuffle == apclient.kREARRANGE_PANELS:
                 # Do the actual shuffling.
@@ -638,6 +652,15 @@ func _load():
         global._print("Hooked Load End")
         ._load()
 
+        # Activate any cached traps.
+        if apclient._cached_slowness > 0:
+                effects.trigger_slowness_trap(apclient._cached_slowness)
+        if apclient._cached_iceland > 0:
+                effects.trigger_iceland_trap(apclient._cached_iceland)
+        if apclient._cached_atbash > 0:
+                for _i in range(0, apclient._cached_atbash):
+                        effects.trigger_atbash_trap()
+
         # Process any items received while the map was loading, and send the checks
         # from the save load.
         apclient.mapFinishedLoading()
@@ -708,6 +731,14 @@ func set_gridmap_tile(x, y, z, tile):
         gridmap.set_cell_item(mapvec.x, mapvec.y, mapvec.z, mesh_library.find_item_by_name(tile))
 
 
+func clear_gridmap_tile(x, y, z):
+        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)))
+
+        gridmap.set_cell_item(mapvec.x, mapvec.y, mapvec.z, GridMap.INVALID_CELL_ITEM)
+
+
 func set_small_gridmap_tile(x, y, z, tile):
         var gridmap = self.get_node("GridMapSmall")
         var mesh_library = gridmap.mesh_library