From d2bc5b2811171685e8bdc895122987b53defcf0a Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sat, 30 Aug 2025 12:00:03 -0400 Subject: Changed how door location names are formatted STANDARD type doors with at most four panels in the same map area and no other trigger objects will have their location names generated from the names of the panels used to open the door, similar to Lingo 1. Other door types will use the door's name. In either case, the name can be overridden using the new location_name field. Rooms can also set a panel_display_name field, which will be used in location names for doors, and is used to group panels into areas. Panels themselves can set display names, which differentiates their locations from other panels in the same area. Many maps were updated for this, but note that the_symbolic and the_unyielding have validator failures because of duplicate panel names. This won't matter until panelsanity is implemented. --- apworld/player_logic.py | 2 +- apworld/static_logic.py | 75 +++- data/ids.yaml | 5 + data/maps/control_center/doors.txtpb | 2 + data/maps/daedalus/doors.txtpb | 65 ++- data/maps/daedalus/rooms/After Bee Room.txtpb | 2 +- data/maps/daedalus/rooms/Amber North 2.txtpb | 2 +- data/maps/daedalus/rooms/Bee Room Obverse.txtpb | 2 +- data/maps/daedalus/rooms/Bee Room Reverse.txtpb | 2 +- .../daedalus/rooms/Beehalls Intersection.txtpb | 2 +- data/maps/daedalus/rooms/Black Hex.txtpb | 2 +- .../daedalus/rooms/Blue Hallway Cut Side.txtpb | 2 +- .../daedalus/rooms/Blue Hallway Tall Side.txtpb | 2 +- data/maps/daedalus/rooms/Blue Hallway.txtpb | 2 +- data/maps/daedalus/rooms/Blue Room.txtpb | 2 +- data/maps/daedalus/rooms/Blue Smiley Annex.txtpb | 2 +- data/maps/daedalus/rooms/Blue Smiley.txtpb | 2 +- data/maps/daedalus/rooms/Book Room.txtpb | 2 +- data/maps/daedalus/rooms/Bow Side.txtpb | 3 +- data/maps/daedalus/rooms/Brown Smiley.txtpb | 2 +- data/maps/daedalus/rooms/C Keyholder.txtpb | 2 +- data/maps/daedalus/rooms/Castle.txtpb | 2 +- data/maps/daedalus/rooms/Coin Tower.txtpb | 2 +- data/maps/daedalus/rooms/Composite Room NE.txtpb | 2 +- data/maps/daedalus/rooms/Composite Room NW.txtpb | 2 +- data/maps/daedalus/rooms/Composite Room S.txtpb | 2 +- data/maps/daedalus/rooms/Computer Room Seal.txtpb | 2 +- data/maps/daedalus/rooms/Computer Room.txtpb | 2 +- data/maps/daedalus/rooms/Cyan Room.txtpb | 2 +- data/maps/daedalus/rooms/D Keyholder.txtpb | 2 +- data/maps/daedalus/rooms/D2 Room.txtpb | 2 +- data/maps/daedalus/rooms/Dark Light Exit.txtpb | 2 +- data/maps/daedalus/rooms/Dark Light Room.txtpb | 2 +- data/maps/daedalus/rooms/Ending.txtpb | 2 +- data/maps/daedalus/rooms/Entry Shortcut.txtpb | 3 +- data/maps/daedalus/rooms/Eye Painting.txtpb | 2 +- data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb | 2 +- data/maps/daedalus/rooms/Eye Temple 1F.txtpb | 2 +- data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb | 2 +- data/maps/daedalus/rooms/Eye Temple 2F.txtpb | 2 +- data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb | 2 +- data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb | 2 +- data/maps/daedalus/rooms/F Keyholder.txtpb | 2 +- data/maps/daedalus/rooms/F2 Prize.txtpb | 2 +- data/maps/daedalus/rooms/F2 Room.txtpb | 2 +- .../daedalus/rooms/Flip Painting Destination.txtpb | 2 +- .../rooms/Flip Painting Hidden Panel.txtpb | 3 +- data/maps/daedalus/rooms/Flip Painting.txtpb | 2 +- data/maps/daedalus/rooms/Gallery Entrance.txtpb | 2 +- data/maps/daedalus/rooms/Globe Room.txtpb | 2 +- data/maps/daedalus/rooms/Godot Room.txtpb | 2 +- data/maps/daedalus/rooms/Gray Color Backside.txtpb | 2 +- data/maps/daedalus/rooms/Gray Color Door.txtpb | 2 +- data/maps/daedalus/rooms/Green Color Door.txtpb | 2 +- data/maps/daedalus/rooms/Green Room.txtpb | 2 +- data/maps/daedalus/rooms/Green Smiley.txtpb | 2 +- data/maps/daedalus/rooms/Hedges Tower.txtpb | 2 +- data/maps/daedalus/rooms/Hedges.txtpb | 2 +- data/maps/daedalus/rooms/Hotel.txtpb | 2 +- data/maps/daedalus/rooms/House Entrance.txtpb | 2 +- data/maps/daedalus/rooms/House.txtpb | 2 +- data/maps/daedalus/rooms/I2 Room.txtpb | 2 +- data/maps/daedalus/rooms/Intense Room.txtpb | 2 +- data/maps/daedalus/rooms/J2 Room.txtpb | 2 +- data/maps/daedalus/rooms/J2 Vestibule.txtpb | 3 +- data/maps/daedalus/rooms/Magic Room.txtpb | 2 +- data/maps/daedalus/rooms/Maze Paintings Area.txtpb | 2 +- data/maps/daedalus/rooms/Maze.txtpb | 2 +- data/maps/daedalus/rooms/Moat.txtpb | 2 +- data/maps/daedalus/rooms/North Castle Area.txtpb | 2 +- .../daedalus/rooms/Number Paintings Area.txtpb | 2 +- data/maps/daedalus/rooms/Nursery.txtpb | 3 +- data/maps/daedalus/rooms/O2 Prize.txtpb | 2 +- data/maps/daedalus/rooms/O2 Room.txtpb | 2 +- data/maps/daedalus/rooms/Orange Room.txtpb | 2 +- data/maps/daedalus/rooms/Outside Book Room.txtpb | 2 +- data/maps/daedalus/rooms/Outside Eye Temple.txtpb | 2 +- data/maps/daedalus/rooms/Outside Hedges.txtpb | 2 +- data/maps/daedalus/rooms/Outside Hotel.txtpb | 3 +- data/maps/daedalus/rooms/Outside House.txtpb | 2 +- data/maps/daedalus/rooms/Outside Magic Room.txtpb | 2 +- data/maps/daedalus/rooms/Outside Orange Room.txtpb | 2 +- data/maps/daedalus/rooms/Outside Pyramid.txtpb | 2 +- data/maps/daedalus/rooms/Outside Red Room.txtpb | 2 +- data/maps/daedalus/rooms/Outside Salt Room.txtpb | 3 +- data/maps/daedalus/rooms/Outside Snake Room.txtpb | 2 +- data/maps/daedalus/rooms/Pains Room.txtpb | 2 +- data/maps/daedalus/rooms/Pairs Room.txtpb | 2 +- data/maps/daedalus/rooms/Pepper Room.txtpb | 3 +- data/maps/daedalus/rooms/Plum Room.txtpb | 2 +- .../rooms/Post Orange Smiley Three Way.txtpb | 2 +- data/maps/daedalus/rooms/Pumpkin Entrance.txtpb | 2 +- data/maps/daedalus/rooms/Pumpkin Room.txtpb | 2 +- .../daedalus/rooms/Purple Hallway From Great.txtpb | 2 +- data/maps/daedalus/rooms/Purple NW Vestibule.txtpb | 2 +- data/maps/daedalus/rooms/Purple Room East.txtpb | 2 +- data/maps/daedalus/rooms/Purple Room South.txtpb | 2 +- data/maps/daedalus/rooms/Purple Room West.txtpb | 2 +- data/maps/daedalus/rooms/Purple Room.txtpb | 2 +- data/maps/daedalus/rooms/Purple SE Vestibule.txtpb | 2 +- data/maps/daedalus/rooms/Purple SW Vestibule.txtpb | 2 +- data/maps/daedalus/rooms/Purple Smiley.txtpb | 2 +- data/maps/daedalus/rooms/Pyramid 3.txtpb | 2 +- data/maps/daedalus/rooms/Pyramid 4.txtpb | 2 +- data/maps/daedalus/rooms/Pyramid 5.txtpb | 2 +- data/maps/daedalus/rooms/Pyramid 6.txtpb | 2 +- data/maps/daedalus/rooms/Pyramid 7.txtpb | 2 +- data/maps/daedalus/rooms/Pyramid 8.txtpb | 3 +- data/maps/daedalus/rooms/Pyramid Entry.txtpb | 2 +- .../maps/daedalus/rooms/Pyramid Second Floor.txtpb | 3 +- data/maps/daedalus/rooms/Pyramid Top.txtpb | 2 +- data/maps/daedalus/rooms/Quiet Entrance.txtpb | 3 +- data/maps/daedalus/rooms/Rain Side.txtpb | 3 +- data/maps/daedalus/rooms/Rainbow Blue.txtpb | 3 +- .../daedalus/rooms/Rainbow Color Backside.txtpb | 3 +- data/maps/daedalus/rooms/Rainbow Color Doors.txtpb | 2 +- data/maps/daedalus/rooms/Rainbow Cyan.txtpb | 3 +- data/maps/daedalus/rooms/Rainbow End.txtpb | 2 +- data/maps/daedalus/rooms/Rainbow Green.txtpb | 3 +- data/maps/daedalus/rooms/Rainbow Orange.txtpb | 3 +- data/maps/daedalus/rooms/Rainbow Purple.txtpb | 3 +- data/maps/daedalus/rooms/Rainbow Red.txtpb | 3 +- data/maps/daedalus/rooms/Rainbow Start.txtpb | 2 +- data/maps/daedalus/rooms/Rainbow Yellow.txtpb | 3 +- data/maps/daedalus/rooms/Red Color Door.txtpb | 3 +- data/maps/daedalus/rooms/Red Room.txtpb | 2 +- data/maps/daedalus/rooms/Red Smiley.txtpb | 2 +- data/maps/daedalus/rooms/Salt Room.txtpb | 3 +- data/maps/daedalus/rooms/Seasoning Room.txtpb | 2 +- data/maps/daedalus/rooms/Snake Room.txtpb | 2 +- data/maps/daedalus/rooms/South Castle Area.txtpb | 2 +- data/maps/daedalus/rooms/Starting Room.txtpb | 2 +- data/maps/daedalus/rooms/Sweet Foyer.txtpb | 2 +- data/maps/daedalus/rooms/Tree Entrance.txtpb | 2 +- data/maps/daedalus/rooms/U2 Prize.txtpb | 2 +- data/maps/daedalus/rooms/U2 Room.txtpb | 2 +- data/maps/daedalus/rooms/Unkempt Entrance.txtpb | 2 +- data/maps/daedalus/rooms/Welcome Back Area.txtpb | 2 +- data/maps/daedalus/rooms/Welcome Back Exit.txtpb | 3 +- data/maps/daedalus/rooms/West Castle Area.txtpb | 2 +- data/maps/daedalus/rooms/West Spire.txtpb | 2 +- .../daedalus/rooms/White Hallway From Entry.txtpb | 2 +- data/maps/daedalus/rooms/Wisdom Panel.txtpb | 2 +- data/maps/daedalus/rooms/Wonderland.txtpb | 2 +- .../daedalus/rooms/Yellow Color Backside.txtpb | 2 +- data/maps/daedalus/rooms/Yellow Color Door.txtpb | 2 +- data/maps/daedalus/rooms/Yellow Room.txtpb | 2 +- data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb | 2 +- data/maps/daedalus/rooms/Z2 Prize.txtpb | 2 +- data/maps/daedalus/rooms/Z2 Room.txtpb | 2 +- data/maps/daedalus/rooms/Zoo Center.txtpb | 2 +- data/maps/daedalus/rooms/Zoo E.txtpb | 2 +- data/maps/daedalus/rooms/Zoo N.txtpb | 3 +- data/maps/daedalus/rooms/Zoo NE.txtpb | 2 +- data/maps/daedalus/rooms/Zoo S.txtpb | 3 +- data/maps/daedalus/rooms/Zoo SE.txtpb | 2 +- data/maps/four_rooms/doors.txtpb | 4 + data/maps/four_rooms/rooms/A2 Room.txtpb | 1 - data/maps/four_rooms/rooms/Examples Room.txtpb | 1 - data/maps/four_rooms/rooms/Hallway.txtpb | 1 - data/maps/four_rooms/rooms/Intensify Room.txtpb | 1 - data/maps/four_rooms/rooms/Keyholder Room.txtpb | 1 - data/maps/four_rooms/rooms/Synonyms Room.txtpb | 1 - data/maps/four_rooms/rooms/Time Room.txtpb | 1 - data/maps/the_ancient/rooms/Ending.txtpb | 1 - data/maps/the_ancient/rooms/Inside.txtpb | 1 - data/maps/the_ancient/rooms/Outside.txtpb | 1 - data/maps/the_bearer/doors.txtpb | 3 +- data/maps/the_bearer/rooms/Back Area.txtpb | 1 - .../maps/the_bearer/rooms/Blue Animal (View).txtpb | 1 - data/maps/the_bearer/rooms/Blue Animal.txtpb | 1 - .../maps/the_bearer/rooms/Blue Planet (View).txtpb | 1 - data/maps/the_bearer/rooms/Blue Planet.txtpb | 1 - data/maps/the_bearer/rooms/Blue Town (View).txtpb | 1 - data/maps/the_bearer/rooms/Blue Town.txtpb | 1 - .../the_bearer/rooms/Blue Vegetable (View).txtpb | 1 - data/maps/the_bearer/rooms/Blue Vegetable.txtpb | 1 - data/maps/the_bearer/rooms/Butterfly Room.txtpb | 1 - data/maps/the_bearer/rooms/Entry.txtpb | 1 - data/maps/the_bearer/rooms/Green Animal.txtpb | 1 - .../the_bearer/rooms/Green Planet (View).txtpb | 1 - data/maps/the_bearer/rooms/Green Planet.txtpb | 1 - data/maps/the_bearer/rooms/Green Town.txtpb | 1 - .../the_bearer/rooms/Green Vegetable (View).txtpb | 1 - data/maps/the_bearer/rooms/Green Vegetable.txtpb | 1 - data/maps/the_bearer/rooms/Orange Planet.txtpb | 1 - data/maps/the_bearer/rooms/Orange Vegetable.txtpb | 1 - data/maps/the_bearer/rooms/Overlook.txtpb | 1 - .../the_bearer/rooms/Purple Animal (View).txtpb | 1 - data/maps/the_bearer/rooms/Purple Animal.txtpb | 1 - .../the_bearer/rooms/Purple Planet (View).txtpb | 1 - data/maps/the_bearer/rooms/Purple Planet.txtpb | 1 - .../maps/the_bearer/rooms/Purple Town (View).txtpb | 1 - data/maps/the_bearer/rooms/Purple Town.txtpb | 1 - .../the_bearer/rooms/Purple Vegetable (View).txtpb | 1 - data/maps/the_bearer/rooms/Purple Vegetable.txtpb | 1 - data/maps/the_bearer/rooms/Q2 Room.txtpb | 1 - data/maps/the_bearer/rooms/Red Animal.txtpb | 1 - data/maps/the_bearer/rooms/Red Planet.txtpb | 1 - data/maps/the_bearer/rooms/Red Town.txtpb | 1 - data/maps/the_bearer/rooms/Red Vegetable.txtpb | 1 - data/maps/the_bearer/rooms/Yellow Planet.txtpb | 1 - data/maps/the_bearer/rooms/Yellow Vegetable.txtpb | 1 - data/maps/the_between/rooms/B2 Back Room.txtpb | 1 - data/maps/the_between/rooms/B2 Front Room.txtpb | 1 - .../the_between/rooms/Control Center Side.txtpb | 1 - data/maps/the_between/rooms/Main Area.txtpb | 1 - data/maps/the_between/rooms/Plaza Entrance.txtpb | 1 - data/maps/the_butterfly/rooms/Main Area.txtpb | 1 - data/maps/the_butterfly/rooms/Mastery.txtpb | 1 - data/maps/the_colorful/rooms/Black Room.txtpb | 1 - data/maps/the_colorful/rooms/Blue Room.txtpb | 1 - data/maps/the_colorful/rooms/Brown Room.txtpb | 1 - data/maps/the_colorful/rooms/Cyan Hallway.txtpb | 1 - data/maps/the_colorful/rooms/Cyan Room.txtpb | 1 - data/maps/the_colorful/rooms/Ending.txtpb | 1 - data/maps/the_colorful/rooms/Gray Room.txtpb | 1 - data/maps/the_colorful/rooms/Green Room.txtpb | 1 - data/maps/the_colorful/rooms/Orange Room.txtpb | 1 - data/maps/the_colorful/rooms/P2 Room.txtpb | 1 - data/maps/the_colorful/rooms/Purple Room.txtpb | 1 - data/maps/the_colorful/rooms/Red Room.txtpb | 1 - data/maps/the_colorful/rooms/White Room.txtpb | 1 - data/maps/the_colorful/rooms/Window Room.txtpb | 1 - data/maps/the_colorful/rooms/Yellow Room.txtpb | 1 - data/maps/the_congruent/doors.txtpb | 5 + data/maps/the_congruent/rooms/C Keyholder.txtpb | 1 - data/maps/the_congruent/rooms/C2 Room.txtpb | 1 - .../the_congruent/rooms/Flipped Magenta Room.txtpb | 1 - .../the_congruent/rooms/Flipped Yellow Room.txtpb | 1 - data/maps/the_congruent/rooms/G Keyholder.txtpb | 1 - data/maps/the_congruent/rooms/G2 Room.txtpb | 1 - data/maps/the_congruent/rooms/Main Area.txtpb | 1 - .../the_congruent/rooms/Obverse Magenta Room.txtpb | 1 - .../the_congruent/rooms/Obverse Yellow Room.txtpb | 1 - data/maps/the_congruent/rooms/T Keyholder.txtpb | 1 - data/maps/the_darkroom/doors.txtpb | 2 + data/maps/the_darkroom/rooms/First Room.txtpb | 2 +- data/maps/the_darkroom/rooms/S Room.txtpb | 1 - data/maps/the_darkroom/rooms/Second Room.txtpb | 2 +- data/maps/the_darkroom/rooms/Third Room.txtpb | 2 +- data/maps/the_digital/rooms/C Room.txtpb | 1 - data/maps/the_digital/rooms/Chamber.txtpb | 1 - data/maps/the_digital/rooms/Gallery Maze.txtpb | 1 - data/maps/the_digital/rooms/Main Area.txtpb | 1 - data/maps/the_digital/rooms/Tree Area.txtpb | 1 - data/maps/the_digital/rooms/U Room.txtpb | 1 - data/maps/the_door/rooms/Ending.txtpb | 1 - data/maps/the_door/rooms/Main Area.txtpb | 1 - data/maps/the_double_sided/rooms/Brown Area.txtpb | 1 - .../rooms/Flipped Black Area.txtpb | 1 - .../the_double_sided/rooms/Flipped Blue Area.txtpb | 1 - .../rooms/Flipped Green Area.txtpb | 1 - .../rooms/Flipped Orange Area.txtpb | 1 - .../the_double_sided/rooms/Flipped Pink Area.txtpb | 1 - .../rooms/Flipped Purple Area.txtpb | 1 - .../the_double_sided/rooms/Flipped Red Area.txtpb | 1 - .../rooms/Flipped Yellow Back Area.txtpb | 1 - .../rooms/Flipped Yellow Front Area.txtpb | 1 - .../rooms/Obverse Black Area.txtpb | 1 - .../the_double_sided/rooms/Obverse Blue Area.txtpb | 1 - .../rooms/Obverse Green Area.txtpb | 1 - .../rooms/Obverse Orange Back Area.txtpb | 1 - .../rooms/Obverse Orange Front Area.txtpb | 1 - .../rooms/Obverse Orange Isolated Section.txtpb | 1 - .../the_double_sided/rooms/Obverse Pink Area.txtpb | 1 - .../rooms/Obverse Purple Area.txtpb | 1 - .../the_double_sided/rooms/Obverse Red Area.txtpb | 1 - .../rooms/Obverse Yellow Area.txtpb | 1 - data/maps/the_double_sided/rooms/Start.txtpb | 1 - data/maps/the_entry/doors.txtpb | 3 +- data/maps/the_entry/rooms/Blue Alcove.txtpb | 2 +- data/maps/the_entry/rooms/Colored Doors Area.txtpb | 2 +- .../the_entry/rooms/Composite Room Entrance.txtpb | 2 +- data/maps/the_entry/rooms/Ctrl Tutorial.txtpb | 2 +- data/maps/the_entry/rooms/D Room Final.txtpb | 2 +- data/maps/the_entry/rooms/D Room.txtpb | 2 +- data/maps/the_entry/rooms/Daedalus Entrance.txtpb | 2 +- data/maps/the_entry/rooms/Digital Entrance.txtpb | 2 +- data/maps/the_entry/rooms/Entry Exit.txtpb | 2 +- data/maps/the_entry/rooms/Eye Room.txtpb | 2 +- data/maps/the_entry/rooms/Flipped Link Area.txtpb | 5 +- .../the_entry/rooms/Flipped Pyramid Area.txtpb | 2 +- data/maps/the_entry/rooms/Flipped Right Eye.txtpb | 2 +- .../maps/the_entry/rooms/Flipped Second Room.txtpb | 2 +- data/maps/the_entry/rooms/Gallery Return.txtpb | 2 +- data/maps/the_entry/rooms/Least Blue Last.txtpb | 2 +- data/maps/the_entry/rooms/Lime Room.txtpb | 2 +- data/maps/the_entry/rooms/Link Area.txtpb | 3 +- data/maps/the_entry/rooms/Parthenon Return.txtpb | 2 +- data/maps/the_entry/rooms/Rabbit Hole.txtpb | 2 +- data/maps/the_entry/rooms/Red Alcove.txtpb | 2 +- data/maps/the_entry/rooms/Red Blue Halls.txtpb | 2 +- .../maps/the_entry/rooms/Repetitive Entrance.txtpb | 2 +- data/maps/the_entry/rooms/Right Eye.txtpb | 2 +- data/maps/the_entry/rooms/Shop Entrance.txtpb | 2 +- data/maps/the_entry/rooms/Starting Room.txtpb | 2 +- data/maps/the_entry/rooms/Trick Room.txtpb | 2 +- .../rooms/White Hallway To Daedalus.txtpb | 2 +- data/maps/the_entry/rooms/Wrath Room.txtpb | 2 +- data/maps/the_entry/rooms/X Area.txtpb | 2 +- data/maps/the_extravagant/rooms/E Room.txtpb | 1 - data/maps/the_extravagant/rooms/Engine Room.txtpb | 1 - data/maps/the_extravagant/rooms/Hat Chamber.txtpb | 1 - .../the_extravagant/rooms/X Minus Middle Leg.txtpb | 1 - .../the_extravagant/rooms/X Minus Right Leg.txtpb | 1 - data/maps/the_extravagant/rooms/X Minus.txtpb | 1 - .../the_extravagant/rooms/X Plus Middle Leg.txtpb | 1 - .../the_extravagant/rooms/X Plus Right Leg.txtpb | 1 - data/maps/the_extravagant/rooms/X Plus.txtpb | 1 - .../rooms/Y Minus First Floor.txtpb | 1 - .../rooms/Y Minus Second Floor.txtpb | 1 - .../rooms/Y Minus Third Floor.txtpb | 1 - .../the_extravagant/rooms/Y Plus First Floor.txtpb | 1 - .../the_extravagant/rooms/Y Plus Third Floor.txtpb | 1 - data/maps/the_gallery/rooms/Back Room.txtpb | 1 - .../the_gallery/rooms/Daedalus Extension.txtpb | 1 - data/maps/the_gallery/rooms/Ending.txtpb | 1 - data/maps/the_gallery/rooms/Main Area.txtpb | 1 - data/maps/the_gold/rooms/The Whole Thing.txtpb | 1 - data/maps/the_graveyard/rooms/Inside.txtpb | 1 - data/maps/the_graveyard/rooms/Outside.txtpb | 1 - data/maps/the_great/doors.txtpb | 2 + data/maps/the_great/rooms/Back Area.txtpb | 2 +- .../the_great/rooms/Behind Question Area.txtpb | 2 +- data/maps/the_great/rooms/Colorful Entrance.txtpb | 2 +- data/maps/the_great/rooms/Daedalus Entrance.txtpb | 2 +- data/maps/the_great/rooms/East Landscape.txtpb | 2 +- data/maps/the_great/rooms/G Room.txtpb | 2 +- data/maps/the_great/rooms/Hive Entrance.txtpb | 2 +- data/maps/the_great/rooms/Jail Part 1.txtpb | 2 +- data/maps/the_great/rooms/Jail Part 2.txtpb | 2 +- data/maps/the_great/rooms/Jubilant Entrance.txtpb | 2 +- data/maps/the_great/rooms/Magnet Room.txtpb | 2 +- data/maps/the_great/rooms/Main Area.txtpb | 2 +- data/maps/the_great/rooms/Maze Center.txtpb | 2 +- data/maps/the_great/rooms/Maze Cold Area.txtpb | 2 +- .../the_great/rooms/Maze Empty Vestibule.txtpb | 2 +- data/maps/the_great/rooms/Maze In Area.txtpb | 2 +- data/maps/the_great/rooms/Maze Moon Area.txtpb | 2 +- data/maps/the_great/rooms/Maze Off Area.txtpb | 2 +- data/maps/the_great/rooms/Maze Slice Area.txtpb | 2 +- data/maps/the_great/rooms/Maze Smooth Area.txtpb | 2 +- data/maps/the_great/rooms/Maze South Area.txtpb | 2 +- data/maps/the_great/rooms/Maze Start.txtpb | 2 +- data/maps/the_great/rooms/Maze Tower.txtpb | 2 +- data/maps/the_great/rooms/Maze Up Area.txtpb | 2 +- data/maps/the_great/rooms/Maze Wreck Area.txtpb | 2 +- data/maps/the_great/rooms/Nature Room.txtpb | 2 +- data/maps/the_great/rooms/North Landscape.txtpb | 2 +- data/maps/the_great/rooms/Outside Jail.txtpb | 2 +- data/maps/the_great/rooms/Pillar Room.txtpb | 2 +- data/maps/the_great/rooms/Purple Room.txtpb | 2 +- data/maps/the_great/rooms/Question Room How.txtpb | 3 +- data/maps/the_great/rooms/Question Room What.txtpb | 3 +- data/maps/the_great/rooms/Question Room When.txtpb | 3 +- data/maps/the_great/rooms/Question Room Who.txtpb | 3 +- data/maps/the_great/rooms/Salmon Room.txtpb | 2 +- data/maps/the_great/rooms/Talented Entrance.txtpb | 2 +- .../maps/the_great/rooms/Under Question Room.txtpb | 3 +- data/maps/the_great/rooms/West Side.txtpb | 2 +- data/maps/the_great/rooms/Whole Room.txtpb | 2 +- data/maps/the_great/rooms/Y Room.txtpb | 2 +- data/maps/the_great/rooms/Zero Room.txtpb | 2 +- data/maps/the_hinterlands/rooms/Main Area.txtpb | 1 - data/maps/the_hive/rooms/Main Area.txtpb | 1 - data/maps/the_hive/rooms/Mastery Room.txtpb | 1 - data/maps/the_hive/rooms/Room 8.txtpb | 1 - data/maps/the_impressive/rooms/Green Eye.txtpb | 2 +- data/maps/the_impressive/rooms/Lobby.txtpb | 2 +- data/maps/the_impressive/rooms/M Room.txtpb | 2 +- data/maps/the_impressive/rooms/M2 Room.txtpb | 2 +- data/maps/the_impressive/rooms/Side Area.txtpb | 2 +- data/maps/the_impressive/rooms/W Room.txtpb | 2 +- data/maps/the_impressive/rooms/WM Room.txtpb | 2 +- data/maps/the_invisible/rooms/Entrance.txtpb | 1 - data/maps/the_invisible/rooms/Maze.txtpb | 1 - data/maps/the_jubilant/rooms/J Room.txtpb | 1 - data/maps/the_jubilant/rooms/Main Area.txtpb | 1 - data/maps/the_jubilant/rooms/Side Area.txtpb | 1 - data/maps/the_keen/rooms/K Room.txtpb | 1 - data/maps/the_keen/rooms/Main Area.txtpb | 1 - data/maps/the_liberated/doors.txtpb | 1 + data/maps/the_liberated/rooms/Painting Room.txtpb | 1 - data/maps/the_liberated/rooms/Puzzle Room.txtpb | 1 - data/maps/the_linear/rooms/Room.txtpb | 1 - data/maps/the_lionized/rooms/E2 Room.txtpb | 1 - data/maps/the_lionized/rooms/Puzzle Room.txtpb | 1 - data/maps/the_literate/doors.txtpb | 1 + data/maps/the_literate/rooms/Painting Room.txtpb | 1 - data/maps/the_literate/rooms/Puzzle Room.txtpb | 1 - data/maps/the_lively/rooms/L2 Room.txtpb | 1 - data/maps/the_lively/rooms/Puzzle Room.txtpb | 1 - data/maps/the_nuanced/rooms/Back Room.txtpb | 1 - data/maps/the_nuanced/rooms/Main Room.txtpb | 1 - data/maps/the_nuanced/rooms/N2 Room.txtpb | 1 - data/maps/the_orb/rooms/B Room.txtpb | 1 - data/maps/the_orb/rooms/Main Area.txtpb | 1 - data/maps/the_orb/rooms/O Room.txtpb | 1 - data/maps/the_orb/rooms/R Room.txtpb | 1 - data/maps/the_owl/rooms/Blue Room.txtpb | 1 - data/maps/the_owl/rooms/Connected Area.txtpb | 1 - data/maps/the_owl/rooms/Magenta Hallway.txtpb | 1 - data/maps/the_owl/rooms/R1C4 Left.txtpb | 1 - data/maps/the_owl/rooms/R2C1 Left.txtpb | 1 - data/maps/the_owl/rooms/R2C2 Bottom.txtpb | 1 - data/maps/the_owl/rooms/R2C2 Top.txtpb | 1 - data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb | 1 - data/maps/the_owl/rooms/Z Room.txtpb | 1 - data/maps/the_parthenon/doors.txtpb | 1 + data/maps/the_parthenon/rooms/Ending.txtpb | 1 - data/maps/the_parthenon/rooms/K2 Room.txtpb | 1 - data/maps/the_parthenon/rooms/Lavender Area.txtpb | 1 - data/maps/the_parthenon/rooms/Main Area.txtpb | 1 - data/maps/the_parthenon/rooms/U Keyholder.txtpb | 1 - data/maps/the_partial/doors.txtpb | 1 + .../rooms/Control Center Entrance.txtpb | 1 - data/maps/the_partial/rooms/F Room.txtpb | 1 - data/maps/the_partial/rooms/Obverse Side.txtpb | 1 - data/maps/the_partial/rooms/P Room.txtpb | 1 - data/maps/the_partial/rooms/Reverse Side.txtpb | 1 - data/maps/the_perceptive/rooms/Main Area.txtpb | 1 - data/maps/the_plaza/doors.txtpb | 1 + data/maps/the_plaza/rooms/Bottom Left Room.txtpb | 1 - data/maps/the_plaza/rooms/Bottom Right Room.txtpb | 1 - data/maps/the_plaza/rooms/Center Room.txtpb | 1 - data/maps/the_plaza/rooms/Main Area.txtpb | 1 - data/maps/the_plaza/rooms/Mastery.txtpb | 1 - .../maps/the_plaza/rooms/Repetitive Entrance.txtpb | 1 - data/maps/the_plaza/rooms/Sirenic Entrance.txtpb | 1 - data/maps/the_plaza/rooms/Symbolic Entrance.txtpb | 1 - data/maps/the_plaza/rooms/Top Left Room.txtpb | 3 +- data/maps/the_plaza/rooms/Top Right Room.txtpb | 3 +- data/maps/the_quiet/rooms/Keyholder Room.txtpb | 1 - data/maps/the_quiet/rooms/Main Area.txtpb | 1 - data/maps/the_quiet/rooms/Q Room.txtpb | 1 - data/maps/the_relentless/rooms/All.txtpb | 1 - data/maps/the_relentless/rooms/Left And Turn.txtpb | 1 - data/maps/the_relentless/rooms/Left Room.txtpb | 1 - data/maps/the_relentless/rooms/Mastery.txtpb | 1 - data/maps/the_relentless/rooms/Shop Room.txtpb | 1 - data/maps/the_relentless/rooms/Turn And Shop.txtpb | 1 - data/maps/the_relentless/rooms/Turn Room.txtpb | 1 - data/maps/the_repetitive/rooms/Anti Room.txtpb | 1 - data/maps/the_repetitive/rooms/Cyan Room.txtpb | 1 - data/maps/the_repetitive/rooms/Dot Area.txtpb | 1 - .../the_repetitive/rooms/Entry Connector.txtpb | 1 - data/maps/the_repetitive/rooms/Lime Room.txtpb | 1 - data/maps/the_repetitive/rooms/Magenta Room.txtpb | 1 - data/maps/the_repetitive/rooms/Main Room.txtpb | 1 - data/maps/the_repetitive/rooms/Mastery Room.txtpb | 1 - .../the_repetitive/rooms/Plaza Connector.txtpb | 1 - data/maps/the_repetitive/rooms/Yellow Room.txtpb | 1 - data/maps/the_revitalized/rooms/Bye Room.txtpb | 1 - data/maps/the_revitalized/rooms/Hidden Room.txtpb | 1 - data/maps/the_revitalized/rooms/Hide Room.txtpb | 1 - data/maps/the_revitalized/rooms/High Room.txtpb | 1 - data/maps/the_revitalized/rooms/Return Room.txtpb | 1 - data/maps/the_revitalized/rooms/Too Room.txtpb | 1 - data/maps/the_revitalized/rooms/Won Room.txtpb | 1 - data/maps/the_shop/rooms/Main Area.txtpb | 1 - data/maps/the_sirenic/rooms/Mastery.txtpb | 1 - data/maps/the_sirenic/rooms/Puzzles.txtpb | 1 - data/maps/the_sirenic/rooms/Start.txtpb | 1 - data/maps/the_stormy/rooms/Center.txtpb | 3 +- data/maps/the_stormy/rooms/Nuclear Side.txtpb | 1 - data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb | 1 - data/maps/the_stormy/rooms/Rain Side.txtpb | 3 +- data/maps/the_stormy/rooms/Tornado Side.txtpb | 1 - data/maps/the_stormy/rooms/Tornado Vestibule.txtpb | 1 - data/maps/the_stormy/rooms/Volcano Side.txtpb | 1 - data/maps/the_stormy/rooms/X2 Room.txtpb | 1 - data/maps/the_sturdy/rooms/Main Area.txtpb | 1 - data/maps/the_sturdy/rooms/S2 Area.txtpb | 1 - data/maps/the_sun_temple/rooms/Ending.txtpb | 1 - data/maps/the_sun_temple/rooms/Entrance.txtpb | 1 - data/maps/the_sun_temple/rooms/Mastery.txtpb | 1 - data/maps/the_sun_temple/rooms/Temple.txtpb | 1 - data/maps/the_sweet/rooms/Main Area.txtpb | 1 - data/maps/the_sweet/rooms/Y2 Room.txtpb | 1 - data/maps/the_unyielding/doors.txtpb | 21 + data/maps/the_wondrous/rooms/Huge.txtpb | 1 + data/maps/the_wondrous/rooms/Regular.txtpb | 1 + proto/data.proto | 5 + proto/human.proto | 7 + tools/datapacker/main.cpp | 14 +- tools/validator/CMakeLists.txt | 3 +- tools/validator/human_processor.cpp | 25 +- tools/validator/structs.h | 7 + tools/validator/validator.cpp | 494 ++++++++++++--------- vcpkg.json | 1 + 491 files changed, 798 insertions(+), 692 deletions(-) diff --git a/apworld/player_logic.py b/apworld/player_logic.py index 3854c99..ae22818 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py @@ -105,7 +105,7 @@ class Lingo2PlayerLogic: # before we calculate any access requirements. for door in world.static_logic.objects.doors: if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors: - door_item_name = self.world.static_logic.get_door_item_name(door.id) + door_item_name = self.world.static_logic.get_door_item_name(door) self.item_by_door[door.id] = door_item_name self.real_items.append(door_item_name) diff --git a/apworld/static_logic.py b/apworld/static_logic.py index 965ce3e..ff1f17d 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py @@ -18,11 +18,11 @@ class Lingo2StaticLogic: for door in self.objects.doors: if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]: - location_name = f"{self.get_map_object_map_name(door)} - {door.name}" + location_name = self.get_door_location_name(door) self.location_id_to_name[door.ap_id] = location_name if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]: - item_name = self.get_door_item_name(door.id) + item_name = self.get_door_item_name(door) self.item_id_to_name[door.ap_id] = item_name for letter in self.objects.letters: @@ -46,10 +46,77 @@ class Lingo2StaticLogic: self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()} self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()} - def get_door_item_name(self, door_id: int) -> str: - door = self.objects.doors[door_id] + def get_door_item_name(self, door: data_pb2.Door) -> str: return f"{self.get_map_object_map_name(door)} - {door.name}" + def get_door_item_name_by_id(self, door_id: int) -> str: + door = self.objects.doors[door_id] + return self.get_door_item_name(door_id) + + def get_door_location_name(self, door: data_pb2.Door) -> str: + game_map = self.objects.maps[door.map_id] + room = self.objects.rooms[door.room_id] + + if room.HasField("panel_display_name"): + map_part = f"{game_map.display_name} ({room.panel_display_name})" + else: + map_part = game_map.display_name + + if door.HasField("location_name"): + return f"{map_part} - {door.location_name}" + + generated_location_name = self.get_generated_door_location_name(door) + if generated_location_name is not None: + return generated_location_name + + return f"{map_part} - {door.name}" + + def get_generated_door_location_name(self, door: data_pb2.Door) -> str | None: + if door.type != data_pb2.DoorType.STANDARD: + return None + + if len(door.keyholders) > 0 or len(door.endings) > 0: + return None + + if len(door.panels) > 4: + return None + + map_areas = set() + for panel_id in door.panels: + panel = self.objects.panels[panel_id.panel] + panel_room = self.objects.rooms[panel.room_id] + # It's okay if panel_display_name is not present because then it's coalesced with other unnamed areas. + map_areas.add(panel_room.panel_display_name) + + if len(map_areas) > 1: + return None + + game_map = self.objects.maps[door.map_id] + map_area = map_areas.pop() + if map_area == "": + map_part = game_map.display_name + else: + map_part = f"{game_map.display_name} ({map_area})" + + def get_panel_display_name(panel: data_pb2.ProxyIdentifier) -> str: + panel_data = self.objects.panels[panel.panel] + panel_name = panel_data.display_name if panel_data.HasField("display_name") else panel_data.name + + if panel.HasField("answer"): + return f"{panel_name}/{panel.answer.upper()}" + else: + return panel_name + + panel_names = [get_panel_display_name(panel_id) + for panel_id in door.panels] + panel_names.sort() + + return f"{map_part} - {", ".join(panel_names)}" + + def get_door_location_name_by_id(self, door_id: int) -> str: + door = self.objects.doors[door_id] + return self.get_door_location_name(door) + def get_room_region_name(self, room_id: int) -> str: room = self.objects.rooms[room_id] return f"{self.get_map_object_map_name(room)} - {room.name}" diff --git a/data/ids.yaml b/data/ids.yaml index 39bdfde..0e49b59 100644 --- a/data/ids.yaml +++ b/data/ids.yaml @@ -1037,6 +1037,7 @@ maps: Near Sweet Blue Door: 1573 Near Sweet Brown Door: 1561 Near Yellow Room Door: 1565 + North Castle Panel: 2742 O2 Room Back Door: 1485 Orange Rainbow Panel: 2267 Orange Rainbow Room: 1535 @@ -1064,6 +1065,7 @@ maps: Purple NW Vestibule: 1459 Purple Rainbow Panel: 2271 Purple Rainbow Room: 1539 + Purple Room: 2741 Purple Room East Entrance: 1472 Purple Room North Entrance: 1469 Purple Room South Entrance: 1470 @@ -1088,6 +1090,7 @@ maps: Snake Room Entrance: 1514 South Castle Area Back Door: 1574 South Castle Area Entrance: 1575 + South Castle Panel: 2744 Southwest Area Intersection: 1475 Splintering Exit Left Door: 1449 Splintering Exit Right Door: 1450 @@ -1109,6 +1112,7 @@ maps: U2 Room Shortcut: 1493 Welcome Back Door: 1435 Welcome Back Secret Door: 1434 + West Castle Panel: 2743 White Hallway From Entry: 1488 Wonderland Left Door: 1520 Wonderland Right Door: 1504 @@ -3641,6 +3645,7 @@ maps: Black Alcove: 2265 Brown Alcove: 1255 Digital Entrance: 1257 + East Room 1: 2740 East Room 1 Entrance: 1251 Hero Room Entrance: 1252 Jay Painting: 1253 diff --git a/data/maps/control_center/doors.txtpb b/data/maps/control_center/doors.txtpb index 0bb29c1..08476a7 100644 --- a/data/maps/control_center/doors.txtpb +++ b/data/maps/control_center/doors.txtpb @@ -109,6 +109,7 @@ doors { keyholders { room: "Main Area" name: "3" key: "r" } keyholders { room: "Main Area" name: "4" key: "e" } location_room: "Main Area" + location_name: "Keyword MORE" } doors { name: "Perceptive From Outside" @@ -132,6 +133,7 @@ doors { keyholders { room: "Main Area" name: "3" key: "r" } keyholders { room: "Main Area" name: "4" key: "o" } location_room: "Main Area" + location_name: "Keyword ZERO" } doors { name: "Between Door" diff --git a/data/maps/daedalus/doors.txtpb b/data/maps/daedalus/doors.txtpb index a92f648..4e35de2 100644 --- a/data/maps/daedalus/doors.txtpb +++ b/data/maps/daedalus/doors.txtpb @@ -188,11 +188,10 @@ doors { } doors { name: "Welcome Back Secret Door" - type: STANDARD + type: ITEM_ONLY receivers: "Components/Doors/Entry/entry_13" panels { room: "Welcome Back Area" name: "FAREWELL LITTLE LAMB" } panels { room: "West Spire" name: "BYE" } - location_room: "West Spire" } doors { name: "Welcome Back Door" @@ -296,6 +295,7 @@ doors { panels { room: "Black Hex" name: "CLUES" } panels { room: "Black Hex" name: "SECRET" } location_room: "Black Hex" + location_name: "Black Hex" } doors { name: "Splintering Exit Left Door" @@ -382,6 +382,7 @@ doors { panels { room: "Z2 Room" name: "CAPE" } panels { room: "Z2 Room" name: "GLANCE" } location_room: "Z2 Room" + location_name: "West Puzzles" } doors { name: "Z2 Room Northwest Door" @@ -413,6 +414,7 @@ doors { panels { room: "Z2 Room" name: "DISCORD" } panels { room: "Z2 Room" name: "CAT" } location_room: "Z2 Room" + location_name: "East Puzzles" } doors { name: "Z2 Room Southeast Door" @@ -491,6 +493,7 @@ doors { panels { room: "Outside House" name: "WALLS" } panels { room: "Outside House" name: "LOCK" } location_room: "Outside House" + location_name: "North Purple Vestibules" } doors { name: "Purple NW Vestibule" @@ -517,6 +520,7 @@ doors { panels { room: "Outside House" name: "BLITHELY" } panels { room: "Purple Room South" name: "THESE" } location_room: "Outside House" + location_name: "West Purple Vestibules" } doors { name: "Purple West Area South Door" @@ -545,6 +549,7 @@ doors { panels { room: "Godot Room" name: "TRAIN" } panels { room: "Godot Room" name: "RECORDING" } location_room: "Godot Room" + location_name: "Godot Room" } doors { name: "Beehalls Intersection" @@ -576,6 +581,7 @@ doors { panels { room: "Purple Room South" name: "ANY" } panels { room: "Outside House" name: "A" } location_room: "Outside House" + location_name: "East Purple Vestibules" } doors { name: "Purple East Area North Door" @@ -593,6 +599,7 @@ doors { panels { room: "Outside House" name: "BLITHELY" } panels { room: "Purple Room South" name: "THESE" } location_room: "Outside House" + location_name: "Purple Vestibules" } doors { name: "Purple Room South Entrance" @@ -621,6 +628,20 @@ doors { panels { room: "Outside House" name: "BLITHELY" } panels { room: "Purple Room South" name: "THESE" } } +doors { + name: "Purple Room" + type: LOCATION_ONLY + panels { room: "Purple Room" name: "HOIST" } + panels { room: "Purple Room" name: "CORE" } + panels { room: "Purple Room" name: "FISH" } + panels { room: "Purple Room" name: "ALLOW" } + panels { room: "Purple Room" name: "BIRD" } + panels { room: "Purple Room" name: "HONK" } + panels { room: "Purple Room" name: "APE" } + panels { room: "Purple Room" name: "APATHY" } + location_room: "Purple Room" + location_name: "Puzzles" +} doors { name: "Hedges Tower" type: LOCATION_ONLY @@ -676,6 +697,7 @@ doors { panels { room: "Blue Room" name: "CELEBRATORY" } panels { room: "Blue Room" name: "DETECTIVE" } location_room: "Blue Room" + location_name: "Puzzles" } doors { name: "O2 Prize" @@ -734,6 +756,7 @@ doors { panels { room: "Composite Room S" name: "BLEAKCARD" } panels { room: "Composite Room S" name: "MISSIONMISSION" } location_room: "Composite Room S" + location_name: "East Rooms" } doors { name: "Composite Room North Door" @@ -762,6 +785,7 @@ doors { panels { room: "Composite Room NW" name: "OUTGARDEN" } panels { room: "Composite Room NW" name: "HELLOTALE" } location_room: "Composite Room NE" + location_name: "North Rooms" } doors { name: "Composite Room West Door" @@ -792,6 +816,7 @@ doors { panels { room: "Composite Room S" name: "OUTEAT" } panels { room: "Composite Room S" name: "SUMMERIN" } location_room: "Composite Room NW" + location_name: "West Rooms" } doors { name: "Composite Room NW Entrance" @@ -829,6 +854,7 @@ doors { panels { room: "Composite Room S" name: "OUTEAT" } panels { room: "Composite Room S" name: "SUMMERIN" } location_room: "Composite Room S" + location_name: "South Rooms" } doors { name: "O2 Room Back Door" @@ -1004,6 +1030,7 @@ doors { panels { room: "Wonderland" name: "ARTS" } panels { room: "Wonderland" name: "SONG" } location_room: "Wonderland" + location_name: "Wonderland" } doors { name: "Pyramid Entrance" @@ -1034,6 +1061,7 @@ doors { panels { room: "Orange Room" name: "COAL" } panels { room: "Orange Room" name: "OWED" } location_room: "Orange Room" + location_name: "Puzzles" } doors { name: "Hedges Entrance" @@ -1389,7 +1417,7 @@ doors { } doors { name: "Roof Access" - type: STANDARD + type: ITEM_ONLY receivers: "Components/Doors/Castle/entry_stairs_big" receivers: "Components/Doors/Castle/entry_stairs_big2" receivers: "Meshes/Stairs/staircase31/teleportListener" @@ -1398,6 +1426,23 @@ doors { panels { room: "North Castle Area" name: "A SUMMER PLACE" } panels { room: "West Castle Area" name: "SONG FACE" } panels { room: "South Castle Area" name: "AN OFFER VILLAGE BEFORE LAIR" } +} +doors { + name: "North Castle Panel" + type: LOCATION_ONLY + panels { room: "North Castle Area" name: "A SUMMER PLACE" } + location_room: "North Castle Area" +} +doors { + name: "West Castle Panel" + type: LOCATION_ONLY + panels { room: "West Castle Area" name: "SONG FACE" } + location_room: "West Castle Area" +} +doors { + name: "South Castle Panel" + type: LOCATION_ONLY + panels { room: "South Castle Area" name: "AN OFFER VILLAGE BEFORE LAIR" } location_room: "South Castle Area" } doors { @@ -1414,6 +1459,7 @@ doors { panels { room: "West Spire" name: "CUT" } panels { room: "West Spire" name: "STONES" } location_room: "West Spire" + location_name: "Pairs Room Puzzles" } doors { name: "Pairs Room West Door" @@ -1711,6 +1757,7 @@ doors { panels { room: "Cyan Room" name: "COLD" } panels { room: "Cyan Room" name: "WORDWORD" } location_room: "Cyan Room" + location_name: "Puzzles" } doors { name: "Green Room Entrance" @@ -1734,6 +1781,7 @@ doors { panels { room: "Green Room" name: "DOUBLE" } panels { room: "Green Room" name: "BADMINTON" } location_room: "Green Room" + location_name: "Puzzles" } doors { name: "Blue Hallway South Divider" @@ -1772,6 +1820,7 @@ doors { panels { room: "Red Room" name: "TESTAMENT" } panels { room: "Red Room" name: "TAKEOUT" } location_room: "Red Room" + location_name: "Puzzles" } doors { name: "Blue Hallway To Red Room" @@ -1785,6 +1834,7 @@ doors { panels { room: "Blue Hallway" name: "CHOP" } panels { room: "Blue Hallway Tall Side" name: "TALL" } location_room: "Blue Hallway Tall Side" + location_name: "CHOP, TALL" } doors { name: "Near Yellow Room Door" @@ -1797,6 +1847,7 @@ doors { panels { room: "Blue Hallway Tall Side" name: "CHILD" } panels { room: "Blue Hallway Tall Side" name: "NEW" } location_room: "Blue Hallway Tall Side" + location_name: "Pink Hex" } doors { name: "House Side Door" @@ -1833,6 +1884,7 @@ doors { panels { room: "Yellow Room" name: "PROTON" } panels { room: "Yellow Room" name: "SPIRIT" } location_room: "Yellow Room" + location_name: "Puzzles" } doors { name: "Dark Light Room Entrance" @@ -1887,6 +1939,7 @@ doors { # Not technically true; it's complete_at=11 with both rooms, but you couldn't # get to the other side in vanilla doors anyway. location_room: "Dark Light Room" + location_name: "Main Puzzles" } doors { name: "Near Sweet Blue Door" @@ -1899,6 +1952,7 @@ doors { panels { room: "Gray Color Backside" name: "LAST" } panels { room: "Gray Color Backside" name: "RISE" } location_room: "Gray Color Backside" + location_name: "Light Green Hex" } doors { name: "South Castle Area Back Door" @@ -1938,6 +1992,7 @@ doors { panels { room: "Plum Room" name: "SNAKE" } panels { room: "Plum Room" name: "CENTER" } location_room: "Plum Room" + location_name: "Plum Room" } doors { name: "D Keyholder Blocker" @@ -2039,6 +2094,7 @@ doors { panels { room: "Computer Room" name: "MOUSE (2)" } panels { room: "Computer Room" name: "KEYBOARD (2)" } location_room: "Computer Room" + location_name: "Main Puzzles" } doors { name: "Computer Room Entrance" @@ -2051,6 +2107,7 @@ doors { panels { room: "Rainbow Color Doors" name: "MISCHIEF" } panels { room: "Rainbow Color Doors" name: "CASUAL" } location_room: "Rainbow Color Doors" + location_name: "Red Tower" } doors { name: "C Keyholder Blocker" @@ -2118,6 +2175,7 @@ doors { panels { room: "Book Room" name: "BOOK (11)" } panels { room: "Book Room" name: "BOOK (12)" } location_room: "Book Room" + location_name: "Book Room" } doors { name: "Sticks And Stones Door" @@ -2144,6 +2202,7 @@ doors { panels { room: "Black Hex" name: "BARK" } panels { room: "Zoo N" name: "LEAF" } location_room: "Zoo N" + location_name: "BARK, LEAF" } doors { name: "Zoo East Entrance" diff --git a/data/maps/daedalus/rooms/After Bee Room.txtpb b/data/maps/daedalus/rooms/After Bee Room.txtpb index f38bd7d..c2dfc0f 100644 --- a/data/maps/daedalus/rooms/After Bee Room.txtpb +++ b/data/maps/daedalus/rooms/After Bee Room.txtpb @@ -1,5 +1,5 @@ name: "After Bee Room" -display_name: "North Area" +panel_display_name: "North Area" panels { name: "GAS" path: "Panels/Beehalls/beehalls_2" diff --git a/data/maps/daedalus/rooms/Amber North 2.txtpb b/data/maps/daedalus/rooms/Amber North 2.txtpb index 8fbaccd..7029695 100644 --- a/data/maps/daedalus/rooms/Amber North 2.txtpb +++ b/data/maps/daedalus/rooms/Amber North 2.txtpb @@ -1,5 +1,5 @@ name: "Amber North 2" -display_name: "West Area" +panel_display_name: "West Area" panels { name: "SONG" path: "Panels/Amber/amber_north_2" diff --git a/data/maps/daedalus/rooms/Bee Room Obverse.txtpb b/data/maps/daedalus/rooms/Bee Room Obverse.txtpb index 1badbc0..7677ed1 100644 --- a/data/maps/daedalus/rooms/Bee Room Obverse.txtpb +++ b/data/maps/daedalus/rooms/Bee Room Obverse.txtpb @@ -1,5 +1,5 @@ name: "Bee Room Obverse" -display_name: "Bee Room" +panel_display_name: "Bee Room" panels { name: "SINGLE" path: "Panels/Bee Room/bee_1" diff --git a/data/maps/daedalus/rooms/Bee Room Reverse.txtpb b/data/maps/daedalus/rooms/Bee Room Reverse.txtpb index f455f06..cba8285 100644 --- a/data/maps/daedalus/rooms/Bee Room Reverse.txtpb +++ b/data/maps/daedalus/rooms/Bee Room Reverse.txtpb @@ -1,5 +1,5 @@ name: "Bee Room Reverse" -display_name: "Bee Room" +panel_display_name: "Bee Room" panels { name: "POCKET" path: "Panels/Bee Room/bee_9" diff --git a/data/maps/daedalus/rooms/Beehalls Intersection.txtpb b/data/maps/daedalus/rooms/Beehalls Intersection.txtpb index fecf71d..7ecbe50 100644 --- a/data/maps/daedalus/rooms/Beehalls Intersection.txtpb +++ b/data/maps/daedalus/rooms/Beehalls Intersection.txtpb @@ -1,5 +1,5 @@ name: "Beehalls Intersection" -display_name: "North Area" +panel_display_name: "North Area" panels { name: "CLOUDS" path: "Panels/Halls/beehalls_4" diff --git a/data/maps/daedalus/rooms/Black Hex.txtpb b/data/maps/daedalus/rooms/Black Hex.txtpb index bd8359e..1276685 100644 --- a/data/maps/daedalus/rooms/Black Hex.txtpb +++ b/data/maps/daedalus/rooms/Black Hex.txtpb @@ -1,5 +1,5 @@ name: "Black Hex" -display_name: "Northwest Area" +panel_display_name: "Northwest Area" panels { name: "HIDE" path: "Panels/Hexes/black_1" diff --git a/data/maps/daedalus/rooms/Blue Hallway Cut Side.txtpb b/data/maps/daedalus/rooms/Blue Hallway Cut Side.txtpb index ea2ffef..5a6c081 100644 --- a/data/maps/daedalus/rooms/Blue Hallway Cut Side.txtpb +++ b/data/maps/daedalus/rooms/Blue Hallway Cut Side.txtpb @@ -1,5 +1,5 @@ name: "Blue Hallway Cut Side" -display_name: "South Area" +panel_display_name: "South Area" panels { name: "CUT" path: "Panels/Halls/halls_6" diff --git a/data/maps/daedalus/rooms/Blue Hallway Tall Side.txtpb b/data/maps/daedalus/rooms/Blue Hallway Tall Side.txtpb index 93d4136..4a775d8 100644 --- a/data/maps/daedalus/rooms/Blue Hallway Tall Side.txtpb +++ b/data/maps/daedalus/rooms/Blue Hallway Tall Side.txtpb @@ -1,5 +1,5 @@ name: "Blue Hallway Tall Side" -display_name: "Northeast Area" +panel_display_name: "Northeast Area" panels { name: "TALL" path: "Panels/Halls/halls_9" diff --git a/data/maps/daedalus/rooms/Blue Hallway.txtpb b/data/maps/daedalus/rooms/Blue Hallway.txtpb index 0bac459..81bc428 100644 --- a/data/maps/daedalus/rooms/Blue Hallway.txtpb +++ b/data/maps/daedalus/rooms/Blue Hallway.txtpb @@ -1,5 +1,5 @@ name: "Blue Hallway" -display_name: "South Area" +panel_display_name: "South Area" panels { name: "CHOP" path: "Panels/Halls/halls_10" diff --git a/data/maps/daedalus/rooms/Blue Room.txtpb b/data/maps/daedalus/rooms/Blue Room.txtpb index 98d933b..1d060d8 100644 --- a/data/maps/daedalus/rooms/Blue Room.txtpb +++ b/data/maps/daedalus/rooms/Blue Room.txtpb @@ -1,5 +1,5 @@ name: "Blue Room" -display_name: "East Area" +panel_display_name: "Blue Room" panels { name: "RED" path: "Panels/Blue Room/panel_1" diff --git a/data/maps/daedalus/rooms/Blue Smiley Annex.txtpb b/data/maps/daedalus/rooms/Blue Smiley Annex.txtpb index c39aeb5..d44bf1a 100644 --- a/data/maps/daedalus/rooms/Blue Smiley Annex.txtpb +++ b/data/maps/daedalus/rooms/Blue Smiley Annex.txtpb @@ -1,5 +1,5 @@ name: "Blue Smiley Annex" -display_name: "South Area" +panel_display_name: "South Area" panels { name: "ORANGE (1)" path: "Panels/Miscellaneous/yellow" diff --git a/data/maps/daedalus/rooms/Blue Smiley.txtpb b/data/maps/daedalus/rooms/Blue Smiley.txtpb index 5ddb330..8464525 100644 --- a/data/maps/daedalus/rooms/Blue Smiley.txtpb +++ b/data/maps/daedalus/rooms/Blue Smiley.txtpb @@ -1,5 +1,5 @@ name: "Blue Smiley" -display_name: "South Area" +panel_display_name: "South Area" panels { name: "SMILE" path: "Panels/Smiley Rooms/blue" diff --git a/data/maps/daedalus/rooms/Book Room.txtpb b/data/maps/daedalus/rooms/Book Room.txtpb index 7571ec1..534fbfe 100644 --- a/data/maps/daedalus/rooms/Book Room.txtpb +++ b/data/maps/daedalus/rooms/Book Room.txtpb @@ -1,5 +1,5 @@ name: "Book Room" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "BOOK (1)" path: "Panels/Book Room/book_1" diff --git a/data/maps/daedalus/rooms/Bow Side.txtpb b/data/maps/daedalus/rooms/Bow Side.txtpb index 6e07925..f04065d 100644 --- a/data/maps/daedalus/rooms/Bow Side.txtpb +++ b/data/maps/daedalus/rooms/Bow Side.txtpb @@ -1,9 +1,10 @@ name: "Bow Side" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "?" path: "Panels/Smiley Rooms/bow" clue: "" answer: "bow" symbols: QUESTION + display_name: "? (2)" } diff --git a/data/maps/daedalus/rooms/Brown Smiley.txtpb b/data/maps/daedalus/rooms/Brown Smiley.txtpb index 91ba963..53783c1 100644 --- a/data/maps/daedalus/rooms/Brown Smiley.txtpb +++ b/data/maps/daedalus/rooms/Brown Smiley.txtpb @@ -1,5 +1,5 @@ name: "Brown Smiley" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "OTHERS" path: "Panels/Smiley Rooms/rainbow2" diff --git a/data/maps/daedalus/rooms/C Keyholder.txtpb b/data/maps/daedalus/rooms/C Keyholder.txtpb index a8ad9aa..cc8548c 100644 --- a/data/maps/daedalus/rooms/C Keyholder.txtpb +++ b/data/maps/daedalus/rooms/C Keyholder.txtpb @@ -1,5 +1,5 @@ name: "C Keyholder" -display_name: "North Area" +panel_display_name: "North Area" keyholders { name: "C" path: "Components/KeyHolders/keyHolderC" diff --git a/data/maps/daedalus/rooms/Castle.txtpb b/data/maps/daedalus/rooms/Castle.txtpb index 4797e80..7fd9a81 100644 --- a/data/maps/daedalus/rooms/Castle.txtpb +++ b/data/maps/daedalus/rooms/Castle.txtpb @@ -1,5 +1,5 @@ name: "Castle" -display_name: "Castle" +panel_display_name: "Castle" panels { name: "REVERSE" path: "Panels/Castle Interior/panel_flip" diff --git a/data/maps/daedalus/rooms/Coin Tower.txtpb b/data/maps/daedalus/rooms/Coin Tower.txtpb index 032ece3..177fc6e 100644 --- a/data/maps/daedalus/rooms/Coin Tower.txtpb +++ b/data/maps/daedalus/rooms/Coin Tower.txtpb @@ -1,5 +1,5 @@ name: "Coin Tower" -display_name: "Northeast Area" +panel_display_name: "Northeast Area" panels { name: "RAIN" path: "Panels/Entry/db_2" diff --git a/data/maps/daedalus/rooms/Composite Room NE.txtpb b/data/maps/daedalus/rooms/Composite Room NE.txtpb index a4b13cd..c91a06f 100644 --- a/data/maps/daedalus/rooms/Composite Room NE.txtpb +++ b/data/maps/daedalus/rooms/Composite Room NE.txtpb @@ -1,5 +1,5 @@ name: "Composite Room NE" -display_name: "Composite Room" +panel_display_name: "Composite Room" panels { name: "<-" path: "Panels/Combo Room NE/panel_1" diff --git a/data/maps/daedalus/rooms/Composite Room NW.txtpb b/data/maps/daedalus/rooms/Composite Room NW.txtpb index 94f987b..949fe31 100644 --- a/data/maps/daedalus/rooms/Composite Room NW.txtpb +++ b/data/maps/daedalus/rooms/Composite Room NW.txtpb @@ -1,5 +1,5 @@ name: "Composite Room NW" -display_name: "Composite Room" +panel_display_name: "Composite Room" panels { name: "BEHOUSE" path: "Panels/Combo Room NW/panel_1" diff --git a/data/maps/daedalus/rooms/Composite Room S.txtpb b/data/maps/daedalus/rooms/Composite Room S.txtpb index ec36ac3..3773034 100644 --- a/data/maps/daedalus/rooms/Composite Room S.txtpb +++ b/data/maps/daedalus/rooms/Composite Room S.txtpb @@ -1,5 +1,5 @@ name: "Composite Room S" -display_name: "Composite Room" +panel_display_name: "Composite Room" panels { name: "CONCAVE" path: "Panels/Combo Room SW/panel_1" diff --git a/data/maps/daedalus/rooms/Computer Room Seal.txtpb b/data/maps/daedalus/rooms/Computer Room Seal.txtpb index 19dcf3a..b271a5c 100644 --- a/data/maps/daedalus/rooms/Computer Room Seal.txtpb +++ b/data/maps/daedalus/rooms/Computer Room Seal.txtpb @@ -1,5 +1,5 @@ name: "Computer Room Seal" -display_name: "Computer Room" +panel_display_name: "Computer Room" panels { name: "SCROLL" path: "Panels/Computer/computer_11" diff --git a/data/maps/daedalus/rooms/Computer Room.txtpb b/data/maps/daedalus/rooms/Computer Room.txtpb index 9cc6cbf..1d5a56d 100644 --- a/data/maps/daedalus/rooms/Computer Room.txtpb +++ b/data/maps/daedalus/rooms/Computer Room.txtpb @@ -1,5 +1,5 @@ name: "Computer Room" -display_name: "Computer Room" +panel_display_name: "Computer Room" panels { name: "MONITOR (1)" path: "Panels/Computer/computer_1" diff --git a/data/maps/daedalus/rooms/Cyan Room.txtpb b/data/maps/daedalus/rooms/Cyan Room.txtpb index 8430dcd..60a3595 100644 --- a/data/maps/daedalus/rooms/Cyan Room.txtpb +++ b/data/maps/daedalus/rooms/Cyan Room.txtpb @@ -1,5 +1,5 @@ name: "Cyan Room" -display_name: "West Area" +panel_display_name: "Cyan Room" panels { name: "LIFE" path: "Panels/Brown Room/panel_1" diff --git a/data/maps/daedalus/rooms/D Keyholder.txtpb b/data/maps/daedalus/rooms/D Keyholder.txtpb index d2f226b..2521ab2 100644 --- a/data/maps/daedalus/rooms/D Keyholder.txtpb +++ b/data/maps/daedalus/rooms/D Keyholder.txtpb @@ -1,5 +1,5 @@ name: "D Keyholder" -display_name: "Plum Room" +panel_display_name: "Plum Room" keyholders { name: "D" path: "Components/KeyHolders/keyHolderD" diff --git a/data/maps/daedalus/rooms/D2 Room.txtpb b/data/maps/daedalus/rooms/D2 Room.txtpb index cfc645d..ec41086 100644 --- a/data/maps/daedalus/rooms/D2 Room.txtpb +++ b/data/maps/daedalus/rooms/D2 Room.txtpb @@ -1,5 +1,5 @@ name: "D2 Room" -display_name: "Intense Room" +panel_display_name: "Intense Room" letters { key: "d" level2: true diff --git a/data/maps/daedalus/rooms/Dark Light Exit.txtpb b/data/maps/daedalus/rooms/Dark Light Exit.txtpb index 9c4d674..53b01f3 100644 --- a/data/maps/daedalus/rooms/Dark Light Exit.txtpb +++ b/data/maps/daedalus/rooms/Dark Light Exit.txtpb @@ -1,5 +1,5 @@ name: "Dark Light Exit" -display_name: "Outside Pumpkin" +panel_display_name: "Outside Pumpkin" panels { name: "GASKET" path: "Panels/Dark Light Room/dark_7" diff --git a/data/maps/daedalus/rooms/Dark Light Room.txtpb b/data/maps/daedalus/rooms/Dark Light Room.txtpb index 4716a36..dcd6347 100644 --- a/data/maps/daedalus/rooms/Dark Light Room.txtpb +++ b/data/maps/daedalus/rooms/Dark Light Room.txtpb @@ -1,5 +1,5 @@ name: "Dark Light Room" -display_name: "Outside Pumpkin" +panel_display_name: "Outside Pumpkin" panels { name: "COIN (1)" path: "Panels/Dark Light Room/dark_1" diff --git a/data/maps/daedalus/rooms/Ending.txtpb b/data/maps/daedalus/rooms/Ending.txtpb index b8d91c0..6b7843c 100644 --- a/data/maps/daedalus/rooms/Ending.txtpb +++ b/data/maps/daedalus/rooms/Ending.txtpb @@ -1,5 +1,5 @@ name: "Ending" -display_name: "Castle" +panel_display_name: "Castle" endings { name: "ORANGE" path: "Components/Triggers/orange_ending" diff --git a/data/maps/daedalus/rooms/Entry Shortcut.txtpb b/data/maps/daedalus/rooms/Entry Shortcut.txtpb index a94d84c..63202ba 100644 --- a/data/maps/daedalus/rooms/Entry Shortcut.txtpb +++ b/data/maps/daedalus/rooms/Entry Shortcut.txtpb @@ -1,11 +1,12 @@ name: "Entry Shortcut" -display_name: "Central" +panel_display_name: "Central" panels { name: "WELCOME" path: "Panels/Entry/entry_3" clue: "welcome" answer: "back" symbols: QUESTION + display_name: "WELCOME (Red/Blue)" } ports { name: "ENTRY" diff --git a/data/maps/daedalus/rooms/Eye Painting.txtpb b/data/maps/daedalus/rooms/Eye Painting.txtpb index d4c7cc6..4214811 100644 --- a/data/maps/daedalus/rooms/Eye Painting.txtpb +++ b/data/maps/daedalus/rooms/Eye Painting.txtpb @@ -1,5 +1,5 @@ name: "Eye Painting" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" panels { name: "REVILED" path: "Panels/Entry/entry_5" diff --git a/data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb b/data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb index 0e914d5..3eb1a6b 100644 --- a/data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb +++ b/data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb @@ -1,5 +1,5 @@ name: "Eye Temple 1F Side" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" paintings { name: "EYEREDSIDE1" path: "Components/Paintings/Temple of the Eyes/eyeRedSide1" diff --git a/data/maps/daedalus/rooms/Eye Temple 1F.txtpb b/data/maps/daedalus/rooms/Eye Temple 1F.txtpb index 9e8dc12..e15afc1 100644 --- a/data/maps/daedalus/rooms/Eye Temple 1F.txtpb +++ b/data/maps/daedalus/rooms/Eye Temple 1F.txtpb @@ -1,5 +1,5 @@ name: "Eye Temple 1F" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" paintings { name: "EYEREDTOEXITMAIN2" path: "Components/Paintings/Temple of the Eyes/eyeRedToExitMain2" diff --git a/data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb b/data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb index b78a413..7a1eb0a 100644 --- a/data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb +++ b/data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb @@ -1,5 +1,5 @@ name: "Eye Temple 2F Side" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" paintings { name: "EYEREDTOEXITMAIN4" path: "Components/Paintings/Temple of the Eyes/eyeRedToExitMain4" diff --git a/data/maps/daedalus/rooms/Eye Temple 2F.txtpb b/data/maps/daedalus/rooms/Eye Temple 2F.txtpb index b564e7e..d9e06d9 100644 --- a/data/maps/daedalus/rooms/Eye Temple 2F.txtpb +++ b/data/maps/daedalus/rooms/Eye Temple 2F.txtpb @@ -1,5 +1,5 @@ name: "Eye Temple 2F" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" paintings { name: "EYEREDEXITTOP1" path: "Components/Paintings/Temple of the Eyes/eyeRedExitTop1" diff --git a/data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb b/data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb index 7fccfb2..8243704 100644 --- a/data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb +++ b/data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb @@ -1,5 +1,5 @@ name: "Eye Temple Pillar 1" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" paintings { name: "EYEREDEXITPILLAR1" path: "Components/Paintings/Temple of the Eyes/eyeRedExitPillar1" diff --git a/data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb b/data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb index 88b468e..445649a 100644 --- a/data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb +++ b/data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb @@ -1,5 +1,5 @@ name: "Eye Temple Pillar 2" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" paintings { name: "EYEREDEXITPILLAR2" path: "Components/Paintings/Temple of the Eyes/eyeRedExitPillar2" diff --git a/data/maps/daedalus/rooms/F Keyholder.txtpb b/data/maps/daedalus/rooms/F Keyholder.txtpb index 8063161..662f76d 100644 --- a/data/maps/daedalus/rooms/F Keyholder.txtpb +++ b/data/maps/daedalus/rooms/F Keyholder.txtpb @@ -1,5 +1,5 @@ name: "F Keyholder" -display_name: "West Area" +panel_display_name: "West Area" keyholders { name: "F" path: "Components/KeyHolders/keyHolderF" diff --git a/data/maps/daedalus/rooms/F2 Prize.txtpb b/data/maps/daedalus/rooms/F2 Prize.txtpb index 7a062f1..ac95340 100644 --- a/data/maps/daedalus/rooms/F2 Prize.txtpb +++ b/data/maps/daedalus/rooms/F2 Prize.txtpb @@ -1,5 +1,5 @@ name: "F2 Prize" -display_name: "F2 Room" +panel_display_name: "F2 Room" letters { key: "f" level2: true diff --git a/data/maps/daedalus/rooms/F2 Room.txtpb b/data/maps/daedalus/rooms/F2 Room.txtpb index 49872ec..96b609e 100644 --- a/data/maps/daedalus/rooms/F2 Room.txtpb +++ b/data/maps/daedalus/rooms/F2 Room.txtpb @@ -1,5 +1,5 @@ name: "F2 Room" -display_name: "F2 Room" +panel_display_name: "F2 Room" panels { name: "DULLS" path: "Panels/The Big F/o_1" diff --git a/data/maps/daedalus/rooms/Flip Painting Destination.txtpb b/data/maps/daedalus/rooms/Flip Painting Destination.txtpb index 99ceb25..b3ec055 100644 --- a/data/maps/daedalus/rooms/Flip Painting Destination.txtpb +++ b/data/maps/daedalus/rooms/Flip Painting Destination.txtpb @@ -1,5 +1,5 @@ name: "Flip Painting Destination" -display_name: "Central" +panel_display_name: "Central" paintings { name: "FLIP" path: "Components/Paintings/Group2/flip" diff --git a/data/maps/daedalus/rooms/Flip Painting Hidden Panel.txtpb b/data/maps/daedalus/rooms/Flip Painting Hidden Panel.txtpb index 71d345e..d597114 100644 --- a/data/maps/daedalus/rooms/Flip Painting Hidden Panel.txtpb +++ b/data/maps/daedalus/rooms/Flip Painting Hidden Panel.txtpb @@ -1,5 +1,5 @@ name: "Flip Painting Hidden Panel" -display_name: "Central" +panel_display_name: "Central" panels { name: "HIDDEN" path: "Panels/Halls/halls_2" @@ -8,4 +8,5 @@ panels { symbols: SUN proxies { answer: "covert" path: "Panels/Halls/secret_proxy_1" } proxies { answer: "secret" path: "Panels/Halls/secret_proxy_2" } + display_name: "HIDDEN (East)" } diff --git a/data/maps/daedalus/rooms/Flip Painting.txtpb b/data/maps/daedalus/rooms/Flip Painting.txtpb index cea1273..6d9bf06 100644 --- a/data/maps/daedalus/rooms/Flip Painting.txtpb +++ b/data/maps/daedalus/rooms/Flip Painting.txtpb @@ -1,5 +1,5 @@ name: "Flip Painting" -display_name: "West Area" +panel_display_name: "West Area" paintings { name: "FLIP2" path: "Components/Paintings/Group2/flip2" diff --git a/data/maps/daedalus/rooms/Gallery Entrance.txtpb b/data/maps/daedalus/rooms/Gallery Entrance.txtpb index bed708f..3616bf7 100644 --- a/data/maps/daedalus/rooms/Gallery Entrance.txtpb +++ b/data/maps/daedalus/rooms/Gallery Entrance.txtpb @@ -1,5 +1,5 @@ name: "Gallery Entrance" -display_name: "Central" +panel_display_name: "Central" paintings { name: "GALLERY" path: "Components/Warps/eyeWorldport" diff --git a/data/maps/daedalus/rooms/Globe Room.txtpb b/data/maps/daedalus/rooms/Globe Room.txtpb index 49488f0..b090ac6 100644 --- a/data/maps/daedalus/rooms/Globe Room.txtpb +++ b/data/maps/daedalus/rooms/Globe Room.txtpb @@ -1,5 +1,5 @@ name: "Globe Room" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "NORTH" path: "Panels/Halls/directions_1" diff --git a/data/maps/daedalus/rooms/Godot Room.txtpb b/data/maps/daedalus/rooms/Godot Room.txtpb index a9c89ec..92cf009 100644 --- a/data/maps/daedalus/rooms/Godot Room.txtpb +++ b/data/maps/daedalus/rooms/Godot Room.txtpb @@ -1,5 +1,5 @@ name: "Godot Room" -display_name: "Central" +panel_display_name: "Central" panels { name: "MOTORCYCLE" path: "Panels/Southwest Room/sw_1" diff --git a/data/maps/daedalus/rooms/Gray Color Backside.txtpb b/data/maps/daedalus/rooms/Gray Color Backside.txtpb index 8afb97e..7d90b7f 100644 --- a/data/maps/daedalus/rooms/Gray Color Backside.txtpb +++ b/data/maps/daedalus/rooms/Gray Color Backside.txtpb @@ -1,5 +1,5 @@ name: "Gray Color Backside" -display_name: "Outside Pumpkin" +panel_display_name: "Outside Pumpkin" panels { name: "ORANGE" path: "Panels/Hexes/lightgreen_1" diff --git a/data/maps/daedalus/rooms/Gray Color Door.txtpb b/data/maps/daedalus/rooms/Gray Color Door.txtpb index f8298ff..db46389 100644 --- a/data/maps/daedalus/rooms/Gray Color Door.txtpb +++ b/data/maps/daedalus/rooms/Gray Color Door.txtpb @@ -1,5 +1,5 @@ name: "Gray Color Door" -display_name: "Outside Pumpkin" +panel_display_name: "Outside Pumpkin" panels { name: "PATCH" path: "Panels/Halls/halls_3" diff --git a/data/maps/daedalus/rooms/Green Color Door.txtpb b/data/maps/daedalus/rooms/Green Color Door.txtpb index 275a3fa..fe52c09 100644 --- a/data/maps/daedalus/rooms/Green Color Door.txtpb +++ b/data/maps/daedalus/rooms/Green Color Door.txtpb @@ -1,5 +1,5 @@ name: "Green Color Door" -display_name: "Outside Pumpkin" +panel_display_name: "Outside Pumpkin" panels { name: "OLD (1)" path: "Panels/Halls/halls_20" diff --git a/data/maps/daedalus/rooms/Green Room.txtpb b/data/maps/daedalus/rooms/Green Room.txtpb index 3b1cde1..d93ee4a 100644 --- a/data/maps/daedalus/rooms/Green Room.txtpb +++ b/data/maps/daedalus/rooms/Green Room.txtpb @@ -1,5 +1,5 @@ name: "Green Room" -display_name: "Green Room" +panel_display_name: "Green Room" panels { name: "TIMESCALE" path: "Panels/Green Room/panel_1" diff --git a/data/maps/daedalus/rooms/Green Smiley.txtpb b/data/maps/daedalus/rooms/Green Smiley.txtpb index 7827f45..18f067f 100644 --- a/data/maps/daedalus/rooms/Green Smiley.txtpb +++ b/data/maps/daedalus/rooms/Green Smiley.txtpb @@ -1,5 +1,5 @@ name: "Green Smiley" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "SMILE" path: "Panels/Smiley Rooms/green" diff --git a/data/maps/daedalus/rooms/Hedges Tower.txtpb b/data/maps/daedalus/rooms/Hedges Tower.txtpb index 97fe935..3031c1d 100644 --- a/data/maps/daedalus/rooms/Hedges Tower.txtpb +++ b/data/maps/daedalus/rooms/Hedges Tower.txtpb @@ -1,5 +1,5 @@ name: "Hedges Tower" -display_name: "Hedges" +panel_display_name: "Hedges" ports { name: "TENACIOUS" path: "Components/Warps/Worldports/worldport13" diff --git a/data/maps/daedalus/rooms/Hedges.txtpb b/data/maps/daedalus/rooms/Hedges.txtpb index e467f7c..69c66a9 100644 --- a/data/maps/daedalus/rooms/Hedges.txtpb +++ b/data/maps/daedalus/rooms/Hedges.txtpb @@ -1,5 +1,5 @@ name: "Hedges" -display_name: "Hedges" +panel_display_name: "Hedges" panels { name: "SOLVE" path: "Panels/Tower Maze/maze_1" diff --git a/data/maps/daedalus/rooms/Hotel.txtpb b/data/maps/daedalus/rooms/Hotel.txtpb index 9834c3f..d2a05db 100644 --- a/data/maps/daedalus/rooms/Hotel.txtpb +++ b/data/maps/daedalus/rooms/Hotel.txtpb @@ -1,5 +1,5 @@ name: "Hotel" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" # TODO: Something has to be changed in-game so that the puzzles don't disappear # and thus cause them to become unsolvable. panels { diff --git a/data/maps/daedalus/rooms/House Entrance.txtpb b/data/maps/daedalus/rooms/House Entrance.txtpb index 99bf58e..06dcb3f 100644 --- a/data/maps/daedalus/rooms/House Entrance.txtpb +++ b/data/maps/daedalus/rooms/House Entrance.txtpb @@ -1,5 +1,5 @@ name: "House Entrance" -display_name: "Maze" +panel_display_name: "Maze" panels { name: "ADULT" path: "Panels/Entry/entry_6" diff --git a/data/maps/daedalus/rooms/House.txtpb b/data/maps/daedalus/rooms/House.txtpb index fcf938d..3cfd4d8 100644 --- a/data/maps/daedalus/rooms/House.txtpb +++ b/data/maps/daedalus/rooms/House.txtpb @@ -1,5 +1,5 @@ name: "House" -display_name: "House" +panel_display_name: "House" panels { name: "GOAT" path: "Panels/Theos House/panel_1" diff --git a/data/maps/daedalus/rooms/I2 Room.txtpb b/data/maps/daedalus/rooms/I2 Room.txtpb index ac9e7d5..2735a3b 100644 --- a/data/maps/daedalus/rooms/I2 Room.txtpb +++ b/data/maps/daedalus/rooms/I2 Room.txtpb @@ -1,5 +1,5 @@ name: "I2 Room" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" letters { key: "i" level2: true diff --git a/data/maps/daedalus/rooms/Intense Room.txtpb b/data/maps/daedalus/rooms/Intense Room.txtpb index ce1cd08..30780f9 100644 --- a/data/maps/daedalus/rooms/Intense Room.txtpb +++ b/data/maps/daedalus/rooms/Intense Room.txtpb @@ -1,5 +1,5 @@ name: "Intense Room" -display_name: "Intense Room" +panel_display_name: "Intense Room" panels { name: "BRILLIANT" path: "Panels/Intense Room/intense_1" diff --git a/data/maps/daedalus/rooms/J2 Room.txtpb b/data/maps/daedalus/rooms/J2 Room.txtpb index 48ae0c2..20211d9 100644 --- a/data/maps/daedalus/rooms/J2 Room.txtpb +++ b/data/maps/daedalus/rooms/J2 Room.txtpb @@ -1,5 +1,5 @@ name: "J2 Room" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" letters { key: "j" level2: true diff --git a/data/maps/daedalus/rooms/J2 Vestibule.txtpb b/data/maps/daedalus/rooms/J2 Vestibule.txtpb index a7f786d..57f5a4f 100644 --- a/data/maps/daedalus/rooms/J2 Vestibule.txtpb +++ b/data/maps/daedalus/rooms/J2 Vestibule.txtpb @@ -1,9 +1,10 @@ name: "J2 Vestibule" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "COLORFUL" path: "Panels/Entry/hotel_entry2" clue: "colorful" answer: "vivid" symbols: SUN + display_name: "COLORFUL (2)" } diff --git a/data/maps/daedalus/rooms/Magic Room.txtpb b/data/maps/daedalus/rooms/Magic Room.txtpb index c16dca6..66c63ca 100644 --- a/data/maps/daedalus/rooms/Magic Room.txtpb +++ b/data/maps/daedalus/rooms/Magic Room.txtpb @@ -1,5 +1,5 @@ name: "Magic Room" -display_name: "Maze" +panel_display_name: "Maze" panels { name: "1" path: "Panels/Magic Maze/maze_1" diff --git a/data/maps/daedalus/rooms/Maze Paintings Area.txtpb b/data/maps/daedalus/rooms/Maze Paintings Area.txtpb index 42a45c5..3b070f7 100644 --- a/data/maps/daedalus/rooms/Maze Paintings Area.txtpb +++ b/data/maps/daedalus/rooms/Maze Paintings Area.txtpb @@ -1,5 +1,5 @@ name: "Maze Paintings Area" -display_name: "Maze" +panel_display_name: "Maze" panels { name: "Paintings" path: "Panels/Halls/halls_28" diff --git a/data/maps/daedalus/rooms/Maze.txtpb b/data/maps/daedalus/rooms/Maze.txtpb index 0329465..a2bb5a3 100644 --- a/data/maps/daedalus/rooms/Maze.txtpb +++ b/data/maps/daedalus/rooms/Maze.txtpb @@ -1,2 +1,2 @@ name: "Maze" -display_name: "Maze" +panel_display_name: "Maze" diff --git a/data/maps/daedalus/rooms/Moat.txtpb b/data/maps/daedalus/rooms/Moat.txtpb index f834609..cbb5d16 100644 --- a/data/maps/daedalus/rooms/Moat.txtpb +++ b/data/maps/daedalus/rooms/Moat.txtpb @@ -1,5 +1,5 @@ name: "Moat" -display_name: "East Area" +panel_display_name: "East Area" paintings { name: "CASTLE" path: "Components/Paintings/Group1/castle" diff --git a/data/maps/daedalus/rooms/North Castle Area.txtpb b/data/maps/daedalus/rooms/North Castle Area.txtpb index 6d177c9..a549245 100644 --- a/data/maps/daedalus/rooms/North Castle Area.txtpb +++ b/data/maps/daedalus/rooms/North Castle Area.txtpb @@ -1,5 +1,5 @@ name: "North Castle Area" -display_name: "North Area" +panel_display_name: "North Area" panels { name: "A" path: "Panels/Castle Entrance/castle_north_helper" diff --git a/data/maps/daedalus/rooms/Number Paintings Area.txtpb b/data/maps/daedalus/rooms/Number Paintings Area.txtpb index fb01075..15c8875 100644 --- a/data/maps/daedalus/rooms/Number Paintings Area.txtpb +++ b/data/maps/daedalus/rooms/Number Paintings Area.txtpb @@ -1,5 +1,5 @@ name: "Number Paintings Area" -display_name: "Northwest Area" +panel_display_name: "Northwest Area" panels { name: "GOING" path: "Panels/Entry/g_hedge_1" diff --git a/data/maps/daedalus/rooms/Nursery.txtpb b/data/maps/daedalus/rooms/Nursery.txtpb index cd1b5e3..c73072d 100644 --- a/data/maps/daedalus/rooms/Nursery.txtpb +++ b/data/maps/daedalus/rooms/Nursery.txtpb @@ -1,5 +1,5 @@ name: "Nursery" -display_name: "Central" +panel_display_name: "Central" panels { name: "Paintings" path: "Panels/Entry/entry_2" @@ -12,6 +12,7 @@ panels { path: "Panels/Halls/halls_17" clue: "" answer: "welcome" + display_name: "Nursery Behind" } paintings { name: "ARE" diff --git a/data/maps/daedalus/rooms/O2 Prize.txtpb b/data/maps/daedalus/rooms/O2 Prize.txtpb index 0a81954..a810182 100644 --- a/data/maps/daedalus/rooms/O2 Prize.txtpb +++ b/data/maps/daedalus/rooms/O2 Prize.txtpb @@ -1,5 +1,5 @@ name: "O2 Prize" -display_name: "O2 Room" +panel_display_name: "O2 Room" letters { key: "o" level2: true diff --git a/data/maps/daedalus/rooms/O2 Room.txtpb b/data/maps/daedalus/rooms/O2 Room.txtpb index 7ea3ce2..b1a839f 100644 --- a/data/maps/daedalus/rooms/O2 Room.txtpb +++ b/data/maps/daedalus/rooms/O2 Room.txtpb @@ -1,5 +1,5 @@ name: "O2 Room" -display_name: "O2 Room" +panel_display_name: "O2 Room" panels { name: "LISTEN" path: "Panels/The Big O/o_1" diff --git a/data/maps/daedalus/rooms/Orange Room.txtpb b/data/maps/daedalus/rooms/Orange Room.txtpb index ba1bedd..08a0ff2 100644 --- a/data/maps/daedalus/rooms/Orange Room.txtpb +++ b/data/maps/daedalus/rooms/Orange Room.txtpb @@ -1,5 +1,5 @@ name: "Orange Room" -display_name: "East Area" +panel_display_name: "Orange Room" panels { name: "FRANCE" path: "Panels/Orange Room/panel_1" diff --git a/data/maps/daedalus/rooms/Outside Book Room.txtpb b/data/maps/daedalus/rooms/Outside Book Room.txtpb index a8e647f..1592217 100644 --- a/data/maps/daedalus/rooms/Outside Book Room.txtpb +++ b/data/maps/daedalus/rooms/Outside Book Room.txtpb @@ -1,5 +1,5 @@ name: "Outside Book Room" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" # This is behind a teal wall. panels { name: "TEAL" diff --git a/data/maps/daedalus/rooms/Outside Eye Temple.txtpb b/data/maps/daedalus/rooms/Outside Eye Temple.txtpb index c7d35fd..85a9c19 100644 --- a/data/maps/daedalus/rooms/Outside Eye Temple.txtpb +++ b/data/maps/daedalus/rooms/Outside Eye Temple.txtpb @@ -1,5 +1,5 @@ name: "Outside Eye Temple" -display_name: "Temple of the Eyes" +panel_display_name: "Temple of the Eyes" panels { name: "Entrance" path: "Panels/Halls/eye_temple_entry_1" diff --git a/data/maps/daedalus/rooms/Outside Hedges.txtpb b/data/maps/daedalus/rooms/Outside Hedges.txtpb index b157beb..9f32e26 100644 --- a/data/maps/daedalus/rooms/Outside Hedges.txtpb +++ b/data/maps/daedalus/rooms/Outside Hedges.txtpb @@ -1,5 +1,5 @@ name: "Outside Hedges" -display_name: "Hedges" +panel_display_name: "Hedges" panels { name: "GOURD (1)" path: "Panels/Halls/halls_11" diff --git a/data/maps/daedalus/rooms/Outside Hotel.txtpb b/data/maps/daedalus/rooms/Outside Hotel.txtpb index 62b5a41..7766c7d 100644 --- a/data/maps/daedalus/rooms/Outside Hotel.txtpb +++ b/data/maps/daedalus/rooms/Outside Hotel.txtpb @@ -1,9 +1,10 @@ name: "Outside Hotel" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "COLORFUL" path: "Panels/Entry/hotel_entry" clue: "colorful" answer: "bright" symbols: SUN + display_name: "COLORFUL (1)" } diff --git a/data/maps/daedalus/rooms/Outside House.txtpb b/data/maps/daedalus/rooms/Outside House.txtpb index 8a5e911..fd3f5f0 100644 --- a/data/maps/daedalus/rooms/Outside House.txtpb +++ b/data/maps/daedalus/rooms/Outside House.txtpb @@ -1,5 +1,5 @@ name: "Outside House" -display_name: "Maze" +panel_display_name: "Maze" panels { name: "WHISPER" path: "Panels/Beehalls/beehalls_1" diff --git a/data/maps/daedalus/rooms/Outside Magic Room.txtpb b/data/maps/daedalus/rooms/Outside Magic Room.txtpb index ef45563..2aa7848 100644 --- a/data/maps/daedalus/rooms/Outside Magic Room.txtpb +++ b/data/maps/daedalus/rooms/Outside Magic Room.txtpb @@ -1,5 +1,5 @@ name: "Outside Magic Room" -display_name: "Maze" +panel_display_name: "Maze" panels { name: "WIZARD" path: "Panels/Magic Maze/maze_entry_1" diff --git a/data/maps/daedalus/rooms/Outside Orange Room.txtpb b/data/maps/daedalus/rooms/Outside Orange Room.txtpb index a50db78..55efe34 100644 --- a/data/maps/daedalus/rooms/Outside Orange Room.txtpb +++ b/data/maps/daedalus/rooms/Outside Orange Room.txtpb @@ -1,5 +1,5 @@ name: "Outside Orange Room" -display_name: "East Area" +panel_display_name: "East Area" panels { name: "SMILE" path: "Panels/Smiley Rooms/orange" diff --git a/data/maps/daedalus/rooms/Outside Pyramid.txtpb b/data/maps/daedalus/rooms/Outside Pyramid.txtpb index fd7ef21..247d3a8 100644 --- a/data/maps/daedalus/rooms/Outside Pyramid.txtpb +++ b/data/maps/daedalus/rooms/Outside Pyramid.txtpb @@ -1,5 +1,5 @@ name: "Outside Pyramid" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "PEER" path: "Panels/Pyramid/pyramid_entry" diff --git a/data/maps/daedalus/rooms/Outside Red Room.txtpb b/data/maps/daedalus/rooms/Outside Red Room.txtpb index e5be363..307633b 100644 --- a/data/maps/daedalus/rooms/Outside Red Room.txtpb +++ b/data/maps/daedalus/rooms/Outside Red Room.txtpb @@ -1,5 +1,5 @@ name: "Outside Red Room" -display_name: "Red Room" +panel_display_name: "Red Room" panels { name: "ROCK" path: "Panels/Red Room/red_entry" diff --git a/data/maps/daedalus/rooms/Outside Salt Room.txtpb b/data/maps/daedalus/rooms/Outside Salt Room.txtpb index 3d374f8..f5c4833 100644 --- a/data/maps/daedalus/rooms/Outside Salt Room.txtpb +++ b/data/maps/daedalus/rooms/Outside Salt Room.txtpb @@ -1,9 +1,10 @@ name: "Outside Salt Room" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "Colors" path: "Panels/Color Reading/cr_1" clue: "" answer: "rob" symbols: LINGO + display_name: "Colors (White)" } diff --git a/data/maps/daedalus/rooms/Outside Snake Room.txtpb b/data/maps/daedalus/rooms/Outside Snake Room.txtpb index b65ee77..31f3281 100644 --- a/data/maps/daedalus/rooms/Outside Snake Room.txtpb +++ b/data/maps/daedalus/rooms/Outside Snake Room.txtpb @@ -1,5 +1,5 @@ name: "Outside Snake Room" -display_name: "West Area" +panel_display_name: "West Area" panels { name: "TONGUE" path: "Panels/Pairs Room/pairs_7" diff --git a/data/maps/daedalus/rooms/Pains Room.txtpb b/data/maps/daedalus/rooms/Pains Room.txtpb index cc0c7bb..d5c9c4a 100644 --- a/data/maps/daedalus/rooms/Pains Room.txtpb +++ b/data/maps/daedalus/rooms/Pains Room.txtpb @@ -1,5 +1,5 @@ name: "Pains Room" -display_name: "Central" +panel_display_name: "Central" panels { name: "MOO" path: "Panels/Gold/gold_1" diff --git a/data/maps/daedalus/rooms/Pairs Room.txtpb b/data/maps/daedalus/rooms/Pairs Room.txtpb index ca5e885..ba484bf 100644 --- a/data/maps/daedalus/rooms/Pairs Room.txtpb +++ b/data/maps/daedalus/rooms/Pairs Room.txtpb @@ -1,2 +1,2 @@ name: "Pairs Room" -display_name: "West Area" +panel_display_name: "West Area" diff --git a/data/maps/daedalus/rooms/Pepper Room.txtpb b/data/maps/daedalus/rooms/Pepper Room.txtpb index 074869f..104efa7 100644 --- a/data/maps/daedalus/rooms/Pepper Room.txtpb +++ b/data/maps/daedalus/rooms/Pepper Room.txtpb @@ -1,9 +1,10 @@ name: "Pepper Room" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "SEASONING" path: "Panels/Color Reading/cr_4" clue: "seasoning" answer: "pepper" symbols: EXAMPLE + display_name: "SEASONING (Black)" } diff --git a/data/maps/daedalus/rooms/Plum Room.txtpb b/data/maps/daedalus/rooms/Plum Room.txtpb index 90243a4..36185b9 100644 --- a/data/maps/daedalus/rooms/Plum Room.txtpb +++ b/data/maps/daedalus/rooms/Plum Room.txtpb @@ -1,5 +1,5 @@ name: "Plum Room" -display_name: "Plum Room" +panel_display_name: "Plum Room" panels { name: "GOD" path: "Panels/Plum Room/plum_1" diff --git a/data/maps/daedalus/rooms/Post Orange Smiley Three Way.txtpb b/data/maps/daedalus/rooms/Post Orange Smiley Three Way.txtpb index 868ff86..63463f0 100644 --- a/data/maps/daedalus/rooms/Post Orange Smiley Three Way.txtpb +++ b/data/maps/daedalus/rooms/Post Orange Smiley Three Way.txtpb @@ -1,2 +1,2 @@ name: "Post Orange Smiley Three Way" -display_name: "West Area" +panel_display_name: "West Area" diff --git a/data/maps/daedalus/rooms/Pumpkin Entrance.txtpb b/data/maps/daedalus/rooms/Pumpkin Entrance.txtpb index c7fc3d1..a746746 100644 --- a/data/maps/daedalus/rooms/Pumpkin Entrance.txtpb +++ b/data/maps/daedalus/rooms/Pumpkin Entrance.txtpb @@ -1,5 +1,5 @@ name: "Pumpkin Entrance" -display_name: "East Area" +panel_display_name: "East Area" panels { name: "JACK" path: "Panels/Pumpkin Room/pumpkin_2" diff --git a/data/maps/daedalus/rooms/Pumpkin Room.txtpb b/data/maps/daedalus/rooms/Pumpkin Room.txtpb index 345b372..e40693b 100644 --- a/data/maps/daedalus/rooms/Pumpkin Room.txtpb +++ b/data/maps/daedalus/rooms/Pumpkin Room.txtpb @@ -1,5 +1,5 @@ name: "Pumpkin Room" -display_name: "East Area" +panel_display_name: "East Area" panels { name: "BONE" path: "Panels/Pumpkin Room/pumpkin_3" diff --git a/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb b/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb index fef68e9..5284133 100644 --- a/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb +++ b/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb @@ -1,5 +1,5 @@ name: "Purple Hallway From Great" -display_name: "South Area" +panel_display_name: "South Area" ports { name: "GREAT" path: "Components/Warps/Worldports/worldport17" diff --git a/data/maps/daedalus/rooms/Purple NW Vestibule.txtpb b/data/maps/daedalus/rooms/Purple NW Vestibule.txtpb index 6aedce9..0244e6c 100644 --- a/data/maps/daedalus/rooms/Purple NW Vestibule.txtpb +++ b/data/maps/daedalus/rooms/Purple NW Vestibule.txtpb @@ -1,5 +1,5 @@ name: "Purple NW Vestibule" -display_name: "Central" +panel_display_name: "Central" panels { name: "MESSAGES" path: "Panels/Purple Exterior/purple_8" diff --git a/data/maps/daedalus/rooms/Purple Room East.txtpb b/data/maps/daedalus/rooms/Purple Room East.txtpb index a866868..6fa31bd 100644 --- a/data/maps/daedalus/rooms/Purple Room East.txtpb +++ b/data/maps/daedalus/rooms/Purple Room East.txtpb @@ -1,2 +1,2 @@ name: "Purple Room East" -display_name: "Central" +panel_display_name: "Central" diff --git a/data/maps/daedalus/rooms/Purple Room South.txtpb b/data/maps/daedalus/rooms/Purple Room South.txtpb index b6a25e6..68a6264 100644 --- a/data/maps/daedalus/rooms/Purple Room South.txtpb +++ b/data/maps/daedalus/rooms/Purple Room South.txtpb @@ -1,5 +1,5 @@ name: "Purple Room South" -display_name: "Central" +panel_display_name: "Central" panels { name: "LITTLE" path: "Panels/Halls/hof_1" diff --git a/data/maps/daedalus/rooms/Purple Room West.txtpb b/data/maps/daedalus/rooms/Purple Room West.txtpb index 8c20399..9971cd2 100644 --- a/data/maps/daedalus/rooms/Purple Room West.txtpb +++ b/data/maps/daedalus/rooms/Purple Room West.txtpb @@ -1,2 +1,2 @@ name: "Purple Room West" -display_name: "Central" +panel_display_name: "Central" diff --git a/data/maps/daedalus/rooms/Purple Room.txtpb b/data/maps/daedalus/rooms/Purple Room.txtpb index 612f8d8..f34d26c 100644 --- a/data/maps/daedalus/rooms/Purple Room.txtpb +++ b/data/maps/daedalus/rooms/Purple Room.txtpb @@ -1,5 +1,5 @@ name: "Purple Room" -display_name: "Central" +panel_display_name: "Purple Room" panels { name: "HOIST" path: "Panels/Purple Room/purple_1" diff --git a/data/maps/daedalus/rooms/Purple SE Vestibule.txtpb b/data/maps/daedalus/rooms/Purple SE Vestibule.txtpb index 5f34151..be86861 100644 --- a/data/maps/daedalus/rooms/Purple SE Vestibule.txtpb +++ b/data/maps/daedalus/rooms/Purple SE Vestibule.txtpb @@ -1,5 +1,5 @@ name: "Purple SE Vestibule" -display_name: "Central" +panel_display_name: "Central" panels { name: "RUN" path: "Panels/Purple Exterior/purple_1" diff --git a/data/maps/daedalus/rooms/Purple SW Vestibule.txtpb b/data/maps/daedalus/rooms/Purple SW Vestibule.txtpb index 05acc75..fbc5fff 100644 --- a/data/maps/daedalus/rooms/Purple SW Vestibule.txtpb +++ b/data/maps/daedalus/rooms/Purple SW Vestibule.txtpb @@ -1,5 +1,5 @@ name: "Purple SW Vestibule" -display_name: "Central" +panel_display_name: "Central" panels { name: "LETTERS" path: "Panels/Purple Exterior/purple_11" diff --git a/data/maps/daedalus/rooms/Purple Smiley.txtpb b/data/maps/daedalus/rooms/Purple Smiley.txtpb index 515336f..5f6c989 100644 --- a/data/maps/daedalus/rooms/Purple Smiley.txtpb +++ b/data/maps/daedalus/rooms/Purple Smiley.txtpb @@ -1,5 +1,5 @@ name: "Purple Smiley" -display_name: "Northeast Area" +panel_display_name: "Northeast Area" panels { name: "SMILE" path: "Panels/Smiley Rooms/purple" diff --git a/data/maps/daedalus/rooms/Pyramid 3.txtpb b/data/maps/daedalus/rooms/Pyramid 3.txtpb index f760ab0..be862d1 100644 --- a/data/maps/daedalus/rooms/Pyramid 3.txtpb +++ b/data/maps/daedalus/rooms/Pyramid 3.txtpb @@ -1,5 +1,5 @@ name: "Pyramid 3" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "VEHICLE" path: "Panels/Pyramid/pyramid_3" diff --git a/data/maps/daedalus/rooms/Pyramid 4.txtpb b/data/maps/daedalus/rooms/Pyramid 4.txtpb index 3247ffa..e67e1c6 100644 --- a/data/maps/daedalus/rooms/Pyramid 4.txtpb +++ b/data/maps/daedalus/rooms/Pyramid 4.txtpb @@ -1,5 +1,5 @@ name: "Pyramid 4" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "CAT" path: "Panels/Pyramid/pyramid_4" diff --git a/data/maps/daedalus/rooms/Pyramid 5.txtpb b/data/maps/daedalus/rooms/Pyramid 5.txtpb index fc05e50..42e8a52 100644 --- a/data/maps/daedalus/rooms/Pyramid 5.txtpb +++ b/data/maps/daedalus/rooms/Pyramid 5.txtpb @@ -1,5 +1,5 @@ name: "Pyramid 5" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "ROYAL" path: "Panels/Pyramid/pyramid_5" diff --git a/data/maps/daedalus/rooms/Pyramid 6.txtpb b/data/maps/daedalus/rooms/Pyramid 6.txtpb index 78efb0c..3a7346b 100644 --- a/data/maps/daedalus/rooms/Pyramid 6.txtpb +++ b/data/maps/daedalus/rooms/Pyramid 6.txtpb @@ -1,5 +1,5 @@ name: "Pyramid 6" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "TEA" path: "Panels/Pyramid/pyramid_6" diff --git a/data/maps/daedalus/rooms/Pyramid 7.txtpb b/data/maps/daedalus/rooms/Pyramid 7.txtpb index bf4ebc6..2db71ea 100644 --- a/data/maps/daedalus/rooms/Pyramid 7.txtpb +++ b/data/maps/daedalus/rooms/Pyramid 7.txtpb @@ -1,5 +1,5 @@ name: "Pyramid 7" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "ARTIST" path: "Panels/Pyramid/pyramid_7" diff --git a/data/maps/daedalus/rooms/Pyramid 8.txtpb b/data/maps/daedalus/rooms/Pyramid 8.txtpb index f65fc69..6f61340 100644 --- a/data/maps/daedalus/rooms/Pyramid 8.txtpb +++ b/data/maps/daedalus/rooms/Pyramid 8.txtpb @@ -1,9 +1,10 @@ name: "Pyramid 8" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "INSTRUMENT" path: "Panels/Pyramid/pyramid_8" clue: "instrument" answer: "drum" symbols: EXAMPLE + display_name: "INSTRUMENT (1F)" } diff --git a/data/maps/daedalus/rooms/Pyramid Entry.txtpb b/data/maps/daedalus/rooms/Pyramid Entry.txtpb index 3bb531f..2c9e841 100644 --- a/data/maps/daedalus/rooms/Pyramid Entry.txtpb +++ b/data/maps/daedalus/rooms/Pyramid Entry.txtpb @@ -1,5 +1,5 @@ name: "Pyramid Entry" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "TREE" path: "Panels/Pyramid/pyramid_1" diff --git a/data/maps/daedalus/rooms/Pyramid Second Floor.txtpb b/data/maps/daedalus/rooms/Pyramid Second Floor.txtpb index e7578e8..86f5f2a 100644 --- a/data/maps/daedalus/rooms/Pyramid Second Floor.txtpb +++ b/data/maps/daedalus/rooms/Pyramid Second Floor.txtpb @@ -1,5 +1,5 @@ name: "Pyramid Second Floor" -display_name: "Pyramid" +panel_display_name: "Pyramid" panels { name: "TOOL" path: "Panels/Pyramid/pyramid_10" @@ -36,6 +36,7 @@ panels { answer: "organ" symbols: EXAMPLE required_door { name: "Pyramid 13 Blocker" } + display_name: "INSTRUMENT (2F)" } panels { name: "BEVERAGE" diff --git a/data/maps/daedalus/rooms/Pyramid Top.txtpb b/data/maps/daedalus/rooms/Pyramid Top.txtpb index b3938fd..c017cd6 100644 --- a/data/maps/daedalus/rooms/Pyramid Top.txtpb +++ b/data/maps/daedalus/rooms/Pyramid Top.txtpb @@ -1,5 +1,5 @@ name: "Pyramid Top" -display_name: "Pyramid" +panel_display_name: "Pyramid" letters { key: "r" level2: true diff --git a/data/maps/daedalus/rooms/Quiet Entrance.txtpb b/data/maps/daedalus/rooms/Quiet Entrance.txtpb index 21e0f68..08fbcc7 100644 --- a/data/maps/daedalus/rooms/Quiet Entrance.txtpb +++ b/data/maps/daedalus/rooms/Quiet Entrance.txtpb @@ -1,5 +1,5 @@ name: "Quiet Entrance" -display_name: "Central" +panel_display_name: "Central" panels { name: "HIDDEN" path: "Panels/Halls/halls_7" @@ -8,6 +8,7 @@ panels { symbols: SUN proxies { answer: "covert" path: "Panels/Halls/secret_proxy_3" } proxies { answer: "secret" path: "Panels/Halls/secret_proxy_4" } + display_name: "HIDDEN (West)" } paintings { name: "PLANET2" diff --git a/data/maps/daedalus/rooms/Rain Side.txtpb b/data/maps/daedalus/rooms/Rain Side.txtpb index 63e95c8..6906aef 100644 --- a/data/maps/daedalus/rooms/Rain Side.txtpb +++ b/data/maps/daedalus/rooms/Rain Side.txtpb @@ -1,11 +1,12 @@ name: "Rain Side" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "?" path: "Panels/Smiley Rooms/rain" clue: "" answer: "rain" symbols: QUESTION + display_name: "? (1)" } ports { name: "BEARER" diff --git a/data/maps/daedalus/rooms/Rainbow Blue.txtpb b/data/maps/daedalus/rooms/Rainbow Blue.txtpb index b566cbb..516a9b6 100644 --- a/data/maps/daedalus/rooms/Rainbow Blue.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Blue.txtpb @@ -1,9 +1,10 @@ name: "Rainbow Blue" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "THEME" path: "Panels/Smiley Rooms/blue2" clue: "theme" answer: "seasonings" symbols: QUESTION + display_name: "THEME (Blue)" } diff --git a/data/maps/daedalus/rooms/Rainbow Color Backside.txtpb b/data/maps/daedalus/rooms/Rainbow Color Backside.txtpb index 3fb3a5c..d9b49c5 100644 --- a/data/maps/daedalus/rooms/Rainbow Color Backside.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Color Backside.txtpb @@ -1,5 +1,5 @@ name: "Rainbow Color Backside" -display_name: "Central" +panel_display_name: "Central" panels { name: "BACKSIDE" path: "Panels/Halls/halls_1" @@ -11,4 +11,5 @@ panels { path: "Panels/Halls/halls_4" clue: "" answer: "side" + display_name: "Backside Behind" } diff --git a/data/maps/daedalus/rooms/Rainbow Color Doors.txtpb b/data/maps/daedalus/rooms/Rainbow Color Doors.txtpb index 3204d28..df44979 100644 --- a/data/maps/daedalus/rooms/Rainbow Color Doors.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Color Doors.txtpb @@ -1,5 +1,5 @@ name: "Rainbow Color Doors" -display_name: "East Area" +panel_display_name: "East Area" panels { name: "CROW" path: "Panels/Blue Room/panel_entry" diff --git a/data/maps/daedalus/rooms/Rainbow Cyan.txtpb b/data/maps/daedalus/rooms/Rainbow Cyan.txtpb index 9ce8b3f..f55b0d2 100644 --- a/data/maps/daedalus/rooms/Rainbow Cyan.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Cyan.txtpb @@ -1,9 +1,10 @@ name: "Rainbow Cyan" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "THEME" path: "Panels/Smiley Rooms/cyan" clue: "theme" answer: "apocalypse" symbols: QUESTION + display_name: "THEME (Cyan)" } diff --git a/data/maps/daedalus/rooms/Rainbow End.txtpb b/data/maps/daedalus/rooms/Rainbow End.txtpb index 27f3c4f..ec623c7 100644 --- a/data/maps/daedalus/rooms/Rainbow End.txtpb +++ b/data/maps/daedalus/rooms/Rainbow End.txtpb @@ -1,5 +1,5 @@ name: "Rainbow End" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "POT" path: "Components/Warps/gold" diff --git a/data/maps/daedalus/rooms/Rainbow Green.txtpb b/data/maps/daedalus/rooms/Rainbow Green.txtpb index 84de8a5..85bb8be 100644 --- a/data/maps/daedalus/rooms/Rainbow Green.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Green.txtpb @@ -1,9 +1,10 @@ name: "Rainbow Green" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "THEME" path: "Panels/Smiley Rooms/green2" clue: "theme" answer: "tea" symbols: QUESTION + display_name: "THEME (Green)" } diff --git a/data/maps/daedalus/rooms/Rainbow Orange.txtpb b/data/maps/daedalus/rooms/Rainbow Orange.txtpb index 290c061..785eda8 100644 --- a/data/maps/daedalus/rooms/Rainbow Orange.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Orange.txtpb @@ -1,9 +1,10 @@ name: "Rainbow Orange" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "THEME" path: "Panels/Smiley Rooms/orange2" clue: "theme" answer: "fish" symbols: QUESTION + display_name: "THEME (Orange)" } diff --git a/data/maps/daedalus/rooms/Rainbow Purple.txtpb b/data/maps/daedalus/rooms/Rainbow Purple.txtpb index 698af59..1f585dd 100644 --- a/data/maps/daedalus/rooms/Rainbow Purple.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Purple.txtpb @@ -1,9 +1,10 @@ name: "Rainbow Purple" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "THEME" path: "Panels/Smiley Rooms/purple2" clue: "theme" answer: "fruit" symbols: QUESTION + display_name: "THEME (Purple)" } diff --git a/data/maps/daedalus/rooms/Rainbow Red.txtpb b/data/maps/daedalus/rooms/Rainbow Red.txtpb index 92dbda0..7ef4db3 100644 --- a/data/maps/daedalus/rooms/Rainbow Red.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Red.txtpb @@ -1,9 +1,10 @@ name: "Rainbow Red" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "THEME" path: "Panels/Smiley Rooms/red2" clue: "theme" answer: "names" symbols: QUESTION + display_name: "THEME (Red)" } diff --git a/data/maps/daedalus/rooms/Rainbow Start.txtpb b/data/maps/daedalus/rooms/Rainbow Start.txtpb index e0d5dc1..c46b762 100644 --- a/data/maps/daedalus/rooms/Rainbow Start.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Start.txtpb @@ -1,5 +1,5 @@ name: "Rainbow Start" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "PAINTING" path: "Panels/Smiley Rooms/rainbow" diff --git a/data/maps/daedalus/rooms/Rainbow Yellow.txtpb b/data/maps/daedalus/rooms/Rainbow Yellow.txtpb index bbbdce4..bd2cfc5 100644 --- a/data/maps/daedalus/rooms/Rainbow Yellow.txtpb +++ b/data/maps/daedalus/rooms/Rainbow Yellow.txtpb @@ -1,9 +1,10 @@ name: "Rainbow Yellow" -display_name: "Rainbow" +panel_display_name: "Rainbow" panels { name: "THEME" path: "Panels/Smiley Rooms/yellow2" clue: "theme" answer: "music" symbols: QUESTION + display_name: "THEME (Yellow)" } diff --git a/data/maps/daedalus/rooms/Red Color Door.txtpb b/data/maps/daedalus/rooms/Red Color Door.txtpb index a2f40a5..f7eab21 100644 --- a/data/maps/daedalus/rooms/Red Color Door.txtpb +++ b/data/maps/daedalus/rooms/Red Color Door.txtpb @@ -1,5 +1,5 @@ name: "Red Color Door" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "Left" path: "Panels/Halls/wb_1" @@ -67,4 +67,5 @@ panels { clue: "" answer: "bank" symbols: LINGO + display_name: "Colors (Black)" } diff --git a/data/maps/daedalus/rooms/Red Room.txtpb b/data/maps/daedalus/rooms/Red Room.txtpb index 99f0a1e..d73f591 100644 --- a/data/maps/daedalus/rooms/Red Room.txtpb +++ b/data/maps/daedalus/rooms/Red Room.txtpb @@ -1,5 +1,5 @@ name: "Red Room" -display_name: "Red Room" +panel_display_name: "Red Room" panels { name: "BLINDING" path: "Panels/Red Room/red_1" diff --git a/data/maps/daedalus/rooms/Red Smiley.txtpb b/data/maps/daedalus/rooms/Red Smiley.txtpb index 6f7c41c..28f2a03 100644 --- a/data/maps/daedalus/rooms/Red Smiley.txtpb +++ b/data/maps/daedalus/rooms/Red Smiley.txtpb @@ -1,5 +1,5 @@ name: "Red Smiley" -display_name: "Northwest Area" +panel_display_name: "Northwest Area" panels { name: "SMILE" path: "Panels/Smiley Rooms/red" diff --git a/data/maps/daedalus/rooms/Salt Room.txtpb b/data/maps/daedalus/rooms/Salt Room.txtpb index 0c7fe73..39c9c9f 100644 --- a/data/maps/daedalus/rooms/Salt Room.txtpb +++ b/data/maps/daedalus/rooms/Salt Room.txtpb @@ -1,9 +1,10 @@ name: "Salt Room" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "SEASONING" path: "Panels/Color Reading/cr_3" clue: "seasoning" answer: "salt" symbols: EXAMPLE + display_name: "SEASONING (White)" } diff --git a/data/maps/daedalus/rooms/Seasoning Room.txtpb b/data/maps/daedalus/rooms/Seasoning Room.txtpb index d3123b9..6159134 100644 --- a/data/maps/daedalus/rooms/Seasoning Room.txtpb +++ b/data/maps/daedalus/rooms/Seasoning Room.txtpb @@ -1,5 +1,5 @@ name: "Seasoning Room" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" panels { name: "PARITY" path: "Panels/Color Reading/cr_5" diff --git a/data/maps/daedalus/rooms/Snake Room.txtpb b/data/maps/daedalus/rooms/Snake Room.txtpb index f3cea2e..fb947ab 100644 --- a/data/maps/daedalus/rooms/Snake Room.txtpb +++ b/data/maps/daedalus/rooms/Snake Room.txtpb @@ -1,5 +1,5 @@ name: "Snake Room" -display_name: "West Area" +panel_display_name: "West Area" panels { name: "HISS" path: "Panels/Snake Room/snake_1" diff --git a/data/maps/daedalus/rooms/South Castle Area.txtpb b/data/maps/daedalus/rooms/South Castle Area.txtpb index 9e9f389..4bb73f3 100644 --- a/data/maps/daedalus/rooms/South Castle Area.txtpb +++ b/data/maps/daedalus/rooms/South Castle Area.txtpb @@ -1,5 +1,5 @@ name: "South Castle Area" -display_name: "Outside Pumpkin" +panel_display_name: "Outside Pumpkin" # There is a teal wall in the middle of this room. panels { name: "AN" diff --git a/data/maps/daedalus/rooms/Starting Room.txtpb b/data/maps/daedalus/rooms/Starting Room.txtpb index 615104b..62fc96a 100644 --- a/data/maps/daedalus/rooms/Starting Room.txtpb +++ b/data/maps/daedalus/rooms/Starting Room.txtpb @@ -1,5 +1,5 @@ name: "Starting Room" -display_name: "Central" +panel_display_name: "Central" panels { name: "ENTRANCE" path: "Panels/Entry/entry_1" diff --git a/data/maps/daedalus/rooms/Sweet Foyer.txtpb b/data/maps/daedalus/rooms/Sweet Foyer.txtpb index d337e7e..03c8262 100644 --- a/data/maps/daedalus/rooms/Sweet Foyer.txtpb +++ b/data/maps/daedalus/rooms/Sweet Foyer.txtpb @@ -1,5 +1,5 @@ name: "Sweet Foyer" -display_name: "South Area" +panel_display_name: "South Area" panels { name: "QUALITY" path: "Panels/Sweet Foyer/panel_1" diff --git a/data/maps/daedalus/rooms/Tree Entrance.txtpb b/data/maps/daedalus/rooms/Tree Entrance.txtpb index df2db7e..2b98178 100644 --- a/data/maps/daedalus/rooms/Tree Entrance.txtpb +++ b/data/maps/daedalus/rooms/Tree Entrance.txtpb @@ -1,5 +1,5 @@ name: "Tree Entrance" -display_name: "Outside Pumpkin" +panel_display_name: "Outside Pumpkin" panels { name: "RAT" path: "Panels/Hexes/lime_1" diff --git a/data/maps/daedalus/rooms/U2 Prize.txtpb b/data/maps/daedalus/rooms/U2 Prize.txtpb index 947af67..571b0c8 100644 --- a/data/maps/daedalus/rooms/U2 Prize.txtpb +++ b/data/maps/daedalus/rooms/U2 Prize.txtpb @@ -1,5 +1,5 @@ name: "U2 Prize" -display_name: "U2 Room" +panel_display_name: "U2 Room" letters { key: "u" level2: true diff --git a/data/maps/daedalus/rooms/U2 Room.txtpb b/data/maps/daedalus/rooms/U2 Room.txtpb index c9907eb..1e5879a 100644 --- a/data/maps/daedalus/rooms/U2 Room.txtpb +++ b/data/maps/daedalus/rooms/U2 Room.txtpb @@ -1,5 +1,5 @@ name: "U2 Room" -display_name: "U2 Room" +panel_display_name: "U2 Room" panels { name: "DREAMSCAPE" path: "Panels/The Big U/o_1" diff --git a/data/maps/daedalus/rooms/Unkempt Entrance.txtpb b/data/maps/daedalus/rooms/Unkempt Entrance.txtpb index 192ba9c..c0cb0df 100644 --- a/data/maps/daedalus/rooms/Unkempt Entrance.txtpb +++ b/data/maps/daedalus/rooms/Unkempt Entrance.txtpb @@ -1,5 +1,5 @@ name: "Unkempt Entrance" -display_name: "O2 Room" +panel_display_name: "O2 Room" ports { name: "UNKEMPT" path: "Components/Warps/Worldports/worldport6" diff --git a/data/maps/daedalus/rooms/Welcome Back Area.txtpb b/data/maps/daedalus/rooms/Welcome Back Area.txtpb index 3f320a3..701baca 100644 --- a/data/maps/daedalus/rooms/Welcome Back Area.txtpb +++ b/data/maps/daedalus/rooms/Welcome Back Area.txtpb @@ -1,5 +1,5 @@ name: "Welcome Back Area" -display_name: "Central" +panel_display_name: "Central" panels { name: "FAREWELL LITTLE LAMB" path: "Panels/Entry/wb_2" diff --git a/data/maps/daedalus/rooms/Welcome Back Exit.txtpb b/data/maps/daedalus/rooms/Welcome Back Exit.txtpb index a4a23e2..ac221c7 100644 --- a/data/maps/daedalus/rooms/Welcome Back Exit.txtpb +++ b/data/maps/daedalus/rooms/Welcome Back Exit.txtpb @@ -1,5 +1,5 @@ name: "Welcome Back Exit" -display_name: "Central" +panel_display_name: "Central" panels { name: "WELCOME" path: "Panels/Entry/wb_1" @@ -7,4 +7,5 @@ panels { answer: "welcome" symbols: QUESTION proxies { answer: "back" path: "Panels/Entry/wb_proxy" } + display_name: "WELCOME (White)" } diff --git a/data/maps/daedalus/rooms/West Castle Area.txtpb b/data/maps/daedalus/rooms/West Castle Area.txtpb index 88722f5..010e5d6 100644 --- a/data/maps/daedalus/rooms/West Castle Area.txtpb +++ b/data/maps/daedalus/rooms/West Castle Area.txtpb @@ -1,5 +1,5 @@ name: "West Castle Area" -display_name: "West Area" +panel_display_name: "West Area" panels { name: "SONG (1)" path: "Panels/Castle Entrance/castle_west_helper" diff --git a/data/maps/daedalus/rooms/West Spire.txtpb b/data/maps/daedalus/rooms/West Spire.txtpb index fdf8f9a..7cc579f 100644 --- a/data/maps/daedalus/rooms/West Spire.txtpb +++ b/data/maps/daedalus/rooms/West Spire.txtpb @@ -1,5 +1,5 @@ name: "West Spire" -display_name: "West Area" +panel_display_name: "West Area" panels { name: "MISSING" path: "Panels/Entry/wb_5" diff --git a/data/maps/daedalus/rooms/White Hallway From Entry.txtpb b/data/maps/daedalus/rooms/White Hallway From Entry.txtpb index 2af7584..a172313 100644 --- a/data/maps/daedalus/rooms/White Hallway From Entry.txtpb +++ b/data/maps/daedalus/rooms/White Hallway From Entry.txtpb @@ -1,5 +1,5 @@ name: "White Hallway From Entry" -display_name: "Southwest Area" +panel_display_name: "Southwest Area" # Not exactly sure what to do with this yet. In unshuffled connections, the door # here should be paired with the door on the other end (which is vanilla) even # if control center color doors are shuffled. But when connections are shuffled diff --git a/data/maps/daedalus/rooms/Wisdom Panel.txtpb b/data/maps/daedalus/rooms/Wisdom Panel.txtpb index 5cbf051..d789f2b 100644 --- a/data/maps/daedalus/rooms/Wisdom Panel.txtpb +++ b/data/maps/daedalus/rooms/Wisdom Panel.txtpb @@ -1,5 +1,5 @@ name: "Wisdom Panel" -display_name: "Castle" +panel_display_name: "Castle" panels { name: "INTELLIGENCE" path: "Components/Warps/numbers" diff --git a/data/maps/daedalus/rooms/Wonderland.txtpb b/data/maps/daedalus/rooms/Wonderland.txtpb index 99c124e..4b69e99 100644 --- a/data/maps/daedalus/rooms/Wonderland.txtpb +++ b/data/maps/daedalus/rooms/Wonderland.txtpb @@ -1,5 +1,5 @@ name: "Wonderland" -display_name: "Northwest Area" +panel_display_name: "Northwest Area" # TODO: There's a warp from The Entry into here. panels { name: "APRIL" diff --git a/data/maps/daedalus/rooms/Yellow Color Backside.txtpb b/data/maps/daedalus/rooms/Yellow Color Backside.txtpb index 931e501..1c29b43 100644 --- a/data/maps/daedalus/rooms/Yellow Color Backside.txtpb +++ b/data/maps/daedalus/rooms/Yellow Color Backside.txtpb @@ -1,5 +1,5 @@ name: "Yellow Color Backside" -display_name: "Northeast Area" +panel_display_name: "Northeast Area" panels { name: "WINDS" path: "Panels/Halls/halls_24" diff --git a/data/maps/daedalus/rooms/Yellow Color Door.txtpb b/data/maps/daedalus/rooms/Yellow Color Door.txtpb index a098c91..f22c954 100644 --- a/data/maps/daedalus/rooms/Yellow Color Door.txtpb +++ b/data/maps/daedalus/rooms/Yellow Color Door.txtpb @@ -1,5 +1,5 @@ name: "Yellow Color Door" -display_name: "Northeast Area" +panel_display_name: "Northeast Area" panels { name: "SUN" path: "Panels/Yellow Room/panel_entry" diff --git a/data/maps/daedalus/rooms/Yellow Room.txtpb b/data/maps/daedalus/rooms/Yellow Room.txtpb index 1e84965..b4d8ff0 100644 --- a/data/maps/daedalus/rooms/Yellow Room.txtpb +++ b/data/maps/daedalus/rooms/Yellow Room.txtpb @@ -1,5 +1,5 @@ name: "Yellow Room" -display_name: "Northeast Area" +panel_display_name: "Yellow Room" panels { name: "FREE" path: "Panels/Yellow Room/panel_1" diff --git a/data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb b/data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb index fa059c4..cb6c402 100644 --- a/data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb +++ b/data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb @@ -1,5 +1,5 @@ name: "Yellow Smiley Annex" -display_name: "Hedges" +panel_display_name: "Hedges" panels { name: "COW" path: "Panels/Miscellaneous/plum1" diff --git a/data/maps/daedalus/rooms/Z2 Prize.txtpb b/data/maps/daedalus/rooms/Z2 Prize.txtpb index a7dd8fb..7b1ceae 100644 --- a/data/maps/daedalus/rooms/Z2 Prize.txtpb +++ b/data/maps/daedalus/rooms/Z2 Prize.txtpb @@ -1,5 +1,5 @@ name: "Z2 Prize" -display_name: "Northwest Area" +panel_display_name: "Z2 Room" letters { key: "z" level2: true diff --git a/data/maps/daedalus/rooms/Z2 Room.txtpb b/data/maps/daedalus/rooms/Z2 Room.txtpb index 1e84dbc..513150a 100644 --- a/data/maps/daedalus/rooms/Z2 Room.txtpb +++ b/data/maps/daedalus/rooms/Z2 Room.txtpb @@ -1,5 +1,5 @@ name: "Z2 Room" -display_name: "Northwest Area" +panel_display_name: "Z2 Room" panels { name: "EXHIBIT" path: "Panels/V Maze/entry" diff --git a/data/maps/daedalus/rooms/Zoo Center.txtpb b/data/maps/daedalus/rooms/Zoo Center.txtpb index fcf72a1..5a788db 100644 --- a/data/maps/daedalus/rooms/Zoo Center.txtpb +++ b/data/maps/daedalus/rooms/Zoo Center.txtpb @@ -1,5 +1,5 @@ name: "Zoo Center" -display_name: "Zoo" +panel_display_name: "Zoo" letters { key: "v" level2: true diff --git a/data/maps/daedalus/rooms/Zoo E.txtpb b/data/maps/daedalus/rooms/Zoo E.txtpb index 59479dc..3195623 100644 --- a/data/maps/daedalus/rooms/Zoo E.txtpb +++ b/data/maps/daedalus/rooms/Zoo E.txtpb @@ -1,5 +1,5 @@ name: "Zoo E" -display_name: "Zoo" +panel_display_name: "Zoo" panels { name: "WING" path: "Panels/V Maze/four_1" diff --git a/data/maps/daedalus/rooms/Zoo N.txtpb b/data/maps/daedalus/rooms/Zoo N.txtpb index e2c1f5d..d621ed4 100644 --- a/data/maps/daedalus/rooms/Zoo N.txtpb +++ b/data/maps/daedalus/rooms/Zoo N.txtpb @@ -1,5 +1,5 @@ name: "Zoo N" -display_name: "Zoo" +panel_display_name: "Zoo" panels { name: "BILL" path: "Panels/V Maze/four_13" @@ -13,6 +13,7 @@ panels { clue: "fin" answer: "whale" symbols: BOXES + display_name: "FIN (N)" } panels { name: "BLOWHOLE" diff --git a/data/maps/daedalus/rooms/Zoo NE.txtpb b/data/maps/daedalus/rooms/Zoo NE.txtpb index 155172d..89bedae 100644 --- a/data/maps/daedalus/rooms/Zoo NE.txtpb +++ b/data/maps/daedalus/rooms/Zoo NE.txtpb @@ -1,5 +1,5 @@ name: "Zoo NE" -display_name: "Zoo" +panel_display_name: "Zoo" panels { name: "FANG" path: "Panels/V Maze/four_5" diff --git a/data/maps/daedalus/rooms/Zoo S.txtpb b/data/maps/daedalus/rooms/Zoo S.txtpb index f4ddaea..3f3a8de 100644 --- a/data/maps/daedalus/rooms/Zoo S.txtpb +++ b/data/maps/daedalus/rooms/Zoo S.txtpb @@ -1,5 +1,5 @@ name: "Zoo S" -display_name: "Zoo" +panel_display_name: "Zoo" panels { name: "SHELL" path: "Panels/V Maze/four_9" @@ -13,6 +13,7 @@ panels { clue: "fin" answer: "fish" symbols: BOXES + display_name: "FIN (S)" } panels { name: "PINCER" diff --git a/data/maps/daedalus/rooms/Zoo SE.txtpb b/data/maps/daedalus/rooms/Zoo SE.txtpb index 906d009..199f234 100644 --- a/data/maps/daedalus/rooms/Zoo SE.txtpb +++ b/data/maps/daedalus/rooms/Zoo SE.txtpb @@ -1,2 +1,2 @@ name: "Zoo SE" -display_name: "Zoo" +panel_display_name: "Zoo" diff --git a/data/maps/four_rooms/doors.txtpb b/data/maps/four_rooms/doors.txtpb index f0bf060..e58adb2 100644 --- a/data/maps/four_rooms/doors.txtpb +++ b/data/maps/four_rooms/doors.txtpb @@ -11,6 +11,7 @@ doors { panels { room: "Intensify Room" name: "INJURY" } panels { room: "Intensify Room" name: "SWAY" } location_room: "Intensify Room" + location_name: "Intensify Room" } doors { name: "Examples Door" @@ -25,6 +26,7 @@ doors { panels { room: "Examples Room" name: "URN" } panels { room: "Examples Room" name: "ART" } location_room: "Examples Room" + location_name: "Examples Room" } doors { name: "Synonyms Door" @@ -39,6 +41,7 @@ doors { panels { room: "Synonyms Room" name: "SERIOUS" } panels { room: "Synonyms Room" name: "FURY" } location_room: "Synonyms Room" + location_name: "Synonyms Room" } doors { name: "Time Door" @@ -53,6 +56,7 @@ doors { panels { room: "Time Room" name: "HOLE" } panels { room: "Time Room" name: "RHYTHM" } location_room: "Time Room" + location_name: "Time Room" } doors { name: "A2 Door" diff --git a/data/maps/four_rooms/rooms/A2 Room.txtpb b/data/maps/four_rooms/rooms/A2 Room.txtpb index 236ce01..ea2ae64 100644 --- a/data/maps/four_rooms/rooms/A2 Room.txtpb +++ b/data/maps/four_rooms/rooms/A2 Room.txtpb @@ -1,5 +1,4 @@ name: "A2 Room" -display_name: "Hallway" letters { key: "a" level2: true diff --git a/data/maps/four_rooms/rooms/Examples Room.txtpb b/data/maps/four_rooms/rooms/Examples Room.txtpb index 3d82e22..dc82971 100644 --- a/data/maps/four_rooms/rooms/Examples Room.txtpb +++ b/data/maps/four_rooms/rooms/Examples Room.txtpb @@ -1,5 +1,4 @@ name: "Examples Room" -display_name: "Examples Room" panels { name: "SIZE (1)" path: "Panels/Room 2 Examples/entry_1" diff --git a/data/maps/four_rooms/rooms/Hallway.txtpb b/data/maps/four_rooms/rooms/Hallway.txtpb index f80cf73..124a5b3 100644 --- a/data/maps/four_rooms/rooms/Hallway.txtpb +++ b/data/maps/four_rooms/rooms/Hallway.txtpb @@ -1,5 +1,4 @@ name: "Hallway" -display_name: "Hallway" panels { name: "SUSPICION" path: "Panels/Reward Room/reward_1" diff --git a/data/maps/four_rooms/rooms/Intensify Room.txtpb b/data/maps/four_rooms/rooms/Intensify Room.txtpb index fb95a1e..2cbb214 100644 --- a/data/maps/four_rooms/rooms/Intensify Room.txtpb +++ b/data/maps/four_rooms/rooms/Intensify Room.txtpb @@ -1,5 +1,4 @@ name: "Intensify Room" -display_name: "Intensify Room" panels { name: "SMALL" path: "Panels/Room 1 Intensify/entry_1" diff --git a/data/maps/four_rooms/rooms/Keyholder Room.txtpb b/data/maps/four_rooms/rooms/Keyholder Room.txtpb index 9605fad..e7c7fa6 100644 --- a/data/maps/four_rooms/rooms/Keyholder Room.txtpb +++ b/data/maps/four_rooms/rooms/Keyholder Room.txtpb @@ -1,5 +1,4 @@ name: "Keyholder Room" -display_name: "Hallway" keyholders { name: "A" path: "Components/KeyHolders/keyHolderA" diff --git a/data/maps/four_rooms/rooms/Synonyms Room.txtpb b/data/maps/four_rooms/rooms/Synonyms Room.txtpb index 054e4ef..4dd5b5d 100644 --- a/data/maps/four_rooms/rooms/Synonyms Room.txtpb +++ b/data/maps/four_rooms/rooms/Synonyms Room.txtpb @@ -1,5 +1,4 @@ name: "Synonyms Room" -display_name: "Synonyms Room" panels { name: "MINUTE" path: "Panels/Room 3 Synonyms/entry_1" diff --git a/data/maps/four_rooms/rooms/Time Room.txtpb b/data/maps/four_rooms/rooms/Time Room.txtpb index 38f529d..d684685 100644 --- a/data/maps/four_rooms/rooms/Time Room.txtpb +++ b/data/maps/four_rooms/rooms/Time Room.txtpb @@ -1,5 +1,4 @@ name: "Time Room" -display_name: "Time Room" panels { name: "BROODING" path: "Panels/Room 4 Time/entry_1" diff --git a/data/maps/the_ancient/rooms/Ending.txtpb b/data/maps/the_ancient/rooms/Ending.txtpb index eea1228..df3fe01 100644 --- a/data/maps/the_ancient/rooms/Ending.txtpb +++ b/data/maps/the_ancient/rooms/Ending.txtpb @@ -1,5 +1,4 @@ name: "Ending" -display_name: "Ending" endings { name: "GREEN" path: "Components/Ending/green_ending" diff --git a/data/maps/the_ancient/rooms/Inside.txtpb b/data/maps/the_ancient/rooms/Inside.txtpb index d088682..d6e8575 100644 --- a/data/maps/the_ancient/rooms/Inside.txtpb +++ b/data/maps/the_ancient/rooms/Inside.txtpb @@ -1,5 +1,4 @@ name: "Inside" -display_name: "Inside" panels { name: "COLOR" path: "Panels/panel_2" diff --git a/data/maps/the_ancient/rooms/Outside.txtpb b/data/maps/the_ancient/rooms/Outside.txtpb index 6f49bba..a3372af 100644 --- a/data/maps/the_ancient/rooms/Outside.txtpb +++ b/data/maps/the_ancient/rooms/Outside.txtpb @@ -1,5 +1,4 @@ name: "Outside" -display_name: "Outside" panels { name: "THIS" path: "Panels/panel_1" diff --git a/data/maps/the_bearer/doors.txtpb b/data/maps/the_bearer/doors.txtpb index 1faddef..574ea8f 100644 --- a/data/maps/the_bearer/doors.txtpb +++ b/data/maps/the_bearer/doors.txtpb @@ -211,7 +211,7 @@ doors { } doors { name: "Q2 Door" - type: STANDARD + type: EVENT receivers: "Components/Doors/entry_3" panels { room: "Entry" name: "SQUISH" } panels { room: "Entry" name: "MANE" } @@ -237,7 +237,6 @@ doors { panels { room: "Red Vegetable" name: "CARD" } panels { room: "Yellow Planet" name: "ZEUS" } panels { room: "Yellow Vegetable" name: "CAKE" } - location_room: "Entry" } doors { name: "Control Center Brown Door" diff --git a/data/maps/the_bearer/rooms/Back Area.txtpb b/data/maps/the_bearer/rooms/Back Area.txtpb index bd90b50..27e175c 100644 --- a/data/maps/the_bearer/rooms/Back Area.txtpb +++ b/data/maps/the_bearer/rooms/Back Area.txtpb @@ -1,5 +1,4 @@ name: "Back Area" -display_name: "Back Area" panels { name: "COLOR" path: "Panels/Entry/panel_3" diff --git a/data/maps/the_bearer/rooms/Blue Animal (View).txtpb b/data/maps/the_bearer/rooms/Blue Animal (View).txtpb index a13ce1d..33c278c 100644 --- a/data/maps/the_bearer/rooms/Blue Animal (View).txtpb +++ b/data/maps/the_bearer/rooms/Blue Animal (View).txtpb @@ -1,5 +1,4 @@ name: "Blue Animal (View)" -display_name: "Main Area" panels { name: "HALF" path: "Panels/Blue/panel_2" diff --git a/data/maps/the_bearer/rooms/Blue Animal.txtpb b/data/maps/the_bearer/rooms/Blue Animal.txtpb index 49ac048..e503c93 100644 --- a/data/maps/the_bearer/rooms/Blue Animal.txtpb +++ b/data/maps/the_bearer/rooms/Blue Animal.txtpb @@ -1,2 +1 @@ name: "Blue Animal" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Blue Planet (View).txtpb b/data/maps/the_bearer/rooms/Blue Planet (View).txtpb index 172565b..e745718 100644 --- a/data/maps/the_bearer/rooms/Blue Planet (View).txtpb +++ b/data/maps/the_bearer/rooms/Blue Planet (View).txtpb @@ -1,5 +1,4 @@ name: "Blue Planet (View)" -display_name: "Main Area" panels { name: "TUNE" path: "Panels/Blue/panel_4" diff --git a/data/maps/the_bearer/rooms/Blue Planet.txtpb b/data/maps/the_bearer/rooms/Blue Planet.txtpb index b291c35..b044590 100644 --- a/data/maps/the_bearer/rooms/Blue Planet.txtpb +++ b/data/maps/the_bearer/rooms/Blue Planet.txtpb @@ -1,2 +1 @@ name: "Blue Planet" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Blue Town (View).txtpb b/data/maps/the_bearer/rooms/Blue Town (View).txtpb index f66eae9..f57fc9b 100644 --- a/data/maps/the_bearer/rooms/Blue Town (View).txtpb +++ b/data/maps/the_bearer/rooms/Blue Town (View).txtpb @@ -1,5 +1,4 @@ name: "Blue Town (View)" -display_name: "Main Area" panels { name: "LICE" path: "Panels/Blue/panel_3" diff --git a/data/maps/the_bearer/rooms/Blue Town.txtpb b/data/maps/the_bearer/rooms/Blue Town.txtpb index b24af76..5ceed12 100644 --- a/data/maps/the_bearer/rooms/Blue Town.txtpb +++ b/data/maps/the_bearer/rooms/Blue Town.txtpb @@ -1,2 +1 @@ name: "Blue Town" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb index f9443fd..cf1ffd3 100644 --- a/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb +++ b/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb @@ -1,5 +1,4 @@ name: "Blue Vegetable (View)" -display_name: "Main Area" panels { name: "THORN" path: "Panels/Blue/panel_1" diff --git a/data/maps/the_bearer/rooms/Blue Vegetable.txtpb b/data/maps/the_bearer/rooms/Blue Vegetable.txtpb index 9034471..64ce77d 100644 --- a/data/maps/the_bearer/rooms/Blue Vegetable.txtpb +++ b/data/maps/the_bearer/rooms/Blue Vegetable.txtpb @@ -1,2 +1 @@ name: "Blue Vegetable" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Butterfly Room.txtpb b/data/maps/the_bearer/rooms/Butterfly Room.txtpb index bd20505..a702737 100644 --- a/data/maps/the_bearer/rooms/Butterfly Room.txtpb +++ b/data/maps/the_bearer/rooms/Butterfly Room.txtpb @@ -1,5 +1,4 @@ name: "Butterfly Room" -display_name: "Back Area" panels { name: "VIBRANT" path: "Panels/Entry/panel_4" diff --git a/data/maps/the_bearer/rooms/Entry.txtpb b/data/maps/the_bearer/rooms/Entry.txtpb index d7a8db6..4300c1f 100644 --- a/data/maps/the_bearer/rooms/Entry.txtpb +++ b/data/maps/the_bearer/rooms/Entry.txtpb @@ -1,5 +1,4 @@ name: "Entry" -display_name: "Main Area" panels { name: "VIEW" path: "Panels/Entry/panel_1" diff --git a/data/maps/the_bearer/rooms/Green Animal.txtpb b/data/maps/the_bearer/rooms/Green Animal.txtpb index 61522cc..147f825 100644 --- a/data/maps/the_bearer/rooms/Green Animal.txtpb +++ b/data/maps/the_bearer/rooms/Green Animal.txtpb @@ -1,2 +1 @@ name: "Green Animal" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Green Planet (View).txtpb b/data/maps/the_bearer/rooms/Green Planet (View).txtpb index 79363bc..4d9f449 100644 --- a/data/maps/the_bearer/rooms/Green Planet (View).txtpb +++ b/data/maps/the_bearer/rooms/Green Planet (View).txtpb @@ -1,5 +1,4 @@ name: "Green Planet (View)" -display_name: "Main Area" panels { name: "SOIL" path: "Panels/Green/panel_4" diff --git a/data/maps/the_bearer/rooms/Green Planet.txtpb b/data/maps/the_bearer/rooms/Green Planet.txtpb index b97b731..efe000a 100644 --- a/data/maps/the_bearer/rooms/Green Planet.txtpb +++ b/data/maps/the_bearer/rooms/Green Planet.txtpb @@ -1,2 +1 @@ name: "Green Planet" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Green Town.txtpb b/data/maps/the_bearer/rooms/Green Town.txtpb index 184ded3..fd80201 100644 --- a/data/maps/the_bearer/rooms/Green Town.txtpb +++ b/data/maps/the_bearer/rooms/Green Town.txtpb @@ -1,2 +1 @@ name: "Green Town" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb index 4bbab5d..98fbbe8 100644 --- a/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb +++ b/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb @@ -1,5 +1,4 @@ name: "Green Vegetable (View)" -display_name: "Main Area" panels { name: "SPIN" path: "Panels/Green/panel_1" diff --git a/data/maps/the_bearer/rooms/Green Vegetable.txtpb b/data/maps/the_bearer/rooms/Green Vegetable.txtpb index ccb817a..051a6d3 100644 --- a/data/maps/the_bearer/rooms/Green Vegetable.txtpb +++ b/data/maps/the_bearer/rooms/Green Vegetable.txtpb @@ -1,2 +1 @@ name: "Green Vegetable" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Orange Planet.txtpb b/data/maps/the_bearer/rooms/Orange Planet.txtpb index 0fbd929..15fae66 100644 --- a/data/maps/the_bearer/rooms/Orange Planet.txtpb +++ b/data/maps/the_bearer/rooms/Orange Planet.txtpb @@ -1,5 +1,4 @@ name: "Orange Planet" -display_name: "Main Area" panels { name: "MAR" path: "Panels/Red/panel_4" diff --git a/data/maps/the_bearer/rooms/Orange Vegetable.txtpb b/data/maps/the_bearer/rooms/Orange Vegetable.txtpb index d4f7b82..e4d59e6 100644 --- a/data/maps/the_bearer/rooms/Orange Vegetable.txtpb +++ b/data/maps/the_bearer/rooms/Orange Vegetable.txtpb @@ -1,5 +1,4 @@ name: "Orange Vegetable" -display_name: "Main Area" panels { name: "POTATO" path: "Panels/Red/panel_1" diff --git a/data/maps/the_bearer/rooms/Overlook.txtpb b/data/maps/the_bearer/rooms/Overlook.txtpb index 384802c..9eadf8f 100644 --- a/data/maps/the_bearer/rooms/Overlook.txtpb +++ b/data/maps/the_bearer/rooms/Overlook.txtpb @@ -1,2 +1 @@ name: "Overlook" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Purple Animal (View).txtpb b/data/maps/the_bearer/rooms/Purple Animal (View).txtpb index 7122059..04ae0f8 100644 --- a/data/maps/the_bearer/rooms/Purple Animal (View).txtpb +++ b/data/maps/the_bearer/rooms/Purple Animal (View).txtpb @@ -1,5 +1,4 @@ name: "Purple Animal (View)" -display_name: "Main Area" panels { name: "SUNBASS" path: "Panels/Purple/panel_2" diff --git a/data/maps/the_bearer/rooms/Purple Animal.txtpb b/data/maps/the_bearer/rooms/Purple Animal.txtpb index 9ddb70e..1c3a52c 100644 --- a/data/maps/the_bearer/rooms/Purple Animal.txtpb +++ b/data/maps/the_bearer/rooms/Purple Animal.txtpb @@ -1,2 +1 @@ name: "Purple Animal" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Purple Planet (View).txtpb b/data/maps/the_bearer/rooms/Purple Planet (View).txtpb index 4ab506d..bacfae6 100644 --- a/data/maps/the_bearer/rooms/Purple Planet (View).txtpb +++ b/data/maps/the_bearer/rooms/Purple Planet (View).txtpb @@ -1,5 +1,4 @@ name: "Purple Planet (View)" -display_name: "Main Area" panels { name: "DOG" path: "Panels/Purple/panel_4" diff --git a/data/maps/the_bearer/rooms/Purple Planet.txtpb b/data/maps/the_bearer/rooms/Purple Planet.txtpb index 37f7ddc..03021d5 100644 --- a/data/maps/the_bearer/rooms/Purple Planet.txtpb +++ b/data/maps/the_bearer/rooms/Purple Planet.txtpb @@ -1,2 +1 @@ name: "Purple Planet" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Purple Town (View).txtpb b/data/maps/the_bearer/rooms/Purple Town (View).txtpb index 40927f4..855e3ea 100644 --- a/data/maps/the_bearer/rooms/Purple Town (View).txtpb +++ b/data/maps/the_bearer/rooms/Purple Town (View).txtpb @@ -1,5 +1,4 @@ name: "Purple Town (View)" -display_name: "Main Area" panels { name: "GRACEFUL" path: "Panels/Purple/panel_3" diff --git a/data/maps/the_bearer/rooms/Purple Town.txtpb b/data/maps/the_bearer/rooms/Purple Town.txtpb index 768f378..b077178 100644 --- a/data/maps/the_bearer/rooms/Purple Town.txtpb +++ b/data/maps/the_bearer/rooms/Purple Town.txtpb @@ -1,2 +1 @@ name: "Purple Town" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb index 182a5bb..1a6ab04 100644 --- a/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb +++ b/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb @@ -1,5 +1,4 @@ name: "Purple Vegetable (View)" -display_name: "Main Area" panels { name: "AUBERGINE" path: "Panels/Purple/panel_1" diff --git a/data/maps/the_bearer/rooms/Purple Vegetable.txtpb b/data/maps/the_bearer/rooms/Purple Vegetable.txtpb index ef5dd7e..380b909 100644 --- a/data/maps/the_bearer/rooms/Purple Vegetable.txtpb +++ b/data/maps/the_bearer/rooms/Purple Vegetable.txtpb @@ -1,2 +1 @@ name: "Purple Vegetable" -display_name: "Main Area" diff --git a/data/maps/the_bearer/rooms/Q2 Room.txtpb b/data/maps/the_bearer/rooms/Q2 Room.txtpb index ab5032a..5cdea80 100644 --- a/data/maps/the_bearer/rooms/Q2 Room.txtpb +++ b/data/maps/the_bearer/rooms/Q2 Room.txtpb @@ -1,5 +1,4 @@ name: "Q2 Room" -display_name: "Back Area" letters { key: "q" level2: true diff --git a/data/maps/the_bearer/rooms/Red Animal.txtpb b/data/maps/the_bearer/rooms/Red Animal.txtpb index 845fbed..d5ae244 100644 --- a/data/maps/the_bearer/rooms/Red Animal.txtpb +++ b/data/maps/the_bearer/rooms/Red Animal.txtpb @@ -1,5 +1,4 @@ name: "Red Animal" -display_name: "Main Area" panels { name: "FOOLSHARK" path: "Panels/Orange/panel_2" diff --git a/data/maps/the_bearer/rooms/Red Planet.txtpb b/data/maps/the_bearer/rooms/Red Planet.txtpb index 55a105d..dd3f2ec 100644 --- a/data/maps/the_bearer/rooms/Red Planet.txtpb +++ b/data/maps/the_bearer/rooms/Red Planet.txtpb @@ -1,5 +1,4 @@ name: "Red Planet" -display_name: "Main Area" panels { name: "FUEL" path: "Panels/Red/panel_3" diff --git a/data/maps/the_bearer/rooms/Red Town.txtpb b/data/maps/the_bearer/rooms/Red Town.txtpb index 8a29ced..ed608cc 100644 --- a/data/maps/the_bearer/rooms/Red Town.txtpb +++ b/data/maps/the_bearer/rooms/Red Town.txtpb @@ -1,5 +1,4 @@ name: "Red Town" -display_name: "Main Area" panels { name: "DESTRUCTION" path: "Panels/Orange/panel_3" diff --git a/data/maps/the_bearer/rooms/Red Vegetable.txtpb b/data/maps/the_bearer/rooms/Red Vegetable.txtpb index 1494e26..fb694db 100644 --- a/data/maps/the_bearer/rooms/Red Vegetable.txtpb +++ b/data/maps/the_bearer/rooms/Red Vegetable.txtpb @@ -1,5 +1,4 @@ name: "Red Vegetable" -display_name: "Main Area" panels { name: "CARD" path: "Panels/Red/panel_2" diff --git a/data/maps/the_bearer/rooms/Yellow Planet.txtpb b/data/maps/the_bearer/rooms/Yellow Planet.txtpb index 9c6d39d..7f8a86b 100644 --- a/data/maps/the_bearer/rooms/Yellow Planet.txtpb +++ b/data/maps/the_bearer/rooms/Yellow Planet.txtpb @@ -1,5 +1,4 @@ name: "Yellow Planet" -display_name: "Main Area" panels { name: "ZEUS" path: "Panels/Orange/panel_4" diff --git a/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb b/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb index 26ef491..f37faa5 100644 --- a/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb +++ b/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb @@ -1,5 +1,4 @@ name: "Yellow Vegetable" -display_name: "Main Area" panels { name: "CAKE" path: "Panels/Orange/panel_1" diff --git a/data/maps/the_between/rooms/B2 Back Room.txtpb b/data/maps/the_between/rooms/B2 Back Room.txtpb index 132ba56..0972ed9 100644 --- a/data/maps/the_between/rooms/B2 Back Room.txtpb +++ b/data/maps/the_between/rooms/B2 Back Room.txtpb @@ -1,5 +1,4 @@ name: "B2 Back Room" -display_name: "B2 Room" letters { key: "b" level2: true diff --git a/data/maps/the_between/rooms/B2 Front Room.txtpb b/data/maps/the_between/rooms/B2 Front Room.txtpb index 02c09fb..f23ed20 100644 --- a/data/maps/the_between/rooms/B2 Front Room.txtpb +++ b/data/maps/the_between/rooms/B2 Front Room.txtpb @@ -1,5 +1,4 @@ name: "B2 Front Room" -display_name: "B2 Room" paintings { name: "EYES" path: "Components/Paintings/eyes" diff --git a/data/maps/the_between/rooms/Control Center Side.txtpb b/data/maps/the_between/rooms/Control Center Side.txtpb index 81bae60..a6a126a 100644 --- a/data/maps/the_between/rooms/Control Center Side.txtpb +++ b/data/maps/the_between/rooms/Control Center Side.txtpb @@ -1,5 +1,4 @@ name: "Control Center Side" -display_name: "Control Center Side" panels { name: "RIGHT" path: "Panels/Helpers/panel_1" diff --git a/data/maps/the_between/rooms/Main Area.txtpb b/data/maps/the_between/rooms/Main Area.txtpb index a8e15a9..a0fc596 100644 --- a/data/maps/the_between/rooms/Main Area.txtpb +++ b/data/maps/the_between/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Main Area" panels { name: "NEW" path: "Panels/Room 1/panel_1" diff --git a/data/maps/the_between/rooms/Plaza Entrance.txtpb b/data/maps/the_between/rooms/Plaza Entrance.txtpb index b99081a..e4d7b19 100644 --- a/data/maps/the_between/rooms/Plaza Entrance.txtpb +++ b/data/maps/the_between/rooms/Plaza Entrance.txtpb @@ -1,5 +1,4 @@ name: "Plaza Entrance" -display_name: "Main Area" ports { name: "PLAZA" path: "Components/Warps/worldport4" diff --git a/data/maps/the_butterfly/rooms/Main Area.txtpb b/data/maps/the_butterfly/rooms/Main Area.txtpb index 9a8b3d5..8b441e4 100644 --- a/data/maps/the_butterfly/rooms/Main Area.txtpb +++ b/data/maps/the_butterfly/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Main Area" panels { name: "SPECIES" path: "Panels/Room_1/panel_1" diff --git a/data/maps/the_butterfly/rooms/Mastery.txtpb b/data/maps/the_butterfly/rooms/Mastery.txtpb index f494fde..bbe8742 100644 --- a/data/maps/the_butterfly/rooms/Mastery.txtpb +++ b/data/maps/the_butterfly/rooms/Mastery.txtpb @@ -1,5 +1,4 @@ name: "Mastery" -display_name: "Main Area" masteries { name: "MASTERY" path: "Components/Collectables/collectable" diff --git a/data/maps/the_colorful/rooms/Black Room.txtpb b/data/maps/the_colorful/rooms/Black Room.txtpb index 75aec81..21a0d41 100644 --- a/data/maps/the_colorful/rooms/Black Room.txtpb +++ b/data/maps/the_colorful/rooms/Black Room.txtpb @@ -1,5 +1,4 @@ name: "Black Room" -display_name: "Black Room" panels { name: "STARK" path: "Panels/Hallway/panel_2" diff --git a/data/maps/the_colorful/rooms/Blue Room.txtpb b/data/maps/the_colorful/rooms/Blue Room.txtpb index c334f6e..ec9337d 100644 --- a/data/maps/the_colorful/rooms/Blue Room.txtpb +++ b/data/maps/the_colorful/rooms/Blue Room.txtpb @@ -1,5 +1,4 @@ name: "Blue Room" -display_name: "Blue Room" panels { name: "VINE" path: "Panels/Hallway/panel_4" diff --git a/data/maps/the_colorful/rooms/Brown Room.txtpb b/data/maps/the_colorful/rooms/Brown Room.txtpb index 8eec879..a5f590b 100644 --- a/data/maps/the_colorful/rooms/Brown Room.txtpb +++ b/data/maps/the_colorful/rooms/Brown Room.txtpb @@ -1,5 +1,4 @@ name: "Brown Room" -display_name: "Brown Room" panels { name: "FIRE" path: "Panels/Hallway/panel_9" diff --git a/data/maps/the_colorful/rooms/Cyan Hallway.txtpb b/data/maps/the_colorful/rooms/Cyan Hallway.txtpb index d6a2425..97ddb0f 100644 --- a/data/maps/the_colorful/rooms/Cyan Hallway.txtpb +++ b/data/maps/the_colorful/rooms/Cyan Hallway.txtpb @@ -1,5 +1,4 @@ name: "Cyan Hallway" -display_name: "Cyan Hallway" panels { name: "KOI" path: "Panels/Extra/panel_12" diff --git a/data/maps/the_colorful/rooms/Cyan Room.txtpb b/data/maps/the_colorful/rooms/Cyan Room.txtpb index 09150ab..3568ec1 100644 --- a/data/maps/the_colorful/rooms/Cyan Room.txtpb +++ b/data/maps/the_colorful/rooms/Cyan Room.txtpb @@ -1,5 +1,4 @@ name: "Cyan Room" -display_name: "Cyan Room" panels { name: "BROTHER" path: "Panels/Cyan/panel_cyan_1" diff --git a/data/maps/the_colorful/rooms/Ending.txtpb b/data/maps/the_colorful/rooms/Ending.txtpb index 060e72e..3aa2b3c 100644 --- a/data/maps/the_colorful/rooms/Ending.txtpb +++ b/data/maps/the_colorful/rooms/Ending.txtpb @@ -1,5 +1,4 @@ name: "Ending" -display_name: "Ending" endings { name: "GRAY" path: "Components/Endings/gray_ending" diff --git a/data/maps/the_colorful/rooms/Gray Room.txtpb b/data/maps/the_colorful/rooms/Gray Room.txtpb index 9d62ebf..6ae6c9c 100644 --- a/data/maps/the_colorful/rooms/Gray Room.txtpb +++ b/data/maps/the_colorful/rooms/Gray Room.txtpb @@ -1,5 +1,4 @@ name: "Gray Room" -display_name: "Gray Room" panels { name: "MEND" path: "Panels/Hallway/panel_11" diff --git a/data/maps/the_colorful/rooms/Green Room.txtpb b/data/maps/the_colorful/rooms/Green Room.txtpb index 3e9dfd5..e438176 100644 --- a/data/maps/the_colorful/rooms/Green Room.txtpb +++ b/data/maps/the_colorful/rooms/Green Room.txtpb @@ -1,5 +1,4 @@ name: "Green Room" -display_name: "Green Room" panels { name: "MOTHER" path: "Panels/Hallway/panel_5" diff --git a/data/maps/the_colorful/rooms/Orange Room.txtpb b/data/maps/the_colorful/rooms/Orange Room.txtpb index b8aa5f8..6728080 100644 --- a/data/maps/the_colorful/rooms/Orange Room.txtpb +++ b/data/maps/the_colorful/rooms/Orange Room.txtpb @@ -1,5 +1,4 @@ name: "Orange Room" -display_name: "Orange Room" panels { name: "CLOUD" path: "Panels/Hallway/panel_8" diff --git a/data/maps/the_colorful/rooms/P2 Room.txtpb b/data/maps/the_colorful/rooms/P2 Room.txtpb index 85dbf20..054d4b4 100644 --- a/data/maps/the_colorful/rooms/P2 Room.txtpb +++ b/data/maps/the_colorful/rooms/P2 Room.txtpb @@ -1,5 +1,4 @@ name: "P2 Room" -display_name: "Cyan Room" letters { key: "p" level2: true diff --git a/data/maps/the_colorful/rooms/Purple Room.txtpb b/data/maps/the_colorful/rooms/Purple Room.txtpb index 9a94650..71b6ad6 100644 --- a/data/maps/the_colorful/rooms/Purple Room.txtpb +++ b/data/maps/the_colorful/rooms/Purple Room.txtpb @@ -1,5 +1,4 @@ name: "Purple Room" -display_name: "Purple Room" panels { name: "FISH" path: "Panels/Hallway/panel_7" diff --git a/data/maps/the_colorful/rooms/Red Room.txtpb b/data/maps/the_colorful/rooms/Red Room.txtpb index 4d262e4..53bbd3a 100644 --- a/data/maps/the_colorful/rooms/Red Room.txtpb +++ b/data/maps/the_colorful/rooms/Red Room.txtpb @@ -1,5 +1,4 @@ name: "Red Room" -display_name: "Red Room" panels { name: "SANDWICH" path: "Panels/Hallway/panel_3" diff --git a/data/maps/the_colorful/rooms/White Room.txtpb b/data/maps/the_colorful/rooms/White Room.txtpb index 497ecff..c2cf33f 100644 --- a/data/maps/the_colorful/rooms/White Room.txtpb +++ b/data/maps/the_colorful/rooms/White Room.txtpb @@ -1,5 +1,4 @@ name: "White Room" -display_name: "White Room" panels { name: "BRIGHT" path: "Panels/Hallway/panel_1" diff --git a/data/maps/the_colorful/rooms/Window Room.txtpb b/data/maps/the_colorful/rooms/Window Room.txtpb index 9e3f8f4..e11d88c 100644 --- a/data/maps/the_colorful/rooms/Window Room.txtpb +++ b/data/maps/the_colorful/rooms/Window Room.txtpb @@ -1,5 +1,4 @@ name: "Window Room" -display_name: "Window Room" panels { name: "FADING" path: "Panels/Hallway/panel_10" diff --git a/data/maps/the_colorful/rooms/Yellow Room.txtpb b/data/maps/the_colorful/rooms/Yellow Room.txtpb index c65e886..40a4b14 100644 --- a/data/maps/the_colorful/rooms/Yellow Room.txtpb +++ b/data/maps/the_colorful/rooms/Yellow Room.txtpb @@ -1,5 +1,4 @@ name: "Yellow Room" -display_name: "Yellow Room" panels { name: "CIRCLE" path: "Panels/Hallway/panel_6" diff --git a/data/maps/the_congruent/doors.txtpb b/data/maps/the_congruent/doors.txtpb index 7c21f55..7c79c00 100644 --- a/data/maps/the_congruent/doors.txtpb +++ b/data/maps/the_congruent/doors.txtpb @@ -17,6 +17,7 @@ doors { panels { room: "Main Area" name: "LABS (1)" } panels { room: "Main Area" name: "LABS (2)" } location_room: "Main Area" + location_name: "Obverse Cyan Large Room" } doors { name: "Flipped Yellow Door" @@ -33,6 +34,7 @@ doors { panels { room: "Flipped Magenta Room" name: "LUST" } panels { room: "Flipped Magenta Room" name: "LAND" } location_room: "Flipped Magenta Room" + location_name: "Flipped Magenta Room" } doors { name: "C Keyholder Blocker" @@ -47,6 +49,7 @@ doors { panels { room: "Flipped Yellow Room" name: "CAVE (1)" } panels { room: "Flipped Yellow Room" name: "CAVE (2)" } location_room: "Flipped Yellow Room" + location_name: "Flipped Yellow Room" } doors { name: "C2 Door" @@ -59,6 +62,7 @@ doors { key: "c" } location_room: "C Keyholder" + location_name: "C Keyholder" } doors { name: "Obverse Yellow Door" @@ -111,6 +115,7 @@ doors { key: "g" } location_room: "G Keyholder" + location_name: "G Keyholder" } doors { name: "T Keyholder Blocker" diff --git a/data/maps/the_congruent/rooms/C Keyholder.txtpb b/data/maps/the_congruent/rooms/C Keyholder.txtpb index 0af0f32..75ef920 100644 --- a/data/maps/the_congruent/rooms/C Keyholder.txtpb +++ b/data/maps/the_congruent/rooms/C Keyholder.txtpb @@ -1,5 +1,4 @@ name: "C Keyholder" -display_name: "Main Area" keyholders { name: "C" path: "Components/KeyHolders/keyHolder" diff --git a/data/maps/the_congruent/rooms/C2 Room.txtpb b/data/maps/the_congruent/rooms/C2 Room.txtpb index 852d4e2..ff53ebd 100644 --- a/data/maps/the_congruent/rooms/C2 Room.txtpb +++ b/data/maps/the_congruent/rooms/C2 Room.txtpb @@ -1,5 +1,4 @@ name: "C2 Room" -display_name: "Main Area" letters { key: "c" level2: true diff --git a/data/maps/the_congruent/rooms/Flipped Magenta Room.txtpb b/data/maps/the_congruent/rooms/Flipped Magenta Room.txtpb index 402e9e0..a51b667 100644 --- a/data/maps/the_congruent/rooms/Flipped Magenta Room.txtpb +++ b/data/maps/the_congruent/rooms/Flipped Magenta Room.txtpb @@ -1,5 +1,4 @@ name: "Flipped Magenta Room" -display_name: "Flipped Magenta Room" panels { name: "LOOK" path: "Panels/Side Up 1/panel_1" diff --git a/data/maps/the_congruent/rooms/Flipped Yellow Room.txtpb b/data/maps/the_congruent/rooms/Flipped Yellow Room.txtpb index 3952373..b407f0d 100644 --- a/data/maps/the_congruent/rooms/Flipped Yellow Room.txtpb +++ b/data/maps/the_congruent/rooms/Flipped Yellow Room.txtpb @@ -1,5 +1,4 @@ name: "Flipped Yellow Room" -display_name: "Flipped Yellow Room" panels { name: "DANCER" path: "Panels/Back 1/panel_1" diff --git a/data/maps/the_congruent/rooms/G Keyholder.txtpb b/data/maps/the_congruent/rooms/G Keyholder.txtpb index c52d7ba..8184703 100644 --- a/data/maps/the_congruent/rooms/G Keyholder.txtpb +++ b/data/maps/the_congruent/rooms/G Keyholder.txtpb @@ -1,5 +1,4 @@ name: "G Keyholder" -display_name: "Obverse Yellow Room" keyholders { name: "G" path: "Components/KeyHolders/keyHolder2" diff --git a/data/maps/the_congruent/rooms/G2 Room.txtpb b/data/maps/the_congruent/rooms/G2 Room.txtpb index 80a23cb..25490a8 100644 --- a/data/maps/the_congruent/rooms/G2 Room.txtpb +++ b/data/maps/the_congruent/rooms/G2 Room.txtpb @@ -1,5 +1,4 @@ name: "G2 Room" -display_name: "Main Area" letters { key: "g" level2: true diff --git a/data/maps/the_congruent/rooms/Main Area.txtpb b/data/maps/the_congruent/rooms/Main Area.txtpb index a783eab..e91f419 100644 --- a/data/maps/the_congruent/rooms/Main Area.txtpb +++ b/data/maps/the_congruent/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Main Area" panels { name: "LANE (1)" path: "Panels/Main/panel_1" diff --git a/data/maps/the_congruent/rooms/Obverse Magenta Room.txtpb b/data/maps/the_congruent/rooms/Obverse Magenta Room.txtpb index b69a4d4..895c4da 100644 --- a/data/maps/the_congruent/rooms/Obverse Magenta Room.txtpb +++ b/data/maps/the_congruent/rooms/Obverse Magenta Room.txtpb @@ -1,5 +1,4 @@ name: "Obverse Magenta Room" -display_name: "Obverse Magenta Room" # TODO: Should these two maybe not be randomizable because they hint the keyholder? paintings { name: "TEA" diff --git a/data/maps/the_congruent/rooms/Obverse Yellow Room.txtpb b/data/maps/the_congruent/rooms/Obverse Yellow Room.txtpb index 334df67..c87efdf 100644 --- a/data/maps/the_congruent/rooms/Obverse Yellow Room.txtpb +++ b/data/maps/the_congruent/rooms/Obverse Yellow Room.txtpb @@ -1,5 +1,4 @@ name: "Obverse Yellow Room" -display_name: "Obverse Yellow Room" panels { name: "CIVIL" path: "Panels/Main/panel_6" diff --git a/data/maps/the_congruent/rooms/T Keyholder.txtpb b/data/maps/the_congruent/rooms/T Keyholder.txtpb index 1cfd2bd..360b030 100644 --- a/data/maps/the_congruent/rooms/T Keyholder.txtpb +++ b/data/maps/the_congruent/rooms/T Keyholder.txtpb @@ -1,5 +1,4 @@ name: "T Keyholder" -display_name: "Obverse Magenta Room" keyholders { name: "T" path: "Components/KeyHolders/keyHolderT" diff --git a/data/maps/the_darkroom/doors.txtpb b/data/maps/the_darkroom/doors.txtpb index e5242ed..ba297e4 100644 --- a/data/maps/the_darkroom/doors.txtpb +++ b/data/maps/the_darkroom/doors.txtpb @@ -44,6 +44,7 @@ doors { panels { room: "First Room" name: "KOI" } panels { room: "First Room" name: "TUNA" } location_room: "First Room" + location_name: "All Puzzles" } doors { name: "Congruent Entrance" @@ -55,6 +56,7 @@ doors { panels { room: "Second Room" name: "KOI" } panels { room: "Second Room" name: "TUNA" } location_room: "Second Room" + location_name: "All Puzzles" } doors { name: "Double Sided Entrance" diff --git a/data/maps/the_darkroom/rooms/First Room.txtpb b/data/maps/the_darkroom/rooms/First Room.txtpb index f79d055..c93f5b4 100644 --- a/data/maps/the_darkroom/rooms/First Room.txtpb +++ b/data/maps/the_darkroom/rooms/First Room.txtpb @@ -1,5 +1,5 @@ name: "First Room" -display_name: "First Room" +panel_display_name: "First Room" panels { name: "BISON" path: "Panels/Room 1/panel_1" diff --git a/data/maps/the_darkroom/rooms/S Room.txtpb b/data/maps/the_darkroom/rooms/S Room.txtpb index 0f56af1..9960b86 100644 --- a/data/maps/the_darkroom/rooms/S Room.txtpb +++ b/data/maps/the_darkroom/rooms/S Room.txtpb @@ -1,5 +1,4 @@ name: "S Room" -display_name: "Third Room" letters { key: "s" path: "Components/Collectables/collectable" diff --git a/data/maps/the_darkroom/rooms/Second Room.txtpb b/data/maps/the_darkroom/rooms/Second Room.txtpb index ce780f3..baeea12 100644 --- a/data/maps/the_darkroom/rooms/Second Room.txtpb +++ b/data/maps/the_darkroom/rooms/Second Room.txtpb @@ -1,5 +1,5 @@ name: "Second Room" -display_name: "Second Room" +panel_display_name: "Second Room" panels { name: "BISON" path: "Panels/Room 2/panel_1" diff --git a/data/maps/the_darkroom/rooms/Third Room.txtpb b/data/maps/the_darkroom/rooms/Third Room.txtpb index 5202243..fc80fa7 100644 --- a/data/maps/the_darkroom/rooms/Third Room.txtpb +++ b/data/maps/the_darkroom/rooms/Third Room.txtpb @@ -1,5 +1,5 @@ name: "Third Room" -display_name: "Third Room" +panel_display_name: "Third Room" panels { name: "CULTS" path: "Panels/Room 3/panel_1" diff --git a/data/maps/the_digital/rooms/C Room.txtpb b/data/maps/the_digital/rooms/C Room.txtpb index 5fdc526..050f090 100644 --- a/data/maps/the_digital/rooms/C Room.txtpb +++ b/data/maps/the_digital/rooms/C Room.txtpb @@ -1,5 +1,4 @@ name: "C Room" -display_name: "Chamber" letters { key: "c" path: "Components/Collectables/c" diff --git a/data/maps/the_digital/rooms/Chamber.txtpb b/data/maps/the_digital/rooms/Chamber.txtpb index 19d4b27..d731372 100644 --- a/data/maps/the_digital/rooms/Chamber.txtpb +++ b/data/maps/the_digital/rooms/Chamber.txtpb @@ -1,5 +1,4 @@ name: "Chamber" -display_name: "Chamber" panels { name: "I" path: "Panels/c1" diff --git a/data/maps/the_digital/rooms/Gallery Maze.txtpb b/data/maps/the_digital/rooms/Gallery Maze.txtpb index 9190728..bfdfa41 100644 --- a/data/maps/the_digital/rooms/Gallery Maze.txtpb +++ b/data/maps/the_digital/rooms/Gallery Maze.txtpb @@ -1,5 +1,4 @@ name: "Gallery Maze" -display_name: "Main Area" ports { name: "GALLERY" path: "Components/Warps/worldport4" diff --git a/data/maps/the_digital/rooms/Main Area.txtpb b/data/maps/the_digital/rooms/Main Area.txtpb index ee5c208..99bcdcc 100644 --- a/data/maps/the_digital/rooms/Main Area.txtpb +++ b/data/maps/the_digital/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Main Area" panels { name: "HIT" path: "Panels/open_c" diff --git a/data/maps/the_digital/rooms/Tree Area.txtpb b/data/maps/the_digital/rooms/Tree Area.txtpb index fb90353..56301d5 100644 --- a/data/maps/the_digital/rooms/Tree Area.txtpb +++ b/data/maps/the_digital/rooms/Tree Area.txtpb @@ -1,5 +1,4 @@ name: "Tree Area" -display_name: "Main Area" panels { name: "TREE" path: "Panels/open_tree" diff --git a/data/maps/the_digital/rooms/U Room.txtpb b/data/maps/the_digital/rooms/U Room.txtpb index 5b3e1cb..6b657d5 100644 --- a/data/maps/the_digital/rooms/U Room.txtpb +++ b/data/maps/the_digital/rooms/U Room.txtpb @@ -1,5 +1,4 @@ name: "U Room" -display_name: "Chamber" letters { key: "u" path: "Components/Collectables/u" diff --git a/data/maps/the_door/rooms/Ending.txtpb b/data/maps/the_door/rooms/Ending.txtpb index 4a4a995..37737e3 100644 --- a/data/maps/the_door/rooms/Ending.txtpb +++ b/data/maps/the_door/rooms/Ending.txtpb @@ -1,5 +1,4 @@ name: "Ending" -display_name: "Main Area" endings { name: "PLUM" path: "Components/plum_ending" diff --git a/data/maps/the_door/rooms/Main Area.txtpb b/data/maps/the_door/rooms/Main Area.txtpb index eb8944f..71e99b1 100644 --- a/data/maps/the_door/rooms/Main Area.txtpb +++ b/data/maps/the_door/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Main Area" panels { name: "HAIR" path: "Panels/Room_1/panel" diff --git a/data/maps/the_double_sided/rooms/Brown Area.txtpb b/data/maps/the_double_sided/rooms/Brown Area.txtpb index 079a8f2..1752257 100644 --- a/data/maps/the_double_sided/rooms/Brown Area.txtpb +++ b/data/maps/the_double_sided/rooms/Brown Area.txtpb @@ -1,5 +1,4 @@ name: "Brown Area" -display_name: "Maze" masteries { name: "MASTERY" path: "Components/Collectables/smiley" diff --git a/data/maps/the_double_sided/rooms/Flipped Black Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Black Area.txtpb index 38eeee6..082d889 100644 --- a/data/maps/the_double_sided/rooms/Flipped Black Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Black Area.txtpb @@ -1,5 +1,4 @@ name: "Flipped Black Area" -display_name: "Maze" panels { name: "SEAPLANE" path: "Panels/Maze/panel_15" diff --git a/data/maps/the_double_sided/rooms/Flipped Blue Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Blue Area.txtpb index 7a285b9..f650be9 100644 --- a/data/maps/the_double_sided/rooms/Flipped Blue Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Blue Area.txtpb @@ -1,5 +1,4 @@ name: "Flipped Blue Area" -display_name: "Maze" panels { name: "SKY" path: "Panels/Maze/panel_5" diff --git a/data/maps/the_double_sided/rooms/Flipped Green Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Green Area.txtpb index 68ac4c7..2621f6f 100644 --- a/data/maps/the_double_sided/rooms/Flipped Green Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Green Area.txtpb @@ -1,5 +1,4 @@ name: "Flipped Green Area" -display_name: "Maze" panels { name: "HIGH" path: "Panels/Maze/panel_3" diff --git a/data/maps/the_double_sided/rooms/Flipped Orange Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Orange Area.txtpb index 30c62f1..58f1a76 100644 --- a/data/maps/the_double_sided/rooms/Flipped Orange Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Orange Area.txtpb @@ -1,5 +1,4 @@ name: "Flipped Orange Area" -display_name: "Maze" panels { name: "HEAVEN" path: "Panels/Maze/panel_6" diff --git a/data/maps/the_double_sided/rooms/Flipped Pink Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Pink Area.txtpb index dce2880..976dd58 100644 --- a/data/maps/the_double_sided/rooms/Flipped Pink Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Pink Area.txtpb @@ -1,2 +1 @@ name: "Flipped Pink Area" -display_name: "Maze" diff --git a/data/maps/the_double_sided/rooms/Flipped Purple Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Purple Area.txtpb index 6228004..02697a8 100644 --- a/data/maps/the_double_sided/rooms/Flipped Purple Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Purple Area.txtpb @@ -1,5 +1,4 @@ name: "Flipped Purple Area" -display_name: "Maze" panels { name: "CEILING" path: "Panels/Maze/panel_8" diff --git a/data/maps/the_double_sided/rooms/Flipped Red Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Red Area.txtpb index 9ca8571..9f10cb2 100644 --- a/data/maps/the_double_sided/rooms/Flipped Red Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Red Area.txtpb @@ -1,5 +1,4 @@ name: "Flipped Red Area" -display_name: "Maze" panels { name: "RAISED" path: "Panels/Maze/panel_12" diff --git a/data/maps/the_double_sided/rooms/Flipped Yellow Back Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Yellow Back Area.txtpb index 81cf7ad..1c3193a 100644 --- a/data/maps/the_double_sided/rooms/Flipped Yellow Back Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Yellow Back Area.txtpb @@ -1,5 +1,4 @@ name: "Flipped Yellow Back Area" -display_name: "Maze" panels { name: "ANGELS" path: "Panels/Maze/panel_13" diff --git a/data/maps/the_double_sided/rooms/Flipped Yellow Front Area.txtpb b/data/maps/the_double_sided/rooms/Flipped Yellow Front Area.txtpb index 00b26b8..00a221d 100644 --- a/data/maps/the_double_sided/rooms/Flipped Yellow Front Area.txtpb +++ b/data/maps/the_double_sided/rooms/Flipped Yellow Front Area.txtpb @@ -1,2 +1 @@ name: "Flipped Yellow Front Area" -display_name: "Maze" diff --git a/data/maps/the_double_sided/rooms/Obverse Black Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Black Area.txtpb index e0f631d..ece5789 100644 --- a/data/maps/the_double_sided/rooms/Obverse Black Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Black Area.txtpb @@ -1,5 +1,4 @@ name: "Obverse Black Area" -display_name: "Maze" panels { name: "MOUNTAIN" path: "Panels/Maze/panel_16" diff --git a/data/maps/the_double_sided/rooms/Obverse Blue Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Blue Area.txtpb index d576195..1a21952 100644 --- a/data/maps/the_double_sided/rooms/Obverse Blue Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Blue Area.txtpb @@ -1,2 +1 @@ name: "Obverse Blue Area" -display_name: "Maze" diff --git a/data/maps/the_double_sided/rooms/Obverse Green Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Green Area.txtpb index 5fe37cf..d66361e 100644 --- a/data/maps/the_double_sided/rooms/Obverse Green Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Green Area.txtpb @@ -1,5 +1,4 @@ name: "Obverse Green Area" -display_name: "Maze" panels { name: "UPSIDE" path: "Panels/Maze/panel_7" diff --git a/data/maps/the_double_sided/rooms/Obverse Orange Back Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Orange Back Area.txtpb index 724e56b..43642f9 100644 --- a/data/maps/the_double_sided/rooms/Obverse Orange Back Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Orange Back Area.txtpb @@ -1,5 +1,4 @@ name: "Obverse Orange Back Area" -display_name: "Maze" panels { name: "OVER" path: "Panels/Maze/panel_2b" diff --git a/data/maps/the_double_sided/rooms/Obverse Orange Front Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Orange Front Area.txtpb index ff393b6..28ec555 100644 --- a/data/maps/the_double_sided/rooms/Obverse Orange Front Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Orange Front Area.txtpb @@ -1,5 +1,4 @@ name: "Obverse Orange Front Area" -display_name: "Maze" panels { name: "UP" path: "Panels/Maze/panel_2" diff --git a/data/maps/the_double_sided/rooms/Obverse Orange Isolated Section.txtpb b/data/maps/the_double_sided/rooms/Obverse Orange Isolated Section.txtpb index 713d737..b563be9 100644 --- a/data/maps/the_double_sided/rooms/Obverse Orange Isolated Section.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Orange Isolated Section.txtpb @@ -1,5 +1,4 @@ name: "Obverse Orange Isolated Section" -display_name: "Maze" panels { name: "TOP" path: "Panels/Maze/panel_4" diff --git a/data/maps/the_double_sided/rooms/Obverse Pink Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Pink Area.txtpb index 936be17..2e64a37 100644 --- a/data/maps/the_double_sided/rooms/Obverse Pink Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Pink Area.txtpb @@ -1,5 +1,4 @@ name: "Obverse Pink Area" -display_name: "Maze" panels { name: "CLOUD" path: "Panels/Maze/panel_14" diff --git a/data/maps/the_double_sided/rooms/Obverse Purple Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Purple Area.txtpb index c77032e..ffe3b80 100644 --- a/data/maps/the_double_sided/rooms/Obverse Purple Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Purple Area.txtpb @@ -1,5 +1,4 @@ name: "Obverse Purple Area" -display_name: "Maze" panels { name: "DRAGON" path: "Panels/Maze/panel_18" diff --git a/data/maps/the_double_sided/rooms/Obverse Red Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Red Area.txtpb index 509a997..90ad07d 100644 --- a/data/maps/the_double_sided/rooms/Obverse Red Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Red Area.txtpb @@ -1,2 +1 @@ name: "Obverse Red Area" -display_name: "Maze" diff --git a/data/maps/the_double_sided/rooms/Obverse Yellow Area.txtpb b/data/maps/the_double_sided/rooms/Obverse Yellow Area.txtpb index 0e40a34..801fa28 100644 --- a/data/maps/the_double_sided/rooms/Obverse Yellow Area.txtpb +++ b/data/maps/the_double_sided/rooms/Obverse Yellow Area.txtpb @@ -1,2 +1 @@ name: "Obverse Yellow Area" -display_name: "Maze" diff --git a/data/maps/the_double_sided/rooms/Start.txtpb b/data/maps/the_double_sided/rooms/Start.txtpb index f47580f..b0bfbcd 100644 --- a/data/maps/the_double_sided/rooms/Start.txtpb +++ b/data/maps/the_double_sided/rooms/Start.txtpb @@ -1,5 +1,4 @@ name: "Start" -display_name: "Maze" panels { name: "ATTIC" path: "Panels/Maze/panel_11" diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb index 374aff1..e1e80f4 100644 --- a/data/maps/the_entry/doors.txtpb +++ b/data/maps/the_entry/doors.txtpb @@ -113,10 +113,9 @@ doors { } doors { name: "Right Eye Entrance" - type: STANDARD + type: ITEM_ONLY receivers: "Components/Doors/third_right" panels { room: "Trick Room" name: "INK" } - location_room: "Trick Room" } doors { name: "Red Blue Area Left Door" diff --git a/data/maps/the_entry/rooms/Blue Alcove.txtpb b/data/maps/the_entry/rooms/Blue Alcove.txtpb index 4c2c48c..3df58b9 100644 --- a/data/maps/the_entry/rooms/Blue Alcove.txtpb +++ b/data/maps/the_entry/rooms/Blue Alcove.txtpb @@ -1,5 +1,5 @@ name: "Blue Alcove" -display_name: "Red Blue Area" +panel_display_name: "Red Blue Area" panels { name: "BLUE" path: "Panels/Back Right/br_11" diff --git a/data/maps/the_entry/rooms/Colored Doors Area.txtpb b/data/maps/the_entry/rooms/Colored Doors Area.txtpb index 29e89b5..4767387 100644 --- a/data/maps/the_entry/rooms/Colored Doors Area.txtpb +++ b/data/maps/the_entry/rooms/Colored Doors Area.txtpb @@ -1,5 +1,5 @@ name: "Colored Doors Area" -display_name: "Colored Doors Area" +panel_display_name: "Colored Doors Area" panels { name: "OPEN" path: "Panels/Back Left/backleft_proxying_1" diff --git a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb index 4c18625..b9a8098 100644 --- a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb +++ b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb @@ -1,5 +1,5 @@ name: "Composite Room Entrance" -display_name: "Starting Room" +panel_display_name: "Starting Room" ports { name: "COMPOSITE" path: "Components/Warps/worldport12" diff --git a/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb b/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb index 0819953..fabcd60 100644 --- a/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb +++ b/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb @@ -1,5 +1,5 @@ name: "Ctrl Tutorial" -display_name: "Colored Doors Area" +panel_display_name: "Colored Doors Area" panels { name: "RIGHT" path: "Panels/Back Left/backleft_proxying_2" diff --git a/data/maps/the_entry/rooms/D Room Final.txtpb b/data/maps/the_entry/rooms/D Room Final.txtpb index 960cb1c..bb8ee87 100644 --- a/data/maps/the_entry/rooms/D Room Final.txtpb +++ b/data/maps/the_entry/rooms/D Room Final.txtpb @@ -1,5 +1,5 @@ name: "D Room Final" -display_name: "D Room" +panel_display_name: "D Room" letters { key: "d" path: "Components/Collectables/d" diff --git a/data/maps/the_entry/rooms/D Room.txtpb b/data/maps/the_entry/rooms/D Room.txtpb index 27a975b..fdf6846 100644 --- a/data/maps/the_entry/rooms/D Room.txtpb +++ b/data/maps/the_entry/rooms/D Room.txtpb @@ -1,5 +1,5 @@ name: "D Room" -display_name: "D Room" +panel_display_name: "D Room" panels { name: "BASEBALL" path: "Panels/D/d_2" diff --git a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb index 60b41cb..db9b78a 100644 --- a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb +++ b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb @@ -1,5 +1,5 @@ name: "Daedalus Entrance" -display_name: "Starting Room" +panel_display_name: "Starting Room" ports { name: "DAEDALUS" path: "Components/Warps/worldport6" diff --git a/data/maps/the_entry/rooms/Digital Entrance.txtpb b/data/maps/the_entry/rooms/Digital Entrance.txtpb index 5713a8d..dd8b5f4 100644 --- a/data/maps/the_entry/rooms/Digital Entrance.txtpb +++ b/data/maps/the_entry/rooms/Digital Entrance.txtpb @@ -1,5 +1,5 @@ name: "Digital Entrance" -display_name: "Starting Room" +panel_display_name: "Starting Room" ports { name: "DIGITAL" path: "Components/Warps/worldport" diff --git a/data/maps/the_entry/rooms/Entry Exit.txtpb b/data/maps/the_entry/rooms/Entry Exit.txtpb index 6b4fadd..b5d75aa 100644 --- a/data/maps/the_entry/rooms/Entry Exit.txtpb +++ b/data/maps/the_entry/rooms/Entry Exit.txtpb @@ -1,5 +1,5 @@ name: "Entry Exit" -display_name: "Starting Room" +panel_display_name: "Starting Room" ports { name: "GREAT" path: "Components/Warps/worldport2" diff --git a/data/maps/the_entry/rooms/Eye Room.txtpb b/data/maps/the_entry/rooms/Eye Room.txtpb index 8c6290b..da17163 100644 --- a/data/maps/the_entry/rooms/Eye Room.txtpb +++ b/data/maps/the_entry/rooms/Eye Room.txtpb @@ -1,5 +1,5 @@ name: "Eye Room" -display_name: "Eye Room" +panel_display_name: "Eye Room" panels { name: "I" path: "Panels/Entry/eyes_1" diff --git a/data/maps/the_entry/rooms/Flipped Link Area.txtpb b/data/maps/the_entry/rooms/Flipped Link Area.txtpb index 5251023..950e9b1 100644 --- a/data/maps/the_entry/rooms/Flipped Link Area.txtpb +++ b/data/maps/the_entry/rooms/Flipped Link Area.txtpb @@ -1,18 +1,19 @@ name: "Flipped Link Area" -display_name: "Pyramid Area" +panel_display_name: "Pyramid Area" panels { name: "WANDER" path: "Panels/Pilgrimage/cream_4" clue: "wander" answer: "roam" symbols: SUN + display_name: "WANDER (Flipped)" } paintings { name: "NEAR" path: "Components/Paintings/aches2" orientation: "north" gravity: Y_PLUS - display_name: "Flipper Near Painting" + display_name: "Flipped Near Painting" } paintings { name: "FAR" diff --git a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb index e2dd992..c0be783 100644 --- a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb +++ b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb @@ -1,5 +1,5 @@ name: "Flipped Pyramid Area" -display_name: "Pyramid Area" +panel_display_name: "Pyramid Area" panels { name: "TURN (1)" path: "Panels/Entry/l_opener_3" diff --git a/data/maps/the_entry/rooms/Flipped Right Eye.txtpb b/data/maps/the_entry/rooms/Flipped Right Eye.txtpb index 429d63e..14f3f5a 100644 --- a/data/maps/the_entry/rooms/Flipped Right Eye.txtpb +++ b/data/maps/the_entry/rooms/Flipped Right Eye.txtpb @@ -1,5 +1,5 @@ name: "Flipped Right Eye" -display_name: "Flip Area" +panel_display_name: "Flip Area" panels { name: "WHERE" path: "Panels/Pilgrimage/cream_5" diff --git a/data/maps/the_entry/rooms/Flipped Second Room.txtpb b/data/maps/the_entry/rooms/Flipped Second Room.txtpb index d4ee780..5841ca1 100644 --- a/data/maps/the_entry/rooms/Flipped Second Room.txtpb +++ b/data/maps/the_entry/rooms/Flipped Second Room.txtpb @@ -1,5 +1,5 @@ name: "Flipped Second Room" -display_name: "Flip Area" +panel_display_name: "Flip Area" panels { name: "CLUE" path: "Panels/Entry/second_right_top" diff --git a/data/maps/the_entry/rooms/Gallery Return.txtpb b/data/maps/the_entry/rooms/Gallery Return.txtpb index 1273928..987a3ca 100644 --- a/data/maps/the_entry/rooms/Gallery Return.txtpb +++ b/data/maps/the_entry/rooms/Gallery Return.txtpb @@ -1,5 +1,5 @@ name: "Gallery Return" -display_name: "Starting Room" +panel_display_name: "Gallery Return" panels { name: "RETURN" path: "Panels/Entry/gallery_return" diff --git a/data/maps/the_entry/rooms/Least Blue Last.txtpb b/data/maps/the_entry/rooms/Least Blue Last.txtpb index 0f198b7..adbe545 100644 --- a/data/maps/the_entry/rooms/Least Blue Last.txtpb +++ b/data/maps/the_entry/rooms/Least Blue Last.txtpb @@ -1,5 +1,5 @@ name: "Least Blue Last" -display_name: "Red Blue Area" +panel_display_name: "Red Blue Area" panels { name: "CAPABLE (1)" path: "Panels/LBL/lbl_1" diff --git a/data/maps/the_entry/rooms/Lime Room.txtpb b/data/maps/the_entry/rooms/Lime Room.txtpb index 6054dd7..e94f775 100644 --- a/data/maps/the_entry/rooms/Lime Room.txtpb +++ b/data/maps/the_entry/rooms/Lime Room.txtpb @@ -1,5 +1,5 @@ name: "Lime Room" -display_name: "Colored Doors Area" +panel_display_name: "Colored Doors Area" panels { name: "HIDE" path: "Panels/Back Left/backleft_proxying_3" diff --git a/data/maps/the_entry/rooms/Link Area.txtpb b/data/maps/the_entry/rooms/Link Area.txtpb index 2866abd..689f57a 100644 --- a/data/maps/the_entry/rooms/Link Area.txtpb +++ b/data/maps/the_entry/rooms/Link Area.txtpb @@ -1,11 +1,12 @@ name: "Link Area" -display_name: "Pyramid Area" +panel_display_name: "Pyramid Area" panels { name: "WANDER" path: "Panels/Pilgrimage/cream_3" clue: "wander" answer: "amble" symbols: SUN + display_name: "WANDER (Obverse)" } paintings { name: "NEAR" diff --git a/data/maps/the_entry/rooms/Parthenon Return.txtpb b/data/maps/the_entry/rooms/Parthenon Return.txtpb index 5a7f6b8..4776d11 100644 --- a/data/maps/the_entry/rooms/Parthenon Return.txtpb +++ b/data/maps/the_entry/rooms/Parthenon Return.txtpb @@ -1,5 +1,5 @@ name: "Parthenon Return" -display_name: "Starting Room" +panel_display_name: "Parthenon Return" panels { name: "RETURN" path: "Panels/Back Left/backleft_return" diff --git a/data/maps/the_entry/rooms/Rabbit Hole.txtpb b/data/maps/the_entry/rooms/Rabbit Hole.txtpb index 9b18bc8..520d513 100644 --- a/data/maps/the_entry/rooms/Rabbit Hole.txtpb +++ b/data/maps/the_entry/rooms/Rabbit Hole.txtpb @@ -1,5 +1,5 @@ name: "Rabbit Hole" -display_name: "Red Blue Area" +panel_display_name: "Red Blue Area" panels { name: "PUZZLE" path: "Panels/Back Right/br_6" diff --git a/data/maps/the_entry/rooms/Red Alcove.txtpb b/data/maps/the_entry/rooms/Red Alcove.txtpb index 5c4085e..503b4a9 100644 --- a/data/maps/the_entry/rooms/Red Alcove.txtpb +++ b/data/maps/the_entry/rooms/Red Alcove.txtpb @@ -1,5 +1,5 @@ name: "Red Alcove" -display_name: "Red Blue Area" +panel_display_name: "Red Blue Area" panels { name: "BROW" path: "Panels/Back Right/br_10" diff --git a/data/maps/the_entry/rooms/Red Blue Halls.txtpb b/data/maps/the_entry/rooms/Red Blue Halls.txtpb index 7d07f9e..789ca42 100644 --- a/data/maps/the_entry/rooms/Red Blue Halls.txtpb +++ b/data/maps/the_entry/rooms/Red Blue Halls.txtpb @@ -1,5 +1,5 @@ name: "Red Blue Halls" -display_name: "Red Blue Area" +panel_display_name: "Red Blue Area" panels { name: "CENTER" path: "Panels/Back Right/br_1" diff --git a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb index 982e3f3..04ddcf3 100644 --- a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb +++ b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb @@ -1,5 +1,5 @@ name: "Repetitive Entrance" -display_name: "Starting Room" +panel_display_name: "Starting Room" ports { name: "REPETITIVE" path: "Components/Warps/worldport7" diff --git a/data/maps/the_entry/rooms/Right Eye.txtpb b/data/maps/the_entry/rooms/Right Eye.txtpb index 1c7bf68..8f6c431 100644 --- a/data/maps/the_entry/rooms/Right Eye.txtpb +++ b/data/maps/the_entry/rooms/Right Eye.txtpb @@ -1,5 +1,5 @@ name: "Right Eye" -display_name: "Right Eye Area" +panel_display_name: "Right Eye Area" panels { name: "EYE" path: "Panels/Entry/front_2" diff --git a/data/maps/the_entry/rooms/Shop Entrance.txtpb b/data/maps/the_entry/rooms/Shop Entrance.txtpb index b52cde7..f793da3 100644 --- a/data/maps/the_entry/rooms/Shop Entrance.txtpb +++ b/data/maps/the_entry/rooms/Shop Entrance.txtpb @@ -1,5 +1,5 @@ name: "Shop Entrance" -display_name: "Starting Room" +panel_display_name: "Starting Room" panels { name: "TURN" path: "Panels/Entry/l_opener_2" diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb index 0b2c2db..bc77e6d 100644 --- a/data/maps/the_entry/rooms/Starting Room.txtpb +++ b/data/maps/the_entry/rooms/Starting Room.txtpb @@ -1,5 +1,5 @@ name: "Starting Room" -display_name: "Starting Room" +panel_display_name: "Starting Room" panels { name: "HI" path: "Panels/Entry/entry_proxying_1" diff --git a/data/maps/the_entry/rooms/Trick Room.txtpb b/data/maps/the_entry/rooms/Trick Room.txtpb index ff9be38..d20502e 100644 --- a/data/maps/the_entry/rooms/Trick Room.txtpb +++ b/data/maps/the_entry/rooms/Trick Room.txtpb @@ -1,5 +1,5 @@ name: "Trick Room" -display_name: "Starting Room" +panel_display_name: "Starting Room" panels { name: "INK" path: "Panels/Entry/l_opener_1" diff --git a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb index bf1398d..ce35e5b 100644 --- a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb +++ b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb @@ -1,5 +1,5 @@ name: "White Hallway To Daedalus" -display_name: "Colored Doors Area" +panel_display_name: "Colored Doors Area" ports { name: "DAEDALUS" path: "Components/Warps/worldport11" diff --git a/data/maps/the_entry/rooms/Wrath Room.txtpb b/data/maps/the_entry/rooms/Wrath Room.txtpb index 29bd1cb..f1f2418 100644 --- a/data/maps/the_entry/rooms/Wrath Room.txtpb +++ b/data/maps/the_entry/rooms/Wrath Room.txtpb @@ -1,5 +1,5 @@ name: "Wrath Room" -display_name: "Red Blue Area" +panel_display_name: "Red Blue Area" panels { name: "RABBIT" path: "Panels/Back Right/br_4" diff --git a/data/maps/the_entry/rooms/X Area.txtpb b/data/maps/the_entry/rooms/X Area.txtpb index ada16f8..3f61c26 100644 --- a/data/maps/the_entry/rooms/X Area.txtpb +++ b/data/maps/the_entry/rooms/X Area.txtpb @@ -1,5 +1,5 @@ name: "X Area" -display_name: "Starting Room" +panel_display_name: "Starting Room" letters { key: "x" path: "Components/Collectables/x" diff --git a/data/maps/the_extravagant/rooms/E Room.txtpb b/data/maps/the_extravagant/rooms/E Room.txtpb index 4b1f284..2f91764 100644 --- a/data/maps/the_extravagant/rooms/E Room.txtpb +++ b/data/maps/the_extravagant/rooms/E Room.txtpb @@ -1,5 +1,4 @@ name: "E Room" -display_name: "3" letters { key: "e" path: "Components/Collectables/e" diff --git a/data/maps/the_extravagant/rooms/Engine Room.txtpb b/data/maps/the_extravagant/rooms/Engine Room.txtpb index 79b60fc..3dcc437 100644 --- a/data/maps/the_extravagant/rooms/Engine Room.txtpb +++ b/data/maps/the_extravagant/rooms/Engine Room.txtpb @@ -1,5 +1,4 @@ name: "Engine Room" -display_name: "Engine Room" panels { name: "ENGINE" path: "Panels/panel_8" diff --git a/data/maps/the_extravagant/rooms/Hat Chamber.txtpb b/data/maps/the_extravagant/rooms/Hat Chamber.txtpb index 049959c..a100130 100644 --- a/data/maps/the_extravagant/rooms/Hat Chamber.txtpb +++ b/data/maps/the_extravagant/rooms/Hat Chamber.txtpb @@ -1,5 +1,4 @@ name: "Hat Chamber" -display_name: "3" panels { name: "BRIM" path: "Panels/panel_14" diff --git a/data/maps/the_extravagant/rooms/X Minus Middle Leg.txtpb b/data/maps/the_extravagant/rooms/X Minus Middle Leg.txtpb index 660a7dd..1455a4b 100644 --- a/data/maps/the_extravagant/rooms/X Minus Middle Leg.txtpb +++ b/data/maps/the_extravagant/rooms/X Minus Middle Leg.txtpb @@ -1,5 +1,4 @@ name: "X Minus Middle Leg" -display_name: "W" panels { name: "ANTENNA" path: "Panels/panel_7" diff --git a/data/maps/the_extravagant/rooms/X Minus Right Leg.txtpb b/data/maps/the_extravagant/rooms/X Minus Right Leg.txtpb index ce731b6..ea45e10 100644 --- a/data/maps/the_extravagant/rooms/X Minus Right Leg.txtpb +++ b/data/maps/the_extravagant/rooms/X Minus Right Leg.txtpb @@ -1,5 +1,4 @@ name: "X Minus Right Leg" -display_name: "W" panels { name: "ROWBOAT" path: "Panels/panel_13" diff --git a/data/maps/the_extravagant/rooms/X Minus.txtpb b/data/maps/the_extravagant/rooms/X Minus.txtpb index 3f389f1..92b15dc 100644 --- a/data/maps/the_extravagant/rooms/X Minus.txtpb +++ b/data/maps/the_extravagant/rooms/X Minus.txtpb @@ -1,5 +1,4 @@ name: "X Minus" -display_name: "W" panels { name: "DUO" path: "Panels/panel_1" diff --git a/data/maps/the_extravagant/rooms/X Plus Middle Leg.txtpb b/data/maps/the_extravagant/rooms/X Plus Middle Leg.txtpb index c656593..cb7cba6 100644 --- a/data/maps/the_extravagant/rooms/X Plus Middle Leg.txtpb +++ b/data/maps/the_extravagant/rooms/X Plus Middle Leg.txtpb @@ -1,5 +1,4 @@ name: "X Plus Middle Leg" -display_name: "M" panels { name: "COLONY" path: "Panels/panel_10" diff --git a/data/maps/the_extravagant/rooms/X Plus Right Leg.txtpb b/data/maps/the_extravagant/rooms/X Plus Right Leg.txtpb index 7c75550..98dfad6 100644 --- a/data/maps/the_extravagant/rooms/X Plus Right Leg.txtpb +++ b/data/maps/the_extravagant/rooms/X Plus Right Leg.txtpb @@ -1,5 +1,4 @@ name: "X Plus Right Leg" -display_name: "M" panels { name: "HEAD" path: "Panels/panel_4" diff --git a/data/maps/the_extravagant/rooms/X Plus.txtpb b/data/maps/the_extravagant/rooms/X Plus.txtpb index db42770..89b6da7 100644 --- a/data/maps/the_extravagant/rooms/X Plus.txtpb +++ b/data/maps/the_extravagant/rooms/X Plus.txtpb @@ -1,5 +1,4 @@ name: "X Plus" -display_name: "M" panels { name: "ROSE" path: "Panels/panel_16" diff --git a/data/maps/the_extravagant/rooms/Y Minus First Floor.txtpb b/data/maps/the_extravagant/rooms/Y Minus First Floor.txtpb index 1429fa8..f80d68a 100644 --- a/data/maps/the_extravagant/rooms/Y Minus First Floor.txtpb +++ b/data/maps/the_extravagant/rooms/Y Minus First Floor.txtpb @@ -1,5 +1,4 @@ name: "Y Minus First Floor" -display_name: "3" panels { name: "RHINO" path: "Panels/panel_2" diff --git a/data/maps/the_extravagant/rooms/Y Minus Second Floor.txtpb b/data/maps/the_extravagant/rooms/Y Minus Second Floor.txtpb index be3238a..34a3c9d 100644 --- a/data/maps/the_extravagant/rooms/Y Minus Second Floor.txtpb +++ b/data/maps/the_extravagant/rooms/Y Minus Second Floor.txtpb @@ -1,5 +1,4 @@ name: "Y Minus Second Floor" -display_name: "3" panels { name: "COMPASS" path: "Panels/panel_5" diff --git a/data/maps/the_extravagant/rooms/Y Minus Third Floor.txtpb b/data/maps/the_extravagant/rooms/Y Minus Third Floor.txtpb index 881d42d..7aa5e1c 100644 --- a/data/maps/the_extravagant/rooms/Y Minus Third Floor.txtpb +++ b/data/maps/the_extravagant/rooms/Y Minus Third Floor.txtpb @@ -1,5 +1,4 @@ name: "Y Minus Third Floor" -display_name: "3" panels { name: "WHISKERS" path: "Panels/panel_11" diff --git a/data/maps/the_extravagant/rooms/Y Plus First Floor.txtpb b/data/maps/the_extravagant/rooms/Y Plus First Floor.txtpb index 9c8120c..6226aa6 100644 --- a/data/maps/the_extravagant/rooms/Y Plus First Floor.txtpb +++ b/data/maps/the_extravagant/rooms/Y Plus First Floor.txtpb @@ -1,5 +1,4 @@ name: "Y Plus First Floor" -display_name: "E" paintings { name: "UNDUE" path: "Components/Paintings/undue4" diff --git a/data/maps/the_extravagant/rooms/Y Plus Third Floor.txtpb b/data/maps/the_extravagant/rooms/Y Plus Third Floor.txtpb index bdc45b9..1cf0480 100644 --- a/data/maps/the_extravagant/rooms/Y Plus Third Floor.txtpb +++ b/data/maps/the_extravagant/rooms/Y Plus Third Floor.txtpb @@ -1,6 +1,5 @@ name: "Y Plus Third Floor" # It's the second floor too... -display_name: "E" panels { name: "CACTUS" path: "Panels/panel_6" diff --git a/data/maps/the_gallery/rooms/Back Room.txtpb b/data/maps/the_gallery/rooms/Back Room.txtpb index baf7270..74d5304 100644 --- a/data/maps/the_gallery/rooms/Back Room.txtpb +++ b/data/maps/the_gallery/rooms/Back Room.txtpb @@ -1,5 +1,4 @@ name: "Back Room" -display_name: "Back Room" panels { name: "UNYIELDING" path: "Panels/entry_2" diff --git a/data/maps/the_gallery/rooms/Daedalus Extension.txtpb b/data/maps/the_gallery/rooms/Daedalus Extension.txtpb index e525a2c..51d2be5 100644 --- a/data/maps/the_gallery/rooms/Daedalus Extension.txtpb +++ b/data/maps/the_gallery/rooms/Daedalus Extension.txtpb @@ -1,5 +1,4 @@ name: "Daedalus Extension" -display_name: "Daedalus Extension" panels { name: "WHERE" path: "Panels/entry_1" diff --git a/data/maps/the_gallery/rooms/Ending.txtpb b/data/maps/the_gallery/rooms/Ending.txtpb index 72c8e72..f713acc 100644 --- a/data/maps/the_gallery/rooms/Ending.txtpb +++ b/data/maps/the_gallery/rooms/Ending.txtpb @@ -1,5 +1,4 @@ name: "Ending" -display_name: "Back Room" endings { name: "YELLOW" path: "Components/Endings/yellow_ending" diff --git a/data/maps/the_gallery/rooms/Main Area.txtpb b/data/maps/the_gallery/rooms/Main Area.txtpb index a8fb3c6..5ba6b25 100644 --- a/data/maps/the_gallery/rooms/Main Area.txtpb +++ b/data/maps/the_gallery/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Main Area" keyholders { name: "P" path: "Components/KeyHolders/keyHolderP" diff --git a/data/maps/the_gold/rooms/The Whole Thing.txtpb b/data/maps/the_gold/rooms/The Whole Thing.txtpb index 026e709..4848c1f 100644 --- a/data/maps/the_gold/rooms/The Whole Thing.txtpb +++ b/data/maps/the_gold/rooms/The Whole Thing.txtpb @@ -1,5 +1,4 @@ name: "The Whole Thing" -display_name: "The Whole Thing" panels { name: "PANEL" path: "Panels/Room_1/panel_1" diff --git a/data/maps/the_graveyard/rooms/Inside.txtpb b/data/maps/the_graveyard/rooms/Inside.txtpb index fd2fc9d..1f58d3f 100644 --- a/data/maps/the_graveyard/rooms/Inside.txtpb +++ b/data/maps/the_graveyard/rooms/Inside.txtpb @@ -1,5 +1,4 @@ name: "Inside" -display_name: "Inside" panels { name: "REMEMBER" path: "Panels/panel_3" diff --git a/data/maps/the_graveyard/rooms/Outside.txtpb b/data/maps/the_graveyard/rooms/Outside.txtpb index b0e5ee9..db9de1b 100644 --- a/data/maps/the_graveyard/rooms/Outside.txtpb +++ b/data/maps/the_graveyard/rooms/Outside.txtpb @@ -1,5 +1,4 @@ name: "Outside" -display_name: "Outside" panels { name: "FOOT" path: "Panels/panel_1" diff --git a/data/maps/the_great/doors.txtpb b/data/maps/the_great/doors.txtpb index be7cd00..5ce7fe2 100644 --- a/data/maps/the_great/doors.txtpb +++ b/data/maps/the_great/doors.txtpb @@ -142,6 +142,7 @@ doors { panels { room: "Pillar Room" name: "CAUGHT" } panels { room: "Pillar Room" name: "TEN" } location_room: "Pillar Room" + location_name: "Pillar Room" } doors { name: "North Landscape Entrance" @@ -396,6 +397,7 @@ doors { panels { room: "Question Room When" name: "QUESTION" answer: "why" } panels { room: "Question Room Who" name: "QUESTION" answer: "why" } location_room: "Question Room Who" + location_name: "Whys" } doors { name: "Talented Entrance" diff --git a/data/maps/the_great/rooms/Back Area.txtpb b/data/maps/the_great/rooms/Back Area.txtpb index 3701249..c1b8ab3 100644 --- a/data/maps/the_great/rooms/Back Area.txtpb +++ b/data/maps/the_great/rooms/Back Area.txtpb @@ -1,5 +1,5 @@ name: "Back Area" -display_name: "Back Area" +panel_display_name: "Back Area" panels { name: "PLANT" path: "Panels/General/entry_14" diff --git a/data/maps/the_great/rooms/Behind Question Area.txtpb b/data/maps/the_great/rooms/Behind Question Area.txtpb index 88f800f..744d4c4 100644 --- a/data/maps/the_great/rooms/Behind Question Area.txtpb +++ b/data/maps/the_great/rooms/Behind Question Area.txtpb @@ -1,5 +1,5 @@ name: "Behind Question Area" -display_name: "Main Area" +panel_display_name: "Question Room" panels { name: "DEW" path: "Panels/General/uc_4" diff --git a/data/maps/the_great/rooms/Colorful Entrance.txtpb b/data/maps/the_great/rooms/Colorful Entrance.txtpb index 5d7c9b2..cb7eb25 100644 --- a/data/maps/the_great/rooms/Colorful Entrance.txtpb +++ b/data/maps/the_great/rooms/Colorful Entrance.txtpb @@ -1,5 +1,5 @@ name: "Colorful Entrance" -display_name: "Pillar Room" +panel_display_name: "Pillar Room" ports { name: "COLORFUL" path: "Meshes/Blocks/Warps/worldport13" diff --git a/data/maps/the_great/rooms/Daedalus Entrance.txtpb b/data/maps/the_great/rooms/Daedalus Entrance.txtpb index 7e1d477..003a8a3 100644 --- a/data/maps/the_great/rooms/Daedalus Entrance.txtpb +++ b/data/maps/the_great/rooms/Daedalus Entrance.txtpb @@ -1,5 +1,5 @@ name: "Daedalus Entrance" -display_name: "Main Area" +panel_display_name: "Main Area" panels { name: "MISSING" path: "Panels/General/entry_2" diff --git a/data/maps/the_great/rooms/East Landscape.txtpb b/data/maps/the_great/rooms/East Landscape.txtpb index 84fc182..44ed2c5 100644 --- a/data/maps/the_great/rooms/East Landscape.txtpb +++ b/data/maps/the_great/rooms/East Landscape.txtpb @@ -1,5 +1,5 @@ name: "East Landscape" -display_name: "East Landscape" +panel_display_name: "East Landscape" panels { name: "COLOR" path: "Panels/General/entry_10" diff --git a/data/maps/the_great/rooms/G Room.txtpb b/data/maps/the_great/rooms/G Room.txtpb index 218a9c1..f93c899 100644 --- a/data/maps/the_great/rooms/G Room.txtpb +++ b/data/maps/the_great/rooms/G Room.txtpb @@ -1,5 +1,5 @@ name: "G Room" -display_name: "Courtyard" +panel_display_name: "Courtyard" letters { key: "g" path: "Components/Collectables/g" diff --git a/data/maps/the_great/rooms/Hive Entrance.txtpb b/data/maps/the_great/rooms/Hive Entrance.txtpb index ba886b1..cd6ba68 100644 --- a/data/maps/the_great/rooms/Hive Entrance.txtpb +++ b/data/maps/the_great/rooms/Hive Entrance.txtpb @@ -1,5 +1,5 @@ name: "Hive Entrance" -display_name: "West Side" +panel_display_name: "West Side" panels { name: "LOST" path: "Panels/Hive Room/hive_1" diff --git a/data/maps/the_great/rooms/Jail Part 1.txtpb b/data/maps/the_great/rooms/Jail Part 1.txtpb index bd468bd..452841b 100644 --- a/data/maps/the_great/rooms/Jail Part 1.txtpb +++ b/data/maps/the_great/rooms/Jail Part 1.txtpb @@ -1,5 +1,5 @@ name: "Jail Part 1" -display_name: "Jail" +panel_display_name: "Jail" panels { name: "FLAP" path: "Panels/Throat/throat_1" diff --git a/data/maps/the_great/rooms/Jail Part 2.txtpb b/data/maps/the_great/rooms/Jail Part 2.txtpb index 1f54dd5..1a0c975 100644 --- a/data/maps/the_great/rooms/Jail Part 2.txtpb +++ b/data/maps/the_great/rooms/Jail Part 2.txtpb @@ -1,5 +1,5 @@ name: "Jail Part 2" -display_name: "Jail" +panel_display_name: "Jail" panels { name: "DIGEST" path: "Panels/Bowels3/bowels_1" diff --git a/data/maps/the_great/rooms/Jubilant Entrance.txtpb b/data/maps/the_great/rooms/Jubilant Entrance.txtpb index eaf9811..0700a6b 100644 --- a/data/maps/the_great/rooms/Jubilant Entrance.txtpb +++ b/data/maps/the_great/rooms/Jubilant Entrance.txtpb @@ -1,5 +1,5 @@ name: "Jubilant Entrance" -display_name: "West Side" +panel_display_name: "West Side" ports { name: "JUBILANT" path: "Meshes/Blocks/Warps/worldport12" diff --git a/data/maps/the_great/rooms/Magnet Room.txtpb b/data/maps/the_great/rooms/Magnet Room.txtpb index 4cf6433..2d122a4 100644 --- a/data/maps/the_great/rooms/Magnet Room.txtpb +++ b/data/maps/the_great/rooms/Magnet Room.txtpb @@ -1,5 +1,5 @@ name: "Magnet Room" -display_name: "Magnet Room" +panel_display_name: "Magnet Room" panels { name: "AIRPLANE" path: "Panels/Magnet Room/magnet_2" diff --git a/data/maps/the_great/rooms/Main Area.txtpb b/data/maps/the_great/rooms/Main Area.txtpb index 40c7fbb..18bcf9b 100644 --- a/data/maps/the_great/rooms/Main Area.txtpb +++ b/data/maps/the_great/rooms/Main Area.txtpb @@ -1,5 +1,5 @@ name: "Main Area" -display_name: "Main Area" +panel_display_name: "Main Area" panels { name: "INTRO" path: "Panels/General/entry_8" diff --git a/data/maps/the_great/rooms/Maze Center.txtpb b/data/maps/the_great/rooms/Maze Center.txtpb index f557eaa..97ff146 100644 --- a/data/maps/the_great/rooms/Maze Center.txtpb +++ b/data/maps/the_great/rooms/Maze Center.txtpb @@ -1,5 +1,5 @@ name: "Maze Center" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "POOR" path: "Panels/Maze/maze_7" diff --git a/data/maps/the_great/rooms/Maze Cold Area.txtpb b/data/maps/the_great/rooms/Maze Cold Area.txtpb index 5886ca8..70b311e 100644 --- a/data/maps/the_great/rooms/Maze Cold Area.txtpb +++ b/data/maps/the_great/rooms/Maze Cold Area.txtpb @@ -1,5 +1,5 @@ name: "Maze Cold Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "COLD" path: "Panels/Maze/maze_11" diff --git a/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb b/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb index d6f265f..1540ee2 100644 --- a/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb +++ b/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb @@ -1,2 +1,2 @@ name: "Maze Empty Vestibule" -display_name: "Courtyard" +panel_display_name: "Courtyard" diff --git a/data/maps/the_great/rooms/Maze In Area.txtpb b/data/maps/the_great/rooms/Maze In Area.txtpb index 13597a0..8c556aa 100644 --- a/data/maps/the_great/rooms/Maze In Area.txtpb +++ b/data/maps/the_great/rooms/Maze In Area.txtpb @@ -1,5 +1,5 @@ name: "Maze In Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "IN" path: "Panels/Maze/maze_3" diff --git a/data/maps/the_great/rooms/Maze Moon Area.txtpb b/data/maps/the_great/rooms/Maze Moon Area.txtpb index b515224..10af4a1 100644 --- a/data/maps/the_great/rooms/Maze Moon Area.txtpb +++ b/data/maps/the_great/rooms/Maze Moon Area.txtpb @@ -1,5 +1,5 @@ name: "Maze Moon Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "MOON" path: "Panels/Maze/maze_9" diff --git a/data/maps/the_great/rooms/Maze Off Area.txtpb b/data/maps/the_great/rooms/Maze Off Area.txtpb index 2fe7bed..c577129 100644 --- a/data/maps/the_great/rooms/Maze Off Area.txtpb +++ b/data/maps/the_great/rooms/Maze Off Area.txtpb @@ -1,5 +1,5 @@ name: "Maze Off Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "OFF" path: "Panels/Maze/maze_14" diff --git a/data/maps/the_great/rooms/Maze Slice Area.txtpb b/data/maps/the_great/rooms/Maze Slice Area.txtpb index d720501..f59d6e5 100644 --- a/data/maps/the_great/rooms/Maze Slice Area.txtpb +++ b/data/maps/the_great/rooms/Maze Slice Area.txtpb @@ -1,5 +1,5 @@ name: "Maze Slice Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "SLICE" path: "Panels/Maze/maze_4" diff --git a/data/maps/the_great/rooms/Maze Smooth Area.txtpb b/data/maps/the_great/rooms/Maze Smooth Area.txtpb index 8145357..156e885 100644 --- a/data/maps/the_great/rooms/Maze Smooth Area.txtpb +++ b/data/maps/the_great/rooms/Maze Smooth Area.txtpb @@ -1,5 +1,5 @@ name: "Maze Smooth Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "SMOOTH" path: "Panels/Maze/maze_5" diff --git a/data/maps/the_great/rooms/Maze South Area.txtpb b/data/maps/the_great/rooms/Maze South Area.txtpb index b3708db..e65778d 100644 --- a/data/maps/the_great/rooms/Maze South Area.txtpb +++ b/data/maps/the_great/rooms/Maze South Area.txtpb @@ -1,5 +1,5 @@ name: "Maze South Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "SOUTH" path: "Panels/Maze/maze_2" diff --git a/data/maps/the_great/rooms/Maze Start.txtpb b/data/maps/the_great/rooms/Maze Start.txtpb index 1e89cbe..16a57f5 100644 --- a/data/maps/the_great/rooms/Maze Start.txtpb +++ b/data/maps/the_great/rooms/Maze Start.txtpb @@ -1,5 +1,5 @@ name: "Maze Start" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "OUT" path: "Panels/Maze/maze_1" diff --git a/data/maps/the_great/rooms/Maze Tower.txtpb b/data/maps/the_great/rooms/Maze Tower.txtpb index 6a815aa..44c30d7 100644 --- a/data/maps/the_great/rooms/Maze Tower.txtpb +++ b/data/maps/the_great/rooms/Maze Tower.txtpb @@ -1,5 +1,5 @@ name: "Maze Tower" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "FEEL" path: "Panels/Maze/maze_12" diff --git a/data/maps/the_great/rooms/Maze Up Area.txtpb b/data/maps/the_great/rooms/Maze Up Area.txtpb index 29f175b..0046cef 100644 --- a/data/maps/the_great/rooms/Maze Up Area.txtpb +++ b/data/maps/the_great/rooms/Maze Up Area.txtpb @@ -1,5 +1,5 @@ name: "Maze Up Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "UP" path: "Panels/Maze/maze_15" diff --git a/data/maps/the_great/rooms/Maze Wreck Area.txtpb b/data/maps/the_great/rooms/Maze Wreck Area.txtpb index 6808fc2..5710df5 100644 --- a/data/maps/the_great/rooms/Maze Wreck Area.txtpb +++ b/data/maps/the_great/rooms/Maze Wreck Area.txtpb @@ -1,5 +1,5 @@ name: "Maze Wreck Area" -display_name: "Courtyard" +panel_display_name: "Courtyard" panels { name: "WRECK" path: "Panels/Maze/maze_8" diff --git a/data/maps/the_great/rooms/Nature Room.txtpb b/data/maps/the_great/rooms/Nature Room.txtpb index 9f798f3..464d3a2 100644 --- a/data/maps/the_great/rooms/Nature Room.txtpb +++ b/data/maps/the_great/rooms/Nature Room.txtpb @@ -1,5 +1,5 @@ name: "Nature Room" -display_name: "North Landscape" +panel_display_name: "North Landscape" panels { name: "SEVERE" path: "Panels/General/nature_2" diff --git a/data/maps/the_great/rooms/North Landscape.txtpb b/data/maps/the_great/rooms/North Landscape.txtpb index 959f351..f0fde77 100644 --- a/data/maps/the_great/rooms/North Landscape.txtpb +++ b/data/maps/the_great/rooms/North Landscape.txtpb @@ -1,5 +1,5 @@ name: "North Landscape" -display_name: "North Landscape" +panel_display_name: "North Landscape" panels { name: "WEATHER" path: "Panels/General/platforms_1" diff --git a/data/maps/the_great/rooms/Outside Jail.txtpb b/data/maps/the_great/rooms/Outside Jail.txtpb index ab30761..d6dfa71 100644 --- a/data/maps/the_great/rooms/Outside Jail.txtpb +++ b/data/maps/the_great/rooms/Outside Jail.txtpb @@ -1,5 +1,5 @@ name: "Outside Jail" -display_name: "Jail" +panel_display_name: "Jail" panels { name: "GUT" path: "Panels/Head/head_1" diff --git a/data/maps/the_great/rooms/Pillar Room.txtpb b/data/maps/the_great/rooms/Pillar Room.txtpb index 01ff309..648b7b4 100644 --- a/data/maps/the_great/rooms/Pillar Room.txtpb +++ b/data/maps/the_great/rooms/Pillar Room.txtpb @@ -1,5 +1,5 @@ name: "Pillar Room" -display_name: "Pillar Room" +panel_display_name: "Pillar Room" panels { name: "EYE" path: "Panels/Impressive/entry_2" diff --git a/data/maps/the_great/rooms/Purple Room.txtpb b/data/maps/the_great/rooms/Purple Room.txtpb index ff9bd9a..e505ca0 100644 --- a/data/maps/the_great/rooms/Purple Room.txtpb +++ b/data/maps/the_great/rooms/Purple Room.txtpb @@ -1,5 +1,5 @@ name: "Purple Room" -display_name: "Main Area" +panel_display_name: "Main Area" ports { name: "DAEDALUS" path: "Meshes/Blocks/Warps/worldport18" diff --git a/data/maps/the_great/rooms/Question Room How.txtpb b/data/maps/the_great/rooms/Question Room How.txtpb index 2c4395b..8f087d0 100644 --- a/data/maps/the_great/rooms/Question Room How.txtpb +++ b/data/maps/the_great/rooms/Question Room How.txtpb @@ -1,5 +1,5 @@ name: "Question Room How" -display_name: "Question Room" +panel_display_name: "Question Room" panels { name: "QUESTION" path: "Panels/Questions/question_3" @@ -12,6 +12,7 @@ panels { proxies { answer: "what" path: "Panels/Question Proxies/question_3_proxied4" } proxies { answer: "when" path: "Panels/Question Proxies/question_3_proxied5" } proxies { answer: "where" path: "Panels/Question Proxies/question_3_proxied6" } + display_name: "QUESTION (How)" } paintings { name: "WHY" diff --git a/data/maps/the_great/rooms/Question Room What.txtpb b/data/maps/the_great/rooms/Question Room What.txtpb index c7be6a9..a806366 100644 --- a/data/maps/the_great/rooms/Question Room What.txtpb +++ b/data/maps/the_great/rooms/Question Room What.txtpb @@ -1,5 +1,5 @@ name: "Question Room What" -display_name: "Question Room" +panel_display_name: "Question Room" panels { name: "QUESTION" path: "Panels/Questions/question_4" @@ -12,4 +12,5 @@ panels { proxies { answer: "how" path: "Panels/Question Proxies/question_4_proxied4" } proxies { answer: "what" path: "Panels/Question Proxies/question_4_proxied5" } proxies { answer: "when" path: "Panels/Question Proxies/question_4_proxied6" } + display_name: "QUESTION (What)" } diff --git a/data/maps/the_great/rooms/Question Room When.txtpb b/data/maps/the_great/rooms/Question Room When.txtpb index 4de0d0f..b3ee2db 100644 --- a/data/maps/the_great/rooms/Question Room When.txtpb +++ b/data/maps/the_great/rooms/Question Room When.txtpb @@ -1,5 +1,5 @@ name: "Question Room When" -display_name: "Question Room" +panel_display_name: "Question Room" panels { name: "QUESTION" path: "Panels/Questions/question_1" @@ -12,6 +12,7 @@ panels { proxies { answer: "who" path: "Panels/Question Proxies/question_1_proxied4" } proxies { answer: "how" path: "Panels/Question Proxies/question_1_proxied5" } proxies { answer: "where" path: "Panels/Question Proxies/question_1_proxied6" } + display_name: "QUESTION (When)" } paintings { name: "WHY" diff --git a/data/maps/the_great/rooms/Question Room Who.txtpb b/data/maps/the_great/rooms/Question Room Who.txtpb index f1d6eb7..eb80882 100644 --- a/data/maps/the_great/rooms/Question Room Who.txtpb +++ b/data/maps/the_great/rooms/Question Room Who.txtpb @@ -1,5 +1,5 @@ name: "Question Room Who" -display_name: "Question Room" +panel_display_name: "Question Room" panels { name: "QUESTION" path: "Panels/Questions/question_2" @@ -12,4 +12,5 @@ panels { proxies { answer: "how" path: "Panels/Question Proxies/question_2_proxied4" } proxies { answer: "what" path: "Panels/Question Proxies/question_2_proxied5" } proxies { answer: "when" path: "Panels/Question Proxies/question_2_proxied6" } + display_name: "QUESTION (Who)" } diff --git a/data/maps/the_great/rooms/Salmon Room.txtpb b/data/maps/the_great/rooms/Salmon Room.txtpb index 96efd1a..ecdef75 100644 --- a/data/maps/the_great/rooms/Salmon Room.txtpb +++ b/data/maps/the_great/rooms/Salmon Room.txtpb @@ -1,5 +1,5 @@ name: "Salmon Room" -display_name: "Main Area" +panel_display_name: "Main Area" ports { name: "BETWEEN" path: "Meshes/Blocks/Warps/worldport11" diff --git a/data/maps/the_great/rooms/Talented Entrance.txtpb b/data/maps/the_great/rooms/Talented Entrance.txtpb index 038c7e7..7329853 100644 --- a/data/maps/the_great/rooms/Talented Entrance.txtpb +++ b/data/maps/the_great/rooms/Talented Entrance.txtpb @@ -1,5 +1,5 @@ name: "Talented Entrance" -display_name: "Question Room" +panel_display_name: "Question Room" ports { name: "TALENTED" path: "Meshes/Blocks/Warps/worldport14" diff --git a/data/maps/the_great/rooms/Under Question Room.txtpb b/data/maps/the_great/rooms/Under Question Room.txtpb index 4992632..db751bb 100644 --- a/data/maps/the_great/rooms/Under Question Room.txtpb +++ b/data/maps/the_great/rooms/Under Question Room.txtpb @@ -1,5 +1,5 @@ name: "Under Question Room" -display_name: "Question Room" +panel_display_name: "Question Room" panels { name: "QUESTION" path: "Panels/General/question_1" @@ -8,4 +8,5 @@ panels { symbols: EXAMPLE proxies { answer: "which" path: "Panels/General/question_1_proxy_1" } proxies { answer: "where" path: "Panels/General/question_1_proxy_2" } + display_name: "QUESTION (Where)" } diff --git a/data/maps/the_great/rooms/West Side.txtpb b/data/maps/the_great/rooms/West Side.txtpb index 4723213..daf1718 100644 --- a/data/maps/the_great/rooms/West Side.txtpb +++ b/data/maps/the_great/rooms/West Side.txtpb @@ -1,5 +1,5 @@ name: "West Side" -display_name: "West Side" +panel_display_name: "West Side" panels { name: "ERASE" path: "Panels/General/entry_9" diff --git a/data/maps/the_great/rooms/Whole Room.txtpb b/data/maps/the_great/rooms/Whole Room.txtpb index 2f5c855..daa174c 100644 --- a/data/maps/the_great/rooms/Whole Room.txtpb +++ b/data/maps/the_great/rooms/Whole Room.txtpb @@ -1,5 +1,5 @@ name: "Whole Room" -display_name: "North Landscape" +panel_display_name: "North Landscape" panels { name: "VAULT" path: "Panels/Whole Room/whole_1" diff --git a/data/maps/the_great/rooms/Y Room.txtpb b/data/maps/the_great/rooms/Y Room.txtpb index b20420c..46c83ea 100644 --- a/data/maps/the_great/rooms/Y Room.txtpb +++ b/data/maps/the_great/rooms/Y Room.txtpb @@ -1,5 +1,5 @@ name: "Y Room" -display_name: "Question Room" +panel_display_name: "Question Room" letters { key: "y" path: "Components/Collectables/y" diff --git a/data/maps/the_great/rooms/Zero Room.txtpb b/data/maps/the_great/rooms/Zero Room.txtpb index dcbe067..54675bf 100644 --- a/data/maps/the_great/rooms/Zero Room.txtpb +++ b/data/maps/the_great/rooms/Zero Room.txtpb @@ -1,5 +1,5 @@ name: "Zero Room" -display_name: "Zero Room" +panel_display_name: "Zero Room" panels { name: "HERO" path: "Panels/General/zero_1" diff --git a/data/maps/the_hinterlands/rooms/Main Area.txtpb b/data/maps/the_hinterlands/rooms/Main Area.txtpb index ad44b38..8daac05 100644 --- a/data/maps/the_hinterlands/rooms/Main Area.txtpb +++ b/data/maps/the_hinterlands/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Main Area" # I'm probably not going to include any of the panels in here. ports { name: "RIGHT" diff --git a/data/maps/the_hive/rooms/Main Area.txtpb b/data/maps/the_hive/rooms/Main Area.txtpb index de7bdec..0f73682 100644 --- a/data/maps/the_hive/rooms/Main Area.txtpb +++ b/data/maps/the_hive/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Hive" panels { name: "ASP" path: "Panels/Room 1/panel_1" diff --git a/data/maps/the_hive/rooms/Mastery Room.txtpb b/data/maps/the_hive/rooms/Mastery Room.txtpb index 1884cfd..5e3326c 100644 --- a/data/maps/the_hive/rooms/Mastery Room.txtpb +++ b/data/maps/the_hive/rooms/Mastery Room.txtpb @@ -1,5 +1,4 @@ name: "Mastery Room" -display_name: "Hive" masteries { name: "MASTERY" path: "Components/Collectables/smiley" diff --git a/data/maps/the_hive/rooms/Room 8.txtpb b/data/maps/the_hive/rooms/Room 8.txtpb index e8cbb60..c96440c 100644 --- a/data/maps/the_hive/rooms/Room 8.txtpb +++ b/data/maps/the_hive/rooms/Room 8.txtpb @@ -1,5 +1,4 @@ name: "Room 8" -display_name: "Hive" panels { name: "BUMBLE" path: "Panels/Room 8/panel_1" diff --git a/data/maps/the_impressive/rooms/Green Eye.txtpb b/data/maps/the_impressive/rooms/Green Eye.txtpb index 195099d..b4a115b 100644 --- a/data/maps/the_impressive/rooms/Green Eye.txtpb +++ b/data/maps/the_impressive/rooms/Green Eye.txtpb @@ -1,5 +1,5 @@ name: "Green Eye" -display_name: "Impressive" +panel_display_name: "Outside" panels { name: "RETURN" path: "Panels/entry_5" diff --git a/data/maps/the_impressive/rooms/Lobby.txtpb b/data/maps/the_impressive/rooms/Lobby.txtpb index 5492d67..3c565fe 100644 --- a/data/maps/the_impressive/rooms/Lobby.txtpb +++ b/data/maps/the_impressive/rooms/Lobby.txtpb @@ -1,5 +1,5 @@ name: "Lobby" -display_name: "Impressive" +panel_display_name: "Outside" panels { name: "RIGHT" path: "Panels/entry_1" diff --git a/data/maps/the_impressive/rooms/M Room.txtpb b/data/maps/the_impressive/rooms/M Room.txtpb index 1796bb3..2cc71be 100644 --- a/data/maps/the_impressive/rooms/M Room.txtpb +++ b/data/maps/the_impressive/rooms/M Room.txtpb @@ -1,5 +1,5 @@ name: "M Room" -display_name: "Impressive" +panel_display_name: "Inside" letters { key: "m" path: "Components/Collectables/collectable" diff --git a/data/maps/the_impressive/rooms/M2 Room.txtpb b/data/maps/the_impressive/rooms/M2 Room.txtpb index d229cbc..3684441 100644 --- a/data/maps/the_impressive/rooms/M2 Room.txtpb +++ b/data/maps/the_impressive/rooms/M2 Room.txtpb @@ -1,5 +1,5 @@ name: "M2 Room" -display_name: "Impressive" +panel_display_name: "Inside" letters { key: "m" level2: true diff --git a/data/maps/the_impressive/rooms/Side Area.txtpb b/data/maps/the_impressive/rooms/Side Area.txtpb index 7c3dbd8..1dfb12b 100644 --- a/data/maps/the_impressive/rooms/Side Area.txtpb +++ b/data/maps/the_impressive/rooms/Side Area.txtpb @@ -1,5 +1,5 @@ name: "Side Area" -display_name: "Impressive" +panel_display_name: "Outside" panels { name: "COLOR" path: "Panels/entry_4" diff --git a/data/maps/the_impressive/rooms/W Room.txtpb b/data/maps/the_impressive/rooms/W Room.txtpb index c0616f9..21f1eab 100644 --- a/data/maps/the_impressive/rooms/W Room.txtpb +++ b/data/maps/the_impressive/rooms/W Room.txtpb @@ -1,5 +1,5 @@ name: "W Room" -display_name: "Impressive" +panel_display_name: "Inside" letters { key: "w" path: "Components/Collectables/collectable2" diff --git a/data/maps/the_impressive/rooms/WM Room.txtpb b/data/maps/the_impressive/rooms/WM Room.txtpb index 3e0ccf2..dce77ed 100644 --- a/data/maps/the_impressive/rooms/WM Room.txtpb +++ b/data/maps/the_impressive/rooms/WM Room.txtpb @@ -1,5 +1,5 @@ name: "WM Room" -display_name: "Impressive" +panel_display_name: "Inside" panels { name: "LEFT" path: "Panels/entry_2" diff --git a/data/maps/the_invisible/rooms/Entrance.txtpb b/data/maps/the_invisible/rooms/Entrance.txtpb index 7fafcb5..bfc7223 100644 --- a/data/maps/the_invisible/rooms/Entrance.txtpb +++ b/data/maps/the_invisible/rooms/Entrance.txtpb @@ -1,5 +1,4 @@ name: "Entrance" -display_name: "Invisible" panels { name: "VISIBLE" path: "Panels/Room_1/panel_1" diff --git a/data/maps/the_invisible/rooms/Maze.txtpb b/data/maps/the_invisible/rooms/Maze.txtpb index 4461f08..895817a 100644 --- a/data/maps/the_invisible/rooms/Maze.txtpb +++ b/data/maps/the_invisible/rooms/Maze.txtpb @@ -1,5 +1,4 @@ name: "Maze" -display_name: "Invisible" masteries { name: "MASTERY" path: "Components/Collectables/smiley" diff --git a/data/maps/the_jubilant/rooms/J Room.txtpb b/data/maps/the_jubilant/rooms/J Room.txtpb index 35abc54..19425f1 100644 --- a/data/maps/the_jubilant/rooms/J Room.txtpb +++ b/data/maps/the_jubilant/rooms/J Room.txtpb @@ -1,5 +1,4 @@ name: "J Room" -display_name: "Jubilant" letters { key: "j" path: "Components/Collectables/q" # yeah lol diff --git a/data/maps/the_jubilant/rooms/Main Area.txtpb b/data/maps/the_jubilant/rooms/Main Area.txtpb index 3d7d31f..3b91f6d 100644 --- a/data/maps/the_jubilant/rooms/Main Area.txtpb +++ b/data/maps/the_jubilant/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Jubilant" panels { name: "GEMSTONE" path: "Panels/Main/panel_1" diff --git a/data/maps/the_jubilant/rooms/Side Area.txtpb b/data/maps/the_jubilant/rooms/Side Area.txtpb index 0e904aa..e924762 100644 --- a/data/maps/the_jubilant/rooms/Side Area.txtpb +++ b/data/maps/the_jubilant/rooms/Side Area.txtpb @@ -1,5 +1,4 @@ name: "Side Area" -display_name: "Jubilant" panels { name: "CALLBACK" path: "Panels/Back Helpers/back_1" diff --git a/data/maps/the_keen/rooms/K Room.txtpb b/data/maps/the_keen/rooms/K Room.txtpb index 3485856..d8108f5 100644 --- a/data/maps/the_keen/rooms/K Room.txtpb +++ b/data/maps/the_keen/rooms/K Room.txtpb @@ -1,5 +1,4 @@ name: "K Room" -display_name: "Keen" letters { key: "k" path: "Components/Collectables/collectable" diff --git a/data/maps/the_keen/rooms/Main Area.txtpb b/data/maps/the_keen/rooms/Main Area.txtpb index 616e7e7..eacd131 100644 --- a/data/maps/the_keen/rooms/Main Area.txtpb +++ b/data/maps/the_keen/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Keen" panels { name: "TIN (1)" path: "Panels/entry_3" diff --git a/data/maps/the_liberated/doors.txtpb b/data/maps/the_liberated/doors.txtpb index becddf9..a7d3c24 100644 --- a/data/maps/the_liberated/doors.txtpb +++ b/data/maps/the_liberated/doors.txtpb @@ -11,4 +11,5 @@ doors { panels { room: "Puzzle Room" name: "WOLF" } panels { room: "Puzzle Room" name: "FOOT" } location_room: "Puzzle Room" + location_name: "Puzzles" } diff --git a/data/maps/the_liberated/rooms/Painting Room.txtpb b/data/maps/the_liberated/rooms/Painting Room.txtpb index 025281a..f22929c 100644 --- a/data/maps/the_liberated/rooms/Painting Room.txtpb +++ b/data/maps/the_liberated/rooms/Painting Room.txtpb @@ -1,5 +1,4 @@ name: "Painting Room" -display_name: "Liberated" paintings { name: "PYRAMID" path: "Components/triangle" diff --git a/data/maps/the_liberated/rooms/Puzzle Room.txtpb b/data/maps/the_liberated/rooms/Puzzle Room.txtpb index dcb29c4..0223b44 100644 --- a/data/maps/the_liberated/rooms/Puzzle Room.txtpb +++ b/data/maps/the_liberated/rooms/Puzzle Room.txtpb @@ -1,5 +1,4 @@ name: "Puzzle Room" -display_name: "Liberated" panels { name: "CORPSE" path: "Panels/entry_1" diff --git a/data/maps/the_linear/rooms/Room.txtpb b/data/maps/the_linear/rooms/Room.txtpb index abb89c8..c47ce0c 100644 --- a/data/maps/the_linear/rooms/Room.txtpb +++ b/data/maps/the_linear/rooms/Room.txtpb @@ -1,5 +1,4 @@ name: "Room" -display_name: "Room" panels { name: "HORN" path: "Panels/entry_1" diff --git a/data/maps/the_lionized/rooms/E2 Room.txtpb b/data/maps/the_lionized/rooms/E2 Room.txtpb index b07d820..e8f81c1 100644 --- a/data/maps/the_lionized/rooms/E2 Room.txtpb +++ b/data/maps/the_lionized/rooms/E2 Room.txtpb @@ -1,5 +1,4 @@ name: "E2 Room" -display_name: "Lionized" letters { key: "e" level2: true diff --git a/data/maps/the_lionized/rooms/Puzzle Room.txtpb b/data/maps/the_lionized/rooms/Puzzle Room.txtpb index 5754c71..22b72ac 100644 --- a/data/maps/the_lionized/rooms/Puzzle Room.txtpb +++ b/data/maps/the_lionized/rooms/Puzzle Room.txtpb @@ -1,5 +1,4 @@ name: "Puzzle Room" -display_name: "Lionized" panels { name: "CHILD" path: "Panels/entry_1" diff --git a/data/maps/the_literate/doors.txtpb b/data/maps/the_literate/doors.txtpb index 480f54d..d17d02b 100644 --- a/data/maps/the_literate/doors.txtpb +++ b/data/maps/the_literate/doors.txtpb @@ -11,4 +11,5 @@ doors { panels { room: "Puzzle Room" name: "STICK" } panels { room: "Puzzle Room" name: "BREAD" } location_room: "Puzzle Room" + location_name: "Puzzles" } diff --git a/data/maps/the_literate/rooms/Painting Room.txtpb b/data/maps/the_literate/rooms/Painting Room.txtpb index 254e174..f22929c 100644 --- a/data/maps/the_literate/rooms/Painting Room.txtpb +++ b/data/maps/the_literate/rooms/Painting Room.txtpb @@ -1,5 +1,4 @@ name: "Painting Room" -display_name: "Literate" paintings { name: "PYRAMID" path: "Components/triangle" diff --git a/data/maps/the_literate/rooms/Puzzle Room.txtpb b/data/maps/the_literate/rooms/Puzzle Room.txtpb index 610a87a..3927702 100644 --- a/data/maps/the_literate/rooms/Puzzle Room.txtpb +++ b/data/maps/the_literate/rooms/Puzzle Room.txtpb @@ -1,5 +1,4 @@ name: "Puzzle Room" -display_name: "Literate" panels { name: "WATER" path: "Panels/entry_1" diff --git a/data/maps/the_lively/rooms/L2 Room.txtpb b/data/maps/the_lively/rooms/L2 Room.txtpb index 094ab10..cd75bbd 100644 --- a/data/maps/the_lively/rooms/L2 Room.txtpb +++ b/data/maps/the_lively/rooms/L2 Room.txtpb @@ -1,5 +1,4 @@ name: "L2 Room" -display_name: "Lively" letters { key: "l" level2: true diff --git a/data/maps/the_lively/rooms/Puzzle Room.txtpb b/data/maps/the_lively/rooms/Puzzle Room.txtpb index f202453..b33a122 100644 --- a/data/maps/the_lively/rooms/Puzzle Room.txtpb +++ b/data/maps/the_lively/rooms/Puzzle Room.txtpb @@ -1,5 +1,4 @@ name: "Puzzle Room" -display_name: "Lively" panels { name: "LIONESS" path: "Panels/entry_1" diff --git a/data/maps/the_nuanced/rooms/Back Room.txtpb b/data/maps/the_nuanced/rooms/Back Room.txtpb index 37a1c7a..b61e18b 100644 --- a/data/maps/the_nuanced/rooms/Back Room.txtpb +++ b/data/maps/the_nuanced/rooms/Back Room.txtpb @@ -1,5 +1,4 @@ name: "Back Room" -display_name: "Nuanced" panels { name: "COURSE" path: "Panels/Rhymes/panel_1" diff --git a/data/maps/the_nuanced/rooms/Main Room.txtpb b/data/maps/the_nuanced/rooms/Main Room.txtpb index 8523b38..8da3b5f 100644 --- a/data/maps/the_nuanced/rooms/Main Room.txtpb +++ b/data/maps/the_nuanced/rooms/Main Room.txtpb @@ -1,5 +1,4 @@ name: "Main Room" -display_name: "Nuanced" panels { name: "HOARSE" path: "Panels/Eyes/panel_1" diff --git a/data/maps/the_nuanced/rooms/N2 Room.txtpb b/data/maps/the_nuanced/rooms/N2 Room.txtpb index 492d4a3..eb9f67c 100644 --- a/data/maps/the_nuanced/rooms/N2 Room.txtpb +++ b/data/maps/the_nuanced/rooms/N2 Room.txtpb @@ -1,5 +1,4 @@ name: "N2 Room" -display_name: "Nuanced" letters { key: "n" level2: true diff --git a/data/maps/the_orb/rooms/B Room.txtpb b/data/maps/the_orb/rooms/B Room.txtpb index 833c659..0324647 100644 --- a/data/maps/the_orb/rooms/B Room.txtpb +++ b/data/maps/the_orb/rooms/B Room.txtpb @@ -1,5 +1,4 @@ name: "B Room" -display_name: "Orb" letters { key: "b" path: "Components/Collectables/b" diff --git a/data/maps/the_orb/rooms/Main Area.txtpb b/data/maps/the_orb/rooms/Main Area.txtpb index 8d7b7b1..4fcac29 100644 --- a/data/maps/the_orb/rooms/Main Area.txtpb +++ b/data/maps/the_orb/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Orb" panels { name: "STRIKE" path: "Panels/O/entry_1" diff --git a/data/maps/the_orb/rooms/O Room.txtpb b/data/maps/the_orb/rooms/O Room.txtpb index f997780..cc254a4 100644 --- a/data/maps/the_orb/rooms/O Room.txtpb +++ b/data/maps/the_orb/rooms/O Room.txtpb @@ -1,5 +1,4 @@ name: "O Room" -display_name: "Orb" letters { key: "o" path: "Components/Collectables/o" diff --git a/data/maps/the_orb/rooms/R Room.txtpb b/data/maps/the_orb/rooms/R Room.txtpb index c53b7eb..a01726a 100644 --- a/data/maps/the_orb/rooms/R Room.txtpb +++ b/data/maps/the_orb/rooms/R Room.txtpb @@ -1,5 +1,4 @@ name: "R Room" -display_name: "Orb" letters { key: "r" path: "Components/Collectables/r" diff --git a/data/maps/the_owl/rooms/Blue Room.txtpb b/data/maps/the_owl/rooms/Blue Room.txtpb index 7c2d69a..a7298cd 100644 --- a/data/maps/the_owl/rooms/Blue Room.txtpb +++ b/data/maps/the_owl/rooms/Blue Room.txtpb @@ -1,5 +1,4 @@ name: "Blue Room" -display_name: "Owl" panels { name: "SKY" path: "Panels/Colors/owl_7" diff --git a/data/maps/the_owl/rooms/Connected Area.txtpb b/data/maps/the_owl/rooms/Connected Area.txtpb index 18388be..5862d59 100644 --- a/data/maps/the_owl/rooms/Connected Area.txtpb +++ b/data/maps/the_owl/rooms/Connected Area.txtpb @@ -1,5 +1,4 @@ name: "Connected Area" -display_name: "Owl" panels { name: "MODE" path: "Panels/Noncritical/owl_12" diff --git a/data/maps/the_owl/rooms/Magenta Hallway.txtpb b/data/maps/the_owl/rooms/Magenta Hallway.txtpb index 58a4a5d..ccbdc1c 100644 --- a/data/maps/the_owl/rooms/Magenta Hallway.txtpb +++ b/data/maps/the_owl/rooms/Magenta Hallway.txtpb @@ -1,5 +1,4 @@ name: "Magenta Hallway" -display_name: "Owl" ports { name: "STURDY" path: "Components/Warps/worldport3" diff --git a/data/maps/the_owl/rooms/R1C4 Left.txtpb b/data/maps/the_owl/rooms/R1C4 Left.txtpb index 73c1520..3714842 100644 --- a/data/maps/the_owl/rooms/R1C4 Left.txtpb +++ b/data/maps/the_owl/rooms/R1C4 Left.txtpb @@ -1,5 +1,4 @@ name: "R1C4 Left" -display_name: "Owl" panels { name: "WALK" path: "Panels/Noncritical/owl_5" diff --git a/data/maps/the_owl/rooms/R2C1 Left.txtpb b/data/maps/the_owl/rooms/R2C1 Left.txtpb index 0f9a2b5..72e7331 100644 --- a/data/maps/the_owl/rooms/R2C1 Left.txtpb +++ b/data/maps/the_owl/rooms/R2C1 Left.txtpb @@ -1,5 +1,4 @@ name: "R2C1 Left" -display_name: "Owl" panels { name: "VERB" path: "Panels/Bottom Left/owl_8" diff --git a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb index e7eb9e4..4661877 100644 --- a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb +++ b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb @@ -1,5 +1,4 @@ name: "R2C2 Bottom" -display_name: "Owl" panels { name: "FOUL" path: "Panels/Bottom Mid/owl_11" diff --git a/data/maps/the_owl/rooms/R2C2 Top.txtpb b/data/maps/the_owl/rooms/R2C2 Top.txtpb index 87b7705..78ce270 100644 --- a/data/maps/the_owl/rooms/R2C2 Top.txtpb +++ b/data/maps/the_owl/rooms/R2C2 Top.txtpb @@ -1,5 +1,4 @@ name: "R2C2 Top" -display_name: "Owl" panels { name: "CRUSH" path: "Panels/Bottom Mid/owl_1" diff --git a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb b/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb index 41b6265..0f5381e 100644 --- a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb +++ b/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb @@ -1,5 +1,4 @@ name: "R2C2.5 Bottom" -display_name: "Owl" panels { name: "FIZZLE" path: "Panels/Bottom Mid/owl_10" diff --git a/data/maps/the_owl/rooms/Z Room.txtpb b/data/maps/the_owl/rooms/Z Room.txtpb index 035d0b4..ab28655 100644 --- a/data/maps/the_owl/rooms/Z Room.txtpb +++ b/data/maps/the_owl/rooms/Z Room.txtpb @@ -1,5 +1,4 @@ name: "Z Room" -display_name: "Owl" panels { name: "MAZE" path: "Panels/Noncritical/owl_10" diff --git a/data/maps/the_parthenon/doors.txtpb b/data/maps/the_parthenon/doors.txtpb index 82a2748..7bc41c1 100644 --- a/data/maps/the_parthenon/doors.txtpb +++ b/data/maps/the_parthenon/doors.txtpb @@ -19,6 +19,7 @@ doors { panels { room: "Main Area" name: "ALEXANDER" answer: "greece" } panels { room: "Main Area" name: "CAESAR" answer: "rome" } location_room: "Main Area" + location_name: "Empires" } doors { name: "Ending Door" diff --git a/data/maps/the_parthenon/rooms/Ending.txtpb b/data/maps/the_parthenon/rooms/Ending.txtpb index 8fa805f..789e906 100644 --- a/data/maps/the_parthenon/rooms/Ending.txtpb +++ b/data/maps/the_parthenon/rooms/Ending.txtpb @@ -1,5 +1,4 @@ name: "Ending" -display_name: "Parthenon" endings { name: "CYAN" path: "Components/cyan_end" diff --git a/data/maps/the_parthenon/rooms/K2 Room.txtpb b/data/maps/the_parthenon/rooms/K2 Room.txtpb index 1c95ad5..596b489 100644 --- a/data/maps/the_parthenon/rooms/K2 Room.txtpb +++ b/data/maps/the_parthenon/rooms/K2 Room.txtpb @@ -1,5 +1,4 @@ name: "K2 Room" -display_name: "Parthenon" letters { key: "k" level2: true diff --git a/data/maps/the_parthenon/rooms/Lavender Area.txtpb b/data/maps/the_parthenon/rooms/Lavender Area.txtpb index 6f67214..9e62498 100644 --- a/data/maps/the_parthenon/rooms/Lavender Area.txtpb +++ b/data/maps/the_parthenon/rooms/Lavender Area.txtpb @@ -1,5 +1,4 @@ name: "Lavender Area" -display_name: "Parthenon" panels { name: "ME" path: "Panels/Lavender/panel_7" diff --git a/data/maps/the_parthenon/rooms/Main Area.txtpb b/data/maps/the_parthenon/rooms/Main Area.txtpb index 7d4a80c..85188d1 100644 --- a/data/maps/the_parthenon/rooms/Main Area.txtpb +++ b/data/maps/the_parthenon/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Parthenon" panels { name: "XERXES" path: "Panels/Main/panel_1" diff --git a/data/maps/the_parthenon/rooms/U Keyholder.txtpb b/data/maps/the_parthenon/rooms/U Keyholder.txtpb index d3107b4..8248df8 100644 --- a/data/maps/the_parthenon/rooms/U Keyholder.txtpb +++ b/data/maps/the_parthenon/rooms/U Keyholder.txtpb @@ -1,5 +1,4 @@ name: "U Keyholder" -display_name: "Parthenon" keyholders { name: "U" path: "Components/KeyHolders/keyHolderU" diff --git a/data/maps/the_partial/doors.txtpb b/data/maps/the_partial/doors.txtpb index 2b233db..c51062a 100644 --- a/data/maps/the_partial/doors.txtpb +++ b/data/maps/the_partial/doors.txtpb @@ -22,6 +22,7 @@ doors { panels { room: "Obverse Side" name: "CUT" } panels { room: "Obverse Side" name: "FUN" } location_room: "Obverse Side" + location_name: "Obverse Side Room" } doors { name: "Giant P" diff --git a/data/maps/the_partial/rooms/Control Center Entrance.txtpb b/data/maps/the_partial/rooms/Control Center Entrance.txtpb index 8d7e228..e685822 100644 --- a/data/maps/the_partial/rooms/Control Center Entrance.txtpb +++ b/data/maps/the_partial/rooms/Control Center Entrance.txtpb @@ -1,5 +1,4 @@ name: "Control Center Entrance" -display_name: "Partial" panels { name: "RETURN" path: "Panels/Control/panel_10" diff --git a/data/maps/the_partial/rooms/F Room.txtpb b/data/maps/the_partial/rooms/F Room.txtpb index 358c936..d41d039 100644 --- a/data/maps/the_partial/rooms/F Room.txtpb +++ b/data/maps/the_partial/rooms/F Room.txtpb @@ -1,5 +1,4 @@ name: "F Room" -display_name: "Partial" letters { key: "f" path: "Components/Collectables/collectable2" diff --git a/data/maps/the_partial/rooms/Obverse Side.txtpb b/data/maps/the_partial/rooms/Obverse Side.txtpb index 0d83c34..75cd9bb 100644 --- a/data/maps/the_partial/rooms/Obverse Side.txtpb +++ b/data/maps/the_partial/rooms/Obverse Side.txtpb @@ -1,5 +1,4 @@ name: "Obverse Side" -display_name: "Partial" panels { name: "PUN" path: "Panels/Main/panel_1" diff --git a/data/maps/the_partial/rooms/P Room.txtpb b/data/maps/the_partial/rooms/P Room.txtpb index e7a7a60..618ebd9 100644 --- a/data/maps/the_partial/rooms/P Room.txtpb +++ b/data/maps/the_partial/rooms/P Room.txtpb @@ -1,5 +1,4 @@ name: "P Room" -display_name: "Partial" letters { key: "p" path: "Components/Collectables/collectable" diff --git a/data/maps/the_partial/rooms/Reverse Side.txtpb b/data/maps/the_partial/rooms/Reverse Side.txtpb index a286737..01858d6 100644 --- a/data/maps/the_partial/rooms/Reverse Side.txtpb +++ b/data/maps/the_partial/rooms/Reverse Side.txtpb @@ -1,5 +1,4 @@ name: "Reverse Side" -display_name: "Partial" panels { name: "BRO" path: "Panels/Side 2/panel_2" diff --git a/data/maps/the_perceptive/rooms/Main Area.txtpb b/data/maps/the_perceptive/rooms/Main Area.txtpb index 75a0343..449bd4d 100644 --- a/data/maps/the_perceptive/rooms/Main Area.txtpb +++ b/data/maps/the_perceptive/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Perceptive" ports { name: "CC" path: "Components/Warps/worldport" diff --git a/data/maps/the_plaza/doors.txtpb b/data/maps/the_plaza/doors.txtpb index be491ed..322fe39 100644 --- a/data/maps/the_plaza/doors.txtpb +++ b/data/maps/the_plaza/doors.txtpb @@ -41,6 +41,7 @@ doors { panels { room: "Center Room" name: "DENTIST" } panels { room: "Center Room" name: "SQUIRREL" } location_room: "Center Room" + location_name: "First Room" } doors { name: "Top Right Door" diff --git a/data/maps/the_plaza/rooms/Bottom Left Room.txtpb b/data/maps/the_plaza/rooms/Bottom Left Room.txtpb index 833ccce..138efc6 100644 --- a/data/maps/the_plaza/rooms/Bottom Left Room.txtpb +++ b/data/maps/the_plaza/rooms/Bottom Left Room.txtpb @@ -1,5 +1,4 @@ name: "Bottom Left Room" -display_name: "Plaza" panels { name: "SHELL (1)" path: "Panels/Room 4/panel_1" diff --git a/data/maps/the_plaza/rooms/Bottom Right Room.txtpb b/data/maps/the_plaza/rooms/Bottom Right Room.txtpb index cc38e23..fcd8d37 100644 --- a/data/maps/the_plaza/rooms/Bottom Right Room.txtpb +++ b/data/maps/the_plaza/rooms/Bottom Right Room.txtpb @@ -1,5 +1,4 @@ name: "Bottom Right Room" -display_name: "Plaza" panels { name: "FLY" path: "Panels/Room 3/panel_1" diff --git a/data/maps/the_plaza/rooms/Center Room.txtpb b/data/maps/the_plaza/rooms/Center Room.txtpb index 4f1c62a..dea2d06 100644 --- a/data/maps/the_plaza/rooms/Center Room.txtpb +++ b/data/maps/the_plaza/rooms/Center Room.txtpb @@ -1,5 +1,4 @@ name: "Center Room" -display_name: "Plaza" panels { name: "REPORTER" path: "Panels/Room 2/panel_1" diff --git a/data/maps/the_plaza/rooms/Main Area.txtpb b/data/maps/the_plaza/rooms/Main Area.txtpb index cabfc94..521b974 100644 --- a/data/maps/the_plaza/rooms/Main Area.txtpb +++ b/data/maps/the_plaza/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Plaza" panels { name: "COURTYARD" path: "Panels/Entrances/panel_1" diff --git a/data/maps/the_plaza/rooms/Mastery.txtpb b/data/maps/the_plaza/rooms/Mastery.txtpb index 6b8fd5b..749837e 100644 --- a/data/maps/the_plaza/rooms/Mastery.txtpb +++ b/data/maps/the_plaza/rooms/Mastery.txtpb @@ -1,5 +1,4 @@ name: "Mastery" -display_name: "Plaza" masteries { name: "MASTERY" path: "Components/Collectables/smiley" diff --git a/data/maps/the_plaza/rooms/Repetitive Entrance.txtpb b/data/maps/the_plaza/rooms/Repetitive Entrance.txtpb index 1690c11..3857d5f 100644 --- a/data/maps/the_plaza/rooms/Repetitive Entrance.txtpb +++ b/data/maps/the_plaza/rooms/Repetitive Entrance.txtpb @@ -1,5 +1,4 @@ name: "Repetitive Entrance" -display_name: "Plaza" panels { name: "TEDIOUS" path: "Panels/Entrances/panel_6" diff --git a/data/maps/the_plaza/rooms/Sirenic Entrance.txtpb b/data/maps/the_plaza/rooms/Sirenic Entrance.txtpb index 048359d..3c60ca8 100644 --- a/data/maps/the_plaza/rooms/Sirenic Entrance.txtpb +++ b/data/maps/the_plaza/rooms/Sirenic Entrance.txtpb @@ -1,5 +1,4 @@ name: "Sirenic Entrance" -display_name: "Plaza" panels { name: "SIREN" path: "Panels/Entrances/panel_8" diff --git a/data/maps/the_plaza/rooms/Symbolic Entrance.txtpb b/data/maps/the_plaza/rooms/Symbolic Entrance.txtpb index 36b6a9b..ce5982c 100644 --- a/data/maps/the_plaza/rooms/Symbolic Entrance.txtpb +++ b/data/maps/the_plaza/rooms/Symbolic Entrance.txtpb @@ -1,5 +1,4 @@ name: "Symbolic Entrance" -display_name: "Plaza" panels { name: "FIGURATIVE" path: "Panels/Entrances/panel_5" diff --git a/data/maps/the_plaza/rooms/Top Left Room.txtpb b/data/maps/the_plaza/rooms/Top Left Room.txtpb index 4f562e0..d5b7056 100644 --- a/data/maps/the_plaza/rooms/Top Left Room.txtpb +++ b/data/maps/the_plaza/rooms/Top Left Room.txtpb @@ -1,5 +1,4 @@ name: "Top Left Room" -display_name: "Plaza" panels { name: "BARE SOD" path: "Panels/Room 6/panel_1" @@ -42,6 +41,7 @@ panels { clue: "knot" answer: "not" symbols: ZERO + display_name: "KNOT (TL)" } panels { name: "SURE TEMPER" @@ -129,6 +129,7 @@ panels { clue: "bear" answer: "bearer" symbols: SPARKLES + display_name: "BEAR (TL)" } panels { name: "CHILL" diff --git a/data/maps/the_plaza/rooms/Top Right Room.txtpb b/data/maps/the_plaza/rooms/Top Right Room.txtpb index 2a169af..7e91cbe 100644 --- a/data/maps/the_plaza/rooms/Top Right Room.txtpb +++ b/data/maps/the_plaza/rooms/Top Right Room.txtpb @@ -1,5 +1,4 @@ name: "Top Right Room" -display_name: "Plaza" panels { name: "RIGHT WING" path: "Panels/Room 5/panel_1" @@ -34,6 +33,7 @@ panels { clue: "bear" answer: "cave" symbols: STARS + display_name: "BEAR (TR)" } panels { name: "TYPIST" @@ -125,6 +125,7 @@ panels { clue: "knot" answer: "not" symbols: ZERO + display_name: "KNOT (TR)" } panels { name: "HALVES ANNOYED SOUR GOOD" diff --git a/data/maps/the_quiet/rooms/Keyholder Room.txtpb b/data/maps/the_quiet/rooms/Keyholder Room.txtpb index e2322a8..d0f2677 100644 --- a/data/maps/the_quiet/rooms/Keyholder Room.txtpb +++ b/data/maps/the_quiet/rooms/Keyholder Room.txtpb @@ -1,5 +1,4 @@ name: "Keyholder Room" -display_name: "Quiet" keyholders { name: "Q" path: "Components/KeyHolders/keyHolderQ" diff --git a/data/maps/the_quiet/rooms/Main Area.txtpb b/data/maps/the_quiet/rooms/Main Area.txtpb index d9c2361..180e0bc 100644 --- a/data/maps/the_quiet/rooms/Main Area.txtpb +++ b/data/maps/the_quiet/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Quiet" panels { name: "SOLID" path: "Panels/Main/panel_1" diff --git a/data/maps/the_quiet/rooms/Q Room.txtpb b/data/maps/the_quiet/rooms/Q Room.txtpb index 224e71b..368f366 100644 --- a/data/maps/the_quiet/rooms/Q Room.txtpb +++ b/data/maps/the_quiet/rooms/Q Room.txtpb @@ -1,5 +1,4 @@ name: "Q Room" -display_name: "Quiet" letters { key: "q" path: "Components/Collectables/q" diff --git a/data/maps/the_relentless/rooms/All.txtpb b/data/maps/the_relentless/rooms/All.txtpb index 12705ba..19238c9 100644 --- a/data/maps/the_relentless/rooms/All.txtpb +++ b/data/maps/the_relentless/rooms/All.txtpb @@ -1,5 +1,4 @@ name: "All" -display_name: "Relentless" panels { name: "LEFT (1)" path: "Panels/Room_1/panel_6" diff --git a/data/maps/the_relentless/rooms/Left And Turn.txtpb b/data/maps/the_relentless/rooms/Left And Turn.txtpb index 5037f20..f79bb54 100644 --- a/data/maps/the_relentless/rooms/Left And Turn.txtpb +++ b/data/maps/the_relentless/rooms/Left And Turn.txtpb @@ -1,5 +1,4 @@ name: "Left And Turn" -display_name: "Relentless" panels { name: "HIDE (1)" path: "Panels/Room_1/panel_2" diff --git a/data/maps/the_relentless/rooms/Left Room.txtpb b/data/maps/the_relentless/rooms/Left Room.txtpb index 52b5154..4db0075 100644 --- a/data/maps/the_relentless/rooms/Left Room.txtpb +++ b/data/maps/the_relentless/rooms/Left Room.txtpb @@ -1,5 +1,4 @@ name: "Left Room" -display_name: "Relentless" panels { name: "HIDE" path: "Panels/Room_1/panel_1" diff --git a/data/maps/the_relentless/rooms/Mastery.txtpb b/data/maps/the_relentless/rooms/Mastery.txtpb index 8b12c56..749837e 100644 --- a/data/maps/the_relentless/rooms/Mastery.txtpb +++ b/data/maps/the_relentless/rooms/Mastery.txtpb @@ -1,5 +1,4 @@ name: "Mastery" -display_name: "Relentless" masteries { name: "MASTERY" path: "Components/Collectables/smiley" diff --git a/data/maps/the_relentless/rooms/Shop Room.txtpb b/data/maps/the_relentless/rooms/Shop Room.txtpb index 22b7acc..be3ff7a 100644 --- a/data/maps/the_relentless/rooms/Shop Room.txtpb +++ b/data/maps/the_relentless/rooms/Shop Room.txtpb @@ -1,5 +1,4 @@ name: "Shop Room" -display_name: "Relentless" panels { name: "LEFT (1)" path: "Panels/Room_3/panel_5" diff --git a/data/maps/the_relentless/rooms/Turn And Shop.txtpb b/data/maps/the_relentless/rooms/Turn And Shop.txtpb index 9e61769..b9e257c 100644 --- a/data/maps/the_relentless/rooms/Turn And Shop.txtpb +++ b/data/maps/the_relentless/rooms/Turn And Shop.txtpb @@ -1,5 +1,4 @@ name: "Turn And Shop" -display_name: "Relentless" panels { name: "LEFT (1)" path: "Panels/Room_2/panel_5" diff --git a/data/maps/the_relentless/rooms/Turn Room.txtpb b/data/maps/the_relentless/rooms/Turn Room.txtpb index 3b5caef..525786c 100644 --- a/data/maps/the_relentless/rooms/Turn Room.txtpb +++ b/data/maps/the_relentless/rooms/Turn Room.txtpb @@ -1,5 +1,4 @@ name: "Turn Room" -display_name: "Relentless" panels { name: "HIDE (1)" path: "Panels/Room_2/panel_2" diff --git a/data/maps/the_repetitive/rooms/Anti Room.txtpb b/data/maps/the_repetitive/rooms/Anti Room.txtpb index 5451977..641fede 100644 --- a/data/maps/the_repetitive/rooms/Anti Room.txtpb +++ b/data/maps/the_repetitive/rooms/Anti Room.txtpb @@ -1,5 +1,4 @@ name: "Anti Room" -display_name: "Repetitive" # Ignore the collectible. The mod should remove it and the back wall too. panels { name: "HA (1)" diff --git a/data/maps/the_repetitive/rooms/Cyan Room.txtpb b/data/maps/the_repetitive/rooms/Cyan Room.txtpb index fb56ac7..d6790f5 100644 --- a/data/maps/the_repetitive/rooms/Cyan Room.txtpb +++ b/data/maps/the_repetitive/rooms/Cyan Room.txtpb @@ -1,5 +1,4 @@ name: "Cyan Room" -display_name: "Repetitive" panels { name: "ALFA" path: "Panels/Lingo2/panel_3" diff --git a/data/maps/the_repetitive/rooms/Dot Area.txtpb b/data/maps/the_repetitive/rooms/Dot Area.txtpb index 63d0395..c4f4583 100644 --- a/data/maps/the_repetitive/rooms/Dot Area.txtpb +++ b/data/maps/the_repetitive/rooms/Dot Area.txtpb @@ -1,5 +1,4 @@ name: "Dot Area" -display_name: "Repetitive" panels { name: "TUTU (1)" path: "Panels/Lingo2/panel" diff --git a/data/maps/the_repetitive/rooms/Entry Connector.txtpb b/data/maps/the_repetitive/rooms/Entry Connector.txtpb index 8addc7f..b6795c2 100644 --- a/data/maps/the_repetitive/rooms/Entry Connector.txtpb +++ b/data/maps/the_repetitive/rooms/Entry Connector.txtpb @@ -1,5 +1,4 @@ name: "Entry Connector" -display_name: "Repetitive" ports { name: "ENTRY" path: "Components/Warps/worldport2" diff --git a/data/maps/the_repetitive/rooms/Lime Room.txtpb b/data/maps/the_repetitive/rooms/Lime Room.txtpb index 71e4c2c..37d4937 100644 --- a/data/maps/the_repetitive/rooms/Lime Room.txtpb +++ b/data/maps/the_repetitive/rooms/Lime Room.txtpb @@ -1,5 +1,4 @@ name: "Lime Room" -display_name: "Repetitive" panels { name: "RAT" path: "Panels/Lingo2/panel_1" diff --git a/data/maps/the_repetitive/rooms/Magenta Room.txtpb b/data/maps/the_repetitive/rooms/Magenta Room.txtpb index 827d058..d38e485 100644 --- a/data/maps/the_repetitive/rooms/Magenta Room.txtpb +++ b/data/maps/the_repetitive/rooms/Magenta Room.txtpb @@ -1,5 +1,4 @@ name: "Magenta Room" -display_name: "Repetitive" panels { name: "WRITE" path: "Panels/Eval/panel_9" diff --git a/data/maps/the_repetitive/rooms/Main Room.txtpb b/data/maps/the_repetitive/rooms/Main Room.txtpb index 9fd36d4..8a2feb0 100644 --- a/data/maps/the_repetitive/rooms/Main Room.txtpb +++ b/data/maps/the_repetitive/rooms/Main Room.txtpb @@ -1,5 +1,4 @@ name: "Main Room" -display_name: "Repetitive" panels { name: "HOTS (2)" path: "Panels/Entry/panel_3" diff --git a/data/maps/the_repetitive/rooms/Mastery Room.txtpb b/data/maps/the_repetitive/rooms/Mastery Room.txtpb index 074a825..5e3326c 100644 --- a/data/maps/the_repetitive/rooms/Mastery Room.txtpb +++ b/data/maps/the_repetitive/rooms/Mastery Room.txtpb @@ -1,5 +1,4 @@ name: "Mastery Room" -display_name: "Repetitive" masteries { name: "MASTERY" path: "Components/Collectables/smiley" diff --git a/data/maps/the_repetitive/rooms/Plaza Connector.txtpb b/data/maps/the_repetitive/rooms/Plaza Connector.txtpb index 88f7fc4..1ed66b4 100644 --- a/data/maps/the_repetitive/rooms/Plaza Connector.txtpb +++ b/data/maps/the_repetitive/rooms/Plaza Connector.txtpb @@ -1,5 +1,4 @@ name: "Plaza Connector" -display_name: "Repetitive" ports { name: "PLAZA" path: "Components/Warps/worldport" diff --git a/data/maps/the_repetitive/rooms/Yellow Room.txtpb b/data/maps/the_repetitive/rooms/Yellow Room.txtpb index 65d665f..9b7d619 100644 --- a/data/maps/the_repetitive/rooms/Yellow Room.txtpb +++ b/data/maps/the_repetitive/rooms/Yellow Room.txtpb @@ -1,5 +1,4 @@ name: "Yellow Room" -display_name: "Repetitive" panels { name: "W" path: "Panels/Eval/panel_1" diff --git a/data/maps/the_revitalized/rooms/Bye Room.txtpb b/data/maps/the_revitalized/rooms/Bye Room.txtpb index 60726c2..6cefe70 100644 --- a/data/maps/the_revitalized/rooms/Bye Room.txtpb +++ b/data/maps/the_revitalized/rooms/Bye Room.txtpb @@ -1,5 +1,4 @@ name: "Bye Room" -display_name: "Revitalized" panels { name: "BYE" path: "Panels/panel_1" diff --git a/data/maps/the_revitalized/rooms/Hidden Room.txtpb b/data/maps/the_revitalized/rooms/Hidden Room.txtpb index c9ec310..61f2e4d 100644 --- a/data/maps/the_revitalized/rooms/Hidden Room.txtpb +++ b/data/maps/the_revitalized/rooms/Hidden Room.txtpb @@ -1,5 +1,4 @@ name: "Hidden Room" -display_name: "Revitalized" panels { name: "HIDDEN" path: "Panels/panel_3" diff --git a/data/maps/the_revitalized/rooms/Hide Room.txtpb b/data/maps/the_revitalized/rooms/Hide Room.txtpb index 6660787..92b29bf 100644 --- a/data/maps/the_revitalized/rooms/Hide Room.txtpb +++ b/data/maps/the_revitalized/rooms/Hide Room.txtpb @@ -1,5 +1,4 @@ name: "Hide Room" -display_name: "Revitalized" panels { name: "HIDE" path: "Panels/panel_2" diff --git a/data/maps/the_revitalized/rooms/High Room.txtpb b/data/maps/the_revitalized/rooms/High Room.txtpb index de8fdaf..e876801 100644 --- a/data/maps/the_revitalized/rooms/High Room.txtpb +++ b/data/maps/the_revitalized/rooms/High Room.txtpb @@ -1,5 +1,4 @@ name: "High Room" -display_name: "Revitalized" panels { name: "HIGH" path: "Panels/panel_4" diff --git a/data/maps/the_revitalized/rooms/Return Room.txtpb b/data/maps/the_revitalized/rooms/Return Room.txtpb index 1d9d094..d629c8d 100644 --- a/data/maps/the_revitalized/rooms/Return Room.txtpb +++ b/data/maps/the_revitalized/rooms/Return Room.txtpb @@ -1,5 +1,4 @@ name: "Return Room" -display_name: "Revitalized" panels { name: "RETURN" path: "Components/panel_7" diff --git a/data/maps/the_revitalized/rooms/Too Room.txtpb b/data/maps/the_revitalized/rooms/Too Room.txtpb index a35b80f..819c3cf 100644 --- a/data/maps/the_revitalized/rooms/Too Room.txtpb +++ b/data/maps/the_revitalized/rooms/Too Room.txtpb @@ -1,5 +1,4 @@ name: "Too Room" -display_name: "Revitalized" panels { name: "TOO" path: "Panels/panel_6" diff --git a/data/maps/the_revitalized/rooms/Won Room.txtpb b/data/maps/the_revitalized/rooms/Won Room.txtpb index 16766fb..8cedd1d 100644 --- a/data/maps/the_revitalized/rooms/Won Room.txtpb +++ b/data/maps/the_revitalized/rooms/Won Room.txtpb @@ -1,5 +1,4 @@ name: "Won Room" -display_name: "Revitalized" panels { name: "WON" path: "Panels/panel_5" diff --git a/data/maps/the_shop/rooms/Main Area.txtpb b/data/maps/the_shop/rooms/Main Area.txtpb index eb0e696..d45e0f0 100644 --- a/data/maps/the_shop/rooms/Main Area.txtpb +++ b/data/maps/the_shop/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Shop" panels { name: "DUCKS" path: "Panels/Books/panel_1" diff --git a/data/maps/the_sirenic/rooms/Mastery.txtpb b/data/maps/the_sirenic/rooms/Mastery.txtpb index 849202b..749837e 100644 --- a/data/maps/the_sirenic/rooms/Mastery.txtpb +++ b/data/maps/the_sirenic/rooms/Mastery.txtpb @@ -1,5 +1,4 @@ name: "Mastery" -display_name: "Sirenic" masteries { name: "MASTERY" path: "Components/Collectables/smiley" diff --git a/data/maps/the_sirenic/rooms/Puzzles.txtpb b/data/maps/the_sirenic/rooms/Puzzles.txtpb index 6784163..0f62cbd 100644 --- a/data/maps/the_sirenic/rooms/Puzzles.txtpb +++ b/data/maps/the_sirenic/rooms/Puzzles.txtpb @@ -1,5 +1,4 @@ name: "Puzzles" -display_name: "Sirenic" panels { name: "Left Top 1" path: "Panels/Room_1/pip_1" diff --git a/data/maps/the_sirenic/rooms/Start.txtpb b/data/maps/the_sirenic/rooms/Start.txtpb index 61150d9..9014e6d 100644 --- a/data/maps/the_sirenic/rooms/Start.txtpb +++ b/data/maps/the_sirenic/rooms/Start.txtpb @@ -1,5 +1,4 @@ name: "Start" -display_name: "Sirenic" panels { name: "Flipped" path: "Panels/Entry/entry_2" diff --git a/data/maps/the_stormy/rooms/Center.txtpb b/data/maps/the_stormy/rooms/Center.txtpb index 62395ba..f0e3e39 100644 --- a/data/maps/the_stormy/rooms/Center.txtpb +++ b/data/maps/the_stormy/rooms/Center.txtpb @@ -1,5 +1,4 @@ name: "Center" -display_name: "Stormy" panels { name: "REACTOR" path: "Panels/Room_1/panel_7" @@ -20,6 +19,7 @@ panels { clue: "cloud" answer: "rain" symbols: AGE + display_name: "CLOUD (1)" } panels { name: "WIND" @@ -27,6 +27,7 @@ panels { clue: "wind" answer: "tornado" symbols: CROSS + display_name: "WIND (1)" } ports { name: "ENTRY" diff --git a/data/maps/the_stormy/rooms/Nuclear Side.txtpb b/data/maps/the_stormy/rooms/Nuclear Side.txtpb index 15d393b..7704cfb 100644 --- a/data/maps/the_stormy/rooms/Nuclear Side.txtpb +++ b/data/maps/the_stormy/rooms/Nuclear Side.txtpb @@ -1,5 +1,4 @@ name: "Nuclear Side" -display_name: "Stormy" panels { name: "GERM" path: "Panels/Room_1/panel_2" diff --git a/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb b/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb index 1d9c46d..34a6715 100644 --- a/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb +++ b/data/maps/the_stormy/rooms/Nuclear Vestibule.txtpb @@ -1,5 +1,4 @@ name: "Nuclear Vestibule" -display_name: "Stormy" panels { name: "STORM" path: "Panels/Room 2/panel_11" diff --git a/data/maps/the_stormy/rooms/Rain Side.txtpb b/data/maps/the_stormy/rooms/Rain Side.txtpb index cb59a6d..1babef2 100644 --- a/data/maps/the_stormy/rooms/Rain Side.txtpb +++ b/data/maps/the_stormy/rooms/Rain Side.txtpb @@ -1,11 +1,11 @@ name: "Rain Side" -display_name: "Stormy" panels { name: "CLOUD" path: "Panels/Room_1/panel_4" clue: "cloud" answer: "lightning" symbols: CROSS + display_name: "CLOUD (2)" } panels { name: "WIND" @@ -13,4 +13,5 @@ panels { clue: "wind" answer: "whirlwind" symbols: PYRAMID + display_name: "WIND (2)" } diff --git a/data/maps/the_stormy/rooms/Tornado Side.txtpb b/data/maps/the_stormy/rooms/Tornado Side.txtpb index d91d057..1e5ca69 100644 --- a/data/maps/the_stormy/rooms/Tornado Side.txtpb +++ b/data/maps/the_stormy/rooms/Tornado Side.txtpb @@ -1,5 +1,4 @@ name: "Tornado Side" -display_name: "Stormy" panels { name: "PUDDLE" path: "Panels/Room_1/panel_6" diff --git a/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb b/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb index 9a98c3e..e6c7e60 100644 --- a/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb +++ b/data/maps/the_stormy/rooms/Tornado Vestibule.txtpb @@ -1,5 +1,4 @@ name: "Tornado Vestibule" -display_name: "Stormy" panels { name: "SHIP" path: "Panels/Room 2/panel_12" diff --git a/data/maps/the_stormy/rooms/Volcano Side.txtpb b/data/maps/the_stormy/rooms/Volcano Side.txtpb index bd823d5..73c7ae4 100644 --- a/data/maps/the_stormy/rooms/Volcano Side.txtpb +++ b/data/maps/the_stormy/rooms/Volcano Side.txtpb @@ -1,5 +1,4 @@ name: "Volcano Side" -display_name: "Stormy" panels { name: "SNOW" path: "Panels/Room_1/panel_1" diff --git a/data/maps/the_stormy/rooms/X2 Room.txtpb b/data/maps/the_stormy/rooms/X2 Room.txtpb index 7d46956..3be4def 100644 --- a/data/maps/the_stormy/rooms/X2 Room.txtpb +++ b/data/maps/the_stormy/rooms/X2 Room.txtpb @@ -1,5 +1,4 @@ name: "X2 Room" -display_name: "Stormy" letters { key: "x" level2: true diff --git a/data/maps/the_sturdy/rooms/Main Area.txtpb b/data/maps/the_sturdy/rooms/Main Area.txtpb index 9468060..c437ceb 100644 --- a/data/maps/the_sturdy/rooms/Main Area.txtpb +++ b/data/maps/the_sturdy/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Sturdy" panels { name: "MOVE (1)" path: "Panels/Main/panel_1" diff --git a/data/maps/the_sturdy/rooms/S2 Area.txtpb b/data/maps/the_sturdy/rooms/S2 Area.txtpb index 118b914..38fad5e 100644 --- a/data/maps/the_sturdy/rooms/S2 Area.txtpb +++ b/data/maps/the_sturdy/rooms/S2 Area.txtpb @@ -1,5 +1,4 @@ name: "S2 Area" -display_name: "Sturdy" panels { name: "COLORS" path: "Panels/Rainbow/panel_1" diff --git a/data/maps/the_sun_temple/rooms/Ending.txtpb b/data/maps/the_sun_temple/rooms/Ending.txtpb index a94e606..975374a 100644 --- a/data/maps/the_sun_temple/rooms/Ending.txtpb +++ b/data/maps/the_sun_temple/rooms/Ending.txtpb @@ -1,5 +1,4 @@ name: "Ending" -display_name: "Sun Temple" endings { name: "PURPLE" path: "Components/purple_ending" diff --git a/data/maps/the_sun_temple/rooms/Entrance.txtpb b/data/maps/the_sun_temple/rooms/Entrance.txtpb index afc932c..f9da822 100644 --- a/data/maps/the_sun_temple/rooms/Entrance.txtpb +++ b/data/maps/the_sun_temple/rooms/Entrance.txtpb @@ -1,5 +1,4 @@ name: "Entrance" -display_name: "Sun Temple" panels { name: "SUN" path: "Panels/Main/panel_1" diff --git a/data/maps/the_sun_temple/rooms/Mastery.txtpb b/data/maps/the_sun_temple/rooms/Mastery.txtpb index b416a9a..bbe8742 100644 --- a/data/maps/the_sun_temple/rooms/Mastery.txtpb +++ b/data/maps/the_sun_temple/rooms/Mastery.txtpb @@ -1,5 +1,4 @@ name: "Mastery" -display_name: "Sun Temple" masteries { name: "MASTERY" path: "Components/Collectables/collectable" diff --git a/data/maps/the_sun_temple/rooms/Temple.txtpb b/data/maps/the_sun_temple/rooms/Temple.txtpb index 047ea8f..4f39737 100644 --- a/data/maps/the_sun_temple/rooms/Temple.txtpb +++ b/data/maps/the_sun_temple/rooms/Temple.txtpb @@ -1,5 +1,4 @@ name: "Temple" -display_name: "Sun Temple" panels { name: "DELAY" path: "Panels/Main/panel_2" diff --git a/data/maps/the_sweet/rooms/Main Area.txtpb b/data/maps/the_sweet/rooms/Main Area.txtpb index b72b6d4..d4e6fda 100644 --- a/data/maps/the_sweet/rooms/Main Area.txtpb +++ b/data/maps/the_sweet/rooms/Main Area.txtpb @@ -1,5 +1,4 @@ name: "Main Area" -display_name: "Sweet" panels { name: "POTATO" path: "Panels/Sweetening Room/panel_1" diff --git a/data/maps/the_sweet/rooms/Y2 Room.txtpb b/data/maps/the_sweet/rooms/Y2 Room.txtpb index 4da87f3..d448f57 100644 --- a/data/maps/the_sweet/rooms/Y2 Room.txtpb +++ b/data/maps/the_sweet/rooms/Y2 Room.txtpb @@ -1,5 +1,4 @@ name: "Y2 Room" -display_name: "Sweet" letters { key: "y" level2: true diff --git a/data/maps/the_unyielding/doors.txtpb b/data/maps/the_unyielding/doors.txtpb index b969c0b..46da45c 100644 --- a/data/maps/the_unyielding/doors.txtpb +++ b/data/maps/the_unyielding/doors.txtpb @@ -183,6 +183,21 @@ doors { panels { room: "Central Connected Area" name: "CHIN" } panels { room: "Central Connected Area" name: "DING" } location_room: "Central Connected Area" + location_name: "East Room 2" +} +doors { + name: "East Room 1" + type: LOCATION_ONLY + panels { room: "East Room 1" name: "CHIN" } + panels { room: "East Room 1" name: "HEAT" } + panels { room: "East Room 1" name: "END" } + panels { room: "East Room 1" name: "FLY" } + panels { room: "East Room 1" name: "OUCH" } + panels { room: "East Room 1" name: "HAG" } + panels { room: "East Room 1" name: "TIN" } + panels { room: "East Room 1" name: "RID" } + panels { room: "East Room 1" name: "TUG" } + location_room: "East Room 1" } doors { name: "Orange Alcove" @@ -199,6 +214,7 @@ doors { } doors { name: "Black Alcove" + type: EVENT panels { room: "Star Rooms" name: "TURN" } panels { room: "Central Connected Area" name: "HAD" } panels { room: "Central Connected Area" name: "SOW" } @@ -218,6 +234,7 @@ doors { panels { room: "Northeast Room 1" name: "CAR" } panels { room: "Northeast Room 1" name: "SIR" } location_room: "Northeast Room 1" + location_name: "Northeast Room 1" } doors { name: "Northeast Corner Behind" @@ -245,6 +262,7 @@ doors { panels { room: "Northwest Room" name: "HER" } panels { room: "Northwest Room" name: "DAM" } location_room: "Northwest Room" + location_name: "Northwest Room" } doors { name: "Cyan Alcove" @@ -274,6 +292,7 @@ doors { panels { room: "Southwest Room 3" name: "HOST" } panels { room: "Southwest Room 3" name: "MUG" } location_room: "Southwest Room 3" + location_name: "Southwest Room 3" } doors { name: "Southwest Room 2 Entrance" @@ -293,6 +312,7 @@ doors { panels { room: "Southwest Room 2" name: "ION" } panels { room: "Southwest Room 2" name: "INN" } location_room: "Southwest Room 2" + location_name: "Southwest Room 2" } doors { name: "Southwest 4" @@ -411,6 +431,7 @@ doors { panels { room: "Central Connected Area" name: "SON (1)" } panels { room: "Central Connected Area" name: "URGE" } location_room: "Central Connected Area" + location_name: "Northeast Room 2" } doors { name: "South Right Painting" diff --git a/data/maps/the_wondrous/rooms/Huge.txtpb b/data/maps/the_wondrous/rooms/Huge.txtpb index c4425e7..6ca6ef8 100644 --- a/data/maps/the_wondrous/rooms/Huge.txtpb +++ b/data/maps/the_wondrous/rooms/Huge.txtpb @@ -4,6 +4,7 @@ panels { path: "Panels/panel_3" clue: "shrink" answer: "shrink" + display_name: "SHRINK (2)" } panels { name: "IRE" diff --git a/data/maps/the_wondrous/rooms/Regular.txtpb b/data/maps/the_wondrous/rooms/Regular.txtpb index bd167d3..65df029 100644 --- a/data/maps/the_wondrous/rooms/Regular.txtpb +++ b/data/maps/the_wondrous/rooms/Regular.txtpb @@ -4,4 +4,5 @@ panels { path: "Panels/panel_2" clue: "shrink" answer: "shrink" + display_name: "SHRINK (1)" } diff --git a/proto/data.proto b/proto/data.proto index 93f2227..032cf3a 100644 --- a/proto/data.proto +++ b/proto/data.proto @@ -107,6 +107,8 @@ message Door { repeated uint64 endings = 16; optional DoorType type = 8; + + optional string location_name = 17; } message PanelData { @@ -124,6 +126,8 @@ message PanelData { optional uint64 required_door = 9; optional uint64 required_room = 11; + + optional string display_name = 12; } message PaintingData { @@ -198,6 +202,7 @@ message Room { optional uint64 map_id = 8; optional string name = 2; optional string display_name = 3; + optional string panel_display_name = 13; repeated uint64 panels = 4; repeated uint64 paintings = 5; diff --git a/proto/human.proto b/proto/human.proto index 1a15c59..5f6354c 100644 --- a/proto/human.proto +++ b/proto/human.proto @@ -90,6 +90,7 @@ message HumanDoor { optional DoorType type = 4; optional string location_room = 5; + optional string location_name = 14; } message HumanDoors { @@ -108,6 +109,8 @@ message HumanPanel { optional DoorIdentifier required_door = 7; optional RoomIdentifier required_room = 8; + + optional string display_name = 9; } message HumanPainting { @@ -161,6 +164,10 @@ message HumanRoom { optional string name = 1; optional string display_name = 2; + // This is used in panelsanity location names and location names for STANDARD + // doors generated from panels in the same area. + optional string panel_display_name = 10; + repeated HumanPanel panels = 3; repeated HumanPainting paintings = 4; repeated HumanLetter letters = 5; diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index d820360..cc83ca1 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp @@ -104,7 +104,11 @@ class DataPacker { container_.FindOrAddRoom(current_map_name, h_room.name(), std::nullopt); Room& room = *container_.all_objects().mutable_rooms(room_id); - room.set_display_name(h_room.display_name()); + //room.set_display_name(h_room.display_name()); + + if (h_room.has_panel_display_name()) { + room.set_panel_display_name(h_room.panel_display_name()); + } for (const HumanPanel& h_panel : h_room.panels()) { room.add_panels(ProcessPanel(h_panel, current_map_name, room.name())); @@ -175,6 +179,10 @@ class DataPacker { map_name, h_panel.required_room().name(), current_map_name)); } + if (h_panel.has_display_name()) { + panel.set_display_name(h_panel.display_name()); + } + return panel_id; } @@ -394,6 +402,10 @@ class DataPacker { } door.set_type(h_door.type()); + + if (h_door.has_location_name()) { + door.set_location_name(h_door.location_name()); + } } void ProcessConnectionsFile(std::filesystem::path path, diff --git a/tools/validator/CMakeLists.txt b/tools/validator/CMakeLists.txt index 967b890..1a8fd9c 100644 --- a/tools/validator/CMakeLists.txt +++ b/tools/validator/CMakeLists.txt @@ -1,3 +1,4 @@ +find_package(fmt REQUIRED) find_package(Protobuf REQUIRED) add_executable(validator @@ -9,4 +10,4 @@ add_executable(validator set_property(TARGET validator PROPERTY CXX_STANDARD 20) set_property(TARGET validator PROPERTY CXX_STANDARD_REQUIRED ON) target_include_directories(validator PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/tools) -target_link_libraries(validator PUBLIC protos util protobuf::libprotobuf) +target_link_libraries(validator PUBLIC protos util fmt::fmt protobuf::libprotobuf) diff --git a/tools/validator/human_processor.cpp b/tools/validator/human_processor.cpp index fb06d31..0f63936 100644 --- a/tools/validator/human_processor.cpp +++ b/tools/validator/human_processor.cpp @@ -1,5 +1,6 @@ #include "human_processor.h" +#include #include #include @@ -93,7 +94,7 @@ class HumanProcessor { room_info.definitions.push_back(h_room); for (const HumanPanel& h_panel : h_room.panels()) { - ProcessPanel(h_panel, current_map_name, h_room.name()); + ProcessPanel(h_panel, current_map_name, h_room); } for (const HumanPainting& h_painting : h_room.paintings()) { @@ -123,10 +124,10 @@ class HumanProcessor { void ProcessPanel(const HumanPanel& h_panel, const std::string& current_map_name, - const std::string& current_room_name) { + const HumanRoom& h_room) { PanelIdentifier panel_identifier; panel_identifier.set_map(current_map_name); - panel_identifier.set_room(current_room_name); + panel_identifier.set_room(h_room.name()); panel_identifier.set_name(h_panel.name()); PanelInfo& panel_info = info_.panels[panel_identifier]; @@ -155,6 +156,24 @@ class HumanProcessor { RoomInfo& required_room_info = info_.rooms[required_room_identifier]; required_room_info.panels_referenced_by.push_back(panel_identifier); } + + std::string map_area_name = current_map_name; + if (h_room.has_panel_display_name()) { + map_area_name = + fmt::format("{} ({})", current_map_name, h_room.panel_display_name()); + } + + panel_info.map_area_name = map_area_name; + + std::string panelsanity_name; + if (h_panel.has_display_name()) { + panelsanity_name = + fmt::format("{} - {}", map_area_name, h_panel.display_name()); + } else { + panelsanity_name = fmt::format("{} - {}", map_area_name, h_panel.name()); + } + info_.panel_names[panelsanity_name].panels_used_by.push_back( + panel_identifier); } void ProcessPainting(const HumanPainting& h_painting, diff --git a/tools/validator/structs.h b/tools/validator/structs.h index 958038d..0ca96fe 100644 --- a/tools/validator/structs.h +++ b/tools/validator/structs.h @@ -72,6 +72,8 @@ struct ProxyInfo { struct PanelInfo { std::vector definitions; + std::string map_area_name; + std::vector connections_referenced_by; std::vector doors_referenced_by; @@ -96,6 +98,10 @@ struct EndingInfo { std::vector doors_referenced_by; }; +struct PanelNameInfo { + std::vector panels_used_by; +}; + struct CollectedInfo { std::map maps; std::map rooms; @@ -107,6 +113,7 @@ struct CollectedInfo { keyholders; std::map letters; std::map endings; + std::map panel_names; }; } // namespace com::fourisland::lingo2_archipelago diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp index f802460..f5524c3 100644 --- a/tools/validator/validator.cpp +++ b/tools/validator/validator.cpp @@ -9,291 +9,365 @@ namespace com::fourisland::lingo2_archipelago { namespace { -void ValidateMap(const std::string& map_name, const MapInfo& map_info) { - for (const auto& [node_path, node_info] : map_info.game_nodes) { - if (node_info.uses > 1) { - std::cout << "Map " << map_name << " node " << node_path - << " is used in multiple places." << std::endl; - } else if (node_info.uses == 0) { - std::cout << "Map " << map_name << " node " << node_path - << " is not used." << std::endl; - } +class Validator { + public: + explicit Validator(const CollectedInfo& info) : info_(info) {} - if (!node_info.defined) { - std::cout << "Map " << map_name << " node " << node_path - << " is not defined in the game file." << std::endl; + void Validate() const { + for (const auto& [map_name, map_info] : info_.maps) { + ValidateMap(map_name, map_info); + } + for (const auto& [room_identifier, room_info] : info_.rooms) { + ValidateRoom(room_identifier, room_info); + } + for (const auto& [door_identifier, door_info] : info_.doors) { + ValidateDoor(door_identifier, door_info); + } + for (const auto& [port_identifier, port_info] : info_.ports) { + ValidatePort(port_identifier, port_info); + } + for (const auto& [painting_identifier, painting_info] : info_.paintings) { + ValidatePainting(painting_identifier, painting_info); + } + for (const auto& [panel_identifier, panel_info] : info_.panels) { + ValidatePanel(panel_identifier, panel_info); + } + for (const auto& [keyholder_identifier, keyholder_info] : + info_.keyholders) { + ValidateKeyholder(keyholder_identifier, keyholder_info); + } + for (const auto& [letter_identifier, letter_info] : info_.letters) { + ValidateLetter(letter_identifier, letter_info); + } + for (const auto& [ending_name, ending_info] : info_.endings) { + ValidateEnding(ending_name, ending_info); + } + for (const auto& [panel_name, panel_info] : info_.panel_names) { + ValidatePanelName(panel_name, panel_info); } } -} -void ValidateRoom(const RoomIdentifier& room_identifier, - const RoomInfo& room_info) { - if (room_info.definitions.empty()) { - std::cout << "Room " << room_identifier.ShortDebugString() - << " has no definition, but was referenced:" << std::endl; + private: + void ValidateMap(const std::string& map_name, const MapInfo& map_info) const { + for (const auto& [node_path, node_info] : map_info.game_nodes) { + if (node_info.uses > 1) { + std::cout << "Map " << map_name << " node " << node_path + << " is used in multiple places." << std::endl; + } else if (node_info.uses == 0) { + std::cout << "Map " << map_name << " node " << node_path + << " is not used." << std::endl; + } - for (const DoorIdentifier& door_identifier : - room_info.doors_referenced_by) { - std::cout << " DOOR " << door_identifier.ShortDebugString() - << std::endl; + if (!node_info.defined) { + std::cout << "Map " << map_name << " node " << node_path + << " is not defined in the game file." << std::endl; + } } + } - for (const PanelIdentifier& panel_identifier : - room_info.panels_referenced_by) { - std::cout << " PANEL " << panel_identifier.ShortDebugString() - << std::endl; - } + void ValidateRoom(const RoomIdentifier& room_identifier, + const RoomInfo& room_info) const { + if (room_info.definitions.empty()) { + std::cout << "Room " << room_identifier.ShortDebugString() + << " has no definition, but was referenced:" << std::endl; + + for (const DoorIdentifier& door_identifier : + room_info.doors_referenced_by) { + std::cout << " DOOR " << door_identifier.ShortDebugString() + << std::endl; + } + + for (const PanelIdentifier& panel_identifier : + room_info.panels_referenced_by) { + std::cout << " PANEL " << panel_identifier.ShortDebugString() + << std::endl; + } - for (const HumanConnection& connection : - room_info.connections_referenced_by) { - std::cout << " CONNECTION " << connection.ShortDebugString() - << std::endl; + for (const HumanConnection& connection : + room_info.connections_referenced_by) { + std::cout << " CONNECTION " << connection.ShortDebugString() + << std::endl; + } + } else if (room_info.definitions.size() > 1) { + std::cout << "Room " << room_identifier.ShortDebugString() + << " was defined multiple times." << std::endl; } - } else if (room_info.definitions.size() > 1) { - std::cout << "Room " << room_identifier.ShortDebugString() - << " was defined multiple times." << std::endl; } -} -void ValidateDoor(const DoorIdentifier& door_identifier, - const DoorInfo& door_info) { - if (door_info.definitions.empty()) { - std::cout << "Door " << door_identifier.ShortDebugString() - << " has no definition, but was referenced:" << std::endl; - - for (const DoorIdentifier& other_door_identifier : - door_info.doors_referenced_by) { - std::cout << " DOOR " << other_door_identifier.ShortDebugString() - << std::endl; + bool DoesDoorNeedLocationName(const HumanDoor& h_door, + const std::string& map_name) const { + if (h_door.type() != DoorType::STANDARD) { + return false; } - for (const PanelIdentifier& panel_identifier : - door_info.panels_referenced_by) { - std::cout << " PANEL " << panel_identifier.ShortDebugString() - << std::endl; + if (h_door.keyholders_size() > 0 || h_door.endings_size() > 0) { + return true; } - for (const PaintingIdentifier& painting_identifier : - door_info.paintings_referenced_by) { - std::cout << " PAINTING " << painting_identifier.ShortDebugString() - << std::endl; + if (h_door.panels_size() > 4) { + return true; } - for (const PortIdentifier& port_identifier : - door_info.ports_referenced_by) { - std::cout << " PORT " << port_identifier.ShortDebugString() - << std::endl; + std::set map_areas; + for (const PanelIdentifier& pi : h_door.panels()) { + auto full_pi = + GetCompletePanelIdentifierWithoutAnswer(pi, map_name, std::nullopt); + if (full_pi) { + auto panel_info_it = info_.panels.find(*full_pi); + if (panel_info_it != info_.panels.end()) { + const PanelInfo& panel_info = panel_info_it->second; + + map_areas.insert(panel_info.map_area_name); + } + } } - for (const HumanConnection& connection : - door_info.connections_referenced_by) { - std::cout << " CONNECTION " << connection.ShortDebugString() - << std::endl; + if (map_areas.size() > 1) { + return true; } - } else if (door_info.definitions.size() > 1) { - std::cout << "Door " << door_identifier.ShortDebugString() - << " was defined multiple times." << std::endl; + + return false; } - if (door_info.malformed_identifiers.HasAny()) { - std::cout << "Door " << door_identifier.ShortDebugString() - << " has malformed identifiers:" << std::endl; + void ValidateDoor(const DoorIdentifier& door_identifier, + const DoorInfo& door_info) const { + if (door_info.definitions.empty()) { + std::cout << "Door " << door_identifier.ShortDebugString() + << " has no definition, but was referenced:" << std::endl; - for (const PaintingIdentifier& painting_identifier : - door_info.malformed_identifiers.paintings) { - std::cout << " PAINTING " << painting_identifier.ShortDebugString() - << std::endl; - } + for (const DoorIdentifier& other_door_identifier : + door_info.doors_referenced_by) { + std::cout << " DOOR " << other_door_identifier.ShortDebugString() + << std::endl; + } - for (const PanelIdentifier& panel_identifier : - door_info.malformed_identifiers.panels) { - std::cout << " PANEL " << panel_identifier.ShortDebugString() - << std::endl; - } + for (const PanelIdentifier& panel_identifier : + door_info.panels_referenced_by) { + std::cout << " PANEL " << panel_identifier.ShortDebugString() + << std::endl; + } - for (const KeyholderIdentifier& keyholder_identifier : - door_info.malformed_identifiers.keyholders) { - std::cout << " KEYHOLDER " << keyholder_identifier.ShortDebugString() - << std::endl; - } - } -} + for (const PaintingIdentifier& painting_identifier : + door_info.paintings_referenced_by) { + std::cout << " PAINTING " << painting_identifier.ShortDebugString() + << std::endl; + } -void ValidatePort(const PortIdentifier& port_identifier, - const PortInfo& port_info) { - if (port_info.definitions.empty()) { - std::cout << "Port " << port_identifier.ShortDebugString() - << " has no definition, but was referenced:" << std::endl; + for (const PortIdentifier& port_identifier : + door_info.ports_referenced_by) { + std::cout << " PORT " << port_identifier.ShortDebugString() + << std::endl; + } - for (const HumanConnection& connection : - port_info.connections_referenced_by) { - std::cout << " CONNECTION " << connection.ShortDebugString() - << std::endl; + for (const HumanConnection& connection : + door_info.connections_referenced_by) { + std::cout << " CONNECTION " << connection.ShortDebugString() + << std::endl; + } + } else if (door_info.definitions.size() > 1) { + std::cout << "Door " << door_identifier.ShortDebugString() + << " was defined multiple times." << std::endl; } - } else if (port_info.definitions.size() > 1) { - std::cout << "Port " << port_identifier.ShortDebugString() - << " was defined multiple times." << std::endl; - } -} -void ValidatePainting(const PaintingIdentifier& painting_identifier, - const PaintingInfo& painting_info) { - if (painting_info.definitions.empty()) { - std::cout << "Painting " << painting_identifier.ShortDebugString() - << " has no definition, but was referenced:" << std::endl; + if (door_info.malformed_identifiers.HasAny()) { + std::cout << "Door " << door_identifier.ShortDebugString() + << " has malformed identifiers:" << std::endl; + + for (const PaintingIdentifier& painting_identifier : + door_info.malformed_identifiers.paintings) { + std::cout << " PAINTING " << painting_identifier.ShortDebugString() + << std::endl; + } + + for (const PanelIdentifier& panel_identifier : + door_info.malformed_identifiers.panels) { + std::cout << " PANEL " << panel_identifier.ShortDebugString() + << std::endl; + } - for (const DoorIdentifier& door_identifier : - painting_info.doors_referenced_by) { - std::cout << " DOOR " << door_identifier.ShortDebugString() - << std::endl; + for (const KeyholderIdentifier& keyholder_identifier : + door_info.malformed_identifiers.keyholders) { + std::cout << " KEYHOLDER " << keyholder_identifier.ShortDebugString() + << std::endl; + } } - for (const HumanConnection& connection : - painting_info.connections_referenced_by) { - std::cout << " CONNECTION " << connection.ShortDebugString() - << std::endl; + for (const HumanDoor& h_door : door_info.definitions) { + if (DoesDoorNeedLocationName(h_door, door_identifier.map()) && + !h_door.has_location_name()) { + std::cout << "Door " << door_identifier.ShortDebugString() + << " needs an explicit location name." << std::endl; + } } - } else if (painting_info.definitions.size() > 1) { - std::cout << "Painting " << painting_identifier.ShortDebugString() - << " was defined multiple times." << std::endl; } -} -void ValidatePanel(const PanelIdentifier& panel_identifier, - const PanelInfo& panel_info) { - if (panel_identifier.name().empty()) { - std::cout << "Panel " << panel_identifier.ShortDebugString() - << " has no name." << std::endl; + void ValidatePort(const PortIdentifier& port_identifier, + const PortInfo& port_info) const { + if (port_info.definitions.empty()) { + std::cout << "Port " << port_identifier.ShortDebugString() + << " has no definition, but was referenced:" << std::endl; + + for (const HumanConnection& connection : + port_info.connections_referenced_by) { + std::cout << " CONNECTION " << connection.ShortDebugString() + << std::endl; + } + } else if (port_info.definitions.size() > 1) { + std::cout << "Port " << port_identifier.ShortDebugString() + << " was defined multiple times." << std::endl; + } } - if (panel_info.definitions.empty()) { - std::cout << "Panel " << panel_identifier.ShortDebugString() - << " has no definition, but was referenced:" << std::endl; + void ValidatePainting(const PaintingIdentifier& painting_identifier, + const PaintingInfo& painting_info) const { + if (painting_info.definitions.empty()) { + std::cout << "Painting " << painting_identifier.ShortDebugString() + << " has no definition, but was referenced:" << std::endl; - for (const DoorIdentifier& door_identifier : - panel_info.doors_referenced_by) { - std::cout << " DOOR " << door_identifier.ShortDebugString() - << std::endl; - } + for (const DoorIdentifier& door_identifier : + painting_info.doors_referenced_by) { + std::cout << " DOOR " << door_identifier.ShortDebugString() + << std::endl; + } - for (const HumanConnection& connection : - panel_info.connections_referenced_by) { - std::cout << " CONNECTION " << connection.ShortDebugString() - << std::endl; + for (const HumanConnection& connection : + painting_info.connections_referenced_by) { + std::cout << " CONNECTION " << connection.ShortDebugString() + << std::endl; + } + } else if (painting_info.definitions.size() > 1) { + std::cout << "Painting " << painting_identifier.ShortDebugString() + << " was defined multiple times." << std::endl; } - } else if (panel_info.definitions.size() > 1) { - std::cout << "Panel " << panel_identifier.ShortDebugString() - << " was defined multiple times." << std::endl; } - for (const auto& [answer, proxy_info] : panel_info.proxies) { - if (proxy_info.definitions.empty()) { + void ValidatePanel(const PanelIdentifier& panel_identifier, + const PanelInfo& panel_info) const { + if (panel_identifier.name().empty()) { + std::cout << "Panel " << panel_identifier.ShortDebugString() + << " has no name." << std::endl; + } + + if (panel_info.definitions.empty()) { std::cout << "Panel " << panel_identifier.ShortDebugString() - << " with answer \"" << answer - << "\" has no definition, but was referenced:" << std::endl; + << " has no definition, but was referenced:" << std::endl; for (const DoorIdentifier& door_identifier : - proxy_info.doors_referenced_by) { + panel_info.doors_referenced_by) { std::cout << " DOOR " << door_identifier.ShortDebugString() << std::endl; } for (const HumanConnection& connection : - proxy_info.connections_referenced_by) { + panel_info.connections_referenced_by) { std::cout << " CONNECTION " << connection.ShortDebugString() << std::endl; } - } else if (proxy_info.definitions.size() > 1) { + } else if (panel_info.definitions.size() > 1) { std::cout << "Panel " << panel_identifier.ShortDebugString() - << " with answer \"" << answer - << "\" was defined multiple times." << std::endl; + << " was defined multiple times." << std::endl; + } + + for (const auto& [answer, proxy_info] : panel_info.proxies) { + if (proxy_info.definitions.empty()) { + std::cout << "Panel " << panel_identifier.ShortDebugString() + << " with answer \"" << answer + << "\" has no definition, but was referenced:" << std::endl; + + for (const DoorIdentifier& door_identifier : + proxy_info.doors_referenced_by) { + std::cout << " DOOR " << door_identifier.ShortDebugString() + << std::endl; + } + + for (const HumanConnection& connection : + proxy_info.connections_referenced_by) { + std::cout << " CONNECTION " << connection.ShortDebugString() + << std::endl; + } + } else if (proxy_info.definitions.size() > 1) { + std::cout << "Panel " << panel_identifier.ShortDebugString() + << " with answer \"" << answer + << "\" was defined multiple times." << std::endl; + } } } -} -void ValidateKeyholder(const KeyholderIdentifier& keyholder_identifier, - const KeyholderInfo& keyholder_info) { - if (keyholder_info.definitions.empty()) { - std::cout << "Keyholder " << keyholder_identifier.ShortDebugString() - << " has no definition, but was referenced:" << std::endl; + void ValidateKeyholder(const KeyholderIdentifier& keyholder_identifier, + const KeyholderInfo& keyholder_info) const { + if (keyholder_info.definitions.empty()) { + std::cout << "Keyholder " << keyholder_identifier.ShortDebugString() + << " has no definition, but was referenced:" << std::endl; - for (const DoorIdentifier& door_identifier : - keyholder_info.doors_referenced_by) { - std::cout << " DOOR " << door_identifier.ShortDebugString() - << std::endl; + for (const DoorIdentifier& door_identifier : + keyholder_info.doors_referenced_by) { + std::cout << " DOOR " << door_identifier.ShortDebugString() + << std::endl; + } + } else if (keyholder_info.definitions.size() > 1) { + std::cout << "Keyholder " << keyholder_identifier.ShortDebugString() + << " was defined multiple times." << std::endl; } - } else if (keyholder_info.definitions.size() > 1) { - std::cout << "Keyholder " << keyholder_identifier.ShortDebugString() - << " was defined multiple times." << std::endl; } -} -void ValidateLetter(const LetterIdentifier& letter_identifier, - const LetterInfo& letter_info) { - std::string letter_name = std::string(1, std::get<0>(letter_identifier)) + - (std::get<1>(letter_identifier) ? "2" : "1"); + void ValidateLetter(const LetterIdentifier& letter_identifier, + const LetterInfo& letter_info) const { + std::string letter_name = std::string(1, std::get<0>(letter_identifier)) + + (std::get<1>(letter_identifier) ? "2" : "1"); - if (letter_info.defined_in.size() > 1) { - std::cout << "Letter " << letter_name - << " was defined in multiple places:" << std::endl; + if (letter_info.defined_in.size() > 1) { + std::cout << "Letter " << letter_name + << " was defined in multiple places:" << std::endl; - for (const RoomIdentifier& room_identifier : letter_info.defined_in) { - std::cout << " " << room_identifier.ShortDebugString() << std::endl; + for (const RoomIdentifier& room_identifier : letter_info.defined_in) { + std::cout << " " << room_identifier.ShortDebugString() << std::endl; + } } } -} -void ValidateEnding(const std::string& ending_name, - const EndingInfo& ending_info) { - if (ending_info.defined_in.empty()) { - std::cout << "Ending " << ending_name - << " has no definition, but was referenced:" << std::endl; + void ValidateEnding(const std::string& ending_name, + const EndingInfo& ending_info) const { + if (ending_info.defined_in.empty()) { + std::cout << "Ending " << ending_name + << " has no definition, but was referenced:" << std::endl; + + for (const DoorIdentifier& door_identifier : + ending_info.doors_referenced_by) { + std::cout << " DOOR " << door_identifier.ShortDebugString() + << std::endl; + } + } else if (ending_info.defined_in.size() > 1) { + std::cout << "Ending " << ending_name + << " was defined in multiple places:" << std::endl; - for (const DoorIdentifier& door_identifier : - ending_info.doors_referenced_by) { - std::cout << " DOOR " << door_identifier.ShortDebugString() - << std::endl; + for (const RoomIdentifier& room_identifier : ending_info.defined_in) { + std::cout << " " << room_identifier.ShortDebugString() << std::endl; + } } - } else if (ending_info.defined_in.size() > 1) { - std::cout << "Ending " << ending_name - << " was defined in multiple places:" << std::endl; + } + + void ValidatePanelName(const std::string& panel_name, + const PanelNameInfo& panel_info) const { + if (panel_info.panels_used_by.size() > 1) { + std::cout << "The location name \"" << panel_name + << "\" is used by multiple panels:" << std::endl; - for (const RoomIdentifier& room_identifier : ending_info.defined_in) { - std::cout << " " << room_identifier.ShortDebugString() << std::endl; + for (const PanelIdentifier& panel_identifier : + panel_info.panels_used_by) { + std::cout << " PANEL " << panel_identifier.ShortDebugString() + << std::endl; + } } } -} + + const CollectedInfo& info_; +}; } // namespace void ValidateCollectedInfo(const CollectedInfo& info) { - for (const auto& [map_name, map_info] : info.maps) { - ValidateMap(map_name, map_info); - } - for (const auto& [room_identifier, room_info] : info.rooms) { - ValidateRoom(room_identifier, room_info); - } - for (const auto& [door_identifier, door_info] : info.doors) { - ValidateDoor(door_identifier, door_info); - } - for (const auto& [port_identifier, port_info] : info.ports) { - ValidatePort(port_identifier, port_info); - } - for (const auto& [painting_identifier, painting_info] : info.paintings) { - ValidatePainting(painting_identifier, painting_info); - } - for (const auto& [panel_identifier, panel_info] : info.panels) { - ValidatePanel(panel_identifier, panel_info); - } - for (const auto& [keyholder_identifier, keyholder_info] : info.keyholders) { - ValidateKeyholder(keyholder_identifier, keyholder_info); - } - for (const auto& [letter_identifier, letter_info] : info.letters) { - ValidateLetter(letter_identifier, letter_info); - } - for (const auto& [ending_name, ending_info] : info.endings) { - ValidateEnding(ending_name, ending_info); - } + Validator validator(info); + validator.Validate(); } } // namespace com::fourisland::lingo2_archipelago diff --git a/vcpkg.json b/vcpkg.json index 6517f7e..5a1975d 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,6 @@ { "dependencies": [ + "fmt", "protobuf", "yaml-cpp" ], -- cgit 1.4.1