merge commit

2022-04-11 18:46:10 +03:00
35 changed files with 2488 additions and 41154 deletions
--- 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: 97fc7747e77335e4483b4a65db2e4fc1
+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: c52ee40e56d869645af73fd6f39c1323
-PrefabImporter:
+guid: 10f2e5d2e4dd2ba42b4dcf6195a74f02
+DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Engine/Editor/Packages/URP_Support.unitypackage.meta
+++ b/Engine/Editor/Packages/URP_Support.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8bc88477f037e96478019bba8de301fd
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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 &2922953866860586845
+--- !u!114 &3157072690679539847
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Support/Materials/Foliage/URP_GrassInteractive.mat
+++ b/Support/Materials/Foliage/URP_GrassInteractive.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5181856834859275866
+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
@@ -123,16 +136,3 @@ Material:
    - _WavingTint: {r: 1, g: 1, b: 1, a: 1}
    - _Wind: {r: 1, g: 1, b: 4, a: 8}
  m_BuildTextureStacks: []
--- !u!114 &4662822464971472953
-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/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 &-4224080419335077331
-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 &5603016075464539001
+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 &-8754062780661562915
-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 &2903791061945988491
+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
@@ -181,7 +181,7 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &2452446718102520243
+--- !u!114 &6902619616048362596
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Support/Materials/Terrain/URP_8Splats.mat
+++ b/Support/Materials/Terrain/URP_8Splats.mat
@@ -173,7 +173,7 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &6932485102031202044
+--- !u!114 &379573167805043484
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- 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 &-5269009578845786356
+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 &2068806285344847222
-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,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1803904315105783093
+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
@@ -80,16 +93,3 @@ Material:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &2706972101473297510
-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/Prefabs/Arlo/Log.prefab
+++ b/Files/Prefabs/Arlo/Log.prefab
@@ -17,7 +17,7 @@ GameObject:
  - component: {fileID: 1264022012566418942}
  - component: {fileID: 759522315152862422}
  - component: {fileID: 7019801789685915322}
-  m_Layer: 10
+  m_Layer: 0
  m_Name: Log
  m_TagString: Throwable
  m_Icon: {fileID: 0}
--- a/Files/Prefabs/JonasB/IceBolt.prefab
+++ b/Files/Prefabs/JonasB/IceBolt.prefab
@@ -4835,8 +4835,6 @@ GameObject:
  - component: {fileID: 824121554007831541}
  - component: {fileID: 3271421586109646936}
  - component: {fileID: 6090694805862981561}
-  - component: {fileID: 6268334591715512481}
-  - component: {fileID: 7195648623186244198}
  m_Layer: 10
  m_Name: IceBolt
  m_TagString: IceBolt
@@ -4899,7 +4897,7 @@ SphereCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Radius: 0.5
+  m_Radius: 1
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!135 &6090694805862981561
 SphereCollider:
@@ -4912,58 +4910,8 @@ SphereCollider:
  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
-  m_Radius: 0.5
+  m_Radius: 1
  m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &6268334591715512481
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3928666337405863711}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7195648623186244198
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3928666337405863711}
-  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: bd0bb729cb6159b4ab21c5f62cad24ee, 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 &4403856838497526616
 GameObject:
  m_ObjectHideFlags: 0
