From 710ff94e2d29e8a2c00846ab24062517ff91da3b Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Thu, 14 Aug 2025 17:50:51 -0400 Subject: Assigned IDs for the_hive, the_impressive, and the_invisible --- apworld/static_logic.py | 2 +- data/ids.txtpb | 300 ++++++++++++++++++++++++++++ data/maps/the_entry/connections.txtpb | 6 +- data/maps/the_extravagant/connections.txtpb | 5 + data/maps/the_great/doors.txtpb | 4 +- 5 files changed, 311 insertions(+), 6 deletions(-) diff --git a/apworld/static_logic.py b/apworld/static_logic.py index af1e985..5414c91 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py @@ -26,7 +26,7 @@ class Lingo2StaticLogic: self.item_id_to_name[door.ap_id] = item_name for letter in self.objects.letters: - letter_name = f"{letter.key.upper()}{'' if letter.level2 else '2'}" + letter_name = f"{letter.key.upper()}{'2' if letter.level2 else '1'}" location_name = f"{self.objects.maps[self.objects.rooms[letter.room_id].map_id].name} - {letter_name}" self.location_id_to_name[letter.ap_id] = location_name diff --git a/data/ids.txtpb b/data/ids.txtpb index 9220998..5428bca 100644 --- a/data/ids.txtpb +++ b/data/ids.txtpb @@ -3227,6 +3227,294 @@ maps { } } } +maps { + key: "the_hive" + value { + doors { + key: "Room 8 Door" + value: 640 + } + rooms { + key: "Main Area" + value { + panels { + key: "AD" + value: 656 + } + panels { + key: "ANTENNA" + value: 676 + } + panels { + key: "ASP" + value: 641 + } + panels { + key: "AT" + value: 650 + } + panels { + key: "ATE" + value: 658 + } + panels { + key: "BEE" + value: 664 + } + panels { + key: "BEEF" + value: 678 + } + panels { + key: "CASE" + value: 672 + } + panels { + key: "COAT" + value: 670 + } + panels { + key: "COFFEE" + value: 677 + } + panels { + key: "COWARDLY" + value: 669 + } + panels { + key: "CURE" + value: 659 + } + panels { + key: "DEN" + value: 655 + } + panels { + key: "EEL" + value: 661 + } + panels { + key: "EYE" + value: 648 + } + panels { + key: "EYES" + value: 674 + } + panels { + key: "FLAXEN" + value: 671 + } + panels { + key: "HONE" + value: 645 + } + panels { + key: "HORN" + value: 642 + } + panels { + key: "JACK" + value: 652 + } + panels { + key: "LEGS" + value: 673 + } + panels { + key: "LOW (1)" + value: 651 + } + panels { + key: "LOW (2)" + value: 653 + } + panels { + key: "MOO" + value: 646 + } + panels { + key: "NET" + value: 643 + } + panels { + key: "OWE" + value: 654 + } + panels { + key: "PAR" + value: 660 + } + panels { + key: "PER" + value: 663 + } + panels { + key: "PETAL" + value: 666 + } + panels { + key: "PLANTS" + value: 668 + } + panels { + key: "QUIT" + value: 647 + } + panels { + key: "SIR" + value: 662 + } + panels { + key: "SITE" + value: 657 + } + panels { + key: "SOIL" + value: 667 + } + panels { + key: "STEM" + value: 665 + } + panels { + key: "WAS" + value: 644 + } + panels { + key: "WINGS" + value: 675 + } + panels { + key: "YELL" + value: 649 + } + } + } + rooms { + key: "Mastery Room" + value { + masteries { + key: "MASTERY" + value: 683 + } + } + } + rooms { + key: "Room 8" + value { + panels { + key: "BUMBLE" + value: 679 + } + panels { + key: "CARPENTER" + value: 680 + } + panels { + key: "CLOVER" + value: 681 + } + panels { + key: "WILDFLOWER" + value: 682 + } + } + } + } +} +maps { + key: "the_impressive" + value { + doors { + key: "Control Center Green Door" + value: 629 + } + doors { + key: "Front Door" + value: 627 + } + doors { + key: "Side Door" + value: 628 + } + rooms { + key: "Green Eye" + value { + panels { + key: "LEFT" + value: 637 + } + panels { + key: "RETURN" + value: 635 + } + panels { + key: "TO" + value: 636 + } + } + } + rooms { + key: "Lobby" + value { + panels { + key: "RIGHT" + value: 630 + } + } + } + rooms { + key: "Side Area" + value { + panels { + key: "COLOR" + value: 631 + } + } + } + rooms { + key: "WM Room" + value { + panels { + key: "LEFT" + value: 632 + } + panels { + key: "RIGHT" + value: 633 + } + } + } + } +} +maps { + key: "the_invisible" + value { + doors { + key: "Maze Entrance" + value: 684 + } + rooms { + key: "Entrance" + value { + panels { + key: "VISIBLE" + value: 685 + } + } + } + rooms { + key: "Maze" + value { + masteries { + key: "MASTERY" + value: 686 + } + } + } + } +} letters { key: "a1" value: 577 @@ -3275,6 +3563,14 @@ letters { key: "l1" value: 190 } +letters { + key: "m1" + value: 638 +} +letters { + key: "m2" + value: 634 +} letters { key: "n1" value: 232 @@ -3299,6 +3595,10 @@ letters { key: "u1" value: 356 } +letters { + key: "w1" + value: 639 +} letters { key: "x1" value: 197 diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb index fd1c729..5171a76 100644 --- a/data/maps/the_entry/connections.txtpb +++ b/data/maps/the_entry/connections.txtpb @@ -90,7 +90,7 @@ connections { } connections { from_room: "Red Blue Halls" - to_room: "Wrath Area" + to_room: "Wrath Room" door { name: "Noon Door" } } connections { @@ -99,12 +99,12 @@ connections { door { name: "Scarf Door" } } connections { - from_room: "Wrath Area" + from_room: "Wrath Room" to_room: "Rabbit Hole" door { name: "Rabbithole Door" } } connections { - from_room: "Wrath Area" + from_room: "Wrath Room" to_room: "Blue Alcove" door { name: "Blue Alcove Entrance" } } diff --git a/data/maps/the_extravagant/connections.txtpb b/data/maps/the_extravagant/connections.txtpb index 50b65d5..777b3a8 100644 --- a/data/maps/the_extravagant/connections.txtpb +++ b/data/maps/the_extravagant/connections.txtpb @@ -143,3 +143,8 @@ connections { } oneway: true } +connections { + from_room: "Y Minus First Floor" + to_room: "E Room" + door { name: "E Door" } +} diff --git a/data/maps/the_great/doors.txtpb b/data/maps/the_great/doors.txtpb index ed8b111..463eaba 100644 --- a/data/maps/the_great/doors.txtpb +++ b/data/maps/the_great/doors.txtpb @@ -306,7 +306,7 @@ doors { panels { room: "Maze Cold Area" name: "COLD" } panels { room: "Maze In Area" name: "IN" } panels { room: "Maze Moon Area" name: "MOON" } - panels { room: "Maze Of Area" name: "OFF" } + panels { room: "Maze Off Area" name: "OFF" } panels { room: "Maze Slice Area" name: "SLICE" } panels { room: "Maze Smooth Area" name: "SMOOTH" } panels { room: "Maze South Area" name: "SOUTH" } @@ -327,7 +327,7 @@ doors { panels { room: "Maze Cold Area" name: "COLD" } panels { room: "Maze In Area" name: "IN" } panels { room: "Maze Moon Area" name: "MOON" } - panels { room: "Maze Of Area" name: "OFF" } + panels { room: "Maze Off Area" name: "OFF" } panels { room: "Maze Slice Area" name: "SLICE" } panels { room: "Maze Smooth Area" name: "SMOOTH" } panels { room: "Maze South Area" name: "SOUTH" } -- cgit 1.4.1