hai :3

2025-12-06 19:48:35 -05:00 · 2025-12-06 19:47:21 -05:00 · 2025-12-06 19:43:40 -05:00 · 2025-08-31 17:37:36 -04:00 · 2025-07-20 14:31:44 -04:00 · 2025-07-19 11:43:05 -04:00
47 changed files with 1502 additions and 296 deletions
--- a/Assets/Core/Materials/LockOnMarkerMaterial.mat
+++ b/Assets/Core/Materials/LockOnMarkerMaterial.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/Assets/Player/Graphs/GrappleAimBT.asset
+++ b/Assets/Player/Graphs/GrappleAimBT.asset
@@ -0,0 +1,26 @@
+%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: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
+  m_Name: GrappleAimBT
+  m_EditorClassIdentifier: 
+  _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"_position":{"x":730.5245,"y":284.5939},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"0"},{"_condition":{"actionName":{"_value":"Grapple"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_position":{"x":498.9515,"y":429.918},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"1"},{"_action":{"fieldOfView":{"label":"FOV","value":60.0,"changeValue":1},"orbitFollowTop":{"label":"Top","changeHeight":1,"height":2.0,"changeRadius":1,"radius":2.0},"orbitFollowCenter":{"label":"Center","changeHeight":1,"height":1.5,"changeRadius":1,"radius":2.4},"orbitFollowBottom":{"label":"Bottom","changeHeight":1,"height":0.7,"changeRadius":1,"radius":2.0},"cameraOffset":{"label":"Screen
+    Position","newValue":{"x":2.0,"z":-1.0},"changeX":1,"changeZ":1},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"},"_position":{"x":527.6321,"y":581.3029},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"2"},{"_action":{"waitTime":{"_value":0.3},"$type":"NodeCanvas.Tasks.Actions.Wait"},"_position":{"x":682.4366,"y":430.895},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"3"},{"_condition":{"actionName":{"_value":"Grapple"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_position":{"x":826.7462,"y":427.8908},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"4"},{"_action":{"fieldOfView":{"label":"FOV","changeValue":2},"orbitFollowTop":{"label":"Top","changeHeight":2,"changeRadius":2},"orbitFollowCenter":{"label":"Center","changeHeight":2,"changeRadius":2},"orbitFollowBottom":{"label":"Bottom","changeHeight":2,"changeRadius":2},"screenPosition":{"label":"Screen
+    Position","changeX":2,"changeY":2},"cameraOffset":{"label":"Screen Position","changeX":2,"changeY":2,"changeZ":2},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"},"_position":{"x":880.8403,"y":568.1857},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
+  _objectReferences: []
+  _graphSource:
+    _version: 3.31
+    _category: 
+    _comments: 
+    _translation: {x: -21.80302, y: 59.90968}
+    _zoomFactor: 1
+  _haltSerialization: 0
+  _externalSerializationFile: {fileID: 0}
--- a/Assets/Player/Graphs/GrappleAimBT.asset.meta
+++ b/Assets/Player/Graphs/GrappleAimBT.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c2ae6811bd56a6245a6ab9ec1b0503ae
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Player/Graphs/GroundedCheckBT.asset
+++ b/Assets/Player/Graphs/GroundedCheckBT.asset
@@ -0,0 +1,24 @@
+%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: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3}
+  m_Name: GroundedCheckBT
+  m_EditorClassIdentifier: 
+  _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"repeaterMode":2,"repeatTimes":{"_value":1},"_position":{"x":476.0,"y":327.0},"$type":"NodeCanvas.BehaviourTrees.Repeater","$id":"0"},{"_position":{"x":550.0,"y":433.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"1"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"09b3259f-8b50-439a-ab86-ea3d8a4916f1"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_position":{"x":458.0,"y":522.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"2"},{"_action":{"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"inputVector3":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"$type":"NodeCanvas.Tasks.Actions.SetAirMovement"},"_position":{"x":396.0,"y":655.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"3"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"09b3259f-8b50-439a-ab86-ea3d8a4916f1"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_position":{"x":715.0,"y":523.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"4"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
+  _objectReferences: []
+  _graphSource:
+    _version: 3.31
+    _category: 
+    _comments: 
+    _translation: {x: 150, y: -43}
+    _zoomFactor: 1
+  _haltSerialization: 0
+  _externalSerializationFile: {fileID: 0}
--- a/Assets/Player/Graphs/GroundedCheckBT.asset.meta
+++ b/Assets/Player/Graphs/GroundedCheckBT.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f9aba4b029eacea44966829321f0124a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Player/Input/PlayerInputs.inputactions
+++ b/Assets/Player/Input/PlayerInputs.inputactions
@@ -62,7 +62,16 @@
                {
                    "name": "Grapple",
                    "type": "Button",
-                    "id": "00393a1c-cfdb-46f8-8e02-552382b53236",
+                    "id": "e0a48394-3128-4596-9b75-5dd3e82d3315",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
+                },
+                {
+                    "name": "Stick",
+                    "type": "Button",
+                    "id": "b8fc0f71-0bb1-4d46-94c9-a55a2b1b1fdb",
                    "expectedControlType": "",
                    "processors": "",
                    "interactions": "",
@@ -164,22 +173,11 @@
                    "path": "<Gamepad>/leftStickPress",
                    "interactions": "",
                    "processors": "",
-                    "groups": "",
+                    "groups": ";Controller",
                    "action": "Sprint",
                    "isComposite": false,
                    "isPartOfComposite": false
                },
-                {
-                    "name": "",
-                    "id": "0aec47c4-b519-4001-9408-a49abe218bd8",
-                    "path": "",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Lock-On",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
                {
                    "name": "",
                    "id": "c9d67b81-b640-4a64-9b31-f92c927c8345",
@@ -191,50 +189,6 @@
                    "isComposite": false,
                    "isPartOfComposite": false
                },
-                {
-                    "name": "",
-                    "id": "89e90b8f-c830-4d10-9046-c1db1ef970d0",
-                    "path": "",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Cancel Lock-On",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "One Modifier",
-                    "id": "cd93e290-6f16-49c1-af36-9d3eaedeb8a2",
-                    "path": "OneModifier",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Cancel Lock-On",
-                    "isComposite": true,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "modifier",
-                    "id": "8713a052-f2c4-439a-acae-f845a5654819",
-                    "path": "",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Cancel Lock-On",
-                    "isComposite": false,
-                    "isPartOfComposite": true
-                },
-                {
-                    "name": "binding",
-                    "id": "013863ac-050d-4d7f-a36c-bce06827ad17",
-                    "path": "",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Cancel Lock-On",
-                    "isComposite": false,
-                    "isPartOfComposite": true
-                },
                {
                    "name": "",
                    "id": "84c3f849-8d7f-40ea-8c6c-4b5af0d9addd",
@@ -248,7 +202,7 @@
                },
                {
                    "name": "",
-                    "id": "3c93b098-1bd2-42c6-90d6-3eea7694acd0",
+                    "id": "0c543052-3c80-432e-a34b-8fcb9267028a",
                    "path": "<Gamepad>/rightTrigger",
                    "interactions": "",
                    "processors": "",
@@ -256,6 +210,17 @@
                    "action": "Grapple",
                    "isComposite": false,
                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "44df0c44-6807-4876-823c-bca658513784",
+                    "path": "<Gamepad>/rightShoulder",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": ";Controller",
+                    "action": "Stick",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                }
            ]
        }
--- a/Assets/Plugins/ParadoxNotion/CanvasCore/Common/Design/PartialEditor/PropertyDrawerFactory.cs
+++ b/Assets/Plugins/ParadoxNotion/CanvasCore/Common/Design/PartialEditor/PropertyDrawerFactory.cs
@@ -152,7 +152,7 @@ namespace ParadoxNotion.Design
        }

        ///<summary>Override to implement GUI. Return the modified instance at the end.</summary>
-        abstract public T OnGUI(GUIContent content, T instance);
+        abstract public T OnGUI(GUIContent content, T _instance);
    }

    ///<summary>The default object drawer implementation able to inspect most types</summary>
@@ -165,8 +165,8 @@ namespace ParadoxNotion.Design
            this.objectType = objectType;
        }

-        public override object OnGUI(GUIContent content, object instance) {
-            return EditorUtils.DrawEditorFieldDirect(content, instance, objectType, info);
+        public override object OnGUI(GUIContent content, object _instance) {
+            return EditorUtils.DrawEditorFieldDirect(content, _instance, objectType, info);
        }
    }

--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -2644,7 +2644,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 330585543}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.11558351, y: 0.00000003563248, z: -0.000000004146316, w: 0.99329776}
+  m_LocalRotation: {x: 0.039987642, y: -0.0000000031281908, z: 1.251891e-10, w: 0.99920017}
  m_LocalPosition: {x: 1.503913, y: 2.0657892, z: -6.8609486}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@@ -2840,6 +2840,8 @@ GameObject:
  - component: {fileID: 402424911}
  - component: {fileID: 402424910}
  - component: {fileID: 402424908}
+  - component: {fileID: 402424912}
+  - component: {fileID: 402424913}
  m_Layer: 0
  m_Name: Cinemachine
  m_TagString: Untagged
@@ -2898,7 +2900,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 402424904}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.115583494, y: 0.000000035632475, z: -0.000000004146315, w: 0.99329776}
+  m_LocalRotation: {x: 0.039987642, y: -0.0000000031281908, z: 1.2518941e-10, w: 0.99920017}
  m_LocalPosition: {x: 1.503913, y: 2.0657892, z: -6.8609486}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@@ -2920,7 +2922,7 @@ MonoBehaviour:
  TargetOffset: {x: 0, y: 0, z: 0}
  TrackerSettings:
    BindingMode: 5
-    PositionDamping: {x: 1, y: 1, z: 1}
+    PositionDamping: {x: 0.5, y: 1, z: 0.2}
    AngularDampingMode: 0
    RotationDamping: {x: 0, y: 0, z: 0}
    QuaternionDamping: 1
@@ -3068,14 +3070,41 @@ MonoBehaviour:
      Enabled: 0
      Size: {x: 0.8, y: 0.8}
      Offset: {x: 0, y: 0}
-  CenterOnActivate: 1
-  TargetOffset: {x: 0, y: 0, z: 0}
+  CenterOnActivate: 0
+  TargetOffset: {x: 0, y: 1, z: 0}
  Damping: {x: 0.5, y: 0.5}
  Lookahead:
    Enabled: 0
    Time: 0
    Smoothing: 0
    IgnoreY: 0
+--- !u!114 &402424912
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 402424904}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c032a18b0b0c1da4092bfc365c6e4aad, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &402424913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 402424904}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 44d70cc20219cd84593f67d248eafe36, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Offset: {x: 0, y: 0, z: 0}
+  ApplyAfter: 1
+  PreserveComposition: 0
 --- !u!1 &410087039
 GameObject:
  m_ObjectHideFlags: 0
@@ -6672,7 +6701,7 @@ CharacterController:
  m_Enabled: 1
  serializedVersion: 3
  m_Height: 2
-  m_Radius: 0.8
+  m_Radius: 0.49
  m_SlopeLimit: 45
  m_StepOffset: 0.3
  m_SkinWidth: 0.01
