summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2025-08-14 14:24:47 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2025-08-14 14:24:47 -0400
commit8662f88dfe0d7f2a9090037a92a8d1d761614a8c (patch)
tree6af30e778d6d05859109e37d972f2bf3e80c8db2
parenteb23fc8152fa0f7033f3efeafbc0b9bec4ab865b (diff)
downloadlingo2-archipelago-8662f88dfe0d7f2a9090037a92a8d1d761614a8c.tar.gz
lingo2-archipelago-8662f88dfe0d7f2a9090037a92a8d1d761614a8c.tar.bz2
lingo2-archipelago-8662f88dfe0d7f2a9090037a92a8d1d761614a8c.zip
Assigned IDs for the_gold, the_graveyard, and the_great
-rw-r--r--apworld/player_logic.py2
-rw-r--r--apworld/static_logic.py4
-rw-r--r--data/connections.txtpb6
-rw-r--r--data/ids.txtpb967
4 files changed, 974 insertions, 5 deletions
diff --git a/apworld/player_logic.py b/apworld/player_logic.py index c2850d5..f67d7f9 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py
@@ -89,7 +89,7 @@ class Lingo2PlayerLogic:
89 self.real_items.append(door_item_name) 89 self.real_items.append(door_item_name)
90 90
91 for door in world.static_logic.objects.doors: 91 for door in world.static_logic.objects.doors:
92 if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY]: 92 if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
93 self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id, 93 self.locations_by_room.setdefault(door.room_id, []).append(PlayerLocation(door.ap_id,
94 self.get_door_reqs(door.id))) 94 self.get_door_reqs(door.id)))
95 95
diff --git a/apworld/static_logic.py b/apworld/static_logic.py index 6a05f3d..af1e985 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py
@@ -17,11 +17,11 @@ class Lingo2StaticLogic:
17 self.objects.ParseFromString(bytearray(file)) 17 self.objects.ParseFromString(bytearray(file))
18 18
19 for door in self.objects.doors: 19 for door in self.objects.doors:
20 if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY]: 20 if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
21 location_name = f"{self.objects.maps[door.map_id].name} - {door.name}" 21 location_name = f"{self.objects.maps[door.map_id].name} - {door.name}"
22 self.location_id_to_name[door.ap_id] = location_name 22 self.location_id_to_name[door.ap_id] = location_name
23 23
24 if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY]: 24 if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
25 item_name = self.get_door_item_name(door.id) 25 item_name = self.get_door_item_name(door.id)
26 self.item_id_to_name[door.ap_id] = item_name 26 self.item_id_to_name[door.ap_id] = item_name
27 27
diff --git a/data/connections.txtpb b/data/connections.txtpb index c105a41..6613a1b 100644 --- a/data/connections.txtpb +++ b/data/connections.txtpb
@@ -385,8 +385,10 @@ connections {
385 } 385 }
386 } 386 }
387 to { 387 to {
388 map: "the_ancient" 388 room {
389 name: "Outside" 389 map: "the_ancient"
390 name: "Outside"
391 }
390 } 392 }
391 oneway: true 393 oneway: true
392} 394}
diff --git a/data/ids.txtpb b/data/ids.txtpb index 019ae84..9220998 100644 --- a/data/ids.txtpb +++ b/data/ids.txtpb
@@ -2272,6 +2272,965 @@ maps {
2272 } 2272 }
2273 } 2273 }
2274} 2274}
2275maps {
2276 key: "the_gold"
2277 value {
2278 rooms {
2279 key: "The Whole Thing"
2280 value {
2281 panels {
2282 key: "PANEL"
2283 value: 437
2284 }
2285 }
2286 }
2287 }
2288}
2289maps {
2290 key: "the_graveyard"
2291 value {
2292 rooms {
2293 key: "Inside"
2294 value {
2295 panels {
2296 key: "REMEMBER"
2297 value: 436
2298 }
2299 }
2300 }
2301 rooms {
2302 key: "Outside"
2303 value {
2304 panels {
2305 key: "FOOT"
2306 value: 434
2307 }
2308 panels {
2309 key: "SEVERE"
2310 value: 435
2311 }
2312 }
2313 }
2314 }
2315}
2316maps {
2317 key: "the_great"
2318 value {
2319 doors {
2320 key: "Back Area Entrance"
2321 value: 439
2322 }
2323 doors {
2324 key: "Between Entrance"
2325 value: 440
2326 }
2327 doors {
2328 key: "Big Y"
2329 value: 462
2330 }
2331 doors {
2332 key: "Building Building Gravestone"
2333 value: 468
2334 }
2335 doors {
2336 key: "Colorful Entrance"
2337 value: 455
2338 }
2339 doors {
2340 key: "Control Center Gray Door"
2341 value: 446
2342 }
2343 doors {
2344 key: "Control Center Purple Door"
2345 value: 445
2346 }
2347 doors {
2348 key: "Control Center Red Door"
2349 value: 447
2350 }
2351 doors {
2352 key: "Courtyard Entrance"
2353 value: 442
2354 }
2355 doors {
2356 key: "Courtyard Side Door"
2357 value: 461
2358 }
2359 doors {
2360 key: "Daedalus Entrance"
2361 value: 448
2362 }
2363 doors {
2364 key: "Digital Entrance"
2365 value: 438
2366 }
2367 doors {
2368 key: "East/West Divider"
2369 value: 444
2370 }
2371 doors {
2372 key: "Hive Entrance"
2373 value: 454
2374 }
2375 doors {
2376 key: "Into The Mouth Gravestone"
2377 value: 457
2378 }
2379 doors {
2380 key: "Invisible Entrance"
2381 value: 465
2382 }
2383 doors {
2384 key: "Jail Entrance"
2385 value: 451
2386 }
2387 doors {
2388 key: "Lavender Cube"
2389 value: 469
2390 }
2391 doors {
2392 key: "Magnet Room Entrance"
2393 value: 449
2394 }
2395 doors {
2396 key: "Nature Room Door"
2397 value: 466
2398 }
2399 doors {
2400 key: "Nature Room Panels"
2401 value: 467
2402 }
2403 doors {
2404 key: "Near UC Painting Door"
2405 value: 441
2406 }
2407 doors {
2408 key: "North Landscape Entrance"
2409 value: 456
2410 }
2411 doors {
2412 key: "Pillar Room Entrance"
2413 value: 450
2414 }
2415 doors {
2416 key: "Question Room Back Door"
2417 value: 464
2418 }
2419 doors {
2420 key: "Red Against Blue Gravestone"
2421 value: 453
2422 }
2423 doors {
2424 key: "Savory Painting"
2425 value: 452
2426 }
2427 doors {
2428 key: "Spiral Painting"
2429 value: 471
2430 }
2431 doors {
2432 key: "Talented Entrance"
2433 value: 463
2434 }
2435 doors {
2436 key: "The Landscapes Gravestone"
2437 value: 458
2438 }
2439 doors {
2440 key: "The Maze Gravestone"
2441 value: 460
2442 }
2443 doors {
2444 key: "Tower Entrance"
2445 value: 459
2446 }
2447 doors {
2448 key: "West/East Divider"
2449 value: 443
2450 }
2451 doors {
2452 key: "Zero Room Panels"
2453 value: 470
2454 }
2455 rooms {
2456 key: "Back Area"
2457 value {
2458 panels {
2459 key: "Left Landscape Bottom"
2460 value: 488
2461 }
2462 panels {
2463 key: "Left Landscape Left"
2464 value: 489
2465 }
2466 panels {
2467 key: "Left Landscape Right"
2468 value: 487
2469 }
2470 panels {
2471 key: "Left Landscape Top"
2472 value: 486
2473 }
2474 panels {
2475 key: "PAINTING"
2476 value: 480
2477 }
2478 panels {
2479 key: "PLANT"
2480 value: 478
2481 }
2482 panels {
2483 key: "Right Landscape Bottom"
2484 value: 492
2485 }
2486 panels {
2487 key: "Right Landscape Left"
2488 value: 493
2489 }
2490 panels {
2491 key: "Right Landscape Right"
2492 value: 491
2493 }
2494 panels {
2495 key: "Right Landscape Top"
2496 value: 490
2497 }
2498 panels {
2499 key: "TOWEL"
2500 value: 481
2501 }
2502 panels {
2503 key: "TREE"
2504 value: 479
2505 }
2506 panels {
2507 key: "Top Landscape Bottom"
2508 value: 484
2509 }
2510 panels {
2511 key: "Top Landscape Left"
2512 value: 485
2513 }
2514 panels {
2515 key: "Top Landscape Right"
2516 value: 483
2517 }
2518 panels {
2519 key: "Top Landscape Top"
2520 value: 482
2521 }
2522 }
2523 }
2524 rooms {
2525 key: "Behind Question Area"
2526 value {
2527 panels {
2528 key: "DEW"
2529 value: 606
2530 }
2531 panels {
2532 key: "NO"
2533 value: 608
2534 }
2535 panels {
2536 key: "YEW"
2537 value: 607
2538 }
2539 }
2540 }
2541 rooms {
2542 key: "Daedalus Entrance"
2543 value {
2544 panels {
2545 key: "MISSING"
2546 value: 569
2547 }
2548 }
2549 }
2550 rooms {
2551 key: "East Landscape"
2552 value {
2553 panels {
2554 key: "COLOR"
2555 value: 604
2556 }
2557 panels {
2558 key: "MISTREAT"
2559 value: 605
2560 }
2561 }
2562 }
2563 rooms {
2564 key: "Hive Entrance"
2565 value {
2566 panels {
2567 key: "LOST"
2568 value: 611
2569 }
2570 }
2571 }
2572 rooms {
2573 key: "Jail Part 1"
2574 value {
2575 panels {
2576 key: "DECATHLON"
2577 value: 530
2578 }
2579 panels {
2580 key: "DOPAMINE"
2581 value: 524
2582 }
2583 panels {
2584 key: "ENGRAVED"
2585 value: 528
2586 }
2587 panels {
2588 key: "FLAP"
2589 value: 520
2590 }
2591 panels {
2592 key: "GLIDEPATH"
2593 value: 529
2594 }
2595 panels {
2596 key: "GRIEVES"
2597 value: 531
2598 }
2599 panels {
2600 key: "LUCK"
2601 value: 521
2602 }
2603 panels {
2604 key: "PALINDROME"
2605 value: 525
2606 }
2607 panels {
2608 key: "PREVAILS"
2609 value: 527
2610 }
2611 panels {
2612 key: "SNARE"
2613 value: 523
2614 }
2615 panels {
2616 key: "STICK"
2617 value: 522
2618 }
2619 panels {
2620 key: "SUPERVILLAIN"
2621 value: 526
2622 }
2623 }
2624 }
2625 rooms {
2626 key: "Jail Part 2"
2627 value {
2628 panels {
2629 key: "COMMENCE"
2630 value: 544
2631 }
2632 panels {
2633 key: "DIGEST"
2634 value: 537
2635 }
2636 panels {
2637 key: "GRIMACE"
2638 value: 543
2639 }
2640 panels {
2641 key: "JAUNDICE"
2642 value: 538
2643 }
2644 panels {
2645 key: "NECROTIZE (1)"
2646 value: 539
2647 }
2648 panels {
2649 key: "NECROTIZE (2)"
2650 value: 540
2651 }
2652 panels {
2653 key: "PILGRIM"
2654 value: 542
2655 }
2656 panels {
2657 key: "TORMENTS"
2658 value: 541
2659 }
2660 }
2661 }
2662 rooms {
2663 key: "Magnet Room"
2664 value {
2665 panels {
2666 key: "AIRPLANE"
2667 value: 552
2668 }
2669 panels {
2670 key: "AUTHOR"
2671 value: 554
2672 }
2673 panels {
2674 key: "BARTENDER"
2675 value: 560
2676 }
2677 panels {
2678 key: "BLENDER"
2679 value: 565
2680 }
2681 panels {
2682 key: "CLEAN"
2683 value: 557
2684 }
2685 panels {
2686 key: "DIG"
2687 value: 561
2688 }
2689 panels {
2690 key: "DOCTOR"
2691 value: 559
2692 }
2693 panels {
2694 key: "HEAL"
2695 value: 556
2696 }
2697 panels {
2698 key: "PEN"
2699 value: 555
2700 }
2701 panels {
2702 key: "PILOT"
2703 value: 553
2704 }
2705 panels {
2706 key: "SAW"
2707 value: 564
2708 }
2709 panels {
2710 key: "TILL"
2711 value: 562
2712 }
2713 panels {
2714 key: "TRUCKER"
2715 value: 558
2716 }
2717 panels {
2718 key: "WRENCH"
2719 value: 563
2720 }
2721 }
2722 }
2723 rooms {
2724 key: "Main Area"
2725 value {
2726 panels {
2727 key: "BORNE"
2728 value: 504
2729 }
2730 panels {
2731 key: "BROWN RED ORANGE"
2732 value: 508
2733 }
2734 panels {
2735 key: "BYE"
2736 value: 519
2737 }
2738 panels {
2739 key: "COLOR"
2740 value: 518
2741 }
2742 panels {
2743 key: "DEW"
2744 value: 505
2745 }
2746 panels {
2747 key: "DO"
2748 value: 509
2749 }
2750 panels {
2751 key: "EWE"
2752 value: 506
2753 }
2754 panels {
2755 key: "INTRO"
2756 value: 503
2757 }
2758 panels {
2759 key: "IS"
2760 value: 514
2761 }
2762 panels {
2763 key: "IT"
2764 value: 515
2765 }
2766 panels {
2767 key: "NO"
2768 value: 507
2769 }
2770 panels {
2771 key: "NOT"
2772 value: 516
2773 }
2774 panels {
2775 key: "OUT"
2776 value: 502
2777 }
2778 panels {
2779 key: "RED"
2780 value: 517
2781 }
2782 panels {
2783 key: "SEE"
2784 value: 511
2785 }
2786 panels {
2787 key: "SMILE"
2788 value: 512
2789 }
2790 panels {
2791 key: "WHY"
2792 value: 513
2793 }
2794 panels {
2795 key: "YOU"
2796 value: 510
2797 }
2798 }
2799 }
2800 rooms {
2801 key: "Maze Center"
2802 value {
2803 panels {
2804 key: "CHASE"
2805 value: 477
2806 }
2807 panels {
2808 key: "POOR"
2809 value: 476
2810 }
2811 }
2812 }
2813 rooms {
2814 key: "Maze Cold Area"
2815 value {
2816 panels {
2817 key: "COLD"
2818 value: 550
2819 }
2820 }
2821 }
2822 rooms {
2823 key: "Maze In Area"
2824 value {
2825 panels {
2826 key: "IN"
2827 value: 610
2828 }
2829 }
2830 }
2831 rooms {
2832 key: "Maze Moon Area"
2833 value {
2834 panels {
2835 key: "MOON"
2836 value: 616
2837 }
2838 }
2839 }
2840 rooms {
2841 key: "Maze Off Area"
2842 value {
2843 panels {
2844 key: "OFF"
2845 value: 536
2846 }
2847 }
2848 }
2849 rooms {
2850 key: "Maze Slice Area"
2851 value {
2852 panels {
2853 key: "SLICE"
2854 value: 612
2855 }
2856 }
2857 }
2858 rooms {
2859 key: "Maze Smooth Area"
2860 value {
2861 panels {
2862 key: "SMOOTH"
2863 value: 613
2864 }
2865 }
2866 }
2867 rooms {
2868 key: "Maze South Area"
2869 value {
2870 panels {
2871 key: "SOUTH"
2872 value: 609
2873 }
2874 }
2875 }
2876 rooms {
2877 key: "Maze Start"
2878 value {
2879 panels {
2880 key: "OUT"
2881 value: 501
2882 }
2883 }
2884 }
2885 rooms {
2886 key: "Maze Tower"
2887 value {
2888 panels {
2889 key: "DECOMPOSE"
2890 value: 534
2891 }
2892 panels {
2893 key: "FEEL"
2894 value: 533
2895 }
2896 panels {
2897 key: "SPIRE"
2898 value: 535
2899 }
2900 }
2901 }
2902 rooms {
2903 key: "Maze Up Area"
2904 value {
2905 panels {
2906 key: "UP"
2907 value: 566
2908 }
2909 }
2910 }
2911 rooms {
2912 key: "Maze Wreck Area"
2913 value {
2914 panels {
2915 key: "MAROON"
2916 value: 568
2917 }
2918 panels {
2919 key: "WRECK"
2920 value: 567
2921 }
2922 }
2923 }
2924 rooms {
2925 key: "Nature Room"
2926 value {
2927 panels {
2928 key: "ABOVE"
2929 value: 548
2930 }
2931 panels {
2932 key: "FOOT"
2933 value: 546
2934 }
2935 panels {
2936 key: "PAUSES"
2937 value: 547
2938 }
2939 panels {
2940 key: "SEVERE"
2941 value: 545
2942 }
2943 }
2944 }
2945 rooms {
2946 key: "North Landscape"
2947 value {
2948 panels {
2949 key: "ANIMALS"
2950 value: 495
2951 }
2952 panels {
2953 key: "FINISHED"
2954 value: 498
2955 }
2956 panels {
2957 key: "INSIDE"
2958 value: 500
2959 }
2960 panels {
2961 key: "LAUGH"
2962 value: 497
2963 }
2964 panels {
2965 key: "LAUGH FINISHED"
2966 value: 499
2967 }
2968 panels {
2969 key: "PLANTS"
2970 value: 496
2971 }
2972 panels {
2973 key: "WEATHER"
2974 value: 494
2975 }
2976 }
2977 }
2978 rooms {
2979 key: "Outside Jail"
2980 value {
2981 panels {
2982 key: "GUT"
2983 value: 472
2984 }
2985 panels {
2986 key: "HAM"
2987 value: 473
2988 }
2989 panels {
2990 key: "MAIM"
2991 value: 474
2992 }
2993 panels {
2994 key: "WILT"
2995 value: 475
2996 }
2997 }
2998 }
2999 rooms {
3000 key: "Pillar Room"
3001 value {
3002 panels {
3003 key: "CAUGHT"
3004 value: 625
3005 }
3006 panels {
3007 key: "EYE"
3008 value: 622
3009 }
3010 panels {
3011 key: "FOUR"
3012 value: 624
3013 }
3014 panels {
3015 key: "HAVE"
3016 value: 623
3017 }
3018 panels {
3019 key: "TEN"
3020 value: 626
3021 }
3022 }
3023 }
3024 rooms {
3025 key: "Question Room How"
3026 value {
3027 panels {
3028 key: "QUESTION"
3029 value: 615
3030 }
3031 }
3032 }
3033 rooms {
3034 key: "Question Room What"
3035 value {
3036 panels {
3037 key: "QUESTION"
3038 value: 603
3039 }
3040 }
3041 }
3042 rooms {
3043 key: "Question Room When"
3044 value {
3045 panels {
3046 key: "QUESTION"
3047 value: 551
3048 }
3049 }
3050 }
3051 rooms {
3052 key: "Question Room Who"
3053 value {
3054 panels {
3055 key: "QUESTION"
3056 value: 532
3057 }
3058 }
3059 }
3060 rooms {
3061 key: "Under Question Room"
3062 value {
3063 panels {
3064 key: "QUESTION"
3065 value: 602
3066 }
3067 }
3068 }
3069 rooms {
3070 key: "West Side"
3071 value {
3072 panels {
3073 key: "CLUE"
3074 value: 576
3075 }
3076 panels {
3077 key: "COLOR"
3078 value: 575
3079 }
3080 panels {
3081 key: "ERASE"
3082 value: 570
3083 }
3084 panels {
3085 key: "FLAVORS"
3086 value: 574
3087 }
3088 panels {
3089 key: "RIGHT"
3090 value: 572
3091 }
3092 panels {
3093 key: "SAVORY"
3094 value: 573
3095 }
3096 panels {
3097 key: "TEACH"
3098 value: 571
3099 }
3100 }
3101 }
3102 rooms {
3103 key: "Whole Room"
3104 value {
3105 panels {
3106 key: "BATHROOM"
3107 value: 585
3108 }
3109 panels {
3110 key: "BEDROOM"
3111 value: 584
3112 }
3113 panels {
3114 key: "BLEACHER"
3115 value: 590
3116 }
3117 panels {
3118 key: "CAFETERIA"
3119 value: 588
3120 }
3121 panels {
3122 key: "CHIPS"
3123 value: 600
3124 }
3125 panels {
3126 key: "CONCESSIONS"
3127 value: 593
3128 }
3129 panels {
3130 key: "DICE"
3131 value: 598
3132 }
3133 panels {
3134 key: "GATE"
3135 value: 595
3136 }
3137 panels {
3138 key: "HOME (1)"
3139 value: 596
3140 }
3141 panels {
3142 key: "HOME (2)"
3143 value: 597
3144 }
3145 panels {
3146 key: "LINE"
3147 value: 592
3148 }
3149 panels {
3150 key: "LOBBY"
3151 value: 587
3152 }
3153 panels {
3154 key: "MACHINE"
3155 value: 591
3156 }
3157 panels {
3158 key: "MOAT"
3159 value: 599
3160 }
3161 panels {
3162 key: "OFFICE"
3163 value: 580
3164 }
3165 panels {
3166 key: "PHARMACY"
3167 value: 586
3168 }
3169 panels {
3170 key: "RAFTER"
3171 value: 581
3172 }
3173 panels {
3174 key: "REGISTER"
3175 value: 582
3176 }
3177 panels {
3178 key: "ROOM"
3179 value: 589
3180 }
3181 panels {
3182 key: "SHELF"
3183 value: 583
3184 }
3185 panels {
3186 key: "STALL"
3187 value: 579
3188 }
3189 panels {
3190 key: "TOWER"
3191 value: 601
3192 }
3193 panels {
3194 key: "VAULT"
3195 value: 578
3196 }
3197 panels {
3198 key: "WALL"
3199 value: 594
3200 }
3201 }
3202 }
3203 rooms {
3204 key: "Zero Room"
3205 value {
3206 panels {
3207 key: "HERO"
3208 value: 617
3209 }
3210 panels {
3211 key: "MANY"
3212 value: 618
3213 }
3214 panels {
3215 key: "MIDDLE"
3216 value: 621
3217 }
3218 panels {
3219 key: "REMAINING"
3220 value: 620
3221 }
3222 panels {
3223 key: "SHIFT"
3224 value: 619
3225 }
3226 }
3227 }
3228 }
3229}
3230letters {
3231 key: "a1"
3232 value: 577
3233}
2275letters { 3234letters {
2276 key: "a2" 3235 key: "a2"
2277 value: 278 3236 value: 278
@@ -2297,6 +3256,10 @@ letters {
2297 value: 401 3256 value: 401
2298} 3257}
2299letters { 3258letters {
3259 key: "g1"
3260 value: 614
3261}
3262letters {
2300 key: "g2" 3263 key: "g2"
2301 value: 304 3264 value: 304
2302} 3265}
@@ -2340,3 +3303,7 @@ letters {
2340 key: "x1" 3303 key: "x1"
2341 value: 197 3304 value: 197
2342} 3305}
3306letters {
3307 key: "y1"
3308 value: 549
3309}