summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2025-03-26 20:32:39 -0400
committerGitHub <noreply@github.com>2025-03-27 01:32:39 +0100
commit93fd4adda9d5aaf63460f0e98a04ebd3291352b8 (patch)
treedec0a2bf112638a0370af5de8f4e0f8f13174f7f
parenta834180195305fe0be91bd0ced5b75de104b7520 (diff)
downloadlingo-apworld-main.tar.gz
lingo-apworld-main.tar.bz2
lingo-apworld-main.zip
Lingo: Add painting display names (#4707) HEAD main
* Lingo: Add painting display names

* Reordered some paintings

* Update generated.dat
-rw-r--r--data/LL1.yaml149
-rw-r--r--data/generated.datbin149504 -> 149504 bytes
-rw-r--r--utils/validate_config.rb6
3 files changed, 126 insertions, 29 deletions
diff --git a/data/LL1.yaml b/data/LL1.yaml index 3783b68..6410ffe 100644 --- a/data/LL1.yaml +++ b/data/LL1.yaml
@@ -100,6 +100,8 @@
100 # paintings is an array of paintings in the room. This is used for painting 100 # paintings is an array of paintings in the room. This is used for painting
101 # shuffling. 101 # shuffling.
102 # - id: The internal painting ID from the LINGO map. 102 # - id: The internal painting ID from the LINGO map.
103 # - display_name: The name of the painting location when showed in the
104 # tracker. Not needed for disabled paintings.
103 # - enter_only: If true, painting shuffling will not place a warp exit on 105 # - enter_only: If true, painting shuffling will not place a warp exit on
104 # this painting. 106 # this painting.
105 # - exit_only: If true, painting shuffling will not place a warp entrance 107 # - exit_only: If true, painting shuffling will not place a warp entrance
@@ -226,6 +228,7 @@
226 - HIDDEN 228 - HIDDEN
227 paintings: 229 paintings:
228 - id: arrows_painting 230 - id: arrows_painting
231 display_name: Overhead Painting
229 exit_only: True 232 exit_only: True
230 orientation: south 233 orientation: south
231 - id: arrows_painting2 234 - id: arrows_painting2
@@ -234,7 +237,24 @@
234 - id: arrows_painting3 237 - id: arrows_painting3
235 disable: True 238 disable: True
236 move: True 239 move: True
240 - id: symmetry_painting_a_starter
241 display_name: Left Near Painting
242 enter_only: True
243 orientation: west
244 move: True
245 required_door:
246 room: The Wondrous (Doorknob)
247 door: Painting Shortcut
248 - id: eyes_yellow_painting2
249 display_name: Left Far Painting
250 enter_only: True
251 orientation: west
252 move: True
253 required_door:
254 room: Outside The Agreeable
255 door: Painting Shortcut
237 - id: garden_painting_tower2 256 - id: garden_painting_tower2
257 display_name: Front Left Painting
238 enter_only: True 258 enter_only: True
239 orientation: north 259 orientation: north
240 move: True 260 move: True
@@ -242,20 +262,15 @@
242 room: Hedge Maze 262 room: Hedge Maze
243 door: Painting Shortcut 263 door: Painting Shortcut
244 - id: flower_painting_8 264 - id: flower_painting_8
265 display_name: Front Right Painting
245 enter_only: True 266 enter_only: True
246 orientation: north 267 orientation: north
247 move: True 268 move: True
248 required_door: 269 required_door:
249 room: Courtyard 270 room: Courtyard
250 door: Painting Shortcut 271 door: Painting Shortcut
251 - id: symmetry_painting_a_starter
252 enter_only: True
253 orientation: west
254 move: True
255 required_door:
256 room: The Wondrous (Doorknob)
257 door: Painting Shortcut
258 - id: pencil_painting6 272 - id: pencil_painting6
273 display_name: Right Far Painting
259 enter_only: True 274 enter_only: True
260 orientation: east 275 orientation: east
261 move: True 276 move: True
@@ -263,19 +278,13 @@
263 room: Outside The Bold 278 room: Outside The Bold
264 door: Painting Shortcut 279 door: Painting Shortcut
265 - id: blueman_painting_3 280 - id: blueman_painting_3
281 display_name: Right Near Painting
266 enter_only: True 282 enter_only: True
267 orientation: east 283 orientation: east
268 move: True 284 move: True
269 required_door: 285 required_door:
270 room: Outside The Undeterred 286 room: Outside The Undeterred
271 door: Painting Shortcut 287 door: Painting Shortcut
272 - id: eyes_yellow_painting2
273 enter_only: True
274 orientation: west
275 move: True
276 required_door:
277 room: Outside The Agreeable
278 door: Painting Shortcut
279 Hidden Room: 288 Hidden Room:
280 entrances: 289 entrances:
281 Starting Room: 290 Starting Room:
@@ -340,6 +349,7 @@
340 - OPEN 349 - OPEN
341 paintings: 350 paintings:
342 - id: owl_painting 351 - id: owl_painting
352 display_name: Painting
343 orientation: north 353 orientation: north
344 The Seeker: 354 The Seeker:
345 entrances: 355 entrances:
@@ -599,6 +609,7 @@
599 - OPEN 609 - OPEN
600 paintings: 610 paintings:
601 - id: maze_painting 611 - id: maze_painting
612 display_name: Near Traveled Painting
602 orientation: west 613 orientation: west
603 sunwarps: 614 sunwarps:
604 - dots: 1 615 - dots: 1
@@ -630,6 +641,7 @@
630 door: Eights 641 door: Eights
631 paintings: 642 paintings:
632 - id: smile_painting_6 643 - id: smile_painting_6
644 display_name: Painting
633 orientation: north 645 orientation: north
634 Sunwarps: 646 Sunwarps:
635 # This is a special, meta-ish room. 647 # This is a special, meta-ish room.
@@ -968,6 +980,7 @@
968 required_door: 980 required_door:
969 door: Eye Wall 981 door: Eye Wall
970 - id: smile_painting_4 982 - id: smile_painting_4
983 display_name: Near Discerning Painting
971 orientation: south 984 orientation: south
972 sunwarps: 985 sunwarps:
973 - dots: 1 986 - dots: 1
@@ -1068,6 +1081,7 @@
1068 tag: midwhite 1081 tag: midwhite
1069 paintings: 1082 paintings:
1070 - id: west_afar 1083 - id: west_afar
1084 display_name: Painting
1071 orientation: south 1085 orientation: south
1072 The Tenacious: 1086 The Tenacious:
1073 entrances: 1087 entrances:
@@ -1392,6 +1406,7 @@
1392 - RIGHT 1406 - RIGHT
1393 paintings: 1407 paintings:
1394 - id: eyes_yellow_painting 1408 - id: eyes_yellow_painting
1409 display_name: Near Hallway Painting
1395 orientation: east 1410 orientation: east
1396 sunwarps: 1411 sunwarps:
1397 - dots: 6 1412 - dots: 6
@@ -1451,6 +1466,7 @@
1451 - FIRE 1466 - FIRE
1452 paintings: 1467 paintings:
1453 - id: pencil_painting7 1468 - id: pencil_painting7
1469 display_name: Compass Room Painting
1454 orientation: north 1470 orientation: north
1455 Dread Hallway: 1471 Dread Hallway:
1456 entrances: 1472 entrances:
@@ -1698,6 +1714,7 @@
1698 - GAZE 1714 - GAZE
1699 paintings: 1715 paintings:
1700 - id: garden_painting_tower 1716 - id: garden_painting_tower
1717 display_name: Painting
1701 orientation: north 1718 orientation: north
1702 The Fearless (First Floor): 1719 The Fearless (First Floor):
1703 entrances: 1720 entrances:
@@ -2077,6 +2094,7 @@
2077 panel: A 2094 panel: A
2078 paintings: 2095 paintings:
2079 - id: crown_painting 2096 - id: crown_painting
2097 display_name: Near Achievement Painting
2080 orientation: east 2098 orientation: east
2081 Eight Alcove: 2099 Eight Alcove:
2082 entrances: 2100 entrances:
@@ -2088,6 +2106,7 @@
2088 door: Eight Door (Outside The Initiated) 2106 door: Eight Door (Outside The Initiated)
2089 paintings: 2107 paintings:
2090 - id: eight_painting2 2108 - id: eight_painting2
2109 display_name: Eight Alcove Painting
2091 orientation: north 2110 orientation: north
2092 Eight Room: 2111 Eight Room:
2093 entrances: 2112 entrances:
@@ -2108,6 +2127,7 @@
2108 tag: forbid 2127 tag: forbid
2109 paintings: 2128 paintings:
2110 - id: eight_painting 2129 - id: eight_painting
2130 display_name: Eight Room Painting
2111 orientation: south 2131 orientation: south
2112 exit_only: True 2132 exit_only: True
2113 required: True 2133 required: True
@@ -2340,8 +2360,10 @@
2340 panel: YELLOW 2360 panel: YELLOW
2341 paintings: 2361 paintings:
2342 - id: arrows_painting_6 2362 - id: arrows_painting_6
2363 display_name: Left Painting
2343 orientation: east 2364 orientation: east
2344 - id: flower_painting_5 2365 - id: flower_painting_5
2366 display_name: Right Painting
2345 orientation: south 2367 orientation: south
2346 sunwarps: 2368 sunwarps:
2347 - dots: 2 2369 - dots: 2
@@ -2430,6 +2452,7 @@
2430 door: Eights 2452 door: Eights
2431 paintings: 2453 paintings:
2432 - id: smile_painting_8 2454 - id: smile_painting_8
2455 display_name: Hot Crusts Painting
2433 orientation: north 2456 orientation: north
2434 sunwarps: 2457 sunwarps:
2435 - dots: 2 2458 - dots: 2
@@ -2531,10 +2554,13 @@
2531 - SIZE (Big) 2554 - SIZE (Big)
2532 paintings: 2555 paintings:
2533 - id: hi_solved_painting3 2556 - id: hi_solved_painting3
2557 display_name: Cellar Replica Painting
2534 orientation: south 2558 orientation: south
2535 - id: hi_solved_painting2 2559 - id: hi_solved_painting2
2560 display_name: Cellar Painting
2536 orientation: south 2561 orientation: south
2537 - id: east_afar 2562 - id: east_afar
2563 display_name: Seasons Area Painting
2538 orientation: north 2564 orientation: north
2539 Orange Tower Sixth Floor: 2565 Orange Tower Sixth Floor:
2540 entrances: 2566 entrances:
@@ -2546,25 +2572,35 @@
2546 painting: True 2572 painting: True
2547 paintings: 2573 paintings:
2548 - id: arrows_painting_10 2574 - id: arrows_painting_10
2575 display_name: Back Left Painting
2549 orientation: east 2576 orientation: east
2550 - id: owl_painting_3
2551 orientation: north
2552 - id: clock_painting
2553 orientation: west
2554 - id: scenery_painting_5d_2 2577 - id: scenery_painting_5d_2
2578 display_name: Left Near Painting
2555 orientation: south 2579 orientation: south
2556 - id: symmetry_painting_b_7
2557 orientation: north
2558 - id: panda_painting_2 2580 - id: panda_painting_2
2581 display_name: Left Middle Painting
2559 orientation: south 2582 orientation: south
2560 - id: crown_painting2
2561 orientation: north
2562 - id: colors_painting2 2583 - id: colors_painting2
2584 display_name: Left Far Painting
2563 orientation: south 2585 orientation: south
2564 - id: cherry_painting2 2586 - id: clock_painting
2565 orientation: east 2587 display_name: Front Left Painting
2588 orientation: west
2566 - id: hi_solved_painting 2589 - id: hi_solved_painting
2590 display_name: Front Right Painting
2567 orientation: west 2591 orientation: west
2592 - id: crown_painting2
2593 display_name: Right Far Painting
2594 orientation: north
2595 - id: owl_painting_3
2596 display_name: Right Middle Painting
2597 orientation: north
2598 - id: symmetry_painting_b_7
2599 display_name: Right Near Painting
2600 orientation: north
2601 - id: cherry_painting2
2602 display_name: Back Right Painting
2603 orientation: east
2568 Ending Area: 2604 Ending Area:
2569 entrances: 2605 entrances:
2570 Orange Tower Sixth Floor: 2606 Orange Tower Sixth Floor:
@@ -2660,6 +2696,7 @@
2660 panel: MASTERY 2696 panel: MASTERY
2661 paintings: 2697 paintings:
2662 - id: map_painting2 2698 - id: map_painting2
2699 display_name: Painting
2663 orientation: north 2700 orientation: north
2664 enter_only: True # otherwise you might just skip the whole game! 2701 enter_only: True # otherwise you might just skip the whole game!
2665 req_blocked_when_no_doors: True # owl hallway in vanilla doors 2702 req_blocked_when_no_doors: True # owl hallway in vanilla doors
@@ -2755,6 +2792,7 @@
2755 non_counting: True 2792 non_counting: True
2756 paintings: 2793 paintings:
2757 - id: arrows_painting_11 2794 - id: arrows_painting_11
2795 display_name: Painting
2758 orientation: east 2796 orientation: east
2759 req_blocked_when_no_doors: True # owl hallway in vanilla doors 2797 req_blocked_when_no_doors: True # owl hallway in vanilla doors
2760 Courtyard: 2798 Courtyard:
@@ -2817,6 +2855,7 @@
2817 panel: GREEN 2855 panel: GREEN
2818 paintings: 2856 paintings:
2819 - id: flower_painting_7 2857 - id: flower_painting_7
2858 display_name: Courtyard Painting
2820 orientation: north 2859 orientation: north
2821 Yellow Backside Area: 2860 Yellow Backside Area:
2822 entrances: 2861 entrances:
@@ -2838,6 +2877,7 @@
2838 door: Nines 2877 door: Nines
2839 paintings: 2878 paintings:
2840 - id: blueman_painting 2879 - id: blueman_painting
2880 display_name: Near Nine Painting
2841 orientation: east 2881 orientation: east
2842 First Second Third Fourth: 2882 First Second Third Fourth:
2843 # We are separating this door + its panels into its own room because they 2883 # We are separating this door + its panels into its own room because they
@@ -3173,6 +3213,7 @@
3173 achievement: The Colorful 3213 achievement: The Colorful
3174 paintings: 3214 paintings:
3175 - id: arrows_painting_12 3215 - id: arrows_painting_12
3216 display_name: Painting
3176 orientation: north 3217 orientation: north
3177 progression: 3218 progression:
3178 Progressive Colorful: 3219 Progressive Colorful:
@@ -3296,13 +3337,17 @@
3296 - STRAYS 3337 - STRAYS
3297 paintings: 3338 paintings:
3298 - id: arrows_painting_8 3339 - id: arrows_painting_8
3340 display_name: Near Maze Painting
3299 orientation: south 3341 orientation: south
3300 - id: maze_painting_2 3342 - id: maze_painting_2
3343 display_name: Maze Side Middle Painting
3301 orientation: north 3344 orientation: north
3302 - id: owl_painting_2 3345 - id: owl_painting_2
3346 display_name: Orange Side Middle Painting
3303 orientation: south 3347 orientation: south
3304 required_when_no_doors: True 3348 required_when_no_doors: True
3305 - id: clock_painting_4 3349 - id: clock_painting_4
3350 display_name: Near Orange Painting
3306 orientation: north 3351 orientation: north
3307 Outside The Initiated: 3352 Outside The Initiated:
3308 entrances: 3353 entrances:
@@ -3490,8 +3535,10 @@
3490 - OXEN 3535 - OXEN
3491 paintings: 3536 paintings:
3492 - id: clock_painting_5 3537 - id: clock_painting_5
3538 display_name: Brown Puzzles Painting
3493 orientation: east 3539 orientation: east
3494 - id: smile_painting_1 3540 - id: smile_painting_1
3541 display_name: Near Eight Painting
3495 orientation: north 3542 orientation: north
3496 sunwarps: 3543 sunwarps:
3497 - dots: 3 3544 - dots: 3
@@ -3866,8 +3913,10 @@
3866 - BEGIN 3913 - BEGIN
3867 paintings: 3914 paintings:
3868 - id: pencil_painting2 3915 - id: pencil_painting2
3916 display_name: Near Bold Painting
3869 orientation: west 3917 orientation: west
3870 - id: north_missing2 3918 - id: north_missing2
3919 display_name: Directions Area Painting
3871 orientation: north 3920 orientation: north
3872 The Bold: 3921 The Bold:
3873 entrances: 3922 entrances:
@@ -4189,12 +4238,14 @@
4189 panel: FOUR 4238 panel: FOUR
4190 paintings: 4239 paintings:
4191 - id: maze_painting_3 4240 - id: maze_painting_3
4241 display_name: Near Four Painting
4192 enter_only: True 4242 enter_only: True
4193 orientation: north 4243 orientation: north
4194 move: True 4244 move: True
4195 required_door: 4245 required_door:
4196 door: Green Painting 4246 door: Green Painting
4197 - id: blueman_painting_2 4247 - id: blueman_painting_2
4248 display_name: Near Undeterred Painting
4198 orientation: east 4249 orientation: east
4199 sunwarps: 4250 sunwarps:
4200 - dots: 4 4251 - dots: 4
@@ -4557,6 +4608,7 @@
4557 panel: NINE 4608 panel: NINE
4558 paintings: 4609 paintings:
4559 - id: smile_painting_5 4610 - id: smile_painting_5
4611 display_name: Near Eight Painting
4560 enter_only: True 4612 enter_only: True
4561 orientation: east 4613 orientation: east
4562 required_door: 4614 required_door:
@@ -4742,10 +4794,13 @@
4742 - LEARN 4794 - LEARN
4743 paintings: 4795 paintings:
4744 - id: smile_painting_7 4796 - id: smile_painting_7
4797 display_name: Near Turn/Return Painting
4745 orientation: south 4798 orientation: south
4746 - id: flower_painting_4 4799 - id: flower_painting_4
4800 display_name: Back Area Right Painting
4747 orientation: south 4801 orientation: south
4748 - id: pencil_painting3 4802 - id: pencil_painting3
4803 display_name: Back Area Left Painting
4749 enter_only: True 4804 enter_only: True
4750 orientation: east 4805 orientation: east
4751 move: True 4806 move: True
@@ -4753,8 +4808,10 @@
4753 room: Number Hunt 4808 room: Number Hunt
4754 door: First Six 4809 door: First Six
4755 - id: boxes_painting 4810 - id: boxes_painting
4811 display_name: Near Directions Painting
4756 orientation: south 4812 orientation: south
4757 - id: cherry_painting 4813 - id: cherry_painting
4814 display_name: Alcove Painting
4758 orientation: east 4815 orientation: east
4759 sunwarps: 4816 sunwarps:
4760 - dots: 6 4817 - dots: 6
@@ -4848,8 +4905,10 @@
4848 - GREEN 4905 - GREEN
4849 paintings: 4906 paintings:
4850 - id: arrows_painting_7 4907 - id: arrows_painting_7
4908 display_name: Near Sunwarp Painting
4851 orientation: east 4909 orientation: east
4852 - id: fruitbowl_painting3 4910 - id: fruitbowl_painting3
4911 display_name: Hidden Painting
4853 orientation: west 4912 orientation: west
4854 enter_only: True 4913 enter_only: True
4855 required_door: 4914 required_door:
@@ -4888,6 +4947,7 @@
4888 tag: forbid 4947 tag: forbid
4889 paintings: 4948 paintings:
4890 - id: colors_painting 4949 - id: colors_painting
4950 display_name: Painting
4891 orientation: south 4951 orientation: south
4892 The Bearer: 4952 The Bearer:
4893 entrances: 4953 entrances:
@@ -5369,6 +5429,7 @@
5369 panel: ANTECHAMBER 5429 panel: ANTECHAMBER
5370 paintings: 5430 paintings:
5371 - id: pencil_painting5 5431 - id: pencil_painting5
5432 display_name: Left Painting
5372 orientation: south 5433 orientation: south
5373 The Steady (Lemon): 5434 The Steady (Lemon):
5374 entrances: 5435 entrances:
@@ -5391,6 +5452,7 @@
5391 - MELON 5452 - MELON
5392 paintings: 5453 paintings:
5393 - id: pencil_painting4 5454 - id: pencil_painting4
5455 display_name: Right Painting
5394 orientation: south 5456 orientation: south
5395 The Steady (Topaz): 5457 The Steady (Topaz):
5396 entrances: 5458 entrances:
@@ -6012,6 +6074,7 @@
6012 panel: NIGHT 6074 panel: NIGHT
6013 paintings: 6075 paintings:
6014 - id: smile_painting_9 6076 - id: smile_painting_9
6077 display_name: Smiley Painting
6015 orientation: north 6078 orientation: north
6016 exit_only: True 6079 exit_only: True
6017 The Artistic (Panda): 6080 The Artistic (Panda):
@@ -6124,6 +6187,7 @@
6124 panel: BOWELS 6187 panel: BOWELS
6125 paintings: 6188 paintings:
6126 - id: panda_painting_3 6189 - id: panda_painting_3
6190 display_name: Panda Painting
6127 exit_only: True 6191 exit_only: True
6128 orientation: south 6192 orientation: south
6129 required_when_no_doors: True 6193 required_when_no_doors: True
@@ -6235,6 +6299,7 @@
6235 panel: THING 6299 panel: THING
6236 paintings: 6300 paintings:
6237 - id: boxes_painting2 6301 - id: boxes_painting2
6302 display_name: Lattice Painting
6238 orientation: south 6303 orientation: south
6239 exit_only: True 6304 exit_only: True
6240 required_when_no_doors: True 6305 required_when_no_doors: True
@@ -6344,6 +6409,7 @@
6344 panel: ROOT 6409 panel: ROOT
6345 paintings: 6410 paintings:
6346 - id: cherry_painting3 6411 - id: cherry_painting3
6412 display_name: Apple Painting
6347 orientation: north 6413 orientation: north
6348 exit_only: True 6414 exit_only: True
6349 required_when_no_doors: True 6415 required_when_no_doors: True
@@ -6490,8 +6556,10 @@
6490 - NEAR 6556 - NEAR
6491 paintings: 6557 paintings:
6492 - id: eye_painting_2 6558 - id: eye_painting_2
6559 display_name: Near Pillar Painting
6493 orientation: west 6560 orientation: west
6494 - id: smile_painting_2 6561 - id: smile_painting_2
6562 display_name: Near Window Painting
6495 orientation: north 6563 orientation: north
6496 Far Window: 6564 Far Window:
6497 entrances: 6565 entrances:
@@ -6512,6 +6580,7 @@
6512 door: Exit 6580 door: Exit
6513 paintings: 6581 paintings:
6514 - id: arrows_painting_5 6582 - id: arrows_painting_5
6583 display_name: Lobby Painting
6515 orientation: east 6584 orientation: east
6516 Outside The Wondrous: 6585 Outside The Wondrous:
6517 entrances: 6586 entrances:
@@ -6562,9 +6631,11 @@
6562 panel: SHRINK 6631 panel: SHRINK
6563 paintings: 6632 paintings:
6564 - id: symmetry_painting_a_1 6633 - id: symmetry_painting_a_1
6634 display_name: Doorknob Upper Painting
6565 orientation: east 6635 orientation: east
6566 exit_only: True 6636 exit_only: True
6567 - id: symmetry_painting_b_1 6637 - id: symmetry_painting_b_1
6638 display_name: Doorknob Lower Painting
6568 orientation: south 6639 orientation: south
6569 The Wondrous (Bookcase): 6640 The Wondrous (Bookcase):
6570 entrances: 6641 entrances:
@@ -6576,6 +6647,7 @@
6576 tag: midblue 6647 tag: midblue
6577 paintings: 6648 paintings:
6578 - id: symmetry_painting_a_3 6649 - id: symmetry_painting_a_3
6650 display_name: Bookcase Painting
6579 orientation: west 6651 orientation: west
6580 exit_only: True 6652 exit_only: True
6581 - id: symmetry_painting_b_3 6653 - id: symmetry_painting_b_3
@@ -6590,6 +6662,7 @@
6590 tag: midyellow 6662 tag: midyellow
6591 paintings: 6663 paintings:
6592 - id: symmetry_painting_a_5 6664 - id: symmetry_painting_a_5
6665 display_name: Chandelier Painting
6593 orientation: east 6666 orientation: east
6594 - id: symmetry_painting_b_5 6667 - id: symmetry_painting_b_5
6595 disable: True 6668 disable: True
@@ -6603,6 +6676,7 @@
6603 tag: botbrown 6676 tag: botbrown
6604 paintings: 6677 paintings:
6605 - id: symmetry_painting_b_4 6678 - id: symmetry_painting_b_4
6679 display_name: Window Painting
6606 orientation: north 6680 orientation: north
6607 exit_only: True 6681 exit_only: True
6608 - id: symmetry_painting_a_4 6682 - id: symmetry_painting_a_4
@@ -6627,8 +6701,10 @@
6627 tag: midyellow 6701 tag: midyellow
6628 paintings: 6702 paintings:
6629 - id: symmetry_painting_a_2 6703 - id: symmetry_painting_a_2
6704 display_name: Table Lower Painting
6630 orientation: west 6705 orientation: west
6631 - id: symmetry_painting_b_2 6706 - id: symmetry_painting_b_2
6707 display_name: Table Upper Painting
6632 orientation: south 6708 orientation: south
6633 exit_only: True 6709 exit_only: True
6634 required: True 6710 required: True
@@ -6669,6 +6745,7 @@
6669 - Achievement 6745 - Achievement
6670 paintings: 6746 paintings:
6671 - id: arrows_painting_9 6747 - id: arrows_painting_9
6748 display_name: Exit Painting
6672 enter_only: True 6749 enter_only: True
6673 orientation: south 6750 orientation: south
6674 move: True 6751 move: True
@@ -6676,9 +6753,11 @@
6676 door: Exit 6753 door: Exit
6677 req_blocked_when_no_doors: True # the wondrous (table) in vanilla doors 6754 req_blocked_when_no_doors: True # the wondrous (table) in vanilla doors
6678 - id: symmetry_painting_a_6 6755 - id: symmetry_painting_a_6
6756 display_name: Fireplace Upper Painting
6679 orientation: west 6757 orientation: west
6680 exit_only: True 6758 exit_only: True
6681 - id: symmetry_painting_b_6 6759 - id: symmetry_painting_b_6
6760 display_name: Fireplace Lower Painting
6682 orientation: north 6761 orientation: north
6683 req_blocked_when_no_doors: True # the wondrous (table) in vanilla doors 6762 req_blocked_when_no_doors: True # the wondrous (table) in vanilla doors
6684 Arrow Garden: 6763 Arrow Garden:
@@ -6700,6 +6779,7 @@
6700 tag: midwhite 6779 tag: midwhite
6701 paintings: 6780 paintings:
6702 - id: flower_painting_6 6781 - id: flower_painting_6
6782 display_name: Painting
6703 orientation: south 6783 orientation: south
6704 Hallway Room (1): 6784 Hallway Room (1):
6705 entrances: 6785 entrances:
@@ -6758,6 +6838,7 @@
6758 - TOWER 6838 - TOWER
6759 paintings: 6839 paintings:
6760 - id: panda_painting 6840 - id: panda_painting
6841 display_name: Painting
6761 orientation: south 6842 orientation: south
6762 progression: 6843 progression:
6763 Progressive Hallway Room: 6844 Progressive Hallway Room:
@@ -6945,6 +7026,7 @@
6945 tag: midwhite 7026 tag: midwhite
6946 paintings: 7027 paintings:
6947 - id: south_afar 7028 - id: south_afar
7029 display_name: Painting
6948 orientation: south 7030 orientation: south
6949 Outside The Wanderer: 7031 Outside The Wanderer:
6950 entrances: 7032 entrances:
@@ -7123,16 +7205,21 @@
7123 panels: 7205 panels:
7124 - ORDER 7206 - ORDER
7125 paintings: 7207 paintings:
7126 - id: smile_painting_3
7127 orientation: west
7128 - id: flower_painting_2 7208 - id: flower_painting_2
7209 display_name: Left Near Painting
7129 orientation: east 7210 orientation: east
7130 - id: scenery_painting_0a
7131 orientation: north
7132 - id: map_painting 7211 - id: map_painting
7212 display_name: Left Far Painting
7133 orientation: east 7213 orientation: east
7134 - id: fruitbowl_painting4 7214 - id: fruitbowl_painting4
7215 display_name: Center Front Painting
7135 orientation: south 7216 orientation: south
7217 - id: scenery_painting_0a
7218 display_name: Center Back Painting
7219 orientation: north
7220 - id: smile_painting_3
7221 display_name: Right Far Painting
7222 orientation: west
7136 progression: 7223 progression:
7137 Progressive Art Gallery: 7224 Progressive Art Gallery:
7138 doors: 7225 doors:
@@ -7493,6 +7580,7 @@
7493 panel: WORD 7580 panel: WORD
7494 paintings: 7581 paintings:
7495 - id: arrows_painting_3 7582 - id: arrows_painting_3
7583 display_name: Circle Painting
7496 orientation: north 7584 orientation: north
7497 Rhyme Room (Looped Square): 7585 Rhyme Room (Looped Square):
7498 entrances: 7586 entrances:
@@ -7675,6 +7763,7 @@
7675 - INNOVATIVE (Bottom) 7763 - INNOVATIVE (Bottom)
7676 paintings: 7764 paintings:
7677 - id: arrows_painting_4 7765 - id: arrows_painting_4
7766 display_name: Target Painting
7678 orientation: north 7767 orientation: north
7679 Room Room: 7768 Room Room:
7680 # This is a bit of a weird room. You can't really get to it from the roof. 7769 # This is a bit of a weird room. You can't really get to it from the roof.
@@ -7944,8 +8033,10 @@
7944 - CAT 8033 - CAT
7945 paintings: 8034 paintings:
7946 - id: arrows_painting_2 8035 - id: arrows_painting_2
8036 display_name: Left Painting
7947 orientation: east 8037 orientation: east
7948 - id: clock_painting_2 8038 - id: clock_painting_2
8039 display_name: Right Painting
7949 orientation: east 8040 orientation: east
7950 exit_only: True 8041 exit_only: True
7951 required: True 8042 required: True
@@ -8022,6 +8113,7 @@
8022 tag: midbrown 8113 tag: midbrown
8023 paintings: 8114 paintings:
8024 - id: clock_painting_3 8115 - id: clock_painting_3
8116 display_name: Painting
8025 orientation: east 8117 orientation: east
8026 req_blocked: True # outside the wise (with or without door shuffle) 8118 req_blocked: True # outside the wise (with or without door shuffle)
8027 The Red: 8119 The Red:
@@ -8492,6 +8584,7 @@
8492 - OPTICS 8584 - OPTICS
8493 paintings: 8585 paintings:
8494 - id: hi_solved_painting4 8586 - id: hi_solved_painting4
8587 display_name: Painting
8495 orientation: south 8588 orientation: south
8496 req_blocked_when_no_doors: True # owl hallway in vanilla doors 8589 req_blocked_when_no_doors: True # owl hallway in vanilla doors
8497 Challenge Room: 8590 Challenge Room:
diff --git a/data/generated.dat b/data/generated.dat index 646ce3b..14f5570 100644 --- a/data/generated.dat +++ b/data/generated.dat
Binary files differ
diff --git a/utils/validate_config.rb b/utils/validate_config.rb index 70f7fc2..2a765fb 100644 --- a/utils/validate_config.rb +++ b/utils/validate_config.rb
@@ -50,7 +50,7 @@ directives = Set["entrances", "panels", "doors", "panel_doors", "paintings", "su
50panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting", "hunt", "location_name"] 50panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting", "hunt", "location_name"]
51door_directives = Set["id", "painting_id", "panels", "item_name", "item_group", "location_name", "skip_location", "skip_item", "door_group", "include_reduce", "event", "warp_id"] 51door_directives = Set["id", "painting_id", "panels", "item_name", "item_group", "location_name", "skip_location", "skip_item", "door_group", "include_reduce", "event", "warp_id"]
52panel_door_directives = Set["panels", "item_name", "panel_group"] 52panel_door_directives = Set["panels", "item_name", "panel_group"]
53painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move", "req_blocked", "req_blocked_when_no_doors"] 53painting_directives = Set["id", "display_name", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move", "req_blocked", "req_blocked_when_no_doors"]
54 54
55non_counting = 0 55non_counting = 0
56 56
@@ -314,6 +314,10 @@ config.each do |room_name, room|
314 next 314 next
315 end 315 end
316 316
317 unless painting.include? "display_name" then
318 puts "#{room_name} - #{painting["id"] || "painting"} :::: Missing display name"
319 end
320
317 if painting.include?("orientation") then 321 if painting.include?("orientation") then
318 unless ["north", "south", "east", "west"].include? painting["orientation"] then 322 unless ["north", "south", "east", "west"].include? painting["orientation"] then
319 puts "#{room_name} - #{painting["id"] || "painting"} :::: Invalid orientation #{painting["orientation"]}" 323 puts "#{room_name} - #{painting["id"] || "painting"} :::: Invalid orientation #{painting["orientation"]}"