From 3fcc676cd3b9b3b24a8755612a459d498879b1df Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sat, 9 Aug 2025 10:58:45 -0400 Subject: Added the_butterfly The proto representation of letters has changed, so the C++ tools need to be updated. --- data/maps/four_rooms/rooms/A2 Room.txtpb | 6 +- data/maps/the_bearer/rooms/Q2 Room.txtpb | 6 +- data/maps/the_between/rooms/B2 Room.txtpb | 6 +- data/maps/the_butterfly/connections.txtpb | 5 + data/maps/the_butterfly/doors.txtpb | 23 ++++ data/maps/the_butterfly/rooms/Main Area.txtpb | 133 ++++++++++++++++++++++++ data/maps/the_butterfly/rooms/Mastery.txtpb | 6 ++ data/maps/the_entry/rooms/D Room Final.txtpb | 5 +- data/maps/the_entry/rooms/Least Blue Last.txtpb | 5 +- data/maps/the_entry/rooms/Starting Room.txtpb | 22 +++- data/maps/the_entry/rooms/X Area.txtpb | 7 +- 11 files changed, 212 insertions(+), 12 deletions(-) create mode 100644 data/maps/the_butterfly/connections.txtpb create mode 100644 data/maps/the_butterfly/doors.txtpb create mode 100644 data/maps/the_butterfly/rooms/Main Area.txtpb create mode 100644 data/maps/the_butterfly/rooms/Mastery.txtpb (limited to 'data/maps') diff --git a/data/maps/four_rooms/rooms/A2 Room.txtpb b/data/maps/four_rooms/rooms/A2 Room.txtpb index 9de7ca9..20c9838 100644 --- a/data/maps/four_rooms/rooms/A2 Room.txtpb +++ b/data/maps/four_rooms/rooms/A2 Room.txtpb @@ -1,3 +1,7 @@ name: "A2 Room" display_name: "Hallway" -letters { key: "a" double: true } +letters { + key: "a" + double: true + path: "Components/Collectables/a2" +} diff --git a/data/maps/the_bearer/rooms/Q2 Room.txtpb b/data/maps/the_bearer/rooms/Q2 Room.txtpb index 7983cb1..2c0c276 100644 --- a/data/maps/the_bearer/rooms/Q2 Room.txtpb +++ b/data/maps/the_bearer/rooms/Q2 Room.txtpb @@ -1,3 +1,7 @@ name: "Q2 Room" display_name: "Back Area" -letters { key: "q" double: true } +letters { + key: "q" + double: true + path: "Components/Collectables/collectable" +} diff --git a/data/maps/the_between/rooms/B2 Room.txtpb b/data/maps/the_between/rooms/B2 Room.txtpb index d4e0afe..97b4684 100644 --- a/data/maps/the_between/rooms/B2 Room.txtpb +++ b/data/maps/the_between/rooms/B2 Room.txtpb @@ -1,4 +1,8 @@ name: "B2 Room" display_name: "B2 Room" -letters { key: "b" double: true } +letters { + key: "b" + double: true + path: "Components/Collectables/collectable" +} # Uhh idk if the paintings and door in here should be randomized. diff --git a/data/maps/the_butterfly/connections.txtpb b/data/maps/the_butterfly/connections.txtpb new file mode 100644 index 0000000..98b9556 --- /dev/null +++ b/data/maps/the_butterfly/connections.txtpb @@ -0,0 +1,5 @@ +connections { + from_room: "Main Area" + to_room: "Mastery" + door { name: "Panels" } +} diff --git a/data/maps/the_butterfly/doors.txtpb b/data/maps/the_butterfly/doors.txtpb new file mode 100644 index 0000000..1994d2f --- /dev/null +++ b/data/maps/the_butterfly/doors.txtpb @@ -0,0 +1,23 @@ +# TODO: The gallery painting +doors { + name: "Panels" + type: EVENT + panels { room: "Main Area" name: "SPECIES" } + panels { room: "Main Area" name: "PERSONALITY" } + panels { room: "Main Area" name: "CONSTITUION" } + panels { room: "Main Area" name: "GAME" } + panels { room: "Main Area" name: "SCIENCE" } + panels { room: "Main Area" name: "SCHOOL" } + panels { room: "Main Area" name: "BUILDING" } + panels { room: "Main Area" name: "STRUCTURE" } + panels { room: "Main Area" name: "CATERPILLAR" } + panels { room: "Main Area" name: "KNOWLEDGE" } + panels { room: "Main Area" name: "GENE" } + panels { room: "Main Area" name: "CREATURE" } + panels { room: "Main Area" name: "ARTICLE" } + panels { room: "Main Area" name: "BOOK" } + panels { room: "Main Area" name: "TEXT" } + panels { room: "Main Area" name: "POSITION (1)" } + panels { room: "Main Area" name: "POSITION (2)" } + panels { room: "Main Area" name: "POSITION (3)" } +} diff --git a/data/maps/the_butterfly/rooms/Main Area.txtpb b/data/maps/the_butterfly/rooms/Main Area.txtpb new file mode 100644 index 0000000..f21863c --- /dev/null +++ b/data/maps/the_butterfly/rooms/Main Area.txtpb @@ -0,0 +1,133 @@ +name: "Main Area" +display_name: "Main Area" +panels { + name: "SPECIES" + path: "Panels/Room_1/panel_1" + clue: "species" + answer: "evolution" + symbols: "null" +} +panels { + name: "PERSONALITY" + path: "Panels/Room_1/panel_2" + clue: "personality" + answer: "growth" + symbols: "null" +} +panels { + name: "CONSTITUTION" + path: "Panels/Room_1/panel_3" + clue: "constitution" + answer: "amendment" + symbols: "null" +} +panels { + name: "GAME" + path: "Panels/Room_1/panel_4" + clue: "game" + answer: "expansion" + symbols: "null" +} +panels { + name: "SCIENCE" + path: "Panels/Room_1/panel_5" + clue: "science" + answer: "discovery" + symbols: "null" +} +panels { + name: "SCHOOL" + path: "Panels/Room_1/panel_6" + clue: "school" + answer: "graduation" + symbols: "null" +} +panels { + name: "BUILDING" + path: "Panels/Room_1/panel_7" + clue: "building" + answer: "construction" + symbols: "null" +} +panels { + name: "STRUCTURE" + path: "Panels/Room_1/panel_8" + clue: "structure" + answer: "construction" + symbols: "null" +} +panels { + name: "CATERPILLAR" + path: "Panels/Room_1/panel_9" + clue: "caterpillar" + answer: "metamorphosis" + symbols: "null" +} +panels { + name: "KNOWLEDGE" + path: "Panels/Room_1/panel_10" + clue: "knowledge" + answer: "learning" + symbols: "null" +} +panels { + name: "GENE" + path: "Panels/Room_1/panel_11" + clue: "gene" + answer: "mutation" + symbols: "null" +} +panels { + name: "CREATURE" + path: "Panels/Room_1/panel_12" + clue: "creature" + answer: "mutation" + symbols: "null" +} +panels { + name: "ARTICLE" + path: "Panels/Room_1/panel_13" + clue: "article" + answer: "revision" + symbols: "null" +} +panels { + name: "BOOK" + path: "Panels/Room_1/panel_14" + clue: "book" + answer: "revision" + symbols: "null" +} +panels { + name: "TEXT" + path: "Panels/Room_1/panel_15" + clue: "text" + answer: "revision" + symbols: "null" +} +panels { + name: "POSITION (1)" + path: "Panels/Room_1/panel_16" + clue: "position" + answer: "motion" + symbols: "null" +} +panels { + name: "POSITION (2)" + path: "Panels/Room_1/panel_17" + clue: "position" + answer: "acceleration" + symbols: "null" +} +panels { + name: "POSITION (3)" + path: "Panels/Room_1/panel_18" + clue: "position" + answer: "jerk" + symbols: "null" +} +ports { + name: "GALLERY" + path: "Components/Warps/worldport" + orientation: "southwest" # uhhhh this is new +} diff --git a/data/maps/the_butterfly/rooms/Mastery.txtpb b/data/maps/the_butterfly/rooms/Mastery.txtpb new file mode 100644 index 0000000..f494fde --- /dev/null +++ b/data/maps/the_butterfly/rooms/Mastery.txtpb @@ -0,0 +1,6 @@ +name: "Mastery" +display_name: "Main Area" +masteries { + name: "MASTERY" + path: "Components/Collectables/collectable" +} diff --git a/data/maps/the_entry/rooms/D Room Final.txtpb b/data/maps/the_entry/rooms/D Room Final.txtpb index f125a79..960cb1c 100644 --- a/data/maps/the_entry/rooms/D Room Final.txtpb +++ b/data/maps/the_entry/rooms/D Room Final.txtpb @@ -1,3 +1,6 @@ name: "D Room Final" display_name: "D Room" -letters { key: "d" } \ No newline at end of file +letters { + key: "d" + path: "Components/Collectables/d" +} diff --git a/data/maps/the_entry/rooms/Least Blue Last.txtpb b/data/maps/the_entry/rooms/Least Blue Last.txtpb index 08d3dd8..d1d4da1 100644 --- a/data/maps/the_entry/rooms/Least Blue Last.txtpb +++ b/data/maps/the_entry/rooms/Least Blue Last.txtpb @@ -83,4 +83,7 @@ paintings { required_door { name: "Corners Painting" } display_name: "Corners Painting" } -letters { key: "l" } \ No newline at end of file +letters { + key: "l" + path: "Components/Collectables/l" +} diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb index eaf493c..93c9df5 100644 --- a/data/maps/the_entry/rooms/Starting Room.txtpb +++ b/data/maps/the_entry/rooms/Starting Room.txtpb @@ -43,10 +43,22 @@ panels { clue: "than" answer: "than" } -letters { key: "h" } -letters { key: "i" } -letters { key: "n" } -letters { key: "t" } +letters { + key: "h" + path: "Components/Collectables/h" +} +letters { + key: "i" + path: "Components/Collectables/i" +} +letters { + key: "n" + path: "Components/Collectables/n" +} +letters { + key: "t" + path: "Components/Collectables/t" +} # Maze painting should stay vanilla as a hint. paintings { name: "OWL" @@ -88,4 +100,4 @@ ports { path: "Components/Warps/worldport12" orientation: "east" required_door { name: "Composite Room Entrance" } -} \ No newline at end of file +} diff --git a/data/maps/the_entry/rooms/X Area.txtpb b/data/maps/the_entry/rooms/X Area.txtpb index ef19a33..ada16f8 100644 --- a/data/maps/the_entry/rooms/X Area.txtpb +++ b/data/maps/the_entry/rooms/X Area.txtpb @@ -1,8 +1,11 @@ name: "X Area" display_name: "Starting Room" -letters { key: "x" } +letters { + key: "x" + path: "Components/Collectables/x" +} ports { name: "CC" path: "Components/Warps/worldport3" orientation: "west" -} \ No newline at end of file +} -- cgit 1.4.1