From 1a6f4c74af4e2c92239a7687dbb2852fbe1451b0 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Fri, 2 Jun 2023 20:19:48 -0400 Subject: Reveal snipes in panel shuffle --- Archipelago/load.gd | 22 ++++++++++++++++++++++ data/LL1.yaml | 9 +++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Archipelago/load.gd b/Archipelago/load.gd index a734459..436198f 100644 --- a/Archipelago/load.gd +++ b/Archipelago/load.gd @@ -127,6 +127,20 @@ func _load(): set_gridmap_tile(-20.5, 1.5, -79.5, "MeshInstance9") + # Remove opaque wall in front of FOURTH. + set_gridmap_tile(-71.5, 1.5, -64.5, "MeshInstance18") + + # Move The Lab's OPEN out of the wall. + panels_parent.get_node("Chemistry Room/Panel_open").translation.x = -87.001 + + # Move ZERO out of the wall and change the wall to be white. + panels_parent.get_node("Backside Room/Panel_zero_zero").translation.z = 16.499 + + set_small_gridmap_tile(-76.25, 1.75, 16.75, "SmallMeshInstance5") + set_small_gridmap_tile(-76.75, 1.75, 16.75, "SmallMeshInstance5") + set_small_gridmap_tile(-76.25, 1.25, 16.75, "SmallMeshInstance5") + set_small_gridmap_tile(-76.75, 1.25, 16.75, "SmallMeshInstance5") + if apclient._panel_shuffle == apclient.kREARRANGE_PANELS: # Do the actual shuffling. var panel_pools = {} @@ -420,6 +434,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 set_small_gridmap_tile(x, y, z, tile): + var gridmap = self.get_node("GridMapSmall") + 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, mesh_library.find_item_by_name(tile)) + + func archipelago_disconnected(reason): var messages_node = self.get_node("Messages") messages_node.show_message(reason) diff --git a/data/LL1.yaml b/data/LL1.yaml index b8c1ef4..271beef 100644 --- a/data/LL1.yaml +++ b/data/LL1.yaml @@ -1451,14 +1451,12 @@ - id: Backside Room/Panel_third_third color: white tag: midwhite -# This is a mandatory wall-snipe, so we will not shuffle it. - id: Backside Room/Panel_fourth_fourth color: white - tag: forbid -# This is a mandatory wall-snipe, so we will not shuffle it. + tag: midwhite - id: Backside Room/Panel_zero_zero color: white - tag: forbid + tag: midwhite - id: Backside Room/Panel_one_one color: white tag: midwhite @@ -2301,10 +2299,9 @@ - id: Ceiling Room/Panel_answer_4 color: yellow tag: topyellow -# This is a mandatory wall-snipe, so we will not shuffle it. - id: Chemistry Room/Panel_open color: white - tag: forbid + tag: midwhite - id: Chemistry Room/Panel_close color: black tag: botblack -- cgit 1.4.1