fixes to slime death, attack function has proper timings

wandering implemented
2022-04-25 18:05:53 +03:00 · 2022-04-25 17:41:22 +03:00
52 changed files with 1439 additions and 27231 deletions
--- a/Pack/Materials/WandPack01.mat
+++ b/Pack/Materials/WandPack01.mat
@@ -108,8 +108,8 @@ Material:
    - _WorkflowMode: 1
    - _ZWrite: 1
    m_Colors:
-    - _BaseColor: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1}
-    - _Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
    - _SpecColor: {r: 0.102941155, g: 0.08477507, b: 0.08477507, a: 1}
--- a/Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
+++ b/Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 021cda96e596cdc4096a187243d67191
+guid: da52a93af762fab4ab9085821b0fb632
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
+++ b/Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: d23be2382af238e47b09ca4ec1043a40
-PrefabImporter:
+guid: 10f2e5d2e4dd2ba42b4dcf6195a74f02
+DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Engine/Editor/Packages/URP_Support.unitypackage.meta
+++ b/Engine/Editor/Packages/URP_Support.unitypackage.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 99edaaabf95b5b54b8e4bfd353c107e0
-PrefabImporter:
+guid: 8bc88477f037e96478019bba8de301fd
+DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Support/Materials/Foliage/URP_Grass.mat
+++ b/Support/Materials/Foliage/URP_Grass.mat
@@ -122,7 +122,7 @@ Material:
    - _WavingTint: {r: 1, g: 1, b: 1, a: 1}
    - _Wind: {r: 1, g: 1, b: 4, a: 8}
  m_BuildTextureStacks: []
--- !u!114 &3571172967903663832
+--- !u!114 &271370933472182076
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Support/Materials/Foliage/URP_GrassInteractive.mat
+++ b/Support/Materials/Foliage/URP_GrassInteractive.mat
@@ -123,7 +123,7 @@ Material:
    - _WavingTint: {r: 1, g: 1, b: 1, a: 1}
    - _Wind: {r: 1, g: 1, b: 4, a: 8}
  m_BuildTextureStacks: []
--- !u!114 &280269339420870476
+--- !u!114 &2538816319711087327
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Support/Materials/Foliage/URP_TreeBillboard.mat
+++ b/Support/Materials/Foliage/URP_TreeBillboard.mat
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8157234245191131702
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -95,3 +82,16 @@ Material:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &4609426864682373882
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
--- a/Support/Materials/Terrain/URP_4Splats.mat
+++ b/Support/Materials/Terrain/URP_4Splats.mat
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7227342547990357574
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -178,3 +165,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &8648607517174720714
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
--- a/Support/Materials/Terrain/URP_4Splats4Normals.mat
+++ b/Support/Materials/Terrain/URP_4Splats4Normals.mat
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1491364163425350603
+--- !u!114 &-3597665421656311537
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Support/Materials/Terrain/URP_8Splats.mat
+++ b/Support/Materials/Terrain/URP_8Splats.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-215921062122507535
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -173,16 +186,3 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &1629948885692042799
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
--- a/Support/Materials/Terrain/URP_GradientLookup.mat
+++ b/Support/Materials/Terrain/URP_GradientLookup.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3013306715965619580
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -97,16 +110,3 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &5220444891309534584
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
--- a/Support/Materials/Terrain/URP_VertexColor.mat
+++ b/Support/Materials/Terrain/URP_VertexColor.mat
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1389114357912770728
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -93,3 +80,16 @@ Material:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &7138810400319773702
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
--- a/Files/Animations/Arlo/Slime.controller
+++ b/Files/Animations/Arlo/Slime.controller
@@ -217,6 +217,28 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &-661908585856255301
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 2
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@@ -244,6 +266,12 @@ AnimatorController:
    m_DefaultInt: 0
    m_DefaultBool: 0
    m_Controller: {fileID: 9100000}
+  - m_Name: Wandering
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@@ -854,8 +882,10 @@ AnimatorState:
  m_Name: Die
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
+  m_Transitions:
+  - {fileID: -661908585856255301}
+  m_StateMachineBehaviours:
+  - {fileID: 7912422198382985104}
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
@@ -1037,7 +1067,7 @@ AnimatorStateMachine:
    m_Position: {x: 670, y: 550, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 1102835054974116572}
-    m_Position: {x: 280, y: 510, z: 0}
+    m_Position: {x: 40, y: 380, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 8194647877007136643}
    m_Position: {x: 300, y: 220, z: 0}
@@ -1054,7 +1084,7 @@ AnimatorStateMachine:
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
  m_EntryPosition: {x: 100, y: 150, z: 0}
-  m_ExitPosition: {x: 90, y: 510, z: 0}
+  m_ExitPosition: {x: 50, y: 440, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 1102546605246812244}
 --- !u!1101 &4009614032068998235
@@ -1064,7 +1094,10 @@ AnimatorStateTransition:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: 
-  m_Conditions: []
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: Wandering
+    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: 1102546605246812244}
  m_Solo: 0
@@ -1086,7 +1119,10 @@ AnimatorStateTransition:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: 
-  m_Conditions: []
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Wandering
+    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: 1102508070621265122}
  m_Solo: 0
@@ -1101,6 +1137,18 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!114 &7912422198382985104
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: aa7306c35f4c27d4daefb1259633b9d0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1102 &8194647877007136643
 AnimatorState:
  serializedVersion: 6
--- a/Files/Prefabs/Arlo/BossSlime.prefab
+++ b/Files/Prefabs/Arlo/BossSlime.prefab
@@ -362,6 +362,7 @@ GameObject:
  - component: {fileID: 9217037737240071080}
  - component: {fileID: 979664278525990523}
  - component: {fileID: 7068053744138324038}