--- a/Files/Prefabs/JoonasP/EssenceWell.prefab
+++ b/Files/Prefabs/JoonasP/EssenceWell.prefab
@@ -1,105 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8183020133482818824
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8183020133482637934}
-  - component: {fileID: 8183020133483952674}
-  - component: {fileID: 8183020133484680894}
-  - component: {fileID: 8183020133918107436}
-  m_Layer: 0
-  m_Name: EssenceWell
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &8183020133482637934
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8183020133482818824}
-  m_LocalRotation: {x: 0.000000115202326, y: 0.7071068, z: 0.7071068, w: -0.000000115202326}
-  m_LocalPosition: {x: -10.25, y: 1.47, z: -12.115}
-  m_LocalScale: {x: 10, y: 10, z: 10}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8183020133483952674
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8183020133482818824}
-  m_Mesh: {fileID: 4300122, guid: 7374575f12d49ba459e91009f7a9ec62, type: 3}
--- !u!23 &8183020133484680894
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8183020133482818824}
-  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: b27fa8aa11d99d440bab56b1de24981f, 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!114 &8183020133918107436
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8183020133482818824}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 580a2bc767950d54d9fdf84752500d7f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  node: {fileID: 3467985268477833302, guid: 215fe2a51d12ecc43ba8f86d3dc3ae54, type: 3}
-  numberOfNodes: 5
-  spawnDelay: 1
-  despawnTime: 2
-  rightDistance: 0.1
-  maxUp: 0.2
-  minDown: -0.2
--- a/Files/Prefabs/JoonasP/FlyingWand.prefab
+++ b/Files/Prefabs/JoonasP/FlyingWand.prefab
@@ -157,12 +157,12 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3757395767074346460}
-  m_Enabled: 0
+  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  particles: {fileID: 0}
+  particles: {fileID: 8844865646353305354}
  flySpeed: 10
  testForce: 1000
 --- !u!114 &3757395767037568670
@@ -379,3 +379,9 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 6456652935746308080}
  m_PrefabAsset: {fileID: 0}
+--- !u!198 &8844865646353305354 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 2532683062447540474, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
+    type: 3}
+  m_PrefabInstance: {fileID: 6456652935746308080}
+  m_PrefabAsset: {fileID: 0}
--- a/Files/Scripts/Arlo/CuttableTree.cs
+++ b/Files/Scripts/Arlo/CuttableTree.cs
@@ -31,9 +31,22 @@ public class CuttableTree : MonoBehaviour
            rotation = transform.rotation;
            rotation *= Quaternion.AngleAxis(20, Vector3.up);
            Instantiate(stumpPrefab, transform.position, rotation);
-            Instantiate(logPrefab, transform.position+new Vector3(0, 1, 0), rotation);
+            Instantiate(logPrefab, transform.position + new Vector3(0, 1, 0), rotation);
            onCut.Invoke();
            Destroy(gameObject);
        }  
    }
+    void OnCollisionEnter(Collision collision)
+    {
+        if (collision.gameObject.tag == "Cutter")
+        {
+            rotation = transform.rotation;
+            rotation *= Quaternion.AngleAxis(20, Vector3.up);
+            Instantiate(stumpPrefab, transform.position, rotation);
+            Instantiate(logPrefab, transform.position + new Vector3(0, 1, 0), rotation);
+            onCut.Invoke();
+            Destroy(gameObject);
+        }
+
+    }
 }
--- a/Files/Scripts/JonasB/ActionGestureInteraction.cs
+++ b/Files/Scripts/JonasB/ActionGestureInteraction.cs
@@ -12,8 +12,6 @@ public class ActionGestureInteraction : MonoBehaviour
    private GameObject player;
    public float projectileSpeed = 30;

-    private bool holdingWand;
-
    void Start()
    {
        player = gameObject;
@@ -21,63 +19,8 @@ public class ActionGestureInteraction : MonoBehaviour

    public void PerformAction(string action)
    {
-        Debug.LogWarning(action);
-
-        if (player.GetComponent<PlayerInfo>().GetRightHand() != null) 
-        {
-            Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand().name);
-            if (player.GetComponent<PlayerInfo>().GetRightHand().name.Equals("wand")) holdingWand = true;
-        }
-        else holdingWand = false;
-
-        switch (action)
-        {
-            case "HorizontalLine":
-                if (holdingWand)
-                {
-                    Debug.LogWarning("CAST BOLT");
-                    ShootProjectile();
-                    InstantiateIceBolt(objects[0]);
-                }
-                else
-                {
-                    Debug.LogWarning("WOODCUTTING ACTION");
-                }
-                return;
-            case "VerticalLine":
-                if (holdingWand)
-                {
-                    Debug.LogWarning("WAND VERTICAL");
-                }
-                else
-                {
-                    Debug.LogWarning("VERTICAL");
-                }
-                return;
-            case "Circle":
-                if (holdingWand)
-                {
-                    Debug.LogWarning("Arcing fireball");
-
-                }
-                else
-                {
-                    Debug.LogWarning("CIRCLE");
-                }
-                return;
-            case "Triangle":
-                if (holdingWand)
-                {
-                    Debug.LogWarning("WAND TRIANGLE");
-                }
-                else
-                {
-                    Debug.LogWarning("WOODCUTTING ACTION");
-                }
-                return;
-        }
-
-        /*if (action == "Portal")
+        Debug.Log(action);
+        if (action == "Portal")
        {
            // Raycast to find portal were looking at.
            var nearestPortal = FindPortalInFront();
@@ -98,9 +41,9 @@ public class ActionGestureInteraction : MonoBehaviour
                    // Make ice wall appear from below to block incoming projectiles
                }
            }
-        }  */
        }  
