added: some platform layout started

change: some snapping testing
maint: updated probuilder 6.0.4 to 6.0.6
2025-08-25 15:53:28 -04:00 · 2025-08-25 15:53:28 -04:00 · 2025-08-25 15:53:27 -04:00 · 2025-08-25 15:53:27 -04:00 · 2025-08-25 15:53:22 -04:00 · 2025-08-25 15:53:17 -04:00
74 changed files with 1118949 additions and 1344 deletions
--- a/Assets/Map/Materials/BuildingsColor.asset
+++ b/Assets/Map/Materials/BuildingsColor.asset
@@ -0,0 +1,31 @@
+%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: dda436a9c8bbd4d109478acf25cd48d8, type: 3}
+  m_Name: BuildingsColor
+  m_EditorClassIdentifier: 
+  m_Colors:
+  - {r: 0.6037736, g: 0.4436999, b: 0.3446066, a: 1}
+  - {r: 0.3207547, g: 0.27557865, b: 0.25569597, a: 1}
+  - {r: 0.44255075, g: 0.4692888, b: 0.6132076, a: 1}
+  - {r: 0.7264151, g: 0.34470186, b: 0.33236918, a: 1}
+  - {r: 0.6886792, g: 0.65442336, b: 0.57498217, a: 1}
+  - {r: 0.5283019, g: 0.50888515, b: 0.48593807, a: 1}
+  - {r: 0.9150943, g: 0.70547265, b: 0.375534, a: 1}
+  - {r: 1, g: 0.863, b: 0, a: 1}
+  - {r: 1, g: 0.522, b: 0.106, a: 1}
+  - {r: 1, g: 0.255, b: 0.212, a: 1}
+  - {r: 0.522, g: 0.078, b: 0.294, a: 1}
+  - {r: 0.941, g: 0.071, b: 0.745, a: 1}
+  - {r: 0.694, g: 0.051, b: 0.788, a: 1}
+  - {r: 0.067, g: 0.067, b: 0.067, a: 1}
+  - {r: 0.667, g: 0.667, b: 0.667, a: 1}
+  - {r: 0.867, g: 0.867, b: 0.867, a: 1}
--- a/Assets/Player/Graphs/PlayerLocomotionFSM.asset.meta
+++ b/Assets/Player/Graphs/PlayerLocomotionFSM.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b307c218c1a404548afe65e66737fa80
+guid: 606edad3bea34fe418d44ed9bde9daa4
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/Map/Materials/Default
+++ b/Assets/Map/Materials/Default
@@ -0,0 +1,25 @@
+%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: 3f1ca63a91b17724bbd99c8fa67e0180, type: 3}
+  m_Name: Default Material Palette
+  m_EditorClassIdentifier: 
+  array:
+  - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+  - {fileID: 2100000, guid: 0b54b63be52c4f94ba30ff0d1ddb6cc8, type: 2}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
--- a/Assets/Map/Materials/Default
+++ b/Assets/Map/Materials/Default
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1b836598393ff984aa570bb74bbdbe35
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/FoliageColors.asset
+++ b/Assets/Map/Materials/FoliageColors.asset
@@ -0,0 +1,31 @@
+%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: dda436a9c8bbd4d109478acf25cd48d8, type: 3}
+  m_Name: FoliageColors
+  m_EditorClassIdentifier: 
+  m_Colors:
+  - {r: 0.49012125, g: 0.6698113, b: 0.42653078, a: 1}
+  - {r: 0.3207547, g: 0.27557865, b: 0.25569597, a: 1}
+  - {r: 0.44255075, g: 0.4692888, b: 0.6132076, a: 1}
+  - {r: 0.7264151, g: 0.34470186, b: 0.33236918, a: 1}
+  - {r: 0.6886792, g: 0.65442336, b: 0.57498217, a: 1}
+  - {r: 0.5283019, g: 0.50888515, b: 0.48593807, a: 1}
+  - {r: 0.9150943, g: 0.70547265, b: 0.375534, a: 1}
+  - {r: 1, g: 0.863, b: 0, a: 1}
+  - {r: 1, g: 0.522, b: 0.106, a: 1}
+  - {r: 1, g: 0.255, b: 0.212, a: 1}
+  - {r: 0.522, g: 0.078, b: 0.294, a: 1}
+  - {r: 0.941, g: 0.071, b: 0.745, a: 1}
+  - {r: 0.694, g: 0.051, b: 0.788, a: 1}
+  - {r: 0.067, g: 0.067, b: 0.067, a: 1}
+  - {r: 0.667, g: 0.667, b: 0.667, a: 1}
+  - {r: 0.867, g: 0.867, b: 0.867, a: 1}
--- a/Assets/Map/Materials/FoliageColors.asset.meta
+++ b/Assets/Map/Materials/FoliageColors.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 17b80a55c33635149a7b4c070e928273
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/GridBox_Default.png
+++ b/Assets/Map/Materials/GridBox_Default.png
--- a/Assets/Map/Materials/GridBox_Default.png.meta
+++ b/Assets/Map/Materials/GridBox_Default.png.meta
@@ -0,0 +1,86 @@
+fileFormatVersion: 2
+guid: e4da0c5e5eed1124f9e599f0edbc3ead
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 1024
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/GroundFloorMat.mat
+++ b/Assets/Map/Materials/GroundFloorMat.mat
@@ -0,0 +1,261 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7074452015321469258
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: 639247ca83abc874e893eb93af2b5e44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 0
+--- !u!114 &-3637609125716766867
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 13
+  hdPluginSubTargetMaterialVersions:
+    m_Keys: []
+    m_Values: 
+--- !u!114 &-2862832523495942279
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GroundFloorMat
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _DETAIL_MULX2
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    MotionVector: User
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  - TransparentDepthPrepass
+  - TransparentDepthPostpass
+  - TransparentBackface
+  - RayTracingPrepass
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 0.2, y: 0.2}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FirstTex:
+        m_Texture: {fileID: 2800000, guid: eb18006e3122d7e4a84e8ef8b708df02, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FourthTex:
+        m_Texture: {fileID: 2800000, guid: 6b2e75e162ed72c428ddc9ca9cac6452, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SecondTex:
+        m_Texture: {fileID: 2800000, guid: 20fa208453803ab41b65dfe6fe92c848, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThirdTex:
+        m_Texture: {fileID: 2800000, guid: 478de9d1d3cbac64bad0d9feaad9e272, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaCutoffEnable: 0
+    - _AlphaDstBlend: 0
+    - _AlphaSrcBlend: 1
+    - _AlphaTestRef: 0.5
+    - _AlphaToMask: 0
+    - _Amplitude: 0.33928573
+    - _Angle: 0.46428573
+    - _BUILTIN_QueueControl: 0
+    - _BUILTIN_QueueOffset: 0
+    - _Blend: 0
+    - _BlendMode: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _ConservativeDepthOffsetEnable: 0
+    - _Cull: 2
+    - _CullMode: 2
+    - _CullModeForward: 2
+    - _Cutoff: 0.27
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedGIMode: 0
+    - _DoubleSidedNormalMode: 2
+    - _DstBlend: 0
+    - _DstBlend2: 0
+    - _DstBlendAlpha: 0
+    - _EmissionScaleUI: 0
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnvironmentReflections: 1
+    - _ExcludeFromTUAndAA: 0
+    - _Gloss: 0.5
+    - _GlossMapScale: 0
+    - _Glossiness: 0.48
+    - _GlossyReflections: 0
+    - _Lightmapping: 1
+    - _MaterialID: 1
+    - _MaterialTypeMask: 2
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _OpaqueCullMode: 2
+    - _Parallax: 0.02
+    - _PerPixelSorting: 0
+    - _Phase: 1
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _RayTracing: 0
+    - _ReceiveShadows: 1
+    - _ReceivesSSR: 1
+    - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
+    - _RenderQueueType: 1
+    - _RequireSplitLighting: 0
+    - _Size: 25
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _StencilRef: 0
+    - _StencilRefDepth: 8
+    - _StencilRefDistortionVec: 4
+    - _StencilRefGBuffer: 10
+    - _StencilRefMV: 40
+    - _StencilWriteMask: 6
+    - _StencilWriteMaskDepth: 9
+    - _StencilWriteMaskDistortionVec: 4
+    - _StencilWriteMaskGBuffer: 15
+    - _StencilWriteMaskMV: 41
+    - _SupportDecals: 1
+    - _Surface: 0
+    - _SurfaceType: 0
+    - _TransmissionEnable: 1
+    - _TransparentBackfaceEnable: 0
+    - _TransparentCullMode: 2
+    - _TransparentDepthPostpassEnable: 0
+    - _TransparentDepthPrepassEnable: 0
+    - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
+    - _TransparentZWrite: 0
+    - _UVSec: 1
+    - _UseShadowThreshold: 0
+    - _Wavelength: 0.17857142
+    - _WorkflowMode: 1
+    - _ZTestDepthEqualForOpaque: 3
+    - _ZTestGBuffer: 4
+    - _ZTestTransparent: 4
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.4339623, g: 0.4339623, b: 0.4339623, a: 1}
+    - _Color: {r: 0.43396226, g: 0.43396226, b: 0.43396226, a: 1}
+    - _Color1: {r: 0.67910445, g: 0.67910445, b: 0.67910445, a: 1}
+    - _Color2: {r: 0.14179105, g: 0.14179105, b: 0.14179105, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1}
+    - _Indicator: {r: 1, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
--- a/Assets/Map/Materials/GroundFloorMat.mat.meta
+++ b/Assets/Map/Materials/GroundFloorMat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c836806d281e6a34d8a90a8c70a98d14
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/LargePlatformMat.mat
+++ b/Assets/Map/Materials/LargePlatformMat.mat
@@ -0,0 +1,261 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7074452015321469258
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: 639247ca83abc874e893eb93af2b5e44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 0
+--- !u!114 &-3637609125716766867
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 13
+  hdPluginSubTargetMaterialVersions:
+    m_Keys: []
+    m_Values: 
+--- !u!114 &-2862832523495942279
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: LargePlatformMat
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _DETAIL_MULX2
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    MotionVector: User
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  - TransparentDepthPrepass
+  - TransparentDepthPostpass
+  - TransparentBackface
+  - RayTracingPrepass
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 0.2, y: 0.2}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FirstTex:
+        m_Texture: {fileID: 2800000, guid: eb18006e3122d7e4a84e8ef8b708df02, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FourthTex:
+        m_Texture: {fileID: 2800000, guid: 6b2e75e162ed72c428ddc9ca9cac6452, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SecondTex:
+        m_Texture: {fileID: 2800000, guid: 20fa208453803ab41b65dfe6fe92c848, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThirdTex:
+        m_Texture: {fileID: 2800000, guid: 478de9d1d3cbac64bad0d9feaad9e272, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaCutoffEnable: 0
+    - _AlphaDstBlend: 0
+    - _AlphaSrcBlend: 1
+    - _AlphaTestRef: 0.5
+    - _AlphaToMask: 0
+    - _Amplitude: 0.33928573
+    - _Angle: 0.46428573
+    - _BUILTIN_QueueControl: 0
+    - _BUILTIN_QueueOffset: 0
+    - _Blend: 0
+    - _BlendMode: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _ConservativeDepthOffsetEnable: 0
+    - _Cull: 2
+    - _CullMode: 2
+    - _CullModeForward: 2
+    - _Cutoff: 0.27
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedGIMode: 0
+    - _DoubleSidedNormalMode: 2
+    - _DstBlend: 0
+    - _DstBlend2: 0
+    - _DstBlendAlpha: 0
+    - _EmissionScaleUI: 0
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnvironmentReflections: 1
+    - _ExcludeFromTUAndAA: 0
+    - _Gloss: 0.5
+    - _GlossMapScale: 0
+    - _Glossiness: 0.48
+    - _GlossyReflections: 0
+    - _Lightmapping: 1
+    - _MaterialID: 1
+    - _MaterialTypeMask: 2
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _OpaqueCullMode: 2
+    - _Parallax: 0.02
+    - _PerPixelSorting: 0
+    - _Phase: 1
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _RayTracing: 0
+    - _ReceiveShadows: 1
+    - _ReceivesSSR: 1
+    - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
+    - _RenderQueueType: 1
+    - _RequireSplitLighting: 0
+    - _Size: 25
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _StencilRef: 0
+    - _StencilRefDepth: 8
+    - _StencilRefDistortionVec: 4
+    - _StencilRefGBuffer: 10
+    - _StencilRefMV: 40
+    - _StencilWriteMask: 6
+    - _StencilWriteMaskDepth: 9
+    - _StencilWriteMaskDistortionVec: 4
+    - _StencilWriteMaskGBuffer: 15
+    - _StencilWriteMaskMV: 41
+    - _SupportDecals: 1
+    - _Surface: 0
+    - _SurfaceType: 0
+    - _TransmissionEnable: 1
+    - _TransparentBackfaceEnable: 0
+    - _TransparentCullMode: 2
+    - _TransparentDepthPostpassEnable: 0
+    - _TransparentDepthPrepassEnable: 0
+    - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
+    - _TransparentZWrite: 0
+    - _UVSec: 1
+    - _UseShadowThreshold: 0
+    - _Wavelength: 0.17857142
+    - _WorkflowMode: 1
+    - _ZTestDepthEqualForOpaque: 3
+    - _ZTestGBuffer: 4
+    - _ZTestTransparent: 4
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 1}
+    - _Color: {r: 0.29245278, g: 0.29245278, b: 0.29245278, a: 1}
+    - _Color1: {r: 0.67910445, g: 0.67910445, b: 0.67910445, a: 1}
+    - _Color2: {r: 0.14179105, g: 0.14179105, b: 0.14179105, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1}
+    - _Indicator: {r: 1, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
--- a/Assets/Map/Materials/LargePlatformMat.mat.meta
+++ b/Assets/Map/Materials/LargePlatformMat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b47df7472c8506428b68dd75d2ea6a4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/LargeWallMat.mat
+++ b/Assets/Map/Materials/LargeWallMat.mat
@@ -0,0 +1,261 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7074452015321469258
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: 639247ca83abc874e893eb93af2b5e44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 0
+--- !u!114 &-3637609125716766867
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 13
+  hdPluginSubTargetMaterialVersions:
+    m_Keys: []
+    m_Values: 
+--- !u!114 &-2862832523495942279
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: LargeWallMat
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _DETAIL_MULX2
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    MotionVector: User
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  - TransparentDepthPrepass
+  - TransparentDepthPostpass
+  - TransparentBackface
+  - RayTracingPrepass
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 0.2, y: 0.2}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FirstTex:
+        m_Texture: {fileID: 2800000, guid: eb18006e3122d7e4a84e8ef8b708df02, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FourthTex:
+        m_Texture: {fileID: 2800000, guid: 6b2e75e162ed72c428ddc9ca9cac6452, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e4da0c5e5eed1124f9e599f0edbc3ead, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SecondTex:
+        m_Texture: {fileID: 2800000, guid: 20fa208453803ab41b65dfe6fe92c848, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThirdTex:
+        m_Texture: {fileID: 2800000, guid: 478de9d1d3cbac64bad0d9feaad9e272, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaCutoffEnable: 0
+    - _AlphaDstBlend: 0
+    - _AlphaSrcBlend: 1
+    - _AlphaTestRef: 0.5
+    - _AlphaToMask: 0
+    - _Amplitude: 0.33928573
+    - _Angle: 0.46428573
+    - _BUILTIN_QueueControl: 0
+    - _BUILTIN_QueueOffset: 0
+    - _Blend: 0
+    - _BlendMode: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _ConservativeDepthOffsetEnable: 0
+    - _Cull: 2
+    - _CullMode: 2
+    - _CullModeForward: 2
+    - _Cutoff: 0.27
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedGIMode: 0
+    - _DoubleSidedNormalMode: 2
+    - _DstBlend: 0
+    - _DstBlend2: 0
+    - _DstBlendAlpha: 0
+    - _EmissionScaleUI: 0
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnvironmentReflections: 1
+    - _ExcludeFromTUAndAA: 0
+    - _Gloss: 0.5
+    - _GlossMapScale: 0
+    - _Glossiness: 0.48
+    - _GlossyReflections: 0
+    - _Lightmapping: 1
+    - _MaterialID: 1
+    - _MaterialTypeMask: 2
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _OpaqueCullMode: 2
+    - _Parallax: 0.02
+    - _PerPixelSorting: 0
+    - _Phase: 1
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _RayTracing: 0
+    - _ReceiveShadows: 1
+    - _ReceivesSSR: 1
+    - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
+    - _RenderQueueType: 1
+    - _RequireSplitLighting: 0
+    - _Size: 25
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _StencilRef: 0
+    - _StencilRefDepth: 8
+    - _StencilRefDistortionVec: 4
+    - _StencilRefGBuffer: 10
+    - _StencilRefMV: 40
+    - _StencilWriteMask: 6
+    - _StencilWriteMaskDepth: 9
+    - _StencilWriteMaskDistortionVec: 4
+    - _StencilWriteMaskGBuffer: 15
+    - _StencilWriteMaskMV: 41
+    - _SupportDecals: 1
+    - _Surface: 0
+    - _SurfaceType: 0
+    - _TransmissionEnable: 1
+    - _TransparentBackfaceEnable: 0
+    - _TransparentCullMode: 2
+    - _TransparentDepthPostpassEnable: 0
+    - _TransparentDepthPrepassEnable: 0
+    - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
+    - _TransparentZWrite: 0
+    - _UVSec: 1
+    - _UseShadowThreshold: 0
+    - _Wavelength: 0.17857142
+    - _WorkflowMode: 1
+    - _ZTestDepthEqualForOpaque: 3
+    - _ZTestGBuffer: 4
+    - _ZTestTransparent: 4
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1}
+    - _Color: {r: 0.16981128, g: 0.16981128, b: 0.16981128, a: 1}
+    - _Color1: {r: 0.67910445, g: 0.67910445, b: 0.67910445, a: 1}
+    - _Color2: {r: 0.14179105, g: 0.14179105, b: 0.14179105, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1}
+    - _Indicator: {r: 1, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
--- a/Assets/Map/Materials/LargeWallMat.mat.meta
+++ b/Assets/Map/Materials/LargeWallMat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d6e774130b69007468ab50df1fd42318
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/NeighborhoodTestVolume.asset
+++ b/Assets/Map/Materials/NeighborhoodTestVolume.asset
@@ -0,0 +1,188 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7893295128165547882
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: 0b2db86121404754db890f4c8dfe81b2, type: 3}
+  m_Name: Bloom
+  m_EditorClassIdentifier: 
+  active: 1
+  skipIterations:
+    m_OverrideState: 1
+    m_Value: 0
+  threshold:
+    m_OverrideState: 1
+    m_Value: 0.5
+  intensity:
+    m_OverrideState: 1
+    m_Value: 2
+  scatter:
+    m_OverrideState: 1
+    m_Value: 0.852
+  clamp:
+    m_OverrideState: 0
+    m_Value: 65472
+  tint:
+    m_OverrideState: 1
+    m_Value: {r: 0.764151, g: 0.49426442, b: 0.075694196, a: 1}
+  highQualityFiltering:
+    m_OverrideState: 1
+    m_Value: 1
+  downscale:
+    m_OverrideState: 0
+    m_Value: 0
+  maxIterations:
+    m_OverrideState: 0
+    m_Value: 6
+  dirtTexture:
+    m_OverrideState: 0
+    m_Value: {fileID: 0}
+    dimension: 1
+  dirtIntensity:
+    m_OverrideState: 0
+    m_Value: 0
+--- !u!114 &-4572712511935420910
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: 66f335fb1ffd8684294ad653bf1c7564, type: 3}
+  m_Name: ColorAdjustments
+  m_EditorClassIdentifier: 
+  active: 1
+  postExposure:
+    m_OverrideState: 1
+    m_Value: 0.2
+  contrast:
+    m_OverrideState: 1
+    m_Value: -18.2
+  colorFilter:
+    m_OverrideState: 1
+    m_Value: {r: 1, g: 0.92169505, b: 0.8443396, a: 1}
+  hueShift:
+    m_OverrideState: 0
+    m_Value: 9
+  saturation:
+    m_OverrideState: 1
+    m_Value: 28.6
+--- !u!114 &-3357603926938260329
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: 899c54efeace73346a0a16faa3afe726, type: 3}
+  m_Name: Vignette
+  m_EditorClassIdentifier: 
+  active: 1
+  color:
+    m_OverrideState: 0
+    m_Value: {r: 0, g: 0, b: 0, a: 1}
+  center:
+    m_OverrideState: 0
+    m_Value: {x: 0.5, y: 0.5}
+  intensity:
+    m_OverrideState: 1
+    m_Value: 0.2
+  smoothness:
+    m_OverrideState: 0
+    m_Value: 0.2
+  rounded:
+    m_OverrideState: 0
+    m_Value: 0
+--- !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: d7fd9488000d3734a9e00ee676215985, type: 3}
+  m_Name: NeighborhoodTestVolume
+  m_EditorClassIdentifier: 
+  components:
+  - {fileID: 849379129802519247}
+  - {fileID: -7893295128165547882}
+  - {fileID: 7391319092446245454}
+  - {fileID: -3357603926938260329}
+  - {fileID: -4572712511935420910}
+--- !u!114 &849379129802519247
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: 97c23e3b12dc18c42a140437e53d3951, type: 3}
+  m_Name: Tonemapping
+  m_EditorClassIdentifier: 
+  active: 1
+  mode:
+    m_OverrideState: 1
+    m_Value: 2
+  neutralHDRRangeReductionMode:
+    m_OverrideState: 0
+    m_Value: 2
+  acesPreset:
+    m_OverrideState: 0
+    m_Value: 3
+  hueShiftAmount:
+    m_OverrideState: 0
+    m_Value: 0
+  detectPaperWhite:
+    m_OverrideState: 1
+    m_Value: 0
+  paperWhite:
+    m_OverrideState: 1
+    m_Value: 234
+  detectBrightnessLimits:
+    m_OverrideState: 1
+    m_Value: 1
+  minNits:
+    m_OverrideState: 1
+    m_Value: 0.005
+  maxNits:
+    m_OverrideState: 1
+    m_Value: 647
+--- !u!114 &7391319092446245454
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: ccf1aba9553839d41ae37dd52e9ebcce, type: 3}
+  m_Name: MotionBlur
+  m_EditorClassIdentifier: 
+  active: 0
+  mode:
+    m_OverrideState: 0
+    m_Value: 0
+  quality:
+    m_OverrideState: 1
+    m_Value: 2
+  intensity:
+    m_OverrideState: 1
+    m_Value: 0.6
+  clamp:
+    m_OverrideState: 0
+    m_Value: 0.05
--- a/Assets/Map/Materials/NeighborhoodTestVolume.asset.meta
+++ b/Assets/Map/Materials/NeighborhoodTestVolume.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ba11eb7973297c54e840eccbe06e4983
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/NeighorhoodTestSkyboxMAt.mat
+++ b/Assets/Map/Materials/NeighorhoodTestSkyboxMAt.mat
@@ -0,0 +1,150 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: NeighorhoodTestSkyboxMAt
+  m_Shader: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _SUNDISK_SIMPLE
+  m_InvalidKeywords:
+  - _MAPPING_LATITUDE_LONGITUDE_LAYOUT
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _AtmosphereThickness: 0.7
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _Exposure: 0.13
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _ImageType: 0
+    - _Layout: 0
+    - _Mapping: 1
+    - _Metallic: 0
+    - _MirrorOnBack: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Rotation: 0
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _SunDisk: 1
+    - _SunSize: 0.071
+    - _SunSizeConvergence: 5
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _GroundColor: {r: 0.259167, g: 0.5076879, b: 0.6037736, a: 1}
+    - _SkyTint: {r: 0.4978195, g: 0.61947215, b: 0.9339623, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _Tint: {r: 0.15521538, g: 0.21602443, b: 0.3018868, a: 0.5}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &7101301216080315808
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
--- a/Assets/Map/Materials/NeighorhoodTestSkyboxMAt.mat.meta
+++ b/Assets/Map/Materials/NeighorhoodTestSkyboxMAt.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 34c4a47ea60a28148953a56f4942fbe6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/SkyboxMat.mat
+++ b/Assets/Map/Materials/SkyboxMat.mat
@@ -0,0 +1,142 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SkyboxMat
+  m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Tex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _Exposure: 0.67
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Rotation: 0
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _Tint: {r: 0.24313726, g: 0.42885855, b: 0.49019608, a: 0.5529412}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &7537235668043726181
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
--- a/Assets/Map/Materials/SkyboxMat.mat.meta
+++ b/Assets/Map/Materials/SkyboxMat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 864bc66a46d5ca74cb057487e5f239ae
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Materials/WarmLightMat.mat
+++ b/Assets/Map/Materials/WarmLightMat.mat
@@ -0,0 +1,137 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: WarmLightMat
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.49144346, g: 0.4393345, b: 0.35931006, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &2683191447336228708
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
--- a/Assets/Map/Materials/WarmLightMat.mat.meta
+++ b/Assets/Map/Materials/WarmLightMat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b54b63be52c4f94ba30ff0d1ddb6cc8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Structures/Bulidings/BuildingSmall1.prefab
+++ b/Assets/Map/Structures/Bulidings/BuildingSmall1.prefab
--- a/Assets/Map/Structures/Bulidings/BuildingSmall2.prefab
+++ b/Assets/Map/Structures/Bulidings/BuildingSmall2.prefab
--- a/Assets/Map/Structures/Bulidings/BuildingSmall3.prefab
+++ b/Assets/Map/Structures/Bulidings/BuildingSmall3.prefab
--- a/Assets/Map/Structures/Bulidings/BuildingSmall4.prefab
+++ b/Assets/Map/Structures/Bulidings/BuildingSmall4.prefab
--- a/Assets/Map/Structures/Decorative/FencePost1.prefab
+++ b/Assets/Map/Structures/Decorative/FencePost1.prefab
--- a/Assets/Map/Structures/Decorative/FencePost1.prefab.meta
+++ b/Assets/Map/Structures/Decorative/FencePost1.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4e0a6053f4048d6438b51e7a86479ccb
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Map/Structures/Decorative/WallLight1.prefab
+++ b/Assets/Map/Structures/Decorative/WallLight1.prefab
--- a/Assets/Map/Structures/Decorative/WallLight1.prefab.meta
+++ b/Assets/Map/Structures/Decorative/WallLight1.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 878d4ff6ab98c584aa4b9e007e88bbc1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Player/Graphs/GrappleAimBT.asset
+++ b/Assets/Player/Graphs/GrappleAimBT.asset
--- a/Assets/Player/Graphs/GroundedCheckBT.asset
+++ b/Assets/Player/Graphs/GroundedCheckBT.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  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":521.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"2"},{"_position":{"x":522.0,"y":632.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"3"},{"_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":399.0,"y":775.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"4"},{"_action":{"airMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"inputVector3":{},"$type":"NodeCanvas.Tasks.Actions.SetAirMovement"},"_position":{"x":576.0,"y":776.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_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":"6"}],"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":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"_isDisabled":true,"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
+  _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":521.0},"$type":"NodeCanvas.BehaviourTrees.WaitUntil","$id":"2"},{"_position":{"x":478.0,"y":709.0},"$type":"NodeCanvas.BehaviourTrees.Sequencer","$id":"3"},{"_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":294.0,"y":816.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"4"},{"_action":{"airMoveDirection":{"_name":"groundMoveDirection","_targetVariableID":"a2c4fe25-9549-4bdd-8cec-2dbfc4a8856f"},"inputVector3":{},"$type":"NodeCanvas.Tasks.Actions.SetAirMovement"},"_position":{"x":471.0,"y":817.0},"$type":"NodeCanvas.BehaviourTrees.ActionNode","$id":"5"},{"_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":"6"}],"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":"6"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"_isDisabled":true,"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"_isDisabled":true,"$type":"NodeCanvas.BehaviourTrees.BTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.BehaviourTrees.BTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}'
  _objectReferences: []
  _graphSource:
    _version: 3.31
--- a/Assets/Player/Graphs/PlayerLocomotionFSM.asset
+++ b/Assets/Player/Graphs/PlayerLocomotionFSM.asset
@@ -1,33 +0,0 @@
-%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: f945e777233a59f4aba40aeca29093a6, type: 3}
-  m_Name: PlayerLocomotionFSM
-  m_EditorClassIdentifier: 
-  _serializedGraph: '{"type":"NodeCanvas.StateMachines.FSM","nodes":[{"_actionList":{"executionMode":1,"actions":[]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":327.7592,"y":812.7609},"$type":"NodeCanvas.StateMachines.ActionState"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":12.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":10.0},"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"valueA":{"_name":"facingDirection","_targetVariableID":"c713d622-aafb-43e7-ae0e-ac0b86a85a37"},"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Player.Movement.PlayerFacingDirection,
-    Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":389.9924,"y":1029.762},"$type":"NodeCanvas.StateMachines.ActionState"},{"_position":{"x":218.6569,"y":475.1322},"$type":"NodeCanvas.StateMachines.AnyState","$id":"2"},{"_position":{"x":253.0,"y":608.0},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"3"},{"_onEnterList":{"executionMode":1,"actions":[{"valueA":{"_name":"facingDirection","_targetVariableID":"c713d622-aafb-43e7-ae0e-ac0b86a85a37"},"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Player.Movement.PlayerFacingDirection,
-    Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_onUpdateList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":12.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":10.0},"$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},"_position":{"x":535.0,"y":768.0},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"4"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":30.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":1.0},"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"valueA":{"_name":"facingDirection","_targetVariableID":"c713d622-aafb-43e7-ae0e-ac0b86a85a37"},"valueB":{"_value":2},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[Reset.Player.Movement.PlayerFacingDirection,
-    Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":917.0839,"y":852.7302},"$type":"NodeCanvas.StateMachines.ActionState","$id":"5"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":20.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"},{"valueA":{"_name":"rotationSpeed","_targetVariableID":"d888730f-97df-4288-bb99-1f6c8a34a7c5"},"valueB":{"_value":2.0},"$type":"NodeCanvas.Tasks.Actions.SetFloat"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1161.288,"y":522.152},"$type":"NodeCanvas.StateMachines.ActionState","$id":"6"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"_value":5.0},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":602.0,"y":269.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"7"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{},"moveDirection":{"_name":"groundMoveDirection","_targetVariableID":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6"},"$type":"NodeCanvas.Tasks.Actions.CalculateGroundedLocomotion"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":402.0,"y":177.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"8"}],"connections":[{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"321e55c7-f93e-4667-a0dc-559eb61c6898"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"_isDisabled":true,"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple
-    Aimed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple
-    Confirmed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGrounded","_targetVariableID":"321e55c7-f93e-4667-a0dc-559eb61c6898"},"valueB":{"_value":true},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.1},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkAgainst":2,"checkAgainstValue":{"_value":{"z":1.0}},"desiredValue":{"_value":1.0},"tolerance":{"_value":0.32},"considerCameraRotation":{},"negate":{},"$type":"NodeCanvas.Tasks.Conditions.GetMovementInputDotProduct"},"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGrounded":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGrounded","_id":"321e55c7-f93e-4667-a0dc-559eb61c6898","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
-    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"groundMoveDirection":{"_name":"groundMoveDirection","_id":"16ae5ce4-097a-4c21-94a5-2c5d9ce73eb6","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.Vector3,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"rotationSpeed":{"_name":"rotationSpeed","_id":"d888730f-97df-4288-bb99-1f6c8a34a7c5","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Single,
-    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"facingDirection":{"_name":"facingDirection","_id":"c713d622-aafb-43e7-ae0e-ac0b86a85a37","_isPublic":true,"$type":"NodeCanvas.Framework.Variable`1[[Reset.Player.Movement.PlayerFacingDirection,
-    Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}}'
-  _objectReferences: []
-  _graphSource:
-    _version: 3.31
-    _category: 
-    _comments: 
-    _translation: {x: 170, y: -154}
-    _zoomFactor: 0.9793777
-  _haltSerialization: 0
-  _externalSerializationFile: {fileID: 0}
--- a/Assets/Scenes/NeighborhoodTest.unity
+++ b/Assets/Scenes/NeighborhoodTest.unity
--- a/Assets/Scenes/NeighborhoodTest.unity.meta
+++ b/Assets/Scenes/NeighborhoodTest.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8bbe26b6c40bdd64c9c3b35ef59462a4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
--- a/Assets/Scenes/WorldDemo.unity
+++ b/Assets/Scenes/WorldDemo.unity
--- a/Assets/Scenes/WorldDemo.unity.meta
+++ b/Assets/Scenes/WorldDemo.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c04cc1e96c4df9346bf7e6d9d71b60d1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Core/Graph
+++ b/Assets/Scripts/Core/Graph
@@ -1,121 +0,0 @@
-using System;
-using System.Linq;
-using NodeCanvas.Framework;
-using ParadoxNotion;
-using ParadoxNotion.Design;
-using UnityEngine;
-using UnityEngine.InputSystem;
-using Reset.Player.Movement;
-
-namespace NodeCanvas.Tasks.Actions {
-	[Category("Reset/Movement")]
-	public class AddJump : ActionTask<CharacterController> {
-        public BBParameter<Vector3> airMoveDirection;
-        public BBParameter<float> jumpPower;
-        
-        [Space(5)]
-        public BBParameter<float> jumpStrength;
-        
-        [SliderField(0, 1)]
-        public BBParameter<float> standStillJumpStrength;
-
-        [Tooltip("Determines how much current movement vectors into jump direction")]
-        [SliderField(0, 1)]
-        public BBParameter<float> currentVelocityInheritence;
-        public BBParameter<Vector3> directionalForce;
-        
-        [SliderField(0, 1)]
-        public BBParameter<float> directionalForceStrength;
-        
-		protected override string info {
-			get{
-				string dirStrength = "";
-				
-				if (directionalForce.value != Vector3.zero && directionalForceStrength.value > 0f) {
-					dirStrength = $", towards <i>{directionalForce.value}</i> * {directionalForceStrength.value}";
-				}
-
-				return string.Format($"<b>Start Jump</b>, <i>{jumpStrength.value}</i> strength" + dirStrength);
-			}
-		}
-
-		//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(){
-			// Set jump power
-			jumpPower.value = jumpStrength.value;
-			
-			// 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 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) {
-				airMoveDirection.value = currentVelocityVector3;
-			} else {
-				// Hold new desired air direction and Dot against the existing air moving directioin
-				Vector3 desiredAirMoveDirection = currentInputVector3;
-				float airMoveDirectionDot = Vector3.Dot(desiredAirMoveDirection.normalized, airMoveDirection.value.normalized);
-				
-				// Check threshold of current XZ velocity- if it's too close to zero, use the jumpStrength for jumping velocity. If it's not, use the current velocity
-				float velocityThreshold = 4f;
-				float magnitudeZeroDifference = Mathf.Clamp(currentVelocityVector3.magnitude - velocityThreshold, 0f, Mathf.Infinity) / velocityThreshold; // Divided by maximum to return a 0-1 value. Clamping not required.
-				float outputHoritontalVelocity = Mathf.Lerp(jumpStrength.value, currentVelocityVector3.magnitude, Math.Clamp(magnitudeZeroDifference, 0f, 1f));
-				
-				outputHoritontalVelocity = Mathf.Min(outputHoritontalVelocity, Mathf.Lerp(standStillJumpStrength.value * jumpStrength.value, jumpStrength.value * .4f, magnitudeZeroDifference));
-
-				// Do the same for directional jump strength
-				outputHoritontalVelocity = Mathf.Lerp(outputHoritontalVelocity, jumpStrength.value, directionalForceStrength.value);
-				
-				// 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(.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(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;
-				
-				// 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 * outputHoritontalVelocity;
-			}
-			EndAction(true);
-		}
-		
-		//Called once per frame while the action is active.
-		protected override void OnUpdate(){
-		}
-
-		//Called when the task is disabled.
-		protected override void OnStop() {
-			
-		}
-
-		//Called when the task is paused.
-		protected override void OnPause() {
-			
-		}
-	}
-}
--- a/Assets/Scripts/Core/Graph
+++ b/Assets/Scripts/Core/Graph
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 86e5b037e41d5bb4b8805890ee72ad29
--- a/Tasks/CalculateAirMovement.cs
+++ b/Tasks/CalculateAirMovement.cs
@@ -1,56 +0,0 @@
-using NodeCanvas.Framework;
-using ParadoxNotion.Design;
-using UnityEngine;
-using Reset.Player.Movement;
-
-namespace NodeCanvas.Tasks.Actions {
-	
-	[Category("Reset/Movement")]
-	public class CalculateAirMovement : ActionTask<Transform>{
-		public BBParameter<Vector3> airMoveDirection;
-		public BBParameter<Vector3> groundMoveDirection; // Unused on 7/29/25, delete if still unusued later
-		
-		private float airControlPower = 1f;
-		
-		//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(){
-			airControlPower = 1f;
-		}
-
-		//Called once per frame while the action is active.
-		protected override void OnUpdate() {
-			// Decay Current Air Movement
-			airMoveDirection.value = Vector3.Lerp(airMoveDirection.value, Vector3.zero, .7f * Time.deltaTime);
-			
-			// Decay Air Control power
-			airControlPower = Mathf.Lerp(airControlPower, 0f, 2f * Time.deltaTime);
-			
-			// 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.Flatten(0, null, 0) *
-			                          inputVector3 * airControlPower;
-
-			airMoveDirection.value = Vector3.ClampMagnitude(airMoveDirection.value, originalMagnitude);
-		}
-
-		//Called when the task is disabled.
-		protected override void OnStop() {
-			// groundMoveDirection.value = agent.GetComponent<CharacterController>().velocity;
-			EndAction(true);
-		}
-
-		//Called when the task is paused.
-		protected override void OnPause() {
-			
-		}
-	}
-}
--- a/Tasks/CalculateAirMovement.cs.meta
+++ b/Tasks/CalculateAirMovement.cs.meta
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 38d61a72cc7757448b3db6c04395cf91
--- a/Tasks/CalculateGroundedLocomotion.cs
+++ b/Tasks/CalculateGroundedLocomotion.cs
@@ -1,78 +0,0 @@
-using NodeCanvas.Framework;
-using ParadoxNotion.Design;
-using UnityEngine;
-
-
-namespace NodeCanvas.Tasks.Actions {
-
-	[Category("Reset/Movement")]
-	[Description("Unit flat ground movement")]
-	public class CalculateGroundedLocomotion : ActionTask<CharacterController>{
-		public BBParameter<float> moveSpeed;
-
-		
-		public BBParameter<Vector3> moveDirection;
-		
-		protected override string info {
-			get{
-				return string.Format($"<b>Set ground movement</b>, <i>{moveSpeed.value}</i> speed");
-			}
-		}
-		
-		private float sprintPower;
-		private bool sprinting;
-
-		//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() {
-			// Get current input direction
-			Vector3 flatSurfaceDirection = Vector3.zero;
-        
-			if (agent.isGrounded) {
-				Vector2 rawInput = agent.transform.GetComponent<PlayerControls>().rawMoveInput;
-				flatSurfaceDirection = new(rawInput.x, 0, rawInput.y);
-			}
-			
-			float CalculateSpeed(){
-				// Calculate sprinting speed
-				float outputSpeed = 0f;
-
-				// Add base speed
-				outputSpeed += moveSpeed.value;
-				
-				return outputSpeed;
-			}
-        
-			// Rotate input to forward direction for flat surface
-			// flatSurfaceDirection = agent.transform.rotation * flatSurfaceDirection;
-        
-			// Finalize flat surface direction by adding speed
-			flatSurfaceDirection *= CalculateSpeed();
-
-			moveDirection.value = flatSurfaceDirection;
-			EndAction(true);
-		}
-
-		//Called when the task is disabled.
-		protected override void OnStop() {
-			
-		}
-
-		//Called when the task is paused.
-		protected override void OnPause() {
-			
-		}
-	}
-}
--- a/Tasks/CalculateGroundedLocomotion.cs.meta
+++ b/Tasks/CalculateGroundedLocomotion.cs.meta
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 808dc54c4ce75e846890125a4f87e516
--- a/Tasks/ChangeAgentTransform.cs
+++ b/Tasks/ChangeAgentTransform.cs
@@ -1,121 +0,0 @@
-using System;
-using NodeCanvas.Framework;
-using ParadoxNotion.Design;
-using ParadoxNotion.Serialization.FullSerializer;
-using Sirenix.OdinInspector;
-using UnityEngine;
-
-namespace NodeCanvas.Tasks.Actions {
-
-	[Category("Reset")]
-	[Description("Update the agent's position and rotation (scale too, sure whynot) either instantly or over time.")]
-	public class ChangeAgentTransform : ActionTask<CharacterController>{
-		public enum TransformProperty{
-			Position,
-			Rotation,
-			Scale
-		}
-
-		protected override string info {
-			get{
-				string basicText = string.Format($"Player {targetProperty.ToString()} to {(targetValue.isPresumedDynamic ? targetValue.name : targetValue.value)}");
-				basicText += relativeToSelf.value ? ", relative to Self" : "";
-				
-				return basicText;
-			}
-		}
-
-		public TransformProperty targetProperty;
-
-		[ParadoxNotion.Design.ShowIf("targetProperty", 1), Space(5)]
-		public BBParameter<bool> forcePositionChange;
-
-		public BBParameter<Vector3> targetValue;
-		
-		public BBParameter<bool> relativeToSelf;
-		
-		[Tooltip("Set this to the current position if you're trying to rotate by 'this much'. Keep it zero for world space values.")]
-		public BBParameter<Vector3> relativeValue;
-
-		public BBParameter<bool> changeInstantly;
-		public BBParameter<float> smoothing;
-
-		private Vector3 currentVel;
-		
-		
-		//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() {
-			switch (targetProperty) {
-				case TransformProperty.Position:
-					Vector3 relativeUseValue = relativeValue.value;
-					if (relativeToSelf.value) {
-						relativeUseValue = agent.transform.position;
-					}
-
-					if (changeInstantly.value) {
-						agent.Move(agent.transform.position.DirectionTo(relativeUseValue + targetValue.value));
-					} 
-					
-					break;
-				case TransformProperty.Rotation:
-					agent.transform.rotation = Quaternion.LookRotation(relativeValue.value) * Quaternion.Euler(targetValue.value);
-					break;
-				case TransformProperty.Scale:
-					break;
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-
-			if (changeInstantly.value) {
-				EndAction(true);
-			}
-		}
-
-		//Called once per frame while the action is active.
-		protected override void OnUpdate() {
-			switch (targetProperty) {
-				case TransformProperty.Position:
-					Vector3 relativeUseValue = relativeValue.value;
-					if (relativeToSelf.value) {
-						relativeUseValue = agent.transform.position;
-					}
-
-					if (!changeInstantly.value) {
-						Vector3 targetPosition = relativeUseValue + targetValue.value;
-						// agent.transform.position = Vector3.SmoothDamp(agent.transform.position, targetPosition,
-						// 	ref currentVel, smoothing.value * Time.deltaTime);
-						
-						agent.Move((agent.transform.position.DirectionTo(targetPosition)).normalized * .5f * Mathf.Lerp(0, 1, Vector3.Distance(agent.transform.position, targetPosition)) * smoothing.value * Time.deltaTime);
-						EndAction();
-					} 
-					
-					break;
-				case TransformProperty.Rotation:
-					agent.transform.rotation = Quaternion.Euler(relativeValue.value) * Quaternion.Euler(targetValue.value);
-					break;
-				case TransformProperty.Scale:
-					break;
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-		}
-
-		//Called when the task is disabled.
-		protected override void OnStop() {
-			
-		}
-
-		//Called when the task is paused.
-		protected override void OnPause() {
-			
-		}
-	}
-}
--- a/Tasks/ChangeAgentTransform.cs.meta
+++ b/Tasks/ChangeAgentTransform.cs.meta
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: b77e2b9ac9aad644480508d5a86f4006
--- a/Tasks/ChangeCameraSettings.cs
+++ b/Tasks/ChangeCameraSettings.cs
@@ -1,412 +1,36 @@
 using NodeCanvas.Framework;
 using ParadoxNotion.Design;
+using Reset.Core;
 using Unity.Cinemachine;
 using UnityEditor;
 using UnityEngine;

-// Individual bool setting for each ring. Three of these will be used. 
-public struct OrbitalFollowValueGroup : ICameraValueGroup{
-	public string label;
-	
-	public CameraSettingsToggle changeHeight;
-	public float height;
-	
-	public CameraSettingsToggle changeRadius;
-	public float radius;
-
-	public OrbitalFollowValueGroup(string newLabel){
-		label = newLabel;
-		changeHeight = CameraSettingsToggle.NoChange;
-		height = 0f;
-		changeRadius = CameraSettingsToggle.NoChange;
-		radius = 0f;
-	}
-}
-
-// 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,
-	RelativeValue, // Placeholder for using as altering existing value
-}
-
-public interface ICameraValueGroup{
-	
-}
-
-public struct Vector3CameraValueGroup : ICameraValueGroup{
-	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 : ICameraValueGroup{
-	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 : ICameraValueGroup{
-	public string label;
-	public float value;
-
-	public CameraSettingsToggle changeValue;
-
-	public FloatCameraValueGroup(string newLabel){
-		label = newLabel;
-		value = 0f;
-		changeValue = CameraSettingsToggle.NoChange;
-	}
-}
-
-public struct BoolCameraValueGroup : ICameraValueGroup{
-	public string label;
-	public bool value;
-
-	public CameraSettingsToggle changeValue;
-
-	public BoolCameraValueGroup(string newLabel){
-		label = newLabel;
-		value = true;
-		changeValue = CameraSettingsToggle.NoChange;
-	}
-}
-
-#if UNITY_EDITOR
-public class BoolCameraValueGroupDrawer : ObjectDrawer<BoolCameraValueGroup>  {
-	public override BoolCameraValueGroup OnGUI(GUIContent content, BoolCameraValueGroup _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.label, 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.Toggle(_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 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.label, 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.label, 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.label, 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){
-		// Remove label for floats
-		EditorGUIUtility.labelWidth = 1;
-		
-		// 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(60.0f),
-		};
-		
-		// Start a Horiztonal Section
-		GUILayout.BeginHorizontal();
-		
-		// Add the left side label
-		GUILayout.Label(_instance.label, labelOptions);
-		
-		// Create the height settings enum
-		_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);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeHeight == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
-		}
-		  
-		// It do what it do.
-		GUILayout.Space(5);
-		
-		// Create the radius settings enum
-		_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);
-		} else {
-			EditorGUI.BeginDisabledGroup(true);
-			EditorGUILayout.TextField(_instance.changeRadius == CameraSettingsToggle.NoChange ? "Unchanged" : "Reset", floatOptions);
-			EditorGUI.EndDisabledGroup();
-		}
-		
-		// Close this line up
-		GUILayout.EndHorizontal();
-		
-		// Reset to default so the rest of things don't get messed up
-		EditorGUIUtility.labelWidth = 0;
-		return _instance;
-	}
-}
-#endif
-
 namespace NodeCanvas.Tasks.Actions {
 	[Category("Reset")]
 	[Description("Change Cinemachine camera settings for the player")]
 	public class ChangeCameraSettings : ActionTask{
 		[ParadoxNotion.Design.Header("Main Settings")]
-		public FloatCameraValueGroup fieldOfView = new (newLabel: "FOV");
+		public FloatValueGroup fieldOfView = new (newLabel: "FOV");

 		[ParadoxNotion.Design.Header("Orbit Follow Ring Settings"), Space (5)]
-		public Vector3CameraValueGroup orbitTargetOffset = new(newLabel: "Target Offset");
-		[Space(5)]public Vector3CameraValueGroup orbitPositionDamping = new(newLabel: "Position Damping");
+		public Vector3ValueGroup orbitTargetOffset = new(newLabel: "Target Offset");
+		[Space(5)]public Vector3ValueGroup orbitPositionDamping = new(newLabel: "Position Damping");
 		
 		public OrbitalFollowValueGroup orbitFollowTop = new (newLabel: "Top");
 		public OrbitalFollowValueGroup orbitFollowCenter = new (newLabel: "Center");
 		public OrbitalFollowValueGroup orbitFollowBottom = new (newLabel: "Bottom");

-		public BoolCameraValueGroup enableXAxis = new (newLabel: "Input Axis X Enabled");
-		public BoolCameraValueGroup enableYAxis = new (newLabel: "Input Axis Y Enabled");
+		public BoolValueGroup enableXAxis = new (newLabel: "Input Axis X Enabled");
+		public BoolValueGroup enableYAxis = new (newLabel: "Input Axis Y Enabled");
 		
-		public FloatCameraValueGroup axisLookXGain = new (newLabel: "Look Orbit X Gain");
-		public FloatCameraValueGroup axisLookYGain = new (newLabel: "Look Orbit Y Gain");
+		public FloatValueGroup axisLookXGain = new (newLabel: "Look Orbit X Gain");
+		public FloatValueGroup axisLookYGain = new (newLabel: "Look Orbit Y Gain");
 		
 		[ParadoxNotion.Design.Header("Rotation Composer Settings")]
-		public Vector2CameraValueGroup screenPosition = new (newLabel: "Screen Position");
+		public Vector2ValueGroup screenPosition = new (newLabel: "Screen Position");
 		
 		[ParadoxNotion.Design.Header("Camera Offset Settings")]
-		public Vector3CameraValueGroup cameraOffset = new (newLabel: "Offset");
+		public Vector3ValueGroup cameraOffset = new (newLabel: "Offset");
 		
 		//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
@@ -440,50 +64,50 @@ namespace NodeCanvas.Tasks.Actions {
 			EndAction(true);
 		}

-		public void UpdateVector3Value(Vector3CameraValueGroup valueGroup, ref CameraSettingSingleValue<Vector3> targetProperty){
+		public void UpdateVector3Value(Vector3ValueGroup valueGroup, ref CameraSettingSingleValue<Vector3> targetProperty){
 			switch (valueGroup.changeX) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetProperty.targetValue.x = valueGroup.newValue.x;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetProperty.targetValue.x = targetProperty.originalValue.x;
 					break;
 			}
 			
 			switch (valueGroup.changeY) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetProperty.targetValue.y = valueGroup.newValue.y;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetProperty.targetValue.y = targetProperty.originalValue.y;
 					break;
 			}
 			
 			switch (valueGroup.changeZ) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetProperty.targetValue.z = valueGroup.newValue.z;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetProperty.targetValue.z = targetProperty.originalValue.z;
 					break;
 			}
 		}
 		