@@ -6691,9 +6720,21 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  _parentBlackboard: {fileID: 0}
-  _serializedBlackboard: '{"_variables":{}}'
+  _serializedBlackboard: '{"_variables":{"isGrounded":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"09b3259f-8b50-439a-ab86-ea3d8a4916f1","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
+    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"airMoveDirection":{"_name":"airMoveDirection","_id":"2fc91db6-09dd-4a1f-9195-426a0c44de31","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
+    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"groundMoveDirection":{"_name":"groundMoveDirection","_id":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
+    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
  _objectReferences: []
-  _serializedVariables: []
+  _serializedVariables:
+  - _json: '{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"09b3259f-8b50-439a-ab86-ea3d8a4916f1","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
+      mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}'
+    _references: []
+  - _json: '{"_name":"airMoveDirection","_id":"2fc91db6-09dd-4a1f-9195-426a0c44de31","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
+      UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+    _references: []
+  - _json: '{"_name":"groundMoveDirection","_id":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
+      UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
+    _references: []
 --- !u!114 &1992890478
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -6708,34 +6749,33 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _serializedExposedParameters: []
  _boundGraphSerialization: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_onEnterList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"valueB":{"_value":4},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[System.Int32,
-    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},{"valueA":{"_name":"airMoveDirection","_targetVariableID":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2"},"valueB":{"_name":"groundMoveDirection","_targetVariableID":"765d24b4-452d-4531-9fce-6cef7ba39634"},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[UnityEngine.Vector3,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[{"valueA":{"_name":"airMoveDirection","_targetVariableID":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2"},"valueB":{"_name":"groundMoveDirection","_targetVariableID":"765d24b4-452d-4531-9fce-6cef7ba39634"},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[UnityEngine.Vector3,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"foldEnter":true,"foldExit":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Ground
-    Idle","_position":{"x":441.1072,"y":185.9887},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"0"},{"_onEnterList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"_onUpdateList":{"executionMode":1,"actions":[{"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2"},"groundMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"765d24b4-452d-4531-9fce-6cef7ba39634"},"$type":"NodeCanvas.Tasks.Actions.CalculateAirMovement"}]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Airborn
-    (Actionable)","_position":{"x":607.037,"y":-147.5533},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"1"},{"_onEnterList":{"executionMode":1,"actions":[{"jumpStrength":{"_value":18.0},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2"},"standStillJumpStrength":{},"jumpPower":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"currentVelocityInheritence":{"_value":0.2},"directionalForce":{"_value":{"y":1.0,"z":0.3}},"directionalForceStrength":{"_value":1.0},"$type":"NodeCanvas.Tasks.Actions.AddJump"},{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Wall
-    Climb Jump","_position":{"x":1065.998,"y":-269.9991},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"2"},{"_onEnterList":{"executionMode":1,"actions":[{"jumpStrength":{},"airMoveDirection":{},"standStillJumpStrength":{},"jumpPower":{},"currentVelocityInheritence":{},"directionalForce":{},"directionalForceStrength":{},"$type":"NodeCanvas.Tasks.Actions.AddJump"},{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Wall
-    Jump","_position":{"x":868.4374,"y":-418.9596},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"3"},{"_onEnterList":{"executionMode":1,"actions":[{"jumpStrength":{"_value":12.0},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2"},"standStillJumpStrength":{"_value":1.0},"jumpPower":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"currentVelocityInheritence":{"_value":1.0},"directionalForce":{},"directionalForceStrength":{},"$type":"NodeCanvas.Tasks.Actions.AddJump"},{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Standard
-    Jump","_position":{"x":831.2836,"y":45.40904},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"4"},{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[{"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2"},"groundMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"765d24b4-452d-4531-9fce-6cef7ba39634"},"$type":"NodeCanvas.Tasks.Actions.CalculateAirMovement"}]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Airborn","_position":{"x":213.7761,"y":-7.08618},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"5"},{"_onEnterList":{"executionMode":1,"actions":[{"jumpStrength":{"_value":10.0},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2"},"standStillJumpStrength":{},"jumpPower":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"currentVelocityInheritence":{"_value":0.3},"directionalForce":{"_value":{"x":1.0,"z":1.0}},"directionalForceStrength":{"_value":10.0},"$type":"NodeCanvas.Tasks.Actions.AddJump"},{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Wall
-    Jump","_position":{"x":328.7507,"y":-415.5261},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"6"},{"_actionList":{"executionMode":1,"actions":[{"cinemachine":{"_value":1},"orbitFollowTop":{"label":"Top","changeHeight":1,"height":2.0,"changeRadius":1,"radius":2.0},"orbitFollowCenter":{"label":"Center","changeHeight":1,"height":1.5,"changeRadius":1,"radius":2.4},"orbitFollowBottom":{"label":"Bottom","changeHeight":1,"height":0.7,"changeRadius":1,"radius":2.0},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":790.0,"y":392.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"7"},{"_actionList":{"executionMode":1,"actions":[{"cinemachine":{"_value":1},"orbitFollowTop":{"label":"Top","changeHeight":2,"changeRadius":2},"orbitFollowCenter":{"changeHeight":2,"changeRadius":2},"orbitFollowBottom":{"changeHeight":2,"changeRadius":2},"$type":"NodeCanvas.Tasks.Actions.ChangeCameraSettings"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":583.0,"y":512.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"8"},{"_subFSM":{"_value":2},"_variablesMap":[{"_targetSubGraphVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6","_canRead":true,"_canWrite":true,"_type":"UnityEngine.Vector3","_name":"groundMoveDirection","_targetVariableID":"765d24b4-452d-4531-9fce-6cef7ba39634"},{"_targetSubGraphVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5","_canRead":true,"_canWrite":true,"_type":"System.Single","_name":"rotationSpeed","_targetVariableID":"3a7d1c7c-8fb6-4a99-b25a-b434b62d4611"}],"_position":{"x":-50.62204,"y":454.3138},"$type":"NodeCanvas.StateMachines.ConcurrentSubFSM"},{"_conditionList":{"conditions":[{"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.DebugCondition"}]},"_actionList":{"executionMode":1,"actions":[{"groundMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"765d24b4-452d-4531-9fce-6cef7ba39634"},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2"},"gravityAcceleration":{"_value":1.0},"gravityMax":{"_value":8.0},"jumpPower":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"jumpPowerDecay":{"_value":2.0},"playerFacingDirection":1,"rotationSpeed":{"_name":"rotationSpeed","_targetVariableID":"3a7d1c7c-8fb6-4a99-b25a-b434b62d4611"},"rotationSmoothing":{"_value":1.0},"gravityPower":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"$type":"NodeCanvas.Tasks.Actions.ProcessMovement"}]},"_position":{"x":-53.13062,"y":301.5233},"$type":"NodeCanvas.StateMachines.OnFSMEnter"}],"connections":[{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Grapple"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"eventName":{"_value":"ForwardRay"},"value":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckEventValue`1[[System.Boolean,
-    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"eventName":{"_value":"RightRay"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInt"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"eventName":{"_value":"LeftRay"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Grapple"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGrounded":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"619300a4-be8b-4ad4-ba2a-978468094ba2","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
+    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},{"valueA":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"valueB":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[UnityEngine.Vector3,
+    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldExit":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Ground
+    Idle","_position":{"x":279.7396,"y":305.6144},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"0"},{"_onEnterList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"_onUpdateList":{"executionMode":1,"actions":[{"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"groundMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"playerFacingDirection":{"_name":"facingDirection","_targetVariableID":"ff039cd9-e306-4c88-84db-54cbd3708ed5"},"$type":"NodeCanvas.Tasks.Actions.CalculateAirMovement"}]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Airborn
+    (Actionable)","_position":{"x":665.0512,"y":-148.5536},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"1"},{"_onEnterList":{"executionMode":1,"actions":[{"jumpStrength":{"_value":18.0},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"playerFacingDirection":{"_name":"facingDirection","_targetVariableID":"ff039cd9-e306-4c88-84db-54cbd3708ed5"},"standStillJumpStrength":{},"jumpPower":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"currentVelocityInheritence":{"_value":0.2},"directionalForce":{"_value":{"y":1.0,"z":0.3}},"directionalForceStrength":{"_value":1.0},"$type":"NodeCanvas.Tasks.Actions.AddJump"},{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Wall
+    Climb Jump","_position":{"x":1041.998,"y":-349.5591},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"2"},{"_onEnterList":{"executionMode":1,"actions":[{"jumpStrength":{},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"playerFacingDirection":{"_name":"facingDirection","_targetVariableID":"ff039cd9-e306-4c88-84db-54cbd3708ed5"},"standStillJumpStrength":{},"jumpPower":{},"currentVelocityInheritence":{},"directionalForce":{},"directionalForceStrength":{},"$type":"NodeCanvas.Tasks.Actions.AddJump"},{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Wall
+    Jump","_position":{"x":860.4374,"y":-478.9596},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"3"},{"_onEnterList":{"executionMode":1,"actions":[{"jumpStrength":{"_value":12.0},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"playerFacingDirection":{"_name":"facingDirection","_targetVariableID":"ff039cd9-e306-4c88-84db-54cbd3708ed5"},"standStillJumpStrength":{"_value":1.0},"jumpPower":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"currentVelocityInheritence":{"_value":1.0},"directionalForce":{},"directionalForceStrength":{},"$type":"NodeCanvas.Tasks.Actions.AddJump"},{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Standard
+    Jump","_position":{"x":879.2953,"y":92.40906},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"4"},{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[{"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"groundMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"playerFacingDirection":{"_name":"facingDirection","_targetVariableID":"ff039cd9-e306-4c88-84db-54cbd3708ed5"},"$type":"NodeCanvas.Tasks.Actions.CalculateAirMovement"}]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Airborn","_position":{"x":145.816,"y":-27.25839},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"5"},{"_onEnterList":{"executionMode":1,"actions":[{"jumpStrength":{"_value":10.0},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"playerFacingDirection":{"_name":"facingDirection","_targetVariableID":"ff039cd9-e306-4c88-84db-54cbd3708ed5"},"standStillJumpStrength":{},"jumpPower":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"currentVelocityInheritence":{"_value":0.3},"directionalForce":{"_value":{"x":1.0,"z":1.0}},"directionalForceStrength":{"_value":10.0},"$type":"NodeCanvas.Tasks.Actions.AddJump"},{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Wall
+    Jump","_position":{"x":328.7507,"y":-416.5261},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"6"},{"_onEnterList":{"actions":[{"valueA":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVector3"},{"valueA":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onUpdateList":{"executionMode":1,"actions":[{"valueA":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_onExitList":{"executionMode":1,"actions":[]},"foldEnter":true,"foldUpdate":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Stick","_position":{"x":1341.099,"y":82.87861},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"7"},{"_actionList":{"executionMode":1,"actions":[]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1100.465,"y":268.9976},"$type":"NodeCanvas.StateMachines.ActionState","$id":"8"},{"_subFSM":{"_value":1},"_variablesMap":[{"_targetSubGraphVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6","_canRead":true,"_canWrite":true,"_type":"UnityEngine.Vector3","_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},{"_targetSubGraphVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5","_canRead":true,"_canWrite":true,"_type":"System.Single","_name":"rotationSpeed","_targetVariableID":"3a7d1c7c-8fb6-4a99-b25a-b434b62d4611"}],"_position":{"x":-257.669,"y":558.3375},"$type":"NodeCanvas.StateMachines.ConcurrentSubFSM"},{"_conditionList":{"conditions":[{"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.DebugCondition"}]},"_actionList":{"executionMode":1,"actions":[{"groundMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"airMoveDirection":{"_name":"airMoveDirection","_targetVariableID":"2fc91db6-09dd-4a1f-9195-426a0c44de31"},"gravityAcceleration":{"_value":1.0},"gravityMax":{"_value":8.0},"jumpPower":{"_name":"jumpPower","_targetVariableID":"9a82efee-e317-423c-ad6e-5ef7e6145396"},"jumpPowerDecay":{"_value":2.0},"playerFacingDirection":{"_name":"facingDirection","_targetVariableID":"ff039cd9-e306-4c88-84db-54cbd3708ed5"},"rotationSpeed":{"_name":"rotationSpeed","_targetVariableID":"3a7d1c7c-8fb6-4a99-b25a-b434b62d4611"},"rotationSmoothing":{"_value":1.0},"gravityPower":{"_name":"gravityPower","_targetVariableID":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e"},"$type":"NodeCanvas.Tasks.Actions.ProcessMovement"}]},"_position":{"x":-260.1776,"y":405.5469},"$type":"NodeCanvas.StateMachines.OnFSMEnter"},{"_subTree":{"_value":2},"_position":{"x":-43.41095,"y":552.2315},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subTree":{"_value":3},"_tag":"","_position":{"x":451.3007,"y":22.14104},"_comment":"","$type":"NodeCanvas.StateMachines.ConcurrentSubTree"}],"connections":[{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"eventName":{"_value":"ForwardRay"},"value":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckEventValue`1[[System.Boolean,
+    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"eventName":{"_value":"RightRay"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInt"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"eventName":{"_value":"LeftRay"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Stick"},"actionValue":{},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGrounded":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"619300a4-be8b-4ad4-ba2a-978468094ba2","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"forwardRay":{"_propertyPath":"PlayerMovement.forwardRay","_name":"forwardRay","_id":"a2506ca5-1b47-4820-9921-3ff4ecc18564","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.RaycastHit,
    UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"airJumpsRemaining":{"_name":"airJumpsRemaining","_id":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d","$type":"NodeCanvas.Framework.Variable`1[[System.Int32,
-    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"groundMoveDirection":{"_name":"groundMoveDirection","_id":"765d24b4-452d-4531-9fce-6cef7ba39634","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"airMoveDirection":{"_name":"airMoveDirection","_id":"8f5f926f-618d-4bcb-87eb-0bcd02e405a2","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"rotationSpeed":{"_value":0.5,"_name":"rotationSpeed","_id":"3a7d1c7c-8fb6-4a99-b25a-b434b62d4611","$type":"NodeCanvas.Framework.Variable`1[[System.Single,
+    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"rotationSpeed":{"_value":0.5,"_name":"rotationSpeed","_id":"3a7d1c7c-8fb6-4a99-b25a-b434b62d4611","$type":"NodeCanvas.Framework.Variable`1[[System.Single,
    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"jumpPower":{"_name":"jumpPower","_id":"9a82efee-e317-423c-ad6e-5ef7e6145396","$type":"NodeCanvas.Framework.Variable`1[[System.Single,
    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"gravityPower":{"_name":"gravityPower","_id":"2221dc20-d9b3-4781-bd23-0b2038a7ff5e","$type":"NodeCanvas.Framework.Variable`1[[System.Single,
-    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}}}'
+    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"facingDirection":{"_value":1,"_name":"facingDirection","_id":"ff039cd9-e306-4c88-84db-54cbd3708ed5","$type":"NodeCanvas.Framework.Variable`1[[Reset.Player.Movement.PlayerFacingDirection,
+    Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}}'
  _boundGraphObjectReferences:
  - {fileID: 0}
-  - {fileID: 402424904}
  - {fileID: 11400000, guid: b307c218c1a404548afe65e66737fa80, type: 2}
+  - {fileID: 11400000, guid: c2ae6811bd56a6245a6ab9ec1b0503ae, type: 2}
+  - {fileID: 11400000, guid: f9aba4b029eacea44966829321f0124a, type: 2}
  _boundGraphSource:
    _version: 3.31
    _category: 
    _comments: 
-    _translation: {x: 215, y: 546}
-    _zoomFactor: 1
+    _translation: {x: -51, y: 507}
+    _zoomFactor: 0.97967756
  _firstActivation: 0
  _enableAction: 0
  _disableAction: 0
--- a/Assets/Scripts/Core/Graph
+++ b/Assets/Scripts/Core/Graph
@@ -5,7 +5,7 @@ using ParadoxNotion;
 using ParadoxNotion.Design;
 using UnityEngine;
 using UnityEngine.InputSystem;
-
+using Reset.Player.Movement;

 namespace NodeCanvas.Tasks.Actions {
 	[Category("Reset/Movement")]
@@ -13,6 +13,8 @@ namespace NodeCanvas.Tasks.Actions {
        public BBParameter<float> jumpStrength;
        public BBParameter<Vector3> airMoveDirection;

+        public BBParameter<PlayerFacingDirection> playerFacingDirection;
+        
 		[Range(0f, 1f)]
        public BBParameter<float> standStillJumpStrength;

@@ -51,14 +53,13 @@ namespace NodeCanvas.Tasks.Actions {
 			// Save current velocity and get current input direction
 			Vector3 currentVelocityVector3 = new Vector3(agent.velocity.x, 0f, agent.velocity.z);
 			Vector2 currentInput = agent.GetComponent<PlayerControls>().rawMoveInput;
-			Vector3 currentInputVector3 = new(currentInput.x, 0f, currentInput.y);
+			Vector3 currentInputVector3 = new Vector3(currentInput.x, 0f, currentInput.y);
 			
 			// Ignore rotation for the current velocity
 			Vector3 currentVelocityWorld = agent.transform.InverseTransformDirection(currentVelocityVector3.normalized);
 			
 			// Get the dot product between current velocity's direction and current input (UNUSED FOR NOW)
 			float velocityInputDot = Vector3.Dot(currentVelocityWorld, currentInputVector3);
-	
 			
 			// Set air move direction
 			if (agent.isGrounded) {
@@ -77,26 +78,24 @@ namespace NodeCanvas.Tasks.Actions {
 				
 				// Remap the dot to  set -1 (opposing direction) to -.5f, and 1 (same direciton) to 1.2f
 				// This is done to allow some sideways jumping direction change, but none backwards, and all forwards
-				float remappedAirDirectionDot = Mathf.Lerp(.3f, 1.2f, airMoveDirectionDot);
+				float remappedAirDirectionDot = Mathf.Lerp(.1f, 1.2f, airMoveDirectionDot);
 				remappedAirDirectionDot = Mathf.Clamp(remappedAirDirectionDot, 0f, 1f);
-
-				// Lerp between the current direction and the inputted direction based on the previous dot product
-				Vector3 outputDirection = Vector3.Lerp(currentVelocityVector3.normalized, currentInputVector3.normalized, remappedAirDirectionDot);
 				
-				// If there is a direction force, lean into that based on it's strength
+				// Lerp between the current direction and the inputted direction based on the previous dot product
+				Vector3 outputDirection = Vector3.Lerp(currentInputVector3.normalized, currentVelocityVector3.normalized, remappedAirDirectionDot);
+				
+				// If there is a directional force (such as the Wall Climb jump going straight upward) supplied in the task, lean into that based on it's strength
 				outputDirection = Vector3.Lerp(outputDirection, directionalForce.value.normalized, directionalForceStrength.value).normalized;
 				
 				// Extra math to degrade current air move direction by velocity inheritence, before applying new air direction
 				airMoveDirection.value *= currentVelocityInheritence.value;
 				
-				// Set air move direciton
+				// Account for the camera's rotation before setting it as the air move direction
+				outputDirection = Camera.main.transform.rotation.Flatten(0, null, 0) * outputDirection;
+				
+				// Set air move direction
 				airMoveDirection.value += outputDirection * outputVelocity;
 			}
-			
-			// Transform and apply rotatio
-			
-			agent.transform.rotation = Quaternion.LookRotation(airMoveDirection.value);
-			
 			EndAction(true);
 		}
 		
--- a/Tasks/CalculateAirMovement.cs
+++ b/Tasks/CalculateAirMovement.cs
@@ -1,6 +1,8 @@
 using NodeCanvas.Framework;
 using ParadoxNotion.Design;
 using UnityEngine;
+using Reset.Player.Movement;
+

 namespace NodeCanvas.Tasks.Actions {
 	
@@ -8,6 +10,8 @@ namespace NodeCanvas.Tasks.Actions {
 	public class CalculateAirMovement : ActionTask<Transform>{
 		public BBParameter<Vector3> airMoveDirection;
 		public BBParameter<Vector3> groundMoveDirection;
+		
+		public BBParameter<PlayerFacingDirection> playerFacingDirection;

 		private float airControlPower = 1f;
 		
@@ -20,8 +24,8 @@ namespace NodeCanvas.Tasks.Actions {
 		//This is called once each time the task is enabled.
 		//Call EndAction() to mark the action as finished, either in success or failure.
 		//EndAction can be called from anywhere.
-		protected override void OnExecute() {
-			airControlPower = 1f;
+		protected override void OnExecute(){
+			
 		}

 		//Called once per frame while the action is active.
@@ -34,8 +38,9 @@ namespace NodeCanvas.Tasks.Actions {
 			
 			// Add air control
 			Vector3 inputVector3 = new(agent.GetComponent<PlayerControls>().rawMoveInput.x, 0f, agent.GetComponent<PlayerControls>().rawMoveInput.y);
-			float originalMagnitude = airMoveDirection.value.magnitude; 
-			airMoveDirection.value += Camera.main.transform.rotation * inputVector3 * airControlPower;
+			float originalMagnitude = airMoveDirection.value.magnitude;
+			airMoveDirection.value += Camera.main.transform.rotation.Flatten(0, null, 0) *
+			                          inputVector3 * airControlPower;

 			airMoveDirection.value = Vector3.ClampMagnitude(airMoveDirection.value, originalMagnitude);
 		}
--- a/Tasks/ChangeCameraSettings.cs
+++ b/Tasks/ChangeCameraSettings.cs
@@ -1,49 +1,9 @@
 using NodeCanvas.Framework;
-using NodeCanvas.Tasks.Actions;
 using ParadoxNotion.Design;
-using Sirenix.OdinInspector;
 using Unity.Cinemachine;
 using UnityEditor;
 using UnityEngine;

-// TODO: Move this outta here but I don't know where to. Future organization task? There's also a shitty method down below in OnInit that calls this for every single instance of Change Camera Settings.
-public static class OriginalCameraSettings{
-	public static float orbitFollowTopHeight;
-	public static float orbitFollowTopRadius;
-	public static float orbitFollowCenterHeight;
-	public static float orbitFollowCenterRadius;
-	public static float orbitFollowBottomHeight;
-	public static float orbitFollowBottomRadius;
-
-	public static Vector2 rotCompScreenPosition;
-
-	public static bool valuesSaved;
-
-	[InitializeOnEnterPlayMode]
-	public static void OnEnterPlaymodeInEditor(){
-		// Unity Play Mode contingency
-		valuesSaved = false;
-	}
-
-	public static void StashCameraOriginalSettings(GameObject cinemachine){
-		if (valuesSaved == false) {
-			CinemachineOrbitalFollow orbit = cinemachine.GetComponent<CinemachineOrbitalFollow>();
-			
-			orbitFollowTopHeight = orbit.Orbits.Top.Height;
-			orbitFollowTopRadius = orbit.Orbits.Top.Radius;
-			orbitFollowCenterHeight = orbit.Orbits.Center.Height;
-			orbitFollowCenterRadius = orbit.Orbits.Center.Radius;
-			orbitFollowBottomHeight = orbit.Orbits.Bottom.Height;
-			orbitFollowBottomRadius = orbit.Orbits.Bottom.Radius;
-
-			CinemachineRotationComposer rotComp = cinemachine.GetComponent<CinemachineRotationComposer>();
-			rotCompScreenPosition = rotComp.Composition.ScreenPosition;
-
-			valuesSaved = true;
-		}
-	}
-}
-
 // Individual bool setting for each ring. Three of these will be used. 
 public struct OrbitalFollowValueGroup{
 	public string label;
@@ -63,16 +23,246 @@ public struct OrbitalFollowValueGroup{
 	}
 }

+// Setting for any X and Y based values
+public struct CinemachineVectorValueGroup{
+	public CameraSettingsToggle changeX;
+	public float xValue;
+	public CameraSettingsToggle changeY;
+	public float yValue;
+}
+
 // Enum options for individual camera settings
 public enum CameraSettingsToggle{
 	NoChange,
 	NewValue,
-	ResetValue
+	ResetValue,
+}
+
+public struct Vector3CameraValueGroup{
+	public string label;
+	public Vector3 newValue;
+	
+	public CameraSettingsToggle changeX;
+	public CameraSettingsToggle changeY;
+	public CameraSettingsToggle changeZ;
+	
+	public Vector3CameraValueGroup(string newLabel){
+		changeX = CameraSettingsToggle.NoChange;
+		changeY = CameraSettingsToggle.NoChange;
+		changeZ = CameraSettingsToggle.NoChange;
+
+		newValue = Vector3.zero;
+		label = newLabel;
+	}
+}
+
+public struct Vector2CameraValueGroup{
+	public string label;
+	public Vector2 newValue;
+	
+	public CameraSettingsToggle changeX;
+	public CameraSettingsToggle changeY;
+	
+	public Vector2CameraValueGroup(string newLabel){
+		changeX = CameraSettingsToggle.NoChange;
+		changeY = CameraSettingsToggle.NoChange;
+
+		newValue = Vector2.zero;
+		label = newLabel;
+	}
+}
+
+public struct FloatCameraValueGroup{
+	public string label;
+	public float value;
+
+	public CameraSettingsToggle changeValue;
+
+	public FloatCameraValueGroup(string newLabel){
+		label = newLabel;
+		value = 0f;
+		changeValue = CameraSettingsToggle.NoChange;
+	}
+}
+
+#if UNITY_EDITOR
+public class FloatCameraValueGroupDrawer : ObjectDrawer<FloatCameraValueGroup>  {
+	public override FloatCameraValueGroup OnGUI(GUIContent _content, FloatCameraValueGroup _instance){
+		// Remove label for floats
+		EditorGUIUtility.labelWidth = 50;
+		
+		// Set layout options for the label and the float fields
+		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+			GUILayout.Width(80.0f), 
+			GUILayout.MinWidth(20.0f), 
+			GUILayout.ExpandWidth(true), 
+		};
+
+		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+			GUILayout.Width(200.0f),
+		};
+		
+		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+		GUILayout.BeginVertical();
+		GUILayout.Label(_instance.ToString(), labelOptions);
+		GUILayout.BeginHorizontal();
+		
+		// Create the x settings enum
+		_instance.changeValue = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", instance.changeValue);
+		
+		// Create the value/disabled information field
+		if (_instance.changeValue == CameraSettingsToggle.NewValue){
+			_instance.value = EditorGUILayout.FloatField(_instance.value, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeValue == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		
+		// Close this line up
+		GUILayout.EndHorizontal();
+		GUILayout.EndVertical();
+		
+		// Reset to default so the rest of things don't get messed up
+		EditorGUIUtility.labelWidth = 0;
+		return _instance;
+	}
+}
+
+public class Vector3CameraValueGroupDrawer : ObjectDrawer<Vector3CameraValueGroup>  {
+	public override Vector3CameraValueGroup OnGUI(GUIContent _content, Vector3CameraValueGroup _instance){
+		// Remove label for floats
+		EditorGUIUtility.labelWidth = 20;
+		
+		// Set layout options for the label and the float fields
+		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+			GUILayout.Width(300.0f), 
+			GUILayout.MinWidth(20.0f), 
+			GUILayout.ExpandWidth(true), 
+		};
+
+		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+			GUILayout.Width(200.0f),
+		};
+		
+		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+		GUILayout.BeginVertical();
+		GUILayout.Label(_instance.ToString(), labelOptions);
+		GUILayout.BeginHorizontal();
+		
+		// Create the x settings enum
+		_instance.changeX = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", instance.changeX);
+		
+		// Create the value/disabled information field
+		if (_instance.changeX == CameraSettingsToggle.NewValue){
+			_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeX == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		  
+		// It do what it do.
+		GUILayout.Space(5);
+		
+		// Create the y settings enum
+		_instance.changeY = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", _instance.changeY);
+		
+		// Create the value/disabled information field
+		if (_instance.changeY == CameraSettingsToggle.NewValue){
+			_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeY == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		
+		// It do what it do.
+		GUILayout.Space(5);
+		
+		// Create the y settings enum
+		_instance.changeZ = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", _instance.changeZ);
+		
+		// Create the value/disabled information field
+		if (_instance.changeZ == CameraSettingsToggle.NewValue){
+			_instance.newValue.z = EditorGUILayout.FloatField(_instance.newValue.z, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeZ == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		
+		// Close this line up
+		GUILayout.EndHorizontal();
+		GUILayout.EndVertical();
+		
+		// Reset to default so the rest of things don't get messed up
+		EditorGUIUtility.labelWidth = 0;
+		return _instance;
+	}
+}
+
+public class Vector2CameraValueGroupDrawer : ObjectDrawer<Vector2CameraValueGroup>  {
+	public override Vector2CameraValueGroup OnGUI(GUIContent _content, Vector2CameraValueGroup _instance){
+		// Remove label for floats
+		EditorGUIUtility.labelWidth = 50;
+		
+		// Set layout options for the label and the float fields
+		GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+			GUILayout.Width(300.0f), 
+			GUILayout.MinWidth(20.0f), 
+			GUILayout.ExpandWidth(true), 
+		};
+
+		GUILayoutOption[] labelOptions = new GUILayoutOption[]{
+			GUILayout.Width(200.0f),
+		};
+		
+		// Start the Vertical layout then add the label before adding a horizontal so the label will be on top of side-by-side options
+		GUILayout.BeginVertical();
+		GUILayout.Label(_instance.ToString(), labelOptions);
+		GUILayout.BeginHorizontal();
+		
+		// Create the x settings enum
+		_instance.changeX = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", instance.changeX);
+		
+		// Create the value/disabled information field
+		if (_instance.changeX == CameraSettingsToggle.NewValue){
+			_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeX == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		  
+		// It do what it do.
+		GUILayout.Space(5);
+		
+		// Create the y settings enum
+		_instance.changeY = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", _instance.changeY);
+		
+		// Create the value/disabled information field
+		if (_instance.changeY == CameraSettingsToggle.NewValue){
+			_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
+		} else {
+			EditorGUI.BeginDisabledGroup(true);
+			EditorGUILayout.TextField(_instance.changeY == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUI.EndDisabledGroup();
+		}
+		
+		// Close this line up
+		GUILayout.EndHorizontal();
+		GUILayout.EndVertical();
+		
+		// Reset to default so the rest of things don't get messed up
+		EditorGUIUtility.labelWidth = 0;
+		return _instance;
+	}
 }

 // Custom editor for each orbital follow ring setting
 public class OrbitalFollowValueGroupDrawer : ObjectDrawer<OrbitalFollowValueGroup>{
-	public override OrbitalFollowValueGroup OnGUI(GUIContent content, OrbitalFollowValueGroup instance){
+	public override OrbitalFollowValueGroup OnGUI(GUIContent _content, OrbitalFollowValueGroup _instance){
 		// Remove label for floats
 		EditorGUIUtility.labelWidth = 1;
 		
@@ -91,17 +281,17 @@ public class OrbitalFollowValueGroupDrawer : ObjectDrawer<OrbitalFollowValueGrou
 		GUILayout.BeginHorizontal();
 		
 		// Add the left side label
-		GUILayout.Label(instance.label, labelOptions);
+		GUILayout.Label(_instance.label, labelOptions);
 		
 		// Create the height settings enum
-		instance.changeHeight = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", instance.changeHeight);
+		_instance.changeHeight = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", _instance.changeHeight);
 		
 		// Create the value/disabled information field
-		if (instance.changeHeight == CameraSettingsToggle.NewValue){
-			instance.height = EditorGUILayout.FloatField(instance.height, floatOptions);
+		if (_instance.changeHeight == CameraSettingsToggle.NewValue){
+			_instance.height = EditorGUILayout.FloatField(_instance.height, floatOptions);
 		} else {
 			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(instance.changeHeight == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUILayout.TextField(_instance.changeHeight == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
 			EditorGUI.EndDisabledGroup();
 		}
 		  
@@ -109,14 +299,14 @@ public class OrbitalFollowValueGroupDrawer : ObjectDrawer<OrbitalFollowValueGrou
 		GUILayout.Space(5);
 		
 		// Create the radius settings enum
-		instance.changeRadius = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", instance.changeRadius);
+		_instance.changeRadius = (CameraSettingsToggle)EditorGUILayout.EnumPopup("", _instance.changeRadius);
 		
 		// Create the value/disabled information field
-		if (instance.changeRadius == CameraSettingsToggle.NewValue){
-			instance.radius = EditorGUILayout.FloatField(instance.radius, floatOptions);
+		if (_instance.changeRadius == CameraSettingsToggle.NewValue){
+			_instance.radius = EditorGUILayout.FloatField(_instance.radius, floatOptions);
 		} else {
 			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(instance.changeRadius == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
+			EditorGUILayout.TextField(_instance.changeRadius == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
 			EditorGUI.EndDisabledGroup();
 		}
 		
@@ -125,44 +315,32 @@ public class OrbitalFollowValueGroupDrawer : ObjectDrawer<OrbitalFollowValueGrou
 		
 		// Reset to default so the rest of things don't get messed up
 		EditorGUIUtility.labelWidth = 0;
-		return instance;
+		return _instance;
 	}
 }
+#endif

 namespace NodeCanvas.Tasks.Actions {
-	
 	[Category("Reset")]
 	[Description("Change Cinemachine camera settings for the player")]
 	public class ChangeCameraSettings : ActionTask{
-		public BBParameter<GameObject> cinemachine;
-		[Space(5)]
+		[ParadoxNotion.Design.Header("Main Settings")]
+		public FloatCameraValueGroup fieldOfView = new (newLabel: "FOV");
 		
 		[ParadoxNotion.Design.Header("Orbit Follow Ring Settings")]
-		public OrbitalFollowValueGroup orbitFollowTop = new OrbitalFollowValueGroup(newLabel: "Top");
-		public OrbitalFollowValueGroup orbitFollowCenter = new OrbitalFollowValueGroup(newLabel: "Center");
-		public OrbitalFollowValueGroup orbitFollowBottom = new OrbitalFollowValueGroup(newLabel: "Bottom");
-
-		[ParadoxNotion.Design.Header("Rotation Composer Settings")]
-		public bool changeScreenPosition;
-		[HideLabel]
-		public Vector2 screenPosition; 
+		public OrbitalFollowValueGroup orbitFollowTop = new (newLabel: "Top");
+		public OrbitalFollowValueGroup orbitFollowCenter = new (newLabel: "Center");
+		public OrbitalFollowValueGroup orbitFollowBottom = new (newLabel: "Bottom");
+		
+		[ParadoxNotion.Design.Header("Rotation Composer Settings")]
+		public Vector2CameraValueGroup screenPosition = new (newLabel: "Screen Position");
+		
+		[ParadoxNotion.Design.Header("Camera Offset Settings")]
+		public Vector3CameraValueGroup cameraOffset = new (newLabel: "Screen Position");
 		
-		private CinemachineOrbitalFollow orbitalFollow;
-
 		//Use for initialization. This is called only once in the lifetime of the task.
 		//Return null if init was successfull. Return an error string otherwise
 		protected override string OnInit(){
-			// Check if cinemachine is referenced
-			try {
-				orbitalFollow = cinemachine.value.GetComponent<CinemachineOrbitalFollow>();
-			} catch {
-				Debug.LogError("Couldn't grab all references from the camera?");
-				EndAction(false);
-			}
-			
-			// Save em.
-			OriginalCameraSettings.StashCameraOriginalSettings(cinemachine.value);
-			
 			return null;
 		}

@@ -171,57 +349,115 @@ namespace NodeCanvas.Tasks.Actions {
 		//EndAction can be called from anywhere.
 		protected override void OnExecute(){
 			// Switch case farm for checking if values should be changed and what to
-			switch (orbitFollowTop.changeHeight) {
+			// Field of view
+			switch (fieldOfView.changeValue) {
 				case CameraSettingsToggle.NewValue:
-					orbitalFollow.Orbits.Top.Height = orbitFollowTop.height;
+					CameraSettingsProcessor.values.mainFieldOfView.targetValue = fieldOfView.value;
 					break;
 				case CameraSettingsToggle.ResetValue:
-					orbitalFollow.Orbits.Top.Height = OriginalCameraSettings.orbitFollowTopHeight;
+					CameraSettingsProcessor.values.mainFieldOfView.Reset();
+					break;
+			}
+			
+			// Orbit follow rings
+			switch (orbitFollowTop.changeHeight) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.orbitFollowTopHeight.targetValue = orbitFollowTop.height;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.orbitFollowTopHeight.Reset();
 					break;
 			}
 			
 			switch (orbitFollowTop.changeRadius) {
 				case CameraSettingsToggle.NewValue:
-					orbitalFollow.Orbits.Top.Radius = orbitFollowTop.radius;
+					CameraSettingsProcessor.values.orbitFollowTopRadius.targetValue = orbitFollowTop.radius;
 					break;
 				case CameraSettingsToggle.ResetValue:
-					orbitalFollow.Orbits.Top.Radius = OriginalCameraSettings.orbitFollowTopRadius;
+					CameraSettingsProcessor.values.orbitFollowTopRadius.Reset();
 					break;
 			}
 			
 			switch (orbitFollowCenter.changeHeight) {
 				case CameraSettingsToggle.NewValue:
-					orbitalFollow.Orbits.Center.Height = orbitFollowCenter.height;
+					CameraSettingsProcessor.values.orbitFollowCenterHeight.targetValue = orbitFollowCenter.height;
 					break;
 				case CameraSettingsToggle.ResetValue:
-					orbitalFollow.Orbits.Center.Height = OriginalCameraSettings.orbitFollowCenterHeight;
+					CameraSettingsProcessor.values.orbitFollowCenterHeight.Reset();
 					break;
 			}
 			
 			switch (orbitFollowCenter.changeRadius) {
 				case CameraSettingsToggle.NewValue:
-					orbitalFollow.Orbits.Center.Radius = orbitFollowCenter.radius;
+					CameraSettingsProcessor.values.orbitFollowCenterRadius.targetValue = orbitFollowCenter.radius;
 					break;
 				case CameraSettingsToggle.ResetValue:
-					orbitalFollow.Orbits.Center.Radius = OriginalCameraSettings.orbitFollowCenterRadius;
+					CameraSettingsProcessor.values.orbitFollowCenterRadius.Reset();
 					break;
 			}
 			
 			switch (orbitFollowBottom.changeHeight) {
 				case CameraSettingsToggle.NewValue:
-					orbitalFollow.Orbits.Bottom.Height = orbitFollowBottom.height;
+					CameraSettingsProcessor.values.orbitFollowBottomHeight.targetValue = orbitFollowBottom.height;
 					break;
 				case CameraSettingsToggle.ResetValue:
-					orbitalFollow.Orbits.Bottom.Height = OriginalCameraSettings.orbitFollowBottomHeight;
+					CameraSettingsProcessor.values.orbitFollowBottomHeight.Reset();
 					break;
 			}
 			
 			switch (orbitFollowBottom.changeRadius) {
 				case CameraSettingsToggle.NewValue:
-					orbitalFollow.Orbits.Bottom.Radius = orbitFollowBottom.radius;
+					CameraSettingsProcessor.values.orbitFollowBottomRadius.targetValue = orbitFollowBottom.radius;
 					break;
 				case CameraSettingsToggle.ResetValue:
-					orbitalFollow.Orbits.Bottom.Radius = OriginalCameraSettings.orbitFollowBottomRadius;
+					CameraSettingsProcessor.values.orbitFollowBottomRadius.Reset();
+					break;
+			}
+
+			// Screen Position
+			switch (screenPosition.changeX) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue.x = screenPosition.newValue.x;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue.x = CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.x;
+					break;
+			}
+			
+			switch (screenPosition.changeY) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue.y = screenPosition.newValue.y;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.rotationComposerScreenPos.targetValue.y = CameraSettingsProcessor.values.rotationComposerScreenPos.originalValue.y;
+					break;
+			}
+			
+			// Camera Offset
+			switch (cameraOffset.changeX) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.x = cameraOffset.newValue.x;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.x = CameraSettingsProcessor.values.cameraOffsetOffset.originalValue.x;
+					break;
+			}
+			
+			switch (cameraOffset.changeY) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.y = cameraOffset.newValue.y;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.y = CameraSettingsProcessor.values.cameraOffsetOffset.originalValue.y;
+					break;
+			}
+			
+			switch (cameraOffset.changeZ) {
+				case CameraSettingsToggle.NewValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.z = cameraOffset.newValue.z;
+					break;
+				case CameraSettingsToggle.ResetValue:
+					CameraSettingsProcessor.values.cameraOffsetOffset.targetValue.z = CameraSettingsProcessor.values.cameraOffsetOffset.originalValue.z;
 					break;
 			}
 			
--- a/Assets/Scripts/Core/Graph
+++ b/Assets/Scripts/Core/Graph
@@ -6,13 +6,17 @@ using ParadoxNotion.Services;
 using Unity.Cinemachine;
 using Unity.Mathematics;
 using UnityEngine;
+using Reset.Player.Movement;

-public enum PlayerFacingDirection{
-	Target = 0,
-	Movement,
-	MatchCamera
+namespace Reset.Player.Movement{
+	public enum PlayerFacingDirection{
+		Target = 0,
+		Movement,
+		MatchCamera
+	}
 }

+
 namespace NodeCanvas.Tasks.Actions {

 	[Category("Reset/Movement")]
@@ -28,7 +32,7 @@ namespace NodeCanvas.Tasks.Actions {
 		public BBParameter<float> jumpPowerDecay;
 		
 		// Rotation
-		public PlayerFacingDirection playerFacingDirection;
+		public BBParameter<PlayerFacingDirection> playerFacingDirection;

 		[ShowIf("playerFacingDirection", 0)]
 		public Vector3 rotationTargetPosition;
@@ -76,7 +80,7 @@ namespace NodeCanvas.Tasks.Actions {
 			// Calculate rotation speed
 			currentRotSpeed = Mathf.Lerp(currentRotSpeed, rotationSpeed.value, rotationSmoothing.value * Time.deltaTime);
 			
-			switch (playerFacingDirection) {
+			switch (playerFacingDirection.value) {
 				case PlayerFacingDirection.Target:
 					// Set rotation to just the direction of the target
 					targetRotation = Quaternion.LookRotation((agent.transform.position.DirectionTo(rotationTargetPosition)).Flatten(null, 0, null));
@@ -96,9 +100,6 @@ namespace NodeCanvas.Tasks.Actions {
 					targetRotation = Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0, null, 0));
 					break;
 			}
-
-			// Set final rotation
-			agent.transform.rotation = Quaternion.Lerp(agent.transform.rotation, targetRotation, 10f * Time.deltaTime);
 			
 	        // Construct move direction
 	        Vector3 finalMoveDir = Vector3.zero;
@@ -125,6 +126,9 @@ namespace NodeCanvas.Tasks.Actions {
 				agent.Move((finalMoveDir + gravityMoveDirection) * Time.deltaTime);
 			}
 			
+			// Set final rotation
+			agent.transform.rotation = Quaternion.Lerp(agent.transform.rotation, targetRotation, 10f * Time.deltaTime);
+			
 			// ???? Moved this above but don't remember if this needs to be here still
 			if (agent.isGrounded) {
 				jumpPower.value = 0f;
--- a/Assets/Scripts/Core/Graph
+++ b/Assets/Scripts/Core/Graph
@@ -0,0 +1,56 @@
+using NodeCanvas.Framework;
+using ParadoxNotion.Design;
+using UnityEngine;
+
+
+namespace NodeCanvas.Tasks.Actions {
+
+	[Category("Reset")]
+	[Description("Hard set the air direction to a certain direction")]
+	public class SetAirMovement : ActionTask<Transform>{
+		public BBParameter<Vector3> airMoveDirection;
+
+		public BBParameter<Vector3> inputVector3;
+		public Space fromSpace;
+		public Space toSpace;
+		
+		//Use for initialization. This is called only once in the lifetime of the task.
+		//Return null if init was successfull. Return an error string otherwise
+		protected override string OnInit() {
+			return null;
+		}
+
+		//This is called once each time the task is enabled.
+		//Call EndAction() to mark the action as finished, either in success or failure.
+		//EndAction can be called from anywhere.
+		protected override void OnExecute(){
+
+		}
+
+		//Called once per frame while the action is active.
+		protected override void OnUpdate() {
+			if (fromSpace == toSpace) {
+				airMoveDirection.value = inputVector3.value;
+			}
+			
+			// NOTE: I swear to God these absolutely do not work and nobody could convince me otherwise
+			if (fromSpace == Space.World){
+				airMoveDirection.value = Camera.main.transform.rotation.Flatten(0, null, 0) * inputVector3.value;
+			} else {
+				airMoveDirection.value = Camera.main.transform.rotation.Flatten(0, null, 0) * agent.InverseTransformVector(inputVector3.value);
+			}
+			
+			EndAction(true);
+		}
+
+		//Called when the task is disabled.
+		protected override void OnStop() {
+			
+		}
+
+		//Called when the task is paused.
+		protected override void OnPause() {
+			
+		}
+	}
+}
--- a/Tasks/SetAirMovement.cs.meta
+++ b/Tasks/SetAirMovement.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f1db555b92ed94543beab7a2106bc2a3
--- a/Assets/Scripts/Core/MathExtensions.cs
+++ b/Assets/Scripts/Core/MathExtensions.cs
@@ -0,0 +1,16 @@
+using UnityEngine;
+
+public static class MathExtensions{
+    public static Vector3 Flatten(this Vector3 origin, float? x = null, float? y = null, float? z = null){
+        return new Vector3(x ?? origin.x, y ?? origin.y, z ?? origin.z);
+    }
+
+    public static Quaternion Flatten(this Quaternion input, float? x = null, float? y = null, float? z = null){
+        return Quaternion.Euler(input.eulerAngles.Flatten(x, y, z));
+    }
+
+    public static Vector3 DirectionTo(this Vector3 origin, Vector3 to){
+        return (to - origin).normalized;
+    }
+
+}
--- a/Assets/Scripts/Core/MathExtensions.cs.meta
+++ b/Assets/Scripts/Core/MathExtensions.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 13cef28bba5a38b4692b3693cb0224b1
--- a/Assets/Scripts/Player/CameraSettingsProcessor.cs
+++ b/Assets/Scripts/Player/CameraSettingsProcessor.cs
@@ -0,0 +1,140 @@
+using Unity.Cinemachine;
+using UnityEngine;
+
+public struct CameraSettingSingleValue<T>{
+    // NOTE: Could add a locked variable here if needed??
+    public T originalValue;
+    public T targetValue;
+    public float smoothing;
+    
+    public float velocityRef;
+    public Vector2 velocityRefV2;
+    public Vector3 velocityRefV3;
+
+    public CameraSettingSingleValue(float defaultSmoothing, T original = default(T)){
+        originalValue = original;
+        targetValue = original;
+        smoothing = defaultSmoothing;
+
+        velocityRef = 0;
+        velocityRefV2 = default;
+        velocityRefV3 = default;
+    }
+
+    public void Reset(){
+        targetValue = originalValue;
+    }
+}
+
+public struct CameraSettingValues{
+    public CameraSettingSingleValue<float> mainFieldOfView;
+    
+    public CameraSettingSingleValue<float> orbitFollowTopHeight;
+    public CameraSettingSingleValue<float> orbitFollowTopRadius;
+    public CameraSettingSingleValue<float> orbitFollowCenterHeight;
+    public CameraSettingSingleValue<float> orbitFollowCenterRadius;
+    public CameraSettingSingleValue<float> orbitFollowBottomHeight;
+    public CameraSettingSingleValue<float> orbitFollowBottomRadius;
+
+    public CameraSettingSingleValue<Vector2> rotationComposerScreenPos;
+    
+    public CameraSettingSingleValue<Vector3> cameraOffsetOffset;
+
+    public CameraSettingValues(float defaultSmoothing){
+        mainFieldOfView = new CameraSettingSingleValue<float>(defaultSmoothing);
+        
+        orbitFollowTopHeight = new CameraSettingSingleValue<float>(defaultSmoothing);
+        orbitFollowTopRadius = new CameraSettingSingleValue<float>(defaultSmoothing);
+        orbitFollowCenterHeight = new CameraSettingSingleValue<float>(defaultSmoothing);
+        orbitFollowCenterRadius = new CameraSettingSingleValue<float>(defaultSmoothing);
+        orbitFollowBottomHeight = new CameraSettingSingleValue<float>(defaultSmoothing);
+        orbitFollowBottomRadius = new CameraSettingSingleValue<float>(defaultSmoothing);
+        
+        rotationComposerScreenPos = new CameraSettingSingleValue<Vector2>(defaultSmoothing);
+        cameraOffsetOffset = new CameraSettingSingleValue<Vector3>(defaultSmoothing);
+    }
+}
+
+public class CameraSettingsProcessor : MonoBehaviour{
+    public static CameraSettingsProcessor Instance{ get; private set; }
+
+    public static CameraSettingValues values = new(defaultSmoothing: .2f);
+    
+    public static GameObject mainCamera;
+
+    private CinemachineCamera main;
+    private CinemachineOrbitalFollow orbit;
+    private CinemachineRotationComposer rotComp;
+    private CinemachineCameraOffset offset;
+    
+    public void Awake(){
+        // Singleton management
+        if (Instance != null && Instance != this) {
+            Destroy(this);
+        } else {
+            Instance = this;
+        }
+
+        // Set references for camera object and cinemachine components
+        mainCamera = gameObject;
+        main = mainCamera.GetComponent<CinemachineCamera>();
+        orbit = mainCamera.GetComponent<CinemachineOrbitalFollow>();
+        rotComp = mainCamera.GetComponent<CinemachineRotationComposer>();
+        offset = mainCamera.GetComponent<CinemachineCameraOffset>();
+
+        // Initialize camera settings values
+        values = new CameraSettingValues{
+            cameraOffsetOffset = new CameraSettingSingleValue<Vector3>(defaultSmoothing: .2f, offset.Offset),
+            mainFieldOfView = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, main.Lens.FieldOfView),
+            orbitFollowTopHeight = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Top.Height),
+            orbitFollowTopRadius = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Top.Radius),
+            orbitFollowCenterHeight = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Center.Height),
+            orbitFollowCenterRadius = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Center.Radius),
+            orbitFollowBottomHeight = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Bottom.Height),
+            orbitFollowBottomRadius = new CameraSettingSingleValue<float>(defaultSmoothing: .2f, orbit.Orbits.Bottom.Radius),
+            rotationComposerScreenPos = new CameraSettingSingleValue<Vector2>(defaultSmoothing: .2f, rotComp.Composition.ScreenPosition),
+        };
+    }
+    
+    void ProcessCameraValues(){
+        main.Lens.FieldOfView = Mathf.SmoothDamp(main.Lens.FieldOfView,
+            values.mainFieldOfView.targetValue, ref values.mainFieldOfView.velocityRef,
+            values.mainFieldOfView.smoothing);
+        
+        orbit.Orbits.Top.Height = Mathf.SmoothDamp(orbit.Orbits.Top.Height,
+            values.orbitFollowTopHeight.targetValue, ref values.orbitFollowTopHeight.velocityRef,
+            values.orbitFollowTopHeight.smoothing);
+        
+        orbit.Orbits.Top.Radius = Mathf.SmoothDamp(orbit.Orbits.Top.Radius,
+            values.orbitFollowTopRadius.targetValue, ref values.orbitFollowTopRadius.velocityRef,
+            values.orbitFollowTopRadius.smoothing);
+        
+        orbit.Orbits.Center.Height = Mathf.SmoothDamp(orbit.Orbits.Center.Height,
+            values.orbitFollowCenterHeight.targetValue, ref values.orbitFollowCenterHeight.velocityRef,
+            values.orbitFollowCenterHeight.smoothing);
+        
+        orbit.Orbits.Center.Radius = Mathf.SmoothDamp(orbit.Orbits.Center.Radius,
+            values.orbitFollowCenterRadius.targetValue, ref values.orbitFollowCenterRadius.velocityRef,
+            values.orbitFollowCenterRadius.smoothing);
+        
+        orbit.Orbits.Bottom.Height = Mathf.SmoothDamp(orbit.Orbits.Bottom.Height,
+            values.orbitFollowBottomHeight.targetValue, ref values.orbitFollowBottomHeight.velocityRef,
+            values.orbitFollowBottomHeight.smoothing);
+        
+        orbit.Orbits.Bottom.Radius = Mathf.SmoothDamp(orbit.Orbits.Bottom.Radius,
+            values.orbitFollowBottomRadius.targetValue, ref values.orbitFollowBottomRadius.velocityRef,
+            values.orbitFollowBottomRadius.smoothing);
+
+        rotComp.Composition.ScreenPosition = Vector2.SmoothDamp(rotComp.Composition.ScreenPosition,
+            values.rotationComposerScreenPos.targetValue, ref values.rotationComposerScreenPos.velocityRefV2,
+            values.rotationComposerScreenPos.smoothing);
+        
+        offset.Offset = Vector3.SmoothDamp(offset.Offset,
+            values.cameraOffsetOffset.targetValue, ref values.cameraOffsetOffset.velocityRefV3,
+            values.cameraOffsetOffset.smoothing);
+    }
+    
+    void Update(){
+        ProcessCameraValues();
+    }
+}
--- a/Assets/Scripts/Player/CameraSettingsProcessor.cs.meta
+++ b/Assets/Scripts/Player/CameraSettingsProcessor.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c032a18b0b0c1da4092bfc365c6e4aad
--- a/Assets/Scripts/Player/PlayerControls.cs
+++ b/Assets/Scripts/Player/PlayerControls.cs
@@ -50,12 +50,11 @@ public class PlayerControls : MonoBehaviour{
        graph.SendEvent<string>("InputEvent", "CancelLockOn", null);
    }

-    public void OnGrapple(InputInteractionContext context){
-        if (context.control.IsPressed()) {
-            graph.SendEvent<string>("InputEvent", "GrappleDown", null);    
-        } else {
-            graph.SendEvent<string>("InputEvent", "GrappleUp", null);
-        }
-        
-    }
+    // public void OnGrapple(InputInteractionContext context){
+    //     if (context.control.IsPressed()) {
+    //         graph.SendEvent<string>("InputEvent", "GrappleDown", null);    
+    //     } else {
+    //         graph.SendEvent<string>("InputEvent", "GrappleUp", null);
+    //     }
+    // }
 }
--- a/Assets/Scripts/Wilds.Core.asmdef
+++ b/Assets/Scripts/Wilds.Core.asmdef
@@ -8,7 +8,9 @@
        "GUID:75469ad4d38634e559750d17036d5f7c",
        "GUID:de4e6084e6d474788bb8c799d6b461ec",
        "GUID:d8b63aba1907145bea998dd612889d6b",
-        "GUID:4307f53044263cf4b835bd812fc161a4"
+        "GUID:4307f53044263cf4b835bd812fc161a4",
+        "GUID:4099e5319e98558428028d54bc62664e",
+        "GUID:1826c0224c0d048b88112c79bbb0cd85"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
@@ -54,18 +54,16 @@ MonoBehaviour:
      - rid: 6852985685364965394
      - rid: 8712630790384254976
      - rid: 1219305102947385344
+      - rid: 2028245633001062400
+      - rid: 2028245633001062401
+      - rid: 2028245633001062402
+      - rid: 2028245633001062403
+      - rid: 2028245633001062404
+      - rid: 2028245633001062405
+      - rid: 2028245633001062406
+      - rid: 2028245633001062407
    m_RuntimeSettings:
-      m_List:
-      - rid: 6852985685364965378
-      - rid: 6852985685364965379
-      - rid: 6852985685364965380
-      - rid: 6852985685364965381
-      - rid: 6852985685364965384
-      - rid: 6852985685364965385
-      - rid: 6852985685364965392
-      - rid: 6852985685364965394
-      - rid: 8712630790384254976
-      - rid: 1219305102947385344
+      m_List: []
  m_AssetVersion: 8
  m_ObsoleteDefaultVolumeProfile: {fileID: 0}
  m_RenderingLayerNames:
@@ -102,6 +100,133 @@ MonoBehaviour:
        m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
        m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
        m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3}
+    - rid: 2028245633001062400
+      type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3}
+        subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3}
+        gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3}
+        bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3}
+        cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3}
+        paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3}
+        lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3}
+        lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3}
+        bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3}
+        temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, type: 3}
+        LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3}
+        LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3}
+        scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3}
+        easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3}
+        uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3}
+        finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3}
+        m_ShaderResourcesVersion: 0
+    - rid: 2028245633001062401
+      type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
+        m_Version: 0
+    - rid: 2028245633001062402
+      type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
+    - rid: 2028245633001062403
+      type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        m_BlueNoise256Textures:
+        - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
+        - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
+        - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
+        - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
+        - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
+        - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
+        - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
+        m_Version: 0
+    - rid: 2028245633001062404
+      type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
+      data:
+        blueNoise16LTex:
+        - {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3}
+        - {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3}
+        - {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3}
+        - {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3}
+        - {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3}
+        - {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3}
+        - {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3}
+        - {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3}
+        - {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3}
+        - {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3}
+        - {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3}
+        - {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3}
+        - {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3}
+        - {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3}
+        - {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3}
+        - {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3}
+        - {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3}
+        - {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3}
+        - {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3}
+        - {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3}
+        - {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3}
+        - {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3}
+        - {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3}
+        - {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3}
+        - {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3}
+        - {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3}
+        - {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3}
+        - {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3}
+        - {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3}
+        - {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3}
+        - {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3}
+        - {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3}
+        filmGrainTex:
+        - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3}
+        - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3}
+        - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3}
+        - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3}
+        - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3}
+        - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3}
+        - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3}
+        - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3}
+        - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3}
+        - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3}
+        smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3}
+        smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3}
+        m_TexturesResourcesVersion: 0
+    - rid: 2028245633001062405
+      type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_version: 0
+    - rid: 2028245633001062406
+      type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, type: 3}
+        m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, type: 3}
+        m_VisualizationLookupTable:
+          m_Data:
+          - {r: 1, g: 0, b: 0, a: 1}
+          - {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+          - {r: 1, g: 1, b: 1, a: 1}
+          - {r: 0, g: 1, b: 0, a: 1}
+          - {r: 0.75, g: 0.75, b: 0, a: 1}
+          - {r: 0, g: 0.75, b: 0.55, a: 1}
+          - {r: 0.5, g: 0, b: 0.5, a: 1}
+          - {r: 0.5, g: 0.5, b: 0.5, a: 1}
+          - {r: 0, g: 0, b: 1, a: 1}
+        m_ConversionLookupTable:
+          m_Data:
+          - {r: 1, g: 0, b: 0, a: 1}
+          - {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+          - {r: 1, g: 1, b: 1, a: 1}
+          - {r: 0, g: 1, b: 0, a: 1}
+          - {r: 0.75, g: 0.75, b: 0, a: 1}
+          - {r: 0, g: 0.75, b: 0.55, a: 1}
+          - {r: 0.5, g: 0, b: 0.5, a: 1}
+          - {r: 0.5, g: 0.5, b: 0.5, a: 1}
+          - {r: 0, g: 0, b: 1, a: 1}
+    - rid: 2028245633001062407
+      type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
+      data:
+        m_Version: 1
+        m_UseBicubicLightmapSampling: 0
    - rid: 6852985685364965376
      type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
@@ -115,9 +240,6 @@ MonoBehaviour:
        m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
        m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3}
        m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3}
