imported music, added combat and death

2023-04-21 03:30:43 -04:00 · 2023-04-21 03:30:43 -04:00 · c4094b169c
commit c4094b169c
parent 0b7b2515d1
82 changed files with 11177 additions and 2270 deletions
--- a/Assets/Animations/Monters/Alien1Anmation/AlienZombieAnimationController.controller
+++ b/Assets/Animations/Monters/Alien1Anmation/AlienZombieAnimationController.controller
@ -116,7 +116,7 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -8045918876602617594}
-    m_Position: {x: 410, y: 80, z: 0}
+    m_Position: {x: 360, y: 110, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 6292746397107399370}
    m_Position: {x: 380, y: 290, z: 0}
@ -134,7 +134,7 @@ AnimatorStateMachine:
    m_Position: {x: 810, y: -180, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -6722448351092568362}
-    m_Position: {x: 693.83386, y: 276.3692, z: 0}
+    m_Position: {x: 770, y: 300, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -3478732761575392327}
    m_Position: {x: 856.5152, y: 181.33751, z: 0}
@ -178,6 +178,31 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-5912259969099434703
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: InLight
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6722448351092568362}
+  m_Solo: 1
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9460432
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-5277390852839867810
 AnimatorState:
  serializedVersion: 6
@ -190,6 +215,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: -1934121248908059639}
+  - {fileID: 3319941337296793358}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -205,6 +231,31 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-5070204470012893550
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: InLight
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6722448351092568362}
+  m_Solo: 1
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.92857146
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-4991608271041000256
 AnimatorState:
  serializedVersion: 6
@ -217,6 +268,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 3840126287449210336}
+  - {fileID: -5070204470012893550}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -244,6 +296,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 3284725948930391759}
+  - {fileID: 4180712500725483702}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -259,7 +312,7 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &-2890399280607573796
+--- !u!1101 &-3195319477333728098
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@ -278,10 +331,35 @@ AnimatorStateTransition:
  serializedVersion: 3
  m_TransitionDuration: 0.25
  m_TransitionOffset: 0
-  m_ExitTime: 0.9794521
+  m_ExitTime: 0.90384614
  m_HasExitTime: 0
  m_HasFixedDuration: 1
-  m_InterruptionSource: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-2890399280607573796
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: InLight
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6722448351092568362}
+  m_Solo: 1
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.009893417
+  m_TransitionOffset: 0
+  m_ExitTime: 0.97945213
+  m_HasExitTime: 0
+  m_HasFixedDuration: 0
+  m_InterruptionSource: 2
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
 --- !u!1102 &-2640043726390947265
@ -296,6 +374,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: -1929447247841503549}
+  - {fileID: -5912259969099434703}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -367,6 +446,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 3811198640985440042}
+  - {fileID: -3195319477333728098}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -536,6 +616,31 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &3319941337296793358
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: InLight
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6722448351092568362}
+  m_Solo: 1
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9050633
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &3811198640985440042
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -608,6 +713,31 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &4180712500725483702
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: InLight
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6722448351092568362}
+  m_Solo: 1
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.01
+  m_TransitionOffset: 0
+  m_ExitTime: 0.91071427
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 1
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &5184814725926522922
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -648,6 +778,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 2642003355210438087}
+  - {fileID: 6767231325866369938}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -688,6 +819,31 @@ AnimatorStateTransition:
  m_InterruptionSource: 1
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &6767231325866369938
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: InLight
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6722448351092568362}
+  m_Solo: 1
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.01
+  m_TransitionOffset: 0
+  m_ExitTime: 0.6875
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 2
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &6886663351162099139
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
--- a/Assets/Animations/PlayerAnimations/Death.meta
+++ b/Assets/Animations/PlayerAnimations/Death.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6aa78ff641fabdc4eb2e936c063dc37c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Animations/PlayerAnimations/Death/DeathForward.fbx
+++ b/Assets/Animations/PlayerAnimations/Death/DeathForward.fbx
--- a/Assets/Animations/PlayerAnimations/Death/DeathForward.fbx.meta
+++ b/Assets/Animations/PlayerAnimations/Death/DeathForward.fbx.meta
@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 519f2bbcd82c7cd408b61f2d3350e209
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Animations/PlayerAnimations/mixamorig_Hips.controller
+++ b/Assets/Animations/PlayerAnimations/mixamorig_Hips.controller
@ -195,6 +195,32 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &-7663569941003565567
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Die
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -203655887218126122, guid: 519f2bbcd82c7cd408b61f2d3350e209, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &-7329068066951733316
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -597,6 +623,31 @@ AnimatorStateTransition:
  m_InterruptionSource: 1
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &-4151451616912817172
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: IsDead
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -7663569941003565567}
+  m_Solo: 1
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.78571427
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-4044307373194923611
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -1080,37 +1131,43 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 1
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
  - m_Name: RunningSpeed
    m_Type: 1
    m_DefaultFloat: 1
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
  - m_Name: SideSpeed
    m_Type: 1
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
  - m_Name: IsCarrying
    m_Type: 4
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
  - m_Name: HasGun
    m_Type: 4
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
  - m_Name: WasHit
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: IsDead
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@ -1466,7 +1523,10 @@ AnimatorStateTransition:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: 
-  m_Conditions: []
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsDead
+    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: 2448133036534709572}
  m_Solo: 1
@ -1770,6 +1830,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 3272332642583013941}
+  - {fileID: -4151451616912817172}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -1846,6 +1907,9 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: 583101868980985703}
    m_Position: {x: 620, y: 510, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -7663569941003565567}
+    m_Position: {x: 840, y: 440, z: 0}
  m_ChildStateMachines:
  - serializedVersion: 1
    m_StateMachine: {fileID: -6935279036761329183}
--- a/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve.mat
+++ b/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve.mat
@ -169,7 +169,7 @@ Material:
    - _DoubleSidedGIMode: 0
    - _DoubleSidedNormalMode: 1
    - _DstBlend: 0
-    - _EdgeThickness: 0.12
+    - _EdgeThickness: 0.02
    - _EmissiveColorMode: 1
    - _EmissiveExposureWeight: 1
    - _EmissiveIntensity: 1
@ -258,7 +258,7 @@ Material:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
-    - _EdgeColor: {r: 1, g: 0.043083057, b: 0, a: 1}
+    - _EdgeColor: {r: 0.29803923, g: 0.29803923, b: 0.29803923, a: 1}
    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
    - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve_vert.mat
