From d1ae9b37569f538c22ca268f57ff11efe06ce485 Mon Sep 17 00:00:00 2001
From: Glence <glence.low@digipen.edu>
Date: Sat, 4 Feb 2023 02:42:30 +0800
Subject: [PATCH] Fix camera arm and win scene issue

---
 Assets/Scenes/Level1Scene.shade                        | 6 +++---
 Assets/Scenes/MainGame.shade                           | 1 +
 Assets/Scenes/WinScene.shade                           | 9 +++++++++
 Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs | 5 +++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Assets/Scenes/Level1Scene.shade b/Assets/Scenes/Level1Scene.shade
index 947d3a3f..9606a5f9 100644
--- a/Assets/Scenes/Level1Scene.shade
+++ b/Assets/Scenes/Level1Scene.shade
@@ -4317,7 +4317,7 @@
   Scripts:
     - Type: GameManager
       Enabled: true
-      winScene: 92009475
+      winScene: 86098106
       loseScene: 91685359
       currGameState: 0
       totalItemCount: 0
@@ -5089,7 +5089,7 @@
       throwForce: [8, 10, 8]
       cameraArmOffSet: [0, 0.25, 0]
       delayTimer: 1
-      aimingLength: 0.5
+      aimingLength: 0.899999976
       throwItem: false
       rayDistance: 0.5
 - EID: 65733
@@ -5135,7 +5135,7 @@
   Scripts:
     - Type: SHADE_Scripting.ThirdPersonCamera
       Enabled: true
-      armLength: 1
+      armLength: 2
       turnSpeedPitch: 0.300000012
       turnSpeedYaw: 0.5
       pitchClamp: 45
diff --git a/Assets/Scenes/MainGame.shade b/Assets/Scenes/MainGame.shade
index 5336f881..77d80689 100644
--- a/Assets/Scenes/MainGame.shade
+++ b/Assets/Scenes/MainGame.shade
@@ -9733,6 +9733,7 @@
       pitchClamp: 45
       inverseXControls: false
       inverseYControls: false
+      lowerClamp: 5
 - EID: 9
   Name: PlayerBag
   IsActive: true
diff --git a/Assets/Scenes/WinScene.shade b/Assets/Scenes/WinScene.shade
index b70cba65..3edd223b 100644
--- a/Assets/Scenes/WinScene.shade
+++ b/Assets/Scenes/WinScene.shade
@@ -36,6 +36,9 @@
       Mesh: 141771688
       Material: 129138332
       IsActive: true
+    UI Component:
+      Canvas ID: 1
+      IsActive: true
   Scripts: ~
 - EID: 5
   Name: Main Menu Button
@@ -56,6 +59,9 @@
       Hovered Texture: 55999018
       Clicked Texture: 66382894
       IsActive: true
+    UI Component:
+      Canvas ID: 1
+      IsActive: true
   Scripts:
     - Type: ChangeSceneButton
       Enabled: true
@@ -79,6 +85,9 @@
       Hovered Texture: 65045286
       Clicked Texture: 58607560
       IsActive: true
+    UI Component:
+      Canvas ID: 1
+      IsActive: true
   Scripts:
     - Type: QuitButton
       Enabled: true
diff --git a/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs
index 14eeb1d7..b03dbf2f 100644
--- a/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs
+++ b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs
@@ -17,6 +17,7 @@ namespace SHADE_Scripting
     public float pitchClamp = 45.0f;
     public bool inverseXControls = false;
     public bool inverseYControls = false;
+    public float lowerClamp = 5.0f;
 
     protected override void awake()
     {
@@ -58,9 +59,9 @@ namespace SHADE_Scripting
         {
           arm.Pitch = pitchClamp;
         }
-        else if (arm.Pitch < 0)
+        else if (arm.Pitch < lowerClamp)
         {
-          arm.Pitch = 0;
+          arm.Pitch = lowerClamp;
         }
       }
     }
-- 
2.40.1