diff --git a/Assets/Audio/Master.bank b/Assets/Audio/Master.bank index 326ae2a7..21c524fe 100644 Binary files a/Assets/Audio/Master.bank and b/Assets/Audio/Master.bank differ diff --git a/Assets/Audio/Master.strings.bank b/Assets/Audio/Master.strings.bank index d858d0f6..3992afa1 100644 Binary files a/Assets/Audio/Master.strings.bank and b/Assets/Audio/Master.strings.bank differ diff --git a/Assets/Audio/Music.bank b/Assets/Audio/Music.bank index 584e37dc..a7a856e5 100644 Binary files a/Assets/Audio/Music.bank and b/Assets/Audio/Music.bank differ diff --git a/Assets/Audio/SFX.bank b/Assets/Audio/SFX.bank index 84d56eaa..d1c9cf58 100644 Binary files a/Assets/Audio/SFX.bank and b/Assets/Audio/SFX.bank differ diff --git a/Assets/Audio/UI.bank b/Assets/Audio/UI.bank index 78ed9460..92edfdf6 100644 Binary files a/Assets/Audio/UI.bank and b/Assets/Audio/UI.bank differ diff --git a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs index f9c524a5..1eff61c7 100644 --- a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs +++ b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs @@ -103,10 +103,13 @@ public partial class Homeowner1 : BehaviourTree //These should be somewhere else + Debug.Log("TESTING"); AudioHandler.audioClipHandlers["BGMUnalert"] = Audio.CreateAudioClip("event:/Music/player_undetected"); Audio.AddAudioClipToBGMChannelGroup(AudioHandler.audioClipHandlers["BGMUnalert"]); AudioHandler.audioClipHandlers["BGMAlert"] = Audio.CreateAudioClip("event:/Music/player_detected"); Audio.AddAudioClipToBGMChannelGroup(AudioHandler.audioClipHandlers["BGMAlert"]); + AudioHandler.audioClipHandlers["BGMAdaptive"] = Audio.CreateAudioClip("event:/Music/bgm_adaptive"); + Audio.AddAudioClipToBGMChannelGroup(AudioHandler.audioClipHandlers["BGMAdaptive"]); AudioHandler.audioClipHandlers["SFXHumming"] = Audio.CreateAudioClip("event:/Homeowner/homeowner_humming"); Audio.AddAudioClipToSFXChannelGroup(AudioHandler.audioClipHandlers["SFXHumming"]); @@ -116,7 +119,6 @@ public partial class Homeowner1 : BehaviourTree Audio.AddAudioClipToSFXChannelGroup(AudioHandler.audioClipHandlers["SFXDetectAh"]); AudioHandler.audioClipHandlers["SFXDetectSting"] = Audio.CreateAudioClip("event:/Music/stingers/player_detected"); Audio.AddAudioClipToSFXChannelGroup(AudioHandler.audioClipHandlers["SFXDetectSting"]); - } //Called every tick @@ -158,8 +160,8 @@ public partial class Homeowner1 : BehaviourTree footstepTimeRemaining -= velocity * Time.DeltaTimeF; if (footstepTimeRemaining < 0.0f) { - Audio.PlaySFXOnce2D("event:/Homeowner/homeowner_footsteps"); - AudioHandler.audioClipHandlers["SFXFootstep"].Play(); + //Audio.PlaySFXOnce2D("event:/Homeowner/homeowner_footsteps"); + //AudioHandler.audioClipHandlers["SFXFootstep"].Play(); footstepTimeRemaining = footstepSFXIntervalMultiplier; } //Debug.Log("Ticked"); diff --git a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafChase.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafChase.cs index fbfb7df5..060336ce 100644 --- a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafChase.cs +++ b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafChase.cs @@ -112,6 +112,7 @@ public partial class LeafChase : BehaviourTreeNode if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == true) { + AudioHandler.audioClipHandlers["BGMAdpative"].SetParameter("Detected", 0.0f); AudioHandler.audioClipHandlers["SFXHumming"].Play(); } SetNodeData("isAlert", false); diff --git a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs index 6afd22bf..07431c11 100644 --- a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs +++ b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs @@ -240,10 +240,11 @@ public partial class LeafPatrol : BehaviourTreeNode if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert")) { //Debug.Log("Unalert"); - AudioHandler.audioClipHandlers["BGMAlert"].Stop(true); + //AudioHandler.audioClipHandlers["BGMAlert"].Stop(true); //Audio.PlaySFXOnce2D("event:/Homeowner/humming"); AudioHandler.audioClipHandlers["SFXHumming"].Play(); - AudioHandler.audioClipHandlers["BGMUnalert"].Play(); + //AudioHandler.audioClipHandlers["BGMUnalert"].Play(); + AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 0.0f); } SetNodeData("isAlert", false); } diff --git a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs index 26c0a484..401b1b1c 100644 --- a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs +++ b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs @@ -66,6 +66,7 @@ public partial class LeafSearch : BehaviourTreeNode { if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == true) { + AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 0.0f); AudioHandler.audioClipHandlers["SFXHumming"].Play(); reevaluateWaypoint(); } @@ -186,23 +187,25 @@ public partial class LeafSearch : BehaviourTreeNode if (GetNodeData("isAlert") == null) { SetNodeData("isAlert", true); - Audio.StopAllSounds(); + //Audio.StopAllSounds(); AudioHandler.audioClipHandlers["SFXDetectAh"].Play(); AudioHandler.audioClipHandlers["SFXDetectSting"].Play(); - AudioHandler.audioClipHandlers["BGMAlert"].Play(); + //AudioHandler.audioClipHandlers["BGMAlert"].Play(); AudioHandler.audioClipHandlers["SFXHumming"].Stop(false); - AudioHandler.audioClipHandlers["BGMUnalert"].Stop(true); + //AudioHandler.audioClipHandlers["BGMUnalert"].Stop(true); + AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 1.0f); } else { if (GetNodeData("isAlert") != null && (bool)GetNodeData("isAlert") == false) { - Audio.StopAllSounds(); + //Audio.StopAllSounds(); AudioHandler.audioClipHandlers["SFXDetectAh"].Play(); AudioHandler.audioClipHandlers["SFXDetectSting"].Play(); - AudioHandler.audioClipHandlers["BGMAlert"].Play(); + //AudioHandler.audioClipHandlers["BGMAlert"].Play(); AudioHandler.audioClipHandlers["SFXHumming"].Stop(false); - AudioHandler.audioClipHandlers["BGMUnalert"].Stop(true); + //AudioHandler.audioClipHandlers["BGMUnalert"].Stop(true); + AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 1.0f); } SetNodeData("isAlert", true); } diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index d6b43a9c..484ea5c4 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -1,4 +1,5 @@ using SHADE; +using SHADE_Scripting.Audio; using System; using System.Collections.Generic; @@ -35,7 +36,11 @@ public class GameManager : Script else Instance = this; - Audio.PlayBGMOnce2D("event:/Music/player_undetected"); + AudioHandler.audioClipHandlers["BGMAdaptive"] = Audio.CreateAudioClip("event:/Music/bgm_adaptive"); + Audio.AddAudioClipToBGMChannelGroup(AudioHandler.audioClipHandlers["BGMAdaptive"]); + AudioHandler.audioClipHandlers["BGMAdaptive"].Play(); + AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 0.0f); + //Audio.PlayBGMOnce2D("event:/Music/player_undetected"); Audio.PlayBGMOnce2D("event:/Ambience/roomtone_kitchen"); totalItemCount = 0; Score = 0;