-        m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
-        m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
-        m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
        m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
        m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
        m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
@@ -128,6 +250,8 @@ MonoBehaviour:
        m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
        m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3}
        m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
+        m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, type: 3}
+        m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, type: 3}
        m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
    - rid: 6852985685364965379
      type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
@@ -144,6 +268,9 @@ MonoBehaviour:
        m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
        m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
        m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+        m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
+        m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
+        m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
    - rid: 6852985685364965381
      type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
@@ -174,6 +301,7 @@ MonoBehaviour:
        m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
        m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
        m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
+        m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
    - rid: 6852985685364965384
      type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
--- a/Assets/SimpleMinMaxSlider.meta
+++ b/Assets/SimpleMinMaxSlider.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8cf4e72d60c563f44b838b832e931b33
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/Samples.meta
+++ b/Assets/SimpleMinMaxSlider/Samples.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e2c435e76ec72da4d9ee1f6d45f8374b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/Samples/SimpleMinMaxSlider
+++ b/Assets/SimpleMinMaxSlider/Samples/SimpleMinMaxSlider
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15e2cde26c94921429fb7c3b52aa1a2a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/Samples/SimpleMinMaxSlider
+++ b/Assets/SimpleMinMaxSlider/Samples/SimpleMinMaxSlider
@@ -0,0 +1,252 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 11
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_UseShadowmask: 1
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &869075708
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 869075710}
+  - component: {fileID: 869075709}
+  m_Layer: 0
+  m_Name: Example
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &869075709
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869075708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f0f4fc589d3160f4197a6ec70bab0925, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  info: Hover over slider to see tooltip
+  floatTest: {x: 2, y: 8}
+  intTest: {x: 0, y: 0}
+--- !u!4 &869075710
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 869075708}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1410662703
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1410662706}
+  - component: {fileID: 1410662705}
+  - component: {fileID: 1410662704}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1410662704
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1410662703}
+  m_Enabled: 1
+--- !u!20 &1410662705
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1410662703}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.58219117, g: 0.8396226, b: 0.82838553, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1410662706
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1410662703}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/SimpleMinMaxSlider/Samples/SimpleMinMaxSlider
+++ b/Assets/SimpleMinMaxSlider/Samples/SimpleMinMaxSlider
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a821f9bc27797d940b5963e05313b936
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/Scripts.meta
+++ b/Assets/SimpleMinMaxSlider/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f4be9f6fb652f19488b46fbc9bac8be5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/Scripts/Editor.meta
+++ b/Assets/SimpleMinMaxSlider/Scripts/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b58f02022de16354ba42b835bcc79d57
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs
+++ b/Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs
@@ -0,0 +1,108 @@
+using UnityEngine;
+using UnityEditor;
+using GD.MinMaxSlider;
+
+[CustomPropertyDrawer(typeof(MinMaxSliderAttribute))]
+public class MinMaxSliderDrawer : PropertyDrawer {
+
+    public override void OnGUI(Rect position, SerializedProperty property, GUIContent label){
+
+        var minMaxAttribute = (MinMaxSliderAttribute)attribute;
+        var propertyType = property.propertyType;
+
+        label.tooltip = minMaxAttribute.min.ToString("F2") + " to " + minMaxAttribute.max.ToString("F2");
+
+        //PrefixLabel returns the rect of the right part of the control. It leaves out the label section. We don't have to worry about it. Nice!
+        Rect controlRect = EditorGUI.PrefixLabel(position, label);
+        
+        Rect[] splittedRect = SplitRect(controlRect,3);
+
+        if(propertyType == SerializedPropertyType.Vector2){ 
+
+            EditorGUI.BeginChangeCheck();
+
+            Vector2 vector = property.vector2Value;
+            float minVal = vector.x;
+            float maxVal = vector.y;
+
+            //F2 limits the float to two decimal places (0.00).
+            minVal = EditorGUI.FloatField(splittedRect[0], float.Parse(minVal.ToString("F2")));
+            maxVal = EditorGUI.FloatField(splittedRect[2], float.Parse(maxVal.ToString("F2")));
+
+            EditorGUI.MinMaxSlider(splittedRect[1], ref minVal, ref maxVal,
+            minMaxAttribute.min,minMaxAttribute.max);
+
+            if(minVal < minMaxAttribute.min){
+                minVal = minMaxAttribute.min;
+            }
+
+            if(maxVal > minMaxAttribute.max){
+                maxVal = minMaxAttribute.max;
+            }
+
+            vector = new Vector2(minVal > maxVal ? maxVal : minVal, maxVal);
+
+            if(EditorGUI.EndChangeCheck()){
+                property.vector2Value = vector;
+            }
+
+        }else if(propertyType == SerializedPropertyType.Vector2Int){
+
+            EditorGUI.BeginChangeCheck();
+
+            Vector2Int vector = property.vector2IntValue;
+            float minVal = vector.x;
+            float maxVal = vector.y;
+
+            minVal = EditorGUI.FloatField(splittedRect[0], minVal);
+            maxVal = EditorGUI.FloatField(splittedRect[2], maxVal);
+
+            EditorGUI.MinMaxSlider(splittedRect[1], ref minVal, ref maxVal,
+            minMaxAttribute.min,minMaxAttribute.max);
+
+            if(minVal < minMaxAttribute.min){
+                maxVal = minMaxAttribute.min;
+            }
+
+            if(minVal > minMaxAttribute.max){
+                maxVal = minMaxAttribute.max;
+            }
+
+            vector = new Vector2Int(Mathf.FloorToInt(minVal > maxVal ? maxVal : minVal), Mathf.FloorToInt(maxVal));
+
+            if(EditorGUI.EndChangeCheck()){
+                property.vector2IntValue = vector;
+            }
+
+        } 
+
+    }
+
+    Rect[] SplitRect(Rect rectToSplit, int n){
+
+
+        Rect[] rects = new Rect[n];
+
+        for(int i = 0; i < n; i++){
+
+            rects[i] = new Rect(rectToSplit.position.x + (i * rectToSplit.width / n), rectToSplit.position.y, rectToSplit.width / n, rectToSplit.height);
+        
+        }
+
+        int padding = (int)rects[0].width - 40;
+        int space = 5;
+
+        rects[0].width -= padding + space;
+        rects[2].width -= padding + space;
+
+        rects[1].x -= padding;
+        rects[1].width += padding * 2;
+
+        rects[2].x += padding + space;
+        
+
+        return rects;
+
+    }
+    
+} 
--- a/Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs.meta
+++ b/Assets/SimpleMinMaxSlider/Scripts/Editor/MinMaxSliderDrawer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e6b53f69308943e499e344adc5adee79
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderAttribute.cs
+++ b/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderAttribute.cs
@@ -0,0 +1,16 @@
+namespace GD.MinMaxSlider
+{
+    using UnityEngine;
+
+    public class MinMaxSliderAttribute : PropertyAttribute{
+
+        public float min;
+        public float max;
+
+        public MinMaxSliderAttribute(float min, float max)
+        {
+            this.min = min;
+            this.max = max;
+        }
+    }  
+}
--- a/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderAttribute.cs.meta
+++ b/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderAttribute.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a090d8b694abe7141af9c000b8cf42ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderExample.cs
+++ b/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderExample.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using GD.MinMaxSlider;
+
+public class MinMaxSliderExample : MonoBehaviour
+{
+
+    public string info = "Hover over a slider to see a tooltip";
+
+    [MinMaxSlider(0,10)]
+    public Vector2 floatRange = new Vector2(2,8);
+    [MinMaxSlider(0,10)]
+    public Vector2Int intRange = new Vector2Int(1,5);
+
+}
--- a/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderExample.cs.meta
+++ b/Assets/SimpleMinMaxSlider/Scripts/MinMaxSliderExample.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 212a7a761531d4b48ae374e583db2389
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/SimpleMinMaxSlider.asmdef
+++ b/Assets/SimpleMinMaxSlider/SimpleMinMaxSlider.asmdef
@@ -0,0 +1,3 @@
+{
+	"name": "SimpleMinMaxSlider"
+}
--- a/Assets/SimpleMinMaxSlider/SimpleMinMaxSlider.asmdef.meta
+++ b/Assets/SimpleMinMaxSlider/SimpleMinMaxSlider.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4099e5319e98558428028d54bc62664e
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SimpleMinMaxSlider/package.json
+++ b/Assets/SimpleMinMaxSlider/package.json
@@ -0,0 +1,23 @@
+{
+    "name": "com.guciodevs.simple-min-max-slider",
+    "displayName": "Simple MinMax Slider",
+    "description": "Handy small package that adds a simple MinMaxSlider attribute.",
+    "version": "1.1.2",
+    "unity": "2018.3",
+    "license": "MIT",
+    "dependencies": {
+     },
+
+    "samples": [
+
+    {
+    
+        "displayName": "Example Scene",
+    
+        "description": "",
+    
+        "path": "Samples~/SimpleMinMaxSlider Example"
+    
+    }   
+    ]
+}
--- a/Assets/SimpleMinMaxSlider/package.json.meta
+++ b/Assets/SimpleMinMaxSlider/package.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 783853a57374ff540b56fa85ce900da7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Hello.txt
+++ b/Hello.txt
--- a/Hi.txt
+++ b/Hi.txt
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,21 +1,21 @@
 {
  "dependencies": {
-    "com.unity.ai.navigation": "2.0.4",
+    "com.unity.ai.navigation": "2.0.8",
    "com.unity.cinemachine": "3.1.2",
-    "com.unity.collab-proxy": "2.5.2",
-    "com.unity.ide.rider": "3.0.34",
-    "com.unity.ide.visualstudio": "2.0.22",
-    "com.unity.inputsystem": "1.11.2",
+    "com.unity.collab-proxy": "2.8.2",
+    "com.unity.ide.rider": "3.0.36",
+    "com.unity.ide.visualstudio": "2.0.23",
+    "com.unity.inputsystem": "1.14.2",
    "com.unity.multiplayer.center": "1.0.0",
-    "com.unity.multiplayer.tools": "2.2.1",
+    "com.unity.multiplayer.tools": "2.2.5",
    "com.unity.netcode.gameobjects": "2.1.1",
-    "com.unity.probuilder": "6.0.4",
-    "com.unity.render-pipelines.universal": "17.0.3",
-    "com.unity.services.multiplayer": "1.0.2",
-    "com.unity.test-framework": "1.4.5",
-    "com.unity.timeline": "1.8.7",
+    "com.unity.probuilder": "6.0.6",
+    "com.unity.render-pipelines.universal": "17.2.0",
+    "com.unity.services.multiplayer": "1.1.0",
+    "com.unity.test-framework": "1.5.1",
+    "com.unity.timeline": "1.8.9",
    "com.unity.ugui": "2.0.0",
-    "com.unity.visualscripting": "1.9.5",
+    "com.unity.visualscripting": "1.9.7",
    "com.unity.modules.accessibility": "1.0.0",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.androidjni": "1.0.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -24,7 +24,7 @@
      }
    },
    "com.unity.ai.navigation": {
-      "version": "2.0.4",
+      "version": "2.0.8",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -33,7 +33,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.burst": {
-      "version": "1.8.18",
+      "version": "1.8.24",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@@ -52,20 +52,21 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.collab-proxy": {
-      "version": "2.5.2",
+      "version": "2.8.2",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.collections": {
-      "version": "2.5.1",
+      "version": "2.5.7",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.burst": "1.8.17",
-        "com.unity.test-framework": "1.4.5",
-        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.burst": "1.8.19",
+        "com.unity.mathematics": "1.3.2",
+        "com.unity.test-framework": "1.4.6",
+        "com.unity.nuget.mono-cecil": "1.11.5",
        "com.unity.test-framework.performance": "3.0.3"
      },
      "url": "https://packages.unity.com"