+  - component: {fileID: -8446248727669723812}
  m_Layer: 0
  m_Name: BossSlime
  m_TagString: BossSlime
@@ -418,6 +419,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 2a6f17609e4d7c441b8f85c0f90c1a13, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  moveSpeed: 1
+  rotSpeed: 50
 --- !u!54 &979664278525990523
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -447,6 +450,28 @@ SphereCollider:
  serializedVersion: 2
  m_Radius: 0.6
  m_Center: {x: 0, y: 0.5, z: 0}
+--- !u!195 &-8446248727669723812
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8437010424349675124}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 4294967295
+  m_ObstacleAvoidanceType: 4
 --- !u!1 &8437097380876049792
 GameObject:
  m_ObjectHideFlags: 0
--- a/Files/Prefabs/Arlo/SlimePBR.prefab
+++ b/Files/Prefabs/Arlo/SlimePBR.prefab
@@ -362,6 +362,7 @@ GameObject:
  - component: {fileID: 9217037737240071080}
  - component: {fileID: 979664278525990523}
  - component: {fileID: 6363954507592996496}
+  - component: {fileID: 8521358267821330725}
  m_Layer: 0
  m_Name: SlimePBR
  m_TagString: Slime
@@ -418,6 +419,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 2a6f17609e4d7c441b8f85c0f90c1a13, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  moveSpeed: 1
+  rotSpeed: 100
 --- !u!54 &979664278525990523
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -447,6 +450,28 @@ SphereCollider:
  serializedVersion: 2
  m_Radius: 0.6
  m_Center: {x: 0, y: 0.5, z: 0}
+--- !u!195 &8521358267821330725
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8437010424349675124}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 1
+  m_BaseOffset: 0
+  m_WalkableMask: 4294967295
+  m_ObstacleAvoidanceType: 4
 --- !u!1 &8437097380876049792
 GameObject:
  m_ObjectHideFlags: 0
