diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 994af81a..4ff3a4b9 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7ce3b018a35468e472d9c9f1c72520c4e9fe933e2a006174ef4f2ec3e7260e7 +oid sha256:3f2cad20bb4fd8d10f06f8f10d22435a9ec7a6dde94662f9a8856c15c8f8e01f size 20242 diff --git a/Assets/_PROJECT/Components/Server room/Alarm Trigger.cs b/Assets/_PROJECT/Components/Server room/Alarm Trigger.cs index 827e126b..307fd448 100644 --- a/Assets/_PROJECT/Components/Server room/Alarm Trigger.cs +++ b/Assets/_PROJECT/Components/Server room/Alarm Trigger.cs @@ -1,6 +1,3 @@ -using System.Collections; -using System.Collections.Generic; -using System.Runtime.Remoting.Messaging; using UnityEngine; using UnityEngine.XR.Content.Interaction; using FMOD.Studio; @@ -30,7 +27,7 @@ public class AlarmTrigger : MonoBehaviour void Start() { //start playing the Server overall sound - //RoomHum.start(); + RoomHum.start(); if (PushButton != null) { diff --git a/Assets/_PROJECT/Components/Server room/Server rack.prefab b/Assets/_PROJECT/Components/Server room/Server rack.prefab index 691b8e98..72dd9bb6 100644 --- a/Assets/_PROJECT/Components/Server room/Server rack.prefab +++ b/Assets/_PROJECT/Components/Server room/Server rack.prefab @@ -152,4 +152,4 @@ MonoBehaviour: PlayerOcclusionWidening: 1 OcclusionLayer: serializedVersion: 2 - m_Bits: 268442624 + m_Bits: 268438528 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 96db2f73..e2c386e7 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8221c41ca39514be4174fb0e0b427ae55cd6649e522d62fedacacd01099a0e5b -size 66959746 +oid sha256:2d69efd8d410f349cfa85963cd28bc6093fd9709732a1194104350e1204c23e0 +size 67025218 diff --git a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs index f2bfa4d2..7c294c8f 100644 --- a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs +++ b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs @@ -18,6 +18,7 @@ public class FMODEvents : MonoBehaviour [field: SerializeField] public EventReference DefaultGrab { get; private set; } [field: SerializeField] public EventReference BowGrab { get; private set; } [field: SerializeField] public EventReference Spray { get; private set; } + [field: SerializeField] public EventReference Coughing { get; private set; } [field: Header("CAR")] [field: SerializeField] public EventReference DoorOpen { get; private set; } diff --git a/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs b/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs index 05b782cc..a07ea885 100644 --- a/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs +++ b/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs @@ -2,7 +2,7 @@ using UnityEngine; using FMODUnity; using FMOD.Studio; using System.Collections; -using System.Collections.Generic; // ADDED +using System.Collections.Generic; public class FirstPersonOcclusion : MonoBehaviour { @@ -26,8 +26,6 @@ public class FirstPersonOcclusion : MonoBehaviour private Color colour; private bool initialisedExternally = false; - - // ADDED: now stores ALL event instances that must be occluded private List managedInstances = new List(); public void InitialiseWithInstance(EventInstance instance) { @@ -42,13 +40,12 @@ public class FirstPersonOcclusion : MonoBehaviour //instance.setParameterByName("Occlusion", 1f, true); - managedInstances.Add(AudioOccluded); // ADDED + managedInstances.Add(AudioOccluded); AudioOccluded.getDescription(out AudioDes); AudioDes.getMinMaxDistance(out float min, out MaxDistance); } - // ADDED: allows adding extra FMOD instances for occlusion public void AddInstance(EventInstance instance) { if (instance.isValid()) diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br index 5b01401e..fddc7779 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br index 22cfdcd7..f9cd97dd 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank index 540eba2b..2fe363ff 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank index d7470061..a9e7c581 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank differ diff --git a/DeltaVRFMOD/Metadata/Event/{1067667c-4322-4be7-88b5-ec1bb6973b2a}.xml b/DeltaVRFMOD/Metadata/Event/{1067667c-4322-4be7-88b5-ec1bb6973b2a}.xml index 5433f5ed..3071019e 100644 --- a/DeltaVRFMOD/Metadata/Event/{1067667c-4322-4be7-88b5-ec1bb6973b2a}.xml +++ b/DeltaVRFMOD/Metadata/Event/{1067667c-4322-4be7-88b5-ec1bb6973b2a}.xml @@ -331,7 +331,6 @@ SourcePos - -2 @@ -340,7 +339,6 @@ OverallGain - -1 @@ -669,7 +667,6 @@ SimOutputs - 0 @@ -686,7 +683,6 @@ DistRange - -6 diff --git a/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml b/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml index 48208374..94c743d6 100644 --- a/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml +++ b/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml @@ -712,7 +712,7 @@ 0.00092690677966101697 - 5 + -3 @@ -720,7 +720,7 @@ 0.45855402542372881 - 2.5 + -5.5 @@ -728,7 +728,7 @@ 0.79471221751412424 - -0.5 + -8.5 @@ -736,7 +736,7 @@ 0.98680261299435024 - -31 + -48.75 @@ -744,7 +744,7 @@ 0.95000000000000007 - -8.5 + -16.5 @@ -829,7 +829,7 @@ ApplyDA - 1 + 2 0 @@ -940,7 +940,7 @@ DAType - 0 + 1 0 diff --git a/DeltaVRFMOD/Metadata/Event/{62c2315e-424a-4d4a-a651-6b9673a3100b}.xml b/DeltaVRFMOD/Metadata/Event/{62c2315e-424a-4d4a-a651-6b9673a3100b}.xml index d23d06a1..fe9ff50c 100644 --- a/DeltaVRFMOD/Metadata/Event/{62c2315e-424a-4d4a-a651-6b9673a3100b}.xml +++ b/DeltaVRFMOD/Metadata/Event/{62c2315e-424a-4d4a-a651-6b9673a3100b}.xml @@ -328,7 +328,6 @@ SourcePos - -2 @@ -337,7 +336,6 @@ OverallGain - -1 @@ -666,7 +664,6 @@ SimOutputs - 0 @@ -683,7 +680,6 @@ DistRange - -6 diff --git a/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml b/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml index 21afefa4..15ef108c 100644 --- a/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml +++ b/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml @@ -45,6 +45,9 @@ + + {a243062a-e3db-4b8e-8ca0-fa16dca3ec7d} + {ffb8b949-0094-4a58-abe5-359891622f8c} @@ -70,8 +73,8 @@ 0 - - 2.20000005 + + 15 @@ -124,6 +127,9 @@ + + {8d2b03c1-2648-4f95-bbed-e834d8591293} + {fb2eee16-23de-440f-9363-b6208a2732e8} @@ -134,6 +140,11 @@ {8a481067-2c45-444c-86ae-8f9f17b95b92} + + + {8d2b03c1-2648-4f95-bbed-e834d8591293} + + {53d88e58-d862-40ff-976d-892f927b0f30} @@ -296,11 +307,19 @@ {ffb8b949-0094-4a58-abe5-359891622f8c} + + + volume + + + {56f51cbd-082f-4de0-9f2c-927c3c4fcd8e} + + - {acaebb26-bfea-4c16-a406-d3bdb161a680} {34075740-b734-477b-bb4c-4b2d0c0dbf70} {1eb9ad6f-5ad0-45da-9ff8-6b0a6895c63e} + {acaebb26-bfea-4c16-a406-d3bdb161a680} @@ -385,9 +404,16 @@ - - - {18dff622-970d-4604-8e31-fde67c7532e7} + + + {fb894807-eb7f-48db-b3de-e2f5dd3322a2} + + + {a3d818d8-e206-4e85-8450-e7df123c6f5e} + {f86e77ea-21da-4402-b965-c1ff480d1768} + {d8b22413-f729-485f-8fe3-f3423728601b} + {32db8333-a83f-4fcb-be11-05d312dc6482} + {4e69b288-62d0-445c-ae55-8bb1eb81d708} @@ -402,6 +428,11 @@ {74f8ce6a-9dd0-4ae8-8236-dedea6491c3e} + + + {18dff622-970d-4604-8e31-fde67c7532e7} + + {0062ed52-d2d1-4741-a3da-f721d4923a9b} @@ -492,6 +523,54 @@ + + + 0.0070621468926553672 + + + 3.81469727e-06 + + + + + 0.34604519774011294 + + + -2 + + + + + 0.7076271186440678 + + + -4 + + + + + 0.94774011299435024 + + + -4 + + + + + 1 + + + -80 + + + + + frequencyA + + + {ecc2d62a-f808-4a29-8dce-cc8a765931d5} + + Steam Audio Spatializer @@ -535,14 +614,6 @@ {0264abb5-8685-4535-9823-c378f49ef3d6} - - - frequencyA - - - {ecc2d62a-f808-4a29-8dce-cc8a765931d5} - - 14.050000000000001 @@ -562,6 +633,18 @@ -2 + + + {fb894807-eb7f-48db-b3de-e2f5dd3322a2} + + + {21aa5825-cab5-462f-976e-3bcc0066fae9} + {90d8eb5b-3042-434e-bb8d-fa2d353fea9a} + {5fefc253-b614-47e0-9790-128f96857f76} + {c73e5728-c7e8-4f09-a6a0-dfc952305216} + {7d820117-faf2-4be8-883b-b2e15fb744b1} + + SourcePos @@ -708,7 +791,7 @@ DAMinDist - 2 + 1 {(0.000000,0.000000)(1.000000,10000.000000)} @@ -719,7 +802,7 @@ DAMaxDist - 20 + 15 {(0.000000,0.000000)(1.000000,10000.000000)} @@ -958,24 +1041,12 @@ false - - - {fb894807-eb7f-48db-b3de-e2f5dd3322a2} - - - {21aa5825-cab5-462f-976e-3bcc0066fae9} - {90d8eb5b-3042-434e-bb8d-fa2d353fea9a} - {5fefc253-b614-47e0-9790-128f96857f76} - {c73e5728-c7e8-4f09-a6a0-dfc952305216} - {7d820117-faf2-4be8-883b-b2e15fb744b1} - - 0 - 12000 + 20 0.0314547755 @@ -994,7 +1065,7 @@ 0.5 - 1028.48486 + 20 -0.0945791602 @@ -1005,7 +1076,7 @@ 0.96999999999999997 - 130 + 20 @@ -1013,7 +1084,7 @@ 0.94694561637357466 - 200 + 20 diff --git a/DeltaVRFMOD/Metadata/Event/{6fe27f03-35f6-4e00-ba0d-60648a3d1e3d}.xml b/DeltaVRFMOD/Metadata/Event/{6fe27f03-35f6-4e00-ba0d-60648a3d1e3d}.xml index 4a229ea5..e612595d 100644 --- a/DeltaVRFMOD/Metadata/Event/{6fe27f03-35f6-4e00-ba0d-60648a3d1e3d}.xml +++ b/DeltaVRFMOD/Metadata/Event/{6fe27f03-35f6-4e00-ba0d-60648a3d1e3d}.xml @@ -214,7 +214,6 @@ SourcePos - -2 @@ -223,7 +222,6 @@ OverallGain - -1 @@ -552,7 +550,6 @@ SimOutputs - 0 @@ -569,7 +566,6 @@ DistRange - -6 diff --git a/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml b/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml index 23e3a4f6..aa015077 100644 --- a/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml +++ b/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml @@ -46,6 +46,7 @@ {545591e5-e760-4a3b-8842-a47576b46777} + {909b220a-7be9-4e8d-a54d-9c5ad312f7f0} {2f17962e-8fa8-478d-93c5-8d2832a11033} @@ -67,11 +68,8 @@ - - 2 - - 10 + 7 @@ -102,6 +100,9 @@ -3.5 + + {c72b4e67-fdbe-4e85-b957-980bbabe02d7} + {929b1c3e-951f-4cba-b573-a6725a0b69df} @@ -117,6 +118,11 @@ {1ab41ced-f781-4927-9d01-a6c8664036bb} + + + {c72b4e67-fdbe-4e85-b957-980bbabe02d7} + + 0 @@ -197,6 +203,14 @@ {45e5e68d-9039-4056-927d-69e6bfcf1caa} + + + volume + + + {27e8dc3b-7ba6-4c1d-be80-c64a7790cf95} + + {e48ad53d-e9a1-4e8d-b153-43beab1a906c} @@ -239,6 +253,18 @@ {1fb33aff-5a47-41a7-8886-4ddaa54f56fe} + + + {fb894807-eb7f-48db-b3de-e2f5dd3322a2} + + + {46a54255-81aa-4263-9096-8d0e7912b233} + {f75535c4-2270-49ca-a717-ac7f4e024444} + {464b4720-5411-4227-ae0a-8e021b51dc00} + {09950811-06b6-4165-8c73-c227c0cb714d} + {5274092b-5d49-4c13-a9c9-338c07798f74} + + @@ -295,6 +321,46 @@ + + + 0.0014124293785310734 + + + -3.5 + + + + + 0.49293785310734461 + + + -6 + + + + + 0.76977401129943501 + + + -12 + + + + + 0.93361581920903958 + + + -12 + + + + + 0.98163841807909602 + + + -80 + + frequencyA @@ -377,7 +443,7 @@ ApplyDA - 1 + 2 0 @@ -488,7 +554,7 @@ DAType - 0 + 1 0 @@ -502,7 +568,7 @@ DAMinDist - 2 + 1 {(0.000000,0.000000)(1.000000,10000.000000)} @@ -513,7 +579,7 @@ DAMaxDist - 10 + 7 {(0.000000,0.000000)(1.000000,10000.000000)} @@ -757,7 +823,7 @@ 0.01 - 5000 + 16999.9941 @@ -765,7 +831,7 @@ 0.20000000000000001 - 1100 + 16999.9941 -0.0511879399 @@ -776,7 +842,7 @@ 0.64000000000000001 - 35 + 16999.9941 diff --git a/DeltaVRFMOD/Metadata/Event/{8ce2164f-f09d-435f-a8b3-b8bcbaa6b1d1}.xml b/DeltaVRFMOD/Metadata/Event/{8ce2164f-f09d-435f-a8b3-b8bcbaa6b1d1}.xml index b868e624..6f3936eb 100644 --- a/DeltaVRFMOD/Metadata/Event/{8ce2164f-f09d-435f-a8b3-b8bcbaa6b1d1}.xml +++ b/DeltaVRFMOD/Metadata/Event/{8ce2164f-f09d-435f-a8b3-b8bcbaa6b1d1}.xml @@ -89,6 +89,9 @@ + + 7 + 7.4000000000000004 @@ -151,7 +154,7 @@ - 5.4000000000000004 + 12.400000000000031 1 @@ -162,7 +165,7 @@ - 7.4000000000000004 + 14.399999999999988 0 diff --git a/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml b/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml index 18b53b2e..24b00d5a 100644 --- a/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml +++ b/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml @@ -73,11 +73,8 @@ - - 4.80000019 - - 150 + 50 diff --git a/DeltaVRFMOD/Metadata/Event/{d82dc382-b60e-47e6-b50b-23c477268a9d}.xml b/DeltaVRFMOD/Metadata/Event/{d82dc382-b60e-47e6-b50b-23c477268a9d}.xml index 83c3217a..7ab013d3 100644 --- a/DeltaVRFMOD/Metadata/Event/{d82dc382-b60e-47e6-b50b-23c477268a9d}.xml +++ b/DeltaVRFMOD/Metadata/Event/{d82dc382-b60e-47e6-b50b-23c477268a9d}.xml @@ -51,11 +51,8 @@ - - 5 - - 30 + 9 @@ -351,7 +348,7 @@ DAMinDist - 5 + 1 {(0.000000,0.000000)(1.000000,10000.000000)} @@ -362,7 +359,7 @@ DAMaxDist - 30 + 9 {(0.000000,0.000000)(1.000000,10000.000000)} diff --git a/highscores.json b/highscores.json index 35d3a441..b2e177ba 100644 --- a/highscores.json +++ b/highscores.json @@ -8,6 +8,10 @@ "name": "ppppVBBPPP", "score": 478.0 }, + { + "name": "tommy", + "score": 478.0 + }, { "name": "mmmoo", "score": 473.0 @@ -55,10 +59,6 @@ { "name": "rq,,tim", "score": 423.0 - }, - { - "name": " ", - "score": 413.0 } ] } \ No newline at end of file