@@ -73,12 +74,11 @@
    "com.unity.ext.nunit": {
      "version": "2.0.5",
      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "source": "builtin",
+      "dependencies": {}
    },
    "com.unity.ide.rider": {
-      "version": "3.0.34",
+      "version": "3.0.36",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -87,7 +87,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.ide.visualstudio": {
-      "version": "2.0.22",
+      "version": "2.0.23",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -96,7 +96,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.inputsystem": {
-      "version": "1.11.2",
+      "version": "1.14.2",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -120,13 +120,13 @@
      }
    },
    "com.unity.multiplayer.tools": {
-      "version": "2.2.1",
+      "version": "2.2.5",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.burst": "1.8.17",
-        "com.unity.collections": "2.4.0",
-        "com.unity.mathematics": "1.3.1",
+        "com.unity.burst": "1.8.18",
+        "com.unity.collections": "2.5.1",
+        "com.unity.mathematics": "1.3.2",
        "com.unity.profiling.core": "1.0.2",
        "com.unity.nuget.mono-cecil": "1.11.4",
        "com.unity.modules.uielements": "1.0.0",
@@ -145,7 +145,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.nuget.mono-cecil": {
-      "version": "1.11.4",
+      "version": "1.11.5",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
@@ -159,11 +159,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.probuilder": {
-      "version": "6.0.4",
+      "version": "6.0.6",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.shadergraph": "17.0.2",
+        "com.unity.shadergraph": "17.0.3",
        "com.unity.modules.imgui": "1.0.0",
        "com.unity.modules.physics": "1.0.0",
        "com.unity.settings-manager": "1.0.3"
@@ -178,7 +178,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.render-pipelines.core": {
-      "version": "17.0.3",
+      "version": "17.2.0",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
@@ -193,12 +193,12 @@
      }
    },
    "com.unity.render-pipelines.universal": {
-      "version": "17.0.3",
+      "version": "17.2.0",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "17.0.3",
-        "com.unity.shadergraph": "17.0.3",
+        "com.unity.render-pipelines.core": "17.2.0",
+        "com.unity.shadergraph": "17.2.0",
        "com.unity.render-pipelines.universal-config": "17.0.3"
      }
    },