+++ b/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve_vert.mat
@ -0,0 +1,293 @@
+%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: Flesh_graph_dissolve_vert
+  m_Shader: {fileID: -6465566751694194690, guid: d2ddc79091f86244b9e41d99a956f4b5, type: 3}
+  m_ValidKeywords:
+  - _ALPHATEST_ON
+  - _ALPHATOMASK_ON
+  - _DISABLE_SSR_TRANSPARENT
+  - _DOUBLESIDED_ON
+  m_InvalidKeywords:
+  - _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: 2475
+  stringTagMap:
+    MotionVector: User
+    RenderType: TransparentCutout
+  disabledShaderPasses:
+  - TransparentDepthPrepass
+  - TransparentDepthPostpass
+  - TransparentBackface
+  - RayTracingPrepass
+  - MOTIONVECTORS
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _CoatMaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _IridescenceMaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _IridescenceThicknessMap:
+        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}
+    - _MainTexture:
+        m_Texture: {fileID: 2800000, guid: 0cefa7db3d7a62e428665fca9cc12e35, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 2800000, guid: 14e44008a6d94d84d9f6d485e5751983, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalTexture:
+        m_Texture: {fileID: 2800000, guid: 9c872e4dd3b884c439d8e76efc965f7b, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceMaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TransmittanceColorMap:
+        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:
+    - _AORemapMax: 1
+    - _AORemapMin: 0
+    - _ATDistance: 1
+    - _AddPrecomputedVelocity: 0
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 1
+    - _AlphaCutoffPostpass: 0.5
+    - _AlphaCutoffPrepass: 0.5
+    - _AlphaCutoffShadow: 0.5
+    - _AlphaDstBlend: 0
+    - _AlphaSrcBlend: 1
+    - _AlphaToMask: 1
+    - _AlphaToMaskInspectorValue: 1
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatMask: 0
+    - _ConservativeDepthOffsetEnable: 0
+    - _CullMode: 0
+    - _CullModeForward: 0
+    - _Cutoff: 0.5
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DiffusionProfile: 0
+    - _DiffusionProfileHash: 0
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 0
+    - _Dissolve: 0.5
+    - _DissolveQuantity: 2
+    - _DoubleSidedEnable: 1
+    - _DoubleSidedGIMode: 0
+    - _DoubleSidedNormalMode: 1
+    - _DstBlend: 0
+    - _EdgeThickness: 0.1
+    - _EmissiveColorMode: 1
+    - _EmissiveExposureWeight: 1
+    - _EmissiveIntensity: 1
+    - _EmissiveIntensityUnit: 0
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableGeometricSpecularAA: 0
+    - _EnergyConservingSpecularColor: 1
+    - _HeightAmplitude: 0.02
+    - _HeightCenter: 0.5
+    - _HeightMapParametrization: 0
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _HeightOffset: 0
+    - _HeightPoMAmplitude: 2
+    - _HeightTessAmplitude: 2
+    - _HeightTessCenter: 0.5
+    - _InvTilingScale: 1
+    - _Ior: 1.5
+    - _IridescenceMask: 1
+    - _IridescenceThickness: 1
+    - _LinkDetailsWithBase: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _MetallicRemapMax: 1
+    - _MetallicRemapMin: 0
+    - _NoiseScale: 30
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _NormalStrength: 1
+    - _OpaqueCullMode: 2
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _RandomStrength: 0.94
+    - _RayTracing: 0
+    - _ReceivesSSR: 1
+    - _ReceivesSSRTransparent: 0
+    - _RefractionModel: 0
+    - _RenderQueueType: 1
+    - _RequireSplitLighting: 0
+    - _Smoothness: 0.75
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SpecularAAScreenSpaceVariance: 0.1
+    - _SpecularAAThreshold: 0.2
+    - _SpecularOcclusionMode: 1
+    - _SrcBlend: 1
+    - _StencilRef: 0
+    - _StencilRefDepth: 8
+    - _StencilRefDistortionVec: 4
+    - _StencilRefGBuffer: 10
+    - _StencilRefMV: 40
+    - _StencilWriteMask: 6
+    - _StencilWriteMaskDepth: 8
+    - _StencilWriteMaskDistortionVec: 4
+    - _StencilWriteMaskGBuffer: 14
+    - _StencilWriteMaskMV: 42
+    - _SubsurfaceMask: 1
+    - _SupportDecals: 1
+    - _SurfaceType: 0
+    - _TexWorldScale: 1
+    - _TexWorldScaleEmissive: 1
+    - _Thickness: 1
+    - _TransmissionEnable: 1
+    - _TransparentBackfaceEnable: 0
+    - _TransparentCullMode: 2
+    - _TransparentDepthPostpassEnable: 0
+    - _TransparentDepthPrepassEnable: 0
+    - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
+    - _TransparentZWrite: 0
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _UVEmissive: 0
+    - _UseEmissiveIntensity: 0
+    - _UseShadowThreshold: 0
+    - _ZTestDepthEqualForOpaque: 3
+    - _ZTestGBuffer: 3
+    - _ZTestTransparent: 4
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EdgeColor: {r: 53.735847, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Smoothness: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+--- !u!114 &8590236446828722254
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 12
+  hdPluginSubTargetMaterialVersions:
+    m_Keys: []
+    m_Values: 
--- a/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve_vert.mat.meta
+++ b/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve_vert.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 51bd0edc0ca69a74282e6b7f886d8535
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/Aliens/BaseAlien_Skinned.fbx.meta
+++ b/Assets/Models/Aliens/BaseAlien_Skinned.fbx.meta
@ -46,7 +46,7 @@ ModelImporter:
    importLights: 1
    nodeNameCollisionStrategy: 1
    fileIdsGeneration: 2
-    swapUVChannels: 0
+    swapUVChannels: 1
    generateSecondaryUV: 1
    useFileUnits: 1
    keepQuads: 0
--- a/Assets/Music.meta
+++ b/Assets/Music.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cd1b85df92eac794a96b14231c8e43c6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/BlackHoleMusic3.mp3
+++ b/Assets/Music/BlackHoleMusic3.mp3
--- a/Assets/Music/BlackHoleMusic3.mp3.meta
+++ b/Assets/Music/BlackHoleMusic3.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 31f849b883d2ca349996b7540b9074d0
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/Music1.mp3
+++ b/Assets/Music/Music1.mp3
--- a/Assets/Music/Music1.mp3.meta
+++ b/Assets/Music/Music1.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bc5896513dad4a7498f18ac8752d3d75
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/Music2.mp3
+++ b/Assets/Music/Music2.mp3
--- a/Assets/Music/Music2.mp3.meta
+++ b/Assets/Music/Music2.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 9fcae129f3cee9e42aab8e517591b0c9
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/ScottBuckley_Soundtracks.meta
+++ b/Assets/Music/ScottBuckley_Soundtracks.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd73915abebb2b04f83daf797f548ffd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/ScottBuckley_Soundtracks/AKindOfHope.mp3
+++ b/Assets/Music/ScottBuckley_Soundtracks/AKindOfHope.mp3
--- a/Assets/Music/ScottBuckley_Soundtracks/AKindOfHope.mp3.meta
+++ b/Assets/Music/ScottBuckley_Soundtracks/AKindOfHope.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 59fd000ac0dea77439219729140c534f
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/ScottBuckley_Soundtracks/HymnToTheDawn.mp3
+++ b/Assets/Music/ScottBuckley_Soundtracks/HymnToTheDawn.mp3
--- a/Assets/Music/ScottBuckley_Soundtracks/HymnToTheDawn.mp3.meta
+++ b/Assets/Music/ScottBuckley_Soundtracks/HymnToTheDawn.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3c7400f4098445249a6c5bc2ac6fa4a3
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/ScottBuckley_Soundtracks/LicensesToAdd.txt
+++ b/Assets/Music/ScottBuckley_Soundtracks/LicensesToAdd.txt
@ -0,0 +1,9 @@
+'Path Through The Mountains' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au
+
+'The Long Dark' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au
+
+'A Kind Of Hope' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au
+
+'Hymn To The Dawn' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au
+
+'Last And First Light' by Scott Buckley - released under CC-BY 4.0. www.scottbuckley.com.au
--- a/Assets/Music/ScottBuckley_Soundtracks/LicensesToAdd.txt.meta
+++ b/Assets/Music/ScottBuckley_Soundtracks/LicensesToAdd.txt.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e6480b3797a7e284281e114341efe022
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/ScottBuckley_Soundtracks/PathThroughTheMountains.mp3
+++ b/Assets/Music/ScottBuckley_Soundtracks/PathThroughTheMountains.mp3
--- a/Assets/Music/ScottBuckley_Soundtracks/PathThroughTheMountains.mp3.meta
+++ b/Assets/Music/ScottBuckley_Soundtracks/PathThroughTheMountains.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3dbe39999d4685845b1b9f5bf8c79009
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/ScottBuckley_Soundtracks/TheLongDark.mp3
+++ b/Assets/Music/ScottBuckley_Soundtracks/TheLongDark.mp3
--- a/Assets/Music/ScottBuckley_Soundtracks/TheLongDark.mp3.meta
+++ b/Assets/Music/ScottBuckley_Soundtracks/TheLongDark.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 23e1364a79fa70043b64899acce15c89
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Music/ScottBuckley_Soundtracks/sb_LastAndFirstLight.mp3
+++ b/Assets/Music/ScottBuckley_Soundtracks/sb_LastAndFirstLight.mp3
--- a/Assets/Music/ScottBuckley_Soundtracks/sb_LastAndFirstLight.mp3.meta
+++ b/Assets/Music/ScottBuckley_Soundtracks/sb_LastAndFirstLight.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bb3f56072af6da64d9feb846afda136d
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab
+++ b/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab
--- a/Assets/Prefabs/Enemies/NoSkinMonster.prefab
+++ b/Assets/Prefabs/Enemies/NoSkinMonster.prefab
--- a/Assets/Prefabs/Enemies/NoSkinMonster.prefab.meta
+++ b/Assets/Prefabs/Enemies/NoSkinMonster.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: db61f30670495034d8ce2e8c7448cec9
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/GunPrefabs/BoltParticle.prefab
+++ b/Assets/Prefabs/GunPrefabs/BoltParticle.prefab
@ -107,7 +107,7 @@ Rigidbody:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6919974783650283166}
  serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 0.8
  m_Drag: 0
  m_AngularDrag: 0.05
  m_UseGravity: 1
@ -129,3 +129,5 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  duration: 5
  type: bolt
+  damageRange: 0
+  damageMagnitude: 1
--- a/Assets/Prefabs/World/Doors/Door.prefab
+++ b/Assets/Prefabs/World/Doors/Door.prefab
@ -1,5 +1,611 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &295159158
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 295159159}
+  - component: {fileID: 295159161}
+  - component: {fileID: 295159160}
+  m_Layer: 6
+  m_Name: Cube.001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &295159159
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 295159158}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
+  m_LocalPosition: {x: 3, y: 0, z: 0}
+  m_LocalScale: {x: 100, y: 100, z: 100}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 345088602}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &295159161
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 295159158}
+  m_Mesh: {fileID: 4493585093827132993, guid: 87bf4dc087008ee42a03c6a42d1c8e43, type: 3}
+--- !u!23 &295159160
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 295159158}
+  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_RenderingLayerMask: 257
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: -6478536213147159724, guid: 87bf4dc087008ee42a03c6a42d1c8e43, type: 3}
+  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_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &345088598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 345088602}
+  - component: {fileID: 345088601}
+  - component: {fileID: 345088600}
+  - component: {fileID: 345088599}
+  m_Layer: 6
+  m_Name: Reciptical_0.1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &345088602
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 345088598}
+  m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: -0.16040875, y: -0.7562957, z: 2.2205837}
+  m_LocalScale: {x: 0.29999998, y: 0.116145976, z: 0.14148198}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 932189024}
+  - {fileID: 295159159}
+  - {fileID: 648685581}
+  - {fileID: 1220123021}
+  - {fileID: 1884542419}
+  m_Father: {fileID: 5400642609667826687}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90}
+--- !u!65 &345088601
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 345088598}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 4, y: 2, z: 2}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &345088600
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 345088598}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 126
+  m_CollisionDetection: 0
+--- !u!114 &345088599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 345088598}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1f575b137603a4b4282a6551120c979a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemName: Door1Recepticle
+  itemSize: 1
+  interactionCanvas: {fileID: 932189021}
+  canPickup: 0
+  searchString: Power Core
+  powerCoreCenter: {fileID: 1884542419}
+  minAttractDist: 5
+  nameSearched: Power Core
+  anim: {fileID: 5400642609667826686}
+--- !u!1 &648685580
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 648685581}
+  - component: {fileID: 648685583}
+  - component: {fileID: 648685582}
+  m_Layer: 6
+  m_Name: Cube.002
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &648685581
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 648685580}
+  m_LocalRotation: {x: -0.00000013767877, y: 0.7071068, z: 0.70710677, w: 0.00000013767878}
+  m_LocalPosition: {x: -2.9796648, y: 0, z: 0}
+  m_LocalScale: {x: 100, y: 100, z: 100}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 345088602}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &648685583
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 648685580}
+  m_Mesh: {fileID: -1550514412580984892, guid: 87bf4dc087008ee42a03c6a42d1c8e43, type: 3}
+--- !u!23 &648685582
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 648685580}
+  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_RenderingLayerMask: 257
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: -3846018093981099296, guid: 87bf4dc087008ee42a03c6a42d1c8e43, type: 3}
+  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_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &932189020
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 932189024}
+  - component: {fileID: 932189021}
+  - component: {fileID: 932189023}
+  - component: {fileID: 932189022}
+  m_Layer: 6
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &932189024
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 932189020}
+  m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: 0, y: 0, z: -1.81}
+  m_LocalScale: {x: 0.0070680366, y: 0.0033333327, z: 0.008609853}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1361249005}
+  m_Father: {fileID: 345088602}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 2.5209854, y: -0.89}
+  m_SizeDelta: {x: 1920, y: 1080}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &932189021
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 932189020}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &932189023
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 932189020}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
+--- !u!114 &932189022
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 932189020}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!1 &1220123020
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1220123021}
+  - component: {fileID: 1220123023}
+  - component: {fileID: 1220123022}
+  m_Layer: 6
+  m_Name: Cylinder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1220123021
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1220123020}
+  m_LocalRotation: {x: 0.50000006, y: 0.50000006, z: -0.49999997, w: -0.49999994}
+  m_LocalPosition: {x: -0.5, y: 0, z: 0}
+  m_LocalScale: {x: 100, y: 100, z: 50}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 345088602}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1220123023
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1220123020}
+  m_Mesh: {fileID: 2534964839176971238, guid: 87bf4dc087008ee42a03c6a42d1c8e43, type: 3}
+--- !u!23 &1220123022
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1220123020}
+  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_RenderingLayerMask: 257
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: -876546973899608171, guid: 87bf4dc087008ee42a03c6a42d1c8e43, type: 3}
+  - {fileID: -876546973899608171, guid: 29efc340a7cbef649a8c21ee1939352c, type: 3}
+  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_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &1361249004
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1361249005}
+  - component: {fileID: 1361249007}
+  - component: {fileID: 1361249006}
+  m_Layer: 6
+  m_Name: Interaction Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1361249005
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1361249004}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -275}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 932189024}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1394, y: 112}
+  m_SizeDelta: {x: 1000, y: 500}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1361249007
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1361249004}
+  m_CullTransparentMesh: 1
+--- !u!114 &1361249006
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1361249004}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Insert Power Core
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 245.6
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 18
+  m_fontSizeMax: 1000
+  m_fontStyle: 1
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: -207.84943, y: -213.57129, z: -243.51343, w: -115.010254}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &1884542418
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1884542419}
+  m_Layer: 6
+  m_Name: Center
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1884542419
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1884542418}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 345088602}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5400642608385724822
 GameObject:
  m_ObjectHideFlags: 0