-    void MinigameEnable(GameObject portal)
+    }
+    void EnableDisablePortal(GameObject portal)
    {
        // Did the raycast catch a portal in front of us?
        if (portal != null)
@@ -127,7 +70,7 @@ public class ActionGestureInteraction : MonoBehaviour
        }
    }

-    GameObject FindMinigame()
+    GameObject FindPortalInFront() 
    {
        Ray ray = playerCamera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
        RaycastHit hit;
@@ -161,7 +104,6 @@ public class ActionGestureInteraction : MonoBehaviour

    void InstantiateIceBolt(GameObject item) 
    {
-        Debug.LogWarning("INSTANTIATE BOLT");
        var projectileObj = Instantiate(item, rightHandTransform.position, playerCamera.transform.rotation) as GameObject;
        projectileObj.GetComponent<Rigidbody>().velocity = (destination - rightHandTransform.position).normalized * projectileSpeed;
    }
--- a/Files/Scripts/JoonasP/EssenceNodeController.cs
+++ b/Files/Scripts/JoonasP/EssenceNodeController.cs
@@ -11,10 +11,7 @@ public class EssenceNodeController : MonoBehaviour

    public bool isTouched;
    private bool followPlayer = false;
-    private Transform playerCamera;
-
-    [SerializeField]
-    private PlayerInfo playerInfo;
+    private Transform player;

    private float timer;
    private Material nodeMaterial;
@@ -24,7 +21,6 @@ public class EssenceNodeController : MonoBehaviour
    private void Awake()
    {
        nodeMaterial = GetComponent<Renderer>().material;
-        playerInfo = PlayerInfo.Instance;
    }

    public void Touched()
@@ -41,7 +37,7 @@ public class EssenceNodeController : MonoBehaviour
    public void FollowPlayer()
    {
        followPlayer = true;
-        playerCamera = GameObject.FindGameObjectWithTag("MainCamera").transform;
+        player = GameObject.FindGameObjectWithTag("MainCamera").transform;
        StartCoroutine(Collect());

    }
@@ -60,8 +56,8 @@ public class EssenceNodeController : MonoBehaviour

    IEnumerator Collect()
    {
-        playerInfo.AddEssenceBasic(1);
        yield return new WaitForSeconds(2f);
+        //TODO: Update value in player inventory
        Destroy(gameObject);
    }

@@ -80,7 +76,7 @@ public class EssenceNodeController : MonoBehaviour

        if (followPlayer)
        {
-            transform.position = Vector3.Lerp(transform.position, new Vector3(playerCamera.position.x, playerCamera.position.y - 0.5f, playerCamera.position.z), Time.deltaTime);
+            transform.position = Vector3.Lerp(transform.position, new Vector3(player.position.x,player.position.y - 0.5f, player.position.z), Time.deltaTime);
        }
    }