--- a/Files/Prefabs/JoonasP/Crystal_Earth.prefab
+++ b/Files/Prefabs/JoonasP/Crystal_Earth.prefab
@@ -1,233 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1887292331624740737
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1889838702387388435}
-  - component: {fileID: 1892274587892955109}
-  - component: {fileID: 1902513991474045951}
-  - component: {fileID: 1892274587892955131}
-  - component: {fileID: 1892274587892955130}
-  - component: {fileID: 1892274587892955128}
-  m_Layer: 10
-  m_Name: Crystal_Earth
-  m_TagString: Throwable
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1889838702387388435
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1887292331624740737}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -16.525, y: 3.151, z: 51.331}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1892274587892955109
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1887292331624740737}
-  m_Mesh: {fileID: 4300000, guid: 78ffc1ed5f72076498d0614872cf48ec, type: 3}
--- !u!23 &1902513991474045951
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1887292331624740737}
-  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: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 7dc61041e72c10b4c84ff3c93efbc5bf, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!54 &1892274587892955131
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1887292331624740737}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
--- !u!114 &1892274587892955130
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1887292331624740737}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_InteractionManager: {fileID: 0}
-  m_Colliders: []
-  m_InteractionLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_InteractionLayers:
-    m_Bits: 1
-  m_SelectMode: 0
-  m_CustomReticle: {fileID: 0}
-  m_FirstHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_LastHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_HoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_HoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FirstSelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_LastSelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Activated:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Deactivated:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnFirstHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnLastHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectCanceled:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnActivate:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnDeactivate:
-    m_PersistentCalls:
-      m_Calls: []
-  m_AttachTransform: {fileID: 0}
-  m_AttachEaseInTime: 0.15
-  m_MovementType: 2
-  m_VelocityDamping: 1
-  m_VelocityScale: 1
-  m_AngularVelocityDamping: 1
-  m_AngularVelocityScale: 1
-  m_TrackPosition: 1
-  m_SmoothPosition: 0
-  m_SmoothPositionAmount: 5
-  m_TightenPosition: 0.5
-  m_TrackRotation: 1
-  m_SmoothRotation: 0
-  m_SmoothRotationAmount: 5
-  m_TightenRotation: 0.5
-  m_ThrowOnDetach: 1
-  m_ThrowSmoothingDuration: 0.25
-  m_ThrowSmoothingCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 1
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  m_ThrowVelocityScale: 1.5
-  m_ThrowAngularVelocityScale: 1
-  m_ForceGravityOnDetach: 0
-  m_RetainTransformParent: 1
-  m_AttachPointCompatibilityMode: 0
--- !u!136 &1892274587892955128
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1887292331624740737}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.3790835
-  m_Height: 1.953244
-  m_Direction: 1
-  m_Center: {x: -0.0214345, y: 0.071287006, z: 0.1076725}
--- a/Files/Prefabs/JoonasP/Crystal_Fire.prefab
+++ b/Files/Prefabs/JoonasP/Crystal_Fire.prefab
@@ -1,233 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5516297800189399664
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5514144098688080456}
-  - component: {fileID: 5548138833619655234}
-  - component: {fileID: 5538202210605045328}
-  - component: {fileID: 5516297800189399678}
-  - component: {fileID: 5516297800189399665}
-  - component: {fileID: 5516297800189399679}
-  m_Layer: 10
-  m_Name: Crystal_Fire
-  m_TagString: Throwable
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &5514144098688080456
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5516297800189399664}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -16.547, y: 3.131, z: 50.916}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5548138833619655234
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5516297800189399664}
-  m_Mesh: {fileID: 4300000, guid: 78ffc1ed5f72076498d0614872cf48ec, type: 3}
--- !u!23 &5538202210605045328
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5516297800189399664}
-  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: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: b16f64f428b405845a02e79478239092, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!54 &5516297800189399678
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5516297800189399664}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
--- !u!114 &5516297800189399665
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5516297800189399664}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_InteractionManager: {fileID: 0}
-  m_Colliders: []
-  m_InteractionLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_InteractionLayers:
-    m_Bits: 1
-  m_SelectMode: 0
-  m_CustomReticle: {fileID: 0}
-  m_FirstHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_LastHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_HoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_HoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FirstSelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_LastSelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Activated:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Deactivated:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnFirstHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnLastHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectCanceled:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnActivate:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnDeactivate:
-    m_PersistentCalls:
-      m_Calls: []
-  m_AttachTransform: {fileID: 0}
-  m_AttachEaseInTime: 0.15
-  m_MovementType: 2
-  m_VelocityDamping: 1
-  m_VelocityScale: 1
-  m_AngularVelocityDamping: 1
-  m_AngularVelocityScale: 1
-  m_TrackPosition: 1
-  m_SmoothPosition: 0
-  m_SmoothPositionAmount: 5
-  m_TightenPosition: 0.5
-  m_TrackRotation: 1
-  m_SmoothRotation: 0
-  m_SmoothRotationAmount: 5
-  m_TightenRotation: 0.5
-  m_ThrowOnDetach: 1
-  m_ThrowSmoothingDuration: 0.25
-  m_ThrowSmoothingCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 1
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  m_ThrowVelocityScale: 1.5
-  m_ThrowAngularVelocityScale: 1
-  m_ForceGravityOnDetach: 0
-  m_RetainTransformParent: 1
-  m_AttachPointCompatibilityMode: 0
--- !u!136 &5516297800189399679
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5516297800189399664}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.3790835
-  m_Height: 1.953244
-  m_Direction: 1
-  m_Center: {x: -0.0214345, y: 0.071287006, z: 0.1076725}
--- a/Files/Prefabs/JoonasP/Crystal_Water.prefab
+++ b/Files/Prefabs/JoonasP/Crystal_Water.prefab
@@ -1,233 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2269602646927770872
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2266812117106989766}
-  - component: {fileID: 2238257314608638910}
-  - component: {fileID: 2247191559369684946}
-  - component: {fileID: 2247191559369684944}
-  - component: {fileID: 2247191559369684945}
-  - component: {fileID: 2247191559369684943}
-  m_Layer: 10
-  m_Name: Crystal_Water
-  m_TagString: Throwable
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &2266812117106989766
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2269602646927770872}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -16.564, y: 3.144, z: 51.102}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2238257314608638910
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2269602646927770872}
-  m_Mesh: {fileID: 4300000, guid: 78ffc1ed5f72076498d0614872cf48ec, type: 3}
--- !u!23 &2247191559369684946
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2269602646927770872}
-  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: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 416d15cd169c5a0468b8346abad16527, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!54 &2247191559369684944
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2269602646927770872}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
--- !u!114 &2247191559369684945
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2269602646927770872}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_InteractionManager: {fileID: 0}
-  m_Colliders: []
-  m_InteractionLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_InteractionLayers:
-    m_Bits: 1
-  m_SelectMode: 0
-  m_CustomReticle: {fileID: 0}
-  m_FirstHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_LastHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_HoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_HoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FirstSelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_LastSelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_SelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Activated:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Deactivated:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnFirstHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnLastHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnHoverExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectExited:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSelectCanceled:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnActivate:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnDeactivate:
-    m_PersistentCalls:
-      m_Calls: []
-  m_AttachTransform: {fileID: 0}
-  m_AttachEaseInTime: 0.15
-  m_MovementType: 2
-  m_VelocityDamping: 1
-  m_VelocityScale: 1
-  m_AngularVelocityDamping: 1
-  m_AngularVelocityScale: 1
-  m_TrackPosition: 1
-  m_SmoothPosition: 0
-  m_SmoothPositionAmount: 5
-  m_TightenPosition: 0.5
-  m_TrackRotation: 1
-  m_SmoothRotation: 0
-  m_SmoothRotationAmount: 5
-  m_TightenRotation: 0.5
-  m_ThrowOnDetach: 1
-  m_ThrowSmoothingDuration: 0.25
-  m_ThrowSmoothingCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 1
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  m_ThrowVelocityScale: 1.5
-  m_ThrowAngularVelocityScale: 1
-  m_ForceGravityOnDetach: 0
-  m_RetainTransformParent: 1
-  m_AttachPointCompatibilityMode: 0
--- !u!136 &2247191559369684943
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2269602646927770872}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.3790835
-  m_Height: 1.953244
-  m_Direction: 1
-  m_Center: {x: -0.0214345, y: 0.071287006, z: 0.1076725}
--- a/Files/Prefabs/JoonasP/EssenceWell.prefab
+++ b/Files/Prefabs/JoonasP/EssenceWell.prefab
@@ -14,7 +14,7 @@ GameObject:
  - component: {fileID: 8183020133918107436}
  m_Layer: 0
  m_Name: EssenceWell
