about summary refs log tree commit diff stats
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/connections.txtpb50
-rw-r--r--data/ids.yaml30
-rw-r--r--data/maps/control_center/doors.txtpb16
-rw-r--r--data/maps/the_entry/metadata.txtpb2
-rw-r--r--data/maps/the_entry/rooms/Starting Room.txtpb2
-rw-r--r--data/maps/the_fuzzy/connections.txtpb5
-rw-r--r--data/maps/the_fuzzy/doors.txtpb12
-rw-r--r--data/maps/the_fuzzy/metadata.txtpb4
-rw-r--r--data/maps/the_fuzzy/rooms/Main Area.txtpb119
-rw-r--r--data/maps/the_fuzzy/rooms/Mastery.txtpb5
-rw-r--r--data/maps/the_relentless/doors.txtpb32
-rw-r--r--data/metadata.txtpb2
12 files changed, 258 insertions, 21 deletions
diff --git a/data/connections.txtpb b/data/connections.txtpb index 4bec584..8d75dab 100644 --- a/data/connections.txtpb +++ b/data/connections.txtpb
@@ -2688,3 +2688,53 @@ connections {
2688 } 2688 }
2689 oneway: true 2689 oneway: true
2690} 2690}
2691connections {
2692 from {
2693 panel {
2694 map: "the_entry"
2695 room: "Starting Room"
2696 name: "Gift Maps"
2697 answer: "gongus"
2698 }
2699 }
2700 to {
2701 room {
2702 map: "the_fuzzy"
2703 name: "Main Area"
2704 }
2705 }
2706 oneway: true
2707}
2708connections {
2709 from {
2710 panel {
2711 map: "the_entry"
2712 room: "Starting Room"
2713 name: "Gift Maps"
2714 answer: "kiwi"
2715 }
2716 }
2717 to {
2718 room {
2719 map: "the_fuzzy"
2720 name: "Main Area"
2721 }
2722 }
2723 oneway: true
2724}
2725connections {
2726 from {
2727 port {
2728 map: "the_fuzzy"
2729 room: "Main Area"
2730 name: "WORLDPORT"
2731 }
2732 }
2733 to {
2734 room {
2735 map: "the_entry"
2736 name: "Starting Room"
2737 }
2738 }
2739 oneway: true
2740}
diff --git a/data/ids.yaml b/data/ids.yaml index 8ef294a..dc82306 100644 --- a/data/ids.yaml +++ b/data/ids.yaml
@@ -2022,6 +2022,30 @@ maps:
2022 panels: 2022 panels:
2023 CACTUS: 410 2023 CACTUS: 410
2024 TAIL: 411 2024 TAIL: 411
2025 the_fuzzy:
2026 rooms:
2027 Main Area:
2028 panels:
2029 ACHIEVES: 3033
2030 BEFORE: 3028
2031 BOTH: 3036
2032 Blank: 3022
2033 CAGED: 3027
2034 COMBINED: 3032
2035 DICE: 3026
2036 FIRST: 3035
2037 FORGED: 3030
2038 LOTTO: 3024
2039 OTHERS: 3031
2040 TOED: 3029
2041 TUTU: 3023
2042 UNVEILED: 3034
2043 WHERETO: 3025
2044 Mastery:
2045 masteries:
2046 MASTERY: 3037
2047 doors:
2048 Black Panels: 3021
2025 the_gallery: 2049 the_gallery:
2026 rooms: 2050 rooms:
2027 Back Room: 2051 Back Room:
@@ -2871,8 +2895,9 @@ maps:
2871 HIDE (2): 1021 2895 HIDE (2): 1021
2872 MORE: 1022 2896 MORE: 1022
2873 doors: 2897 doors:
2874 Left/Turn Door: 984 2898 Left Only Puzzles: 3020
2875 Turn/Shop Door: 985 2899 Shop Only Puzzles: 3019
2900 Turn Only Puzzles: 3018
2876 the_repetitive: 2901 the_repetitive:
2877 rooms: 2902 rooms:
2878 Anti Room: 2903 Anti Room:
@@ -4153,6 +4178,7 @@ special:
4153 Job Symbol: 2798 4178 Job Symbol: 2798
4154 Lingo Symbol: 2799 4179 Lingo Symbol: 2799
4155 Null Symbol: 2800 4180 Null Symbol: 2800
4181 Numbers: 3038
4156 Planet Symbol: 2801 4182 Planet Symbol: 2801
4157 Pyramid Symbol: 2802 4183 Pyramid Symbol: 2802
4158 Question Symbol: 2803 4184 Question Symbol: 2803
diff --git a/data/maps/control_center/doors.txtpb b/data/maps/control_center/doors.txtpb index cac1937..1422301 100644 --- a/data/maps/control_center/doors.txtpb +++ b/data/maps/control_center/doors.txtpb
@@ -86,21 +86,7 @@ doors {
86doors { 86doors {
87 name: "White Ending Door" 87 name: "White Ending Door"
88 type: EVENT 88 type: EVENT
89 # This is the only time a door depends on endings. However, it's nice to do it 89 white_ending: true
90 # this way instead of just checking for ending room access because this lets
91 # us use events, which makes the playthrough more readable.
92 endings: "MINT"
93 endings: "ORANGE"
94 endings: "GREEN"
95 endings: "GRAY"
96 endings: "PLUM"
97 endings: "YELLOW"
98 endings: "GOLD"
99 endings: "BLACK"
100 endings: "CYAN"
101 endings: "PURPLE"
102 endings: "RED"
103 endings: "BLUE"
104} 90}
105doors { 91doors {
106 name: "Repetitive Entrance" 92 name: "Repetitive Entrance"
diff --git a/data/maps/the_entry/metadata.txtpb b/data/maps/the_entry/metadata.txtpb index bdcdf83..da2194b 100644 --- a/data/maps/the_entry/metadata.txtpb +++ b/data/maps/the_entry/metadata.txtpb
@@ -12,9 +12,11 @@ excluded_nodes: "Panels/Back Left/backleft_4_proxied_2"
12# This is a proxy related to the first panel and it doesn't seem useful. 12# This is a proxy related to the first panel and it doesn't seem useful.
13excluded_nodes: "Panels/Entry/entry_proxied_fake" 13excluded_nodes: "Panels/Entry/entry_proxied_fake"
14# The gift map entrance is created by the mod. 14# The gift map entrance is created by the mod.
15custom_nodes: "Components/GiftMapEntrance/GongusPanel"
15custom_nodes: "Components/GiftMapEntrance/HatkirbyPanel" 16custom_nodes: "Components/GiftMapEntrance/HatkirbyPanel"
16custom_nodes: "Components/GiftMapEntrance/IcelyPanel" 17custom_nodes: "Components/GiftMapEntrance/IcelyPanel"
17custom_nodes: "Components/GiftMapEntrance/KirbyPanel" 18custom_nodes: "Components/GiftMapEntrance/KirbyPanel"
19custom_nodes: "Components/GiftMapEntrance/KiwiPanel"
18custom_nodes: "Components/GiftMapEntrance/Panel" 20custom_nodes: "Components/GiftMapEntrance/Panel"
19custom_nodes: "Components/GiftMapEntrance/QPanel" 21custom_nodes: "Components/GiftMapEntrance/QPanel"
20custom_nodes: "Components/GiftMapEntrance/SouveyPanel" 22custom_nodes: "Components/GiftMapEntrance/SouveyPanel"
diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb index 9c73766..d01d807 100644 --- a/data/maps/the_entry/rooms/Starting Room.txtpb +++ b/data/maps/the_entry/rooms/Starting Room.txtpb
@@ -55,9 +55,11 @@ panels {
55 # The puzzle solution doesn't matter. We'll change it to the player's name 55 # The puzzle solution doesn't matter. We'll change it to the player's name
56 # for fun. 56 # for fun.
57 symbols: QUESTION 57 symbols: QUESTION
58 proxies { answer: "gongus" path: "Components/GiftMapEntrance/GongusPanel" }
58 proxies { answer: "hatkirby" path: "Components/GiftMapEntrance/HatkirbyPanel" } 59 proxies { answer: "hatkirby" path: "Components/GiftMapEntrance/HatkirbyPanel" }
59 proxies { answer: "icely" path: "Components/GiftMapEntrance/IcelyPanel" } 60 proxies { answer: "icely" path: "Components/GiftMapEntrance/IcelyPanel" }
60 proxies { answer: "kirby" path: "Components/GiftMapEntrance/KirbyPanel" } 61 proxies { answer: "kirby" path: "Components/GiftMapEntrance/KirbyPanel" }
62 proxies { answer: "kiwi" path: "Components/GiftMapEntrance/KiwiPanel" }
61 proxies { answer: "q" path: "Components/GiftMapEntrance/QPanel" } 63 proxies { answer: "q" path: "Components/GiftMapEntrance/QPanel" }
62 proxies { answer: "souvey" path: "Components/GiftMapEntrance/SouveyPanel" } 64 proxies { answer: "souvey" path: "Components/GiftMapEntrance/SouveyPanel" }
63 proxies { answer: "star" path: "Components/GiftMapEntrance/StarPanel" } 65 proxies { answer: "star" path: "Components/GiftMapEntrance/StarPanel" }
diff --git a/data/maps/the_fuzzy/connections.txtpb b/data/maps/the_fuzzy/connections.txtpb new file mode 100644 index 0000000..ea39f34 --- /dev/null +++ b/data/maps/the_fuzzy/connections.txtpb
@@ -0,0 +1,5 @@
1connections {
2 from_room: "Main Area"
3 to_room: "Mastery"
4 door { name: "Mastery Door" }
5}
diff --git a/data/maps/the_fuzzy/doors.txtpb b/data/maps/the_fuzzy/doors.txtpb new file mode 100644 index 0000000..0f89b80 --- /dev/null +++ b/data/maps/the_fuzzy/doors.txtpb
@@ -0,0 +1,12 @@
1doors {
2 name: "Black Panels"
3 type: LOCATION_ONLY
4 panels { room: "Main Area" name: "WHERETO" }
5 panels { room: "Main Area" name: "COMBINED" }
6 location_room: "Main Area"
7}
8doors {
9 name: "Mastery Door"
10 type: EVENT
11 panels { room: "Main Area" name: "OTHERS" }
12}
diff --git a/data/maps/the_fuzzy/metadata.txtpb b/data/maps/the_fuzzy/metadata.txtpb new file mode 100644 index 0000000..b4178c7 --- /dev/null +++ b/data/maps/the_fuzzy/metadata.txtpb
@@ -0,0 +1,4 @@
1display_name: "The Fuzzy"
2type: GIFT_MAP
3# The map's mastery is created at runtime.
4custom_nodes: "Components/Collectables/collectable"
diff --git a/data/maps/the_fuzzy/rooms/Main Area.txtpb b/data/maps/the_fuzzy/rooms/Main Area.txtpb new file mode 100644 index 0000000..9c06df8 --- /dev/null +++ b/data/maps/the_fuzzy/rooms/Main Area.txtpb
@@ -0,0 +1,119 @@
1name: "Main Area"
2panels {
3 name: "Blank"
4 path: "Panels/Room_1/panel_1"
5 clue: ""
6 answer: "2475"
7 symbols: LINGO
8 symbols: QUESTION
9}
10panels {
11 name: "TUTU"
12 path: "Panels/Room_1/panel_2"
13 clue: "tutu"
14 answer: "22"
15 symbols: ZERO
16 symbols: EVAL
17}
18panels {
19 name: "LOTTO"
20 path: "Panels/Room_1/panel_3"
21 clue: "lotto"
22 answer: "22222222"
23 symbols: ZERO
24 symbols: EVAL
25}
26panels {
27 name: "WHERETO"
28 path: "Panels/Room_1/panel_10"
29 clue: "whereto"
30 answer: "sides"
31 symbols: QUESTION
32}
33panels {
34 name: "DICE"
35 path: "Panels/Room_1/panel_11"
36 clue: "dice"
37 answer: "4935"
38 symbols: QUESTION
39}
40panels {
41 name: "CAGED"
42 path: "Panels/Room_1/panel_12"
43 clue: "caged"
44 answer: "31754"
45 symbols: QUESTION
46}
47panels {
48 name: "BEFORE"
49 path: "Panels/Room_1/panel_13"
50 clue: "before"
51 answer: "100"
52 symbols: ZERO
53 symbols: EVAL
54}
55panels {
56 name: "TOED"
57 path: "Panels/Room_1/panel_14"
58 clue: "toed"
59 answer: "108"
60 symbols: ZERO
61 symbols: EVAL
62}
63panels {
64 name: "FORGED"
65 path: "Panels/Room_1/panel_15"
66 clue: "forged"
67 answer: "3016"
68 symbols: ZERO
69 symbols: EVAL
70}
71panels {
72 name: "OTHERS"
73 path: "Panels/Room_1/panel_4"
74 clue: "others"
75 answer: "34390869"
76 symbols: QUESTION
77}
78panels {
79 name: "COMBINED"
80 path: "Panels/Room_1/panel_9"
81 clue: "combined"
82 answer: "added"
83 symbols: SUN
84}
85panels {
86 name: "ACHIEVES"
87 path: "Panels/Room_1/panel_5"
88 clue: "achieves"
89 answer: "4214"
90 symbols: QUESTION
91}
92panels {
93 name: "UNVEILED"
94 path: "Panels/Room_1/panel_6"
95 clue: "unveiled"
96 answer: "12122021"
97 symbols: QUESTION
98}
99panels {
100 name: "FIRST"
101 path: "Panels/Room_1/panel_8"
102 clue: "first"
103 answer: "1"
104 symbols: QUESTION
105}
106panels {
107 name: "BOTH"
108 path: "Panels/Room_1/panel_7"
109 clue: "both"
110 answer: "2"
111 symbols: QUESTION
112}
113ports {
114 name: "WORLDPORT"
115 display_name: "Entrance"
116 path: "Components/Warps/worldport"
117 destination { x: 0 y: 0 z: 9 }
118 rotation: 0
119}
diff --git a/data/maps/the_fuzzy/rooms/Mastery.txtpb b/data/maps/the_fuzzy/rooms/Mastery.txtpb new file mode 100644 index 0000000..bbe8742 --- /dev/null +++ b/data/maps/the_fuzzy/rooms/Mastery.txtpb
@@ -0,0 +1,5 @@
1name: "Mastery"
2masteries {
3 name: "MASTERY"
4 path: "Components/Collectables/collectable"
5}
diff --git a/data/maps/the_relentless/doors.txtpb b/data/maps/the_relentless/doors.txtpb index 11f6369..727599f 100644 --- a/data/maps/the_relentless/doors.txtpb +++ b/data/maps/the_relentless/doors.txtpb
@@ -1,17 +1,42 @@
1doors { 1doors {
2 name: "Left/Turn Door" 2 name: "Turn Only Puzzles"
3 type: LOCATION_ONLY
4 panels { room: "Turn Room" name: "HIDE (1)" }
5 panels { room: "Turn Room" name: "HIDE (2)" }
6 panels { room: "Turn Room" name: "MORE" }
7 location_room: "Turn Room"
8}
9doors {
10 name: "Shop Only Puzzles"
11 type: LOCATION_ONLY
12 panels { room: "Shop Room" name: "LEFT (1)" }
13 panels { room: "Shop Room" name: "LEFT (2)" }
14 panels { room: "Shop Room" name: "EXIT (1)" }
15 panels { room: "Shop Room" name: "EXIT (2)" }
16 panels { room: "Shop Room" name: "EXIT (3)" }
17 location_room: "Shop Room"
18}
19doors {
20 name: "Left Only Puzzles"
3 type: LOCATION_ONLY 21 type: LOCATION_ONLY
4 panels { room: "Left Room" name: "HIDE" } 22 panels { room: "Left Room" name: "HIDE" }
5 panels { room: "Left Room" name: "LEFT" } 23 panels { room: "Left Room" name: "LEFT" }
6 panels { room: "Left Room" name: "MORE" } 24 panels { room: "Left Room" name: "MORE" }
25 location_room: "Left Room"
26}
27doors {
28 name: "Left/Turn Door"
29 type: EVENT
30 panels { room: "Left Room" name: "HIDE" }
31 panels { room: "Left Room" name: "LEFT" }
32 panels { room: "Left Room" name: "MORE" }
7 panels { room: "Turn Room" name: "HIDE (1)" } 33 panels { room: "Turn Room" name: "HIDE (1)" }
8 panels { room: "Turn Room" name: "HIDE (2)" } 34 panels { room: "Turn Room" name: "HIDE (2)" }
9 panels { room: "Turn Room" name: "MORE" } 35 panels { room: "Turn Room" name: "MORE" }
10 location_room: "Turn Room"
11} 36}
12doors { 37doors {
13 name: "Turn/Shop Door" 38 name: "Turn/Shop Door"
14 type: LOCATION_ONLY 39 type: EVENT
15 panels { room: "Turn Room" name: "HIDE (1)" } 40 panels { room: "Turn Room" name: "HIDE (1)" }
16 panels { room: "Turn Room" name: "HIDE (2)" } 41 panels { room: "Turn Room" name: "HIDE (2)" }
17 panels { room: "Turn Room" name: "MORE" } 42 panels { room: "Turn Room" name: "MORE" }
@@ -20,7 +45,6 @@ doors {
20 panels { room: "Shop Room" name: "EXIT (1)" } 45 panels { room: "Shop Room" name: "EXIT (1)" }
21 panels { room: "Shop Room" name: "EXIT (2)" } 46 panels { room: "Shop Room" name: "EXIT (2)" }
22 panels { room: "Shop Room" name: "EXIT (3)" } 47 panels { room: "Shop Room" name: "EXIT (3)" }
23 location_room: "Turn Room"
24} 48}
25doors { 49doors {
26 name: "All Doors" 50 name: "All Doors"
diff --git a/data/metadata.txtpb b/data/metadata.txtpb index c5c48c2..eb3fe54 100644 --- a/data/metadata.txtpb +++ b/data/metadata.txtpb
@@ -52,3 +52,5 @@ special_names: "Anti W"
52special_names: "Anti X" 52special_names: "Anti X"
53special_names: "Anti Y" 53special_names: "Anti Y"
54special_names: "Anti Z" 54special_names: "Anti Z"
55# Numbers for The Fuzzy
56special_names: "Numbers"