@@ -221,26 +221,26 @@
      }
    },
    "com.unity.searcher": {
-      "version": "4.9.2",
+      "version": "4.9.3",
      "depth": 2,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.services.authentication": {
-      "version": "3.3.3",
+      "version": "3.4.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
        "com.unity.ugui": "1.0.0",
-        "com.unity.services.core": "1.13.0",
+        "com.unity.services.core": "1.14.0",
        "com.unity.nuget.newtonsoft-json": "3.2.1",
        "com.unity.modules.unitywebrequest": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.services.core": {
-      "version": "1.13.0",
+      "version": "1.14.0",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@@ -251,24 +251,24 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.services.deployment": {
-      "version": "1.3.0",
+      "version": "1.4.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
        "com.unity.services.core": "1.12.0",
-        "com.unity.services.deployment.api": "1.0.0"
+        "com.unity.services.deployment.api": "1.1.2"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.services.deployment.api": {
-      "version": "1.0.0",
+      "version": "1.1.2",
      "depth": 2,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.services.multiplayer": {
-      "version": "1.0.2",
+      "version": "1.1.0",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -298,7 +298,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.services.wire": {
-      "version": "1.2.7",
+      "version": "1.4.0",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@@ -309,55 +309,54 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.settings-manager": {
-      "version": "2.0.1",
+      "version": "2.1.0",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "17.0.3",
+      "version": "17.2.0",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "17.0.3",
-        "com.unity.searcher": "4.9.2"
+        "com.unity.render-pipelines.core": "17.2.0",
+        "com.unity.searcher": "4.9.3"
      }
    },
    "com.unity.splines": {
-      "version": "2.6.1",
+      "version": "2.8.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.ugui": "1.0.0",
        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.imgui": "1.0.0",
        "com.unity.settings-manager": "1.0.3"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.test-framework": {
-      "version": "1.4.5",
+      "version": "1.5.1",
      "depth": 0,
-      "source": "registry",
+      "source": "builtin",
      "dependencies": {
        "com.unity.ext.nunit": "2.0.3",
        "com.unity.modules.imgui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
+      }
    },
    "com.unity.test-framework.performance": {
-      "version": "3.0.3",
+      "version": "3.1.0",
      "depth": 2,
      "source": "registry",
      "dependencies": {
-        "com.unity.test-framework": "1.1.31",
+        "com.unity.test-framework": "1.1.33",
        "com.unity.modules.jsonserialize": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.timeline": {
-      "version": "1.8.7",
+      "version": "1.8.9",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -369,7 +368,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.transport": {
-      "version": "2.4.0",
+      "version": "2.5.3",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@@ -389,7 +388,7 @@
      }
    },
    "com.unity.visualscripting": {
-      "version": "1.9.5",
+      "version": "1.9.7",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -546,7 +545,8 @@
        "com.unity.modules.ui": "1.0.0",
        "com.unity.modules.imgui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.hierarchycore": "1.0.0"
+        "com.unity.modules.hierarchycore": "1.0.0",
+        "com.unity.modules.physics": "1.0.0"
      }
    },
    "com.unity.modules.umbra": {
--- a/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset
+++ b/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  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: 6762c37d3236e2a4382cd018dcdf221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.Multiplayer.Tools.Common::Unity.Multiplayer.Tools.Common.Visualization.CustomColorSettings
+  colors:
+    m_Keys: 
+    m_Values: []
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -16,15 +16,20 @@
                "key": "log.path",
                "value": "{\"m_Value\":\"ProBuilderLog.txt\"}"
            },