-  m_TagString: Portal
+  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
--- a/Files/Prefabs/JoonasP/Shield_exit_anim.anim
+++ b/Files/Prefabs/JoonasP/Shield_exit_anim.anim
@@ -1,134 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
-AnimationClip:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Shield_exit_anim
-  serializedVersion: 6
-  m_Legacy: 1
-  m_Compressed: 0
-  m_UseHighQualityCurve: 1
-  m_RotationCurves: []
-  m_CompressedRotationCurves: []
-  m_EulerCurves: []
-  m_PositionCurves: []
-  m_ScaleCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: 1, y: 1, z: 1}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.25
-        value: {x: 0, y: 0, z: 1}
-        inSlope: {x: -6.4939423, y: -6.575429, z: 0}
-        outSlope: {x: -6.4939423, y: -6.575429, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.108208954, y: 0.08768654, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: 
-  m_FloatCurves: []
-  m_PPtrCurves: []
-  m_SampleRate: 60
-  m_WrapMode: 1
-  m_Bounds:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 0, y: 0, z: 0}
-  m_ClipBindingConstant:
-    genericBindings: []
-    pptrCurveMapping: []
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 0.25
-    m_OrientationOffsetY: 0
-    m_Level: 0
-    m_CycleOffset: 0
-    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
-    m_LoopBlend: 0
-    m_LoopBlendOrientation: 0
-    m_LoopBlendPositionY: 0
-    m_LoopBlendPositionXZ: 0
-    m_KeepOriginalOrientation: 0
-    m_KeepOriginalPositionY: 1
-    m_KeepOriginalPositionXZ: 0
-    m_HeightFromFeet: 0
-    m_Mirror: 0
-  m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.25
-        value: 0
-        inSlope: -6.4939423
-        outSlope: -6.4939423
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0.108208954
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.x
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.25
-        value: 0
-        inSlope: -6.575429
-        outSlope: -6.575429
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0.08768654
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.y
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 0
-  m_HasMotionFloatCurves: 0
-  m_Events: []
--- a/Files/Prefabs/JoonasP/Shield_exit_anim.anim.meta
+++ b/Files/Prefabs/JoonasP/Shield_exit_anim.anim.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cd1512060f5701d43ac6357d4bcafd06
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Prefabs/JoonasP/Shield_init_anim.anim
+++ b/Files/Prefabs/JoonasP/Shield_init_anim.anim
@@ -1,161 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
-AnimationClip:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Shield_init_anim
-  serializedVersion: 6
-  m_Legacy: 1
-  m_Compressed: 0
-  m_UseHighQualityCurve: 1
-  m_RotationCurves: []
-  m_CompressedRotationCurves: []
-  m_EulerCurves: []
-  m_PositionCurves: []
-  m_ScaleCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: 0, y: 0, z: 1}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.33333334
-        value: {x: 1.1, y: 1.1, z: 1}
-        inSlope: {x: 9.488643, y: 0, z: 0}
-        outSlope: {x: -5.271774, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.03731346, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.124067195, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.5
-        value: {x: 1, y: 1, z: 1}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: 
-  m_FloatCurves: []
-  m_PPtrCurves: []
-  m_SampleRate: 60
-  m_WrapMode: 1
-  m_Bounds:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 0, y: 0, z: 0}
-  m_ClipBindingConstant:
-    genericBindings: []
-    pptrCurveMapping: []
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 0.5
-    m_OrientationOffsetY: 0
-    m_Level: 0
-    m_CycleOffset: 0
-    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
-    m_LoopBlend: 0
-    m_LoopBlendOrientation: 0
-    m_LoopBlendPositionY: 0
-    m_LoopBlendPositionXZ: 0
-    m_KeepOriginalOrientation: 0
-    m_KeepOriginalPositionY: 1
-    m_KeepOriginalPositionXZ: 0
-    m_HeightFromFeet: 0
-    m_Mirror: 0
-  m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.33333334
-        value: 1.1
-        inSlope: 9.488643
-        outSlope: -5.271774
-        tangentMode: 1
-        weightedMode: 0
-        inWeight: 0.03731346
-        outWeight: 0.124067195
-      - serializedVersion: 3
-        time: 0.5
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.x
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.33333334
-        value: 1.1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 1
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.5
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.y
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 0
-  m_HasMotionFloatCurves: 0
-  m_Events: []
--- a/Files/Prefabs/JoonasP/XR
+++ b/Files/Prefabs/JoonasP/XR
@@ -217,7 +217,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 08f72f5d017837743b67d344a6a7ed52, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  spawnLocation: {fileID: 0}
 --- !u!1 &2674332924243185464
 GameObject:
  m_ObjectHideFlags: 0
--- a/Files/Prefabs/JoonasP/shield_spell.prefab
+++ b/Files/Prefabs/JoonasP/shield_spell.prefab
@@ -46,7 +46,6 @@ GameObject:
  - component: {fileID: 3268723311598239928}
  - component: {fileID: 7564575873016353892}
  - component: {fileID: 3597675138378626114}
-  - component: {fileID: 5089910899482564357}
  m_Layer: 0
  m_Name: shield_spell
  m_TagString: Untagged
@@ -64,7 +63,7 @@ Transform:
  m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
  m_LocalPosition: {x: 26.388, y: 4.077, z: 49.415}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
+  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 8009436372187810761}
  m_Father: {fileID: 0}
@@ -148,23 +147,6 @@ MonoBehaviour:
  health: 5
  startColor: {r: 0.019607844, g: 0.77254903, b: 0.77254903, a: 0}
  endColor: {r: 0.8666667, g: 0.43137255, b: 0.13333334, a: 0}
--- !u!111 &5089910899482564357
-Animation:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3917053023338471789}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Animation: {fileID: 0}
-  m_Animations:
-  - {fileID: 7400000, guid: 23150fe44169b164cb20023a6fe36bd4, type: 2}
-  - {fileID: 7400000, guid: cd1512060f5701d43ac6357d4bcafd06, type: 2}
-  m_WrapMode: 0
-  m_PlayAutomatically: 0
-  m_AnimatePhysics: 0
-  m_CullingType: 0
 --- !u!1 &4435714647248106357
 GameObject:
  m_ObjectHideFlags: 0
--- a/Files/Scripts/Arlo/SlimeAI.cs
+++ b/Files/Scripts/Arlo/SlimeAI.cs
@@ -11,7 +11,7 @@ public class SlimeAI : MonoBehaviour
    GameObject player;
    int HP;