@ -57,16 +663,17 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5400642609667826684}
-  m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
  m_LocalPosition: {x: -1.47, y: 0.5, z: -5.8628845}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 5582307034284941001}
  - {fileID: 5582307032929443851}
+  - {fileID: 345088602}
  m_Father: {fileID: 0}
  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!65 &5400642609667826672
 BoxCollider:
  m_ObjectHideFlags: 0
@ -235,6 +842,22 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 0.0020000006, y: 0.02, z: 0.03999999}
  m_Center: {x: -0.000000007450581, y: 9.313226e-10, z: 0}
+--- !u!208 &1620583442
+NavMeshObstacle:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6555725971114716111}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Shape: 1
+  m_Extents: {x: 0.001, y: 0.010000001, z: 0.020000001}
+  m_MoveThreshold: 0.1
+  m_Carve: 1
+  m_CarveOnlyStationary: 1
+  m_Center: {x: 0, y: 0, z: 0}
+  m_TimeToStationary: 0.5
 --- !u!1001 &5400642609638131680
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -354,3 +977,19 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 0.0020000006, y: 0.02, z: 0.03999999}
  m_Center: {x: 0.000000011175871, y: 0.0000000037252903, z: 0.0000000018626451}
+--- !u!208 &1726642995
+NavMeshObstacle:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6555725969758557453}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Shape: 1
+  m_Extents: {x: 0.001, y: 0.010000001, z: 0.020000001}
+  m_MoveThreshold: 0.1
+  m_Carve: 1
+  m_CarveOnlyStationary: 1
+  m_Center: {x: 0, y: 0, z: 0}
+  m_TimeToStationary: 0.5
--- a/Assets/Scenes/Experimentation/EnemyExperimentation1.unity
+++ b/Assets/Scenes/Experimentation/EnemyExperimentation1.unity
--- a/Assets/Scenes/Experimentation/EnemyExperimentation1/NavMesh.asset
+++ b/Assets/Scenes/Experimentation/EnemyExperimentation1/NavMesh.asset
--- a/Assets/Scenes/ShootingScene.meta
+++ b/Assets/Scenes/ShootingScene.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 98d2b1320130acf48be2f0a956c50221
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/ShootingScene.unity
+++ b/Assets/Scenes/ShootingScene.unity
--- a/Assets/Scenes/ShootingScene/NavMesh.asset
+++ b/Assets/Scenes/ShootingScene/NavMesh.asset
--- a/Assets/Scenes/ShootingScene/NavMesh.asset.meta
+++ b/Assets/Scenes/ShootingScene/NavMesh.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 37a82a05ea56f424cbe6680ce297f236
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/StartScreen2.unity
+++ b/Assets/Scenes/StartScreen2.unity
@ -5310,7 +5310,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 934156617}
-  m_RootOrder: 14
+  m_RootOrder: 12
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &580239657
 MeshCollider:
