change: updated world demo with new volume profile & a few buildings for testing

Assets/DefaultNetworkPrefabs.asset

@@ -29,3 +29,8 @@ MonoBehaviour:
     SourcePrefabToOverride: {fileID: 0}
     SourceHashToOverride: 0
     OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}

Assets/Map/Materials/BuildingsColor.asset

@@ -20,12 +20,12 @@ MonoBehaviour:
   - {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: 0.9339623, g: 0.8922398, b: 0.629984, 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.8584906, g: 0.5061855, b: 0.5809581, a: 1}
+  - {r: 0.7924528, g: 0.73581594, b: 0.66162336, a: 1}
+  - {r: 0.5660378, g: 0.5625123, b: 0.509968, a: 1}
+  - {r: 0.4093453, g: 0.3700605, b: 0.41509432, a: 1}
+  - {r: 0.21242543, g: 0.21039516, b: 0.2264151, a: 1}
   - {r: 0.667, g: 0.667, b: 0.667, a: 1}
   - {r: 0.867, g: 0.867, b: 0.867, a: 1}

Assets/Map/Materials/Default Material Palette.asset

@@ -16,7 +16,7 @@ MonoBehaviour:
   - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
   - {fileID: 2100000, guid: 0b54b63be52c4f94ba30ff0d1ddb6cc8, type: 2}
   - {fileID: 2100000, guid: 9e9846162c23b624d8334dbfd2726184, type: 2}
-  - {fileID: 0}
+  - {fileID: 2100000, guid: 4005e5f0044ff9e4e943eda4aeb744d8, type: 2}
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}

Assets/Map/Materials/WindowWarmLightMat.mat

@@ -0,0 +1,138 @@
+%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: WindowWarmLightMat
+  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
+    - _XRMotionVectorsPass: 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.49416867, g: 0.44177076, b: 0.36130255, 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: 10

Assets/Map/Materials/WindowWarmLightMat.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4005e5f0044ff9e4e943eda4aeb744d8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Map/Structures/Pieces.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b75c4363b486204fb15653c8ec169f6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Map/Structures/Pieces/PipeSmall1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3e85a558ff3c33e40b9a020059605b03
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Map/Structures/Pieces/PipeSmall2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0f6687cf01fb57c44b9fc152970c510e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Map/Structures/Pieces/WindowMedium1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 73d4266f5cb27b943b3993e3c4173425
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Map/Structures/Pieces/WindowPanes1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 44e7f68dfe097664d8d2536fe7e9c96a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Map/Structures/Pieces/WindowSmall1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 287cf11ee8667a348a683fd01e8ea4fe
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Player/Graphs/PlayerBaseFSM.asset

@@ -100,18 +100,18 @@ MonoBehaviour:
     Jump","_position":{"x":697.7955,"y":220.1157},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"21"},{"_actionList":{"actions":[{"valueA":{"_name":"newAirMoveSmoothing"},"valueB":{"_value":1.0},"_isDisabled":true,"$type":"NodeCanvas.Tasks.Actions.SetFloat"},{"eventName":{"_value":"Air
     Reset Received"},"delay":{},"$type":"NodeCanvas.Tasks.Actions.SendEvent"}]},"_color":{"r":0.3647059,"g":0.3215686,"b":1.0,"a":1.0},"_name":"Airborne
     Standard Movement","_position":{"x":227.1761,"y":27.24033},"$type":"NodeCanvas.StateMachines.ActionState","$id":"22"},{"_name":"INTERACT