-		public void UpdateVector2Value(Vector2CameraValueGroup valueGroup, ref CameraSettingSingleValue<Vector2> targetProperty){
+		public void UpdateVector2Value(Vector2ValueGroup valueGroup, ref CameraSettingSingleValue<Vector2> targetProperty){
 			switch (valueGroup.changeX) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetProperty.targetValue.x = valueGroup.newValue.x;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetProperty.targetValue.x = targetProperty.originalValue.x;
 					break;
 			}
 			
 			switch (valueGroup.changeY) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetProperty.targetValue.y = valueGroup.newValue.y;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetProperty.targetValue.y = targetProperty.originalValue.y;
 					break;
 			}
@@ -491,41 +115,41 @@ namespace NodeCanvas.Tasks.Actions {
 		
 		public void UpdateOrbitFollowValue(OrbitalFollowValueGroup valueGroup, ref CameraSettingSingleValue<float> targetHeight, ref CameraSettingSingleValue<float> targetRadius){
 			switch (valueGroup.changeHeight) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetHeight.targetValue = valueGroup.height;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetHeight.targetValue = targetHeight.originalValue;
 					break;
 			}
 			
 			switch (valueGroup.changeRadius) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetRadius.targetValue = valueGroup.radius;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetRadius.targetValue = targetRadius.originalValue;
 					break;
 			}
 		}
 		