-    public float moveSpeed = 3f;
+    public float moveSpeed = 4f;
    public float rotSpeed = 100f;

    private bool isWandering = false;
@@ -19,6 +19,8 @@ public class SlimeAI : MonoBehaviour
    private bool isRotatingRight = false;
    private bool isWalking = false;

+    private bool isAttacking = false;
+    private float attackStartTime;
    //[SerializeField]
    //private UnityEvent onAttack;

@@ -27,22 +29,31 @@ public class SlimeAI : MonoBehaviour
    {
        animator = GetComponent<Animator>();
        player = GameObject.FindWithTag("Player");
-        HP = 10;
+        HP = 0;
+        
    }

    // Update is called once per frame
    void Update()
    {
        playerDistance = Vector3.Distance(player.transform.position, transform.position);
+
+        if (HP <= 0)
+        {
+            animator.Play("Die");
+        }
        if (playerDistance < 1.5) //Attack
        {
+            animator.SetBool("Wandering", false);
            animator.SetBool("EnemyInAttackRange", true);
            animator.SetBool("EnemyInAggroRange", true);
            animator.SetBool("EnemyInVisionRange", true);
            Rotate();
+            Attack();
        }
        else if (playerDistance < 10) //Chase
        {
+            animator.SetBool("Wandering", false);
            animator.SetBool("EnemyInAttackRange", false);
            animator.SetBool("EnemyInAggroRange", true);
            animator.SetBool("EnemyInVisionRange", true);
@@ -51,43 +62,44 @@ public class SlimeAI : MonoBehaviour
        }
        else if (playerDistance < 18) //Stare
        {
+            animator.SetBool("Wandering", false);
            animator.SetBool("EnemyInAttackRange", false);
            animator.SetBool("EnemyInAggroRange", false);
            animator.SetBool("EnemyInVisionRange", true);
            Rotate();
+            StopCoroutine("Wandering");
        }
-        else //Idle
+        else
        {
            animator.SetBool("EnemyInAttackRange", false);
            animator.SetBool("EnemyInAggroRange", false);
            animator.SetBool("EnemyInVisionRange", false);
+        }
+        
+        if (!isWandering)
+        {
+            //Idle 
            StartCoroutine("Wander");
-
-            if (isRotatingRight == true)
-            {
-                gameObject.GetComponent<Animator>().Play("IdleNormal");
-                transform.Rotate(transform.up * Time.deltaTime * rotSpeed);
-            }
-            if (isRotatingLeft == true)
-            {
-                gameObject.GetComponent<Animator>().Play("IdleNormal");
-                transform.Rotate(transform.up * Time.deltaTime * -rotSpeed);
-            }
-            if (isWalking == true)
-            {
-                gameObject.GetComponent<Animator>().Play("WalkFWD");
-                transform.position += transform.forward * moveSpeed * Time.deltaTime;
-            }
        }
-        if (HP <= 0)
+        Debug.Log(isWandering);
+        Debug.Log(isRotatingLeft);
+        Debug.Log(isRotatingRight);
+        if (isRotatingRight == true)
        {
-            animator.SetBool("Dead", true);
+            animator.SetBool("Wandering", false);
+            transform.Rotate(transform.up * Time.deltaTime * rotSpeed);
        }
-        if (animator.GetBool("DeathComplete"))
+        if (isRotatingLeft == true)
        {
-            print("asd");
-            Destroy(this.gameObject);
+            animator.SetBool("Wandering", false);
+            transform.Rotate(transform.up * Time.deltaTime * -rotSpeed);
        }
+        if (isWalking == true)
+        {
+            animator.SetBool("Wandering", true);
+            transform.position += transform.forward * moveSpeed * Time.deltaTime;
+        }
+        
        

    }
@@ -108,14 +120,37 @@ public class SlimeAI : MonoBehaviour
    {
        HP -= dmg;
    }
+    
+    void Attack()
+    {
+        if (!isAttacking)
+        {
+            isAttacking = true;
+            attackStartTime = Time.time;
+            StartCoroutine(DelayedAttack());
+        }
+        else if (Time.time - attackStartTime > 0.833)
+        {
+            isAttacking = false;
+            attackStartTime = 0.0f;
+        }
+
+    }
+
+    IEnumerator DelayedAttack()
+    {
+        yield return new WaitForSeconds(0.2f);
+        Debug.Log("Attack");
+        //do attack e.g check for player in range/hit collider
+    }

    IEnumerator Wander()
    {
        int rotTime = Random.Range(1, 3);
-        int rotateWait = Random.Range(1, 4);
+        int rotateWait = Random.Range(1, 5);
        int rotateLorR = Random.Range(1, 2);
        int walkWait = Random.Range(1, 5);
-        int walkTime = Random.Range(1, 6);
+        int walkTime = Random.Range(1, 20);

        isWandering = true;

--- a/Files/Scripts/JonasB/ActionGestureInteraction.cs
+++ b/Files/Scripts/JonasB/ActionGestureInteraction.cs
@@ -35,7 +35,6 @@ public class ActionGestureInteraction : MonoBehaviour
            {
                holdingWand = true;
                wandPower = player.GetComponent<PlayerInfo>().GetRightHand().GetComponent<WandData>().power;
-                wandElement = player.GetComponent<PlayerInfo>().GetRightHand().GetComponent<WandData>().element;
            }
            
        }
@@ -194,7 +193,6 @@ public class ActionGestureInteraction : MonoBehaviour
        Debug.LogWarning("INSTANTIATE BOLT");
        var projectileObj = Instantiate(item, rightHandTransform.position, playerCamera.transform.rotation) as GameObject;
        projectileObj.GetComponent<Projectile>().damage = 1 * wandPower;
