summary refs log tree commit diff stats
path: root/data
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2024-05-22 20:09:52 -0400
committerGitHub <noreply@github.com>2024-05-23 02:09:52 +0200
commite41bdceb052334f2c86a78ba41411a9c85df7cc5 (patch)
tree617719d43319e041236d17b740924fa0ce9a1242 /data
parent808daa5b230aa0912671b263edc6de2c71b73a6a (diff)
downloadlingo-apworld-e41bdceb052334f2c86a78ba41411a9c85df7cc5.tar.gz
lingo-apworld-e41bdceb052334f2c86a78ba41411a9c85df7cc5.tar.bz2
lingo-apworld-e41bdceb052334f2c86a78ba41411a9c85df7cc5.zip
Lingo: Minor logic fixes (part 2) (#3250)
* Lingo: Minor logic fixes (part 2)

* Update the datafile

* Renamed Fearless Mastery

* Move Rhyme Room LEAP into upper room

* Rename Artistic achievement location

* Fix broken wondrous painting

* Added a test for the Wondrous painting thing
Diffstat (limited to 'data')
-rw-r--r--data/LL1.yaml13
-rw-r--r--data/generated.datbin135088 -> 136017 bytes
-rw-r--r--data/ids.yaml2
3 files changed, 10 insertions, 5 deletions
diff --git a/data/LL1.yaml b/data/LL1.yaml index c33cad3..4d6771a 100644 --- a/data/LL1.yaml +++ b/data/LL1.yaml
@@ -2052,6 +2052,7 @@
2052 door: Rhyme Room Entrance 2052 door: Rhyme Room Entrance
2053 Art Gallery: 2053 Art Gallery:
2054 warp: True 2054 warp: True
2055 Roof: True # by parkouring through the Bearer shortcut
2055 panels: 2056 panels:
2056 RED: 2057 RED:
2057 id: Color Arrow Room/Panel_red_afar 2058 id: Color Arrow Room/Panel_red_afar
@@ -2333,6 +2334,7 @@
2333 # This is the MASTERY on the other side of THE FEARLESS. It can only be 2334 # This is the MASTERY on the other side of THE FEARLESS. It can only be
2334 # accessed by jumping from the top of the tower. 2335 # accessed by jumping from the top of the tower.
2335 id: Master Room/Panel_mastery_mastery8 2336 id: Master Room/Panel_mastery_mastery8
2337 location_name: The Fearless - MASTERY
2336 tag: midwhite 2338 tag: midwhite
2337 hunt: True 2339 hunt: True
2338 required_door: 2340 required_door:
@@ -4098,6 +4100,7 @@
4098 Number Hunt: 4100 Number Hunt:
4099 room: Number Hunt 4101 room: Number Hunt
4100 door: Door to Directional Gallery 4102 door: Door to Directional Gallery
4103 Roof: True # through ceiling of sunwarp
4101 panels: 4104 panels:
4102 PEPPER: 4105 PEPPER:
4103 id: Backside Room/Panel_pepper_salt 4106 id: Backside Room/Panel_pepper_salt
@@ -5390,6 +5393,7 @@
5390 - The Artistic (Apple) 5393 - The Artistic (Apple)
5391 - The Artistic (Lattice) 5394 - The Artistic (Lattice)
5392 check: True 5395 check: True
5396 location_name: The Artistic - Achievement
5393 achievement: The Artistic 5397 achievement: The Artistic
5394 FINE: 5398 FINE:
5395 id: Ceiling Room/Panel_yellow_top_5 5399 id: Ceiling Room/Panel_yellow_top_5
@@ -6046,7 +6050,7 @@
6046 paintings: 6050 paintings:
6047 - id: symmetry_painting_a_5 6051 - id: symmetry_painting_a_5
6048 orientation: east 6052 orientation: east
6049 - id: symmetry_painting_a_5 6053 - id: symmetry_painting_b_5
6050 disable: True 6054 disable: True
6051 The Wondrous (Window): 6055 The Wondrous (Window):
6052 entrances: 6056 entrances:
@@ -6814,9 +6818,6 @@
6814 tag: syn rhyme 6818 tag: syn rhyme
6815 subtag: bot 6819 subtag: bot
6816 link: rhyme FALL 6820 link: rhyme FALL
6817 LEAP:
6818 id: Double Room/Panel_leap_leap
6819 tag: midwhite
6820 doors: 6821 doors:
6821 Exit: 6822 Exit:
6822 id: Double Room Area Doors/Door_room_exit 6823 id: Double Room Area Doors/Door_room_exit
@@ -7065,6 +7066,9 @@
7065 tag: syn rhyme 7066 tag: syn rhyme
7066 subtag: bot 7067 subtag: bot
7067 link: rhyme CREATIVE 7068 link: rhyme CREATIVE
7069 LEAP:
7070 id: Double Room/Panel_leap_leap
7071 tag: midwhite
7068 doors: 7072 doors:
7069 Door to Cross: 7073 Door to Cross:
7070 id: Double Room Area Doors/Door_room_4a 7074 id: Double Room Area Doors/Door_room_4a
@@ -7272,6 +7276,7 @@
7272 MASTERY: 7276 MASTERY:
7273 id: Master Room/Panel_mastery_mastery 7277 id: Master Room/Panel_mastery_mastery
7274 tag: midwhite 7278 tag: midwhite
7279 hunt: True
7275 required_door: 7280 required_door:
7276 room: Orange Tower Seventh Floor 7281 room: Orange Tower Seventh Floor
7277 door: Mastery 7282 door: Mastery
diff --git a/data/generated.dat b/data/generated.dat index 304109c..6c8c925 100644 --- a/data/generated.dat +++ b/data/generated.dat
Binary files differ
diff --git a/data/ids.yaml b/data/ids.yaml index 918af7a..1fa06d2 100644 --- a/data/ids.yaml +++ b/data/ids.yaml
@@ -766,7 +766,6 @@ panels:
766 BOUNCE: 445010 766 BOUNCE: 445010
767 SCRAWL: 445011 767 SCRAWL: 445011
768 PLUNGE: 445012 768 PLUNGE: 445012
769 LEAP: 445013
770 Rhyme Room (Circle): 769 Rhyme Room (Circle):
771 BIRD: 445014 770 BIRD: 445014
772 LETTER: 445015 771 LETTER: 445015
@@ -790,6 +789,7 @@ panels:
790 GEM: 445031 789 GEM: 445031
791 INNOVATIVE (Top): 445032 790 INNOVATIVE (Top): 445032
792 INNOVATIVE (Bottom): 445033 791 INNOVATIVE (Bottom): 445033
792 LEAP: 445013
793 Room Room: 793 Room Room:
794 DOOR (1): 445034 794 DOOR (1): 445034
795 DOOR (2): 445035 795 DOOR (2): 445035