-		public void UpdateBoolValue(BoolCameraValueGroup valueGroup, ref CameraSettingSingleValue<bool> targetProperty){
+		public void UpdateBoolValue(BoolValueGroup valueGroup, ref CameraSettingSingleValue<bool> targetProperty){
 			switch (valueGroup.changeValue) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetProperty.targetValue = valueGroup.value;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetProperty.targetValue = targetProperty.originalValue;
 					break;
 			}
 		}
 		
-		public void UpdateFloatValue(FloatCameraValueGroup valueGroup, ref CameraSettingSingleValue<float> targetProperty){
+		public void UpdateFloatValue(FloatValueGroup valueGroup, ref CameraSettingSingleValue<float> targetProperty){
 			switch (valueGroup.changeValue) {
-				case CameraSettingsToggle.NewValue:
+				case ValueChangeAction.NewValue:
 					targetProperty.targetValue = valueGroup.value;
 					break;
-				case CameraSettingsToggle.ResetValue:
+				case ValueChangeAction.ResetValue:
 					targetProperty.targetValue = targetProperty.originalValue;
 					break;
 			}
--- a/Tasks/ChangeMovementSettings.cs
+++ b/Tasks/ChangeMovementSettings.cs
@@ -0,0 +1,233 @@
+using System;
+using NodeCanvas.Framework;
+using ParadoxNotion.Design;
+using Reset.Units;
+using UnityEngine;
+
+namespace Reset.Core {
+	[Category("Reset")]
+	[Description("Commits movement unit changes to the handler.")]
+	public class ChangeMovementSettings : ActionTask<UnitMovementHandler> {
+		// Move Speed
+		[ParadoxNotion.Design.Header("Speed")]
+		public FloatValueGroup moveSpeed = new (newLabel: "Move Speed");
+		public FloatValueGroup moveSpeedSoothing = new (newLabel: "Move Speed Smoothing");
+
+		[ParadoxNotion.Design.Header("Direction")]
+		public FloatValueGroup airDirectionDecay = new FloatValueGroup("Air Direction Decay");
+		public FloatValueGroup accelerationSmoothing = new (newLabel: "Acceleration Smoothing");
+		public FloatValueGroup deaccelerationSmoothing = new (newLabel: "Deacceleration Smoothing");
+		// public CurveValueGroup deaccelerationCurve = new (newLabel: "Deacceleration Curve"); // Currently unused, may return
+
+		// Direction
+		[Space(5)]
+		public Vector3ValueGroup feedNewDirection = new Vector3ValueGroup("Feed New Direction");
+		public float newDirectionStrength;
+		[Space(5)]
+		public Vector2 addDirectionFromInput;
+		public float addInputStrength;
+		[SliderField(0,1)]
+		public float addInputPriorty;
+		
+		// Jumping
+		[ParadoxNotion.Design.Header("Jumping")]
+		public FloatValueGroup jumpPower = new (newLabel: "Jump Power");
+		public FloatValueGroup jumpPowerDecay = new (newLabel: "Jump Decay Speed");
+    
+		// Gravity
+		[ParadoxNotion.Design.Header("Gravity")]
+		public FloatValueGroup gravityPower = new (newLabel: "Gravity Power");
+		public FloatValueGroup gravityMax = new (newLabel: "Gravity Max");
+		public FloatValueGroup gravityAcceleration = new (newLabel: "Gravity Acceleration Speed");
+		public FloatValueGroup gravityScale = new (newLabel: "Gravity Scale");
+        
+		// Rotation
+		[ParadoxNotion.Design.Header("Rotation")]
+		public EnumValueGroup rotateFacing = new EnumValueGroup("Facing Direction", PlayerFacingDirection.TowardsTarget);
+		public FloatValueGroup rotationSpeed = new (newLabel: "Rotation Speed");
+		public FloatValueGroup rotationSmoothing = new (newLabel: "Rotation Smoothing");
+		public FloatValueGroup rotationInputBlending = new("Rotation Input Blending");
+		[Space(5)]
+		public BBParameter<Vector3> feedNewRotation;
+		public BBParameter<Vector3> feedRelativeTo;
+		public Space rotationRelativeSpace;
+
+		private Vector3 feedDir;
+
+		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() {
+			// Direction 
+			UpdateFloatValue(airDirectionDecay, ref agent.data.airDirectionDecay, ref agent.data.airDirectionDecay);
+			UpdateFloatValue(accelerationSmoothing, ref agent.data.accelerationSmoothing, ref agent.defaultData.accelerationSmoothing);
+			UpdateFloatValue(deaccelerationSmoothing, ref agent.data.deaccelerationSmoothing, ref agent.defaultData.deaccelerationSmoothing);
+			// UpdateCurveProperty(deaccelerationCurve, ref agent.data.deaccelerationCurve, ref agent.defaultData.deaccelerationCurve); // Currently unused, may return
+			
+			// Direction from value
+			// Check that feedDir is not changed
+			UpdateVector3Value(feedNewDirection, ref feedDir, ref feedDir); 
+
+			// If there's a direciton add it to the player for a frame
+			if (feedDir != Vector3.zero) {
+				agent.AddToCurrentDirection(agent.transform.rotation * feedDir.normalized, newDirectionStrength);
+				// Reset the fed direction after it's added so future runs don't have
+				feedDir = Vector3.zero;
+			}
+			
+			// Direction from controller input
+			if (addDirectionFromInput != Vector2.zero){
+				agent.OverwriteDirectionFromInput(new Vector3(addDirectionFromInput.x, addDirectionFromInput.y), addInputPriorty, addInputStrength);
+			}
+			
+			// Move Speed
+			UpdateFloatValue(moveSpeed, ref agent.data.moveSpeed, ref agent.defaultData.moveSpeed);
+			UpdateFloatValue(moveSpeedSoothing, ref agent.data.moveSpeedSoothing, ref agent.defaultData.moveSpeedSoothing);
+			
+			// Jump
+			UpdateFloatValue(jumpPower, ref agent.data.jumpPower, ref agent.defaultData.jumpPower);
+			UpdateFloatValue(jumpPowerDecay, ref agent.data.jumpPowerDecay, ref agent.defaultData.jumpPowerDecay);
+			
+			// Gravity
+			UpdateFloatValue(gravityPower, ref agent.data.gravityPower, ref agent.defaultData.gravityPower);
+			UpdateFloatValue(gravityMax, ref agent.data.gravityMax, ref agent.defaultData.gravityMax);
+			UpdateFloatValue(gravityAcceleration, ref agent.data.gravityAcceleration, ref agent.defaultData.gravityAcceleration);
+			UpdateFloatValue(gravityScale, ref agent.data.gravityScale, ref agent.defaultData.gravityScale);
+
+			// Rotation
+			UpdateEnumValue(rotateFacing, ref agent.data.rotateFacing, ref agent.defaultData.rotateFacing);
+			UpdateFloatValue(rotationSpeed, ref agent.data.rotationSpeed, ref agent.defaultData.rotationSpeed);
+			UpdateFloatValue(rotationSmoothing, ref agent.data.rotationSmoothing, ref agent.defaultData.rotationSmoothing);
+			UpdateFloatValue(rotationInputBlending, ref agent.data.rotationInputBlending, ref agent.defaultData.rotationInputBlending);
+			
+			// Rotation from value
+			if (feedNewRotation.value != Vector3.zero) {
+				if (rotationRelativeSpace == Space.World) {
+					Debug.Log(Quaternion.LookRotation(feedRelativeTo.value));
+					agent.SetSpecifiedRotation(Quaternion.Euler(feedNewRotation.value) * Quaternion.LookRotation(feedRelativeTo.value));
+				} else {
+					agent.SetSpecifiedRotation(agent.transform.rotation * Quaternion.Euler(feedNewRotation.value) * Quaternion.LookRotation(feedRelativeTo.value));
+				}
+			}
+			
+			EndAction(true);
+		}
+
+		//Called once per frame while the action is active.
+		protected override void OnUpdate() {
+			
+		}
+
+		//Called when the task is disabled.
+		protected override void OnStop() {
+			
+		}
+
+		//Called when the task is paused.
+		protected override void OnPause() {
+			
+		}
+
+		public void UpdateCurveProperty(CurveValueGroup valueGroup, ref AnimationCurve targetProperty, ref AnimationCurve defaultProperty){
+			switch (valueGroup.changeValue) {
+				case ValueChangeAction.NoChange:
+					break;
+				case ValueChangeAction.NewValue:
+					targetProperty = valueGroup.newValue;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty = defaultProperty;
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
+		
+		public void UpdateVector3Value(Vector3ValueGroup valueGroup, ref Vector3 targetProperty, ref Vector3 defaultProperty){
+			switch (valueGroup.changeX) {
+				case ValueChangeAction.NewValue:
+					targetProperty.x = valueGroup.newValue.x;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.x = defaultProperty.x;
+					break;
+			}
+			
+			switch (valueGroup.changeY) {
+				case ValueChangeAction.NewValue:
+					targetProperty.y = valueGroup.newValue.y;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.y = defaultProperty.y;
+					break;
+			}
+			
+			switch (valueGroup.changeZ) {
+				case ValueChangeAction.NewValue:
+					targetProperty.z = valueGroup.newValue.z;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.z = defaultProperty.z;
+					break;
+			}
+		}
+		
+		public void UpdateVector2Value(Vector2ValueGroup valueGroup, ref Vector2 targetProperty, ref Vector2 defaultProperty){
+			switch (valueGroup.changeX) {
+				case ValueChangeAction.NewValue:
+					targetProperty.x = valueGroup.newValue.x;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.x = defaultProperty.x;
+					break;
+			}
+			
+			switch (valueGroup.changeY) {
+				case ValueChangeAction.NewValue:
+					targetProperty.y = valueGroup.newValue.y;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty.y = defaultProperty.y;
+					break;
+			}
+		}
+
+		
+		public void UpdateBoolValue(BoolValueGroup valueGroup, ref bool targetProperty, ref bool defaultProperty){
+			switch (valueGroup.changeValue) {
+				case ValueChangeAction.NewValue:
+					targetProperty = valueGroup.value;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty = defaultProperty;
+					break;
+			}
+		}
+		
+		public void UpdateEnumValue(EnumValueGroup valueGroup, ref Enum targetProperty, ref Enum defaultProperty){
+			switch (valueGroup.changeValue) {
+				case ValueChangeAction.NewValue:
+					targetProperty = valueGroup.newValue;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty = defaultProperty;
+					break;
+			}
+		}
+		
+		public void UpdateFloatValue(FloatValueGroup valueGroup, ref float targetProperty, ref float defaultProperty){
+			switch (valueGroup.changeValue) {
+				case ValueChangeAction.NewValue:
+					targetProperty = valueGroup.value;
+					break;
+				case ValueChangeAction.ResetValue:
+					targetProperty = defaultProperty;
+					break;
+			}
+		}
+	}
+}
--- a/Tasks/ChangeMovementSettings.cs.meta
+++ b/Tasks/ChangeMovementSettings.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5132a76af4f722e49bc7fbbc75edcaf1
--- a/Assets/Scripts/Core/Graph
+++ b/Assets/Scripts/Core/Graph
@@ -1,171 +0,0 @@
-using System;
-using System.Collections;
-using NodeCanvas.Framework;
-using ParadoxNotion.Design;
-using ParadoxNotion.Services;
-using Unity.Cinemachine;
-using Unity.Mathematics;
-using UnityEngine;
-using Reset.Player.Movement;
-
-namespace Reset.Player.Movement{
-	public enum PlayerFacingDirection{
-		Target = 0,
-		Movement,
-		MatchCamera,
-		Static
-	}
-}
-
-
-namespace NodeCanvas.Tasks.Actions {
-
-	[Category("Reset/Movement")]
-	[Description("Finalizes movement and sends the final move commands to the controller")]
-	public class ProcessMovement : ActionTask<CharacterController>{
-		public BBParameter<Vector3> groundMoveDirection;
-		public BBParameter<Vector3> airMoveDirection;
-		[Space(5)]
-		public BBParameter<float> gravityAcceleration = 1f;
-		public BBParameter<float> gravityMax = 8f;
-
-		public BBParameter<float> jumpPower;
-		public BBParameter<float> jumpPowerDecay;
-		
-		// Rotation
-		public BBParameter<PlayerFacingDirection> playerFacingDirection;
-
-		[ShowIf("playerFacingDirection", 0)]
-		public Vector3 rotationTargetPosition;
-		
-		public BBParameter<float> rotationSpeed = 5f;
-		public BBParameter<float> rotationSmoothing;
-
-		private float currentRotSpeed;
-		private float lastLookMagnitude;
-		private Quaternion targetRotation;
-		private Vector3 currentMoveDir;
-		
-		// References
-		private PlayerControls controls;
-		
-		public BBParameter<float> gravityPower;
-
-		//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() {
-			// Append the late update method to actually happen on late update
-			MonoManager.current.onLateUpdate += LateUpdate;
-			
-			// Set ingitial rotation power
-			currentRotSpeed = rotationSpeed.value;
-			
-			// Reference to controls
-			controls = agent.GetComponent<PlayerControls>();
-			
-			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(){
-			currentMoveDir = groundMoveDirection.value;
-		}
-
-		//Called once per frame while the action is active.
-		protected override void OnUpdate(){
-			// Accelerate gravity
-			gravityPower.value += gravityAcceleration.value * Time.deltaTime;
-			gravityPower.value = Mathf.Min(gravityPower.value, gravityMax.value);
-			
-			// Calculate rotation speed
-			currentRotSpeed = Mathf.Lerp(currentRotSpeed, rotationSpeed.value, rotationSmoothing.value * Time.deltaTime);
-			
-			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));
-					
-					break;
-				case PlayerFacingDirection.Movement:
-					// Check magnitude to avoid the "Look rotation viewing vector is zero" debug
-
-					// Set desired rotation to input direction, with respect to camera rotation
-					if (agent.isGrounded){
-						if (controls.rawMoveInput.magnitude == 0) { break; }
-
-						targetRotation = Quaternion.LookRotation(currentMoveDir) *
-						                 Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0f, null, 0f));
-					} else {
-						if (airMoveDirection.value.magnitude == 0) { break; }
-
-						targetRotation = Quaternion.LookRotation(airMoveDirection.value);
-					}
-					break;
-				case PlayerFacingDirection.MatchCamera:
-					// Craft a new rotation that flattens the camera's rotation to the ground
-					// Needed to keep the character from inheriting the camera's height-rotation
-					targetRotation = Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0, null, 0));
-					break;
-				case PlayerFacingDirection.Static:
-					targetRotation = agent.transform.rotation;
-					break;
-			}
-			
-	        // Construct move direction
-	        Vector3 finalMoveDir = Vector3.zero;
-			Vector3 gravityMoveDirection;
-
-			// Change how input is managed based on facing state
-			currentMoveDir = Vector3.Slerp(currentMoveDir, groundMoveDirection.value, currentRotSpeed * Time.deltaTime);
-			
-			// Add input movement
-			if (agent.isGrounded){
-				finalMoveDir += currentMoveDir +  Vector3.down * .03f;
-				gravityMoveDirection = new(0f, jumpPower.value + (Physics.gravity.y *.3f), 0f);
-			} else {
-				finalMoveDir += airMoveDirection.value;
-				gravityMoveDirection = new(0f, jumpPower.value + Physics.gravity.y * gravityPower.value, 0f);
-			}
-			
-			// Reset gravity power when grounded
-			if (agent.isGrounded) {
-				gravityPower.value = 0f;
-			}
-			
-			// Do final movement
-			if (agent.isGrounded) {
-				agent.Move((Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0f, null, 0f)) * finalMoveDir + gravityMoveDirection) * Time.deltaTime);
-			} else {
-				agent.Move((finalMoveDir + gravityMoveDirection) * Time.deltaTime);
-			}
-			
-			// Set final rotation
-			agent.transform.rotation = Quaternion.Lerp(agent.transform.rotation, targetRotation, 10f * Time.deltaTime).Flatten(0, null, 0);
-			
-			// ???? Moved this above but don't remember if this needs to be here still
-			if (agent.isGrounded) {
-				jumpPower.value = 0f;
-			}
-			EndAction(true);
-
-		}
-		
-		// Gravity is processed in LateUpdate (added to MonoManager's onLateUpdate in OnInit())
-		public void LateUpdate(){
-			// Decay jump power
-			jumpPower.value = Mathf.Lerp(jumpPower.value, 0f, jumpPowerDecay.value * Time.deltaTime);
-		}
-
-		//Called when the task is disabled.
-		protected override void OnStop() {
-			EndAction(true);
-		}
-
-		//Called when the task is paused.
-		protected override void OnPause() {
-			
-		}
-	}
-}
--- a/Assets/Scripts/Core/Graph
+++ b/Assets/Scripts/Core/Graph
@@ -1,56 +0,0 @@
-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
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: f1db555b92ed94543beab7a2106bc2a3
--- a/Assets/Scripts/Core/Graph
+++ b/Assets/Scripts/Core/Graph
@@ -1,7 +1,7 @@
 using System;
 using NodeCanvas.Framework;
 using ParadoxNotion.Design;
