diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2023-11-16 05:12:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-16 04:12:44 -0600 |
commit | 86405cedd7d1a6f376862593dd0a72b6cd1e80a9 (patch) | |
tree | a3e727d4f93af5f3aa3f292cb2783aa580236689 | |
parent | 5d248f259a83909a714cc27a95bd7323000c6dc8 (diff) | |
download | lingo-apworld-86405cedd7d1a6f376862593dd0a72b6cd1e80a9.tar.gz lingo-apworld-86405cedd7d1a6f376862593dd0a72b6cd1e80a9.tar.bz2 lingo-apworld-86405cedd7d1a6f376862593dd0a72b6cd1e80a9.zip |
Lingo: Sync config with game update (#2447)
-rw-r--r-- | LL1.yaml | 30 | ||||
-rw-r--r-- | ids.yaml | 4 | ||||
-rw-r--r-- | utils/validate_config.rb | 2 |
3 files changed, 28 insertions, 8 deletions
diff --git a/LL1.yaml b/LL1.yaml index db1418f..f8b07b8 100644 --- a/LL1.yaml +++ b/LL1.yaml | |||
@@ -1650,7 +1650,9 @@ | |||
1650 | The Observant: True # Assuming that access to The Observant includes access to the right entrance | 1650 | The Observant: True # Assuming that access to The Observant includes access to the right entrance |
1651 | Eight Room: True | 1651 | Eight Room: True |
1652 | Eight Alcove: | 1652 | Eight Alcove: |
1653 | door: Eight Painting | 1653 | door: Eight Door |
1654 | Orange Tower Sixth Floor: | ||
1655 | painting: True | ||
1654 | panels: | 1656 | panels: |
1655 | Achievement: | 1657 | Achievement: |
1656 | id: Countdown Panels/Panel_incomparable_incomparable | 1658 | id: Countdown Panels/Panel_incomparable_incomparable |
@@ -1715,7 +1717,7 @@ | |||
1715 | colors: blue | 1717 | colors: blue |
1716 | tag: forbid | 1718 | tag: forbid |
1717 | doors: | 1719 | doors: |
1718 | Eight Painting: | 1720 | Eight Door: |
1719 | id: Red Blue Purple Room Area Doors/Door_a_strands | 1721 | id: Red Blue Purple Room Area Doors/Door_a_strands |
1720 | location_name: Giant Sevens | 1722 | location_name: Giant Sevens |
1721 | group: Observant Doors | 1723 | group: Observant Doors |
@@ -1725,11 +1727,17 @@ | |||
1725 | panel: I | 1727 | panel: I |
1726 | - room: Elements Area | 1728 | - room: Elements Area |
1727 | panel: A | 1729 | panel: A |
1730 | paintings: | ||
1731 | - id: crown_painting | ||
1732 | orientation: east | ||
1728 | Eight Alcove: | 1733 | Eight Alcove: |
1729 | entrances: | 1734 | entrances: |
1730 | The Incomparable: | 1735 | The Incomparable: |
1731 | room: The Incomparable | 1736 | room: The Incomparable |
1732 | door: Eight Painting | 1737 | door: Eight Door |
1738 | Outside The Initiated: | ||
1739 | room: Outside The Initiated | ||
1740 | door: Eight Door | ||
1733 | paintings: | 1741 | paintings: |
1734 | - id: eight_painting2 | 1742 | - id: eight_painting2 |
1735 | orientation: north | 1743 | orientation: north |
@@ -2126,7 +2134,7 @@ | |||
2126 | orientation: north | 2134 | orientation: north |
2127 | - id: panda_painting_2 | 2135 | - id: panda_painting_2 |
2128 | orientation: south | 2136 | orientation: south |
2129 | - id: pencil_painting | 2137 | - id: crown_painting2 |
2130 | orientation: north | 2138 | orientation: north |
2131 | - id: colors_painting2 | 2139 | - id: colors_painting2 |
2132 | orientation: south | 2140 | orientation: south |
@@ -2638,10 +2646,8 @@ | |||
2638 | Hub Room: True | 2646 | Hub Room: True |
2639 | Outside The Wondrous: True | 2647 | Outside The Wondrous: True |
2640 | Outside The Undeterred: True | 2648 | Outside The Undeterred: True |
2641 | Outside The Initiated: True | ||
2642 | Outside The Agreeable: True | 2649 | Outside The Agreeable: True |
2643 | Outside The Wanderer: True | 2650 | Outside The Wanderer: True |
2644 | Eight Alcove: True | ||
2645 | Orange Tower Fifth Floor: | 2651 | Orange Tower Fifth Floor: |
2646 | room: Orange Tower Fifth Floor | 2652 | room: Orange Tower Fifth Floor |
2647 | door: Welcome Back | 2653 | door: Welcome Back |
@@ -2713,6 +2719,8 @@ | |||
2713 | Orange Tower Fifth Floor: | 2719 | Orange Tower Fifth Floor: |
2714 | room: Art Gallery | 2720 | room: Art Gallery |
2715 | door: Exit | 2721 | door: Exit |
2722 | Eight Alcove: | ||
2723 | door: Eight Door | ||
2716 | panels: | 2724 | panels: |
2717 | SEVEN (1): | 2725 | SEVEN (1): |
2718 | id: Backside Room/Panel_seven_seven_5 | 2726 | id: Backside Room/Panel_seven_seven_5 |
@@ -2878,6 +2886,16 @@ | |||
2878 | panel: BACKSIDE | 2886 | panel: BACKSIDE |
2879 | - room: The Bearer | 2887 | - room: The Bearer |
2880 | panel: BACKSIDE | 2888 | panel: BACKSIDE |
2889 | Eight Door: | ||
2890 | id: Red Blue Purple Room Area Doors/Door_a_strands2 | ||
2891 | skip_location: True | ||
2892 | panels: | ||
2893 | - room: The Incomparable | ||
2894 | panel: I (Seven) | ||
2895 | - room: Courtyard | ||
2896 | panel: I | ||
2897 | - room: Elements Area | ||
2898 | panel: A | ||
2881 | paintings: | 2899 | paintings: |
2882 | - id: clock_painting_5 | 2900 | - id: clock_painting_5 |
2883 | orientation: east | 2901 | orientation: east |
diff --git a/ids.yaml b/ids.yaml index f48858a..1a1ceca 100644 --- a/ids.yaml +++ b/ids.yaml | |||
@@ -1098,7 +1098,7 @@ doors: | |||
1098 | item: 444474 | 1098 | item: 444474 |
1099 | location: 444569 | 1099 | location: 444569 |
1100 | The Incomparable: | 1100 | The Incomparable: |
1101 | Eight Painting: | 1101 | Eight Door: |
1102 | item: 444475 | 1102 | item: 444475 |
1103 | location: 445219 | 1103 | location: 445219 |
1104 | Orange Tower: | 1104 | Orange Tower: |
@@ -1219,6 +1219,8 @@ doors: | |||
1219 | Entrance: | 1219 | Entrance: |
1220 | item: 444516 | 1220 | item: 444516 |
1221 | location: 445237 | 1221 | location: 445237 |
1222 | Eight Door: | ||
1223 | item: 444578 | ||
1222 | The Traveled: | 1224 | The Traveled: |
1223 | Color Hallways Entrance: | 1225 | Color Hallways Entrance: |
1224 | item: 444517 | 1226 | item: 444517 |
diff --git a/utils/validate_config.rb b/utils/validate_config.rb index ed2e905..bed5188 100644 --- a/utils/validate_config.rb +++ b/utils/validate_config.rb | |||
@@ -42,7 +42,7 @@ door_groups = {} | |||
42 | directives = Set["entrances", "panels", "doors", "paintings", "progression"] | 42 | directives = Set["entrances", "panels", "doors", "paintings", "progression"] |
43 | panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting"] | 43 | panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting"] |
44 | door_directives = Set["id", "painting_id", "panels", "item_name", "location_name", "skip_location", "skip_item", "group", "include_reduce", "junk_item", "event"] | 44 | door_directives = Set["id", "painting_id", "panels", "item_name", "location_name", "skip_location", "skip_item", "group", "include_reduce", "junk_item", "event"] |
45 | painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move"] | 45 | painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move", "req_blocked", "req_blocked_when_no_doors"] |
46 | 46 | ||
47 | non_counting = 0 | 47 | non_counting = 0 |
48 | 48 | ||