-        projectileObj.GetComponent<Projectile>().element = wandElement;
        projectileObj.GetComponent<Rigidbody>().velocity = (playerCamera.transform.forward).normalized * projectileSpeed;
    }
 }
--- a/Files/Scripts/JonasB/Projectile.cs
+++ b/Files/Scripts/JonasB/Projectile.cs
@@ -8,7 +8,6 @@ public class Projectile : MonoBehaviour
    Vector3 oldEulerAngles;

    public float damage;
-    public string element = null;

    private void Start()
    {
@@ -29,19 +28,10 @@ public class Projectile : MonoBehaviour
    private void OnCollisionEnter(Collision collision)
    {
        Debug.LogWarning(collision.gameObject.name);
-        GameObject obj = collision.gameObject;
-        if (obj.tag != "IceBolt" && obj.tag != "Player" && !collided)
+        if (collision.gameObject.tag != "IceBolt" && collision.gameObject.tag != "Player" && !collided)
        {
            collided = true;
-            if (obj.CompareTag("Slime"))
-            {
-                //Enemy element check!
-                //Null element = damage * 0.75
-                //Weak against enemy element = damage * 0.5
-                // Strong against enemy element = damage * 2
-
-                obj.GetComponent<SlimeAI>().GetHit(Mathf.RoundToInt(damage));
-            }
+            if (collision.gameObject.name == "Dummy") Destroy(collision.gameObject); //REPLACE WITH ENEMY TAG CHECK AND DAMAGE CHECKING
            Destroy(gameObject);
        }
        
--- a/Files/Scripts/JonasB/SlimeSpawner.cs
+++ b/Files/Scripts/JonasB/SlimeSpawner.cs
@@ -29,7 +29,7 @@ public class SlimeSpawner : MonoBehaviour
        {
            float slimeRandom = Random.Range(0, slimeTypes.Count);
            float spawnRandom = Random.Range(0, spawnLocations.Count);
-            Instantiate(slimeTypes[Mathf.RoundToInt(slimeRandom)], spawnLocations[Mathf.RoundToInt(spawnRandom)].position, Quaternion.identity);
+            Instantiate(slimeTypes[Mathf.RoundToInt(slimeRandom)], spawnLocations[Mathf.RoundToInt(spawnRandom)].position, Quaternion.Euler(0f, Random.Range(0f, 360f), 0f));
        }
    }

--- a/Files/Scripts/JoonasP/CraftingTable.cs
+++ b/Files/Scripts/JoonasP/CraftingTable.cs
@@ -68,49 +68,6 @@ public class CraftingTable : MonoBehaviour
                    item1 = null;
                }
            }
-            else if((item1.name.StartsWith("wand") && item2.name.StartsWith("Crystal")) || (item2.name.StartsWith("wand") && item1.name.StartsWith("Crystal")))
-            {
-                if (item2.name.StartsWith("Crystal"))
-                {
-                    WandData data = item1.GetComponent<WandData>();
-                    switch (item2.name.Split("_")[1])
-                    {
-                        case "Earth":
-                            data.element = "Earth";
-                            break;
-                        case "Water":
-                            data.element = "Water";
-                            break;
-                        case "Fire":
-                            data.element = "Fire";
-                            break;
-
-                    }
-                    Destroy(item2.gameObject);
-                    item2 = null;
-
-                }
-
-                else
-                {
-                    WandData data = item2.GetComponent<WandData>();
-                    switch (item1.name.Split("_")[1])
-                    {
-                        case "Earth":
-                            data.element = "Earth";
-                            break;
-                        case "Water":
-                            data.element = "Water";
-                            break;
-                        case "Fire":
-                            data.element = "Fire";
-                            break;
-
-                    }
-                    Destroy(item1.gameObject);
-                    item1 = null;
-                }
-            }
            
        }
        Debug.LogError("Invalid Recipe!");
--- a/Files/Scripts/JoonasP/PlayerInfo.cs
+++ b/Files/Scripts/JoonasP/PlayerInfo.cs
@@ -14,28 +14,24 @@ public class PlayerInfo : MonoBehaviour
    private GameObject rightHandHeld;
    private GameObject leftHandHeld;

-    public Transform spawnLocation;
-
    private void Awake()
    {
        Instance = this;
        health = 5;
-        essence_basic = 1;
+        essence_basic = 0;
        rightHandHeld = null;
        leftHandHeld = null;
    }

-    public void AddHealth(int value)
+    public bool AddHealth(int value)
    {
        health += value;
        if (health <= 0)
        {
-            transform.position = spawnLocation.position;
-            health = 5;
            Debug.Log("NO HEALTH REMAINING");
-            
+            return false;
        }
-        
+        return true;
    }

    public bool AddEssenceBasic(int value)
--- a/Files/Scripts/JoonasP/ShieldController.cs
+++ b/Files/Scripts/JoonasP/ShieldController.cs
@@ -13,7 +13,7 @@ public class ShieldController : MonoBehaviour
    // Start is called before the first frame update
    void Start()
    {
-        GetComponent<Animation>().Play("Shield_init_anim");
+        
    }

    // Update is called once per frame
@@ -21,10 +21,6 @@ public class ShieldController : MonoBehaviour
    {
        health -= Time.deltaTime;
        GetComponent<Renderer>().material.SetColor("_Color0", Color.Lerp(endColor, startColor, health / 5));
-        if (health <= 0)
-        {
-            GetComponent<Animation>().Play("Shield_exit_anim");
-            Destroy(gameObject, 0.25f);
-        } 
+        if (health <= 0) Destroy(gameObject);
    }
 }