+            {
+                "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "editor.materialPalettePath",
+                "value": "{\"m_Value\":\"Assets/ProBuilder Data/Default Material Palette.asset\"}"
+            },
            {
                "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "about.identifier",
-                "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":4,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
+                "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":6,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
            },
            {
                "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "preferences.version",
-                "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":4,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
+                "value": "{\"m_Value\":{\"m_Major\":6,\"m_Minor\":0,\"m_Patch\":6,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
            },
            {
                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -12,8 +12,8 @@ PlayerSettings:
  targetDevice: 2
  useOnDemandResources: 0
  accelerometerFrequency: 60
-  companyName: DefaultCompany
-  productName: Project Wilds
+  companyName: Thunderstar Games
+  productName: Project Reset
  defaultCursor: {fileID: 0}
  cursorHotspot: {x: 0, y: 0}
  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -132,6 +132,7 @@ PlayerSettings:
  switchNVNMaxPublicSamplerIDCount: 0
  switchMaxWorkerMultiple: 8
  switchNVNGraphicsFirmwareMemory: 32
+  switchGraphicsJobsSyncAfterKick: 1
  vulkanNumSwapchainBuffers: 3
  vulkanEnableSetSRGBWrite: 0
  vulkanEnablePreTransform: 1
@@ -141,7 +142,8 @@ PlayerSettings:
  visionOSBundleVersion: 1.0
  tvOSBundleVersion: 1.0
  bundleVersion: 0.1.0
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 11400000, guid: 8e19eb4aa4fac2a409e792d0d3e5f944, type: 2}
  metroInputSource: 0
  wsaTransparentSwapchain: 0
  m_HolographicPauseOnTrackingLoss: 1