--- a/Files/Scripts/JoonasP/PlayerInfo.cs
+++ b/Files/Scripts/JoonasP/PlayerInfo.cs
@@ -1,73 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PlayerInfo : MonoBehaviour
-{
-    public static PlayerInfo Instance;
-
-    private int health;
-
-    private int essence_basic;
-
-    private GameObject rightHandHeld;
-    private GameObject leftHandHeld;
-
-    private void Awake()
-    {
-        Instance = this;
-        health = 5;
-        essence_basic = 0;
-        rightHandHeld = null;
-        leftHandHeld = null;
-    }
-
-    public void AddHealth(int value)
-    {
-        health += value;
-        if (health <= 0)
-        {
-            Debug.Log("NO HEALTH REAMINING");
-        }
-    }
-
-    public void AddEssenceBasic(int value)
-    {
-        if (essence_basic + value < 0)
-        {
-            Debug.Log("NOT ENOUGH ESSENCE");
-        }
-        else essence_basic += value;
-    }
-
-    public void AddLeftHand(GameObject obj)
-    {
-        leftHandHeld = obj;
-    }
-
-    public void AddRightHand(GameObject obj)
-    {
-        rightHandHeld = obj;
-    }
-
-    public void RemoveLeftHand()
-    {
-        leftHandHeld = null;
-    }
-
-    public void RemoveRightHand()
-    {
-        rightHandHeld = null;
-    }
-
-    public GameObject GetLeftHand()
-    {
-        return leftHandHeld;
-    }
-
-    public GameObject GetRightHand()
-    {
-        return rightHandHeld;
-    }
-
-}
--- a/Files/Scripts/JoonasP/PlayerInfo.cs.meta
+++ b/Files/Scripts/JoonasP/PlayerInfo.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 51150922d2ca8cc44b6fc27d9365a8d4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/Homebase.unity
+++ b/Assets/Scenes/Homebase.unity
--- a/Assets/Scenes/JonasB/Dungeon.unity
+++ b/Assets/Scenes/JonasB/Dungeon.unity
@@ -15,7 +15,7 @@ RenderSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 9
  m_Fog: 0
-  m_FogColor: {r: 0.87746114, g: 0.7956361, b: 0.74937975, a: 1}
+  m_FogColor: {r: 0.41592866, g: 0.36391953, b: 0.5471698, a: 1}
  m_FogMode: 3
  m_FogDensity: 0.01
  m_LinearFogStart: 0
@@ -26,8 +26,7 @@ RenderSettings:
  m_AmbientIntensity: 1
  m_AmbientMode: 0
  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 3754961556890611794, guid: acded0c84d73b454aa0f31e93a7a47f6,
-    type: 2}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
  m_HaloStrength: 0.5
  m_FlareStrength: 1
  m_FlareFadeSpeed: 3
@@ -39,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.25923243, g: 0.2534048, b: 0.27568978, a: 1}
+  m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -18256,7 +18255,7 @@ PrefabInstance:
    - target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 19.895
+      value: 19.944
      objectReference: {fileID: 0}
    - target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
        type: 3}
@@ -33361,7 +33360,7 @@ PrefabInstance:
    - target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: -0.006
      objectReference: {fileID: 0}
    - target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
        type: 3}
@@ -34425,7 +34424,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1634078368
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -44916,7 +44915,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &2097260270
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- 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
@@ -131,6 +131,31 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 973685166}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &48807391 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 122020, guid: 627e36a0129013a47a9ff4c741c3f6d6,
+    type: 3}
+  m_PrefabInstance: {fileID: 1694198627}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &48807395
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 48807391}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 580a2bc767950d54d9fdf84752500d7f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  node: {fileID: 3467985268477833302, guid: 215fe2a51d12ecc43ba8f86d3dc3ae54, type: 3}
+  numberOfNodes: 5
+  spawnDelay: 1
+  despawnTime: 2
+  rightDistance: 0.1
+  maxUp: 0.2
+  minDown: -0.2
 --- !u!4 &407110722 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852,
@@ -571,7 +596,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &629412354
 GameObject:
@@ -621,7 +646,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 12
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &629412357
 MonoBehaviour:
@@ -733,7 +758,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &705507993
 GameObject:
@@ -1004,7 +1029,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 13
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &913183357
 GameObject:
@@ -1071,7 +1096,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &953161746
 PrefabInstance:
@@ -1307,7 +1332,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1342371955
 MonoBehaviour:
@@ -1468,7 +1493,7 @@ Transform:
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1366746230
 GameObject:
@@ -1503,7 +1528,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1366746232
 MonoBehaviour:
@@ -1735,7 +1760,7 @@ PrefabInstance:
    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
        type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
        type: 3}
@@ -1841,7 +1866,7 @@ Transform:
  m_Children:
  - {fileID: 508810528}
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1578543177
 MonoBehaviour:
@@ -2007,8 +2032,185 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1694198627
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 122020, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_Name
+      value: EssenceWell
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -10.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.47
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -12.115
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.000000115202326
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.000000115202326
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
+--- !u!1001 &1699517438
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 48807395}
+    - target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: StartMinigame
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: WellController, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355069, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_Name
+      value: Lever (1)
+      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_LocalPosition.x
+      value: -8.716
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.235
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -11.355
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.6532815
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.27059805
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.6532815
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.27059805
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 45
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cb8b19b563b3d224897e3b3d94c353aa, type: 3}
 --- !u!1 &1986139475
 GameObject:
  m_ObjectHideFlags: 0
@@ -2258,7 +2460,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2057955796 stripped
 GameObject:
@@ -2473,7 +2675,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3}
      propertyPath: m_RootOrder
-      value: 10
+      value: 11
      objectReference: {fileID: 0}
    - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3}
      propertyPath: m_LocalPosition.x
@@ -2821,72 +3023,3 @@ SphereCollider:
  serializedVersion: 2
  m_Radius: 0.05
  m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &8183020133965781711
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 13
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -10.25
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.47
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -12.115
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.000000115202326
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.000000115202326
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8183020133482818824, guid: c52ee40e56d869645af73fd6f39c1323,
-        type: 3}
-      propertyPath: m_Name
-      value: EssenceWell
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: c52ee40e56d869645af73fd6f39c1323, type: 3}
--- a/Assets/SineVFX/TranslucentCrystals/Prefabs/Crystalsv10.prefab
+++ b/Assets/SineVFX/TranslucentCrystals/Prefabs/Crystalsv10.prefab
--- a/Assets/SineVFX/TranslucentCrystals/_SRP/TranslucentCrystals_HDRP_Patch.unitypackage.meta
+++ b/Assets/SineVFX/TranslucentCrystals/_SRP/TranslucentCrystals_HDRP_Patch.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3829f2d229e9f9b44b6d3f85cb2d6653
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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.4556081
+    - _HorizonExponent: 3.3921747
    - _HorizonStep: 500
    - _HorizonThickness: 1
    - _MoonGlow: 0
-    - _MoonLightIntensity: 0.000004351139
+    - _MoonLightIntensity: 0.00034078956
    - _MoonSize: 0
    - _MoonSoftEdge: 0
    - _OverheadCloudAltitude: 1000
    - _OverheadCloudAnimationSpeed: 50
    - _OverheadCloudFlowDirectionX: 1
    - _OverheadCloudFlowDirectionZ: 1