--- a/Files/Scripts/JoonasP/WandData.cs
+++ b/Files/Scripts/JoonasP/WandData.cs
@@ -6,9 +6,14 @@ public class WandData : MonoBehaviour
 {
    public float power = 1f;

-    public string element = null;
+    //public string element = "water";


+    private void Awake()
+    {
+        
+    }
+
    public void SetPower(float pow)
    {
        power = pow;
--- a/Files/VolumeDataObjects/Vignette.asset
+++ b/Files/VolumeDataObjects/Vignette.asset
@@ -24,7 +24,7 @@ MonoBehaviour:
    m_Value: 0.75
  smoothness:
    m_OverrideState: 1
-    m_Value: 0.543
+    m_Value: 0.4
  rounded:
    m_OverrideState: 0
    m_Value: 0
--- a/Assets/Scenes/CombatScene.meta
+++ b/Assets/Scenes/CombatScene.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9e3cc957f00ba754196d033975851083
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/CombatScene.unity
+++ b/Assets/Scenes/CombatScene.unity
--- a/Assets/Scenes/CombatScene/NavMesh.asset
+++ b/Assets/Scenes/CombatScene/NavMesh.asset
--- a/Files/Prefabs/JoonasP/Shield_init_anim.anim.meta
+++ b/Files/Prefabs/JoonasP/Shield_init_anim.anim.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 23150fe44169b164cb20023a6fe36bd4
+guid: e97b658bf81e64e438a5af4cce8abe6d
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 7400000
+  mainObjectFileID: 23800000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Scenes/JoonasP/CombatScene_JP.unity
+++ b/Assets/Scenes/JoonasP/CombatScene_JP.unity
--- a/Assets/Scenes/JoonasP/Homebase_JP.unity
+++ b/Assets/Scenes/JoonasP/Homebase_JP.unity
--- a/Assets/Scenes/JoonasP/SampleScene.unity
+++ b/Assets/Scenes/JoonasP/SampleScene.unity
@@ -176,7 +176,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &407110722 stripped
 Transform:
@@ -706,7 +706,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &629412355
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -737,7 +737,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 11
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &629412357
 MonoBehaviour:
@@ -1120,7 +1120,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &913183357
 GameObject:
@@ -1187,7 +1187,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &953161746
 PrefabInstance:
@@ -1435,7 +1435,7 @@ Transform:
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1479875001
 GameObject:
@@ -1550,6 +1550,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: Lever
      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
        type: 3}
      propertyPath: m_RootOrder
@@ -1990,7 +1995,7 @@ PrefabInstance:
        type: 3}
      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_Target
      value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 48807395}
    - target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
        type: 3}
      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
--- a/Assets/Scenes/JoonasP/SampleScene/GameObject
+++ b/Assets/Scenes/JoonasP/SampleScene/GameObject
@@ -21,7 +21,7 @@ MonoBehaviour:
    m_Value: {x: 0.5, y: 0.5}
  intensity:
    m_OverrideState: 1
-    m_Value: 0.304
+    m_Value: 0
  smoothness:
    m_OverrideState: 1
    m_Value: 1
--- a/Assets/SineVFX/TranslucentCrystals/_SRP/TranslucentCrystals_HDRP_Patch.unitypackage.meta
+++ b/Assets/SineVFX/TranslucentCrystals/_SRP/TranslucentCrystals_HDRP_Patch.unitypackage.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: bb536ec79df408e41b0f5488eaf78cc4
-PrefabImporter:
+guid: 3829f2d229e9f9b44b6d3f85cb2d6653
+DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/SineVFX/TranslucentCrystals/_SRP/TranslucentCrystals_URP_Patch.unitypackage.meta
+++ b/Assets/SineVFX/TranslucentCrystals/_SRP/TranslucentCrystals_URP_Patch.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2dc48376fb0fbaa4f93eb47a43ad6560
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/SkyProfile-457889269655148736.asset
+++ b/Assets/SkyProfile-457889269655148736.asset
@@ -90,19 +90,19 @@ Material:
    - _HorizonCloudSize: 4.91
    - _HorizonCloudStartPosition: -0.1
    - _HorizonCloudStep: 25
-    - _HorizonExponent: 3.448133
+    - _HorizonExponent: 3.3921747
    - _HorizonStep: 500
    - _HorizonThickness: 1
    - _MoonGlow: 0
-    - _MoonLightIntensity: 0.000015899539
+    - _MoonLightIntensity: 0.00034078956
    - _MoonSize: 0
    - _MoonSoftEdge: 0
    - _OverheadCloudAltitude: 1000
    - _OverheadCloudAnimationSpeed: 50
    - _OverheadCloudFlowDirectionX: 1
    - _OverheadCloudFlowDirectionZ: 1
-    - _OverheadCloudRemapMax: 1.0972334
-    - _OverheadCloudRemapMin: 0.12990488
+    - _OverheadCloudRemapMax: 1.074074
+    - _OverheadCloudRemapMin: 0.111940965
    - _OverheadCloudSize: 10
    - _OverheadCloudStep: 2
    - _StarsDensity0: 0.4
@@ -112,7 +112,7 @@ Material:
    - _StarsGlow0: 0.01
    - _StarsGlow1: 0.01
    - _StarsGlow2: 0.01
-    - _StarsOpacity: 0
+    - _StarsOpacity: 0.0009148121
    - _StarsSize0: 0.42
    - _StarsSize1: 0.53
    - _StarsSize2: 0.46
@@ -121,25 +121,25 @@ Material:
    - _StarsTwinkle1: 6
    - _StarsTwinkle2: 2
    - _SunGlow: 0.45