-using Reset.Player.Movement;
+using Reset.Movement;
 using UnityEngine;

 namespace NodeCanvas.Tasks.Actions {
--- a/Tasks/UpdateGravityDirection.cs
+++ b/Tasks/UpdateGravityDirection.cs
@@ -0,0 +1,73 @@
+using NodeCanvas.Framework;
+using ParadoxNotion.Design;
+using ParadoxNotion.Services;
+using UnityEngine;
+
+namespace Reset.Movement {
+
+	[Category("Reset/Movement")]
+	[Description("Process Y-axis movement for the agent")]
+	// TODO: Rename to UpdateGravitytDirection
+	public class UpdateGravityDirection : ActionTask<CharacterController>{
+		public BBParameter<Vector3> moveDirection;
+		public BBParameter<float> jumpPower;
+		public BBParameter<float> jumpPowerDecay;
+		
+		[Space(5)]
+		public BBParameter<float> gravityAcceleration = 1f;
+		public BBParameter<float> gravityMax = 8f;
+		
+		public BBParameter<float> gravityPower;
+		
+		//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() {
+			MonoManager.current.onLateUpdate += LateUpdate;
+			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() {
+			// Accelerate gravity
+			gravityPower.value += gravityAcceleration.value * Time.deltaTime;
+			gravityPower.value = Mathf.Min(gravityPower.value, gravityMax.value);
+			
+			// Apply a constant gravity if the player is grounded
+			if (agent.isGrounded) {
+				gravityPower.value = .1f;
+			}
+			
+			// Create the gravity direction
+			float gravityMoveDirection = jumpPower.value + Physics.gravity.y * gravityPower.value;
+			
+			// Commit gravity to move direction, ignoring XZ since those are done in UpdateMovementDirection
+			moveDirection.value = new Vector3(moveDirection.value.x, gravityMoveDirection, moveDirection.value.z);
+
+			Debug.Log("Gravity Done");
+
+			EndAction(true);
+			
+		}
+		public void LateUpdate(){
+			// Decay jump power
+			jumpPower.value = Mathf.Lerp(jumpPower.value, 0f, jumpPowerDecay.value * Time.deltaTime);
+		}
+
+
+		//Called when the task is disabled.
+		protected override void OnStop() {
+			
+		}
+
+		//Called when the task is paused.
+		protected override void OnPause() {
+			
+		}
+	}
+}
--- a/Tasks/UpdateGravityDirection.cs.meta
+++ b/Tasks/UpdateGravityDirection.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5531fbd949d33204690c98dd89a5e97f
--- a/Tasks/UpdateMovementDirection.cs
+++ b/Tasks/UpdateMovementDirection.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections;
+using NodeCanvas.Framework;
+using ParadoxNotion.Design;
+using ParadoxNotion.Services;
+using Unity.Cinemachine;
+using Unity.Mathematics;
+using UnityEngine;
+using Reset.Movement;
+using Reset.Units;
+
+namespace NodeCanvas.Tasks.Actions {
+
+	[Category("Reset/Movement")]
+	[Description("Finalizes movement and sends the final move commands to the controller")]
+	// TODO: Rename to UpdateMovementDirection
+	public class UpdateMovementDirection : ActionTask<CharacterController>{
+		[ParadoxNotion.Design.Header("References")]
+		public BBParameter<Vector3> moveDirection;
+		// TODO: Remove this reference and let each copy of this use their own settings.
+		public BBParameter<PlayerFacingDirection> playerFacingDirection;
+		
+		[ParadoxNotion.Design.Header("Settings")]
+		public BBParameter<float> accelerationSmoothing = 5f;
+		public BBParameter<float> deaccelerationSmoothing = 5f;
+		public BBParameter<AnimationCurve> deaccelerationCurve;
+
+		public BBParameter<float> directionChangeMinimumMagnitude; // Unused. Use to only make input change if it's over a certain input threshold. Maybe smoothing can affect this?
+		
+		private float lastLookMagnitude;
+		private Vector3 currentMoveDir;
+	
+		// References
+		private PlayerControls controls;
+		
+		//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() {
+			// Reference to controls
+			controls = agent.GetComponent<PlayerControls>();
+			
+			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(){
+			// Initialize the smoothed direction with the value as is on input
+			// currentMoveDir = new Vector3(moveDirection.value.x, moveDirection.value.y, moveDirection.value.z);
+		}
+
+		//Called once per frame while the action is active.
+		protected override void OnUpdate(){
+	        // Construct move direction
+	        Vector3 targetDirection = moveDirection.value;
+	        
+	        // Get input value
+	        Vector3 inputMovement = new Vector3(controls.rawMoveInput.x, 0f, controls.rawMoveInput.y);
+
+	        if (inputMovement.magnitude < .1f) {
+		        inputMovement = Vector3.zero;
+	        }
+
+			// Change how movement is managed based on facing state
+			switch (playerFacingDirection.value) {
+				case PlayerFacingDirection.TowardsTarget:
+					break;
+				case PlayerFacingDirection.MatchForward: // TODO: Recomment
+					// targetDirection = agent.transform.forward * inputMovement.magnitude;
+					targetDirection = inputMovement;
+					break;
+				case PlayerFacingDirection.MatchCamera:
+					targetDirection = Quaternion.Euler(Camera.main.transform.forward.DirectionTo(agent.transform.forward)) * inputMovement;	// NOTE: This used to be t: currentRotSpeed * Time.deltaTime.
+					// See how it feels with a hard set value and go fro there.
+					break;
+				case PlayerFacingDirection.Static:
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+
+			// Remove Y from variables
+			Vector3 targetNoY = new Vector3(targetDirection.x, 0f, targetDirection.z);
+			Vector3 currentNoY = new Vector3(currentMoveDir.x, 0f, currentMoveDir.z);
+			
+			// Smooth movement 
+			if (targetNoY.magnitude > currentNoY.magnitude) {
+				currentMoveDir = Vector3.Lerp(currentMoveDir, targetNoY,accelerationSmoothing.value * Time.deltaTime);	
+
+			} else {
+				float deaccelValue = deaccelerationCurve.value.Evaluate(inputMovement.magnitude); 
+				
+				currentMoveDir = Vector3.Lerp(currentMoveDir, targetNoY, deaccelerationSmoothing.value * Time.deltaTime);	
+			}
+			
+			
+			currentMoveDir.y = moveDirection.value.y;
+			// Commit move direction
+			moveDirection.value = currentMoveDir;
+			// Debug.Log(moveDirection.value);
+			EndAction(true);
+		}
+		
+		// Gravity is processed in LateUpdate (added to MonoManager's onLateUpdate in OnInit())
+
+
+		//Called when the task is disabled.
+		protected override void OnStop() {
+			EndAction(true);
+		}
+
+		//Called when the task is paused.
+		protected override void OnPause() {
+			
+		}
+	}
+}
--- a/Tasks/UpdateMovementDirection.cs.meta
+++ b/Tasks/UpdateMovementDirection.cs.meta
--- a/Tasks/UpdateMovementSpeed.cs
+++ b/Tasks/UpdateMovementSpeed.cs
@@ -0,0 +1,60 @@
+using System;
+using NodeCanvas.Framework;
+using ParadoxNotion.Design;
+using UnityEngine;
+
+
+namespace Reset.Movement {
+
+	[Category("Reset/Movement")]
+	[Description("Updates the movespeed for this agent")]
+	public class UpdateMovementSpeed : ActionTask{
+		public BBParameter<float> target;
+		public BBParameter<float> speed;
+		public BBParameter<float> smoothing = 10f;
+
+		private float currentSpeed;
+		
+		//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() {
+			if (!speed.useBlackboard) {
+				Debug.LogError("This <b>Update Movement Speed</b> does not have it's current value attached to a Blackboard variable. Nothing will happen.", agent.gameObject);
+			}
+			
+			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(){
+			// currentSpeed = speed.value;
+
+		}
+
+		//Called once per frame while the action is active.
+		protected override void OnUpdate(){
+			currentSpeed = Mathf.Lerp(currentSpeed, target.value, smoothing.value * Time.deltaTime);
+			
+			speed.value = currentSpeed;
+
+			if (Mathf.Abs(currentSpeed - speed.value) < .01f) {
+				
+			}
+			
+			Debug.Log("Speed Done");
+			EndAction(true);
+		}
+
+		//Called when the task is disabled.
+		protected override void OnStop() {
+			
+		}
+
+		//Called when the task is paused.
+		protected override void OnPause() {
+			
+		}
+	}
+}
--- a/Tasks/UpdateMovementSpeed.cs.meta
+++ b/Tasks/UpdateMovementSpeed.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6a4c5896d783ad845861edd0c9eea14b
--- a/Assets/Scripts/Core/LockOnManager.cs
+++ b/Assets/Scripts/Core/LockOnManager.cs
@@ -29,8 +29,7 @@ public class LockOnManager : MonoBehaviour{
    // Lock On Tracking
    [Space(10)]
    
-    [ShowInInspector]
-    ActiveLockOnTarget mainTarget;
+    public ActiveLockOnTarget mainTarget;
    
    public List<ActiveLockOnTarget> activeTargets = new List<ActiveLockOnTarget>();

@@ -54,7 +53,6 @@ public class LockOnManager : MonoBehaviour{
            return;
        }

-
        // Quick check for things in lock-on target that aren't lock-onable
        if (mainTarget != null && mainTarget.gameObject.GetComponent<ILockOnTarget>() == null) {
            mainTarget.gameObject.AddComponent<GenericLockOnTarget>();
--- a/Assets/Scripts/Core/ValueGroup.cs
+++ b/Assets/Scripts/Core/ValueGroup.cs
@@ -0,0 +1,487 @@
+using System;
+using ParadoxNotion.Design;
+using UnityEditor;
+using UnityEngine;
+
+namespace Reset.Core{
+	// Individual bool setting for each ring. Three of these will be used. 
+	public struct OrbitalFollowValueGroup{
+		public string label;
+		
+		public ValueChangeAction changeHeight;
+		public float height;
+		
+		public ValueChangeAction changeRadius;
+		public float radius;
+
+		public OrbitalFollowValueGroup(string newLabel){
+			label = newLabel;
+			changeHeight = ValueChangeAction.NoChange;
+			height = 0f;
+			changeRadius = ValueChangeAction.NoChange;
+			radius = 0f;
+		}
+	}
+
+	// Enum options for individual camera settings
+	public enum ValueChangeAction{
+		NoChange,
+		NewValue,
+		ResetValue,
+		RelativeValue, // Placeholder for using as altering existing value
+	}
+
+	public struct CurveValueGroup{
+		public string label;
+		public AnimationCurve newValue;
+
+		public ValueChangeAction changeValue;
+
+		public CurveValueGroup(string newLabel){
+			changeValue = ValueChangeAction.NoChange;
+
+			newValue = new AnimationCurve();
+			label = newLabel;
+		}
+	}
+
+	public struct EnumValueGroup{
+		public string label;
+		public Enum newValue;
+
+		public ValueChangeAction changeValue;
+
+		public EnumValueGroup(string newLabel, Enum enumType){
+			changeValue = ValueChangeAction.NoChange;
+
+			newValue = enumType;
+			label = newLabel;
+
+
+		}
+	}
+
+	public struct Vector3ValueGroup{
+		public string label;
+		public Vector3 newValue;
+		
+		public ValueChangeAction changeX;
+		public ValueChangeAction changeY;
+		public ValueChangeAction changeZ;
+		
+		public Vector3ValueGroup(string newLabel){
+			changeX = ValueChangeAction.NoChange;
+			changeY = ValueChangeAction.NoChange;
+			changeZ = ValueChangeAction.NoChange;
+
+			newValue = Vector3.zero;
+			label = newLabel;
+		}
+	}
+
+	public struct Vector2ValueGroup{
+		public string label;
+		public Vector2 newValue;
+		
+		public ValueChangeAction changeX;
+		public ValueChangeAction changeY;
+		
+		public Vector2ValueGroup(string newLabel){
+			changeX = ValueChangeAction.NoChange;
+			changeY = ValueChangeAction.NoChange;
+
+			newValue = Vector2.zero;
+			label = newLabel;
+		}
+	}
+
+	public struct FloatValueGroup{
+		public string label;
+		public float value;
+
+		public ValueChangeAction changeValue;
+
+		public FloatValueGroup(string newLabel){
+			label = newLabel;
+			value = 0f;
+			changeValue = ValueChangeAction.NoChange;
+		}
+	}
+
+	public struct BoolValueGroup{
+		public string label;
+		public bool value;
+
+		public ValueChangeAction changeValue;
+
+		public BoolValueGroup(string newLabel){
+			label = newLabel;
+			value = true;
+			changeValue = ValueChangeAction.NoChange;
+		}
+	}
+
+#if UNITY_EDITOR
+	public class BoolValueGroupDrawer : ObjectDrawer<BoolValueGroup>  {
+		public override BoolValueGroup OnGUI(GUIContent content, BoolValueGroup _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.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
+			
+			// Create the value/disabled information field
+			if (_instance.changeValue == ValueChangeAction.NewValue){
+				_instance.value = EditorGUILayout.Toggle(_instance.value, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.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 CurveVlueGroupDrawer : ObjectDrawer<CurveValueGroup>  {
+		public override CurveValueGroup OnGUI(GUIContent _content, CurveValueGroup _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.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
+			
+			// Create the value/disabled information field
+			if (_instance.changeValue == ValueChangeAction.NewValue){
+				_instance.newValue = EditorGUILayout.CurveField(_instance.newValue, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.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 EnumValueGroupDrawer : ObjectDrawer<EnumValueGroup>{
+		public override EnumValueGroup OnGUI(GUIContent _content, EnumValueGroup _instance){
+			// Set layout options for the label and the float fields
+			GUILayoutOption[] floatOptions = new GUILayoutOption[] {
+				GUILayout.Width(200.0f), 
+				GUILayout.MinWidth(100.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.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
+			
+			// Create the value/disabled information field
+			if (_instance.changeValue == ValueChangeAction.NewValue){
+				_instance.newValue = EditorGUILayout.EnumPopup("", instance.newValue, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.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 FloatValueGroupDrawer : ObjectDrawer<FloatValueGroup>  {
+		public override FloatValueGroup OnGUI(GUIContent _content, FloatValueGroup _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.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeValue = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeValue);
+			
+			// Create the value/disabled information field
+			if (_instance.changeValue == ValueChangeAction.NewValue){
+				_instance.value = EditorGUILayout.FloatField(_instance.value, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeValue == ValueChangeAction.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 Vector3ValueGroupDrawer : ObjectDrawer<Vector3ValueGroup>  {
+		public override Vector3ValueGroup OnGUI(GUIContent _content, Vector3ValueGroup _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.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeX = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeX);
+			
+			// Create the value/disabled information field
+			if (_instance.changeX == ValueChangeAction.NewValue){
+				_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeX == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			  
+			// It do what it do.
+			GUILayout.Space(5);
+			
+			// Create the y settings enum
+			_instance.changeY = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeY);
+			
+			// Create the value/disabled information field
+			if (_instance.changeY == ValueChangeAction.NewValue){
+				_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeY == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// It do what it do.
+			GUILayout.Space(5);
+			
+			// Create the y settings enum
+			_instance.changeZ = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeZ);
+			
+			// Create the value/disabled information field
+			if (_instance.changeZ == ValueChangeAction.NewValue){
+				_instance.newValue.z = EditorGUILayout.FloatField(_instance.newValue.z, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeZ == ValueChangeAction.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 Vector2ValueGroupDrawer : ObjectDrawer<Vector2ValueGroup>  {
+		public override Vector2ValueGroup OnGUI(GUIContent _content, Vector2ValueGroup _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.label, labelOptions);
+			GUILayout.BeginHorizontal();
+			
+			// Create the x settings enum
+			_instance.changeX = (ValueChangeAction)EditorGUILayout.EnumPopup("", instance.changeX);
+			
+			// Create the value/disabled information field
+			if (_instance.changeX == ValueChangeAction.NewValue){
+				_instance.newValue.x = EditorGUILayout.FloatField(_instance.newValue.x, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeX == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			  
+			// It do what it do.
+			GUILayout.Space(5);
+			
+			// Create the y settings enum
+			_instance.changeY = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeY);
+			
+			// Create the value/disabled information field
+			if (_instance.changeY == ValueChangeAction.NewValue){
+				_instance.newValue.y = EditorGUILayout.FloatField(_instance.newValue.y, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeY == ValueChangeAction.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){
+			// Remove label for floats
+			EditorGUIUtility.labelWidth = 1;
+			
+			// 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(60.0f),
+			};
+			
+			// Start a Horiztonal Section
+			GUILayout.BeginHorizontal();
+			
+			// Add the left side label
+			GUILayout.Label(_instance.label, labelOptions);
+			
+			// Create the height settings enum
+			_instance.changeHeight = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeHeight);
+			
+			// Create the value/disabled information field
+			if (_instance.changeHeight == ValueChangeAction.NewValue){
+				_instance.height = EditorGUILayout.FloatField(_instance.height, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeHeight == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			  
+			// It do what it do.
+			GUILayout.Space(5);
+			
+			// Create the radius settings enum
+			_instance.changeRadius = (ValueChangeAction)EditorGUILayout.EnumPopup("", _instance.changeRadius);
+			
+			// Create the value/disabled information field
+			if (_instance.changeRadius == ValueChangeAction.NewValue){
+				_instance.radius = EditorGUILayout.FloatField(_instance.radius, floatOptions);
+			} else {
+				EditorGUI.BeginDisabledGroup(true);
+				EditorGUILayout.TextField(_instance.changeRadius == ValueChangeAction.NoChange ? "Unchanged" : "Reset", floatOptions);
+				EditorGUI.EndDisabledGroup();
+			}
+			
+			// Close this line up
+			GUILayout.EndHorizontal();
+			
+			// Reset to default so the rest of things don't get messed up
+			EditorGUIUtility.labelWidth = 0;
+			return _instance;
+		}
+	}
+#endif
+
+}
--- a/Assets/Scripts/Core/ValueGroup.cs.meta
+++ b/Assets/Scripts/Core/ValueGroup.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 111e95d8d161f7d4887fa7ccfa6d1454
--- a/Assets/Scripts/Player/Player.cs
+++ b/Assets/Scripts/Player/Player.cs
@@ -5,12 +5,10 @@ using Sirenix.OdinInspector;

 public class Player : MonoBehaviour{
    [HideInInspector] public PlayerControls controls;
-    [HideInInspector] public PlayerMovement movement;
    [HideInInspector] public new PlayerCamera camera;

    void Awake(){
        controls = GetComponent<PlayerControls>();
-        movement = GetComponent<PlayerMovement>();
    }

    void Start()
--- a/Assets/Scripts/Player/PlayerMovement.cs
+++ b/Assets/Scripts/Player/PlayerMovement.cs
@@ -1,56 +0,0 @@
-using UnityEngine;
-using Drawing;
-
-public class PlayerMovement : MonoBehaviour
-{
-    // Raycasts
-    public RaycastHit forwardRay;
-    public RaycastHit leftRay;
-    public RaycastHit rightRay;
-    
-    // References
-    private Player thisPlayer;
-    
-    void Awake(){
-        thisPlayer = GetComponent<Player>();
-    }
-
-    // void Update(){
-    //     // Create Ray Colors
-    //     Color forwardRayStatus = Color.red;
-    //     Color leftRayStatus = Color.red;
-    //     Color rightRayStatus = Color.red;
-    //     
-    //     if (forwardRay.collider&& forwardRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ forwardRayStatus = Color.green;}
-    //     if (leftRay.collider&& leftRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ leftRayStatus = Color.green;}
-    //     if (rightRay.collider&& rightRay.transform.gameObject.layer == LayerMask.NameToLayer("Environment")){ rightRayStatus = Color.green;}
-    //     
-    //     using (Draw.WithColor(forwardRayStatus)) {
-    //         Draw.Line(transform.position + transform.up, transform.position + transform.forward * 2.5f + transform.up);
-    //     }
-    //
-    //     using (Draw.WithColor(leftRayStatus)) {
-    //         Draw.Line(transform.position + transform.up, transform.position + -transform.right * 2f + transform.up);
-    //     }
-    //     
-    //     using (Draw.WithColor(rightRayStatus)) {
-    //         Draw.Line(transform.position + transform.up, transform.position + transform.right * 2f + transform.up);
-    //     }
-    // }
-
-    // void FixedUpdate(){
-    //     LayerMask environmentLayer = LayerMask.NameToLayer("Environment");
-    //     
-    //     if (Physics.Raycast(transform.position + Vector3.up, transform.forward, out forwardRay, 2.5f, ~environmentLayer)){
-    //         thisPlayer.controls.graph.SendEvent("ForwardRay", true, null);
-    //     }
-    //
-    //     if (Physics.Raycast(transform.position + Vector3.up, transform.position + Vector3.left, out leftRay, maxDistance: 2f, ~environmentLayer )) {
-    //         thisPlayer.controls.graph.SendEvent("LeftRay", true, null);
-    //     }
-    //     
-    //     if (Physics.Raycast(transform.position + Vector3.up, transform.position + Vector3.right, out rightRay, maxDistance: 2f, ~environmentLayer )) {
-    //         thisPlayer.controls.graph.SendEvent("RightRay", true, null);
-    //     }
-    // }
-}
--- a/Assets/Scripts/Player/UnitMovementHandler.cs
+++ b/Assets/Scripts/Player/UnitMovementHandler.cs
@@ -0,0 +1,320 @@
+using System;
+using UnityEngine;
+using ParadoxNotion.Design;
+using Sirenix.OdinInspector;
+using UnityEngine.Serialization;
+
+public enum PlayerFacingDirection{
+    TowardsTarget = 0,
+    MatchForward,
+    MatchCamera,
+    Static,
+    Momentum,
+    SpecifiedDirection
+}
+
+namespace Reset.Units{
+    // public interface IBuffSource{ - Unused good idea?
+    //     public Object sourceObject();
+    //     public 
+    // }
+
+    [Serializable]
+    public class UnitMovementData : ICloneable{
+        // Movement Direction
+        public float accelerationSmoothing = 5f;
+        public float deaccelerationSmoothing = 5f;
+        // public AnimationCurve deaccelerationCurve; // Currently unused, may return
+
+        [SliderField(0,1)]
+        public float airDirectionDecay;
+        
+        // Move Speed
+        public float moveSpeed = 15f;
+        public float moveSpeedSoothing = 10f;
+        
+        // Jumping
+        [ShowInInspector, ReadOnly] public float jumpPower;
+        public float jumpPowerDecay = 3f;
+    
+        // Gravity
+        [ShowInInspector, ReadOnly] public float gravityPower;
+        public float gravityMax = 8f;
+        public float gravityAcceleration = 1f;
+        public float gravityScale = 1f;
+        
+        // Rotation
+        [ShowInInspector, SerializeReference]
+        public Enum rotateFacing;
+        [FormerlySerializedAs("rotationSpeedTarget")] public float rotationSpeed = 5f;
+        public float rotationSmoothing = 1f;
+        public float rotationInputBlending = .3f;
+
+        public object Clone(){
+            return MemberwiseClone();
+        }
+    }
+    
+    public class UnitMovementHandler : MonoBehaviour{
+        // class MovementFloatModifier{
+        //     // IBuffSource source 
+        //     public float value;
+        // }
+        
+        // Debug viewing
+        [ShowInInspector, ReadOnly] private float outputSpeed;
+        [ShowInInspector, ReadOnly] private float additionalSpeed;
+        [ShowInInspector, ReadOnly] public Vector3 outputMoveDirection;
+        [ShowInInspector, ReadOnly] private Vector3 additionalMoveDirection;
+        [ShowInInspector, ReadOnly] private Quaternion outputRotation;
+        [ShowInInspector, ReadOnly] private Quaternion specifiedRotation;
+        [ShowInInspector, ReadOnly] private float outputRotationSpeed;
+
+        private float directionChangeDot;
+        
+        private CharacterController controller;
+        private PlayerControls controls;
+        private LockOnManager lockOnManager;
+
+        [ShowInInspector, PropertyOrder(2)]
+        public UnitMovementData data = new();
+
+        [HideInInspector]
+        public UnitMovementData defaultData;
+        
+        void Awake(){
+            controller = GetComponent<CharacterController>();
+            controls = GetComponent<PlayerControls>();
+            lockOnManager = GetComponent<LockOnManager>();
+        }
+
+        private void Start(){
+            defaultData = (UnitMovementData)data.Clone();
+        }
+
+        void Update(){
+            UpdateCurrentDirection();
+            UpdateCurrentSpeed();
+            UpdateCurrentGravity();
+            UpdateCurrentRotation();
+            
+            DoMovement();
+        }
+
+        // Add directly to the direction
+        public void AddToCurrentDirection(Vector3 inputDirection, float power){
+            additionalMoveDirection += inputDirection.normalized;
+            additionalSpeed = power;
+        }
+
+        // Hold a new rotation to be moved to during PlayerFacingDirection.SpecifiedRotation
+        public void SetSpecifiedRotation(Quaternion inputRotation){
+            specifiedRotation = inputRotation;
+        }
+
+        // Blend between the current direction and an input direction, based on the current controller input
+        public void OverwriteDirectionFromInput(Vector2 value, float priority, float speed = Mathf.Infinity){
+            // Create a new direction that is the current controller input * the amount of power they should have
+            Vector3 dirToAdd = new Vector3(controls.rawMoveInput.x * value.x, 0f, controls.rawMoveInput.y * value.y);
+            
+            // Multiply it by the current magnitude (why? i forgor)
+            dirToAdd *= controls.rawMoveInput.magnitude;
+            
+            // Blend the existing direction into it
+            dirToAdd = Vector3.Lerp(outputMoveDirection, dirToAdd, priority * controls.rawMoveInput.magnitude);
+            
+            // Set the new direction
+            outputMoveDirection = new Vector3(dirToAdd.x, outputMoveDirection.y, dirToAdd.z);
+
+            // Everthing under here is for the speed now. If it's not set do...nothing. Otherwise set it to the max value between move speed and the new speed
+            if (float.IsPositiveInfinity(speed)) {
+                return;
+            }
+
+            outputSpeed = Mathf.Lerp(outputSpeed, Mathf.Max(data.moveSpeed, speed), priority);
+        }
+        
+        // Update the direction, called every frame
+        private void UpdateCurrentDirection(){
+            // Get input value
+            Vector3 inputMovement = new Vector3(controls.rawMoveInput.x, 0f, controls.rawMoveInput.y);
+            
+            // Construct move direction
+            Vector3 targetDirection = inputMovement;
+            
+            // Deadzone
+            if (inputMovement.magnitude < .05f) {
+                targetDirection = Vector3.zero;
+            }
+
+            // Remove Y from variables
+            Vector3 targetNoY = new Vector3(targetDirection.x, 0f, targetDirection.z);
+            Vector3 currentNoY = new Vector3(outputMoveDirection.x, 0f, outputMoveDirection.z);
+			
+            // Also need to find the dot value of the current input versus the current move direction
+            Vector3 slerpedValue;
+            Vector3 lerpedValue;
+            
+            float switchedDirection = Vector3.Dot(inputMovement, outputMoveDirection);
+            float switchedDirectionRemapped = Mathf.Lerp(0, 1, switchedDirection);
+
+            directionChangeDot = Mathf.Lerp(switchedDirection, switchedDirectionRemapped, 5f * Time.deltaTime) ; // turn that .5f into a variable
+            
+            // Smooth movement. Use deaccel smoothing if the input magnitude is lower, and accel smoothing if it's higher
+            // Also checks when grounded to only use Slerp on the ground            
+            
+            if (targetNoY.magnitude > currentNoY.magnitude) {
+                if (controller.isGrounded){
+                    slerpedValue = Vector3.Slerp(currentNoY, targetNoY, data.accelerationSmoothing * Time.deltaTime);
+                    lerpedValue = Vector3.Lerp(currentNoY, targetNoY, data.accelerationSmoothing * Time.deltaTime);
+
+                    currentNoY = Vector3.Lerp(lerpedValue, slerpedValue, directionChangeDot);
+                } else {
+                    currentNoY = Vector3.Lerp(currentNoY, targetNoY, data.accelerationSmoothing * Time.deltaTime);
+                }
+            } else {
+                if (controller.isGrounded){
+                    slerpedValue = Vector3.Slerp(currentNoY, targetNoY, data.deaccelerationSmoothing * Time.deltaTime);
+                    lerpedValue = Vector3.Lerp(currentNoY, targetNoY, data.deaccelerationSmoothing * Time.deltaTime);
+                    
+                    currentNoY = Vector3.Lerp(lerpedValue, slerpedValue, directionChangeDot);
+                } else {
+                    currentNoY = Vector3.Lerp(currentNoY, targetNoY, data.deaccelerationSmoothing * data.airDirectionDecay * Time.deltaTime);
+                }
+            }
+            
+            // Commit move direction
+            outputMoveDirection = new Vector3(currentNoY.x, outputMoveDirection.y, currentNoY.z);
+        }
+
+        // Update the speed, called every frame
+        private void UpdateCurrentSpeed(){
+            outputSpeed = Mathf.Lerp(outputSpeed, data.moveSpeed, data.moveSpeedSoothing * Time.deltaTime);
+        }
+
+        // Update the gravity, called every frame
+        private void UpdateCurrentGravity(){
+            // Accelerate gravity
+            data.gravityPower += data.gravityAcceleration * Time.deltaTime;
+            data.gravityPower = Mathf.Min(data.gravityPower, data.gravityMax);
+            
+            // Apply a constant gravity if the player is grounded
+            if (controller.isGrounded) {
+                data.gravityPower = .1f;
+            }
+            
+            // Create the final gravity value
+            float gravityMoveDirection = data.jumpPower + (Physics.gravity.y * data.gravityPower);
+            
+            // Commit gravity to move direction, ignoring XZ since those are done in UpdateMovementDirection
+            outputMoveDirection.y = gravityMoveDirection;
+        }
+
+        // Update the rotation, called every frame
+        private void UpdateCurrentRotation(){
+            // Get input value
+            Vector3 inputMovement = new Vector3(controls.rawMoveInput.x, 0f, controls.rawMoveInput.y);
+			
+            // Switch the desired rotation based on current movement setting
+            switch (data.rotateFacing) {
+                // Just look at target
+                case PlayerFacingDirection.TowardsTarget:
+                    // Look directly at the target
+                    outputRotation = Quaternion.LookRotation(transform.position.DirectionTo(lockOnManager.mainTarget.gameObject.transform.position));
+                    break;
+                case PlayerFacingDirection.Momentum:
+                    // Look towards the current direction the agent is moving 
+                    if (inputMovement.magnitude > .05f){
+                        outputRotation = Camera.main.transform.rotation * Quaternion.LookRotation(outputMoveDirection);
+                    }
+                    break;
+                case PlayerFacingDirection.MatchForward:
+                    // Look towards the input direction....why??? I guess cause move direction is PlayerFacingDirection.Momentum.
+                    if (controls.rawMoveInput.magnitude < 0.05f) { break; }
+                    
+                    outputRotation = Camera.main.transform.rotation * Quaternion.LookRotation(inputMovement);
+                    break;
+                case PlayerFacingDirection.MatchCamera:
+                    // Look the same direction as the camera
+                    outputRotation = Quaternion.Euler(Camera.main.transform.rotation.eulerAngles.Flatten(0, null, 0));
+                    break;
+                case PlayerFacingDirection.Static:
+                    // Don't change
+                    outputRotation  = transform.rotation;
+                    break;
+                case PlayerFacingDirection.SpecifiedDirection:
+                    // Look at an inputed rotation
+                    outputRotation = specifiedRotation;
+                    break;
+            }
+            
+            // Add the current input into the created rotation
+            if (inputMovement.magnitude > .05){
+                outputRotation = Quaternion.Lerp(outputRotation, Camera.main.transform.rotation * Quaternion.LookRotation(inputMovement), data.rotationInputBlending);
+            }
+           
+            // Calculate rotation speed, as in how fast the fella rotates. This value has it's own smoothing to allow for gradual increasing/decreasing of the speed till it reaches the target
+            outputRotationSpeed = Mathf.Lerp(outputRotationSpeed, data.rotationSpeed, data.rotationSmoothing * Time.deltaTime);
+			
+            // Set final rotation
+            transform.rotation = Quaternion.Slerp(transform.rotation, outputRotation, outputRotationSpeed * Time.deltaTime).Flatten(0, null, 0);
+        }
+
+        // Move with default settings
+        public void DoMovement(){
+            DoMovement(outputMoveDirection, outputSpeed, data.gravityScale);
+        }
+        
+        // Custom move from input
+        public void DoMovement(Vector3 moveDir, float speed, float gravity){
+            // Seperate the different move directions. Additonal becomes it's own because it needs to be added independently of the other two
+            Vector3 moveXZDir = new Vector3(moveDir.x, 0f, moveDir.z);
+            Vector3 moveYDir = new Vector3(0f, moveDir.y, 0f);
+            Vector3 addDir = additionalMoveDirection;
+
+            // Add their related speeds
+            moveXZDir *= speed * Time.deltaTime;
+            moveYDir *= gravity * Time.deltaTime;
+            addDir *= additionalSpeed * Time.deltaTime;
+
+            // Construct the direction and move
+            Vector3 finalDir = moveXZDir + moveYDir;
+            
+            controller.Move((Camera.main.transform.rotation.Flatten(0, null, 0) * finalDir) + addDir);
+        }
+
+        void LateUpdate(){
+            UpdateGravityLate();
+            DecayAdditionalDirection();
+        }
+
+        void DecayAdditionalDirection(){
+            // Get input value
+            Vector3 inputMovement = new Vector3(controls.rawMoveInput.x, 0f, controls.rawMoveInput.y);
+            
+            // Ignore values under deadzone
+            if (inputMovement.magnitude < .1f) {
+                inputMovement = Vector3.zero;
+            }
+            
+            // Remove Y from variables
+            Vector3 currentNoY = new Vector3(additionalMoveDirection.x, 0f, additionalMoveDirection.z);
+            
+            // Decay the direction
+            if (inputMovement.magnitude < currentNoY.magnitude) {
+                additionalMoveDirection = Vector3.Slerp(additionalMoveDirection, Vector3.zero,data.accelerationSmoothing * Time.deltaTime);	
+
+            } else {
+                // float deaccelValue = data.deaccelerationCurve.Evaluate(inputMovement.magnitude);
+                additionalMoveDirection = Vector3.Lerp(additionalMoveDirection, Vector3.zero, data.deaccelerationSmoothing * Time.deltaTime);	
+            }
+        }
+        
+        private void UpdateGravityLate(){
+            // Decay jump power
+            data.jumpPower -= data.jumpPowerDecay * Time.deltaTime;
+            data.jumpPower = Mathf.Max(0f, data.jumpPower);
+        }
+    }
+}
+
--- a/Assets/Scripts/Player/UnitMovementHandler.cs.meta
+++ b/Assets/Scripts/Player/UnitMovementHandler.cs.meta
--- a/Assets/Settings/DefaultVolumeProfile.asset
+++ b/Assets/Settings/DefaultVolumeProfile.asset
@@ -342,6 +342,9 @@ MonoBehaviour:
  skyOcclusionIntensityMultiplier:
    m_OverrideState: 1
    m_Value: 1
+  worldOffset:
+    m_OverrideState: 1
+    m_Value: {x: 0, y: 0, z: 0}
 --- !u!114 &-1216621516061285780
 MonoBehaviour:
  m_ObjectHideFlags: 3
@@ -462,8 +465,6 @@ MonoBehaviour:
  - {fileID: -6288072647309666549}
  - {fileID: 7518938298396184218}
  - {fileID: -1410297666881709256}
-  - {fileID: -7750755424749557576}
-  - {fileID: -5139089513906902183}
 --- !u!114 &853819529557874667
 MonoBehaviour:
  m_ObjectHideFlags: 3
--- a/Assets/Settings/Mobile_RPAsset.asset
+++ b/Assets/Settings/Mobile_RPAsset.asset
@@ -43,7 +43,7 @@ MonoBehaviour:
  m_ProbeVolumeSHBands: 1
  m_MainLightRenderingMode: 1
  m_MainLightShadowsSupported: 1
-  m_MainLightShadowmapResolution: 1024
+  m_MainLightShadowmapResolution: 512
  m_AdditionalLightsRenderingMode: 1
  m_AdditionalLightsPerObjectLimit: 4
  m_AdditionalLightShadowsSupported: 0
@@ -78,11 +78,11 @@ MonoBehaviour:
  m_UseAdaptivePerformance: 1
  m_ColorGradingMode: 0
  m_ColorGradingLutSize: 32
+  m_AllowPostProcessAlphaOutput: 0
  m_UseFastSRGBLinearConversion: 1
  m_SupportDataDrivenLensFlare: 1
  m_SupportScreenSpaceLensFlare: 1
  m_GPUResidentDrawerMode: 0
-  m_UseLegacyLightmaps: 0
  m_SmallMeshScreenPercentage: 0
  m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
  m_ShadowType: 1
@@ -109,6 +109,7 @@ MonoBehaviour:
  m_PrefilterDebugKeywords: 1
  m_PrefilterWriteRenderingLayers: 1
  m_PrefilterHDROutput: 1
+  m_PrefilterAlphaOutput: 0
  m_PrefilterSSAODepthNormals: 1
  m_PrefilterSSAOSourceDepthLow: 1
  m_PrefilterSSAOSourceDepthMedium: 0
--- a/Assets/Settings/PC_RPAsset.asset
+++ b/Assets/Settings/PC_RPAsset.asset
@@ -53,7 +53,7 @@ MonoBehaviour:
  m_AdditionalLightsShadowResolutionTierHigh: 1024
  m_ReflectionProbeBlending: 1
  m_ReflectionProbeBoxProjection: 1
-  m_ShadowDistance: 50
+  m_ShadowDistance: 154.28
  m_ShadowCascadeCount: 4
  m_Cascade2Split: 0.25
  m_Cascade3Split: {x: 0.1, y: 0.3}
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -9,7 +9,7 @@
    "com.unity.multiplayer.center": "1.0.0",
    "com.unity.multiplayer.tools": "2.2.1",
    "com.unity.netcode.gameobjects": "2.1.1",
-    "com.unity.probuilder": "6.0.4",
+    "com.unity.probuilder": "6.0.6",
    "com.unity.render-pipelines.universal": "17.0.3",
    "com.unity.services.multiplayer": "1.0.2",
    "com.unity.test-framework": "1.4.5",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -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"
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -19,12 +19,12 @@
            {
                "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",
@@ -54,7 +54,7 @@
            {
                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
                "key": "ShapeComponent.SettingsEnabled",
-                "value": "{\"m_Value\":false}"
+                "value": "{\"m_Value\":true}"
            },
            {
                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
@@ -91,6 +91,31 @@
                "key": "CollapseVertices.collapseToFirst",
                "value": "{\"m_Value\":false}"
            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "SubdivideEdges.rangeExpanded",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "SelectEdgeLoop.selectIterative",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "FillHole.selectEntirePath",
+                "value": "{\"m_Value\":true}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "SelectEdgeRing.selectIterative",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "editor.extrudeEdgesAsGroup",
+                "value": "{\"m_Value\":true}"
+            },
            {
                "type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "mesh.shadowCastingMode",
@@ -121,15 +146,80 @@
                "key": "ShapeBuilder.ActiveShapeIndex",
                "value": "{\"m_Value\":6}"
            },
+            {
+                "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "SubdivideEdges.subdivisions",
+                "value": "{\"m_Value\":1}"
+            },
+            {
+                "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "SubdivideEdges.subdivisionsUIMin",
+                "value": "{\"m_Value\":1}"
+            },
+            {
+                "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "SubdivideEdges.subdivisionsUIMax",
+                "value": "{\"m_Value\":32}"
+            },
            {
                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "ShapeBuilder.LastSize.Cube",
-                "value": "{\"m_Value\":{\"x\":53.82322311401367,\"y\":3.7740979194641115,\"z\":159.09600830078126}}"
+                "value": "{\"m_Value\":{\"x\":13.580684661865235,\"y\":6.24212646484375,\"z\":10.487823486328125}}"
            },
            {
                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "ShapeBuilder.LastSize.Stairs",
-                "value": "{\"m_Value\":{\"x\":-7.032182693481445,\"y\":2.840894937515259,\"z\":-7.309409141540527}}"
+                "value": "{\"m_Value\":{\"x\":6.0,\"y\":6.000001907348633,\"z\":-2.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Door",
+                "value": "{\"m_Value\":{\"x\":260.0,\"y\":60.0,\"z\":-60.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Plane",
+                "value": "{\"m_Value\":{\"x\":-6.224588871002197,\"y\":0.0,\"z\":5.46331787109375}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Cylinder",
+                "value": "{\"m_Value\":{\"x\":1460.0,\"y\":660.0,\"z\":-1460.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Arch",
+                "value": "{\"m_Value\":{\"x\":100.0,\"y\":100.0,\"z\":640.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Sphere",
+                "value": "{\"m_Value\":{\"x\":820.0,\"y\":10.0,\"z\":-840.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Cone",
+                "value": "{\"m_Value\":{\"x\":9.0,\"y\":4.0,\"z\":-11.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Pipe",
+                "value": "{\"m_Value\":{\"x\":1.0,\"y\":1.0,\"z\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Torus",
+                "value": "{\"m_Value\":{\"x\":1.0,\"y\":1.0,\"z\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Prism",
+                "value": "{\"m_Value\":{\"x\":27.552936553955079,\"y\":17.8223876953125,\"z\":31.70098876953125}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Sprite",
+                "value": "{\"m_Value\":{\"x\":1.0,\"y\":1.0,\"z\":1.0}}"
            },
            {
                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
@@ -141,16 +231,111 @@
                "key": "ShapeBuilder.LastRotation.Stairs",
                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Door",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Plane",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Cylinder",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Arch",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":-0.7071067690849304,\"z\":0.0,\"w\":0.7071067690849304}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Sphere",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Cone",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Pipe",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Torus",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Prism",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Sprite",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
            {
                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "ShapeBuilder.PivotLocation.Cube",
-                "value": "{\"m_Value\":0}"
+                "value": "{\"m_Value\":1}"
            },
            {
                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "ShapeBuilder.PivotLocation.Stairs",
                "value": "{\"m_Value\":0}"
            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Door",
+                "value": "{\"m_Value\":0}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Plane",
+                "value": "{\"m_Value\":0}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Cylinder",
+                "value": "{\"m_Value\":0}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Arch",
+                "value": "{\"m_Value\":0}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Sphere",
+                "value": "{\"m_Value\":0}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Cone",
+                "value": "{\"m_Value\":0}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Pipe",
+                "value": "{\"m_Value\":0}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Torus",
+                "value": "{\"m_Value\":0}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Prism",
+                "value": "{\"m_Value\":0}"
+            },
            {
                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "ShapeBuilder.Cube",
@@ -161,6 +346,41 @@
                "key": "ShapeBuilder.Stairs",
                "value": "{}"
            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Door",
+                "value": "{}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Cylinder",
+                "value": "{}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Arch",
+                "value": "{}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Sphere",
+                "value": "{}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Cone",
+                "value": "{}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Plane",
+                "value": "{}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Prism",
+                "value": "{}"
+            },
            {
                "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "s_SelectMode",
@@ -180,6 +400,16 @@
                "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
                "key": "uv.uvEditorGridSnapIncrement",
                "value": "{\"m_Value\":0.125}"
+            },
+            {
+                "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "ExtrudeFaces.distance",
+                "value": "{\"m_Value\":0.5}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "editor.extrudeMethod",
+                "value": "{\"m_Value\":2}"
            }
        ]
    }
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -16,12 +16,12 @@ PlayerSettings:
  productName: Project Reset
  defaultCursor: {fileID: 0}
  cursorHotspot: {x: 0, y: 0}
-  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
+  m_SplashScreenBackgroundColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
  m_ShowUnitySplashScreen: 1
  m_ShowUnitySplashLogo: 1
  m_SplashScreenOverlayOpacity: 1
  m_SplashScreenAnimation: 1
-  m_SplashScreenLogoStyle: 1
+  m_SplashScreenLogoStyle: 0
  m_SplashScreenDrawMode: 0
  m_SplashScreenBackgroundAnimationZoom: 1
  m_SplashScreenLogoAnimationZoom: 1
@@ -140,7 +140,7 @@ PlayerSettings:
  loadStoreDebugModeEnabled: 0
  visionOSBundleVersion: 1.0
  tvOSBundleVersion: 1.0
-  bundleVersion: 0.1.0
+  bundleVersion: 0.2.0
  preloadedAssets:
  - {fileID: 11400000, guid: 8e19eb4aa4fac2a409e792d0d3e5f944, type: 2}
  metroInputSource: 0
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -47,8 +47,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858,
-      type: 2}
+    customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858, type: 2}
    terrainQualityOverrides: 0
    terrainPixelError: 1
    terrainDetailDensityScale: 1
@@ -101,8 +100,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd,
-      type: 2}
+    customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2}
    terrainQualityOverrides: 0
    terrainPixelError: 1
    terrainDetailDensityScale: 1
Author	SHA1	Message	Date
Chris	529528a7d1	added: some platform layout started	2025-08-25 15:53:28 -04:00
Chris	0ccee64644	change: some snapping testing	2025-08-25 15:53:28 -04:00
Chris	1b4f8bced4	maint: updated probuilder 6.0.4 to 6.0.6	2025-08-25 15:53:27 -04:00
Chris	57d81c9736	added: materials for test world	2025-08-25 15:53:27 -04:00
Chris	e9c4407a68	changed: graphics settings for shadows	2025-08-25 15:53:22 -04:00
Chris	1e136847b9	changed: added two more ideas for world layouts	2025-08-25 15:53:17 -04:00
Chris	cc1f172217	added: world demo scene	2025-08-25 15:53:17 -04:00
Chris	a2008d6a1c	maint: final tweaks and cleanups	2025-08-25 15:53:13 -04:00
Chris	77ae53d31f	maint: whitespace nothingburger	2025-08-25 15:53:11 -04:00
Chris	a60179205c	maint: deleted old and now unused movement tasks/graphs	2025-08-25 15:53:11 -04:00
Chris	6ba17a4373	changed: movement now also handles opposing inputs. value tweaks.	2025-08-25 15:53:06 -04:00
Chris	0b3bf59c5c	maint: cleaned up some files and tweaked some movement	2025-08-25 15:53:04 -04:00
Chris	2ae586727f	changed: graph to use new system	2025-08-25 15:53:00 -04:00
Chris	e82dbfa61f	added: movement settings changing within graph	2025-08-25 15:52:59 -04:00
Chris	6a8e335557	change: moved cameravaluegroups to valuegroup and made for generic usage	2025-08-25 15:52:59 -04:00
Chris	4097ed949a	fix: various changes to handler such as gravity speed decoupling, data cloning, rotation smoothing,	2025-08-25 15:52:59 -04:00
Chris	d374abd7e7	fixed: all moving conditions working. removed 'moveFacing' primarily	2025-08-25 15:52:59 -04:00
Chris	13f6cb5fdb	fix: rotation in relation to camera no longer broken	2025-08-25 15:52:58 -04:00
Chris	6a0fb1a53c	changed: UnitMovementHandler.cs is now functional (buggy)	2025-08-25 15:52:58 -04:00
Chris	179d4e326b	change: started unified movement handler	2025-08-25 15:52:58 -04:00
Chris	1ccf724281	change: separated all functions of movement into separate tasks	2025-08-25 15:52:58 -04:00
Chris	8f1edd94ed	added: initial seperation of movement from gravity and rotation	2025-08-25 15:52:58 -04:00
Chris	ed84c33ba1	maint: project settings changes for numbered versions	2025-08-25 15:52:24 -04:00
Chris	4ed149be69	maint: small scene and project settings changes	2025-08-25 15:52:22 -04:00
Chris	ce4acc18a7	changed: added glow material to material palette	2025-08-25 15:32:06 -04:00
Chris	f7fa2f09ed	change: shadow limit increased	2025-08-25 15:31:51 -04:00
Chris	346417afc9	change: lighting updated	2025-08-25 15:29:56 -04:00
Chris	1cbb32ad6b	added: new material and prefab	2025-08-25 15:29:14 -04:00
Chris	dc10b3fb0b	added: neighborhood visual test scene	2025-08-25 00:59:05 -04:00
Chris	7095525b39	maint: probuilder colors/materials	2025-08-25 00:23:25 -04:00
Chris	39566ff5e4	change: small buildings redone	2025-08-25 00:22:06 -04:00