Fix adaptive bgm not changing on alert

AI fix
Merge pull request #456 from SHADE-DP/Navigation
2023-04-02 18:16:25 +08:00 · 2023-04-02 13:32:21 +08:00 · 2023-04-02 12:48:39 +08:00
3 changed files with 8 additions and 6 deletions
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs
@ -50,11 +50,13 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework

    protected override void onTriggerStay(CollisionInfo info)
    {
-      if(info.GameObject.GetScript<PlayerController>())
-        pc = info.GameObject.GetScript<PlayerController>();
-      if (ai && ai.atk && pc)
+      if (info.GameObject.GetScript<PlayerController>())
      { 
-        raccoonFound = true;
+        pc = info.GameObject.GetScript<PlayerController>();
+        if (ai && ai.atk && pc)
+        {
+          raccoonFound = true;
+        }
      }
    }

--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs
@ -52,7 +52,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States
 				}
 				
 			}
-      
+      SHADE.Audio.SetParameterWithLabel("PlayerDetection", "Detected");

 		}
    public override void OnExit()
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AttackState.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AttackState.cs
@ -88,7 +88,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States

    public override void update()
    {
-      if (ai.hitboxScript.raccoonFound)
+      if (ai.hitboxScript.raccoonFound && machine.GetScript<HomeOwnerAI>().atk)
      {
        raccoonCaught = true;
 				Transform pcTransform = ai.player.GetComponent<Transform>();
Author	SHA1	Message	Date
Sri Sham Haran	0f7d86543f	Fix adaptive bgm not changing on alert	2023-04-02 18:16:25 +08:00
Glence	8ffca03f16	AI fix	2023-04-02 13:32:21 +08:00
XiaoQiDigipen	724f8ae2cf	Merge pull request #456 from SHADE-DP/Navigation adjusted hitbox timing	2023-04-02 12:48:39 +08:00