about summary refs log tree commit diff stats
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/the_owl/connections.txtpb18
-rw-r--r--data/maps/the_owl/doors.txtpb8
-rw-r--r--data/maps/the_owl/rooms/Connected Area.txtpb7
-rw-r--r--data/maps/the_owl/rooms/R2C2 Bottom.txtpb3
-rw-r--r--data/maps/the_owl/rooms/R2C3 Bottom.txtpb (renamed from data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb)9
5 files changed, 23 insertions, 22 deletions
diff --git a/data/maps/the_owl/connections.txtpb b/data/maps/the_owl/connections.txtpb index 87c98b3..2bd2380 100644 --- a/data/maps/the_owl/connections.txtpb +++ b/data/maps/the_owl/connections.txtpb
@@ -10,12 +10,17 @@ connections {
10} 10}
11connections { 11connections {
12 from_room: "R2C2 Bottom" 12 from_room: "R2C2 Bottom"
13 to_room: "R2C2.5 Bottom" 13 to_room: "Connected Area"
14 door { name: "Gray Owl" } 14 door { name: "Gray Owl" }
15} 15}
16connections { 16connections {
17 from_room: "R2C3 Bottom"
18 to_room: "Connected Area"
19 oneway: true
20}
21connections {
17 from_room: "R2C2 Bottom" 22 from_room: "R2C2 Bottom"
18 to_room: "R2C2.5 Bottom" 23 to_room: "Connected Area"
19 door { name: "First Room Shortcut" } 24 door { name: "First Room Shortcut" }
20} 25}
21connections { 26connections {
@@ -30,17 +35,12 @@ connections {
30} 35}
31connections { 36connections {
32 from_room: "R2C2 Top" 37 from_room: "R2C2 Top"
33 to_room: "R2C2.5 Bottom" 38 to_room: "R2C3 Bottom"
34 door { name: "Gray Bottom Door" } 39 door { name: "Gray Bottom Door" }
35} 40}
36connections { 41connections {
37 from_room: "R2C2 Top"
38 to_room: "R2C2.5 Bottom"
39 door { name: "Gray Owl" }
40}
41connections {
42 from_room: "Connected Area" 42 from_room: "Connected Area"
43 to_room: "R2C2.5 Bottom" 43 to_room: "R2C3 Bottom"
44 door { name: "Gray Owl" } 44 door { name: "Gray Owl" }
45} 45}
46connections { 46connections {
diff --git a/data/maps/the_owl/doors.txtpb b/data/maps/the_owl/doors.txtpb index 28af5d0..3d2d055 100644 --- a/data/maps/the_owl/doors.txtpb +++ b/data/maps/the_owl/doors.txtpb
@@ -25,8 +25,8 @@ doors {
25 name: "First Room Shortcut" 25 name: "First Room Shortcut"
26 type: STANDARD 26 type: STANDARD
27 receivers: "Components/Doors/entry_6" 27 receivers: "Components/Doors/entry_6"
28 panels { room: "R2C2.5 Bottom" name: "FIZZLE" } 28 panels { room: "Connected Area" name: "FIZZLE" }
29 location_room: "R2C2.5 Bottom" 29 location_room: "Connected Area"
30} 30}
31doors { 31doors {
32 name: "First Door" 32 name: "First Door"
@@ -171,8 +171,8 @@ doors {
171 receivers: "Components/Owl/Room 10/WG" 171 receivers: "Components/Owl/Room 10/WG"
172 receivers: "Components/Owl/Room 11/W" 172 receivers: "Components/Owl/Room 11/W"
173 receivers: "Components/Owl/Room 11/WG" 173 receivers: "Components/Owl/Room 11/WG"
174 panels { room: "R2C2.5 Bottom" name: "BLACK" } 174 panels { room: "R2C3 Bottom" name: "BLACK" }
175 location_room: "R2C2.5 Bottom" 175 location_room: "R2C3 Bottom"
176} 176}
177doors { 177doors {
178 name: "Black Owl" 178 name: "Black Owl"
diff --git a/data/maps/the_owl/rooms/Connected Area.txtpb b/data/maps/the_owl/rooms/Connected Area.txtpb index 5862d59..cf5ea1f 100644 --- a/data/maps/the_owl/rooms/Connected Area.txtpb +++ b/data/maps/the_owl/rooms/Connected Area.txtpb
@@ -132,6 +132,13 @@ panels {
132 answer: "orange" 132 answer: "orange"
133 symbols: SPARKLES 133 symbols: SPARKLES
134} 134}
135panels {
136 name: "FIZZLE"
137 path: "Panels/Bottom Mid/owl_10"
138 clue: "fizzle"
139 answer: "chisel"
140 symbols: ZERO
141}
135paintings { 142paintings {
136 name: "OWL" 143 name: "OWL"
137 path: "Components/Paintings/owl" 144 path: "Components/Paintings/owl"
diff --git a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb index 4661877..604a1cc 100644 --- a/data/maps/the_owl/rooms/R2C2 Bottom.txtpb +++ b/data/maps/the_owl/rooms/R2C2 Bottom.txtpb
@@ -10,5 +10,6 @@ ports {
10 name: "GALLERY" 10 name: "GALLERY"
11 path: "Components/Warps/worldport" 11 path: "Components/Warps/worldport"
12 orientation: "south" 12 orientation: "south"
13 # Note that this port is accessible from the other side in the Z1 room. Hmm. 13 # TODO: Note that this port is accessible from the other side in the Z1
14 # room. Hmm.
14} 15}
diff --git a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb b/data/maps/the_owl/rooms/R2C3 Bottom.txtpb index 0f5381e..2b49e26 100644 --- a/data/maps/the_owl/rooms/R2C2.5 Bottom.txtpb +++ b/data/maps/the_owl/rooms/R2C3 Bottom.txtpb
@@ -1,11 +1,4 @@
1name: "R2C2.5 Bottom" 1name: "R2C3 Bottom"
2panels {
3 name: "FIZZLE"
4 path: "Panels/Bottom Mid/owl_10"
5 clue: "fizzle"
6 answer: "chisel"
7 symbols: ZERO
8}
9panels { 2panels {
10 name: "FIGMENT" 3 name: "FIGMENT"
11 path: "Panels/Noncritical/owl_14" 4 path: "Panels/Noncritical/owl_14"
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-10-31 21:51:25 +0000
lass="w"> 65536 /* Makes sure this enum is signed 32bit. */ } FMOD_STUDIO_INSTANCETYPE; /* FMOD Studio structures */ typedef struct FMOD_STUDIO_BANK_INFO { int size; void *userdata; int userdatalength; FMOD_FILE_OPEN_CALLBACK opencallback; FMOD_FILE_CLOSE_CALLBACK closecallback; FMOD_FILE_READ_CALLBACK readcallback; FMOD_FILE_SEEK_CALLBACK seekcallback; } FMOD_STUDIO_BANK_INFO; typedef struct FMOD_STUDIO_PARAMETER_ID { unsigned int data1; unsigned int data2; } FMOD_STUDIO_PARAMETER_ID; typedef struct FMOD_STUDIO_PARAMETER_DESCRIPTION { const char *name; FMOD_STUDIO_PARAMETER_ID id; float minimum; float maximum; float defaultvalue; FMOD_STUDIO_PARAMETER_TYPE type; FMOD_STUDIO_PARAMETER_FLAGS flags; FMOD_GUID guid; } FMOD_STUDIO_PARAMETER_DESCRIPTION; typedef struct FMOD_STUDIO_USER_PROPERTY { const char *name; FMOD_STUDIO_USER_PROPERTY_TYPE type; union { int intvalue; FMOD_BOOL boolvalue; float floatvalue; const char *stringvalue; }; } FMOD_STUDIO_USER_PROPERTY; typedef struct FMOD_STUDIO_PROGRAMMER_SOUND_PROPERTIES { const char *name; FMOD_SOUND *sound; int subsoundIndex; } FMOD_STUDIO_PROGRAMMER_SOUND_PROPERTIES; typedef struct FMOD_STUDIO_PLUGIN_INSTANCE_PROPERTIES { const char *name; FMOD_DSP *dsp; } FMOD_STUDIO_PLUGIN_INSTANCE_PROPERTIES; typedef struct FMOD_STUDIO_TIMELINE_MARKER_PROPERTIES { const char *name; int position; } FMOD_STUDIO_TIMELINE_MARKER_PROPERTIES; typedef struct FMOD_STUDIO_TIMELINE_BEAT_PROPERTIES { int bar; int beat; int position; float tempo; int timesignatureupper; int timesignaturelower; } FMOD_STUDIO_TIMELINE_BEAT_PROPERTIES; typedef struct FMOD_STUDIO_TIMELINE_NESTED_BEAT_PROPERTIES { FMOD_GUID eventid; FMOD_STUDIO_TIMELINE_BEAT_PROPERTIES properties; } FMOD_STUDIO_TIMELINE_NESTED_BEAT_PROPERTIES; typedef struct FMOD_STUDIO_ADVANCEDSETTINGS { int cbsize; unsigned int commandqueuesize; unsigned int handleinitialsize; int studioupdateperiod; int idlesampledatapoolsize; unsigned int streamingscheduledelay; const char* encryptionkey; } FMOD_STUDIO_ADVANCEDSETTINGS; typedef struct FMOD_STUDIO_CPU_USAGE { float update; } FMOD_STUDIO_CPU_USAGE; typedef struct FMOD_STUDIO_BUFFER_INFO { int currentusage; int peakusage; int capacity; int stallcount; float stalltime; } FMOD_STUDIO_BUFFER_INFO; typedef struct FMOD_STUDIO_BUFFER_USAGE { FMOD_STUDIO_BUFFER_INFO studiocommandqueue; FMOD_STUDIO_BUFFER_INFO studiohandle; } FMOD_STUDIO_BUFFER_USAGE; typedef struct FMOD_STUDIO_SOUND_INFO { const char *name_or_data; FMOD_MODE mode; FMOD_CREATESOUNDEXINFO exinfo; int subsoundindex; } FMOD_STUDIO_SOUND_INFO; typedef struct FMOD_STUDIO_COMMAND_INFO { const char *commandname; int parentcommandindex; int framenumber; float frametime; FMOD_STUDIO_INSTANCETYPE instancetype; FMOD_STUDIO_INSTANCETYPE outputtype; unsigned int instancehandle; unsigned int outputhandle; } FMOD_STUDIO_COMMAND_INFO; typedef struct FMOD_STUDIO_MEMORY_USAGE { int exclusive; int inclusive; int sampledata; } FMOD_STUDIO_MEMORY_USAGE; /* FMOD Studio callbacks. */ typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_SYSTEM_CALLBACK) (FMOD_STUDIO_SYSTEM *system, FMOD_STUDIO_SYSTEM_CALLBACK_TYPE type, void *commanddata, void *userdata); typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_EVENT_CALLBACK) (FMOD_STUDIO_EVENT_CALLBACK_TYPE type, FMOD_STUDIO_EVENTINSTANCE *event, void *parameters); typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_COMMANDREPLAY_FRAME_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, float currenttime, void *userdata); typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_COMMANDREPLAY_LOAD_BANK_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, const FMOD_GUID *bankguid, const char *bankfilename, FMOD_STUDIO_LOAD_BANK_FLAGS flags, FMOD_STUDIO_BANK **bank, void *userdata); typedef FMOD_RESULT (F_CALLBACK *FMOD_STUDIO_COMMANDREPLAY_CREATE_INSTANCE_CALLBACK) (FMOD_STUDIO_COMMANDREPLAY *replay, int commandindex, FMOD_STUDIO_EVENTDESCRIPTION *eventdescription, FMOD_STUDIO_EVENTINSTANCE **instance, void *userdata); #endif // FMOD_STUDIO_COMMON_H