-    - _SunLightIntensity: 0.25083867
+    - _SunLightIntensity: 0.22252172
    - _SunSize: 0.1
    - _SunSoftEdge: 0.5
    m_Colors:
    - _DetailOverlayTintColor: {r: 0, g: 0, b: 0, a: 0}
    - _FogColor: {r: 0, g: 0, b: 0, a: 0}
-    - _GroundColor: {r: 0.41291976, g: 0.39312416, b: 0.4314673, a: 1}
+    - _GroundColor: {r: 0.4100945, g: 0.38965663, b: 0.42924377, a: 1}
    - _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
-    - _HorizonColor: {r: 0.90433806, g: 0.85606474, b: 0.74898267, a: 1}
+    - _HorizonColor: {r: 0.9055729, g: 0.85231304, b: 0.741789, a: 1}
    - _MoonColor: {r: 1, g: 1, b: 1, a: 0}
    - _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
    - _MoonLightColor: {r: 0, g: 0, b: 0, a: 0}
-    - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.96808887}
-    - _SkyColor: {r: 0.21055394, g: 0.36771357, b: 0.60376364, a: 1}
+    - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.9640542}
+    - _SkyColor: {r: 0.20533016, g: 0.35421106, b: 0.5882197, a: 1}
    - _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
    - _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
    - _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
-    - _SunColor: {r: 0.97367364, g: 0.9302338, b: 0.85855806, a: 1}
-    - _SunDirection: {r: 0, g: -0.29832366, b: 0.9544648, a: 0}
+    - _SunColor: {r: 0.9742516, g: 0.93176544, b: 0.86166334, a: 1}
+    - _SunDirection: {r: 0, g: -0.258819, b: 0.9659258, a: 0}
    - _SunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
  m_BuildTextureStacks: []
 --- !u!114 &11400000
--- a/Files/Scripts/Arlo/SlimeDeath.cs
+++ b/Files/Scripts/Arlo/SlimeDeath.cs
@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;

-public class death : StateMachineBehaviour
+public class SlimeDeath : StateMachineBehaviour
 {
    // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
    //override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
@@ -17,10 +17,10 @@ public class death : StateMachineBehaviour
    //}

    // OnStateExit is called when a transition ends and the state machine finishes evaluating this state
-    //override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
-    //{
-    //    
-    //}
+    override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+    {
+        Destroy(animator.gameObject);
+    }

    // OnStateMove is called right after Animator.OnAnimatorMove()
    //override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
--- a/Files/Scripts/Arlo/SlimeDeath.cs.meta
+++ b/Files/Scripts/Arlo/SlimeDeath.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6c7f89faf36f41b418e5105a12c34cdb
+guid: aa7306c35f4c27d4daefb1259633b9d0
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/_TerrainData/TerrainData_521113671563848736.asset
+++ b/Assets/_TerrainData/TerrainData_521113671563848736.asset
--- a/Assets/_TerrainData/TerrainData_699485723238748736.asset
+++ b/Assets/_TerrainData/TerrainData_699485723238748736.asset
--- a/Assets/_TerrainData/TerrainData_869121471408748736.asset
+++ b/Assets/_TerrainData/TerrainData_869121471408748736.asset
--- a/Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
+++ b/Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
@@ -27,17 +27,17 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorBlend:
-        m_Texture: {fileID: 7949313181305387792, guid: b6bbea2e1167a7346822545139402874,
+        m_Texture: {fileID: -1194533861416839154, guid: b6bbea2e1167a7346822545139402874,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
-        m_Texture: {fileID: 6125799598916057514, guid: b6bbea2e1167a7346822545139402874,
+        m_Texture: {fileID: 4148794505670020756, guid: b6bbea2e1167a7346822545139402874,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
-        m_Texture: {fileID: 2224532881430876303, guid: b6bbea2e1167a7346822545139402874,
+        m_Texture: {fileID: 9206949218771078510, guid: b6bbea2e1167a7346822545139402874,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
--- a/Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
+++ b/Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
@@ -40,17 +40,17 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorBlend:
-        m_Texture: {fileID: -8934127479932439888, guid: 726ce83d589353742be6b48ff467fc48,
+        m_Texture: {fileID: -1638983025302772359, guid: 726ce83d589353742be6b48ff467fc48,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
-        m_Texture: {fileID: -1855763798676332792, guid: 726ce83d589353742be6b48ff467fc48,
+        m_Texture: {fileID: 5693894473929199623, guid: 726ce83d589353742be6b48ff467fc48,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
-        m_Texture: {fileID: -4675251007966098766, guid: 726ce83d589353742be6b48ff467fc48,
+        m_Texture: {fileID: 1037727246875307785, guid: 726ce83d589353742be6b48ff467fc48,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
--- a/Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
+++ b/Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
@@ -40,17 +40,17 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorBlend:
-        m_Texture: {fileID: 5328951821386129616, guid: 7f589c682d367b442b8cf75918f5aa55,
+        m_Texture: {fileID: -5980367444381717797, guid: 7f589c682d367b442b8cf75918f5aa55,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
-        m_Texture: {fileID: 7890751047339745244, guid: 7f589c682d367b442b8cf75918f5aa55,
+        m_Texture: {fileID: 1925041048746766459, guid: 7f589c682d367b442b8cf75918f5aa55,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
-        m_Texture: {fileID: 2157036223387729760, guid: 7f589c682d367b442b8cf75918f5aa55,
+        m_Texture: {fileID: -1661191792390972591, guid: 7f589c682d367b442b8cf75918f5aa55,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
Author	SHA1	Message	Date
arlo	5a83699fd1	fixes to slime death, attack function has proper timings	2022-04-25 18:05:53 +03:00
jonasty	a748b342a8	wandering implemented	2022-04-25 17:41:22 +03:00