@ -7827,6 +7827,134 @@ Transform:
  m_Father: {fileID: 932164085}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &887813314
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 887813316}
+  - component: {fileID: 887813315}
+  m_Layer: 0
+  m_Name: BackgroundMusicSource
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!82 &887813315
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 887813314}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: bc5896513dad4a7498f18ac8752d3d75, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!4 &887813316
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 887813314}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.8332176, y: 2.6615357, z: -5.548581}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 26
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &891492413
 GameObject:
  m_ObjectHideFlags: 0
@ -8354,11 +8482,11 @@ Transform:
  - {fileID: 95507227}
  - {fileID: 121866826}
  - {fileID: 2101320871}
-  - {fileID: 1977789705}
-  - {fileID: 1568346554}
  - {fileID: 580239656}
  - {fileID: 1169865804}
  - {fileID: 1549543972}
+  - {fileID: 1977789705}
+  - {fileID: 1568346554}
  m_Father: {fileID: 0}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -9947,7 +10075,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 934156617}
-  m_RootOrder: 15
+  m_RootOrder: 13
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1169865805
 MeshCollider:
@ -12830,7 +12958,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 934156617}
-  m_RootOrder: 16
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1549543973
 MeshCollider:
--- a/Assets/Scripts/CharacterControllerForce.cs
+++ b/Assets/Scripts/CharacterControllerForce.cs
@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CharacterControllerForce : MonoBehaviour
+{
+    float mass = 3f; // defines the character mass
+    Vector3 impact = Vector3.zero;
+    private CharacterController character;
+ 
+    void Start()
+    {
+        
+        character = this.gameObject.GetComponent<CharacterController>();
+    }
+
+    // call this function to add an impact force:
+    public void AddImpact(Vector3 dir, float force)
+    {
+        dir.Normalize();
+        if (dir.y < 0) dir.y = -dir.y; // reflect down force on the ground
+        impact += dir.normalized * force / mass;
+    }
+
+    void Update()
+    {
+        // apply the impact force:
+        if (impact.magnitude > 0.2) 
+            character.Move(impact * Time.deltaTime);
+        // consumes the impact energy each cycle:
+        impact = Vector3.Lerp(impact, Vector3.zero, 5 * Time.deltaTime);
+    }
+}
--- a/Assets/Scripts/CharacterControllerForce.cs.meta
+++ b/Assets/Scripts/CharacterControllerForce.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1fb5120753ff7544bb106f2fcaaad636
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Enemies/AI/SkinlessMonsterAnimator.cs
+++ b/Assets/Scripts/Enemies/AI/SkinlessMonsterAnimator.cs
@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEditor.Rendering;
 using UnityEngine;
+using UnityEngine.Events;

 public class SkinlessMonsterAnimator : MonoBehaviour
 {
@ -9,56 +10,144 @@ public class SkinlessMonsterAnimator : MonoBehaviour
    private Animator animator;
    private float speed = 0f;

+    [SerializeField]
+    [Tooltip("This is the object with the skin dissolve material")]
+    private GameObject modelObject;
+    [SerializeField]
+    private List<GameObject> objectsThatFallOnDeath= new List<GameObject>();
+
+    private Material dissolveMaterial;
+    private bool isAlive = true;
+    [SerializeField]
+    private float deathSpeed = 5f;
+    private float curDeathSpeed = 5f;
+
+    private bool isRunning = false;
+    public bool IsRunning { get { return isRunning; } }
+    [SerializeField]
+    private float fastDeathduration = 1f;
+    [SerializeField]
+    private float deathDuration = 5f;
+    [SerializeField]
+    private string deathAnimationName = "PainScream";
+

    // Start is called before the first frame update
    void Start()
    {
-
+        dissolveMaterial = modelObject.GetComponent<SkinnedMeshRenderer>().materials[0];
+        curDeathSpeed = deathSpeed;
    }

    // Update is called once per frame
    void Update()
    {
+        
+        if (isAlive)
+        {
+            animator.SetFloat("Speed", speed);
+            
+        }
+        else
+        {
+            
+            float quantity = dissolveMaterial.GetFloat("_DissolveQuantity");
+            quantity = Mathf.Lerp(quantity, -2, Time.deltaTime *curDeathSpeed);
+            dissolveMaterial.SetFloat("_DissolveQuantity", quantity);
+        }

-        animator.SetFloat("speed", speed);
-
+       
    }

    public void StartMoving()
    {
-        speed = 1;
+        if (isAlive)
+        {
+            isRunning = true;
+            speed = 1;
+        }
+        
        
        
    }
    public void StopMoving()
    {
-        speed = 0;
+        if (isAlive)
+        {
+            speed = 0;
+            isRunning = false;
+        }
+        
        
    }
    public void Attack()
    {
-        animator.SetTrigger("Attack");
+        if (isAlive)
+        {
+            animator.SetTrigger("Attack");
+           
+
+        }
+        
+        
    }
+
+
    /// <summary>
    /// 0,1,2,3
    /// </summary>
    /// <param name="attackType"></param>
    public void SetAttackType(int attackType)
    {
+        
        animator.SetInteger("AttackIndex", attackType);
    }
    public void InLight()
    {
+        if(isAlive)
        animator.SetBool("InLight", true);
    }
    public void NotInLight()
    {
+        if(isAlive)
        animator.SetBool("InLight", false);
    }

    public void AttackScream()
    {
+        if(isAlive)
        animator.SetTrigger("AttackScream");
    }

+    public void Kill(bool fast = false)
+    {
+        //animator.speed = 0;
+        InLight();
+        //animator.Play(this.deathAnimationName);
+
+        isAlive = false;
+        foreach(GameObject obj in this.objectsThatFallOnDeath)
+        {
+            obj.AddComponent<Rigidbody>();
+            if (obj.GetComponent<Collider>() != null)
+            {
+                obj.GetComponent<Collider>().enabled = false;
+            }
+        }
+        float dur = this.deathDuration;
+        if (fast)
+        {
+            dur = this.fastDeathduration;
+            curDeathSpeed = deathSpeed * (this.deathDuration / this.fastDeathduration);
+        }
+        StartCoroutine(destroyAfterSeconds(dur));
+    }
+
+    
+    private IEnumerator destroyAfterSeconds(float duration)
+    {
+        yield return new WaitForSeconds(duration);
+        Destroy(this.gameObject);
+    }
+
 }
--- a/Assets/Scripts/Enemies/AI/SkinlessMonsterComponent.cs
+++ b/Assets/Scripts/Enemies/AI/SkinlessMonsterComponent.cs
@ -12,34 +12,315 @@ public class SkinlessMonsterComponent : MonoBehaviour
    private NavMeshAgent agent;
    [SerializeField]
    private SkinlessMonsterAnimator animator;
-
-    private bool inRangeOfTarget = false;
+    private bool inDamageRange = false;
+    private bool inDamageMargin = false;
    private bool atTarget = false;
    [SerializeField]
-    private float atTargetDistance = 3;
+    private float atTargetDistance = 2;
    private TargetInformation target;

+    [SerializeField]
+    private float health = 2f;

