diff options
| -rw-r--r-- | data/connections.txtpb | 52 | ||||
| -rw-r--r-- | data/ids.yaml | 22 | ||||
| -rw-r--r-- | data/maps/the_partial/connections.txtpb | 2 | ||||
| -rw-r--r-- | data/maps/the_partial/doors.txtpb | 4 | ||||
| -rw-r--r-- | data/maps/the_tenacious/connections.txtpb | 35 | ||||
| -rw-r--r-- | data/maps/the_tenacious/doors.txtpb | 39 | ||||
| -rw-r--r-- | data/maps/the_tenacious/metadata.txtpb | 1 | ||||
| -rw-r--r-- | data/maps/the_tenacious/rooms/Color Room.txtpb | 7 | ||||
| -rw-r--r-- | data/maps/the_tenacious/rooms/Control Center Entrance.txtpb | 12 | ||||
| -rw-r--r-- | data/maps/the_tenacious/rooms/Main Area.txtpb | 5 | ||||
| -rw-r--r-- | data/maps/the_tenacious/rooms/Mastery.txtpb | 5 | ||||
| -rw-r--r-- | data/maps/the_tenacious/rooms/Paintings Room.txtpb | 10 | ||||
| -rw-r--r-- | data/maps/the_tenacious/rooms/Tower Room.txtpb | 7 | ||||
| -rw-r--r-- | data/maps/the_tenacious/rooms/Wisdom Room.txtpb | 7 |
14 files changed, 201 insertions, 7 deletions
| diff --git a/data/connections.txtpb b/data/connections.txtpb index 150d052..042f90a 100644 --- a/data/connections.txtpb +++ b/data/connections.txtpb | |||
| @@ -27,13 +27,11 @@ | |||
| 27 | # cc <-> the shop (keyholder door only needed one way) | 27 | # cc <-> the shop (keyholder door only needed one way) |
| 28 | # the_sun_temple/Entrance/UNKEMPT | 28 | # the_sun_temple/Entrance/UNKEMPT |
| 29 | # the_unyielding/Central Connected Area/BACK (panel) | 29 | # the_unyielding/Central Connected Area/BACK (panel) |
| 30 | # daedalus/Wisdom Panel/INTELLIGENCE (panel) | ||
| 31 | # daedalus/South Castle Area/TRIANGLE | ||
| 32 | # daedalus/roof -> icarus | 30 | # daedalus/roof -> icarus |
| 33 | # daedalus/Hedges Tower/TENACIOUS | ||
| 34 | # daedalus/Tree Entrance/TREE | 31 | # daedalus/Tree Entrance/TREE |
| 35 | # daedalus/Unkempt Entrance/UNKEMPT | 32 | # daedalus/Unkempt Entrance/UNKEMPT |
| 36 | # daedalus/Wonderland/WONDROUS | 33 | # daedalus/Wonderland/WONDROUS |
| 34 | # the_tenacious/Control Center Entrance/CC | ||
| 37 | connections { | 35 | connections { |
| 38 | from { | 36 | from { |
| 39 | port { | 37 | port { |
| @@ -1668,3 +1666,51 @@ connections { | |||
| 1668 | } | 1666 | } |
| 1669 | } | 1667 | } |
| 1670 | } | 1668 | } |
| 1669 | connections { | ||
| 1670 | from { | ||
| 1671 | panel { | ||
| 1672 | map: "daedalus" | ||
| 1673 | room: "Wisdom Panel" | ||
| 1674 | name: "INTELLIGENCE" | ||
| 1675 | } | ||
| 1676 | } | ||
| 1677 | to { | ||
| 1678 | room { | ||
| 1679 | map: "the_tenacious" | ||
| 1680 | name: "Wisdom Room" | ||
| 1681 | } | ||
| 1682 | } | ||
| 1683 | oneway: true | ||
| 1684 | } | ||
| 1685 | connections { | ||
| 1686 | from { | ||
| 1687 | painting { | ||
| 1688 | map: "daedalus" | ||
| 1689 | room: "South Castle Area" | ||
| 1690 | name: "TRIANGLE" | ||
| 1691 | } | ||
| 1692 | } | ||
| 1693 | to { | ||
| 1694 | room { | ||
| 1695 | map: "the_tenacious" | ||
| 1696 | name: "Color Room" | ||
| 1697 | } | ||
| 1698 | } | ||
| 1699 | oneway: true | ||
| 1700 | } | ||
| 1701 | connections { | ||
| 1702 | from { | ||
| 1703 | port { | ||
| 1704 | map: "daedalus" | ||
| 1705 | room: "Hedges Tower" | ||
| 1706 | name: "TENACIOUS" | ||
| 1707 | } | ||
| 1708 | } | ||
| 1709 | to { | ||
| 1710 | room { | ||
| 1711 | map: "the_tenacious" | ||
| 1712 | name: "Tower Room" | ||
| 1713 | } | ||
| 1714 | } | ||
| 1715 | oneway: true | ||
| 1716 | } | ||
| diff --git a/data/ids.yaml b/data/ids.yaml index f62a0c3..4452905 100644 --- a/data/ids.yaml +++ b/data/ids.yaml | |||
| @@ -3077,6 +3077,28 @@ maps: | |||
| 3077 | Black Side Panels: 2427 | 3077 | Black Side Panels: 2427 |
| 3078 | Brown Side Panels: 2428 | 3078 | Brown Side Panels: 2428 |
| 3079 | Main Room Door: 2429 | 3079 | Main Room Door: 2429 |
| 3080 | the_tenacious: | ||
| 3081 | rooms: | ||
| 3082 | Color Room: | ||
| 3083 | panels: | ||
| 3084 | COLOR: 2454 | ||
| 3085 | Control Center Entrance: | ||
| 3086 | panels: | ||
| 3087 | ZERO: 2455 | ||
| 3088 | Mastery: | ||
| 3089 | masteries: | ||
| 3090 | MASTERY: 2456 | ||
| 3091 | Paintings Room: | ||
| 3092 | panels: | ||
| 3093 | PAINTINGS: 2457 | ||
| 3094 | Tower Room: | ||
| 3095 | panels: | ||
| 3096 | TOWER: 2458 | ||
| 3097 | Wisdom Room: | ||
| 3098 | panels: | ||
| 3099 | WISDOM: 2459 | ||
| 3100 | doors: | ||
| 3101 | Paintings Door: 2453 | ||
| 3080 | the_unyielding: | 3102 | the_unyielding: |
| 3081 | rooms: | 3103 | rooms: |
| 3082 | Behind Northeast: | 3104 | Behind Northeast: |
| diff --git a/data/maps/the_partial/connections.txtpb b/data/maps/the_partial/connections.txtpb index 34ff94f..abadb06 100644 --- a/data/maps/the_partial/connections.txtpb +++ b/data/maps/the_partial/connections.txtpb | |||
| @@ -17,13 +17,11 @@ connections { | |||
| 17 | from_room: "Obverse Side" | 17 | from_room: "Obverse Side" |
| 18 | to_room: "Control Center Entrance" | 18 | to_room: "Control Center Entrance" |
| 19 | door { name: "L Entered" } | 19 | door { name: "L Entered" } |
| 20 | oneway: true | ||
| 21 | } | 20 | } |
| 22 | connections { | 21 | connections { |
| 23 | from_room: "Control Center Entrance" | 22 | from_room: "Control Center Entrance" |
| 24 | to_room: "Obverse Side" | 23 | to_room: "Obverse Side" |
| 25 | door { name: "Control Center Entrance" } | 24 | door { name: "Control Center Entrance" } |
| 26 | oneway: true | ||
| 27 | } | 25 | } |
| 28 | connections { | 26 | connections { |
| 29 | from_room: "Reverse Side" | 27 | from_room: "Reverse Side" |
| diff --git a/data/maps/the_partial/doors.txtpb b/data/maps/the_partial/doors.txtpb index fed6951..2b233db 100644 --- a/data/maps/the_partial/doors.txtpb +++ b/data/maps/the_partial/doors.txtpb | |||
| @@ -49,8 +49,8 @@ doors { | |||
| 49 | } | 49 | } |
| 50 | doors { | 50 | doors { |
| 51 | name: "Control Center Entrance" | 51 | name: "Control Center Entrance" |
| 52 | type: STANDARD | 52 | type: LOCATION_ONLY |
| 53 | receivers: "Components/Doors/controlDoor" | 53 | #receivers: "Components/Doors/controlDoor" |
| 54 | panels { room: "Control Center Entrance" name: "RETURN" } | 54 | panels { room: "Control Center Entrance" name: "RETURN" } |
| 55 | location_room: "Control Center Entrance" | 55 | location_room: "Control Center Entrance" |
| 56 | } | 56 | } |
| diff --git a/data/maps/the_tenacious/connections.txtpb b/data/maps/the_tenacious/connections.txtpb new file mode 100644 index 0000000..56716e0 --- /dev/null +++ b/data/maps/the_tenacious/connections.txtpb | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | connections { | ||
| 2 | from_room: "Control Center Entrance" | ||
| 3 | to_room: "Main Area" | ||
| 4 | door { name: "Control Center Entrance" } | ||
| 5 | } | ||
| 6 | connections { | ||
| 7 | from_room: "Main Area" | ||
| 8 | to_room: "Control Center Entrance" | ||
| 9 | door { name: "K Entered" } | ||
| 10 | } | ||
| 11 | connections { | ||
| 12 | from_room: "Paintings Room" | ||
| 13 | to_room: "Main Area" | ||
| 14 | door { name: "Paintings Door" } | ||
| 15 | } | ||
| 16 | connections { | ||
| 17 | from_room: "Wisdom Room" | ||
| 18 | to_room: "Main Area" | ||
| 19 | door { name: "Wisdom Door" } | ||
| 20 | } | ||
| 21 | connections { | ||
| 22 | from_room: "Tower Room" | ||
| 23 | to_room: "Main Area" | ||
| 24 | door { name: "Tower Door" } | ||
| 25 | } | ||
| 26 | connections { | ||
| 27 | from_room: "Color Room" | ||
| 28 | to_room: "Main Area" | ||
| 29 | door { name: "Color Door" } | ||
| 30 | } | ||
| 31 | connections { | ||
| 32 | from_room: "Main Area" | ||
| 33 | to_room: "Mastery" | ||
| 34 | door { name: "Mastery" } | ||
| 35 | } | ||
| diff --git a/data/maps/the_tenacious/doors.txtpb b/data/maps/the_tenacious/doors.txtpb new file mode 100644 index 0000000..8fe8bd5 --- /dev/null +++ b/data/maps/the_tenacious/doors.txtpb | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | doors { | ||
| 2 | name: "Control Center Entrance" | ||
| 3 | type: EVENT | ||
| 4 | panels { room: "Control Center Entrance" name: "ZERO" } | ||
| 5 | } | ||
| 6 | doors { | ||
| 7 | name: "K Entered" | ||
| 8 | type: EVENT | ||
| 9 | keyholders { room: "Main Area" name: "K" key: "k" } | ||
| 10 | } | ||
| 11 | doors { | ||
| 12 | name: "Paintings Door" | ||
| 13 | type: ITEM_ONLY | ||
| 14 | receivers: "Components/Doors/entry_3" | ||
| 15 | rooms { name: "Main Area" } | ||
| 16 | } | ||
| 17 | doors { | ||
| 18 | name: "Wisdom Door" | ||
| 19 | type: EVENT | ||
| 20 | panels { room: "Wisdom Room" name: "WISDOM" } | ||
| 21 | } | ||
| 22 | doors { | ||
| 23 | name: "Color Door" | ||
| 24 | type: EVENT | ||
| 25 | panels { room: "Color Room" name: "COLOR" } | ||
| 26 | } | ||
| 27 | doors { | ||
| 28 | name: "Tower Door" | ||
| 29 | type: EVENT | ||
| 30 | panels { room: "Tower Room" name: "TOWER" } | ||
| 31 | } | ||
| 32 | doors { | ||
| 33 | name: "Mastery" | ||
| 34 | type: EVENT | ||
| 35 | panels { room: "Paintings Room" name: "PAINTINGS" } | ||
| 36 | panels { room: "Wisdom Room" name: "WISDOM" } | ||
| 37 | panels { room: "Color Room" name: "COLOR" } | ||
| 38 | panels { room: "Tower Room" name: "TOWER" } | ||
| 39 | } | ||
| diff --git a/data/maps/the_tenacious/metadata.txtpb b/data/maps/the_tenacious/metadata.txtpb new file mode 100644 index 0000000..d98e8f2 --- /dev/null +++ b/data/maps/the_tenacious/metadata.txtpb | |||
| @@ -0,0 +1 @@ | |||
| display_name: "The Tenacious" | |||
| diff --git a/data/maps/the_tenacious/rooms/Color Room.txtpb b/data/maps/the_tenacious/rooms/Color Room.txtpb new file mode 100644 index 0000000..e2a7a31 --- /dev/null +++ b/data/maps/the_tenacious/rooms/Color Room.txtpb | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | name: "Color Room" | ||
| 2 | panels { | ||
| 3 | name: "COLOR" | ||
| 4 | path: "Panels/Room_1/panel_1" | ||
| 5 | clue: "color" | ||
| 6 | answer: "color" | ||
| 7 | } | ||
| diff --git a/data/maps/the_tenacious/rooms/Control Center Entrance.txtpb b/data/maps/the_tenacious/rooms/Control Center Entrance.txtpb new file mode 100644 index 0000000..45a0d12 --- /dev/null +++ b/data/maps/the_tenacious/rooms/Control Center Entrance.txtpb | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | name: "Control Center Entrance" | ||
| 2 | panels { | ||
| 3 | name: "ZERO" | ||
| 4 | path: "Panels/Room_1/panel_5" | ||
| 5 | clue: "zero" | ||
| 6 | answer: "hero" | ||
| 7 | symbols: ZERO | ||
| 8 | } | ||
| 9 | ports { | ||
| 10 | name: "CC" | ||
| 11 | path: "Components/Warps/worldport" | ||
| 12 | } | ||
| diff --git a/data/maps/the_tenacious/rooms/Main Area.txtpb b/data/maps/the_tenacious/rooms/Main Area.txtpb new file mode 100644 index 0000000..8190827 --- /dev/null +++ b/data/maps/the_tenacious/rooms/Main Area.txtpb | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | name: "Main Area" | ||
| 2 | keyholders { | ||
| 3 | name: "K" | ||
| 4 | path: "Components/KeyHolders/keyHolderK" | ||
| 5 | } | ||
| diff --git a/data/maps/the_tenacious/rooms/Mastery.txtpb b/data/maps/the_tenacious/rooms/Mastery.txtpb new file mode 100644 index 0000000..749837e --- /dev/null +++ b/data/maps/the_tenacious/rooms/Mastery.txtpb | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | name: "Mastery" | ||
| 2 | masteries { | ||
| 3 | name: "MASTERY" | ||
| 4 | path: "Components/Collectables/smiley" | ||
| 5 | } | ||
| diff --git a/data/maps/the_tenacious/rooms/Paintings Room.txtpb b/data/maps/the_tenacious/rooms/Paintings Room.txtpb new file mode 100644 index 0000000..f140ef3 --- /dev/null +++ b/data/maps/the_tenacious/rooms/Paintings Room.txtpb | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | name: "Paintings Room" | ||
| 2 | # NOTE: It will be non-trivial to implement the painting pilgrimage in Daedalus, | ||
| 3 | # so until then, the door to this room will be an item in door shuffle, and will | ||
| 4 | # automatically be open without door shuffle. | ||
| 5 | panels { | ||
| 6 | name: "PAINTINGS" | ||
| 7 | path: "Panels/Room_1/panel_3" | ||
| 8 | clue: "paintings" | ||
| 9 | answer: "paintings" | ||
| 10 | } | ||
| diff --git a/data/maps/the_tenacious/rooms/Tower Room.txtpb b/data/maps/the_tenacious/rooms/Tower Room.txtpb new file mode 100644 index 0000000..d050d80 --- /dev/null +++ b/data/maps/the_tenacious/rooms/Tower Room.txtpb | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | name: "Tower Room" | ||
| 2 | panels { | ||
| 3 | name: "TOWER" | ||
| 4 | path: "Panels/Room_1/panel_2" | ||
| 5 | clue: "tower" | ||
| 6 | answer: "tower" | ||
| 7 | } | ||
| diff --git a/data/maps/the_tenacious/rooms/Wisdom Room.txtpb b/data/maps/the_tenacious/rooms/Wisdom Room.txtpb new file mode 100644 index 0000000..84a1a6d --- /dev/null +++ b/data/maps/the_tenacious/rooms/Wisdom Room.txtpb | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | name: "Wisdom Room" | ||
| 2 | panels { | ||
| 3 | name: "WISDOM" | ||
| 4 | path: "Panels/Room_1/panel_4" | ||
| 5 | clue: "wisdom" | ||
| 6 | answer: "wisdom" | ||
| 7 | } | ||
