diff --git a/FMOD Project/Assets/Discord Disconnect Sound [mCRI5vnuc-I].mp3 b/FMOD Project/Assets/Discord Disconnect Sound [mCRI5vnuc-I].mp3 new file mode 100644 index 00000000..66c2be31 Binary files /dev/null and b/FMOD Project/Assets/Discord Disconnect Sound [mCRI5vnuc-I].mp3 differ diff --git a/FMOD Project/Assets/Discord Join Sound Effect (download) [W8svHrWMC1c].mp3 b/FMOD Project/Assets/Discord Join Sound Effect (download) [W8svHrWMC1c].mp3 new file mode 100644 index 00000000..272e828f Binary files /dev/null and b/FMOD Project/Assets/Discord Join Sound Effect (download) [W8svHrWMC1c].mp3 differ diff --git "a/FMOD Project/Assets/Grindr Notification Sound \357\275\234 Free Sound Effects [kURiwTXmGZg].mp3" "b/FMOD Project/Assets/Grindr Notification Sound \357\275\234 Free Sound Effects [kURiwTXmGZg].mp3" new file mode 100644 index 00000000..a151cfd2 Binary files /dev/null and "b/FMOD Project/Assets/Grindr Notification Sound \357\275\234 Free Sound Effects [kURiwTXmGZg].mp3" differ diff --git "a/FMOD Project/Assets/misc/Windows 10\342\247\270 Windows 8 Device Disconnect Sound [OOJi5zm9GYQ].mp3" "b/FMOD Project/Assets/misc/Windows 10\342\247\270 Windows 8 Device Disconnect Sound [OOJi5zm9GYQ].mp3" new file mode 100644 index 00000000..d11a6bea Binary files /dev/null and "b/FMOD Project/Assets/misc/Windows 10\342\247\270 Windows 8 Device Disconnect Sound [OOJi5zm9GYQ].mp3" differ diff --git "a/FMOD Project/Assets/misc/Windows 10\342\247\2708 Device Connect Sound [9omajpF7v-o].mp3" "b/FMOD Project/Assets/misc/Windows 10\342\247\2708 Device Connect Sound [9omajpF7v-o].mp3" new file mode 100644 index 00000000..8cceb36d Binary files /dev/null and "b/FMOD Project/Assets/misc/Windows 10\342\247\2708 Device Connect Sound [9omajpF7v-o].mp3" differ diff --git a/FMOD Project/Assets/Neuro_bwaa.mp3 b/FMOD Project/Assets/noises/neuro/Neuro_bwaa.mp3 similarity index 100% rename from FMOD Project/Assets/Neuro_bwaa.mp3 rename to FMOD Project/Assets/noises/neuro/Neuro_bwaa.mp3 diff --git a/FMOD Project/Metadata/Asset/{f6274a2c-44d1-41c7-b799-7c09d70693ad}.xml b/FMOD Project/Metadata/Asset/{f6274a2c-44d1-41c7-b799-7c09d70693ad}.xml new file mode 100644 index 00000000..5145c754 --- /dev/null +++ b/FMOD Project/Metadata/Asset/{f6274a2c-44d1-41c7-b799-7c09d70693ad}.xml @@ -0,0 +1,11 @@ + + + + + misc/ + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{2f4853f6-4616-43cf-befd-82a952ae3021}.xml b/FMOD Project/Metadata/AudioFile/{2f4853f6-4616-43cf-befd-82a952ae3021}.xml new file mode 100644 index 00000000..bffb0482 --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{2f4853f6-4616-43cf-befd-82a952ae3021}.xml @@ -0,0 +1,20 @@ + + + + + Discord Disconnect Sound [mCRI5vnuc-I].mp3 + + + 48 + + + 2 + + + 1.1040000000000001 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{3c8b2dda-fdd0-426c-9f25-b5e7d5d4f26a}.xml b/FMOD Project/Metadata/AudioFile/{3c8b2dda-fdd0-426c-9f25-b5e7d5d4f26a}.xml new file mode 100644 index 00000000..00404af4 --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{3c8b2dda-fdd0-426c-9f25-b5e7d5d4f26a}.xml @@ -0,0 +1,20 @@ + + + + + misc/Windows 10⧸8 Device Connect Sound [9omajpF7v-o].mp3 + + + 48 + + + 2 + + + 2.6400000000000001 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{532599c5-77c9-4519-99fe-faf8aa4215ed}.xml b/FMOD Project/Metadata/AudioFile/{532599c5-77c9-4519-99fe-faf8aa4215ed}.xml index 1fc79edd..831a8349 100644 --- a/FMOD Project/Metadata/AudioFile/{532599c5-77c9-4519-99fe-faf8aa4215ed}.xml +++ b/FMOD Project/Metadata/AudioFile/{532599c5-77c9-4519-99fe-faf8aa4215ed}.xml @@ -2,7 +2,7 @@ - Neuro_bwaa.mp3 + noises/neuro/Neuro_bwaa.mp3 48 diff --git a/FMOD Project/Metadata/AudioFile/{6cdf014a-f818-4cac-bcf1-69b0ac0b8027}.xml b/FMOD Project/Metadata/AudioFile/{6cdf014a-f818-4cac-bcf1-69b0ac0b8027}.xml new file mode 100644 index 00000000..b47dbe17 --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{6cdf014a-f818-4cac-bcf1-69b0ac0b8027}.xml @@ -0,0 +1,20 @@ + + + + + Discord Join Sound Effect (download) [W8svHrWMC1c].mp3 + + + 48 + + + 2 + + + 1.248 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{6e7d567c-d4cb-4ada-8f5a-55e59184275b}.xml b/FMOD Project/Metadata/AudioFile/{6e7d567c-d4cb-4ada-8f5a-55e59184275b}.xml new file mode 100644 index 00000000..4caacffc --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{6e7d567c-d4cb-4ada-8f5a-55e59184275b}.xml @@ -0,0 +1,20 @@ + + + + + Grindr Notification Sound ｜ Free Sound Effects [kURiwTXmGZg].mp3 + + + 48 + + + 2 + + + 7.056 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{8077285b-acee-42be-9a95-6ed396966724}.xml b/FMOD Project/Metadata/AudioFile/{8077285b-acee-42be-9a95-6ed396966724}.xml new file mode 100644 index 00000000..7591967a --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{8077285b-acee-42be-9a95-6ed396966724}.xml @@ -0,0 +1,20 @@ + + + + + misc/Windows 10⧸ Windows 8 Device Disconnect Sound [OOJi5zm9GYQ].mp3 + + + 48 + + + 2 + + + 2.6880000000000002 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/Event/{06cce0d7-5040-4d40-aeb3-9306836a6eb4}.xml b/FMOD Project/Metadata/Event/{06cce0d7-5040-4d40-aeb3-9306836a6eb4}.xml new file mode 100644 index 00000000..e6f1caa8 --- /dev/null +++ b/FMOD Project/Metadata/Event/{06cce0d7-5040-4d40-aeb3-9306836a6eb4}.xml @@ -0,0 +1,141 @@ + + + + + usb_disconnect + + + 1 + + + {3bf2e9fb-e123-4bef-b758-8e29592a0394} + + + {e1c73de1-7198-47c1-866b-4c1b984746ab} + + + {70b16d87-b8db-4609-b9cc-2a1ca569d7fc} + + + {ae4cbce2-30bc-43bc-8455-852b772466fa} + + + {920537a9-dc26-41f6-bdf9-c5edffe39e6c} + + + {db3b02c2-9bb6-46f0-a2bc-b98903eec55f} + + + {2993fa20-4bec-4f3c-be5a-d789f8070406} + + + {4e631767-bbac-4b64-8fa1-b7ef507eec11} + + + {ee130ebb-2424-4cd7-93aa-c7027c5e64bf} + + + {6f6c823e-9073-439e-9503-3b2b490ddbfb} + + + + + {c23fdad1-4fc2-446b-839a-12b7935630b4} + + + + + {fc48e926-e845-4c66-80a0-c86688b28cdd} + + + {c23fdad1-4fc2-446b-839a-12b7935630b4} + + + + + {0b16235a-3c1f-4458-a0a2-749db5966db1} + + + {ffdb385b-7730-4455-9b90-0e721ed38ac9} + + + {2b8a6038-2b39-4144-b00d-653554a1fe21} + + + + + + + {0949656a-e0e4-4fe0-a969-82060bfda542} + + + + + false + + + + + {fc48e926-e845-4c66-80a0-c86688b28cdd} + + + + + 10 + + + {6c778f69-b72a-4dab-b38a-3454bfe5fdfb} + + + {783334e1-ebf2-430b-8c48-18356c5ce2b6} + + + {e1c73de1-7198-47c1-866b-4c1b984746ab} + + + + + {21765669-47a1-4053-a3d6-ae3470bcdd52} + + + + + {3b7b4190-31b0-4914-897e-6254280012d1} + + + + + + Audio 1 + + + {8d0c0415-a330-42a2-9b92-7277de1c8211} + + + {ae2c0e62-918d-4321-b00a-57125cfbf4ba} + + + {c23fdad1-4fc2-446b-839a-12b7935630b4} + + + + + {87e148ec-0f80-44b7-adda-17834095c7eb} + + + + + + {8077285b-acee-42be-9a95-6ed396966724} + + + + + + {5ee3c2f5-c076-45ec-b13c-4dbc3053362b} + + + + + + diff --git a/FMOD Project/Metadata/Event/{14049523-9837-411b-ad33-01d15f51e16e}.xml b/FMOD Project/Metadata/Event/{14049523-9837-411b-ad33-01d15f51e16e}.xml new file mode 100644 index 00000000..6b9c355a --- /dev/null +++ b/FMOD Project/Metadata/Event/{14049523-9837-411b-ad33-01d15f51e16e}.xml @@ -0,0 +1,138 @@ + + + + + discord_dc + + + 1 + + + {3bf2e9fb-e123-4bef-b758-8e29592a0394} + + + {2d89dca8-c83c-429a-ae46-88d6e674a8ae} + + + {4733864f-3a26-4987-a8f8-a266fc802f39} + + + {0abc7d67-788b-4515-abdb-348444f178d7} + + + {4d24c1e9-2ef9-4f74-b5ca-2044b90dde4a} + + + {8cabd074-0164-4275-aec9-392dd1a29cbd} + + + {a2c0d89c-579f-4bd1-b270-8528a3dc1849} + + + {07a44085-11f6-4143-8882-b7ccfb6959f1} + + + {5b8e86f1-b1ed-418b-a225-babcb99f5abd} + + + {6f6c823e-9073-439e-9503-3b2b490ddbfb} + + + + + {535767ac-fd2e-42fc-bd8b-4ce1bd2e569f} + + + + + {2904f2bd-960b-455b-9def-97fac7954721} + + + {535767ac-fd2e-42fc-bd8b-4ce1bd2e569f} + + + + + {68d80237-0877-4023-9412-9605c2343e24} + + + {2513e43c-aa59-40d4-b3cc-d7897f93f870} + + + {2b8a6038-2b39-4144-b00d-653554a1fe21} + + + + + + + {9fa35528-2ea8-462b-bbec-5a5442d83f06} + + + + + false + + + + + {2904f2bd-960b-455b-9def-97fac7954721} + + + + + {8ce04679-2c38-491b-a4f1-cdafe004576a} + + + {7a0d3e3e-3dc2-482a-927b-871c97913adc} + + + {2d89dca8-c83c-429a-ae46-88d6e674a8ae} + + + + + {33df1b7e-ab15-4bc5-96c2-1b3feb8cc15f} + + + + + {666799ca-294e-4895-9ce7-7f67528c0f1e} + + + + + + Audio 1 + + + {01f82bf9-662a-4415-b419-d2fd66a97f14} + + + {bb411f49-525d-44b7-8b4f-a227bb7f2111} + + + {535767ac-fd2e-42fc-bd8b-4ce1bd2e569f} + + + + + {daa78094-a026-4c99-96eb-6f836dabc1a9} + + + + + + {2f4853f6-4616-43cf-befd-82a952ae3021} + + + + + + {311bdeb5-0571-4d6f-b284-f18a6d0bd172} + + + + + + diff --git a/FMOD Project/Metadata/Event/{38697652-ca2b-4c65-a7b2-11a46dfafd70}.xml b/FMOD Project/Metadata/Event/{38697652-ca2b-4c65-a7b2-11a46dfafd70}.xml new file mode 100644 index 00000000..e6aeb8aa --- /dev/null +++ b/FMOD Project/Metadata/Event/{38697652-ca2b-4c65-a7b2-11a46dfafd70}.xml @@ -0,0 +1,141 @@ + + + + + usb_connect + + + 1 + + + {3bf2e9fb-e123-4bef-b758-8e29592a0394} + + + {be9c852f-3a08-4a61-b714-53f1a7594360} + + + {6475ecfc-8da7-4cc4-9ce4-c4f052c19abf} + + + {f32f379b-d664-41e2-8811-b719b88f3d88} + + + {fb105adc-f071-41c6-970d-0927193d2525} + + + {0d3625d5-0858-4d0a-b4c8-3acc7c9ab69d} + + + {0e474836-e3cf-4b61-b8f6-36274d85b5ee} + + + {dfe62521-962e-4711-ac47-40c840607a38} + + + {d8d524c5-d330-4de3-96c3-9d688cfd88e5} + + + {6f6c823e-9073-439e-9503-3b2b490ddbfb} + + + + + {7b170194-1924-4cfe-a9f3-501eeb504b1d} + + + + + {298db2dd-16d2-4440-bf7b-782eebd22b66} + + + {7b170194-1924-4cfe-a9f3-501eeb504b1d} + + + + + {b2db0733-acaa-4e8b-bb56-6508a5016bc1} + + + {6f3ce91c-0000-4ca9-b4cc-bf3650cb96d0} + + + {2b8a6038-2b39-4144-b00d-653554a1fe21} + + + + + + + {9e1bcde7-92d1-4a0b-8430-41be3f131195} + + + + + false + + + + + {298db2dd-16d2-4440-bf7b-782eebd22b66} + + + + + 10 + + + {b2a01739-aaa3-4672-8090-3aa8d5ad606e} + + + {41857a94-9599-414c-b782-801d4af3e2ad} + + + {be9c852f-3a08-4a61-b714-53f1a7594360} + + + + + {a4450197-d98d-49ee-bcc3-e7977865fd9b} + + + + + {433ec6ba-77a4-4195-909e-ca81f41af68a} + + + + + + Audio 1 + + + {b64b092b-c570-46d6-af4b-cd1a34ac827e} + + + {2f33425b-0ecf-4ebd-b40d-63fc0c5cd874} + + + {7b170194-1924-4cfe-a9f3-501eeb504b1d} + + + + + {61a1a18c-25ef-4215-af9e-5ad81b36c75a} + + + + + + {3c8b2dda-fdd0-426c-9f25-b5e7d5d4f26a} + + + + + + {15931ad7-559d-4951-afae-f8b31d1fbba2} + + + + + + diff --git a/FMOD Project/Metadata/Event/{5fb8f8f0-0f40-44ff-b8c1-954d5a12ab7c}.xml b/FMOD Project/Metadata/Event/{5fb8f8f0-0f40-44ff-b8c1-954d5a12ab7c}.xml new file mode 100644 index 00000000..3f9f5f67 --- /dev/null +++ b/FMOD Project/Metadata/Event/{5fb8f8f0-0f40-44ff-b8c1-954d5a12ab7c}.xml @@ -0,0 +1,138 @@ + + + + + grindr + + + 1 + + + {3bf2e9fb-e123-4bef-b758-8e29592a0394} + + + {662973fe-bc82-430f-9387-59b0d0beb0ba} + + + {b7feccbd-1190-4979-9212-469c93a66b5f} + + + {e1eade59-cb7b-4e29-9278-09c55b0895b1} + + + {f22bdc58-2d93-4823-9051-fa305ddd3ad0} + + + {73cb2521-e8da-4cf8-ad3e-368578ccef20} + + + {4524bd64-5cad-4c63-905c-d68f3c2c9381} + + + {1bc9132d-9c98-4406-bd52-0693d9207a4d} + + + {39a0c111-bfe7-4700-b717-33bef63b9766} + + + {6f6c823e-9073-439e-9503-3b2b490ddbfb} + + + + + {591c86ae-ccd7-47d0-a2d5-16983e4ac7b2} + + + + + {597d79fb-714a-4c69-a959-4d94bd3e1571} + + + {591c86ae-ccd7-47d0-a2d5-16983e4ac7b2} + + + + + {c74e12fe-7c99-4ac7-9cfd-f120e4d4fcd8} + + + {061f03d0-d281-43fe-81ff-ced2e60229f8} + + + {2b8a6038-2b39-4144-b00d-653554a1fe21} + + + + + + + {1142b64b-1683-4b62-ad39-869461f4a614} + + + + + false + + + + + {597d79fb-714a-4c69-a959-4d94bd3e1571} + + + + + {bc8dfa2b-0c4f-4567-af0a-bdacea844e70} + + + {ff5b5887-a2cc-4880-aba7-0fc12da7b91c} + + + {662973fe-bc82-430f-9387-59b0d0beb0ba} + + + + + {1c12179d-52a0-4c13-995f-a71ab05ef44d} + + + + + {a66fbf99-01bf-42a0-b724-739e01d5070d} + + + + + + Audio 1 + + + {0ba48700-23ad-417b-96f6-aa1c32259918} + + + {bf1129c6-ec1d-41ab-bb8c-54c78373b770} + + + {591c86ae-ccd7-47d0-a2d5-16983e4ac7b2} + + + + + {865df5b4-f9af-4815-9b7e-f704219e6950} + + + + + + {6e7d567c-d4cb-4ada-8f5a-55e59184275b} + + + + + + {b54b79e6-ab9e-4b65-b1ba-919daa53780b} + + + + + + diff --git a/FMOD Project/Metadata/Event/{f12f41c0-da2e-4f68-a8f7-5b3e0b730ccd}.xml b/FMOD Project/Metadata/Event/{f12f41c0-da2e-4f68-a8f7-5b3e0b730ccd}.xml new file mode 100644 index 00000000..7286c83f --- /dev/null +++ b/FMOD Project/Metadata/Event/{f12f41c0-da2e-4f68-a8f7-5b3e0b730ccd}.xml @@ -0,0 +1,138 @@ + + + + + discord_join + + + 1 + + + {3bf2e9fb-e123-4bef-b758-8e29592a0394} + + + {6c89c7f4-fce6-48a9-bd13-81a15148b46b} + + + {9c117810-294b-4f49-9150-3bf432cfc269} + + + {d17107ad-3d85-4567-a241-c90e00010e76} + + + {c3d50251-eec9-4b7b-be0d-a2ebd822b7f3} + + + {6cdec00d-b347-48a0-9ef1-04497e5ab2b5} + + + {be70cd8b-8761-49e4-94a6-f6cb01950394} + + + {0741ca9b-9100-4483-825c-64ff10061922} + + + {d02e2daf-09ae-44f4-9da4-a819e9b646ae} + + + {6f6c823e-9073-439e-9503-3b2b490ddbfb} + + + + + {6b7e62cc-b4ac-4f75-a0a0-68f97a7ad2f4} + + + + + {10723a22-829e-4c3f-8e6f-c3dfce8bd047} + + + {6b7e62cc-b4ac-4f75-a0a0-68f97a7ad2f4} + + + + + {c973472c-826e-4e88-b388-e8203cf276d0} + + + {78f8be1d-ff8a-4c5d-ae71-ed7f05e503a6} + + + {2b8a6038-2b39-4144-b00d-653554a1fe21} + + + + + + + {64d1f0a1-5cc0-4171-8f08-3b78d330073b} + + + + + false + + + + + {10723a22-829e-4c3f-8e6f-c3dfce8bd047} + + + + + {d27353ec-d1e2-4431-ac9b-04bc7f8d0ad6} + + + {0f7ce29a-90c9-4941-8a93-442aca1aa8d5} + + + {6c89c7f4-fce6-48a9-bd13-81a15148b46b} + + + + + {a2510283-e8f5-4f6e-b7c5-458e8d546405} + + + + + {f911c4c3-bbc0-41e3-b0f4-de23a7c7b3a7} + + + + + + Audio 1 + + + {47959bf1-0c63-46a5-b366-1468d2aa742b} + + + {fe2a043a-8052-46f4-889a-81eae8f30e04} + + + {6b7e62cc-b4ac-4f75-a0a0-68f97a7ad2f4} + + + + + {56603de8-f956-49c2-8944-2ab149f21a10} + + + + + + {6cdf014a-f818-4cac-bcf1-69b0ac0b8027} + + + + + + {4844cb67-e79d-4ad1-90bb-3e51c175c236} + + + + + + diff --git a/FMOD Project/Metadata/Event/{fea7a256-904a-4b2d-9a9a-b7650c10c51c}.xml b/FMOD Project/Metadata/Event/{fea7a256-904a-4b2d-9a9a-b7650c10c51c}.xml new file mode 100644 index 00000000..224d9e82 --- /dev/null +++ b/FMOD Project/Metadata/Event/{fea7a256-904a-4b2d-9a9a-b7650c10c51c}.xml @@ -0,0 +1,138 @@ + + + + + someone_tell_vedal + + + 1 + + + {3bf2e9fb-e123-4bef-b758-8e29592a0394} + + + {871c781a-867a-402f-b028-a1617d502e06} + + + {1bedf73e-9de0-425c-a496-55e9ade2a028} + + + {b6074162-4272-4154-80db-992d2a0c1fc9} + + + {b1af4d0b-73e0-4e75-ac94-802b859e7b2d} + + + {da75110a-ce0b-4f1f-81cc-0631382dad36} + + + {2b5fedc0-8089-4bc6-a32e-7fd56517c63d} + + + {d63a5cf8-3036-47aa-9462-6149acc37798} + + + {668fd34e-77ce-4194-ba61-5036e315d3d8} + + + {6f6c823e-9073-439e-9503-3b2b490ddbfb} + + + + + {c6a87691-a64d-42f3-9d9b-55e083e81b82} + + + + + {df38ecd9-b91d-4fe7-8302-9fb77a22e0c6} + + + {c6a87691-a64d-42f3-9d9b-55e083e81b82} + + + + + {69239fee-176e-4022-a86b-8f5b2a6067a3} + + + {f8cddf12-1a58-4b01-abcd-939ba4c47c59} + + + {2b8a6038-2b39-4144-b00d-653554a1fe21} + + + + + + + {e695357b-25e4-4f41-8ac7-f43e62629db5} + + + + + false + + + + + {df38ecd9-b91d-4fe7-8302-9fb77a22e0c6} + + + + + {0eb59845-3142-42d5-a1e4-8f8f21456ba9} + + + {7243b999-da56-417d-997a-f27f5b462e1d} + + + {871c781a-867a-402f-b028-a1617d502e06} + + + + + {c0a47580-2665-41f9-8b51-1a90846ff57c} + + + + + {b3983b2c-76c5-402f-b78e-d677b43e129d} + + + + + + Audio 1 + + + {37ac4fef-9f09-4a34-afd2-860227a5a1d9} + + + {df2f09c4-5f39-41d3-9114-58a0bbd7be31} + + + {c6a87691-a64d-42f3-9d9b-55e083e81b82} + + + + + {2c31f27b-2632-4731-b128-5ff657fc2c6a} + + + + + + {8ea0d17a-eabb-48b4-bb2c-78ce3689ac1e} + + + + + + {3128a0f9-838f-4815-ad61-262959019f13} + + + + + + diff --git a/FMOD Project/Metadata/EventFolder/{3bf2e9fb-e123-4bef-b758-8e29592a0394}.xml b/FMOD Project/Metadata/EventFolder/{3bf2e9fb-e123-4bef-b758-8e29592a0394}.xml new file mode 100644 index 00000000..e392fe17 --- /dev/null +++ b/FMOD Project/Metadata/EventFolder/{3bf2e9fb-e123-4bef-b758-8e29592a0394}.xml @@ -0,0 +1,11 @@ + + + + + troll + + + {b1cc6170-82f0-4087-b202-f3bffb8cbc9b} + + + diff --git a/SCHIZO/Resources/FMODBanks/SCHIZO.bank b/SCHIZO/Resources/FMODBanks/SCHIZO.bank index 57ab4f61..93c52894 100644 Binary files a/SCHIZO/Resources/FMODBanks/SCHIZO.bank and b/SCHIZO/Resources/FMODBanks/SCHIZO.bank differ diff --git a/SCHIZO/Resources/FMODBanks/SCHIZO.strings.bank b/SCHIZO/Resources/FMODBanks/SCHIZO.strings.bank index 9cda3b58..a9d8bca5 100644 Binary files a/SCHIZO/Resources/FMODBanks/SCHIZO.strings.bank and b/SCHIZO/Resources/FMODBanks/SCHIZO.strings.bank differ diff --git a/SCHIZO/SwarmControl/EggTimer.cs b/SCHIZO/SwarmControl/EggTimer.cs new file mode 100644 index 00000000..b0f664f1 --- /dev/null +++ b/SCHIZO/SwarmControl/EggTimer.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections; +using UnityEngine; +using UWE; + +namespace SCHIZO.SwarmControl; + +#nullable enable +internal class EggTimer : IDisposable +{ + private readonly Coroutine _timerCoro; + private readonly Action _onStart; + private readonly Action _onEnd; + private readonly Action? _onTick; + private bool _active; + private float _timeLeft; + + public bool IsActive => _active; + public float TimeLeft => _timeLeft; + + public EggTimer(Action onStart, Action onEnd, Action? onTick = null) + { + _onStart = onStart; + _onEnd = onEnd; + _onTick = onTick; + _timerCoro = CoroutineHost.StartCoroutine(TimerCoro()); + } + + public void AddTime(float seconds) + { + _timeLeft += seconds; + if (_timeLeft > 0) + Start(); + } + + private IEnumerator TimerCoro() + { + while (true) + { + yield return new WaitForFixedUpdate(); + if (!_active) continue; + + _onTick?.Invoke(); + _timeLeft -= Time.fixedDeltaTime; + if (_timeLeft <= 0) + { + _timeLeft = 0; + End(); + } + } + } + + public void Start() + { + if (_active) return; + _active = true; + _onStart(); + } + public void End() + { + if (!_active) return; + _active = false; + _onEnd(); + } + + public void Dispose() + { + CoroutineHost.StopCoroutine(_timerCoro); + } +} diff --git a/SCHIZO/SwarmControl/Redeems/Annoying/HideVehicleSignal.cs b/SCHIZO/SwarmControl/Redeems/Annoying/HideVehicleSignal.cs index 0c7a3bb8..d789d8eb 100644 --- a/SCHIZO/SwarmControl/Redeems/Annoying/HideVehicleSignal.cs +++ b/SCHIZO/SwarmControl/Redeems/Annoying/HideVehicleSignal.cs @@ -1,11 +1,9 @@ -using System.Collections; using System.Collections.Generic; using System.Linq; using SCHIZO.Commands.Base; using SCHIZO.Commands.Context; using SCHIZO.Commands.Output; using UnityEngine; -using UWE; namespace SCHIZO.SwarmControl.Redeems.Annoying; @@ -18,32 +16,18 @@ namespace SCHIZO.SwarmControl.Redeems.Annoying; internal class HideVehicleSignal : Command, IParameters { public IReadOnlyList Parameters => []; - private Coroutine _timer = null!; - private float _timeLeft; - private bool _active; + private EggTimer _timer; private static float Duration = 30f; - private IEnumerator TimerCoro() + public HideVehicleSignal() { - while (true) - { - yield return null; - if (!_active) continue; - - _timeLeft -= Time.deltaTime; - if (_timeLeft <= 0) - { - _timeLeft = 0; - Deactivate(); - } - } + _timer = new(Activate, Deactivate); } protected override object ExecuteCore(CommandExecutionContext ctx) { - _timer ??= CoroutineHost.StartCoroutine(TimerCoro()); - _timeLeft += Duration; - Activate(); + _timer.AddTime(Duration); + _timer.Start(); return CommonResults.OK(); } @@ -65,8 +49,6 @@ protected override object ExecuteCore(CommandExecutionContext ctx) private void Activate() { - if (_active) return; - _active = true; PingInstance[] allPings = GameObject.FindObjectsOfType(); foreach (PingInstance p in allPings.Where(p => _vehiclePingTypes.Contains(p.pingType))) { @@ -79,8 +61,6 @@ private void Activate() } private void Deactivate() { - if (!_active) return; - _active = false; foreach (PingInstance p in _disabledPings) { if (!p) continue; diff --git a/SCHIZO/SwarmControl/Redeems/Audio/PlayNoise.cs b/SCHIZO/SwarmControl/Redeems/Audio/PlayNoise.cs new file mode 100644 index 00000000..39f9ae82 --- /dev/null +++ b/SCHIZO/SwarmControl/Redeems/Audio/PlayNoise.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using SCHIZO.Commands.Base; +using SCHIZO.Commands.Context; +using SCHIZO.Commands.Output; +using SCHIZO.Helpers; +using SCHIZO.SwarmControl.Redeems.Enums; + +namespace SCHIZO.SwarmControl.Redeems.Audio; +#nullable enable +[Redeem( + Name = "redeem_noise", + DisplayName = "Play Sound", + Announce = false +)] +internal class PlayNoise : Command, IParameters +{ + public IReadOnlyList Parameters => [ + new Parameter(new("noise", "Sound"), typeof(NormalNoise)) + ]; + + protected override object? ExecuteCore(CommandExecutionContext ctx) + { + if (!Player.main) return CommonResults.Error("Requires a loaded game."); + + if (!ctx.Input.GetNamedArguments().TryGetValue("noise", out NormalNoise noise) + || !NoiseRegistry.Normal.TryGetValue(noise, out string path)) + { + return CommonResults.Error("Noise not found"); + } + FMODHelpers.PlayOneShotAttached(path, Player.main.gameObject); + return CommonResults.OK(); + } +} diff --git a/SCHIZO/SwarmControl/Redeems/Audio/PlayTrollNoise.cs b/SCHIZO/SwarmControl/Redeems/Audio/PlayTrollNoise.cs new file mode 100644 index 00000000..4a1f7d74 --- /dev/null +++ b/SCHIZO/SwarmControl/Redeems/Audio/PlayTrollNoise.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using SCHIZO.Commands.Base; +using SCHIZO.Commands.Context; +using SCHIZO.Commands.Output; +using SCHIZO.Helpers; +using SCHIZO.SwarmControl.Redeems.Enums; + +namespace SCHIZO.SwarmControl.Redeems.Audio; + +#nullable enable +[Redeem( + Name = "redeem_trollnoise", + DisplayName = "Play Troll Sound", + Announce = false +)] +internal class PlayTrollNoise : Command, IParameters +{ + public IReadOnlyList Parameters => [ + new(new("noise", "Sound"), typeof(TrollNoise)) + ]; + + protected override object ExecuteCore(CommandExecutionContext ctx) + { + if (!Player.main) return CommonResults.Error("Requires a loaded game."); + + if (!ctx.Input.GetNamedArguments().TryGetValue("noise", out TrollNoise noise) + || !NoiseRegistry.Troll.TryGetValue(noise, out string path)) + { + return CommonResults.Error("Noise not found"); + } + FMODHelpers.PlayOneShotAttached(path, Player.main.gameObject); + return CommonResults.OK(); + } +} diff --git a/SCHIZO/SwarmControl/Redeems/Enums/NormalNoise.cs b/SCHIZO/SwarmControl/Redeems/Enums/NormalNoise.cs new file mode 100644 index 00000000..a36280ed --- /dev/null +++ b/SCHIZO/SwarmControl/Redeems/Enums/NormalNoise.cs @@ -0,0 +1,29 @@ +using System.Runtime.Serialization; + +namespace SCHIZO.SwarmControl.Redeems.Enums; + +internal enum NormalNoise +{ + [EnumMember(Value = "Ermfish Ambient")] + ErmfishAmbient, + [EnumMember(Value = "Ermfish Cook")] + ErmfishCook, + [EnumMember(Value = "Ermfish Eat")] + ErmfishEat, + [EnumMember(Value = "Anneel Ambient")] + AnneelAmbient, + [EnumMember(Value = "Anneel Hurt")] + AnneelHurt, + [EnumMember(Value = "Tutel Ambient")] + TutelAmbient, + [EnumMember(Value = "Tutel Cook")] + TutelCook, + [EnumMember(Value = "Tutel Eat")] + TutelEat, + [EnumMember(Value = "Ermshark Ambient")] + ErmsharkAmbient, + [EnumMember(Value = "Ermshark Attack")] + ErmsharkAttack, + [EnumMember(Value = "Ermshark Hurt")] + ErmsharkHurt +} diff --git a/SCHIZO/SwarmControl/Redeems/Enums/TrollNoise.cs b/SCHIZO/SwarmControl/Redeems/Enums/TrollNoise.cs new file mode 100644 index 00000000..1f8253d5 --- /dev/null +++ b/SCHIZO/SwarmControl/Redeems/Enums/TrollNoise.cs @@ -0,0 +1,20 @@ +using System.Runtime.Serialization; + +namespace SCHIZO.SwarmControl.Redeems.Enums; + +internal enum TrollNoise +{ + [EnumMember(Value = "Someone tell Vedal")] + SomeoneTellVedal, + [EnumMember(Value = "Leviathan Roar")] + Leviathan, + [EnumMember(Value = "Discord Disconnect")] + DiscordDisconnect, + [EnumMember(Value = "Discord Join")] + DiscordJoin, + [EnumMember(Value = "USB Disconnect")] + UsbDisconnect, + [EnumMember(Value = "USB Connect")] + UsbConnect, + Grindr, +} diff --git a/SCHIZO/SwarmControl/Redeems/Misc/Floaties.cs b/SCHIZO/SwarmControl/Redeems/Misc/Floaties.cs new file mode 100644 index 00000000..6239f91a --- /dev/null +++ b/SCHIZO/SwarmControl/Redeems/Misc/Floaties.cs @@ -0,0 +1,47 @@ +using System.Collections.Generic; +using SCHIZO.Commands.Base; +using SCHIZO.Commands.Context; +using SCHIZO.Commands.Output; +using UnityEngine; + +namespace SCHIZO.SwarmControl.Redeems.Misc; + +#nullable enable +[Redeem( + Name = "redeem_airbladder", + DisplayName = "Floaties", + Description = "Push player up towards the surface for 10 seconds. Does nothing if above water." +)] +internal class Floaties : Command, IParameters +{ + public IReadOnlyList Parameters => []; + private static readonly float buoyancyForce = 50f; + private static readonly float Duration = 10f; + private readonly EggTimer _timer; + + public Floaties() + { + _timer = new(() => { }, () => { }, FixedUpdate); + } + + protected override object ExecuteCore(CommandExecutionContext ctx) + { + _timer.AddTime(Duration); + _timer.Start(); + return CommonResults.OK(); + } + + private void FixedUpdate() + { + if (!Player.main) return; + if (!Player.main.IsUnderwaterForSwimming()) return; + + float depth = Ocean.GetOceanLevel() - 1f - Player.main.transform.position.y; + Rigidbody rb = Player.main.rigidBody; + if (rb.velocity.y * Time.fixedDeltaTime < depth) + { + Vector3 vector = Vector3.up * buoyancyForce; + rb.AddForce(vector, ForceMode.Acceleration); + } + } +} diff --git a/SCHIZO/SwarmControl/Redeems/NoiseRegistry.cs b/SCHIZO/SwarmControl/Redeems/NoiseRegistry.cs new file mode 100644 index 00000000..0bb76918 --- /dev/null +++ b/SCHIZO/SwarmControl/Redeems/NoiseRegistry.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using SCHIZO.SwarmControl.Redeems.Enums; + +namespace SCHIZO.SwarmControl.Redeems; + +internal static class NoiseRegistry +{ + public static readonly Dictionary Normal = new() + { + [NormalNoise.ErmfishAmbient] = "event:/SCHIZO/creatures/ermfish/ambient_world", + [NormalNoise.ErmfishCook] = "event:/SCHIZO/creatures/ermfish/cook", + [NormalNoise.ErmfishEat] = "event:/SCHIZO/creatures/ermfish/eat", + [NormalNoise.AnneelAmbient] = "event:/SCHIZO/creatures/anneel/ambient", + [NormalNoise.AnneelHurt] = "event:/SCHIZO/creatures/anneel/hurt", + [NormalNoise.ErmsharkAmbient] = "event:/SCHIZO/creatures/ermshark/ambient", + [NormalNoise.ErmsharkAttack] = "event:/SCHIZO/creatures/ermshark/attack", + [NormalNoise.ErmsharkHurt] = "event:/SCHIZO/creatures/ermshark/hurt", + [NormalNoise.TutelAmbient] = "event:/SCHIZO/creatures/tutel/ambient", + [NormalNoise.TutelCook] = "event:/SCHIZO/creatures/tutel/cook", + [NormalNoise.TutelEat] = "event:/SCHIZO/creatures/tutel/eat" + }; + + public static readonly Dictionary Troll = new() + { + [TrollNoise.SomeoneTellVedal] = "event:/SCHIZO/troll/someone_tell_vedal", + [TrollNoise.Leviathan] = "event:/bz/creature/shadow_leviathan/post_kill_roar", + [TrollNoise.UsbDisconnect] = "event:/SCHIZO/troll/usb_disconnect", + [TrollNoise.UsbConnect] = "event:/SCHIZO/troll/usb_connect", + [TrollNoise.DiscordDisconnect] = "event:/SCHIZO/troll/discord_dc", + [TrollNoise.DiscordJoin] = "event:/SCHIZO/troll/discord_join", + [TrollNoise.Grindr] = "event:/SCHIZO/troll/grindr" + }; +}