about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2025-08-09 10:58:45 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2025-08-09 10:58:45 -0400
commit3fcc676cd3b9b3b24a8755612a459d498879b1df (patch)
tree3b94528d182fef58befbca1fa58956b90ef98d8f
parent4db9ccf6adc4c90b5899a2bf8bf4c47a7392004b (diff)
downloadlingo2-archipelago-3fcc676cd3b9b3b24a8755612a459d498879b1df.tar.gz
lingo2-archipelago-3fcc676cd3b9b3b24a8755612a459d498879b1df.tar.bz2
lingo2-archipelago-3fcc676cd3b9b3b24a8755612a459d498879b1df.zip
Added the_butterfly
The proto representation of letters has changed, so the C++ tools need to be updated.
Diffstat
-rw-r--r--data/connections.txtpb18
-rw-r--r--data/maps/four_rooms/rooms/A2 Room.txtpb6
-rw-r--r--data/maps/the_bearer/rooms/Q2 Room.txtpb6
-rw-r--r--data/maps/the_between/rooms/B2 Room.txtpb6
-rw-r--r--data/maps/the_butterfly/connections.txtpb5
-rw-r--r--data/maps/the_butterfly/doors.txtpb23
-rw-r--r--data/maps/the_butterfly/rooms/Main Area.txtpb133
-rw-r--r--data/maps/the_butterfly/rooms/Mastery.txtpb6
-rw-r--r--data/maps/the_entry/rooms/D Room Final.txtpb5
-rw-r--r--data/maps/the_entry/rooms/Least Blue Last.txtpb5
-rw-r--r--data/maps/the_entry/rooms/Starting Room.txtpb22
-rw-r--r--data/maps/the_entry/rooms/X Area.txtpb7
-rw-r--r--proto/human.proto15
13 files changed, 243 insertions, 14 deletions
diff --git a/data/connections.txtpb b/data/connections.txtpb index 6aaf273..992982b 100644 --- a/data/connections.txtpb +++ b/data/connections.txtpb
@@ -8,12 +8,12 @@
8# the_bearer/Back Area/TREE 8# the_bearer/Back Area/TREE
9# the_bearer/Entry/UNYIELDING 9# the_bearer/Entry/UNYIELDING
10# the_bearer/Back Area/DAEDALUS 10# the_bearer/Back Area/DAEDALUS
11# the_bearer/Butterfly Room/BUTTERFLY
12# the_between/Main Area/GREAT 11# the_between/Main Area/GREAT
13# the_between/Main Area/PLAZA 12# the_between/Main Area/PLAZA
14# gallery -> between 13# gallery -> between
15# the_between/Control Center Side/CC 14# the_between/Control Center Side/CC
16# the_between/Control Center Side/LIVELY 15# the_between/Control Center Side/LIVELY
16# butterfly -> gallery
17connections { 17connections {
18 from { 18 from {
19 panel { 19 panel {
@@ -192,3 +192,19 @@ connections {
192 } 192 }
193 oneway: true 193 oneway: true
194} 194}
195connections {
196 from {
197 painting {
198 map: "the_bearer"
199 room: "Butterfly"
200 name: "BUTTERFLY"
201 }
202 }
203 to {
204 room {
205 map: "the_butterfly"
206 name: "Main Area"
207 }
208 }
209 oneway: true
210}
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 @@
1name: "A2 Room" 1name: "A2 Room"
2display_name: "Hallway" 2display_name: "Hallway"
3letters { key: "a" double: true } 3letters {
4 key: "a"
5 double: true
6 path: "Components/Collectables/a2"
7}
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 @@
1name: "Q2 Room" 1name: "Q2 Room"
2display_name: "Back Area" 2display_name: "Back Area"
3letters { key: "q" double: true } 3letters {
4 key: "q"
5 double: true
6 path: "Components/Collectables/collectable"
7}
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 @@
1name: "B2 Room" 1name: "B2 Room"
2display_name: "B2 Room" 2display_name: "B2 Room"
3letters { key: "b" double: true } 3letters {
4 key: "b"
5 double: true
6 path: "Components/Collectables/collectable"
7}
4# Uhh idk if the paintings and door in here should be randomized. 8# 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 @@
1connections {
2 from_room: "Main Area"
3 to_room: "Mastery"
4 door { name: "Panels" }
5}
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 @@
1# TODO: The gallery painting
2doors {
3 name: "Panels"
4 type: EVENT
5 panels { room: "Main Area" name: "SPECIES" }
6 panels { room: "Main Area" name: "PERSONALITY" }
7 panels { room: "Main Area" name: "CONSTITUION" }
8 panels { room: "Main Area" name: "GAME" }
9 panels { room: "Main Area" name: "SCIENCE" }
10 panels { room: "Main Area" name: "SCHOOL" }
11 panels { room: "Main Area" name: "BUILDING" }
12 panels { room: "Main Area" name: "STRUCTURE" }
13 panels { room: "Main Area" name: "CATERPILLAR" }
14 panels { room: "Main Area" name: "KNOWLEDGE" }
15 panels { room: "Main Area" name: "GENE" }
16 panels { room: "Main Area" name: "CREATURE" }
17 panels { room: "Main Area" name: "ARTICLE" }
18 panels { room: "Main Area" name: "BOOK" }
19 panels { room: "Main Area" name: "TEXT" }
20 panels { room: "Main Area" name: "POSITION (1)" }
21 panels { room: "Main Area" name: "POSITION (2)" }
22 panels { room: "Main Area" name: "POSITION (3)" }
23}
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 @@
1name: "Main Area"
2display_name: "Main Area"
3panels {
4 name: "SPECIES"
5 path: "Panels/Room_1/panel_1"
6 clue: "species"
7 answer: "evolution"
8 symbols: "null"
9}
10panels {
11 name: "PERSONALITY"
12 path: "Panels/Room_1/panel_2"
13 clue: "personality"
14 answer: "growth"
15 symbols: "null"
16}
17panels {
18 name: "CONSTITUTION"
19 path: "Panels/Room_1/panel_3"
20 clue: "constitution"
21 answer: "amendment"
22 symbols: "null"
23}
24panels {
25 name: "GAME"
26 path: "Panels/Room_1/panel_4"
27 clue: "game"
28 answer: "expansion"
29 symbols: "null"
30}
31panels {
32 name: "SCIENCE"
33 path: "Panels/Room_1/panel_5"
34 clue: "science"
35 answer: "discovery"
36 symbols: "null"
37}
38panels {
39 name: "SCHOOL"
40 path: "Panels/Room_1/panel_6"
41 clue: "school"
42 answer: "graduation"
43 symbols: "null"
44}
45panels {
46 name: "BUILDING"
47 path: "Panels/Room_1/panel_7"
48 clue: "building"
49 answer: "construction"
50 symbols: "null"
51}
52panels {
53 name: "STRUCTURE"
54 path: "Panels/Room_1/panel_8"
55 clue: "structure"
56 answer: "construction"
57 symbols: "null"
58}
59panels {
60 name: "CATERPILLAR"
61 path: "Panels/Room_1/panel_9"
62 clue: "caterpillar"
63 answer: "metamorphosis"
64 symbols: "null"
65}
66panels {
67 name: "KNOWLEDGE"
68 path: "Panels/Room_1/panel_10"
69 clue: "knowledge"
70 answer: "learning"
71 symbols: "null"
72}
73panels {
74 name: "GENE"
75 path: "Panels/Room_1/panel_11"
76 clue: "gene"
77 answer: "mutation"
78 symbols: "null"
79}
80panels {
81 name: "CREATURE"
82 path: "Panels/Room_1/panel_12"
83 clue: "creature"
84 answer: "mutation"
85 symbols: "null"
86}
87panels {
88 name: "ARTICLE"
89 path: "Panels/Room_1/panel_13"
90 clue: "article"
91 answer: "revision"
92 symbols: "null"
93}
94panels {
95 name: "BOOK"
96 path: "Panels/Room_1/panel_14"
97 clue: "book"
98 answer: "revision"
99 symbols: "null"
100}
101panels {
102 name: "TEXT"
103 path: "Panels/Room_1/panel_15"
104 clue: "text"
105 answer: "revision"
106 symbols: "null"
107}
108panels {
109 name: "POSITION (1)"
110 path: "Panels/Room_1/panel_16"
111 clue: "position"
112 answer: "motion"
113 symbols: "null"
114}
115panels {
116 name: "POSITION (2)"
117 path: "Panels/Room_1/panel_17"
118 clue: "position"
119 answer: "acceleration"
120 symbols: "null"
121}
122panels {
123 name: "POSITION (3)"
124 path: "Panels/Room_1/panel_18"
125 clue: "position"
126 answer: "jerk"
127 symbols: "null"
128}
129ports {
130 name: "GALLERY"
131 path: "Components/Warps/worldport"
132 orientation: "southwest" # uhhhh this is new
133}
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 @@
1name: "Mastery"
2display_name: "Main Area"
3masteries {
4 name: "MASTERY"
5 path: "Components/Collectables/collectable"
6}
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 @@
1name: "D Room Final" 1name: "D Room Final"
2display_name: "D Room" 2display_name: "D Room"
3letters { key: "d" } \ No newline at end of file 3letters {
4 key: "d"
5 path: "Components/Collectables/d"
6}
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 {
83 required_door { name: "Corners Painting" } 83 required_door { name: "Corners Painting" }
84 display_name: "Corners Painting" 84 display_name: "Corners Painting"
85} 85}
86letters { key: "l" } \ No newline at end of file 86letters {
87 key: "l"
88 path: "Components/Collectables/l"
89}
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 {
43 clue: "than" 43 clue: "than"
44 answer: "than" 44 answer: "than"
45} 45}
46letters { key: "h" } 46letters {
47letters { key: "i" } 47 key: "h"
48letters { key: "n" } 48 path: "Components/Collectables/h"
49letters { key: "t" } 49}
50letters {
51 key: "i"
52 path: "Components/Collectables/i"
53}
54letters {
55 key: "n"
56 path: "Components/Collectables/n"
57}
58letters {
59 key: "t"
60 path: "Components/Collectables/t"
61}
50# Maze painting should stay vanilla as a hint. 62# Maze painting should stay vanilla as a hint.
51paintings { 63paintings {
52 name: "OWL" 64 name: "OWL"
@@ -88,4 +100,4 @@ ports {
88 path: "Components/Warps/worldport12" 100 path: "Components/Warps/worldport12"
89 orientation: "east" 101 orientation: "east"
90 required_door { name: "Composite Room Entrance" } 102 required_door { name: "Composite Room Entrance" }
91} \ No newline at end of file 103}
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 @@
1name: "X Area" 1name: "X Area"
2display_name: "Starting Room" 2display_name: "Starting Room"
3letters { key: "x" } 3letters {
4 key: "x"
5 path: "Components/Collectables/x"
6}
4ports { 7ports {
5 name: "CC" 8 name: "CC"
6 path: "Components/Warps/worldport3" 9 path: "Components/Warps/worldport3"
7 orientation: "west" 10 orientation: "west"
8} \ No newline at end of file 11}
diff --git a/proto/human.proto b/proto/human.proto index 3352518..88aca38 100644 --- a/proto/human.proto +++ b/proto/human.proto
@@ -126,15 +126,28 @@ message HumanKeyholder {
126 string path = 2; 126 string path = 2;
127} 127}
128 128
129message HumanLetter {
130 string key = 1;
131 bool double = 2;
132
133 string path = 3;
134}
135
136message HumanMastery {
137 string name = 1;
138 string path = 2;
139}
140
129message HumanRoom { 141message HumanRoom {
130 string name = 1; 142 string name = 1;
131 string display_name = 2; 143 string display_name = 2;
132 144
133 repeated HumanPanel panels = 3; 145 repeated HumanPanel panels = 3;
134 repeated HumanPainting paintings = 4; 146 repeated HumanPainting paintings = 4;
135 repeated Letter letters = 5; 147 repeated HumanLetter letters = 5;
136 repeated HumanPort ports = 6; 148 repeated HumanPort ports = 6;
137 repeated HumanKeyholder keyholders = 7; 149 repeated HumanKeyholder keyholders = 7;
150 repeated HumanMastery masteries = 8;
138} 151}
139 152
140message IdMappings { 153message IdMappings {
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-10-27 04:32:43 +0000