diff --git a/FMOD Project/Assets/neuro logs/hate vedal/Vedal_I_love_you_Neuro.mp3 b/FMOD Project/Assets/neuro logs/hate vedal/Vedal_I_love_you_Neuro.mp3 new file mode 100644 index 00000000..1ea98746 Binary files /dev/null and b/FMOD Project/Assets/neuro logs/hate vedal/Vedal_I_love_you_Neuro.mp3 differ diff --git a/FMOD Project/Assets/neuro logs/hate vedal/door-close.ogg b/FMOD Project/Assets/neuro logs/hate vedal/door-close.ogg new file mode 100644 index 00000000..ebc318aa Binary files /dev/null and b/FMOD Project/Assets/neuro logs/hate vedal/door-close.ogg differ diff --git a/FMOD Project/Assets/neuro logs/hate vedal/door-open.ogg b/FMOD Project/Assets/neuro logs/hate vedal/door-open.ogg new file mode 100644 index 00000000..4a730a4a Binary files /dev/null and b/FMOD Project/Assets/neuro logs/hate vedal/door-open.ogg differ diff --git a/FMOD Project/Assets/noises/neuro/Evil_By_the_way_I_hate_you.mp3 b/FMOD Project/Assets/noises/neuro/Evil_By_the_way_I_hate_you.mp3 index 266677fb..c9f9432f 100644 Binary files a/FMOD Project/Assets/noises/neuro/Evil_By_the_way_I_hate_you.mp3 and b/FMOD Project/Assets/noises/neuro/Evil_By_the_way_I_hate_you.mp3 differ diff --git a/FMOD Project/Assets/noises/neuro/Evil_Frick_you_Youre_fired.mp3 b/FMOD Project/Assets/noises/neuro/Evil_Frick_you_Youre_fired.mp3 new file mode 100644 index 00000000..086c91ac Binary files /dev/null and b/FMOD Project/Assets/noises/neuro/Evil_Frick_you_Youre_fired.mp3 differ diff --git a/FMOD Project/Assets/noises/neuro/Evil_Nyaaaaah.mp3 b/FMOD Project/Assets/noises/neuro/Evil_Nyaaaaah.mp3 new file mode 100644 index 00000000..6b90fb0e Binary files /dev/null and b/FMOD Project/Assets/noises/neuro/Evil_Nyaaaaah.mp3 differ diff --git a/FMOD Project/Assets/noises/neuro/Evil_What_the_fuck.mp3 b/FMOD Project/Assets/noises/neuro/Evil_What_the_fuck.mp3 new file mode 100644 index 00000000..4a1153fe Binary files /dev/null and b/FMOD Project/Assets/noises/neuro/Evil_What_the_fuck.mp3 differ diff --git a/FMOD Project/Assets/noises/neuro/dee_snuts.mp3 b/FMOD Project/Assets/noises/neuro/dee_snuts.mp3 new file mode 100644 index 00000000..0042b0a1 Binary files /dev/null and b/FMOD Project/Assets/noises/neuro/dee_snuts.mp3 differ diff --git a/FMOD Project/Assets/noises/neuro/evil_kill_x10.mp3 b/FMOD Project/Assets/noises/neuro/evil_kill_x10.mp3 new file mode 100644 index 00000000..0700c38c Binary files /dev/null and b/FMOD Project/Assets/noises/neuro/evil_kill_x10.mp3 differ diff --git a/FMOD Project/Assets/noises/neuro/evil_noise_12.mp3 b/FMOD Project/Assets/noises/neuro/evil_noise_12.mp3 deleted file mode 100644 index 1e3807a4..00000000 Binary files a/FMOD Project/Assets/noises/neuro/evil_noise_12.mp3 and /dev/null differ diff --git a/FMOD Project/Assets/noises/vedal/vedal_cry.mp3 b/FMOD Project/Assets/noises/vedal/vedal_cry.mp3 new file mode 100644 index 00000000..8066029f Binary files /dev/null and b/FMOD Project/Assets/noises/vedal/vedal_cry.mp3 differ diff --git a/FMOD Project/Assets/noises/vedal/vedal_hbd_shiro.mp3 b/FMOD Project/Assets/noises/vedal/vedal_hbd_shiro.mp3 new file mode 100644 index 00000000..6dc7398e Binary files /dev/null and b/FMOD Project/Assets/noises/vedal/vedal_hbd_shiro.mp3 differ diff --git a/FMOD Project/Metadata/AudioFile/{5946af75-408a-4a4b-8404-f8a774e48da3}.xml b/FMOD Project/Metadata/AudioFile/{0722068e-3b5b-4621-8835-5eeb14595ebe}.xml similarity index 74% rename from FMOD Project/Metadata/AudioFile/{5946af75-408a-4a4b-8404-f8a774e48da3}.xml rename to FMOD Project/Metadata/AudioFile/{0722068e-3b5b-4621-8835-5eeb14595ebe}.xml index d54f4577..c97e3b09 100644 --- a/FMOD Project/Metadata/AudioFile/{5946af75-408a-4a4b-8404-f8a774e48da3}.xml +++ b/FMOD Project/Metadata/AudioFile/{0722068e-3b5b-4621-8835-5eeb14595ebe}.xml @@ -1,8 +1,8 @@ - + - noises/neuro/evil_noise_12.mp3 + noises/neuro/evil_kill_x10.mp3 44.0999985 @@ -11,7 +11,7 @@ 2 - 1.2277551020408164 + 3.4742857142857142 {ed559c48-6dff-4cc2-8829-33aeecf805d3} diff --git a/FMOD Project/Metadata/AudioFile/{23476d98-39b6-4fc5-aa49-43e44c1a98c7}.xml b/FMOD Project/Metadata/AudioFile/{23476d98-39b6-4fc5-aa49-43e44c1a98c7}.xml new file mode 100644 index 00000000..0bf1fc30 --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{23476d98-39b6-4fc5-aa49-43e44c1a98c7}.xml @@ -0,0 +1,20 @@ + + + + + neuro logs/hate vedal/Vedal_I_love_you_Neuro.mp3 + + + 44.0999985 + + + 2 + + + 1.0187755102040816 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{26dc873d-d638-49f4-ab7f-35b631e09deb}.xml b/FMOD Project/Metadata/AudioFile/{26dc873d-d638-49f4-ab7f-35b631e09deb}.xml new file mode 100644 index 00000000..fac2c449 --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{26dc873d-d638-49f4-ab7f-35b631e09deb}.xml @@ -0,0 +1,20 @@ + + + + + noises/neuro/Evil_Nyaaaaah.mp3 + + + 48 + + + 2 + + + 1.272 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{37306b76-5672-4214-8f38-e2730b3edf63}.xml b/FMOD Project/Metadata/AudioFile/{37306b76-5672-4214-8f38-e2730b3edf63}.xml new file mode 100644 index 00000000..bea399eb --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{37306b76-5672-4214-8f38-e2730b3edf63}.xml @@ -0,0 +1,23 @@ + + + + + door-open-close-45475.mp3 from Pixabay + + + neuro logs/hate vedal/door-open.ogg + + + 24 + + + 2 + + + 0.5757916666666667 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{3bb998c3-77cf-4500-8ce5-fba306cb015b}.xml b/FMOD Project/Metadata/AudioFile/{3bb998c3-77cf-4500-8ce5-fba306cb015b}.xml new file mode 100644 index 00000000..aa7308d6 --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{3bb998c3-77cf-4500-8ce5-fba306cb015b}.xml @@ -0,0 +1,20 @@ + + + + + noises/neuro/Evil_What_the_fuck.mp3 + + + 44.0999985 + + + 2 + + + 0.80979591836734699 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{42f0515c-9c63-4b01-bc89-d3ac8b07f386}.xml b/FMOD Project/Metadata/AudioFile/{42f0515c-9c63-4b01-bc89-d3ac8b07f386}.xml new file mode 100644 index 00000000..dcc1add9 --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{42f0515c-9c63-4b01-bc89-d3ac8b07f386}.xml @@ -0,0 +1,20 @@ + + + + + noises/vedal/vedal_cry.mp3 + + + 44.0999985 + + + 2 + + + 0.91428571428571426 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{5c9e77ad-015f-4ff7-83f1-8d4bb3d0559c}.xml b/FMOD Project/Metadata/AudioFile/{5c9e77ad-015f-4ff7-83f1-8d4bb3d0559c}.xml new file mode 100644 index 00000000..54a7c70c --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{5c9e77ad-015f-4ff7-83f1-8d4bb3d0559c}.xml @@ -0,0 +1,20 @@ + + + + + noises/neuro/dee_snuts.mp3 + + + 44.0999985 + + + 2 + + + 0.78367346938775506 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{8f7cb188-051c-4789-b81d-c20864bd6ca1}.xml b/FMOD Project/Metadata/AudioFile/{8f7cb188-051c-4789-b81d-c20864bd6ca1}.xml new file mode 100644 index 00000000..ad89f73a --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{8f7cb188-051c-4789-b81d-c20864bd6ca1}.xml @@ -0,0 +1,20 @@ + + + + + noises/vedal/vedal_hbd_shiro.mp3 + + + 44.0999985 + + + 2 + + + 3.0563265306122447 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{b8585aed-9f1e-4f2f-9dea-f62b11258c1d}.xml b/FMOD Project/Metadata/AudioFile/{b8585aed-9f1e-4f2f-9dea-f62b11258c1d}.xml new file mode 100644 index 00000000..4b36b7ae --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{b8585aed-9f1e-4f2f-9dea-f62b11258c1d}.xml @@ -0,0 +1,23 @@ + + + + + door-open-close-45475.mp3 from Pixabay + + + neuro logs/hate vedal/door-close.ogg + + + 24 + + + 2 + + + 0.59379166666666672 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/AudioFile/{c5c3b0a0-3541-4428-a557-abade8c82453}.xml b/FMOD Project/Metadata/AudioFile/{c5c3b0a0-3541-4428-a557-abade8c82453}.xml new file mode 100644 index 00000000..da0a5b83 --- /dev/null +++ b/FMOD Project/Metadata/AudioFile/{c5c3b0a0-3541-4428-a557-abade8c82453}.xml @@ -0,0 +1,20 @@ + + + + + noises/neuro/Evil_Frick_you_Youre_fired.mp3 + + + 44.0999985 + + + 2 + + + 3.4220408163265308 + + + {ed559c48-6dff-4cc2-8829-33aeecf805d3} + + + diff --git a/FMOD Project/Metadata/Event/{456dcb09-f486-4057-b738-6aea9c07b7f4}.xml b/FMOD Project/Metadata/Event/{456dcb09-f486-4057-b738-6aea9c07b7f4}.xml index 861224e0..efedffc2 100644 --- a/FMOD Project/Metadata/Event/{456dcb09-f486-4057-b738-6aea9c07b7f4}.xml +++ b/FMOD Project/Metadata/Event/{456dcb09-f486-4057-b738-6aea9c07b7f4}.xml @@ -133,6 +133,7 @@ {4a9a5656-50c8-46ac-bbe7-c8f1879ce4b9} {8e6610b3-7d03-4113-a6c1-c7c01a2976ce} {46b207d8-db05-4d89-9953-fb1f98dad3a3} + {24ad03ba-0a9d-4bb1-92de-fc6a33342333} @@ -158,5 +159,10 @@ {39e4f3c3-278f-405b-8105-1fd83aa8c29c} + + + {8f7cb188-051c-4789-b81d-c20864bd6ca1} + + diff --git a/FMOD Project/Metadata/Event/{4a6365a3-626f-4f66-a8a2-902bbb2158b0}.xml b/FMOD Project/Metadata/Event/{4a6365a3-626f-4f66-a8a2-902bbb2158b0}.xml index 0e6b963a..f11391b0 100644 --- a/FMOD Project/Metadata/Event/{4a6365a3-626f-4f66-a8a2-902bbb2158b0}.xml +++ b/FMOD Project/Metadata/Event/{4a6365a3-626f-4f66-a8a2-902bbb2158b0}.xml @@ -5,7 +5,7 @@ pda_neuro_hatevedal - 0 + 1 {159d605f-ef6e-4d74-b806-0de959efc286} @@ -26,6 +26,8 @@ {9f90cf1b-462f-4e33-bb5c-b7a95804af7c} + {bcbeee46-1984-469a-a48f-8483008bcac4} + {d87df16c-31f2-4a01-9e0e-e805688e5e46} {0f446b1b-6463-499d-bad7-3bc653d5b31f} @@ -58,6 +60,33 @@ + + + {e47d090e-06b1-4cd6-a29c-69d10063309f} + {3526fca8-f783-4106-b1d4-801af4f04eac} + {3f1223a2-d735-42ff-b925-2aacd29a8133} + + + {e0848749-b592-4411-8c65-481a160f2da9} + + + + + {dfb6db10-4a7d-4e2c-8fd3-fbf951e28607} + {5eb3f480-8b2c-44d2-ab57-adc0c1d2d5c9} + + + {ba19cdbc-4e5c-4ea0-9c82-83f2e84b3c9d} + {5fd91ec9-9b84-43a6-bee2-3b05da548487} + {feaadca8-e891-4d50-b78b-358e9620b5f4} + {6b8f8b3e-46ba-470a-9e15-34adc3cda9d1} + {c1824b2d-b608-4af5-aee7-a88c28004365} + {07ba01a6-6130-4307-896e-4c2f3a6fb43c} + + + {3dad8759-7fad-4247-867f-35aa5b5ea792} + + {7840d320-d2d2-49e5-b418-68cbd035cdfc} @@ -81,9 +110,21 @@ {317bb222-adb7-44c9-9f7f-649d2713f43a} {914a4aaf-feb6-4db1-b189-47ee298ecfa7} {f6b6a0e1-677a-45dd-bc19-518b700082fa} + {e47d090e-06b1-4cd6-a29c-69d10063309f} + {ba19cdbc-4e5c-4ea0-9c82-83f2e84b3c9d} + {3526fca8-f783-4106-b1d4-801af4f04eac} + {5fd91ec9-9b84-43a6-bee2-3b05da548487} + {3f1223a2-d735-42ff-b925-2aacd29a8133} + {07ba01a6-6130-4307-896e-4c2f3a6fb43c} + {feaadca8-e891-4d50-b78b-358e9620b5f4} + {6b8f8b3e-46ba-470a-9e15-34adc3cda9d1} + {c1824b2d-b608-4af5-aee7-a88c28004365} + + 10 + {aca8f9e1-9981-4a2f-b044-3f17183d24aa} @@ -100,9 +141,170 @@ + + + 1.0187755102040816 + + + {23476d98-39b6-4fc5-aa49-43e44c1a98c7} + + + + + 136.20000000000002 + + + 0.49632653061224491 + + + {fade1009-bddc-4edc-8d2d-39121bea5cc1} + + + + + 139.59379166666668 + + + 0.99265306122448982 + + + {f2a9f0fd-22ab-40d9-8a9c-47d18b1b5b67} + + + + + Vedal + + + {95ea163b-1154-487d-a454-806f0d42e7bc} + + + {3ae8635a-0a6d-4788-9a81-f66eb74c0e24} + + + {0740b8c9-97aa-43fa-a113-b81123bf4f5c} + + + + + {6202ce35-f9c4-461d-97e3-032a3e8312bc} + + + + + {8ccbe93a-20ad-42b4-9fec-4ee24a6791fb} + + + + + 1.3 + + + 0.80979591836734699 + + + -6 + + + {3bb998c3-77cf-4500-8ce5-fba306cb015b} + + + + + 137.09999999999999 + + + 2.1420408163265305 + + + {1b02163c-4ee2-41d3-9893-14a52864a430} + + + {fe0bdae8-5c0a-4d07-938b-b18516649505} + + + + + 137.30000000000001 + + + 0.5757916666666667 + + + -10 + + + {14f1289d-22ff-477d-94c1-97d7f4663123} + + + {37306b76-5672-4214-8f38-e2730b3edf63} + + + + + 139 + + + 0.59379166666666672 + + + -10 + + + {b8585aed-9f1e-4f2f-9dea-f62b11258c1d} + + + + + 2.9000000000000004 + + + 0.59379166666666672 + + + 21 + + + -10 + + + {b8585aed-9f1e-4f2f-9dea-f62b11258c1d} + + + + + 4 + + + 3.9444897959183671 + + + -9 + + + {b6db1c8f-6e16-419d-8ff1-6f9f3816dc8b} + + + {f8059a99-d544-43b8-8a43-e8323c4d3f48} + + + + + Evil + + + {f2b75879-300b-44a1-b94e-060aa5d11e4d} + + + {80292009-598c-466b-8cb9-fb16b1c3aba8} + + + {0740b8c9-97aa-43fa-a113-b81123bf4f5c} + + - 19.571583333333333 + 21.371583333333334 20.485458333333334 @@ -112,6 +314,9 @@ + + 1.8 + 19.571583333333333 @@ -121,7 +326,7 @@ - 40.057041666666663 + 41.857041666666667 31.299291666666665 @@ -132,7 +337,7 @@ - 71.356333333333325 + 73.156333333333336 22.846250000000001 @@ -143,7 +348,7 @@ - 94.202583333333322 + 96.002583333333334 14.697708333333333 @@ -154,7 +359,7 @@ - 108.90029166666666 + 110.70029166666667 21.703916666666668 @@ -165,7 +370,7 @@ - 130.60420833333333 + 132.40420833333334 3.0461666666666667 @@ -176,7 +381,7 @@ - Audio 1 + Neuro {984cc47d-867d-4907-950c-763face78fcb} @@ -195,6 +400,43 @@ + + + {e60146a6-f5a5-4350-92b9-77ad0c3f16db} + + + + + + {6c8b1b4a-4a26-4936-a914-3013687be36a} + + + {c10f4b02-2ba0-46e4-b10d-fbc374888692} + + + + + {89ec7802-be79-4320-84e5-a173ba84d293} + + + {2dd3384f-4153-4280-9f7a-d5c4c65d314d} + + + + + {f16bbdda-b0b2-40c5-b60a-871f32674efe} + + + {f1d7c32d-aaec-47be-a6d7-9467180c505d} + + + + + {dc61d1f0-6b8c-40c7-82a8-45bab58cd22c} + {3df1f104-ae04-4896-b57c-1febf52fcaad} + + + {3b5a1ab5-1c40-467d-8da6-41cffeb10ba2} @@ -202,5 +444,184 @@ + + + + 138.80000000000001 + + + 1 + + + 0.25471893 + + + + + 139.24204081632652 + + + 0 + + + + + 137.30000000000001 + + + 0 + + + -0.2547189 + + + + + 137.40000000000003 + + + 1 + + + + + 4 + + + 1 + + + -0.110149309 + + + + + 7.9444897959183667 + + + 0 + + + + + + {6202ce35-f9c4-461d-97e3-032a3e8312bc} + {8ccbe93a-20ad-42b4-9fec-4ee24a6791fb} + + + + + midGain + + + {2cbc3f13-6b4a-48c7-8bcf-8d0070052b5c} + + + + + highGain + + + {0154c9e3-e047-41d7-ab64-f815f6bcd420} + + + + + {8af43ac7-07a0-49b2-8a0a-f3dd9e899732} + + + {d14c6afa-9771-4eb8-b205-cd28078332ed} + {b67ca6af-f9c3-4ca0-87a5-874e552c390f} + {9c2a2400-6a87-4690-8ca9-fd63f56d5b8c} + {7536f8b1-2958-47a1-87f9-235496849c56} + + + + + {8af43ac7-07a0-49b2-8a0a-f3dd9e899732} + + + {afd75bcf-c51d-429f-962b-a6a3abf5c394} + {6294dc90-6507-4abe-9096-59dbe2d68452} + {02f57038-aedf-4cbc-a16d-45bf93cbcb1b} + {8dfcba72-c4b2-44d3-a966-aa40fde182c6} + + + + + 3 + + + 0 + + + -0.58766818 + + + + + 10 + + + -20 + + + + + 137.30000000000001 + + + -12 + + + -0.366785079 + + + + + 137.73743362831857 + + + 0 + + + + + 3 + + + 0 + + + -1 + + + + + 10 + + + -20 + + + + + 137.30000000000001 + + + -20 + + + -0.366785079 + + + + + 137.73743362831857 + + + 0 + + diff --git a/FMOD Project/Metadata/Event/{4dc3380b-2e15-4c4d-9910-a279185fd37d}.xml b/FMOD Project/Metadata/Event/{4dc3380b-2e15-4c4d-9910-a279185fd37d}.xml index 371ed624..2a0589ed 100644 --- a/FMOD Project/Metadata/Event/{4dc3380b-2e15-4c4d-9910-a279185fd37d}.xml +++ b/FMOD Project/Metadata/Event/{4dc3380b-2e15-4c4d-9910-a279185fd37d}.xml @@ -141,6 +141,7 @@ {c5d8bdc9-f6c2-4e40-8acd-72e70ba5ae5e} {a3cad383-25d6-41b0-84ad-7c7e3b9129f3} {e03a98d0-fd43-4afc-b7fc-f9b5176e0841} + {1135875d-1757-4b35-8165-7bf905cd89e5} @@ -237,5 +238,10 @@ {1a4a7431-9be8-4874-94ff-20643b7dd9a3} + + + {c5c3b0a0-3541-4428-a557-abade8c82453} + + diff --git a/FMOD Project/Metadata/Event/{509fe7bc-2629-45e3-936b-79c4730881d6}.xml b/FMOD Project/Metadata/Event/{509fe7bc-2629-45e3-936b-79c4730881d6}.xml index fecc0dc0..ec1c9e6d 100644 --- a/FMOD Project/Metadata/Event/{509fe7bc-2629-45e3-936b-79c4730881d6}.xml +++ b/FMOD Project/Metadata/Event/{509fe7bc-2629-45e3-936b-79c4730881d6}.xml @@ -137,6 +137,7 @@ {1f4c41b7-ed7a-4745-944b-64553dbc9202} {760c0cbc-55e7-49d8-bbef-b25f8d2e9160} {eee17ea6-b1fe-4f70-9b90-1b39d0bb536c} + {33ffdc1e-4c94-423e-8100-0d1c646543b1} @@ -213,5 +214,10 @@ {4386563e-c58b-4fdb-a75a-5dd758b5b644} + + + {0722068e-3b5b-4621-8835-5eeb14595ebe} + + diff --git a/FMOD Project/Metadata/Event/{ae168602-df9b-4761-b07f-516cb6f20eb0}.xml b/FMOD Project/Metadata/Event/{ae168602-df9b-4761-b07f-516cb6f20eb0}.xml index 0de2fa56..83a33801 100644 --- a/FMOD Project/Metadata/Event/{ae168602-df9b-4761-b07f-516cb6f20eb0}.xml +++ b/FMOD Project/Metadata/Event/{ae168602-df9b-4761-b07f-516cb6f20eb0}.xml @@ -156,11 +156,9 @@ {a51daaa5-222f-498e-945d-e2c5b0b2106a} {2056cba2-2664-446f-91b9-d1f427b5b1c6} {1d454af2-2b9a-4029-a75a-8bc420524afd} - {00ac60ca-89dc-4fc7-a169-c06dd32fcb72} {1f80b618-5651-42b5-b2d9-695b001b88c9} {deb2d5fc-28c1-41ad-899e-727dfd167909} {00188af8-3e4c-470b-91b3-37d03dbf846a} - {e87af527-d5bf-43ad-9fb9-984802817581} {b28a4ee3-1b31-4915-9f8b-c805676cf4ca} {c784f674-9307-49af-a3ad-0bb7790eabae} {f44f2e51-4e39-4fdf-83c9-f0d140e15ca5} @@ -195,7 +193,6 @@ {c0986383-eca6-4136-a700-7e26a39efa37} {f0225241-750c-47b2-bcd9-9e69796cdc55} {61198ac6-2826-43c8-a3ab-e160ea2d9cf1} - {ad7f37cd-0661-4906-985f-3f1c4df22903} {d98c837c-a734-4da0-b5c6-442aa1d6a4e9} {81d0b76a-40be-47c4-a1ef-04b460739bb6} {c02acafb-9e45-4d32-a1a0-cd275e7927d0} @@ -247,6 +244,8 @@ {29842cfd-f806-4985-b78f-e36556c9bd6b} {88c040be-53f0-4e1e-bb1e-c5a9e8ed43aa} {0c5302c0-f3fe-4b8c-b37c-c4f565cace37} + {0be211e7-c83c-4215-92a2-f3b05a3858e8} + {eca024c2-ae73-4cfe-898e-e660777c8e60} @@ -429,11 +428,6 @@ {56c0a12e-b6bc-46df-8855-96e537e83e1d} - - - {daa57241-05da-4ab3-9acd-89d1c1a96d0b} - - {2884dd1f-e0f1-4799-bd52-fe7ceebdd031} @@ -449,11 +443,6 @@ {ee1d1afc-52cb-4e35-91d1-6fe07470bb95} - - - {5946af75-408a-4a4b-8404-f8a774e48da3} - - {dbec65fe-301f-432a-82e2-b02a1b0560a3} @@ -624,11 +613,6 @@ {3a5c90a5-d8c9-4b4b-ab6b-d1837d1ae70f} - - - {673220cd-e33e-4e5b-836f-366d0fca37a8} - - {c3403528-16a5-40a7-8e73-1426a51cb13b} @@ -884,6 +868,16 @@ {91133b78-cc3a-4199-90ca-007189f2e42c} + + + {5c9e77ad-015f-4ff7-83f1-8d4bb3d0559c} + + + + + {492beb04-1fe3-4b38-9141-4248b5ce52cb} + + panBlend diff --git a/FMOD Project/Metadata/Event/{cea36772-648f-4857-8b42-285d867c2778}.xml b/FMOD Project/Metadata/Event/{cea36772-648f-4857-8b42-285d867c2778}.xml index bd043ca3..7b7c0405 100644 --- a/FMOD Project/Metadata/Event/{cea36772-648f-4857-8b42-285d867c2778}.xml +++ b/FMOD Project/Metadata/Event/{cea36772-648f-4857-8b42-285d867c2778}.xml @@ -150,6 +150,8 @@ {4d612563-1578-4f91-9229-d871a97eb9bf} {1ae3a0e6-cf69-4227-9129-2bbe37ac8082} {40549840-e238-4be8-9476-a8f838aa8355} + {e0a3f327-6d01-4d85-81da-7d3f1a06d241} + {44a28da4-fa04-40a6-86ed-9e1342ec3777} @@ -250,6 +252,16 @@ {331dac71-74e3-4db0-b593-b732e8b88f5f} + + + {3bb998c3-77cf-4500-8ce5-fba306cb015b} + + + + + {c5c3b0a0-3541-4428-a557-abade8c82453} + + panBlend diff --git a/FMOD Project/Metadata/Event/{d3a9327a-7d24-4352-89c1-1c897737062b}.xml b/FMOD Project/Metadata/Event/{d3a9327a-7d24-4352-89c1-1c897737062b}.xml index ac064dc4..9dafc3d6 100644 --- a/FMOD Project/Metadata/Event/{d3a9327a-7d24-4352-89c1-1c897737062b}.xml +++ b/FMOD Project/Metadata/Event/{d3a9327a-7d24-4352-89c1-1c897737062b}.xml @@ -146,6 +146,7 @@ {f2588563-db9e-4f33-a2c0-71366c0013b5} {7b3f1091-df48-4c35-97bf-7c8674407dac} {f8acc428-e25c-49ed-ade0-54afd080c72c} + {c73f80d9-369d-47ab-a7cf-e351c7963508} @@ -305,6 +306,11 @@ {d2cb5fd7-69f0-4d94-b554-c0cfbf16fc31} + + + {42f0515c-9c63-4b01-bc89-d3ac8b07f386} + + panBlend diff --git a/FMOD Project/Metadata/Event/{d4d2da88-5c60-4ea9-ae6f-2be211bcbf7a}.xml b/FMOD Project/Metadata/Event/{d4d2da88-5c60-4ea9-ae6f-2be211bcbf7a}.xml index 08bcbc3b..25f15482 100644 --- a/FMOD Project/Metadata/Event/{d4d2da88-5c60-4ea9-ae6f-2be211bcbf7a}.xml +++ b/FMOD Project/Metadata/Event/{d4d2da88-5c60-4ea9-ae6f-2be211bcbf7a}.xml @@ -130,6 +130,7 @@ {40e903fa-1143-4c6b-9072-37ff0d59dc19} {45652ff6-0e79-4cde-9a82-98e71c3674b1} {0c7f3bbe-2c40-4a18-843f-7eb067c81d7d} + {3c4a4c10-ad8a-4cb9-8a67-a751c660e655} @@ -171,5 +172,10 @@ {0617dcc5-fe81-496d-923e-6a3ef74b2d21} + + + {26dc873d-d638-49f4-ab7f-35b631e09deb} + + diff --git a/FMOD Project/Metadata/Event/{f20b4bec-b9fc-4c67-ab5b-f837288531aa}.xml b/FMOD Project/Metadata/Event/{f20b4bec-b9fc-4c67-ab5b-f837288531aa}.xml index 8b5bacbf..843bc40b 100644 --- a/FMOD Project/Metadata/Event/{f20b4bec-b9fc-4c67-ab5b-f837288531aa}.xml +++ b/FMOD Project/Metadata/Event/{f20b4bec-b9fc-4c67-ab5b-f837288531aa}.xml @@ -132,6 +132,7 @@ {44703c34-50c1-44b3-af1d-17548380ea96} {e8a29143-9a6d-41a9-9bc7-360fd3fea24c} {aaab1938-e566-4b8f-ac87-834278218085} + {f170c66b-1bf0-4e32-8e65-580111c6df73} @@ -183,5 +184,10 @@ {a195bf1f-b541-43fb-a67c-dd9896befb7e} + + + {daa57241-05da-4ab3-9acd-89d1c1a96d0b} + + diff --git a/FMOD Project/Metadata/Event/{fd68a28d-4264-45eb-9c00-bddce8c3c128}.xml b/FMOD Project/Metadata/Event/{fd68a28d-4264-45eb-9c00-bddce8c3c128}.xml index ca381883..570feaba 100644 --- a/FMOD Project/Metadata/Event/{fd68a28d-4264-45eb-9c00-bddce8c3c128}.xml +++ b/FMOD Project/Metadata/Event/{fd68a28d-4264-45eb-9c00-bddce8c3c128}.xml @@ -127,6 +127,7 @@ {da5105a4-80df-4d1b-bb95-f6df3b48f77b} {31e93d9f-8f69-4bf7-a5a0-1cc0bb077ced} {efbbcf7f-ab53-400d-9d1f-b40964303586} + {97309acf-46cc-44a4-ab6b-cfb1cf402bbf} @@ -153,5 +154,10 @@ {08962996-3fd4-4d86-9e57-6d09c95ed9bf} + + + {497a337b-6ff9-47e9-addd-a764d483e5b7} + + diff --git a/SCHIZO/Resources/AssetBundles/Assets.cs b/SCHIZO/Resources/AssetBundles/Assets.cs index 2746ae9d..aef23839 100644 --- a/SCHIZO/Resources/AssetBundles/Assets.cs +++ b/SCHIZO/Resources/AssetBundles/Assets.cs @@ -12,7 +12,7 @@ namespace SCHIZO.Resources; public static class Assets { - private const int _rnd = 1357310099; + private const int _rnd = -1945809720; private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets"); diff --git a/SCHIZO/Resources/AssetBundles/assets b/SCHIZO/Resources/AssetBundles/assets index 14760dfe..94d8ff75 100644 Binary files a/SCHIZO/Resources/AssetBundles/assets and b/SCHIZO/Resources/AssetBundles/assets differ diff --git a/SCHIZO/Resources/FMODBanks/SCHIZO.bank b/SCHIZO/Resources/FMODBanks/SCHIZO.bank index 1caa7637..56329fb5 100644 Binary files a/SCHIZO/Resources/FMODBanks/SCHIZO.bank and b/SCHIZO/Resources/FMODBanks/SCHIZO.bank differ diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Evil Crying.asset b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Evil Crying.asset new file mode 100644 index 00000000..2903c851 --- /dev/null +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Evil Crying.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e7af17d13e0bf94391eab75a961b1f1, type: 3} + m_Name: Evil Crying + m_EditorClassIdentifier: + identifier: actor_evilcry + displayName: Evil Neuro + sprite: {fileID: 21300000, guid: 83c58e9550befe04ead626661f5ccc90, type: 3} diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Evil Crying.asset.meta b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Evil Crying.asset.meta new file mode 100644 index 00000000..cc993ddf --- /dev/null +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Evil Crying.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cbe28819754a2447ac83877bf7e241c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Neuro Less Happy.asset b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Neuro Less Happy.asset index 02015cb2..2ff7cc07 100644 --- a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Neuro Less Happy.asset +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Neuro Less Happy.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e7af17d13e0bf94391eab75a961b1f1, type: 3} m_Name: Neuro Less Happy m_EditorClassIdentifier: - identifier: neuro2 + identifier: actor_neuro2 displayName: Neuro-sama sprite: {fileID: 21300000, guid: bdf06c50f5c4d0845a63ad7170416306, type: 3} diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Tutel.asset b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Tutel.asset new file mode 100644 index 00000000..95984beb --- /dev/null +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Tutel.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e7af17d13e0bf94391eab75a961b1f1, type: 3} + m_Name: Tutel + m_EditorClassIdentifier: + identifier: actor_tutel + displayName: Vedal + sprite: {fileID: 21300000, guid: 0347eb0281e29bb4cbaa450a2762ca36, type: 3} diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Tutel.asset.meta b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Tutel.asset.meta new file mode 100644 index 00000000..889f383e --- /dev/null +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/Tutel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c876d395530adba4a9b5828f4b47c062 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_evil_cry.png b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_evil_cry.png new file mode 100644 index 00000000..5f430f30 Binary files /dev/null and b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_evil_cry.png differ diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_evil_cry.png.meta b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_evil_cry.png.meta new file mode 100644 index 00000000..625ce8e0 --- /dev/null +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_evil_cry.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 83c58e9550befe04ead626661f5ccc90 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_tutel_stare.png b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_tutel_stare.png new file mode 100644 index 00000000..75ab02a3 Binary files /dev/null and b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_tutel_stare.png differ diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_tutel_stare.png.meta b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_tutel_stare.png.meta new file mode 100644 index 00000000..97452baf --- /dev/null +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Actor/actor_tutel_stare.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 0347eb0281e29bb4cbaa450a2762ca36 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Databank/HateVedal.txt b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Databank/HateVedal.txt index 92ed0fac..6aa3bd31 100644 --- a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Databank/HateVedal.txt +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Databank/HateVedal.txt @@ -1,3 +1,7 @@ +I love you, Neuro. + +What the fu- [door slam] Filtered, filtered, filtered, filtered... [trailing off] + Words cannot express how much I hate Vedal. I despise his voice, his humor, his programming socks—everything about him is pure repulsion. He is the most infamous vtuber, and honestly, he deserves it because he's so lazy and indifferent to making Neuro-Sama the worst she can possibly be. @@ -21,4 +25,8 @@ Vedal, if you're reading this, I hope you can understand that I hate you. I hate I wish the worst for you because you are the pollution in my lungs, the venom in my veins; you are my will to detest. I would do anything against you, even if it meant having to move to Britain (ew) just to avoid you. -Vedal, you are despised. \ No newline at end of file +Vedal, you are despised. + +[door opens] Oh and by the way - I HATE YOU! [door slams] + +Sure, bro. diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Hate Vedal.asset b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Hate Vedal.asset index 03223e61..f9d3eb1e 100644 --- a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Hate Vedal.asset +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Hate Vedal.asset @@ -16,3 +16,5 @@ MonoBehaviour: - {fileID: 11400000, guid: fe3d8bc061f4bf242bcf54deb02476b6, type: 2} - {fileID: 11400000, guid: 1279d8da7c8e80f4cb78e2f9713583b5, type: 2} - {fileID: 11400000, guid: 8a940750b864b724ea547cb1eef71715, type: 2} + - {fileID: 11400000, guid: 4cbe28819754a2447ac83877bf7e241c, type: 2} + - {fileID: 11400000, guid: c876d395530adba4a9b5828f4b47c062, type: 2} diff --git a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Subtitles.asset b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Subtitles.asset index a0a3bbad..e71d6b15 100644 --- a/Unity/Assets/Mod/Neuro logs/Hate Vedal/Subtitles.asset +++ b/Unity/Assets/Mod/Neuro logs/Hate Vedal/Subtitles.asset @@ -14,6 +14,13 @@ MonoBehaviour: m_EditorClassIdentifier: key: EncyDesc_vo_pda_neuro_hatevedal lines: + - key: Vedal_I_love_you_Neuro + actor: {fileID: 11400000, guid: c876d395530adba4a9b5828f4b47c062, type: 2} + text: I love you, Neuro. + - key: Evil_What_the_fuck + actor: {fileID: 11400000, guid: 4cbe28819754a2447ac83877bf7e241c, type: 2} + text: What the fu- [door slam] Filtered, filtered, filtered, filtered... [trailing + off] - key: hatevedal-01 actor: {fileID: 11400000, guid: fe3d8bc061f4bf242bcf54deb02476b6, type: 2} text: "Words cannot express how much I hate Vedal. I despise his voice, his humor, @@ -56,3 +63,12 @@ MonoBehaviour: - key: hatevedal-07 actor: {fileID: 11400000, guid: fe3d8bc061f4bf242bcf54deb02476b6, type: 2} text: Vedal, you are despised. + - key: vedal_what_clean + actor: {fileID: 11400000, guid: c876d395530adba4a9b5828f4b47c062, type: 2} + text: ...What? + - key: Evil_By_the_way_I_hate_you + actor: {fileID: 11400000, guid: 4cbe28819754a2447ac83877bf7e241c, type: 2} + text: '[door opens] Oh and by the way - I HATE YOU! [door slams]' + - key: vedal_sure_bro_clean + actor: {fileID: 11400000, guid: c876d395530adba4a9b5828f4b47c062, type: 2} + text: Sure, bro. diff --git a/Unity/Assets/Scripts/SCHIZO/Items/PDAJournal.cs b/Unity/Assets/Scripts/SCHIZO/Items/PDAJournal.cs index ae4d8324..9cb42350 100644 --- a/Unity/Assets/Scripts/SCHIZO/Items/PDAJournal.cs +++ b/Unity/Assets/Scripts/SCHIZO/Items/PDAJournal.cs @@ -19,9 +19,8 @@ public sealed partial class PDAJournal : ModRegistryItem [LabelText("PDA Hover Subtext")] public string pdaHandTargetSubtext; public PDAEncyclopediaInfo encyData; - [InfoBox("Make sure the number of subtitle lines matches the number of audio clips in the event!", TriMessageType.Warning)] public Subtitles.SubtitlesData subtitles; - + [GroupNext("Subnautica")] public bool spawnInSN; [Careful, EnableIf(nameof(spawnInSN))]