-    private void Update()
+
+    private bool isAlive = true;
+
+
+
+    private Vector3 oppositeVector;
+
+    private PlayerComponent player;
+    private float distanceToPlayer;
+    private FlareRegister flareRegister;
+    [SerializeField]
+    [Tooltip("This is the angle of visibility the enemy has")]
+    private float visibilityConeLimit = 90f;
+    [SerializeField]
+    private float bulletSoundRange = 15f;
+
+    private GameObject targetObject;
+    [SerializeField]
+    private float newTargetCooldown = 5f;
+    private float timeSinceTarget = 0f;
+
+
+    private void Awake()
    {
-        
-        if (target != null)
+        //Find active player rn.
+        PlayerComponent[] players = GameObject.FindObjectsOfType<PlayerComponent>();
+        foreach (PlayerComponent p in players)
        {
-            //Update booleans for movement
-            float distToTarget = Vector3.Distance(target.target.transform.position, agent.transform.position);
-            atTarget = atTargetDistance >= distToTarget;
-            if (target.hasDamageRange)
+            if (p.isActiveAndEnabled)
            {
-                inRangeOfTarget = target.damageRange <= distToTarget;
+                player = p;
+            }
+        }
+        
+    }
+
+    private void Start()
+    {
+        flareRegister = GameObject.FindObjectOfType<FlareRegister>();
+        if (targetObject == null)
+            targetObject = new GameObject();
+        targetObject.name = "Enemy Target";
+        
+    }
+    
+    void HandleTargetOperations()
+    {
+        //Update booleans for movement
+        float distToTarget = Vector3.Distance(target.target.transform.position, agent.transform.position);
+        atTarget = atTargetDistance >= distToTarget;
+        if (target.hasDamageRange)
+        {
+            inDamageRange = target.damageRange <= distToTarget;
+            inDamageMargin = target.damageMargin + target.damageRange <= distToTarget;
+        }
+        else
+        {
+            inDamageRange = false;
+            inDamageMargin = false;
+        }
+        //Perform actions.
+        if (target.runTowards)
+        {
+            if (inDamageRange)
+            {
+                //Damage is being dealt
+                animator.InLight();
+                //Deal Damage
+                health -= Time.deltaTime;
+                if (health < 0 && this.isAlive)
+                {
+                    this.Kill();
+                }
+
+            }
+            else if (inDamageMargin)
+            {
+                //Effective stop
+                agent.SetDestination(transform.position);
+                animator.StopMoving();
+
            }
            else
            {
-                inRangeOfTarget = false;
-            }
-            //Perform actions.
+                if (atTarget)
+                {
+                    //Effective stop
+                    agent.SetDestination(transform.position);
+                    animator.StopMoving();
+                    if (target.isHostile)
+                    {
+                       
+                        animator.Attack();
+                        animator.SetAttackType(Random.Range(0, 0));
+                            
+                        
+                        
+                        
+                    }

+                }
+                else
+                {
+                    agent.SetDestination(target.target.transform.position);
+                    animator.StartMoving();
+                    animator.NotInLight();
+                }
+
+            }
+        }
+        else
+        {
+            //Run away logic
+            if (atTarget || distToTarget < 3)
+            {
+                animator.StopMoving();
+            }
+            else
+            {
+                Ray r = new Ray();
+                r.origin = transform.position;
+                r.direction = oppositeVector;
+                RaycastHit hit;
+                if (Physics.Raycast(r, out hit))
+                {
+
+                    animator.StartMoving();
+                    agent.SetDestination(hit.point);
+                }
+                else
+                {
+
+                    agent.SetDestination(transform.position + oppositeVector * 100);
+                    agent.isStopped = false;
+                }
+            }

        }