-    OPTIONS","_position":{"x":967.8022,"y":970.8088},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"23"},{"_actionList":{"executionMode":1,"actions":[{"raycastHit":{"_name":"_hit"},"transform":{},"collider":{},"gameObject":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"distance":{},"normal":{},"point":{},"$type":"NodeCanvas.Tasks.Actions.DecomposeRaycastHit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":2055.0,"y":790.0},"$type":"NodeCanvas.StateMachines.ActionState","$id":"24"},{"_name":"Check
-    if interactable","_position":{"x":2335.022,"y":1165.423},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"25"},{"_actionList":{"executionMode":1,"actions":[{"log":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"$type":"NodeCanvas.Tasks.Actions.DebugLogText"},{"moveSpeed":{"label":"Move
+    OPTIONS","_position":{"x":967.8022,"y":970.8088},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"23"},{"_actionList":{"executionMode":1,"actions":[{"raycastHit":{"_name":"_hit"},"transform":{},"collider":{},"gameObject":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"distance":{},"normal":{},"point":{},"$type":"NodeCanvas.Tasks.Actions.DecomposeRaycastHit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1979.639,"y":835.3054},"$type":"NodeCanvas.StateMachines.ActionState","$id":"24"},{"_name":"Check
+    if interactable","_position":{"x":2261.751,"y":1168.912},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"25"},{"_actionList":{"executionMode":1,"actions":[{"log":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"$type":"NodeCanvas.Tasks.Actions.DebugLogText"},{"moveSpeed":{"label":"Move
     Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{"_value":1},"_easing":{"_value":5.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"facingDirection":{"label":"Facing
     Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation
-    Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"target":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick
+    Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick
     Up Start","$type":"Reset.Units.SendEventToUnit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Start
-    Ally Pickup","_position":{"x":2647.121,"y":1343.222},"$type":"NodeCanvas.StateMachines.ActionState","$id":"26"},{"_actionList":{"executionMode":1,"actions":[{"target":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick
+    Ally Pickup","_position":{"x":2476.157,"y":1375.323},"$type":"NodeCanvas.StateMachines.ActionState","$id":"26"},{"_actionList":{"executionMode":1,"actions":[{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick
     Up Failed","$type":"Reset.Units.SendEventToUnit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Pickup
-    Failed","_position":{"x":2320.785,"y":1479.228},"$type":"NodeCanvas.StateMachines.ActionState","$id":"27"},{"_position":{"x":2055.903,"y":1096.625},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"28"},{"_actionList":{"executionMode":1,"actions":[{"valueA":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[UnityEngine.GameObject,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1682.273,"y":1020.806},"$type":"NodeCanvas.StateMachines.ActionState","$id":"29"},{"_actionList":{"executionMode":1,"actions":[{"target":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick
+    Failed","_position":{"x":2149.82,"y":1512.374},"$type":"NodeCanvas.StateMachines.ActionState","$id":"27"},{"_position":{"x":1982.633,"y":1100.114},"$type":"NodeCanvas.StateMachines.EmptyState","$id":"28"},{"_actionList":{"executionMode":1,"actions":[{"valueA":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"$type":"NodeCanvas.Tasks.Actions.SetVariable`1[[UnityEngine.GameObject,
+    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_position":{"x":1682.273,"y":1020.806},"$type":"NodeCanvas.StateMachines.ActionState","$id":"29"},{"_actionList":{"executionMode":1,"actions":[{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"eventToSend":"Pick
     Up Success","$type":"Reset.Units.SendEventToUnit"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Pickup
-    Success","_position":{"x":2312.675,"y":1237.935},"$type":"NodeCanvas.StateMachines.ActionState","$id":"30"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move
+    Success","_position":{"x":2141.71,"y":1271.081},"$type":"NodeCanvas.StateMachines.ActionState","$id":"30"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move
     Speed","changeValue":{"_value":1},"value":{"_value":30.0},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":0.1},"_changeEasing":{"_value":1},"_easing":{"_value":0.1}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"fieldOfView":{"label":"FOV","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitTargetOffset":{"label":"Target
     Offset","value":{},"changeX":{},"changeY":{},"changeZ":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitPositionDamping":{"label":"Position
     Damping","value":{},"changeX":{},"changeY":{},"changeZ":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"orbitFollowTop":{"label":"Top
@@ -143,16 +143,16 @@ MonoBehaviour:
     Speed","changeValue":{"_value":1},"value":{"_value":6.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"moveSpeed":{"label":"Move
     Speed","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"acceleration":{"label":"Acceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{"_value":1},"value":{"_value":1.0},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"newDirection":{"_value":{"y":1.0}},"absolute":{},"relativity":{},"setRawAsWell":{},"relativeTo":{},"$type":"Reset.Units.SetNewDirection"},{"newSpeed":{"_value":22.0},"absolute":{},"relativity":{},"$type":"Reset.Units.SetNewSpeed"}]},"_onUpdateList":{"executionMode":1,"actions":[{"newGravity":{"_value":2.0},"absolute":{},"relativity":{"_value":0.86},"deltaTime":{"_value":true},"decayRate":{"_value":0.3},"$type":"Reset.Units.SetNewGravity"}]},"_onExitList":{"executionMode":1,"actions":[{"valueA":{"_name":"airJumpsRemaining","_targetVariableID":"23f0ddc0-c4e8-462f-a7e0-fdd8e818d08d"},"Operation":2,"valueB":{"_value":1},"$type":"NodeCanvas.Tasks.Actions.SetInt"}]},"foldEnter":true,"foldUpdate":true,"foldExit":true,"_color":{"r":0.4117647,"g":0.945098,"b":0.254902,"a":1.0},"_name":"Run
     Jump","_position":{"x":1043.577,"y":32.57642},"$type":"NodeCanvas.StateMachines.SuperActionState","$id":"33"},{"_nestedBT":{"_value":1},"executionMode":0,"_variablesMap":[{"_targetSubGraphVariableID":"9de2ef67-d7a9-49dc-936e-63ede27a131b","_canWrite":true,"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"}],"_position":{"x":6.297241,"y":862.5489},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"34"},{"_nestedBT":{"_value":2},"executionMode":0,"_position":{"x":171.2884,"y":699.1394},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"35"},{"_nestedBT":{"_value":3},"executionMode":0,"_position":{"x":265.6401,"y":1002.963},"$type":"NodeCanvas.StateMachines.NestedBTState","$id":"36"},{"_subTree":{"_value":4},"_variablesMap":[{"_targetSubGraphVariableID":"e1cfd0be-7f55-420d-bdd8-e72531fc61ba","_canWrite":true,"_type":"UnityEngine.Transform","_name":"mainCamera"},{"_targetSubGraphVariableID":"c4e68b75-5129-428c-8177-abb7b38986f5","_canWrite":true,"_type":"Reset.Units.PlayerFacingDirection","_value":{"$content":0,"$type":"Reset.Units.PlayerFacingDirection"}}],"_position":{"x":-513.2321,"y":190.793},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subTree":{"_value":5},"_tag":"","_position":{"x":88.88626,"y":312.6888},"_comment":"","$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_conditionList":{"conditions":[]},"_actionList":{"executionMode":1,"actions":[{"resolvedVector2":{"_name":"resolvedMoveVector2","_targetVariableID":"2aee664e-07ba-4e85-9d6a-a1393398789d"},"resolvedVector3":{"_name":"resolvedMoveVector3","_targetVariableID":"5d907161-2896-4b95-bfd2-0ea9426145d7"},"resolvedGravity":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"resolvedSpeed":{"_name":"resolvedSpeed","_targetVariableID":"a81cae83-1fb4-4a2c-bc68-ebf1781c2037"},"resolvedRotation":{"_name":"resolvedRotation","_targetVariableID":"f2ba350a-0fea-438e-9ad3-ed77db853d34"},"$type":"Reset.Units.GetResolvedMovementData"}]},"_position":{"x":43.41211,"y":188.3668},"$type":"NodeCanvas.StateMachines.OnFSMUpdate"},{"_onEnterList":{"executionMode":1,"actions":[]},"_onUpdateList":{"executionMode":1,"actions":[]},"_onExitList":{"executionMode":1,"actions":[]},"_color":{"r":0.4980392,"g":1.0,"b":0.9803922,"a":1.0},"_name":"Airborne
-    Standby","_position":{"x":1509.989,"y":-548.8954},"$type":"NodeCanvas.StateMachines.SuperActionState"},{"_subTree":{"_value":6},"_position":{"x":1126.753,"y":-309.6837},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subFSM":{"_value":7},"_position":{"x":-97.23633,"y":603.6638},"$type":"NodeCanvas.StateMachines.ConcurrentSubFSM"},{"_position":{"x":1228.18,"y":1604.454},"$type":"NodeCanvas.StateMachines.AnyState","$id":"43"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move
+    Standby","_position":{"x":1509.989,"y":-548.8954},"$type":"NodeCanvas.StateMachines.SuperActionState"},{"_subTree":{"_value":6},"_position":{"x":1126.753,"y":-309.6837},"$type":"NodeCanvas.StateMachines.ConcurrentSubTree"},{"_subFSM":{"_value":7},"_position":{"x":-97.23633,"y":603.6638},"$type":"NodeCanvas.StateMachines.ConcurrentSubFSM"},{"_position":{"x":1205.416,"y":1652.661},"$type":"NodeCanvas.StateMachines.AnyState","$id":"43"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move
     Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{"_value":1},"_easing":{"_value":5.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"facingDirection":{"label":"Facing
     Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation
-    Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"trigger":{"_value":"Downed"},"$type":"Reset.Core.SendAnimationTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Downed","_position":{"x":1127.07,"y":1850.24},"$type":"NodeCanvas.StateMachines.ActionState","$id":"44"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move
+    Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"trigger":{"_value":"Downed"},"$type":"Reset.Core.SendAnimationTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Downed","_position":{"x":1104.305,"y":1898.447},"$type":"NodeCanvas.StateMachines.ActionState","$id":"44"},{"_actionList":{"executionMode":1,"actions":[{"moveSpeed":{"label":"Move
     Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{"_value":1},"_smoothing":{"_value":10.0},"_changeEasing":{"_value":1},"_easing":{"_value":5.0}},"acceleration":{"label":"Acceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"deacceleration":{"label":"Deacceleration","changeValue":{},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeMoveSpeedSettings"},{"facingDirection":{"label":"Facing
     Direction","value":{"_value":{"$content":1,"$type":"Reset.Units.PlayerFacingDirection"}},"changeValue":{"_value":1}},"rotationSpeed":{"label":"Rotation
-    Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Die","_position":{"x":1341.81,"y":1339.448},"$type":"NodeCanvas.StateMachines.ActionState","$id":"45"},{"_actionList":{"executionMode":1,"actions":[{"position":{},"$type":"Reset.Units.MoveUnit"},{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"method":{"_baseInfo":"Reset.Units.Player|SetNewHealthRpc|System.Void","_paramsInfo":"System.Single"},"parameters":[{"_type":"System.Single","_value":{"$content":100.0,"$type":"System.Single"}}],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Respawn","_position":{"x":1013.765,"y":1441.579},"$type":"NodeCanvas.StateMachines.ActionState","$id":"46"},{"_actionList":{"executionMode":1,"actions":[{"$type":"NodeCanvas.Tasks.Actions.DrawReviveBar"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Getting
-    Picked Up","_position":{"x":945.5722,"y":1718.105},"$type":"NodeCanvas.StateMachines.ActionState","$id":"47"},{"_actionList":{"executionMode":1,"actions":[{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"},{"method":{"_baseInfo":"Reset.Units.Player|SetNewHealthRpc|System.Void","_paramsInfo":"System.Single"},"parameters":[{"_type":"System.Single","_value":{"$content":100.0,"$type":"System.Single"}}],"returnValue":{},"$type":"NodeCanvas.Tasks.Actions.ExecuteFunction_Multiplatform"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Picked
-    Up","_position":{"x":770.7885,"y":1574.854},"$type":"NodeCanvas.StateMachines.ActionState","$id":"48"},{"_position":{"x":639.1807,"y":1779.759},"$type":"NodeCanvas.StateMachines.AnyState","$id":"49"},{"_actionList":{"executionMode":1,"actions":[{"control":1,"$type":"NodeCanvas.Tasks.Actions.GraphOwnerControl"}]},"_color":{"r":0.2358491,"g":0.2358491,"b":0.2358491,"a":1.0},"_name":"Not
-    Owned","_position":{"x":603.1617,"y":1881.634},"$type":"NodeCanvas.StateMachines.ActionState","$id":"50"}],"connections":[{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"23"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"observerLabel":{"_value":"itemdrop"},"outputHitTo":{},"deactivateOnFinish":false,"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple
+    Speed","changeValue":{"_value":1},"value":{},"_changeSmoothing":{},"_smoothing":{},"_changeEasing":{},"_easing":{}},"$type":"Reset.Units.ChangeRotationSettings"},{"parameter":{"_value":"Downed"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Die","_position":{"x":1341.81,"y":1339.448},"$type":"NodeCanvas.StateMachines.ActionState","$id":"45"},{"_actionList":{"executionMode":1,"actions":[{"position":{},"$type":"Reset.Units.MoveUnit"},{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Respawn","_position":{"x":1013.765,"y":1441.579},"$type":"NodeCanvas.StateMachines.ActionState","$id":"46"},{"_actionList":{"executionMode":1,"actions":[{"$type":"NodeCanvas.Tasks.Actions.DrawReviveBar"}]},"_repeatStateActions":true,"_color":{"r":1.0,"g":0.42,"b":0.32,"a":1.0},"_name":"Getting
+    Picked Up","_position":{"x":922.8077,"y":1766.312},"$type":"NodeCanvas.StateMachines.ActionState","$id":"47"},{"_actionList":{"executionMode":1,"actions":[{"trigger":{"_value":"PickUp"},"$type":"Reset.Core.SendAnimationTrigger"},{"parameter":{"_value":"PickUp"},"parameterHashID":{},"overrideAgent":{"_type":"UnityEngine.Animator","_name":"modelAnimator","_targetVariableID":"7496ae67-b0a2-4894-a203-35e011767a3a"},"$type":"NodeCanvas.Tasks.Actions.MecanimSetTrigger"}]},"_color":{"r":1.0,"g":1.0,"b":1.0,"a":1.0},"_name":"Picked
+    Up","_position":{"x":675.3742,"y":1598.958},"$type":"NodeCanvas.StateMachines.ActionState","$id":"48"},{"_position":{"x":66.05099,"y":1392.763},"$type":"NodeCanvas.StateMachines.AnyState","$id":"49"},{"_actionList":{"executionMode":1,"actions":[{"control":1,"$type":"NodeCanvas.Tasks.Actions.GraphOwnerControl"}]},"_color":{"r":0.2358491,"g":0.2358491,"b":0.2358491,"a":1.0},"_name":"Not
+    Owned","_position":{"x":30.03195,"y":1494.638},"$type":"NodeCanvas.StateMachines.ActionState","$id":"50"}],"connections":[{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"23"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"observerLabel":{"_value":"itemdrop"},"outputHitTo":{},"deactivateOnFinish":false,"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple
     Launch"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3,
     UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple
     Pull"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3,
@@ -167,9 +167,9 @@ MonoBehaviour:
     Launch"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3,
     UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Grapple
     Pull"},"saveEventValue":{"_name":"_grappleLaunchDir"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent`1[[UnityEngine.Vector3,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"timeout":{"_value":0.2},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"9"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"13"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"14"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":2.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"17"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"18"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkAgainst":2,"checkAgainstValue":{"_name":"_wallJumpHitNormal"},"desiredValue":{"_value":1.0},"tolerance":{"_value":0.5},"considerCameraRotation":{"_value":true},"negate":{},"$type":"NodeCanvas.Tasks.Conditions.GetMovementInputDotProduct"},"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"valueA":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"checkType":2,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckFloat"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"21"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"22"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"player"},"outputHitTo":{"_name":"_hit"},"deactivateOnFinish":false,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"valueA":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[UnityEngine.GameObject,
-    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"valueA":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[Reset.Units.Player,
-    Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"target":{"_name":"testobject","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"$type":"Reset.Core.IsInteractable"},"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"26"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"27"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":5.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"30"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"27"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"28"},"_targetNode":{"$ref":"29"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"29"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"30"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.1},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"31"},"_targetNode":{"$ref":"32"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"33"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"33"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"34"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"35"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"36"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Downed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"44"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Killed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"44"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick
+    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"timeout":{"_value":0.2},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"9"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"13"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"14"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"timeout":{"_value":2.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{"_value":true},"_invert":true,"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":1.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"17"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"18"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkAgainst":2,"checkAgainstValue":{"_name":"_wallJumpHitNormal"},"desiredValue":{"_value":1.0},"tolerance":{"_value":0.5},"considerCameraRotation":{"_value":true},"negate":{},"$type":"NodeCanvas.Tasks.Conditions.GetMovementInputDotProduct"},"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"checkMode":1,"conditions":[{"actionName":{"_value":"Jump"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},{"valueA":{"_name":"resolvedGravity","_targetVariableID":"7c9d4632-c537-44c4-ae35-d92fa64d5303"},"checkType":2,"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckFloat"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"21"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"22"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"conditions":[{"observerLabel":{"_value":"player"},"outputHitTo":{"_name":"_hit"},"deactivateOnFinish":false,"$type":"NodeCanvas.Tasks.Conditions.CheckEnvironmentObserver"},{"valueA":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[UnityEngine.GameObject,
+    UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},{"valueA":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"valueB":{},"_invert":true,"_isDisabled":true,"$type":"NodeCanvas.Tasks.Conditions.CheckVariable`1[[Reset.Units.Player,
+    Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}],"$type":"NodeCanvas.Framework.ConditionList"},"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"24"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"23"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"24"},"_targetNode":{"$ref":"25"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"target":{"_name":"pickupTarget","_targetVariableID":"45e90651-1912-40ef-b4fc-6c27d00d0ef0"},"$type":"Reset.Core.IsInteractable"},"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"26"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"25"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Interact"},"actionPhase":{"_value":4},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"27"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":5.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"26"},"_targetNode":{"$ref":"30"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"27"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"28"},"_targetNode":{"$ref":"29"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"29"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"30"},"_targetNode":{"$ref":"28"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":0.1},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"31"},"_targetNode":{"$ref":"32"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Jump"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"33"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"actionName":{"_value":"Sprint"},"actionPhase":{"_value":3},"$type":"NodeCanvas.Tasks.Conditions.CheckInput"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"valueA":{"_name":"isGroundedOld","_targetVariableID":"619300a4-be8b-4ad4-ba2a-978468094ba2"},"valueB":{},"$type":"NodeCanvas.Tasks.Conditions.CheckBoolean"},"_sourceNode":{"$ref":"32"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"33"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"34"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"35"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"36"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Downed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"44"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Killed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"43"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"44"},"_targetNode":{"$ref":"45"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick
     Up Start"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"44"},"_targetNode":{"$ref":"47"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"timeout":{"_value":4.0},"$type":"NodeCanvas.Tasks.Conditions.Timeout"},"_sourceNode":{"$ref":"45"},"_targetNode":{"$ref":"46"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"46"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick
     Up Success"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"47"},"_targetNode":{"$ref":"48"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"eventName":{"_value":"Pick
     Up Failed"},"$type":"NodeCanvas.Tasks.Conditions.CheckEvent"},"_sourceNode":{"$ref":"47"},"_targetNode":{"$ref":"44"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_sourceNode":{"$ref":"48"},"_targetNode":{"$ref":"0"},"$type":"NodeCanvas.StateMachines.FSMConnection"},{"_condition":{"method":{"_baseInfo":"Reset.Units.Player|UnitIsLocal|System.Boolean","_paramsInfo":""},"parameters":[],"checkValue":{"_type":"System.Boolean","_value":{"$content":false,"$type":"System.Boolean"}},"$type":"NodeCanvas.Tasks.Conditions.CheckFunction_Multiplatform"},"_sourceNode":{"$ref":"49"},"_targetNode":{"$ref":"50"},"$type":"NodeCanvas.StateMachines.FSMConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{"isGroundedOld":{"_propertyPath":"UnityEngine.CharacterController.isGrounded","_name":"isGroundedOld","_id":"619300a4-be8b-4ad4-ba2a-978468094ba2","_debugBoundValue":true,"$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
@@ -188,7 +188,7 @@ MonoBehaviour:
     _version: 3.31
     _category: 
     _comments: 
-    _translation: {x: -371, y: -1005}
-    _zoomFactor: 0.99690014
+    _translation: {x: -587, y: -941}
+    _zoomFactor: 0.9994002
   _haltSerialization: 0
   _externalSerializationFile: {fileID: 0}

Assets/Player/Objects/Player.prefab

@@ -1,116 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &36903730637130313
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8724852473240757749}
-  - component: {fileID: 4139543147529259242}
-  - component: {fileID: 2742767765139736186}
-  - component: {fileID: 842367472781696068}
-  m_Layer: 0
-  m_Name: Sphere
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8724852473240757749
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 36903730637130313}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.64, z: 0.224}
-  m_LocalScale: {x: 0.96464, y: 0.96464, z: 0.96464}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2655796284435897345}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &4139543147529259242
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 36903730637130313}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &2742767765139736186
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 36903730637130313}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_ForceMeshLod: -1
-  m_MeshLodSelectionBias: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_GlobalIlluminationMeshLod: 0
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!135 &842367472781696068
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 36903730637130313}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &2757828562731694833
 GameObject:
   m_ObjectHideFlags: 0
@@ -158,8 +47,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2655796284435897345}
-  - {fileID: 4019564870895517434}
   - {fileID: 4382182686028875865}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -175,7 +62,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject
-  GlobalObjectIdHash: 1109077195
+  GlobalObjectIdHash: 3816484910
   InScenePlacedSourceGlobalObjectIdHash: 0
   DeferredDespawnTick: 0
   Ownership: 1
@@ -201,8 +88,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ShowTopMostFoldoutHeaderGroup: 1
-  state: 
-  testSTate:
+  graphStateAsString:
     m_InternalValue:
       utf8LengthInBytes: 0
       bytes:
@@ -271,10 +157,11 @@ MonoBehaviour:
         byte0059: 0
         byte0060: 0
         byte0061: 0
-  controls: {fileID: 0}
   _isDowned:
-    m_InternalValue: 1
+    m_InternalValue: 0
   pickupTarget: {fileID: 0}
+  persistDrawingRevive: 0
+  lastKnownReviveTime: 0
 --- !u!114 &8163344541298437235
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -622,7 +509,7 @@ MonoBehaviour:
     hitTextSize: 0
     hitLocationOffset: {x: 0, y: 0, z: 0}
     hitRotationOffset: {x: 0, y: 0, z: 0}
-    gizmoDrawingCondition: 0
+    gizmoDrawingCondition: 2
     children: []
   - label: player
     castType: 4
@@ -649,7 +536,7 @@ MonoBehaviour:
     hitTextSize: 0
     hitLocationOffset: {x: 0, y: 0, z: 0}
     hitRotationOffset: {x: 0, y: 0, z: 0}
-    gizmoDrawingCondition: 0
+    gizmoDrawingCondition: 2
     children: []
   references:
     version: 2
@@ -864,7 +751,7 @@ MonoBehaviour:
     UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"Combat
     Information":{"_value":{},"_name":"Combat Information","_id":"a15396c3-5ba0-4789-b5c5-39a6cfea1943","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
     ParadoxNotion, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"inGoHard":{"_propertyPath":"PlayerMeter.inGoHard","_name":"inGoHard","_id":"dc9f60c8-856e-4970-bf11-25745eff1201","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
-    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"testobject":{"_name":"testobject","_id":"45e90651-1912-40ef-b4fc-6c27d00d0ef0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
+    mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"pickupTarget":{"_name":"pickupTarget","_id":"45e90651-1912-40ef-b4fc-6c27d00d0ef0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
     UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
   _objectReferences:
   - {fileID: 0}
@@ -905,7 +792,7 @@ MonoBehaviour:
   - _json: '{"_propertyPath":"PlayerMeter.inGoHard","_name":"inGoHard","_id":"dc9f60c8-856e-4970-bf11-25745eff1201","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
       mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}'
     _references: []
-  - _json: '{"_name":"testobject","_id":"45e90651-1912-40ef-b4fc-6c27d00d0ef0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
+  - _json: '{"_name":"pickupTarget","_id":"45e90651-1912-40ef-b4fc-6c27d00d0ef0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
       UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
     _references: []
 --- !u!95 &8583102325603564116
@@ -1070,252 +957,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: Core::Reset.Units.UnitAnimation
   ShowTopMostFoldoutHeaderGroup: 1
   modelAnimator: {fileID: 8505492416078151957}
---- !u!1 &9138484595871696647
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2655796284435897345}
-  - component: {fileID: 4359455419140958956}
-  - component: {fileID: 5110612731591093627}
-  m_Layer: 0
-  m_Name: Capsule Body
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &2655796284435897345
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9138484595871696647}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8724852473240757749}
-  m_Father: {fileID: 7329826263822975762}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &4359455419140958956
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9138484595871696647}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &5110612731591093627
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9138484595871696647}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_ForceMeshLod: -1
-  m_MeshLodSelectionBias: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_GlobalIlluminationMeshLod: 0
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!1001 &3477594240599513361
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7329826263822975762}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_Name
-      value: MaruTestMesh
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 6535719103590072454}
-    - targetCorrespondingSourceObject: {fileID: -4767811373846985505, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1496504048583724107}
-    - targetCorrespondingSourceObject: {fileID: 1723866223041371365, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 4903646563686216737}
-  m_SourcePrefab: {fileID: 100100000, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
---- !u!1 &979446437205532110 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -4767811373846985505, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-  m_PrefabInstance: {fileID: 3477594240599513361}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &1496504048583724107
-Animator:
-  serializedVersion: 7
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 979446437205532110}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 8def683e913d7b54087d096cf3fc05b8, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
---- !u!1 &2859366553890850292 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1723866223041371365, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-  m_PrefabInstance: {fileID: 3477594240599513361}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &4903646563686216737
-Animator:
-  serializedVersion: 7
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2859366553890850292}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 8def683e913d7b54087d096cf3fc05b8, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
---- !u!4 &4019564870895517434 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-  m_PrefabInstance: {fileID: 3477594240599513361}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &4360483176023188544 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e3ac69b01ac41514ab5cde0dffb31c13, type: 3}
-  m_PrefabInstance: {fileID: 3477594240599513361}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &6535719103590072454
-Animator:
-  serializedVersion: 7
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4360483176023188544}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 8def683e913d7b54087d096cf3fc05b8, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!1001 &4276760010964545458
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scenes/CombatTest.unity

