diff options
-rw-r--r-- | apworld/static_logic.py | 4 | ||||
-rw-r--r-- | data/ids.txtpb | 182 | ||||
-rw-r--r-- | data/maps/four_rooms/rooms/Examples Room.txtpb | 4 | ||||
-rw-r--r-- | data/maps/four_rooms/rooms/Intensify Room.txtpb | 4 | ||||
-rw-r--r-- | data/maps/four_rooms/rooms/Synonyms Room.txtpb | 4 |
5 files changed, 190 insertions, 8 deletions
diff --git a/apworld/static_logic.py b/apworld/static_logic.py index d3ed85c..db2af82 100644 --- a/apworld/static_logic.py +++ b/apworld/static_logic.py | |||
@@ -19,11 +19,11 @@ class Lingo2StaticLogic: | |||
19 | 19 | ||
20 | for door in self.objects.doors: | 20 | for door in self.objects.doors: |
21 | if door.type == common_pb2.DoorType.STANDARD: | 21 | if door.type == common_pb2.DoorType.STANDARD: |
22 | location_name = f"{self.objects.rooms[door.room_id].display_name} - {door.name}" | 22 | location_name = f"{self.objects.maps[door.map_id].name} - {door.name}" |
23 | self.location_id_to_name[door.ap_id] = location_name | 23 | self.location_id_to_name[door.ap_id] = location_name |
24 | 24 | ||
25 | if door.type != common_pb2.DoorType.EVENT: | 25 | if door.type != common_pb2.DoorType.EVENT: |
26 | item_name = f"{self.objects.rooms[door.room_id].display_name} - {door.name}" | 26 | item_name = f"{self.objects.maps[door.map_id].name} - {door.name}" |
27 | self.item_id_to_name[door.ap_id] = item_name | 27 | self.item_id_to_name[door.ap_id] = item_name |
28 | 28 | ||
29 | self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()} | 29 | self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()} |
diff --git a/data/ids.txtpb b/data/ids.txtpb index 423f503..613b793 100644 --- a/data/ids.txtpb +++ b/data/ids.txtpb | |||
@@ -1,4 +1,186 @@ | |||
1 | maps { | 1 | maps { |
2 | key: "four_rooms" | ||
3 | value { | ||
4 | doors { | ||
5 | key: "A2 Door" | ||
6 | value: 135 | ||
7 | } | ||
8 | doors { | ||
9 | key: "Examples Door" | ||
10 | value: 132 | ||
11 | } | ||
12 | doors { | ||
13 | key: "Intensify Door" | ||
14 | value: 131 | ||
15 | } | ||
16 | doors { | ||
17 | key: "Keyholder Door" | ||
18 | value: 136 | ||
19 | } | ||
20 | doors { | ||
21 | key: "Synonyms Door" | ||
22 | value: 133 | ||
23 | } | ||
24 | doors { | ||
25 | key: "Time Door" | ||
26 | value: 134 | ||
27 | } | ||
28 | rooms { | ||
29 | key: "Examples Room" | ||
30 | value { | ||
31 | panels { | ||
32 | key: "ART" | ||
33 | value: 160 | ||
34 | } | ||
35 | panels { | ||
36 | key: "EMOTION" | ||
37 | value: 156 | ||
38 | } | ||
39 | panels { | ||
40 | key: "SIZE" | ||
41 | value: 155 | ||
42 | } | ||
43 | panels { | ||
44 | key: "SONNET" | ||
45 | value: 158 | ||
46 | } | ||
47 | panels { | ||
48 | key: "SUPERLATIVE" | ||
49 | value: 157 | ||
50 | } | ||
51 | panels { | ||
52 | key: "URN" | ||
53 | value: 159 | ||
54 | } | ||
55 | } | ||
56 | } | ||
57 | rooms { | ||
58 | key: "Hallway" | ||
59 | value { | ||
60 | panels { | ||
61 | key: "HUNCHBACK" | ||
62 | value: 146 | ||
63 | } | ||
64 | panels { | ||
65 | key: "SUSPICION" | ||
66 | value: 145 | ||
67 | } | ||
68 | } | ||
69 | } | ||
70 | rooms { | ||
71 | key: "Intensify Room" | ||
72 | value { | ||
73 | panels { | ||
74 | key: "BETTER" | ||
75 | value: 151 | ||
76 | } | ||
77 | panels { | ||
78 | key: "INJURY" | ||
79 | value: 153 | ||
80 | } | ||
81 | panels { | ||
82 | key: "LARGE" | ||
83 | value: 149 | ||
84 | } | ||
85 | panels { | ||
86 | key: "LIKE" | ||
87 | value: 148 | ||
88 | } | ||
89 | panels { | ||
90 | key: "SMALL" | ||
91 | value: 147 | ||
92 | } | ||
93 | panels { | ||
94 | key: "SWAY" | ||
95 | value: 154 | ||
96 | } | ||
97 | panels { | ||
98 | key: "TERROR" | ||
99 | value: 150 | ||
100 | } | ||
101 | panels { | ||
102 | key: "TURN" | ||
103 | value: 152 | ||
104 | } | ||
105 | } | ||
106 | } | ||
107 | rooms { | ||
108 | key: "Synonyms Room" | ||
109 | value { | ||
110 | panels { | ||
111 | key: "ADORE" | ||
112 | value: 162 | ||
113 | } | ||
114 | panels { | ||
115 | key: "FRIGHT" | ||
116 | value: 164 | ||
117 | } | ||
118 | panels { | ||
119 | key: "FURY" | ||
120 | value: 168 | ||
121 | } | ||
122 | panels { | ||
123 | key: "MASSIVE" | ||
124 | value: 163 | ||
125 | } | ||
126 | panels { | ||
127 | key: "MINUTE" | ||
128 | value: 161 | ||
129 | } | ||
130 | panels { | ||
131 | key: "SERIOUS" | ||
132 | value: 167 | ||
133 | } | ||
134 | panels { | ||
135 | key: "SURPASS" | ||
136 | value: 165 | ||
137 | } | ||
138 | panels { | ||
139 | key: "VERSE" | ||
140 | value: 166 | ||
141 | } | ||
142 | } | ||
143 | } | ||
144 | rooms { | ||
145 | key: "Time Room" | ||
146 | value { | ||
147 | panels { | ||
148 | key: "BROODING" | ||
149 | value: 137 | ||
150 | } | ||
151 | panels { | ||
152 | key: "CARE" | ||
153 | value: 138 | ||
154 | } | ||
155 | panels { | ||
156 | key: "HOLE" | ||
157 | value: 143 | ||
158 | } | ||
159 | panels { | ||
160 | key: "LIFE" | ||
161 | value: 139 | ||
162 | } | ||
163 | panels { | ||
164 | key: "PRACTICE" | ||
165 | value: 141 | ||
166 | } | ||
167 | panels { | ||
168 | key: "RHYTHM" | ||
169 | value: 144 | ||
170 | } | ||
171 | panels { | ||
172 | key: "SUSPENSE" | ||
173 | value: 140 | ||
174 | } | ||
175 | panels { | ||
176 | key: "WRITING" | ||
177 | value: 142 | ||
178 | } | ||
179 | } | ||
180 | } | ||
181 | } | ||
182 | } | ||
183 | maps { | ||
2 | key: "the_entry" | 184 | key: "the_entry" |
3 | value { | 185 | value { |
4 | doors { | 186 | doors { |
diff --git a/data/maps/four_rooms/rooms/Examples Room.txtpb b/data/maps/four_rooms/rooms/Examples Room.txtpb index beb1238..ffbe74d 100644 --- a/data/maps/four_rooms/rooms/Examples Room.txtpb +++ b/data/maps/four_rooms/rooms/Examples Room.txtpb | |||
@@ -1,5 +1,5 @@ | |||
1 | name: Examples Room | 1 | name: "Examples Room" |
2 | display_name: Examples Room | 2 | display_name: "Examples Room" |
3 | panels { | 3 | panels { |
4 | name: "SIZE" | 4 | name: "SIZE" |
5 | path: "Panels/Room 2 Examples/entry_1" | 5 | path: "Panels/Room 2 Examples/entry_1" |
diff --git a/data/maps/four_rooms/rooms/Intensify Room.txtpb b/data/maps/four_rooms/rooms/Intensify Room.txtpb index 3c2ea89..e48dad9 100644 --- a/data/maps/four_rooms/rooms/Intensify Room.txtpb +++ b/data/maps/four_rooms/rooms/Intensify Room.txtpb | |||
@@ -1,5 +1,5 @@ | |||
1 | name: Intensify Room | 1 | name: "Intensify Room" |
2 | display_name: Intensify Room | 2 | display_name: "Intensify Room" |
3 | panels { | 3 | panels { |
4 | name: "SMALL" | 4 | name: "SMALL" |
5 | path: "Panels/Room 1 Intensify/entry_1" | 5 | path: "Panels/Room 1 Intensify/entry_1" |
diff --git a/data/maps/four_rooms/rooms/Synonyms Room.txtpb b/data/maps/four_rooms/rooms/Synonyms Room.txtpb index 0269be8..e418c0d 100644 --- a/data/maps/four_rooms/rooms/Synonyms Room.txtpb +++ b/data/maps/four_rooms/rooms/Synonyms Room.txtpb | |||
@@ -1,5 +1,5 @@ | |||
1 | name: Synonyms Room | 1 | name: "Synonyms Room" |
2 | display_name: Synonyms Room | 2 | display_name: "Synonyms Room" |
3 | panels { | 3 | panels { |
4 | name: "MINUTE" | 4 | name: "MINUTE" |
5 | path: "Panels/Room 3 Synonyms/entry_1" | 5 | path: "Panels/Room 3 Synonyms/entry_1" |