-    - _OverheadCloudRemapMax: 1.1004372
-    - _OverheadCloudRemapMin: 0.13224335
+    - _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.2545984
+    - _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.41328734, g: 0.3935753, b: 0.4317566, 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.90417737, g: 0.85655284, b: 0.74991864, 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.96861386}
-    - _SkyColor: {r: 0.2112336, g: 0.3694704, b: 0.6057861, 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.9735985, g: 0.9300345, b: 0.858154, a: 1}
-    - _SunDirection: {r: 0, g: -0.30342793, b: 0.9528544, 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/Assets/SkyProfile-959083625099828736.asset
+++ b/Assets/SkyProfile-959083625099828736.asset
@@ -181,11 +181,11 @@ Material:
    - _HorizonCloudSize: 5
    - _HorizonCloudStartPosition: 0
    - _HorizonCloudStep: 25
-    - _HorizonExponent: 4.9867373
+    - _HorizonExponent: 4.9805226
    - _HorizonStep: 500
    - _HorizonThickness: 1
    - _MoonGlow: 0.24
-    - _MoonLightIntensity: 0.1494839
+    - _MoonLightIntensity: 0.14924046
    - _MoonSize: 0.07
    - _MoonSoftEdge: 0.22
    - _OverheadCloudAltitude: 1000
@@ -203,7 +203,7 @@ Material:
    - _StarsGlow0: 0.01
    - _StarsGlow1: 0.01
    - _StarsGlow2: 0.01
-    - _StarsOpacity: 0.9950686
+    - _StarsOpacity: 0.99275
    - _StarsSize0: 0.42
    - _StarsSize1: 0.53
    - _StarsSize2: 0.46
@@ -212,24 +212,24 @@ Material:
    - _StarsTwinkle1: 6
    - _StarsTwinkle2: 2
    - _SunGlow: 0.45
-    - _SunLightIntensity: 0.0000058357195
+    - _SunLightIntensity: 0.000008530984
    - _SunSize: 0.07
    - _SunSoftEdge: 0.5
    m_Colors:
    - _DetailOverlayTintColor: {r: 1, g: 1, b: 1, a: 1}
    - _FogColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1}
-    - _GroundColor: {r: 0.28866658, g: 0.24062498, b: 0.3336792, a: 1}
+    - _GroundColor: {r: 0.28962553, g: 0.24180192, b: 0.3344339, a: 1}
    - _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
    - _HorizonColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1}
    - _MoonColor: {r: 1, g: 1, b: 1, a: 1}
    - _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
    - _MoonLightColor: {r: 0.8431373, g: 0.9843138, b: 1, a: 1}
-    - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.08649225}
+    - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.08823514}
    - _SkyColor: {r: 0.08056989, g: 0.03172837, b: 0.21698111, 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.9990927, g: 0.99759555, b: 0.9951253, a: 0}
+    - _SunColor: {r: 0.9988965, g: 0.9970757, b: 0.9940713, a: 0}
    - _SunDirection: {r: 0, g: 0, b: 1, a: 0}
    - _SunLightColor: {r: 1, g: 0.9921569, b: 0.90196085, a: 1}
  m_BuildTextureStacks: []
--- 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: -6801517624070787717, guid: b6bbea2e1167a7346822545139402874,
+        m_Texture: {fileID: 567659264843545098, guid: b6bbea2e1167a7346822545139402874,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
-        m_Texture: {fileID: 7632090461019099052, guid: b6bbea2e1167a7346822545139402874,
+        m_Texture: {fileID: 5600802747215712828, guid: b6bbea2e1167a7346822545139402874,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
-        m_Texture: {fileID: -4777867093011165434, guid: b6bbea2e1167a7346822545139402874,
+        m_Texture: {fileID: 4387930893138807582, 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: -5193949924077371402, guid: 726ce83d589353742be6b48ff467fc48,
+        m_Texture: {fileID: -8225046794103038699, guid: 726ce83d589353742be6b48ff467fc48,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
-        m_Texture: {fileID: 836370342043809526, guid: 726ce83d589353742be6b48ff467fc48,
+        m_Texture: {fileID: 6831111675755459306, guid: 726ce83d589353742be6b48ff467fc48,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
-        m_Texture: {fileID: 4428962203539512438, guid: 726ce83d589353742be6b48ff467fc48,
+        m_Texture: {fileID: 165637708112304383, 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: 3523615859096353334, guid: 7f589c682d367b442b8cf75918f5aa55,
+        m_Texture: {fileID: 3234995293974440031, guid: 7f589c682d367b442b8cf75918f5aa55,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByHeight:
-        m_Texture: {fileID: -6652137863509328346, guid: 7f589c682d367b442b8cf75918f5aa55,
+        m_Texture: {fileID: 7438741728987644076, guid: 7f589c682d367b442b8cf75918f5aa55,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ColorByNormal:
-        m_Texture: {fileID: 8282537599635226317, guid: 7f589c682d367b442b8cf75918f5aa55,
+        m_Texture: {fileID: -7540841678319409431, guid: 7f589c682d367b442b8cf75918f5aa55,
          type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}