@@ -273,6 +275,9 @@ PlayerSettings:
  AndroidBuildApkPerCpuArchitecture: 0
  AndroidTVCompatibility: 0
  AndroidIsGame: 1
+  androidAppCategory: 3
+  useAndroidAppCategory: 1
+  androidAppCategoryOther: 
  AndroidEnableTango: 0
  androidEnableBanner: 1
  androidUseLowAccuracyLocation: 0
@@ -527,6 +532,9 @@ PlayerSettings:
  - m_BuildTarget: AndroidPlayer
    m_APIs: 150000000b000000
    m_Automatic: 0
+  - m_BuildTarget: WindowsStandaloneSupport
+    m_APIs: 0200000012000000
+    m_Automatic: 0
  m_BuildTargetVRSettings: []
  m_DefaultShaderChunkSizeInMB: 16
  m_DefaultShaderChunkCount: 0
@@ -542,6 +550,7 @@ PlayerSettings:
  - serializedVersion: 2
    m_BuildTarget: Android
    m_EncodingQuality: 1
+  m_BuildTargetGroupHDRCubemapEncodingQuality: []
  m_BuildTargetGroupLightmapSettings: []
  m_BuildTargetGroupLoadStoreDebugModeSettings: []
  m_BuildTargetNormalMapEncoding:
@@ -810,12 +819,12 @@ PlayerSettings:
  webGLMemoryLinearGrowthStep: 16
  webGLMemoryGeometricGrowthStep: 0.2
  webGLMemoryGeometricGrowthCap: 96
-  webGLEnableWebGPU: 0
  webGLPowerPreference: 2
  webGLWebAssemblyTable: 0
  webGLWebAssemblyBigInt: 0
  webGLCloseOnQuit: 0
  webWasm2023: 0
+  webEnableSubmoduleStrippingCompatibility: 0
  scriptingDefineSymbols:
    Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;NODECANVAS
  additionalCompilerArguments: {}
@@ -944,3 +953,4 @@ PlayerSettings:
  insecureHttpOption: 0
  androidVulkanDenyFilterList: []
  androidVulkanAllowFilterList: []
+  androidVulkanDeviceFilterListAsset: {fileID: 0}
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.0.28f1
-m_EditorVersionWithRevision: 6000.0.28f1 (f336aca0cab5)
+m_EditorVersion: 6000.2.1f1
+m_EditorVersionWithRevision: 6000.2.1f1 (55300504c302)
--- a/ProjectSettings/URPProjectSettings.asset
+++ b/ProjectSettings/URPProjectSettings.asset
@@ -12,4 +12,4 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_LastMaterialVersion: 9
+  m_LastMaterialVersion: 10
Author	SHA1	Message	Date
Desmond Cheeseboro	f71ba6f5fe	hai :3	2025-12-06 19:48:35 -05:00
Desmond Cheeseboro	92f9ef731b	hai :3	2025-12-06 19:47:21 -05:00
Desmond Cheeseboro	59ab310615	hai :3	2025-12-06 19:43:40 -05:00
Chris	bbb735c9c1	maint: updated to unity 6.2	2025-08-31 17:37:36 -04:00
Chris	d551ef5fca	added: probuilder included in assembly definition	2025-07-20 14:31:44 -04:00
Chris	1570a2fe43	fix: added minmaxslider to reset.core asmdef	2025-07-19 11:43:05 -04:00
Chris	b50b8f0bae	Merge remote-tracking branch 'origin/main'	2025-07-19 11:36:28 -04:00
Chris	94a4742187	maint: added minmaxslider package	2025-07-19 11:35:51 -04:00
Chris	8a2d1bf64a	maint: added minmaxslider package	2025-07-19 11:35:15 -04:00
Chris	185580c3af	added: wall stick input handling and initial fsm agent states	2025-07-17 11:37:00 -04:00
Chris	fbe99c6f3c	change: build settings updated	2025-07-17 10:48:24 -04:00
Chris	4062a3b5db	changed: build settings updated	2025-07-16 13:40:43 -04:00
Chris	981c9eda18	added: math extensions file	2025-07-15 18:23:57 -04:00
tealtxgr	e86617fcbe	Merge pull request 'maint: (b144) fixed airborne directional input' (#4 ) from maint/bugs/b144 into main Reviewed-on: #4	2025-07-15 22:19:12 +00:00
Chris	8e986bc754	maint: cleaned up some of the notes and whitespace	2025-07-15 18:15:50 -04:00
Chris	577659458e	fix: corrected math for air directional jumping	2025-07-15 18:15:00 -04:00
tealtxgr	0e0bb7d3e0	Merge pull request 'fix: walking out of grounded jittering fixed' (#3 ) from maint/bugs/b143-airborne-jitter into main Reviewed-on: #3	2025-07-15 21:09:45 +00:00
Chris	2f7043ea64	changed: scene updated, changed graph variables slightly	2025-07-15 17:02:27 -04:00
Chris	9e321677c5	changed: changed facing direction into BBParamater	2025-07-15 17:01:58 -04:00
Chris	103ffce69b	fixed: changed how rotation is handled in transition from grounded to air to account for becoming grounded without jumping	2025-07-15 17:00:45 -04:00
tealtxgr	920e36ca89	Merge pull request 'added: camera framework for camera settings, camera settings change for grapple button' (#2 ) from player/grapple-feature-add into main Reviewed-on: #2	2025-07-15 15:55:59 +00:00
Chris	cb554175c3	changed: fov and better offset. parallelized grapple change.	2025-07-14 15:46:26 -04:00
Chris	b0bf831676	Merge remote-tracking branch 'origin/player/grapple-feature-add' into player/grapple-feature-add	2025-07-14 14:24:33 -04:00
Chris	bbfb583e3c	added: tools for changing camera settings, and camera settings processor	2025-07-14 14:24:07 -04:00
Chris	a502b2d97a	added: tools for changing camera settings, and camera settings processor	2025-07-14 14:22:50 -04:00