+
+        if (atTarget&&target.isHostile)
+        {
+            SlowLookAt(target.target.transform.position-transform.position);  
+        }
+    }
+    void SlowLookAt(Vector3 targetVector,float animatedRotationSpeed=1f)
+    {
+        Vector3 relativePos = targetVector;
+        Quaternion toRotation = Quaternion.LookRotation(relativePos);
+
+        transform.rotation = Quaternion.Lerp(transform.rotation, toRotation, animatedRotationSpeed * Time.deltaTime);
+
+    }
+
+    void CheckForAOERanges()
+    {
+        foreach(BulletComponent bullet in flareRegister.bullets)
+        {
+            float dist = Vector3.Distance(bullet.transform.position, transform.position);
+            if (dist <= bullet.DamageRange)
+            {
+                this.health = 0;
+                this.Kill(true);
+            }
+        }
+        foreach(FlareBeacon beacon in flareRegister.beacons)
+        {
+            float dist = Vector3.Distance(beacon.transform.position, transform.position);
+            if (dist <= beacon.Range)
+            {
+                this.health = 0f;
+                
+            }
+        }
+        if (this.health <= 0)
+        {
+            this.Kill();
+        }
+    }
+
+    public bool isPlayerVisible(bool withAngle)
+    {
+        Ray r = new Ray();
+        r.origin = transform.position;
+        r.direction = player.transform.position - transform.position;
+        Vector3 toPosition = (player.transform.position - transform.position).normalized;
+        float angleToPosition = Vector3.Angle(transform.forward, toPosition);
+        
+        
+        RaycastHit hit;
+        if(Physics.Raycast(r, out hit))
+        {
+            
+            GameObject hitObject = hit.transform.gameObject;
+            
+            if (hitObject.GetComponent<PlayerComponent>() != null)
+            {
+                //hit player
+                return angleToPosition <= this.visibilityConeLimit||!withAngle;
+                
+            }else if (hitObject.GetComponentInParent<PlayerComponent>() != null)
+            {
+                //also hit player
+                return angleToPosition <= this.visibilityConeLimit||!withAngle;
+            }
+            
+        }
+        return false;
+    }
+
+    void SetLiveTargeting()
+    {
+        if (!isAlive)
+        {
+            //this.targetObject.transform.position = transform.position;
+            this.Stop();
+        }
+
+        distanceToPlayer = Vector3.Distance(this.transform.position, player.transform.position);
+        //print("Dist Comparison "+distanceToPlayer.ToString()+" Noise:"+player.NoiseManager.NoiseDistance);
+        bool isPlayerVisible = this.isPlayerVisible(true);
+        //check if player is heard or player line of sight
+        if (distanceToPlayer <= player.NoiseManager.NoiseDistance||isPlayerVisible)
+        {
+            //check that nothing in between
+            if (this.isPlayerVisible(false))
+            {
+                this.Target(player.gameObject, true);
+            }
+            
+        }
+        else
+        {
+            if (this.timeSinceTarget < this.newTargetCooldown)
+            {
+                //no further targeting
+                //Stop();
+                return;
+            }
+            
+            BulletComponent closestBullet = null;
+            float closestDistance = Mathf.Infinity;
+            foreach(BulletComponent bullet in this.flareRegister.bullets)
+            {
+                float bDist = Vector3.Distance(bullet.transform.position, transform.position);
+                if (closestBullet==null||(bDist< bulletSoundRange&&bDist<closestDistance))
+                {
+                    closestBullet = bullet;
+                    closestDistance = bDist;
+                }
+            }
+            if (closestBullet != null)
+            {
+               
+                targetObject.transform.position= closestBullet.transform.position;
+                this.Target(targetObject,false);
+            }
+            else
+            {
+
+                targetObject.transform.position = transform.position;
+                this.Target(targetObject,false);
+                this.Stop();
+            }
+        }
+    }
+
+    private void Update()
+    {
+        if (!player.IsAlive)
+        {
+            Stop();
+        }
+        
+        if (target != null)
+        {
+            HandleTargetOperations();
+        }
+        CheckForAOERanges();
+        if(isAlive&&player.IsAlive)
+            SetLiveTargeting();
+        timeSinceTarget += Time.deltaTime;
+
+        /*
+            AI Behavior:
+            A. If not targeting player
+                1. Get distance to player
+                    - if distance < player.NoiseDistance then target player.
+                2. Raycast to player to test line of sight
+                    - if in line of sight and angle between LOS vector and forward vector is < LOF margin, then
+                    target player.
+            B. If targeting player
+                1. If out of sound range and no line of sight then lose target.
+                    - stop()
+                2. If beacon placed down and in range
+                    - remove agent
+                    - kill()
+                3. If beacon placed down and in margin:
+                    - stop() and wait for player to leave AOE (enforced by navigation).
+         */
    }
    /*
    STANDARD BEHAVIOR:
@ -58,17 +339,32 @@ private void Update()
    //Runs towards target. If its meant to be hostile, it will melee attack once in range.
    public void Target(GameObject obj,bool hostile=false)
    {
-        if(target.target!= obj)
+        if(target == null || target.target!= obj)
        {
            //target = new TargetInformation(obj,hostile,false,runTowards:true);
+            target = new TargetInformation();
+            target.target = obj;
+            target.isHostile = hostile;
+            target.hasDamageRange = false;
+            target.runTowards = true;
+            timeSinceTarget = 0;
+            
        }
    }
    //Runs towards flare such that it stops randomly within margin before range.
    public void TargetFlare(GameObject obj,float range,float margin)
    {
-        if(target.target != obj)
+        if(target == null || target.target != obj)
        {
            //target = new TargetInformation(obj, false, true, range, margin,runTowards:true);
+            target = new TargetInformation();
+            target.target = obj;
+            target.isHostile = false;
+            target.hasDamageRange = true;
+            target.damageRange = range;
+            target.damageMargin = margin;
+            target.runTowards = true;
+            timeSinceTarget = 0;
        }
    }
    /// <summary>
@ -79,13 +375,53 @@ public void TargetFlare(GameObject obj,float range,float margin)
    /// <param name="minRange"></param>
    /// <param name="minMargin"></param>
    public void RunAwayFrom(GameObject obj,float minRange,float minMargin) {
-        if(target.target != obj)
+        if(target== null ||target.target != obj)
        {
            //target = new TargetInformation(obj, false, true, minRange, minMargin, false);
+            target = new TargetInformation();
+            target.target = obj;
+            target.isHostile = false;
+            target.hasDamageRange = true;
+            target.damageRange = minRange;
+            target.damageMargin = minMargin;
+            target.runTowards = false;
+            oppositeVector = -(target.target.transform.position - transform.position).normalized;
+            timeSinceTarget = 0;
        }
    }

-   
+    public void Stop()
+    {
+        target = new TargetInformation();
+        target.target = this.gameObject;
+        target.isHostile = false;
+        target.hasDamageRange = false;
+        target.runTowards = true;
+        
+    }
+
+    public void Kill(bool fast=false)
+    {
+        if (this.isAlive)
+        {
+            this.animator.Kill(fast);
+            this.isAlive = false;
+            agent.isStopped = true;
+            
+        }
+
+    }
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.gameObject.GetComponent<BulletComponent>() != null)
+        {
+            
+            this.health -= other.gameObject.GetComponent<BulletComponent>().DamageMagnitude;
+        }
+    }
+
+  
+
 }
 class TargetInformation
 {
--- a/Assets/Scripts/Enemies/AI/Tester.meta
+++ b/Assets/Scripts/Enemies/AI/Tester.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb4695679f3562e48be282f6f41c7c98
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Enemies/AI/Tester/TestSkinnlessMonster.cs
+++ b/Assets/Scripts/Enemies/AI/Tester/TestSkinnlessMonster.cs
@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TestSkinnlessMonster : MonoBehaviour
+{
+    [SerializeField]
+    private SkinlessMonsterComponent monster;
+    [SerializeField]
+    private Camera cam;
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.Alpha1))
+        {
+            monster.Target(cam.gameObject, true);
+        }
+        if (Input.GetKeyDown(KeyCode.Alpha2))
+        {
+            monster.TargetFlare(cam.gameObject, 1, 1);
+        }
+        if (Input.GetKeyDown(KeyCode.Alpha3))
+        {
+            
+            monster.RunAwayFrom(cam.gameObject, 1, 1);
+        }
+        if (Input.GetKeyDown(KeyCode.Alpha0))
+        {
+            monster.Stop();
+        }
+    }
+}
--- a/Assets/Scripts/Enemies/AI/Tester/TestSkinnlessMonster.cs.meta
+++ b/Assets/Scripts/Enemies/AI/Tester/TestSkinnlessMonster.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7669ff0185daae442aef0aafc331fdbb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Enemies/MonsterComponent.cs
+++ b/Assets/Scripts/Enemies/MonsterComponent.cs
@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MonsterComponent : MonoBehaviour
+{
+
+    [SerializeField]
+    private float attackDamage = 1f;
+    public float AttackDamage { get { return this.attackDamage; } }
+
+    [SerializeField]
+    private bool shakeCameraOnHit = true;
+    public bool ShakeCameraOnHit { get { return this.shakeCameraOnHit; } }
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Assets/Scripts/Enemies/MonsterComponent.cs.meta
+++ b/Assets/Scripts/Enemies/MonsterComponent.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 14a29478dda21134ab3eef7c2c3f6d93
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Item/FlareBeacon/FlareBeacon.cs
+++ b/Assets/Scripts/Item/FlareBeacon/FlareBeacon.cs
@ -7,6 +7,7 @@ public class FlareBeacon : MonoBehaviour
 {
    [SerializeField]
    private float range = 1;
+    public float Range { get { return range; }}
    [SerializeField]
    private float duration = 5f;

@ -14,6 +15,7 @@ public class FlareBeacon : MonoBehaviour
    [SerializeField]
    private NavMeshObstacle obstacle;

+    private FlareRegister register;
    void OnDrawGizmosSelected()
    {
        // Draw a yellow sphere at the transform's position
@ -24,6 +26,8 @@ void OnDrawGizmosSelected()
    // Start is called before the first frame update
    void Start()
    {
+        register = FlareRegister.instance;
+        register.beacons.Add(this);
        transform.localEulerAngles = new Vector3(-89.98f, 0, 0);
        Ray r = new Ray();
        r.direction = -transform.forward;
@ -42,6 +46,8 @@ void Start()
        if(Physics.Raycast(r,out hit)){
           // transform.position = hit.point;
        }
+
+        if(obstacle!=null)
        obstacle.radius = this.range / 10;
    }

--- a/Assets/Scripts/Item/FlareBeacon/FlareBeacon.cs.meta
+++ b/Assets/Scripts/Item/FlareBeacon/FlareBeacon.cs.meta
--- a/Assets/Scripts/Item/Pistol/BulletComponent.cs
+++ b/Assets/Scripts/Item/Pistol/BulletComponent.cs
@ -9,11 +9,18 @@ public class BulletComponent : MonoBehaviour
    private float existed = 0f;
    [SerializeField]
    private string type = "flare";
-
+    private FlareRegister register;
+    [SerializeField]
+    private float damageRange = 20f;
+    [SerializeField]
+    private float damageMagnitude = 1f;
+    public float DamageMagnitude { get { return this.damageMagnitude; } }
+    public float DamageRange { get { return damageRange; } }
    // Start is called before the first frame update
    void Start()
    {
-        
+        register = FlareRegister.instance;
+        register.bullets.Add(this);
    }

    // Update is called once per frame
@ -25,6 +32,7 @@ private void FixedUpdate()
    {
        if(existed >= duration)
        {
+            register.bullets.Remove(this);
            Destroy(this.gameObject);
        }
        existed += Time.fixedDeltaTime;
--- a/Assets/Scripts/Item/Pistol/PistolComponent.cs
+++ b/Assets/Scripts/Item/Pistol/PistolComponent.cs
@ -25,6 +25,7 @@ public class PistolComponent : MonoBehaviour
    [SerializeField]
    private float maxProjectileDuration = 5f;

+
    

    //private Dictionary<int,float> projectiles = new Dictionary<int, float>(); 
@ -32,7 +33,7 @@ public class PistolComponent : MonoBehaviour
    // Start is called before the first frame update
    void Start()
    {
-        
+
    }

    // Update is called once per frame
@ -66,7 +67,7 @@ private void FixedUpdate()
            {
                targetObject.gameObject.transform.position = hit.point;
                float drop = CalculateDrop(this.bulletSpawnPoint.position, hit.point, this.transform.up * this.firePower);
-                print(drop);
+                //print(drop);
                
            }
        }
@ -84,6 +85,8 @@ public void Fire()
        Rigidbody pRigid = projectile.GetComponent<Rigidbody>();
        pRigid.AddForce(pRigid.transform.up*this.firePower, ForceMode.Impulse);
        projectile.transform.parent = null;
+
+        
        
    }
    public void Enable()
--- a/Assets/Scripts/Item/Registers.meta
+++ b/Assets/Scripts/Item/Registers.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 90f48ba02e4248644b7c711ebd9b212f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Item/Registers/FlareRegister.cs
+++ b/Assets/Scripts/Item/Registers/FlareRegister.cs
@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FlareRegister : MonoBehaviour
+{
+    public List<BulletComponent> bullets= new List<BulletComponent>();
+    
+    public List<FlareBeacon> beacons= new List<FlareBeacon>();
+
+    public static FlareRegister instance;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        instance = this;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Assets/Scripts/Item/Registers/FlareRegister.cs.meta
+++ b/Assets/Scripts/Item/Registers/FlareRegister.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 788a4240e87c8654fa8813057977c848
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Item/SpecialItemCycler.cs
+++ b/Assets/Scripts/Item/SpecialItemCycler.cs
@ -34,10 +34,12 @@ public class SpecialItemCycler : MonoBehaviour
    private TMP_Text selectedQuantityText;
    private Color sqtInitColor;

+
    // Start is called before the first frame update
    void Start()
    {
-        sqtInitColor = selectedQuantityText.color;   
+        sqtInitColor = selectedQuantityText.color;
+        
    }

    // Update is called once per frame
@ -81,7 +83,7 @@ void Update()
                    instance.transform.localPosition = Vector3.zero;
                    instance.transform.parent = null;
                    invent.Remove(spawnableItems[spawnableIndex].name);
-                
+                    
                }
        }

--- a/Assets/Scripts/Player/NoiseVisibilitySettingsManager.cs
+++ b/Assets/Scripts/Player/NoiseVisibilitySettingsManager.cs
@ -0,0 +1,72 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+public class NoiseVisibilitySettingsManager : MonoBehaviour
+{
+    [SerializeField]
+    private float sneakNoiseDistance = 5f;
+    [SerializeField]
+    private float runNoiseDistance = 10f;
+    [SerializeField]
+    private float shootNoiseDistance = 30f;
+    [SerializeField]
+    private float standNoiseDistance = 0f;
+    private float noiseDistance = 0f;
+    
+    public float SneakNoiseDistance { get { return sneakNoiseDistance; } }
+    public float RunNoiseDistance { get { return runNoiseDistance; } }
+    public float ShootNoiseDistance { get { return shootNoiseDistance; } }
+    public float StandNoiseDistance { get { return standNoiseDistance; } }
+
+    public float NoiseDistance { get { return this.noiseDistance; } }
+
+    private float timeSinceLastShot = 0f;
+    [SerializeField]
+    private float shootNoiseDuration = 2f;
+    private bool isSneaking = false;
+    private bool isRunning = false;
+
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (timeSinceLastShot>0)
+        {
+            this.noiseDistance = this.shootNoiseDistance;
+        }
+        else if (isRunning)
+        {
+            this.noiseDistance = this.runNoiseDistance;
+        }else if (isSneaking)
+        {
+            this.noiseDistance = this.sneakNoiseDistance;
+        }
+        else
+        {
+            this.noiseDistance = standNoiseDistance;
+        }
+
+        timeSinceLastShot -= Time.deltaTime;
+    }
+
+    public void ShotFired()
+    {
+        this.timeSinceLastShot = this.shootNoiseDuration;
+    }
+    public void SetRunning(bool isRunning)
+    {
+        this.isRunning = isRunning;
+    }
+    public void SetSneaking(bool isSneaking)
+    {
+        this.isSneaking= isSneaking;
+    }
+}
--- a/Assets/Scripts/Player/NoiseVisibilitySettingsManager.cs.meta
+++ b/Assets/Scripts/Player/NoiseVisibilitySettingsManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1179093e6fa69e045838868718a12c58
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Player/PlayerAnimationController.cs
+++ b/Assets/Scripts/Player/PlayerAnimationController.cs
@ -42,9 +42,10 @@ public void Animate(PlayerQuickAnimationType animation)
        }
    }
    
-    public void Hit()
+    public void Hit(bool isDead)
    {
        animController.SetTrigger("WasHit");
+        animController.SetBool("IsDead", isDead);
    }

    // Start is called before the first frame update
--- a/Assets/Scripts/Player/PlayerComponent.cs
+++ b/Assets/Scripts/Player/PlayerComponent.cs
@ -0,0 +1,98 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Cinemachine;
+
+
+public class PlayerComponent : MonoBehaviour
+{
+    [SerializeField]
+    private float health = 5f;
+    [SerializeField]
+    private float maxHealth = 5f;
+    [SerializeField]
+    private float stamina = 20f;
+    [SerializeField]
+    private float maxStamina = 20f;
+
+    [SerializeField] private NoiseVisibilitySettingsManager noiseManager;
+    [SerializeField] private PlayerMovementController movementController;
+
+    public NoiseVisibilitySettingsManager NoiseManager { get { return this.noiseManager; } }
+    public PlayerMovementController MovementController { get { return movementController; } }
+    [SerializeField]
+    private PlayerAnimationController animationController;
+
+    [HideInInspector]
+    public FlareRegister flareRegister;
+    [SerializeField]
+    private CinemachineFreeLook cameraFreeLook;
+    private float shakeTimer = 0;
+    CinemachineBasicMultiChannelPerlin perlin;
+    [SerializeField]
+    private float knockbackDuration = 1f;
+    [SerializeField]
+    private float knockbackDistance = 5f;
+    [HideInInspector]
+    public bool IsAlive { get { return this.health > 0; } }
+    private void Awake()
+    {
+        flareRegister = GameObject.FindObjectOfType<FlareRegister>();
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+        perlin = cameraFreeLook.GetRig(1).GetCinemachineComponent<CinemachineBasicMultiChannelPerlin>();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        NoiseManager.SetRunning(MovementController.IsRunning);
+
+        if (shakeTimer > 0)
+        {
+            shakeTimer -= Time.deltaTime;
+            
+           // perlin.m_AmplitudeGain = 0;
+            perlin.m_AmplitudeGain = Mathf.Lerp(perlin.m_AmplitudeGain, 0, .1f);
+            if (shakeTimer <= 0f)
+            {
+                
+                perlin.m_AmplitudeGain = 0;
+            }
+        }
+        
+    }
+
+    
+
+    public void ShakeCamera(float intensity, float time)
+    {
+        CinemachineBasicMultiChannelPerlin perlin = cameraFreeLook.GetRig(1).GetCinemachineComponent<CinemachineBasicMultiChannelPerlin>();
+        perlin.m_AmplitudeGain= intensity;
+        shakeTimer = time;
+    }
+
+    public void Damage(float damage,bool applyShake=false)
+    {
+        this.health-=damage;
+        if (applyShake)
+        {
+            ShakeCamera(15, 5);
+        }
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.CompareTag("Damaging"))
+        {
+            MonsterComponent monster = other.GetComponentInParent<MonsterComponent>();
+            
+            this.Damage(monster.AttackDamage, monster.ShakeCameraOnHit);
+            animationController.Hit(this.health<=0);
+            this.movementController.PhysicalForceMove((transform.position - monster.transform.position)*knockbackDistance);
+            this.movementController.LockMovement(this.knockbackDuration);
+        }
+    }
+}
--- a/Assets/Scripts/Player/PlayerComponent.cs.meta
+++ b/Assets/Scripts/Player/PlayerComponent.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 86fd72b889d47804e844e0bc9c04218d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Player/PlayerInteractionHandler.cs
+++ b/Assets/Scripts/Player/PlayerInteractionHandler.cs
@ -38,6 +38,9 @@ public class PlayerInteractionHandler : MonoBehaviour
    private bool useItemSelector = true;
    [SerializeField]
    private PistolComponent pistol;
+    [SerializeField]
+    private NoiseVisibilitySettingsManager noiseManager;
+    
    

    // Start is called before the first frame update
@ -83,6 +86,7 @@ void Update()
                if (tempInvent.GetQuantityOf(this.pistol.projectileName) > 0)
                {
                    this.pistol.Fire();
+                    this.noiseManager.ShotFired();
                    tempInvent.Remove(this.pistol.projectileName);
                }
                    
--- a/Assets/Scripts/Player/PlayerMovementController.cs
+++ b/Assets/Scripts/Player/PlayerMovementController.cs
@ -12,9 +12,12 @@ public class PlayerMovementController : MonoBehaviour
    private float mouseX = 0;

    private bool isRunning = false;
+    private bool isSneaking = false;
+    public bool IsRunning { get { return isRunning; } }
    [SerializeField]
    private CharacterController ccontroller;
-    
+    private CharacterControllerForce ccForceAddon;
+
    [SerializeField]
    private CameraController cameraController;

@ -31,13 +34,27 @@ public class PlayerMovementController : MonoBehaviour
    [HideInInspector]
    public bool AllowRotation = false;

+    [SerializeField]
+    private NoiseVisibilitySettingsManager noiseSettings;
+
+   
+
+
+    public float NoiseDistance { get { return this.noiseSettings.NoiseDistance; } }


    private Vector3 lookingDirectionVector;
+
+    private bool movementLocked = false;
    private void GetMovementOld()
    {
        x = Input.GetAxis("Horizontal");
        y = Input.GetAxis("Vertical");
+        if (movementLocked)
+        {
+            x = 0;
+            y = 0;
+        }
        isRunning = (Mathf.Abs(y) > 0.1f || Mathf.Abs(x) > 0.1f);
    }
    private void MovePlayer()
@ -64,13 +81,14 @@ private void GetJumpOld()
    // Start is called before the first frame update
    void Start()
    {
-        
+        ccForceAddon = ccontroller.gameObject.GetComponent<CharacterControllerForce>();
    }

    // Update is called once per frame
    void Update()
    {
-        AllowRotation = Input.GetMouseButton(1);
+        
+        AllowRotation = Input.GetMouseButton(1) || Input.GetAxis("Aim")>0.5f;
        GetMovementOld();
        MovePlayer();
        
@ -86,8 +104,13 @@ void Update()

            SlowLookAt(this.lookingDirectionVector);
        }
+
+        
    }

+
+  
+
    void SlowLookAt(Vector3 targetVector)
    {
        Vector3 relativePos = targetVector;
@ -96,4 +119,21 @@ void SlowLookAt(Vector3 targetVector)
        transform.rotation = Quaternion.Lerp(transform.rotation, toRotation, animatedRotationSpeed * Time.deltaTime);
        
    }
+    
+    public void PhysicalForceMove(Vector3 vector)
+    {
+        this.ccontroller.Move(vector);
+        ccForceAddon.AddImpact(vector, vector.magnitude);
+        
+    }
+    public void LockMovement(float duration)
+    {
+        StartCoroutine(lockMovement(duration));
+    }
+    private IEnumerator lockMovement(float duration)
+    {
+        movementLocked = true;
+        yield return new WaitForSeconds(duration);
+        movementLocked = false;
+    }
 }
--- a/Assets/Shaders/Dissolve2.shadergraph
+++ b/Assets/Shaders/Dissolve2.shadergraph
@ -146,6 +146,9 @@
        },
        {
            "m_Id": "859e89b1a3264041b2eca465aa9acd2b"
+        },
+        {
+            "m_Id": "8e852b7f2baa4862824c149e0534ae14"
        }
    ],
    "m_GroupDatas": [],
@ -333,6 +336,20 @@
                "m_SlotId": 1
            }
        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "8e852b7f2baa4862824c149e0534ae14"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "8b1576b024df4760aadb8991770b2741"
+                },
+                "m_SlotId": 0
+            }
+        },
        {
            "m_OutputSlot": {
                "m_Node": {
@ -1413,6 +1430,29 @@
    "m_SerializedDescriptor": "SurfaceDescription.NormalTS"
 }

+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "450f1ec0ddb147b9a38f399979129ed3",
+    "m_Id": 0,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
 {
    "m_SGVersion": 0,
    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
@ -2370,6 +2410,42 @@
    "m_Labels": []
 }

+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.PositionNode",
+    "m_ObjectId": "8e852b7f2baa4862824c149e0534ae14",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Position",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1582.400146484375,
+            "y": 4.799994945526123,
+            "width": 208.0,
+            "height": 312.8000183105469
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "450f1ec0ddb147b9a38f399979129ed3"
+        }
+    ],
+    "synonyms": [
+        "location"
+    ],
+    "m_Precision": 1,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 2,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Space": 0,
+    "m_PositionSource": 0
+}
+
 {
    "m_SGVersion": 3,
    "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
--- a/Assets/Shaders/Dissolve3.shadergraph
+++ b/Assets/Shaders/Dissolve3.shadergraph
--- a/Assets/Shaders/Dissolve3.shadergraph.meta
+++ b/Assets/Shaders/Dissolve3.shadergraph.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d2ddc79091f86244b9e41d99a956f4b5
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Assets/Textures/tempicons.meta
+++ b/Assets/Textures/tempicons.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2bda195298e6f7f42820f4cc3bd93570
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Textures/tempicons/Demo.png
+++ b/Assets/Textures/tempicons/Demo.png
--- a/Assets/Textures/tempicons/Demo.png.meta
+++ b/Assets/Textures/tempicons/Demo.png.meta
@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 0721a573d493710408b907a4fad0f47f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/VFXGraph/Dust.meta
+++ b/Assets/VFXGraph/Dust.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd3cbe869514af346aa8edb4b1dd376d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Documentation/Level
+++ b/Documentation/Level
@ -0,0 +1,9 @@
+FOR AI DESIGN:
+- Initial rooms have 1-2 enemies player can take out with boltw or together with flare.
+- Then one hallway full of enemies where player shoots a flare and kills all.
+
+- Then one room with large space where lots of enemies that are spread out. Player can lure them all into hallway to flare kill again.
+
+- Then one room with no enemies, but once powered opens hatches which drops enemies, encourage flare beacon.
+
+-
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@ -346,7 +346,7 @@ InputManager:
    descriptiveName: 
    descriptiveNegativeName: 
    negativeButton: 
-    positiveButton: 
+    positiveButton: joystick button 10
    altNegativeButton: 
    altPositiveButton: 
    gravity: 1000
@ -380,7 +380,7 @@ InputManager:
    negativeButton: 
    positiveButton: x
    altNegativeButton: 
-    altPositiveButton: joystick button 2
+    altPositiveButton: joystick button 3
    gravity: 1000
    dead: 0.001
    sensitivity: 1000
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -22,7 +22,7 @@ PlayerSettings:
  m_SplashScreenOverlayOpacity: 1
  m_SplashScreenAnimation: 1
  m_SplashScreenLogoStyle: 1
-  m_SplashScreenDrawMode: 0
+  m_SplashScreenDrawMode: 1
  m_SplashScreenBackgroundAnimationZoom: 1
  m_SplashScreenLogoAnimationZoom: 1
  m_SplashScreenBackgroundLandscapeAspect: 1
@ -39,7 +39,11 @@ PlayerSettings:
    y: 0
    width: 1
    height: 1
-  m_SplashScreenLogos: []
+  m_SplashScreenLogos:
+  - logo: {fileID: 10404, guid: 0000000000000000e000000000000000, type: 0}
+    duration: 2
+  - logo: {fileID: 21300000, guid: 0721a573d493710408b907a4fad0f47f, type: 3}
+    duration: 2
  m_VirtualRealitySplashScreen: {fileID: 0}
  m_HolographicTrackingLossScreen: {fileID: 0}
  defaultScreenWidth: 1920
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -5,6 +5,7 @@ TagManager:
  serializedVersion: 2
  tags:
  - Collectable
+  - Damaging
  layers:
  - Default
  - TransparentFX