@@ -6456,7 +6456,7 @@ PrefabInstance:
         UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"Combat
         Information":{"_value":{},"_name":"Combat Information","_id":"a15396c3-5ba0-4789-b5c5-39a6cfea1943","$type":"NodeCanvas.Framework.Variable`1[[NodeCanvas.Framework.VariableSeperator,
         ParadoxNotion, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"},"inGoHard":{"_propertyPath":"PlayerMeter.inGoHard","_name":"inGoHard","_id":"dc9f60c8-856e-4970-bf11-25745eff1201","$type":"NodeCanvas.Framework.Variable`1[[System.Boolean,
-        mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"testobject":{"_name":"testobject","_id":"de2c7183-a5c3-4036-b92c-4b952c7a7af0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
+        mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"},"pickupTarget":{"_name":"pickupTarget","_id":"de2c7183-a5c3-4036-b92c-4b952c7a7af0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
         UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}}}'
       objectReference: {fileID: 0}
     - target: {fileID: 6546916578030478377, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
@@ -6479,7 +6479,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6546916578030478377, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
       propertyPath: _serializedVariables.Array.data[11]._json
-      value: '{"_name":"testobject","_id":"de2c7183-a5c3-4036-b92c-4b952c7a7af0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
+      value: '{"_name":"pickupTarget","_id":"de2c7183-a5c3-4036-b92c-4b952c7a7af0","$type":"NodeCanvas.Framework.Variable`1[[UnityEngine.GameObject,
         UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]"}'
       objectReference: {fileID: 0}
     - target: {fileID: 6546916578030478377, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
@@ -8550,7 +8550,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/Core/Graph Tasks/CheckGenericObserver.cs

@@ -118,7 +118,6 @@ namespace Reset {
 			if (check && isSingleTargetHit && !outputHit.isNoneOrNull) {
 				outputHit.value = observer.hit;
 			} else if (check && !isSingleTargetHit && !outputHitArray.isNoneOrNull) {
-				Debug.Log(observer.overlapHits.Length);
 				outputHitArray.value.AddRange(observer.overlapHits);
 			}
 			

Assets/Scripts/Core/Graph Tasks/CheckInput.cs

@@ -63,11 +63,8 @@ namespace NodeCanvas.Tasks.Conditions {
 			// Take the input arguments as objects and convert them to InputAction & Phases
 			InputAction thisAction = (InputAction)args[0];
 			InputActionPhase thisActionPhase = (InputActionPhase)args[1];
-
-			// Debug.Log(thisActionPhase);
 			
 			if (actionName.value == thisAction.name && actionPhase.value == thisActionPhase && !blocked) {
-				Debug.Log($"Recieved an unblocked {thisAction}  @ {Time.time}.");
 				YieldReturn(true);
 			}
 		}

Assets/Scripts/Core/Graph Tasks/DrawReviveBar.cs

@@ -21,21 +21,15 @@ namespace NodeCanvas.Tasks.Actions {
 		//Call EndAction() to mark the action as finished, either in success or failure.
 		//EndAction can be called from anywhere.
 		protected override void OnExecute(){
-			// using (Draw.WithColor(Color.forestGreen)){
-
-
-				// EndAction(true);
-			// }
+			
 		}
 
 		//Called once per frame while the action is active.
 		protected override void OnUpdate(){
-			agent.GetComponent<Player>().persistDrawingRevive = .5f;
+			agent.GetComponent<Player>().persistDrawingRevive = 1f;
 			agent.GetComponent<Player>().DrawReviveBarRpc(elapsedTime);
 		}
 
-
-
 		//Called when the task is disabled.
 		protected override void OnStop() {
 			

Assets/Scripts/Core/Graph Tasks/IsInteractable.cs

@@ -10,8 +10,6 @@ namespace Reset.Core {
 	public class IsInteractable : ConditionTask{
 		public BBParameter<GameObject> target;
 		protected override string info{
-			
-			
 			get{
 				// string agentName = agent == null ? agentType.ToString() : target.ToString(); 
 				return $"<b>{target.ToString()}</b> is interactable";
@@ -37,7 +35,7 @@ namespace Reset.Core {
 		//Called once per frame while the condition is active.
 		//Return whether the condition is success or failure.
 		protected override bool OnCheck(){
-			IInteractable interactable = agent.GetComponent<IInteractable>();
+			IInteractable interactable = target.value.GetComponent<IInteractable>();
 			
 			if (interactable == null) {
 				return false;

Assets/Scripts/Core/Graph Tasks/SendAnimationTrigger.cs

@@ -5,9 +5,7 @@ using Unity.Netcode;
 using Unity.Netcode.Components;
 using UnityEngine;
 
-
 namespace Reset.Core {
-
 	[Category("Reset")]
 	[Description("Sends an animation trigger with network sync to networked objects")]
 	public class SendAnimationTrigger : ActionTask<NetworkAnimator>{

Assets/Scripts/Core/Graph Tasks/SendEventToUnit.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 
 namespace Reset.Units {
 	[Category("Reset")]
-	[Description("Send a string as an event to another unit. Works online as well")]
+	[Description("Send a graph event to another unit. Works online as well")]
 	public class SendEventToUnit : ActionTask<Unit>{
 		public BBParameter<GameObject> target;
 		public string eventToSend;

Assets/Scripts/Units/Combat/IDamageable.cs

@@ -1,9 +1,6 @@
-using UnityEngine;
-
 namespace Reset.Core{
     public interface IDamageable{
         public void TakeDamage(DamageSource source);
         public void TakeDamage(DamageSource[] sources);
     }
-
 }

Assets/Scripts/Units/Combat/UnitCombat.cs

@@ -66,7 +66,7 @@ public class UnitCombat : UnitComponent {
             }
 
             draggedUnitMovement.SetNewRotation(-transform.position.DirectionTo(draggedUnit.transform.position), 1f, true);
-            draggedUnitMovement.SetNewDirection((positionDelta).ToVector2(), 1f, true);
+            draggedUnitMovement.SetNewDirection(positionDelta.ToVector2(), 1f, true);
             draggedUnitMovement.SetNewSpeed(speedDelta, 1f, true);
         }
     }

Assets/Scripts/Units/Enemy.cs

@@ -6,14 +6,17 @@ using UnityEngine;
 
 namespace Reset.Units{
     public class Enemy : Unit, ILockOnTarget, IKillable {
+        // Lock-On
         public float lockonTargetRadius{ get; set; } = 10f;
         [ShowInInspector]
         public bool lockonDebug{ get; set; } = true;
         public float lockonRaycastVerticalOffset{ get; set; } = 1f;
         
+        // IKillable
         public float maxHealth{ get; set; }
         public float currentHealth{ get; set; }
 
+        // Object References
         public Animator testModelAnimator;
         
         public override void UnitStart(){
@@ -54,7 +57,7 @@ namespace Reset.Units{
         }
 
         [Rpc(SendTo.Everyone)]
-        void SetHealthRpc(float newHealth){
+        public void SetHealthRpc(float newHealth){
             currentHealth = newHealth;
         }
         

Assets/Scripts/Units/IKillable.cs

@@ -1,5 +1,6 @@
 using Drawing;
 using Reset.Core;
+using Unity.Netcode;
 using UnityEngine;
 
 namespace Reset.Units{
@@ -21,6 +22,9 @@ namespace Reset.Units{
                 currentHealth = maxHealth;
             }
         }
+        
+        [Rpc(SendTo.Everyone)]
+        void SetHealthRpc(float health);
 
         internal void DrawHealthDebug(){
             using (Draw.WithColor(Color.blue)) {

Assets/Scripts/Units/Player.cs

@@ -7,25 +7,35 @@ using Unity.Netcode;
 
 namespace Reset.Units{
     public class Player : Unit, IKillable, IInteractable{
-        [HideInInspector] public PlayerControls controls;
-        
+        // IKillable
         public float maxHealth{ get; set; }
         public float currentHealth{ get; set; }
 
+        // State management (don't like this being used like this)
         public NetworkVariable<bool> _isDowned;
+        public bool IsDowned{
+            get{
+                if (UnitIsLocal()){
+                    _isDowned.Value = FSM.currentRootStateName == "Downed";
+                }
+                return _isDowned.Value;
+            }
+        }
 
-        public bool IsDowned => _isDowned.Value;
+        // References
+        public GameObject pickupTarget; // NOTE: Might be removed in a refactor (https://thunderstar.codecks.io/card/15v-refactor-interaction-handler)
         
-        private float timeDowned;
-
-        public GameObject pickupTarget;
+        // (TEMP) Revive UI
+        // NOTE: When I make the actual UI it's a good idea to have them somehow inherit from a class or something that
+        // will make them persist for more than a frame since Rpc calls will make it flash
+        public float persistDrawingRevive;
+        public float lastKnownReviveTime;
 
         void Awake(){
-            controls = GetComponent<PlayerControls>();
             maxHealth = 20f;
         }
 
-        public void Attach(){
+        void AttachToGame(){
             if (IsLocalPlayer || !UnitIsNetworked()) { // 
                 PlayerManager.Player = gameObject;
 
@@ -38,7 +48,8 @@ namespace Reset.Units{
             base.UnitStart();
 
             SetPlayerName();
-            Attach();
+            AttachToGame();
+            
             ((IKillable)this).IKillableInitialize();
         }
 
@@ -49,8 +60,14 @@ namespace Reset.Units{
             }
         }
 
-        public override void UnitUpdate(){
-            GetComponent<IKillable>().DrawHealthDebug();
+        protected override void Update(){
+            base.Update();
+
+            // Draw Revive UI for at least .5 seconds to prevent flashing
+            if (persistDrawingRevive > 0) {
+                persistDrawingRevive -= 1f * Time.deltaTime;
+                DrawReviveBarRpc(lastKnownReviveTime);
+            }
         }
 
         public void TakeDamage(DamageSource[] sources){
@@ -59,32 +76,36 @@ namespace Reset.Units{
             }
         }
 
-        public void TakeDamage(DamageSource source){
-            ((IKillable)this).currentHealth -= source.damageDealt;
+        public void TakeDamage(DamageSource source){ 
+            // Calculate health after damage, locally
+            float newHealth = ((IKillable)this).currentHealth - source.damageDealt;
 
+            // Tell every unit to set the new health value
             if (UnitIsNetworked()) {
-                SetNewHealthRpc(currentHealth);
+                SetHealthRpc(newHealth);
             }
-
-
         }
 
-        // TODO: Move somewhere not stupid so there's not an identical method in Enemy.cs
         [Rpc(SendTo.Everyone)]
-        public void SetNewHealthRpc(float health){
+        public void SetHealthRpc(float health){
+            // Set health to new value, clamped to 0
+            health = Mathf.Max(health, 0f);
             currentHealth = health;
             
-            // NOTE: only here for testing. Move out of here into some "post damage" check method
-            if (((IKillable)this).currentHealth <= 0) {
-                // if (UnitIsNetworked()) {
-                Down();
-                // } else {
-                //     Kill();
-                // }
+            // For local players, run things based on health value. 
+            // This Rpc is global but only the owner checks health
+            CheckHealth();
+        }
+
+        void CheckHealth(){
+            if (UnitIsLocal()){
+                if (currentHealth <= 0f) {
+                    Down();
+                }
             }
         }
 
-        public void Down(){ 
+        void Down(){ 
             Graph.SendEvent("Downed");
         }
 
@@ -93,6 +114,7 @@ namespace Reset.Units{
         }
 
         public void Interact(){
+            // Interaction for picking up allies
             // Check if the other player can be interacted with at all 
             if (pickupTarget&& pickupTarget.GetComponent<Player>().CanInteract()) {
                 // Tell the local player to start picking up the ally and switch states
@@ -109,7 +131,6 @@ namespace Reset.Units{
         [Rpc(SendTo.Owner)]
         public void StartPickupRpc(){
             // When picked up by another player, move into the pick up state
-            // TODO: Turn all these send events into a goddamn task maybe? State stuff should happen in the state machine. Concurrent stuff should happen in code
             Graph.SendEvent("Pick Up Start");
         }
 
@@ -120,8 +141,6 @@ namespace Reset.Units{
             while (elapsed < 7f) {
                 elapsed += 1f * Time.deltaTime;
                 
-                
-                
                 yield return null;
             }
             
@@ -152,24 +171,35 @@ namespace Reset.Units{
         
         [Rpc(SendTo.Everyone)]
         public void DrawReviveBarRpc(float elapsedTime){
-            Debug.Log("test is drawn");
+            // Draw a (shoddy) UI bar that shows the revie progress
             using (Draw.ingame.WithLineWidth(5f)) {
                 using (Draw.InLocalSpace(transform)){
+                    // Set width of the bar
                     float width = .9f;
-                    float widthDone = width * elapsedTime / 5f;
+                    float widthDone = width * elapsedTime / 5f; // 5f assumes a 5 second revive time
 
+                    // Clamp the red bar showing how much is progresseed to the max of width of the purple bar background (to prevent it going outside)
                     widthDone = Mathf.Clamp(widthDone, 0, width);
 					    
-                    Vector3 pos = Vector3.up * 1.8f + Vector3.left * width + Vector3.forward * .01f;
-                    Draw.ingame.Line(Camera.main.transform.rotation * pos, Camera.main.transform.rotation *
-                                                                           (pos + Vector3.right * width * 2f), Color.rebeccaPurple);
+                    // Draw background bar
+                    Vector3 pos = Vector3.up * 1.8f + Vector3.left * width + Vector3.forward * +.01f;
+                    Draw.ingame.Line(
+                        transform.position + Camera.main.transform.rotation * pos, 
+                        transform.position + Camera.main.transform.rotation * (pos + Vector3.right * width * 2f), 
+                        Color.rebeccaPurple
+                    );
 					    
+                    // Draw foreground bar
                     Vector3 donePos = Vector3.up * 1.8f + Vector3.left * widthDone;
-                    Draw.ingame.Line(Camera.main.transform.rotation * donePos, Camera.main.transform.rotation *
-                                                                               (donePos + Vector3.right * widthDone * 2f), Color.red);
+                    Draw.ingame.Line(
+                        transform.position + Camera.main.transform.rotation * donePos, 
+                        transform.position + Camera.main.transform.rotation * (donePos + Vector3.right * widthDone * 2f), 
+                        Color.red
+                    );
                 }
             }
             
+            // Set last known time so that online players don't have flashing UIs
             lastKnownReviveTime = elapsedTime;
         }
 

Assets/Scripts/Units/Unit.cs

@@ -1,51 +1,32 @@
 using System;
-using System.Collections;
-using System.Threading.Tasks;
 using Drawing;
-using NodeCanvas.BehaviourTrees;
 using NodeCanvas.Framework;
 using NodeCanvas.StateMachines;
-using Reset;
-using Reset.Units;
 using Unity.Collections;
 using Unity.Netcode;
 using UnityEngine;
 
 namespace Reset.Units{
     public class Unit : NetworkBehaviour, INetworkSerializeByMemcpy{
-
-        public string state;
-
-        public NetworkVariable<FixedString64Bytes> testSTate;
-
-        private FSMOwner fsm;
+        // References
+        private FSMOwner _fsm;
+        internal FSMOwner FSM{
+            get{ if (!_fsm) { _fsm = GetComponent<FSMOwner>(); } return _fsm; }
+        }
         
         private UnitMovementHandler _movement;  
         internal UnitMovementHandler Movement{
-            get{
-                if (!_movement) {
-                    _movement = GetComponent<UnitMovementHandler>();
-                } 
-                
-                return _movement;
-            }
+            get{ if (!_movement) { _movement = GetComponent<UnitMovementHandler>(); } return _movement; }
         }
         
         private GraphOwner _graph; 
         internal GraphOwner Graph{
-            get{
-                if (!_graph) {
-                    _graph = GetComponent<GraphOwner>();
-                } 
-                
-                return _graph;
-            }
+            get{ if (!_graph) { _graph = GetComponent<GraphOwner>(); } return _graph; }
         }
-
-        private void Awake(){
-            fsm = GetComponent<FSMOwner>();
-        }
-
+        
+        // Debug and Gizmos
+        public NetworkVariable<FixedString64Bytes> graphStateAsString;
+        
         public virtual void Start(){
             UnitStart();
         }
@@ -67,17 +48,14 @@ namespace Reset.Units{
 
         protected virtual void Update(){
             UpdateGizmos();
+        }
 
+        // Draw Gizmos
+        void UpdateGizmos(){
             if (GetComponent<IKillable>() != null) {
                 GetComponent<IKillable>().DrawHealthDebug();
             }
-
-            UnitUpdate();
-        }
-        
-        public virtual void UnitUpdate(){ }
-
-        void UpdateGizmos(){
+            
             DrawOnlineStatusGizmo();
             DrawStateGizmo();
         }
@@ -104,55 +82,38 @@ namespace Reset.Units{
             SetNewPosition(position);
         }
         
-        
         public void SetNewPosition(Vector3 position){
+            // Set position, disabling the character controller if one is available
             var contr = GetComponent<CharacterController>();
-            
-            if (contr)
-                contr.enabled = false;
+            if (contr) contr.enabled = false;
 
             transform.position = position;
             
-            if (contr)
-                contr.enabled = true;
+            if (contr) contr.enabled = true;
         }
-        
+
         private void DrawStateGizmo(){
-            if (fsm && UnitIsLocal()) {
-                testSTate.Value = fsm.currentRootStateName;
-                // if (UnitIsNetworked()) { 
-                //     // state = fsm.currentRootStateName;
-                //     SendStateInformationRpc(fsm.currentRootStateName);
-                // } else {
-                //     state = fsm.currentRootStateName;
-                // }
-            } else {
-                fsm = GetComponent<FSMOwner>();
+            // Get state from FSM
+            if (UnitIsLocal()) {
+                graphStateAsString.Value = FSM.currentRootStateName;
             }
 
-            // state = state.ToString().ToUpper();
-            
+            // Draw state gizmo, regardless of if local or not
             try {
-                Draw.ingame.Label2D(transform.position + Vector3.up * 2.7f, testSTate.Value.ToString(), Color.red);
+                Draw.ingame.Label2D(transform.position + Vector3.up * 2.7f, graphStateAsString.Value.ToString(),
+                    Color.red);
             } catch (Exception e) {
                 Debug.LogError(e.Message);
             }
         }
-
-        [Rpc(SendTo.Everyone)]
-        public void SendStateInformationRpc(string newState){
-            Debug.Log($"newstate! {newState}");
-            state = newState;
-        }
-
+        
         [Rpc(SendTo.Owner)]
-        public void TakeOwnershipRpc(ulong clientID){
-            GetComponent<NetworkObject>().ChangeOwnership(clientID);
+        public void TakeOwnershipRpc(ulong newOwnerID){
+            GetComponent<NetworkObject>().ChangeOwnership(newOwnerID);
         }
         
         [Rpc(SendTo.Owner)]
         public void DoGraphEventRpc(string eventToSend){
-            Debug.Log(eventToSend);
             GetComponent<FSMOwner>().SendEvent(eventToSend); }
     }
 }

Assets/Scripts/Units/UnitAnimation.cs

@@ -8,13 +8,9 @@ namespace Reset.Units{
         // Temporary
         private float inputMagnitude;
         
-        void Start(){
-
-        }
-
         void Update(){
+            // Temporary
             try {
-                // Temporary
                 inputMagnitude = Mathf.MoveTowards(inputMagnitude, GetComponent<PlayerControls>().rawMoveInput.magnitude * 2f, 6f * Time.deltaTime);
                 
                 modelAnimator.SetFloat("Move Direction X", Unit.Movement.GetResolvedDirectionLocal().x * inputMagnitude);
@@ -23,21 +19,6 @@ namespace Reset.Units{
                 Debug.LogError($"Failed in setting X and Y move direction floats: {e.Message}");
             }
         }
-
-        public void SendTriggerToAnimator(string trigger){
-            if (!modelAnimator) {
-                Debug.LogError($"There is no animator set to recieve the trigger '{trigger}' on unit {name}.", gameObject);
-                return;
-            }
-
-            try {
-                modelAnimator.SetTrigger(trigger);
-            }
-            catch (Exception e)
-            {
-                Debug.LogError($"Failed to send trigger to Animator: {e.Message}");
-            }
-        }
         
     }
 

Assets/Scripts/World/World.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+namespace Reset.World{
+    public class World{
+        public List<Zone> zones = new List<Zone>();
+        public List<ZoneEvent> activeEvents = new List<ZoneEvent>();
+
+        public static List<ZoneEvent> ZoneEventsMasterList;
+        
+        void Start(){
+
+        }
+
+        // Update is called once per frame
+        void Update(){
+
+        }
+    }
+}

Assets/Scripts/World/World.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d524946cf105ebe47ab710cddf19e4f8

Assets/Scripts/World/Zone.cs

@@ -0,0 +1,27 @@
+using Reset.World;
+using UnityEngine;
+public class Zone : MonoBehaviour{
+    public ZoneEvent activeEvent;
+    
+    void Start()
+    {
+        
+    }
+
+    public bool TryNewEvent(){
+        int eventIndex = Random.Range(0, World.ZoneEventsMasterList.Count);
+
+        if (Random.value * 100 < World.ZoneEventsMasterList[eventIndex].eventRarity) {
+            activeEvent = World.ZoneEventsMasterList[eventIndex];
+            return true;
+        }
+            
+        return false;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/World/Zone.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 787d3d76f34dc6d40aeac24af98bc27d

Assets/Scripts/World/ZoneEvent.cs

@@ -0,0 +1,9 @@
+using NUnit.Framework;
+using Sirenix.OdinInspector;
+
+namespace Reset.World{
+    public class ZoneEvent{
+        [PropertyRange(0, 100)]
+        public float eventRarity;
+    }
+}

Assets/Scripts/World/ZoneEvent.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9b045a48fc77475389d1f1eca177aed9
+timeCreated: 1759349742

Assets/Settings/Build Profiles/Default Windows.asset

@@ -18,8 +18,10 @@ MonoBehaviour:
   m_PlatformId: 4e3c793746204150860bf175a9a41a05
   m_PlatformBuildProfile:
     rid: 1867487625482076160
-  m_OverrideGlobalSceneList: 0
-  m_Scenes: []
+  m_OverrideGlobalSceneList: 1
+  m_Scenes:
+  - m_enabled: 1
+    m_path: Assets/Scenes/CombatTest.unity
   m_ScriptingDefines: []
   m_PlayerSettingsYaml:
     m_Settings: []
@@ -40,6 +42,8 @@ MonoBehaviour:
         m_ExplicitArrayBoundsChecks: 0
         m_CompressionType: 0
         m_InstallInBuildFolder: 0
+        m_InsightsSettingsContainer:
+          m_BuildProfileEngineDiagnosticsState: 2
         m_WindowsBuildAndRunDeployTarget: 0
         m_Architecture: 0
         m_CreateSolution: 0

Assets/Settings/PC_Renderer.asset

@@ -13,32 +13,27 @@ MonoBehaviour:
   m_Name: PC_Renderer
   m_EditorClassIdentifier: 
   debugShaders:
-    debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
-      type: 3}
+    debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
     hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
-    probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959,
-      type: 3}
+    probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3}
   probeVolumeResources:
-    probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae,
-      type: 3}
-    probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607,
-      type: 3}
-    probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664,
-      type: 3}
-    probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7,
-      type: 3}
-    probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe,
-      type: 3}
-    probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e,
-      type: 3}
-    probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176,
-      type: 3}
+    probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, type: 3}
+    probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, type: 3}
+    probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, type: 3}
+    probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, type: 3}
+    probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, type: 3}
+    probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3}
+    probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, type: 3}
   m_RendererFeatures:
   - {fileID: 7833122117494664109}
   m_RendererFeatureMap: ad6b866f10d7b46c
   m_UseNativeRenderPass: 1
+  xrSystemData: {fileID: 0}
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
-  m_AssetVersion: 2
+  m_AssetVersion: 3
+  m_PrepassLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
   m_OpaqueLayerMask:
     serializedVersion: 2
     m_Bits: 4294967295
@@ -56,6 +51,8 @@ MonoBehaviour:
   m_RenderingMode: 2
   m_DepthPrimingMode: 0
   m_CopyDepthMode: 0
+  m_DepthAttachmentFormat: 0
+  m_DepthTextureFormat: 0
   m_AccurateGbufferNormals: 0
   m_IntermediateTextureMode: 0
 --- !u!114 &7833122117494664109
@@ -84,12 +81,3 @@ MonoBehaviour:
     BlurQuality: 0
     Falloff: 100
     SampleCount: -1
-  m_BlueNoise256Textures:
-  - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
-  - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
-  - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
-  - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
-  - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
-  - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
-  - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
-  m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}

Assets/Settings/PlayMode/TwoPlayers.asset

@@ -21,7 +21,7 @@ MonoBehaviour:
     - Main Editor|0_run
     - Main Editor|0_deploy
     m_PlayerTag: 
-    m_InitialScene: {fileID: 102900000, guid: 7f8c36f656558f24ab6aa5c9f9da5abc, type: 3}
+    m_InitialScene: {fileID: 102900000, guid: 7afe0eb15714afe4cb7caee140008f5b, type: 3}
   m_EditorInstances:
   - Name: Player 2
     <CorrespondingNodeId>k__BackingField: Player 2|1_run

Packages/packages-lock.json

@@ -14,6 +14,29 @@
         "com.unity.ugui": "1.0.0"
       }
     },
+    "com.arongranberg.astar": {
+      "version": "file:com.arongranberg.astar",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {
+        "com.unity.burst": "1.8.7",
+        "com.unity.collections": "1.5.1",
+        "com.unity.mathematics": "1.2.6",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0",
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.physics2d": "1.0.0",
+        "com.unity.modules.terrain": "1.0.0",
+        "com.unity.modules.terrainphysics": "1.0.0",
+        "com.unity.modules.tilemap": "1.0.0",
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.uielements": "1.0.0",
+        "com.unity.ugui": "1.0.0"
+      }
+    },
     "com.singularitygroup.hotreload": {
       "version": "file:com.singularitygroup.hotreload",
       "depth": 0,

ProjectSettings/EditorBuildSettings.asset

@@ -14,6 +14,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/ItemTest.unity
     guid: 520e0dc411c2684479fba0c4f32b733c
+  - enabled: 1
+    path: Assets/Scenes/CombatTest.unity
+    guid: 7afe0eb15714afe4cb7caee140008f5b
   m_configObjects:
     com.unity.input.settings: {fileID: 11400000, guid: e4ca318d34698fe41ba99a765e54e4c2, type: 2}
     com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 94c7611bb3f64b248940847af54844cf, type: 3}

ProjectSettings/Packages/com.unity.probuilder/Settings.json

@@ -21,6 +21,11 @@
                 "key": "editor.materialPalettePath",
                 "value": "{\"m_Value\":\"Assets/ProBuilder Data/Default Material Palette.asset\"}"
             },
+            {
+                "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "VertexColorPalette.previousColorPalette",
+                "value": "{\"m_Value\":\"Assets/Map/Materials/BuildingsColor.asset\"}"
+            },
             {
                 "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "about.identifier",
@@ -129,13 +134,23 @@
             {
                 "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.LastSize.Cube",
-                "value": "{\"m_Value\":{\"x\":20.036033630371095,\"y\":1.0208016633987427,\"z\":-17.9393310546875}}"
+                "value": "{\"m_Value\":{\"x\":1.0,\"y\":15.0,\"z\":1.0}}"
             },
             {
                 "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}}"
             },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Prism",
+                "value": "{\"m_Value\":{\"x\":-17.4999942779541,\"y\":9.000001907348633,\"z\":9.0}}"
+            },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Plane",
+                "value": "{\"m_Value\":{\"x\":-1.0,\"y\":0.0,\"z\":7.0}}"
+            },
             {
                 "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.LastRotation.Cube",
@@ -146,6 +161,16 @@
                 "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.Prism",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":-0.7071067690849304,\"w\":0.7071067690849304}}"
+            },
+            {
+                "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.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.PivotLocation.Cube",
@@ -156,6 +181,16 @@
                 "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.Prism",
+                "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.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.Cube",
@@ -166,10 +201,20 @@
                 "key": "ShapeBuilder.Stairs",
                 "value": "{}"
             },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Prism",
+                "value": "{}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Plane",
+                "value": "{}"
+            },
             {
                 "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "s_SelectMode",
-                "value": "{\"m_Value\":1}"
+                "value": "{\"m_Value\":2}"
             },
             {
                 "type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
@@ -185,6 +230,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}"
             }
         ]
     }

ProjectSettings/ProjectSettings.asset

@@ -144,6 +144,8 @@ PlayerSettings:
   bundleVersion: 0.2.0
   preloadedAssets:
   - {fileID: 0}
+  - {fileID: 11400000, guid: e4ca318d34698fe41ba99a765e54e4c2, type: 2}
+  - {fileID: -944628639613478452, guid: 94c7611bb3f64b248940847af54844cf, type: 3}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

ProjectSettings/QualitySettings.asset

@@ -6,7 +6,7 @@ QualitySettings:
   serializedVersion: 5
   m_CurrentQuality: 1
   m_QualitySettings:
-  - serializedVersion: 4
+  - serializedVersion: 5
     name: Mobile
     pixelLightCount: 2
     shadows: 2
@@ -34,6 +34,7 @@ QualitySettings:
     adaptiveVsyncExtraA: 0
     adaptiveVsyncExtraB: 0
     lodBias: 1
+    meshLodThreshold: 1
     maximumLODLevel: 0
     enableLODCrossFade: 1
     streamingMipmapsActive: 0
@@ -59,7 +60,7 @@ QualitySettings:
     terrainMaxTrees: 50
     excludedTargetPlatforms:
     - Standalone
-  - serializedVersion: 4
+  - serializedVersion: 5
     name: PC
     pixelLightCount: 2
     shadows: 2
@@ -87,6 +88,7 @@ QualitySettings:
     adaptiveVsyncExtraA: 0
     adaptiveVsyncExtraB: 0
     lodBias: 2
+    meshLodThreshold: 1
     maximumLODLevel: 0
     enableLODCrossFade: 1
     streamingMipmapsActive: 0

ProjectSettings/TimelineSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.Timeline.Editor::TimelineProjectSettings
+  assetDefaultFramerate: 60
+  m_DefaultFrameRate: 60

ProjectSettings/com.arongranberg.astar/settings.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21f007d651ef4ab42b597f1da9ad75cf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AstarPathfindingProjectEditor::Pathfinding.PathfindingEditorSettings
+  hasShownWelcomeScreen: 1