summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2025-08-10 09:03:23 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2025-08-10 09:03:23 -0400
commit482b251a26c6701e77ddcc167b78e7986fb0a25e (patch)
tree030e99e059f23d28bddea79470aafff2374f5fe1
parent9380a7786afaefa2a999e3130ba0f5318a45b83f (diff)
downloadlingo2-archipelago-482b251a26c6701e77ddcc167b78e7986fb0a25e.tar.gz
lingo2-archipelago-482b251a26c6701e77ddcc167b78e7986fb0a25e.tar.bz2
lingo2-archipelago-482b251a26c6701e77ddcc167b78e7986fb0a25e.zip
Assigned IDs for the_colorful
Also fixed bug where the ID assigner didn't read letter and mastery IDs
and would thus reuse them. I reassigned all IDs because of this (since
we don't need to worry about ID stability yet).
-rw-r--r--data/ids.txtpb706
-rw-r--r--proto/data.proto1
-rw-r--r--proto/human.proto1
-rw-r--r--tools/assign_ids/main.cpp12
-rw-r--r--tools/datapacker/main.cpp9
5 files changed, 469 insertions, 260 deletions
diff --git a/data/ids.txtpb b/data/ids.txtpb index c4be6b5..ae050e9 100644 --- a/data/ids.txtpb +++ b/data/ids.txtpb
@@ -3,54 +3,54 @@ maps {
3 value { 3 value {
4 doors { 4 doors {
5 key: "A2 Door" 5 key: "A2 Door"
6 value: 135 6 value: 246
7 } 7 }
8 doors { 8 doors {
9 key: "Examples Door" 9 key: "Examples Door"
10 value: 132 10 value: 243
11 } 11 }
12 doors { 12 doors {
13 key: "Intensify Door" 13 key: "Intensify Door"
14 value: 131 14 value: 242
15 } 15 }
16 doors { 16 doors {
17 key: "Keyholder Door" 17 key: "Keyholder Door"
18 value: 136 18 value: 247
19 } 19 }
20 doors { 20 doors {
21 key: "Synonyms Door" 21 key: "Synonyms Door"
22 value: 133 22 value: 244
23 } 23 }
24 doors { 24 doors {
25 key: "Time Door" 25 key: "Time Door"
26 value: 134 26 value: 245
27 } 27 }
28 rooms { 28 rooms {
29 key: "Examples Room" 29 key: "Examples Room"
30 value { 30 value {
31 panels { 31 panels {
32 key: "ART" 32 key: "ART"
33 value: 160 33 value: 269
34 } 34 }
35 panels { 35 panels {
36 key: "EMOTION" 36 key: "EMOTION"
37 value: 156 37 value: 265
38 } 38 }
39 panels { 39 panels {
40 key: "SIZE" 40 key: "SIZE"
41 value: 155 41 value: 264
42 } 42 }
43 panels { 43 panels {
44 key: "SONNET" 44 key: "SONNET"
45 value: 158 45 value: 267
46 } 46 }
47 panels { 47 panels {
48 key: "SUPERLATIVE" 48 key: "SUPERLATIVE"
49 value: 157 49 value: 266
50 } 50 }
51 panels { 51 panels {
52 key: "URN" 52 key: "URN"
53 value: 159 53 value: 268
54 } 54 }
55 } 55 }
56 } 56 }
@@ -59,11 +59,11 @@ maps {
59 value { 59 value {
60 panels { 60 panels {
61 key: "HUNCHBACK" 61 key: "HUNCHBACK"
62 value: 146 62 value: 280
63 } 63 }
64 panels { 64 panels {
65 key: "SUSPICION" 65 key: "SUSPICION"
66 value: 145 66 value: 279
67 } 67 }
68 } 68 }
69 } 69 }
@@ -72,35 +72,35 @@ maps {
72 value { 72 value {
73 panels { 73 panels {
74 key: "BETTER" 74 key: "BETTER"
75 value: 151 75 value: 252
76 } 76 }
77 panels { 77 panels {
78 key: "INJURY" 78 key: "INJURY"
79 value: 153 79 value: 254
80 } 80 }
81 panels { 81 panels {
82 key: "LARGE" 82 key: "LARGE"
83 value: 149 83 value: 250
84 } 84 }
85 panels { 85 panels {
86 key: "LIKE" 86 key: "LIKE"
87 value: 148 87 value: 249
88 } 88 }
89 panels { 89 panels {
90 key: "SMALL" 90 key: "SMALL"
91 value: 147 91 value: 248
92 } 92 }
93 panels { 93 panels {
94 key: "SWAY" 94 key: "SWAY"
95 value: 154 95 value: 255
96 } 96 }
97 panels { 97 panels {
98 key: "TERROR" 98 key: "TERROR"
99 value: 150 99 value: 251
100 } 100 }
101 panels { 101 panels {
102 key: "TURN" 102 key: "TURN"
103 value: 152 103 value: 253
104 } 104 }
105 } 105 }
106 } 106 }
@@ -109,35 +109,35 @@ maps {
109 value { 109 value {
110 panels { 110 panels {
111 key: "ADORE" 111 key: "ADORE"
112 value: 162 112 value: 271
113 } 113 }
114 panels { 114 panels {
115 key: "FRIGHT" 115 key: "FRIGHT"
116 value: 164 116 value: 273
117 } 117 }
118 panels { 118 panels {
119 key: "FURY" 119 key: "FURY"
120 value: 168 120 value: 277
121 } 121 }
122 panels { 122 panels {
123 key: "MASSIVE" 123 key: "MASSIVE"
124 value: 163 124 value: 272
125 } 125 }
126 panels { 126 panels {
127 key: "MINUTE" 127 key: "MINUTE"
128 value: 161 128 value: 270
129 } 129 }
130 panels { 130 panels {
131 key: "SERIOUS" 131 key: "SERIOUS"
132 value: 167 132 value: 276
133 } 133 }
134 panels { 134 panels {
135 key: "SURPASS" 135 key: "SURPASS"
136 value: 165 136 value: 274
137 } 137 }
138 panels { 138 panels {
139 key: "VERSE" 139 key: "VERSE"
140 value: 166 140 value: 275
141 } 141 }
142 } 142 }
143 } 143 }
@@ -146,35 +146,35 @@ maps {
146 value { 146 value {
147 panels { 147 panels {
148 key: "BROODING" 148 key: "BROODING"
149 value: 137 149 value: 256
150 } 150 }
151 panels { 151 panels {
152 key: "CARE" 152 key: "CARE"
153 value: 138 153 value: 257
154 } 154 }
155 panels { 155 panels {
156 key: "HOLE" 156 key: "HOLE"
157 value: 143 157 value: 262
158 } 158 }
159 panels { 159 panels {
160 key: "LIFE" 160 key: "LIFE"
161 value: 139 161 value: 258
162 } 162 }
163 panels { 163 panels {
164 key: "PRACTICE" 164 key: "PRACTICE"
165 value: 141 165 value: 260
166 } 166 }
167 panels { 167 panels {
168 key: "RHYTHM" 168 key: "RHYTHM"
169 value: 144 169 value: 263
170 } 170 }
171 panels { 171 panels {
172 key: "SUSPENSE" 172 key: "SUSPENSE"
173 value: 140 173 value: 259
174 } 174 }
175 panels { 175 panels {
176 key: "WRITING" 176 key: "WRITING"
177 value: 142 177 value: 261
178 } 178 }
179 } 179 }
180 } 180 }
@@ -185,22 +185,22 @@ maps {
185 value { 185 value {
186 doors { 186 doors {
187 key: "End Door" 187 key: "End Door"
188 value: 170 188 value: 130
189 } 189 }
190 doors { 190 doors {
191 key: "Front Door" 191 key: "Front Door"
192 value: 169 192 value: 129
193 } 193 }
194 doors { 194 doors {
195 key: "Lavender Cubes" 195 key: "Lavender Cubes"
196 value: 171 196 value: 131
197 } 197 }
198 rooms { 198 rooms {
199 key: "Inside" 199 key: "Inside"
200 value { 200 value {
201 panels { 201 panels {
202 key: "COLOR" 202 key: "COLOR"
203 value: 173 203 value: 133
204 } 204 }
205 } 205 }
206 } 206 }
@@ -209,7 +209,7 @@ maps {
209 value { 209 value {
210 panels { 210 panels {
211 key: "THIS" 211 key: "THIS"
212 value: 172 212 value: 132
213 } 213 }
214 } 214 }
215 } 215 }
@@ -220,30 +220,30 @@ maps {
220 value { 220 value {
221 doors { 221 doors {
222 key: "Butterfly Entrance" 222 key: "Butterfly Entrance"
223 value: 178 223 value: 37
224 } 224 }
225 doors { 225 doors {
226 key: "Control Center Brown Door" 226 key: "Control Center Brown Door"
227 value: 177 227 value: 36
228 } 228 }
229 doors { 229 doors {
230 key: "Exit Door" 230 key: "Exit Door"
231 value: 175 231 value: 34
232 } 232 }
233 doors { 233 doors {
234 key: "Overlook Door" 234 key: "Overlook Door"
235 value: 174 235 value: 33
236 } 236 }
237 doors { 237 doors {
238 key: "Q2 Door" 238 key: "Q2 Door"
239 value: 176 239 value: 35
240 } 240 }
241 rooms { 241 rooms {
242 key: "Back Area" 242 key: "Back Area"
243 value { 243 value {
244 panels { 244 panels {
245 key: "COLOR" 245 key: "COLOR"
246 value: 179 246 value: 38
247 } 247 }
248 } 248 }
249 } 249 }
@@ -252,7 +252,7 @@ maps {
252 value { 252 value {
253 panels { 253 panels {
254 key: "HALF" 254 key: "HALF"
255 value: 205 255 value: 65
256 } 256 }
257 } 257 }
258 } 258 }
@@ -261,7 +261,7 @@ maps {
261 value { 261 value {
262 panels { 262 panels {
263 key: "TUNE" 263 key: "TUNE"
264 value: 204 264 value: 64
265 } 265 }
266 } 266 }
267 } 267 }
@@ -270,7 +270,7 @@ maps {
270 value { 270 value {
271 panels { 271 panels {
272 key: "LICE" 272 key: "LICE"
273 value: 203 273 value: 63
274 } 274 }
275 } 275 }
276 } 276 }
@@ -279,7 +279,7 @@ maps {
279 value { 279 value {
280 panels { 280 panels {
281 key: "THORN" 281 key: "THORN"
282 value: 183 282 value: 42
283 } 283 }
284 } 284 }
285 } 285 }
@@ -288,11 +288,11 @@ maps {
288 value { 288 value {
289 panels { 289 panels {
290 key: "DARKNESS" 290 key: "DARKNESS"
291 value: 182 291 value: 41
292 } 292 }
293 panels { 293 panels {
294 key: "VIBRANT" 294 key: "VIBRANT"
295 value: 181 295 value: 40
296 } 296 }
297 } 297 }
298 } 298 }
@@ -301,35 +301,35 @@ maps {
301 value { 301 value {
302 panels { 302 panels {
303 key: "CYCLING" 303 key: "CYCLING"
304 value: 198 304 value: 58
305 } 305 }
306 panels { 306 panels {
307 key: "FLYTRAP" 307 key: "FLYTRAP"
308 value: 196 308 value: 56
309 } 309 }
310 panels { 310 panels {
311 key: "HOVER" 311 key: "HOVER"
312 value: 192 312 value: 52
313 } 313 }
314 panels { 314 panels {
315 key: "MANE" 315 key: "MANE"
316 value: 194 316 value: 54
317 } 317 }
318 panels { 318 panels {
319 key: "SCHOOL" 319 key: "SCHOOL"
320 value: 195 320 value: 55
321 } 321 }
322 panels { 322 panels {
323 key: "SQUISH" 323 key: "SQUISH"
324 value: 193 324 value: 53
325 } 325 }
326 panels { 326 panels {
327 key: "TOAD" 327 key: "TOAD"
328 value: 197 328 value: 57
329 } 329 }
330 panels { 330 panels {
331 key: "VIEW" 331 key: "VIEW"
332 value: 191 332 value: 51
333 } 333 }
334 } 334 }
335 } 335 }
@@ -338,7 +338,7 @@ maps {
338 value { 338 value {
339 panels { 339 panels {
340 key: "SOIL" 340 key: "SOIL"
341 value: 184 341 value: 43
342 } 342 }
343 } 343 }
344 } 344 }
@@ -347,7 +347,7 @@ maps {
347 value { 347 value {
348 panels { 348 panels {
349 key: "SPIN" 349 key: "SPIN"
350 value: 188 350 value: 48
351 } 351 }
352 } 352 }
353 } 353 }
@@ -356,7 +356,7 @@ maps {
356 value { 356 value {
357 panels { 357 panels {
358 key: "MAR" 358 key: "MAR"
359 value: 201 359 value: 61
360 } 360 }
361 } 361 }
362 } 362 }
@@ -365,7 +365,7 @@ maps {
365 value { 365 value {
366 panels { 366 panels {
367 key: "POTATO" 367 key: "POTATO"
368 value: 180 368 value: 39
369 } 369 }
370 } 370 }
371 } 371 }
@@ -374,7 +374,7 @@ maps {
374 value { 374 value {
375 panels { 375 panels {
376 key: "SUNBASS" 376 key: "SUNBASS"
377 value: 199 377 value: 59
378 } 378 }
379 } 379 }
380 } 380 }
@@ -383,7 +383,7 @@ maps {
383 value { 383 value {
384 panels { 384 panels {
385 key: "DOG" 385 key: "DOG"
386 value: 207 386 value: 67
387 } 387 }
388 } 388 }
389 } 389 }
@@ -392,7 +392,7 @@ maps {
392 value { 392 value {
393 panels { 393 panels {
394 key: "GRACEFUL" 394 key: "GRACEFUL"
395 value: 200 395 value: 60
396 } 396 }
397 } 397 }
398 } 398 }
@@ -401,7 +401,7 @@ maps {
401 value { 401 value {
402 panels { 402 panels {
403 key: "AUBERGINE" 403 key: "AUBERGINE"
404 value: 206 404 value: 66
405 } 405 }
406 } 406 }
407 } 407 }
@@ -410,7 +410,7 @@ maps {
410 value { 410 value {
411 panels { 411 panels {
412 key: "FOOLSHARK" 412 key: "FOOLSHARK"
413 value: 202 413 value: 62
414 } 414 }
415 } 415 }
416 } 416 }
@@ -419,7 +419,7 @@ maps {
419 value { 419 value {
420 panels { 420 panels {
421 key: "FUEL" 421 key: "FUEL"
422 value: 186 422 value: 46
423 } 423 }
424 } 424 }
425 } 425 }
@@ -428,7 +428,7 @@ maps {
428 value { 428 value {
429 panels { 429 panels {
430 key: "DESTRUCTION" 430 key: "DESTRUCTION"
431 value: 187 431 value: 47
432 } 432 }
433 } 433 }
434 } 434 }
@@ -437,7 +437,7 @@ maps {
437 value { 437 value {
438 panels { 438 panels {
439 key: "CARD" 439 key: "CARD"
440 value: 189 440 value: 49
441 } 441 }
442 } 442 }
443 } 443 }
@@ -446,7 +446,7 @@ maps {
446 value { 446 value {
447 panels { 447 panels {
448 key: "ZEUS" 448 key: "ZEUS"
449 value: 190 449 value: 50
450 } 450 }
451 } 451 }
452 } 452 }
@@ -455,7 +455,7 @@ maps {
455 value { 455 value {
456 panels { 456 panels {
457 key: "CAKE" 457 key: "CAKE"
458 value: 185 458 value: 44
459 } 459 }
460 } 460 }
461 } 461 }
@@ -466,58 +466,58 @@ maps {
466 value { 466 value {
467 doors { 467 doors {
468 key: "B2 Door" 468 key: "B2 Door"
469 value: 248 469 value: 98
470 } 470 }
471 doors { 471 doors {
472 key: "Blue Puzzles" 472 key: "Blue Puzzles"
473 value: 244 473 value: 94
474 } 474 }
475 doors { 475 doors {
476 key: "Brown Puzzles" 476 key: "Brown Puzzles"
477 value: 241 477 value: 91
478 } 478 }
479 doors { 479 doors {
480 key: "Control Center Entrance" 480 key: "Control Center Entrance"
481 value: 246 481 value: 96
482 } 482 }
483 doors { 483 doors {
484 key: "Gallery Painting" 484 key: "Gallery Painting"
485 value: 245 485 value: 95
486 } 486 }
487 doors { 487 doors {
488 key: "Gray Puzzles" 488 key: "Gray Puzzles"
489 value: 242 489 value: 92
490 } 490 }
491 doors { 491 doors {
492 key: "Green Puzzles" 492 key: "Green Puzzles"
493 value: 239 493 value: 89
494 } 494 }
495 doors { 495 doors {
496 key: "Orange Puzzles" 496 key: "Orange Puzzles"
497 value: 240 497 value: 90
498 } 498 }
499 doors { 499 doors {
500 key: "Plaza Entrance" 500 key: "Plaza Entrance"
501 value: 247 501 value: 97
502 } 502 }
503 doors { 503 doors {
504 key: "Purple Puzzles" 504 key: "Purple Puzzles"
505 value: 243 505 value: 93
506 } 506 }
507 doors { 507 doors {
508 key: "Red Puzzles" 508 key: "Red Puzzles"
509 value: 208 509 value: 87
510 } 510 }
511 doors { 511 doors {
512 key: "Yellow Puzzles" 512 key: "Yellow Puzzles"
513 value: 238 513 value: 88
514 } 514 }
515 rooms { 515 rooms {
516 key: "Control Center Side" 516 key: "Control Center Side"
517 value { 517 value {
518 panels { 518 panels {
519 key: "RIGHT" 519 key: "RIGHT"
520 value: 237 520 value: 127
521 } 521 }
522 } 522 }
523 } 523 }
@@ -526,115 +526,115 @@ maps {
526 value { 526 value {
527 panels { 527 panels {
528 key: "CAUGHT" 528 key: "CAUGHT"
529 value: 222 529 value: 112
530 } 530 }
531 panels { 531 panels {
532 key: "CHOP" 532 key: "CHOP"
533 value: 229 533 value: 119
534 } 534 }
535 panels { 535 panels {
536 key: "CHOP YOU PLOT" 536 key: "CHOP YOU PLOT"
537 value: 232 537 value: 122
538 } 538 }
539 panels { 539 panels {
540 key: "CURTSY" 540 key: "CURTSY"
541 value: 213 541 value: 103
542 } 542 }
543 panels { 543 panels {
544 key: "DOLLARS" 544 key: "DOLLARS"
545 value: 210 545 value: 100
546 } 546 }
547 panels { 547 panels {
548 key: "FOUR" 548 key: "FOUR"
549 value: 221 549 value: 111
550 } 550 }
551 panels { 551 panels {
552 key: "FOUR CAUGHT NET" 552 key: "FOUR CAUGHT NET"
553 value: 224 553 value: 114
554 } 554 }
555 panels { 555 panels {
556 key: "GREEN" 556 key: "GREEN"
557 value: 233 557 value: 123
558 } 558 }
559 panels { 559 panels {
560 key: "GREEN THINK LION" 560 key: "GREEN THINK LION"
561 value: 236 561 value: 126
562 } 562 }
563 panels { 563 panels {
564 key: "KOI" 564 key: "KOI"
565 value: 216 565 value: 106
566 } 566 }
567 panels { 567 panels {
568 key: "LION" 568 key: "LION"
569 value: 235 569 value: 125
570 } 570 }
571 panels { 571 panels {
572 key: "MOON" 572 key: "MOON"
573 value: 218 573 value: 108
574 } 574 }
575 panels { 575 panels {
576 key: "MOON POWER" 576 key: "MOON POWER"
577 value: 220 577 value: 110
578 } 578 }
579 panels { 579 panels {
580 key: "NEAR" 580 key: "NEAR"
581 value: 227 581 value: 117
582 } 582 }
583 panels { 583 panels {
584 key: "NET" 584 key: "NET"
585 value: 223 585 value: 113
586 } 586 }
587 panels { 587 panels {
588 key: "NEW" 588 key: "NEW"
589 value: 209 589 value: 99
590 } 590 }
591 panels { 591 panels {
592 key: "NEW DOLLARS" 592 key: "NEW DOLLARS"
593 value: 211 593 value: 101
594 } 594 }
595 panels { 595 panels {
596 key: "OUT" 596 key: "OUT"
597 value: 225 597 value: 115
598 } 598 }
599 panels { 599 panels {
600 key: "OUT SEW NEAR" 600 key: "OUT SEW NEAR"
601 value: 228 601 value: 118
602 } 602 }
603 panels { 603 panels {
604 key: "PLOT" 604 key: "PLOT"
605 value: 231 605 value: 121
606 } 606 }
607 panels { 607 panels {
608 key: "POWER" 608 key: "POWER"
609 value: 219 609 value: 109
610 } 610 }
611 panels { 611 panels {
612 key: "SEW" 612 key: "SEW"
613 value: 226 613 value: 116
614 } 614 }
615 panels { 615 panels {
616 key: "SHINE" 616 key: "SHINE"
617 value: 212 617 value: 102
618 } 618 }
619 panels { 619 panels {
620 key: "SHINE CURTSY" 620 key: "SHINE CURTSY"
621 value: 214 621 value: 104
622 } 622 }
623 panels { 623 panels {
624 key: "SUN" 624 key: "SUN"
625 value: 215 625 value: 105
626 } 626 }
627 panels { 627 panels {
628 key: "SUN KOI" 628 key: "SUN KOI"
629 value: 217 629 value: 107
630 } 630 }
631 panels { 631 panels {
632 key: "THINK" 632 key: "THINK"
633 value: 234 633 value: 124
634 } 634 }
635 panels { 635 panels {
636 key: "YOU" 636 key: "YOU"
637 value: 230 637 value: 120
638 } 638 }
639 } 639 }
640 } 640 }
@@ -648,75 +648,75 @@ maps {
648 value { 648 value {
649 panels { 649 panels {
650 key: "ARTICLE" 650 key: "ARTICLE"
651 value: 262 651 value: 80
652 } 652 }
653 panels { 653 panels {
654 key: "BOOK" 654 key: "BOOK"
655 value: 263 655 value: 81
656 } 656 }
657 panels { 657 panels {
658 key: "BUILDING" 658 key: "BUILDING"
659 value: 256 659 value: 74
660 } 660 }
661 panels { 661 panels {
662 key: "CATERPILLAR" 662 key: "CATERPILLAR"
663 value: 258 663 value: 76
664 } 664 }
665 panels { 665 panels {
666 key: "CONSTITUTION" 666 key: "CONSTITUTION"
667 value: 252 667 value: 70
668 } 668 }
669 panels { 669 panels {
670 key: "CREATURE" 670 key: "CREATURE"
671 value: 261 671 value: 79
672 } 672 }
673 panels { 673 panels {
674 key: "GAME" 674 key: "GAME"
675 value: 253 675 value: 71
676 } 676 }
677 panels { 677 panels {
678 key: "GENE" 678 key: "GENE"
679 value: 260 679 value: 78
680 } 680 }
681 panels { 681 panels {
682 key: "KNOWLEDGE" 682 key: "KNOWLEDGE"
683 value: 259 683 value: 77
684 } 684 }
685 panels { 685 panels {
686 key: "PERSONALITY" 686 key: "PERSONALITY"
687 value: 251 687 value: 69
688 } 688 }
689 panels { 689 panels {
690 key: "POSITION (1)" 690 key: "POSITION (1)"
691 value: 265 691 value: 83
692 } 692 }
693 panels { 693 panels {
694 key: "POSITION (2)" 694 key: "POSITION (2)"
695 value: 266 695 value: 84
696 } 696 }
697 panels { 697 panels {
698 key: "POSITION (3)" 698 key: "POSITION (3)"
699 value: 267 699 value: 85
700 } 700 }
701 panels { 701 panels {
702 key: "SCHOOL" 702 key: "SCHOOL"
703 value: 255 703 value: 73
704 } 704 }
705 panels { 705 panels {
706 key: "SCIENCE" 706 key: "SCIENCE"
707 value: 254 707 value: 72
708 } 708 }
709 panels { 709 panels {
710 key: "SPECIES" 710 key: "SPECIES"
711 value: 250 711 value: 68
712 } 712 }
713 panels { 713 panels {
714 key: "STRUCTURE" 714 key: "STRUCTURE"
715 value: 257 715 value: 75
716 } 716 }
717 panels { 717 panels {
718 key: "TEXT" 718 key: "TEXT"
719 value: 264 719 value: 82
720 } 720 }
721 } 721 }
722 } 722 }
@@ -725,7 +725,201 @@ maps {
725 value { 725 value {
726 masteries { 726 masteries {
727 key: "MASTERY" 727 key: "MASTERY"
728 value: 268 728 value: 86
729 }
730 }
731 }
732 }
733}
734maps {
735 key: "the_colorful"
736 value {
737 doors {
738 key: "Black Door"
739 value: 2
740 }
741 doors {
742 key: "Blue Door"
743 value: 4
744 }
745 doors {
746 key: "Brown Door"
747 value: 11
748 }
749 doors {
750 key: "Cyan Door"
751 value: 9
752 }
753 doors {
754 key: "Gray Door"
755 value: 13
756 }
757 doors {
758 key: "Green Door"
759 value: 5
760 }
761 doors {
762 key: "Orange Door"
763 value: 10
764 }
765 doors {
766 key: "Purple Door"
767 value: 7
768 }
769 doors {
770 key: "Purple Side Entrance"
771 value: 8
772 }
773 doors {
774 key: "Red Door"
775 value: 3
776 }
777 doors {
778 key: "White Door"
779 value: 1
780 }
781 doors {
782 key: "Window Door"
783 value: 12
784 }
785 doors {
786 key: "Yellow Door"
787 value: 6
788 }
789 rooms {
790 key: "Black Room"
791 value {
792 panels {
793 key: "STARK"
794 value: 30
795 }
796 }
797 }
798 rooms {
799 key: "Blue Room"
800 value {
801 panels {
802 key: "VINE"
803 value: 18
804 }
805 }
806 }
807 rooms {
808 key: "Brown Room"
809 value {
810 panels {
811 key: "FIRE"
812 value: 19
813 }
814 }
815 }
816 rooms {
817 key: "Cyan Hallway"
818 value {
819 panels {
820 key: "CHAOS"
821 value: 24
822 }
823 panels {
824 key: "KOI"
825 value: 22
826 }
827 panels {
828 key: "WISH"
829 value: 23
830 }
831 }
832 }
833 rooms {
834 key: "Cyan Room"
835 value {
836 panels {
837 key: "BROTHER"
838 value: 25
839 }
840 panels {
841 key: "LOST"
842 value: 27
843 }
844 panels {
845 key: "MISTER"
846 value: 26
847 }
848 panels {
849 key: "SING"
850 value: 28
851 }
852 }
853 }
854 rooms {
855 key: "Gray Room"
856 value {
857 panels {
858 key: "MEND"
859 value: 20
860 }
861 }
862 }
863 rooms {
864 key: "Green Room"
865 value {
866 panels {
867 key: "MOTHER"
868 value: 21
869 }
870 }
871 }
872 rooms {
873 key: "Orange Room"
874 value {
875 panels {
876 key: "CLOUD"
877 value: 16
878 }
879 }
880 }
881 rooms {
882 key: "Purple Room"
883 value {
884 panels {
885 key: "FISH"
886 value: 17
887 }
888 }
889 }
890 rooms {
891 key: "Red Room"
892 value {
893 panels {
894 key: "SANDWICH"
895 value: 29
896 }
897 }
898 }
899 rooms {
900 key: "White Room"
901 value {
902 panels {
903 key: "BRIGHT"
904 value: 31
905 }
906 }
907 }
908 rooms {
909 key: "Window Room"
910 value {
911 panels {
912 key: "FADING"
913 value: 15
914 }
915 }
916 }
917 rooms {
918 key: "Yellow Room"
919 value {
920 panels {
921 key: "CIRCLE"
922 value: 14
729 } 923 }
730 } 924 }
731 } 925 }
@@ -736,178 +930,166 @@ maps {
736 value { 930 value {
737 doors { 931 doors {
738 key: "Blue Alcove Entrance" 932 key: "Blue Alcove Entrance"
739 value: 12 933 value: 144
740 } 934 }
741 doors { 935 doors {
742 key: "Blue Alcove Exit" 936 key: "Blue Alcove Exit"
743 value: 8 937 value: 140
744 } 938 }
745 doors { 939 doors {
746 key: "Colored Doors Area Entrance" 940 key: "Colored Doors Area Entrance"
747 value: 33 941 value: 165
748 } 942 }
749 doors { 943 doors {
750 key: "Composite Room Entrance" 944 key: "Composite Room Entrance"
751 value: 24 945 value: 156
752 } 946 }
753 doors { 947 doors {
754 key: "Control Center White Door" 948 key: "Control Center White Door"
755 value: 22 949 value: 154
756 } 950 }
757 doors { 951 doors {
758 key: "Corners Painting" 952 key: "Corners Painting"
759 value: 7 953 value: 139
760 } 954 }
761 doors { 955 doors {
762 key: "D Room Entrance" 956 key: "D Room Entrance"
763 value: 34 957 value: 166
764 }
765 doors {
766 key: "D Room Panels"
767 value: 36
768 } 958 }
769 doors { 959 doors {
770 key: "Daedalus Entrance" 960 key: "Daedalus Entrance"
771 value: 26 961 value: 158
772 } 962 }
773 doors { 963 doors {
774 key: "Flip Area Entrance" 964 key: "Flip Area Entrance"
775 value: 25 965 value: 157
776 } 966 }
777 doors { 967 doors {
778 key: "Flipped Pyramid Area Entrance" 968 key: "Flipped Pyramid Area Entrance"
779 value: 30 969 value: 162
780 } 970 }
781 doors { 971 doors {
782 key: "Flipped Second Room Left Door" 972 key: "Flipped Second Room Left Door"
783 value: 15 973 value: 147
784 } 974 }
785 doors { 975 doors {
786 key: "Flipped Second Room Right Door" 976 key: "Flipped Second Room Right Door"
787 value: 14 977 value: 146
788 }
789 doors {
790 key: "Four Corner Panels"
791 value: 6
792 } 978 }
793 doors { 979 doors {
794 key: "Gallery Entrance" 980 key: "Gallery Entrance"
795 value: 37 981 value: 168
796 } 982 }
797 doors { 983 doors {
798 key: "L Room Entrance" 984 key: "L Room Entrance"
799 value: 38 985 value: 169
800 }
801 doors {
802 key: "Least Blue Last Panels"
803 value: 39
804 } 986 }
805 doors { 987 doors {
806 key: "Liberated Entrance" 988 key: "Liberated Entrance"
807 value: 29 989 value: 161
808 } 990 }
809 doors { 991 doors {
810 key: "Lime Room Entrance" 992 key: "Lime Room Entrance"
811 value: 20 993 value: 152
812 } 994 }
813 doors { 995 doors {
814 key: "Link Area Entrance" 996 key: "Link Area Entrance"
815 value: 2 997 value: 135
816 } 998 }
817 doors { 999 doors {
818 key: "Literate Entrance" 1000 key: "Literate Entrance"
819 value: 31 1001 value: 163
820 } 1002 }
821 doors { 1003 doors {
822 key: "Near D Room Painting" 1004 key: "Near D Room Painting"
823 value: 35 1005 value: 167
824 } 1006 }
825 doors { 1007 doors {
826 key: "Noon Door" 1008 key: "Noon Door"
827 value: 10 1009 value: 142
828 } 1010 }
829 doors { 1011 doors {
830 key: "Orange Door Hider" 1012 key: "Orange Door Hider"
831 value: 19 1013 value: 151
832 } 1014 }
833 doors { 1015 doors {
834 key: "Parthenon Entrance" 1016 key: "Parthenon Entrance"
835 value: 32 1017 value: 164
836 } 1018 }
837 doors { 1019 doors {
838 key: "Rabbithole Door" 1020 key: "Rabbithole Door"
839 value: 9 1021 value: 141
840 } 1022 }
841 doors { 1023 doors {
842 key: "Red Alcove Exit" 1024 key: "Red Alcove Exit"
843 value: 5 1025 value: 138
844 } 1026 }
845 doors { 1027 doors {
846 key: "Red Blue Area Left Door" 1028 key: "Red Blue Area Left Door"
847 value: 17 1029 value: 149
848 } 1030 }
849 doors { 1031 doors {
850 key: "Red Blue Area Right Door" 1032 key: "Red Blue Area Right Door"
851 value: 18 1033 value: 150
852 } 1034 }
853 doors { 1035 doors {
854 key: "Red Room Painting" 1036 key: "Red Room Painting"
855 value: 40 1037 value: 170
856 } 1038 }
857 doors { 1039 doors {
858 key: "Repetitive Entrance" 1040 key: "Repetitive Entrance"
859 value: 27 1041 value: 159
860 } 1042 }
861 doors { 1043 doors {
862 key: "Revitalized Entrance" 1044 key: "Revitalized Entrance"
863 value: 21 1045 value: 153
864 } 1046 }
865 doors { 1047 doors {
866 key: "Right Eye Entrance" 1048 key: "Right Eye Entrance"
867 value: 16 1049 value: 148
868 } 1050 }
869 doors { 1051 doors {
870 key: "Scarf Door" 1052 key: "Scarf Door"
871 value: 11 1053 value: 143
872 } 1054 }
873 doors { 1055 doors {
874 key: "Second Room Left Door" 1056 key: "Second Room Left Door"
875 value: 13 1057 value: 145
876 } 1058 }
877 doors { 1059 doors {
878 key: "Second Room Right Door" 1060 key: "Second Room Right Door"
879 value: 4 1061 value: 137
880 } 1062 }
881 doors { 1063 doors {
882 key: "Shop Entrance" 1064 key: "Shop Entrance"
883 value: 28 1065 value: 160
884 } 1066 }
885 doors { 1067 doors {
886 key: "Third Eye Painting" 1068 key: "Third Eye Painting"
887 value: 41 1069 value: 171
888 } 1070 }
889 doors { 1071 doors {
890 key: "Trick Door" 1072 key: "Trick Door"
891 value: 1 1073 value: 134
892 } 1074 }
893 doors { 1075 doors {
894 key: "Trick To Shop Door" 1076 key: "Trick To Shop Door"
895 value: 3 1077 value: 136
896 } 1078 }
897 doors { 1079 doors {
898 key: "X Area Entrance" 1080 key: "X Area Entrance"
899 value: 23 1081 value: 155
900 } 1082 }
901 rooms { 1083 rooms {
902 key: "Blue Alcove" 1084 key: "Blue Alcove"
903 value { 1085 value {
904 panels { 1086 panels {
905 key: "ARMY" 1087 key: "ARMY"
906 value: 80 1088 value: 213
907 } 1089 }
908 panels { 1090 panels {
909 key: "BLUE" 1091 key: "BLUE"
910 value: 79 1092 value: 212
911 } 1093 }
912 } 1094 }
913 } 1095 }
@@ -916,7 +1098,7 @@ maps {
916 value { 1098 value {
917 panels { 1099 panels {
918 key: "OPEN" 1100 key: "OPEN"
919 value: 60 1101 value: 191
920 } 1102 }
921 } 1103 }
922 } 1104 }
@@ -925,7 +1107,7 @@ maps {
925 value { 1107 value {
926 panels { 1108 panels {
927 key: "RIGHT" 1109 key: "RIGHT"
928 value: 64 1110 value: 195
929 } 1111 }
930 } 1112 }
931 } 1113 }
@@ -934,39 +1116,39 @@ maps {
934 value { 1116 value {
935 panels { 1117 panels {
936 key: "BASEBALL" 1118 key: "BASEBALL"
937 value: 70 1119 value: 203
938 } 1120 }
939 panels { 1121 panels {
940 key: "BIKERS" 1122 key: "BIKERS"
941 value: 71 1123 value: 204
942 } 1124 }
943 panels { 1125 panels {
944 key: "BLACK" 1126 key: "BLACK"
945 value: 74 1127 value: 207
946 } 1128 }
947 panels { 1129 panels {
948 key: "BOWLER" 1130 key: "BOWLER"
949 value: 77 1131 value: 210
950 } 1132 }
951 panels { 1133 panels {
952 key: "CARPENTER" 1134 key: "CARPENTER"
953 value: 78 1135 value: 211
954 } 1136 }
955 panels { 1137 panels {
956 key: "COWBOY" 1138 key: "COWBOY"
957 value: 75 1139 value: 208
958 } 1140 }
959 panels { 1141 panels {
960 key: "RED" 1142 key: "RED"
961 value: 72 1143 value: 205
962 } 1144 }
963 panels { 1145 panels {
964 key: "SPRAY" 1146 key: "SPRAY"
965 value: 76 1147 value: 209
966 } 1148 }
967 panels { 1149 panels {
968 key: "SUN" 1150 key: "SUN"
969 value: 73 1151 value: 206
970 } 1152 }
971 } 1153 }
972 } 1154 }
@@ -975,7 +1157,7 @@ maps {
975 value { 1157 value {
976 panels { 1158 panels {
977 key: "I" 1159 key: "I"
978 value: 90 1160 value: 223
979 } 1161 }
980 } 1162 }
981 } 1163 }
@@ -984,7 +1166,7 @@ maps {
984 value { 1166 value {
985 panels { 1167 panels {
986 key: "WANDER" 1168 key: "WANDER"
987 value: 42 1169 value: 172
988 } 1170 }
989 } 1171 }
990 } 1172 }
@@ -993,11 +1175,11 @@ maps {
993 value { 1175 value {
994 panels { 1176 panels {
995 key: "TURN (1)" 1177 key: "TURN (1)"
996 value: 48 1178 value: 178
997 } 1179 }
998 panels { 1180 panels {
999 key: "TURN (2)" 1181 key: "TURN (2)"
1000 value: 49 1182 value: 179
1001 } 1183 }
1002 } 1184 }
1003 } 1185 }
@@ -1006,11 +1188,11 @@ maps {
1006 value { 1188 value {
1007 panels { 1189 panels {
1008 key: "HERE" 1190 key: "HERE"
1009 value: 86 1191 value: 219
1010 } 1192 }
1011 panels { 1193 panels {
1012 key: "WHERE" 1194 key: "WHERE"
1013 value: 85 1195 value: 218
1014 } 1196 }
1015 } 1197 }
1016 } 1198 }
@@ -1019,11 +1201,11 @@ maps {
1019 value { 1201 value {
1020 panels { 1202 panels {
1021 key: "CLUE" 1203 key: "CLUE"
1022 value: 46 1204 value: 176
1023 } 1205 }
1024 panels { 1206 panels {
1025 key: "SLENDER" 1207 key: "SLENDER"
1026 value: 47 1208 value: 177
1027 } 1209 }
1028 } 1210 }
1029 } 1211 }
@@ -1032,7 +1214,7 @@ maps {
1032 value { 1214 value {
1033 panels { 1215 panels {
1034 key: "RETURN" 1216 key: "RETURN"
1035 value: 61 1217 value: 192
1036 } 1218 }
1037 } 1219 }
1038 } 1220 }
@@ -1041,43 +1223,43 @@ maps {
1041 value { 1223 value {
1042 panels { 1224 panels {
1043 key: "AIL" 1225 key: "AIL"
1044 value: 58 1226 value: 188
1045 } 1227 }
1046 panels { 1228 panels {
1047 key: "CAPABLE (1)" 1229 key: "CAPABLE (1)"
1048 value: 50 1230 value: 180
1049 } 1231 }
1050 panels { 1232 panels {
1051 key: "CAPABLE (2)" 1233 key: "CAPABLE (2)"
1052 value: 51 1234 value: 181
1053 } 1235 }
1054 panels { 1236 panels {
1055 key: "CORNERS" 1237 key: "CORNERS"
1056 value: 59 1238 value: 189
1057 } 1239 }
1058 panels { 1240 panels {
1059 key: "LABEL" 1241 key: "LABEL"
1060 value: 57 1242 value: 187
1061 } 1243 }
1062 panels { 1244 panels {
1063 key: "LUSTRE" 1245 key: "LUSTRE"
1064 value: 52 1246 value: 182
1065 } 1247 }
1066 panels { 1248 panels {
1067 key: "OLD" 1249 key: "OLD"
1068 value: 55 1250 value: 185
1069 } 1251 }
1070 panels { 1252 panels {
1071 key: "STEALER" 1253 key: "STEALER"
1072 value: 54 1254 value: 184
1073 } 1255 }
1074 panels { 1256 panels {
1075 key: "TRUST" 1257 key: "TRUST"
1076 value: 56 1258 value: 186
1077 } 1259 }
1078 panels { 1260 panels {
1079 key: "WANT" 1261 key: "WANT"
1080 value: 53 1262 value: 183
1081 } 1263 }
1082 } 1264 }
1083 } 1265 }
@@ -1086,15 +1268,15 @@ maps {
1086 value { 1268 value {
1087 panels { 1269 panels {
1088 key: "COLOR" 1270 key: "COLOR"
1089 value: 45 1271 value: 175
1090 } 1272 }
1091 panels { 1273 panels {
1092 key: "HIDE" 1274 key: "HIDE"
1093 value: 43 1275 value: 173
1094 } 1276 }
1095 panels { 1277 panels {
1096 key: "SEEK" 1278 key: "SEEK"
1097 value: 44 1279 value: 174
1098 } 1280 }
1099 } 1281 }
1100 } 1282 }
@@ -1103,7 +1285,7 @@ maps {
1103 value { 1285 value {
1104 panels { 1286 panels {
1105 key: "WANDER" 1287 key: "WANDER"
1106 value: 63 1288 value: 194
1107 } 1289 }
1108 } 1290 }
1109 } 1291 }
@@ -1112,7 +1294,7 @@ maps {
1112 value { 1294 value {
1113 panels { 1295 panels {
1114 key: "RETURN" 1296 key: "RETURN"
1115 value: 87 1297 value: 220
1116 } 1298 }
1117 } 1299 }
1118 } 1300 }
@@ -1121,7 +1303,7 @@ maps {
1121 value { 1303 value {
1122 panels { 1304 panels {
1123 key: "PUZZLE" 1305 key: "PUZZLE"
1124 value: 84 1306 value: 217
1125 } 1307 }
1126 } 1308 }
1127 } 1309 }
@@ -1130,11 +1312,11 @@ maps {
1130 value { 1312 value {
1131 panels { 1313 panels {
1132 key: "BROW" 1314 key: "BROW"
1133 value: 88 1315 value: 221
1134 } 1316 }
1135 panels { 1317 panels {
1136 key: "DEAD" 1318 key: "DEAD"
1137 value: 89 1319 value: 222
1138 } 1320 }
1139 } 1321 }
1140 } 1322 }
@@ -1143,31 +1325,31 @@ maps {
1143 value { 1325 value {
1144 panels { 1326 panels {
1145 key: "CENTER" 1327 key: "CENTER"
1146 value: 97 1328 value: 234
1147 } 1329 }
1148 panels { 1330 panels {
1149 key: "CENTER DAY" 1331 key: "CENTER DAY"
1150 value: 99 1332 value: 236
1151 } 1333 }
1152 panels { 1334 panels {
1153 key: "DAY" 1335 key: "DAY"
1154 value: 98 1336 value: 235
1155 } 1337 }
1156 panels { 1338 panels {
1157 key: "RAIN" 1339 key: "RAIN"
1158 value: 101 1340 value: 238
1159 } 1341 }
1160 panels { 1342 panels {
1161 key: "RAIN WOMAN" 1343 key: "RAIN WOMAN"
1162 value: 103 1344 value: 240
1163 } 1345 }
1164 panels { 1346 panels {
1165 key: "WANDER" 1347 key: "WANDER"
1166 value: 100 1348 value: 237
1167 } 1349 }
1168 panels { 1350 panels {
1169 key: "WOMAN" 1351 key: "WOMAN"
1170 value: 102 1352 value: 239
1171 } 1353 }
1172 } 1354 }
1173 } 1355 }
@@ -1176,15 +1358,15 @@ maps {
1176 value { 1358 value {
1177 panels { 1359 panels {
1178 key: "EYE" 1360 key: "EYE"
1179 value: 81 1361 value: 214
1180 } 1362 }
1181 panels { 1363 panels {
1182 key: "FAINT" 1364 key: "FAINT"
1183 value: 83 1365 value: 216
1184 } 1366 }
1185 panels { 1367 panels {
1186 key: "WANDER" 1368 key: "WANDER"
1187 value: 82 1369 value: 215
1188 } 1370 }
1189 } 1371 }
1190 } 1372 }
@@ -1193,7 +1375,7 @@ maps {
1193 value { 1375 value {
1194 panels { 1376 panels {
1195 key: "TURN" 1377 key: "TURN"
1196 value: 104 1378 value: 241
1197 } 1379 }
1198 } 1380 }
1199 } 1381 }
@@ -1202,27 +1384,27 @@ maps {
1202 value { 1384 value {
1203 panels { 1385 panels {
1204 key: "EYE" 1386 key: "EYE"
1205 value: 93 1387 value: 226
1206 } 1388 }
1207 panels { 1389 panels {
1208 key: "HI" 1390 key: "HI"
1209 value: 91 1391 value: 224
1210 } 1392 }
1211 panels { 1393 panels {
1212 key: "HINT" 1394 key: "HINT"
1213 value: 94 1395 value: 227
1214 } 1396 }
1215 panels { 1397 panels {
1216 key: "THAN" 1398 key: "THAN"
1217 value: 96 1399 value: 229
1218 } 1400 }
1219 panels { 1401 panels {
1220 key: "THIN" 1402 key: "THIN"
1221 value: 95 1403 value: 228
1222 } 1404 }
1223 panels { 1405 panels {
1224 key: "TRICK" 1406 key: "TRICK"
1225 value: 92 1407 value: 225
1226 } 1408 }
1227 } 1409 }
1228 } 1410 }
@@ -1231,7 +1413,7 @@ maps {
1231 value { 1413 value {
1232 panels { 1414 panels {
1233 key: "INK" 1415 key: "INK"
1234 value: 62 1416 value: 193
1235 } 1417 }
1236 } 1418 }
1237 } 1419 }
@@ -1240,23 +1422,23 @@ maps {
1240 value { 1422 value {
1241 panels { 1423 panels {
1242 key: "CORN" 1424 key: "CORN"
1243 value: 69 1425 value: 202
1244 } 1426 }
1245 panels { 1427 panels {
1246 key: "DICE" 1428 key: "DICE"
1247 value: 68 1429 value: 201
1248 } 1430 }
1249 panels { 1431 panels {
1250 key: "HOLE" 1432 key: "HOLE"
1251 value: 66 1433 value: 199
1252 } 1434 }
1253 panels { 1435 panels {
1254 key: "RABBIT" 1436 key: "RABBIT"
1255 value: 65 1437 value: 198
1256 } 1438 }
1257 panels { 1439 panels {
1258 key: "WREATH" 1440 key: "WREATH"
1259 value: 67 1441 value: 200
1260 } 1442 }
1261 } 1443 }
1262 } 1444 }
@@ -1264,41 +1446,45 @@ maps {
1264} 1446}
1265letters { 1447letters {
1266 key: "a2" 1448 key: "a2"
1267 value: 277 1449 value: 278
1268} 1450}
1269letters { 1451letters {
1270 key: "b2" 1452 key: "b2"
1271 value: 269 1453 value: 128
1272} 1454}
1273letters { 1455letters {
1274 key: "d1" 1456 key: "d1"
1275 value: 271 1457 value: 196
1276} 1458}
1277letters { 1459letters {
1278 key: "h1" 1460 key: "h1"
1279 value: 273 1461 value: 230
1280} 1462}
1281letters { 1463letters {
1282 key: "i1" 1464 key: "i1"
1283 value: 274 1465 value: 231
1284} 1466}
1285letters { 1467letters {
1286 key: "l1" 1468 key: "l1"
1287 value: 270 1469 value: 190
1288} 1470}
1289letters { 1471letters {
1290 key: "n1" 1472 key: "n1"
1291 value: 275 1473 value: 232
1474}
1475letters {
1476 key: "p2"
1477 value: 32
1292} 1478}
1293letters { 1479letters {
1294 key: "q2" 1480 key: "q2"
1295 value: 249 1481 value: 45
1296} 1482}
1297letters { 1483letters {
1298 key: "t1" 1484 key: "t1"
1299 value: 276 1485 value: 233
1300} 1486}
1301letters { 1487letters {
1302 key: "x1" 1488 key: "x1"
1303 value: 272 1489 value: 197
1304} 1490}
diff --git a/proto/data.proto b/proto/data.proto index dd7a2a3..274010d 100644 --- a/proto/data.proto +++ b/proto/data.proto
@@ -54,6 +54,7 @@ message Panel {
54 repeated Proxy proxies = 8; 54 repeated Proxy proxies = 8;
55 55
56 uint64 required_door = 9; 56 uint64 required_door = 9;
57 uint64 required_room = 11;
57} 58}
58 59
59message Painting { 60message Painting {
diff --git a/proto/human.proto b/proto/human.proto index 3edd984..0de1f0e 100644 --- a/proto/human.proto +++ b/proto/human.proto
@@ -96,6 +96,7 @@ message HumanPanel {
96 repeated Proxy proxies = 6; 96 repeated Proxy proxies = 6;
97 97
98 DoorIdentifier required_door = 7; 98 DoorIdentifier required_door = 7;
99 RoomIdentifier required_room = 8;
99} 100}
100 101
101message HumanPainting { 102message HumanPainting {
diff --git a/tools/assign_ids/main.cpp b/tools/assign_ids/main.cpp index eba4fd6..349c258 100644 --- a/tools/assign_ids/main.cpp +++ b/tools/assign_ids/main.cpp
@@ -61,6 +61,12 @@ class AssignIds {
61 next_id_ = id; 61 next_id_ = id;
62 } 62 }
63 } 63 }
64
65 for (const auto& [_, id] : room.masteries()) {
66 if (id > next_id_) {
67 next_id_ = id;
68 }
69 }
64 } 70 }
65 } 71 }
66 72
@@ -70,6 +76,12 @@ class AssignIds {
70 } 76 }
71 } 77 }
72 78
79 for (const auto& [_, id] : id_mappings_.letters()) {
80 if (id > next_id_) {
81 next_id_ = id;
82 }
83 }
84
73 next_id_++; 85 next_id_++;
74 } 86 }
75 87
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 2ad97b0..260ab62 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp
@@ -139,6 +139,15 @@ class DataPacker {
139 map_name, h_panel.required_door().name(), current_map_name)); 139 map_name, h_panel.required_door().name(), current_map_name));
140 } 140 }
141 141
142 if (h_panel.has_required_room()) {
143 std::optional<std::string> map_name =
144 h_panel.required_room().has_map()
145 ? std::optional<std::string>(h_panel.required_room().map())
146 : std::nullopt;
147 panel.set_required_room(container_.FindOrAddRoom(
148 map_name, h_panel.required_room().name(), current_map_name));
149 }
150
142 return panel_id; 151 return panel_id;
143 } 152 }
144 153