Basic saving, currently hardcoded to the one "chest" inventory in HomeBase.

Loads when scene name contains "Homebase" and saves when button pressed.
Merge pull request 'staging2' (#26 ) from staging2 into master
2022-04-18 08:59:26 +03:00 · 2022-04-11 16:26:05 +00:00 · 2022-04-11 19:13:05 +03:00 · 2022-04-11 19:10:18 +03:00 · 2022-04-11 19:08:35 +03:00 · 2022-04-11 19:03:18 +03:00
221 changed files with 192011 additions and 10232 deletions
--- a/Assets/Oculus/Interaction/Samples/Objects/Props/MapWithPins/Materials/MapPointerMat.mat
+++ b/Assets/Oculus/Interaction/Samples/Objects/Props/MapWithPins/Materials/MapPointerMat.mat
@@ -45,7 +45,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: b883faee006af594480a183e2c37d229, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@@ -108,7 +108,7 @@ Material:
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/Oculus/LipSync/Models/FemaleHead_Morph/Materials/hair.mat
+++ b/Assets/Oculus/LipSync/Models/FemaleHead_Morph/Materials/hair.mat
@@ -108,7 +108,7 @@ Material:
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 0, g: 0, b: 0, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/Oculus/SampleFramework/Core/CustomHands/CustomHandRight.prefab
+++ b/Assets/Oculus/SampleFramework/Core/CustomHands/CustomHandRight.prefab
@@ -474,7 +474,7 @@ GameObject:
  - component: {fileID: 13646088}
  m_Layer: 0
  m_Name: hands_coll:b_r_index3
-  m_TagString: Untagged
+  m_TagString: Hand
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@@ -502,8 +502,8 @@ CapsuleCollider:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 157110}
  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 0
+  m_IsTrigger: 1
+  m_Enabled: 1
  m_Radius: 0.01
  m_Height: 0.05
  m_Direction: 2
--- a/Assets/Photon/PhotonUnityNetworking/Demos/DemoSlotRacer/Kenney
+++ b/Assets/Photon/PhotonUnityNetworking/Demos/DemoSlotRacer/Kenney
@@ -108,7 +108,7 @@ Material:
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 0.828, g: 0.197287, b: 0, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.828, g: 0.19728696, b: 0, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/Photon/PhotonUnityNetworking/Demos/PunBasics-Tutorial/Materials/Red
+++ b/Assets/Photon/PhotonUnityNetworking/Demos/PunBasics-Tutorial/Materials/Red
@@ -9,7 +9,7 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: Red Beam
  m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
-  m_ShaderKeywords: _EMISSION _GLOSSINESS_FROM_BASE_ALPHA _SPECULAR_COLOR
+  m_ShaderKeywords: _EMISSION
  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@@ -78,7 +78,7 @@ Material:
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 1, g: 0, b: 0, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 0, b: 0, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
  m_BuildTextureStacks: []
--- 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 &6211255873334046625
+--- !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 &7943742790050641351
-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
@@ -82,7 +82,7 @@ Material:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &5349969004212611957
+--- !u!114 &5603016075464539001
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- 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 &-2670054271726696167
-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
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7678057132603775348
-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
@@ -194,3 +181,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &6902619616048362596
+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_8Splats.mat
+++ b/Support/Materials/Terrain/URP_8Splats.mat
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7418405857753137198
-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
@@ -186,3 +173,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &379573167805043484
+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 &-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 &4555146833379849627
-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 &1366594654907158125
-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.meta
+++ b/Files/Animations/Arlo.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scenes/Shumpei/MenuScene.unity.meta
+guid: 8eb805c8ac3b6ff41a6002372d160f1f
+========
+guid: 7132a8e595d20114aa50d2f143f253d0
+folderAsset: yes
+>>>>>>>> origin/slimeAI:Assets/Project Files/Animations/Arlo.meta
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Animations/Arlo/Slime.controller
+++ b/Files/Animations/Arlo/Slime.controller
--- a/Files/Animations/Arlo/Slime.controller.meta
+++ b/Files/Animations/Arlo/Slime.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7862259c182c7f0488c1e8a56b2d0ae7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Prefabs/Arlo/SlimePBR.prefab
+++ b/Files/Prefabs/Arlo/SlimePBR.prefab
@@ -0,0 +1,483 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8436190047659544114
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8431058975139358266}
+  m_Layer: 0
+  m_Name: EyeBall
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8431058975139358266
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436190047659544114}
+  m_LocalRotation: {x: 0.44996268, y: 0.5454664, z: -0.44996268, w: 0.5454664}
+  m_LocalPosition: {x: -0.12632965, y: 3.5527135e-16, z: 1.0995774e-17}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8439517562119907010}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8436227201186145988
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439512495488244804}
+  m_Layer: 0
+  m_Name: Spine01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439512495488244804
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436227201186145988}
+  m_LocalRotation: {x: -5.551115e-17, y: -4.3368087e-19, z: -0.2246773, w: 0.97443324}
+  m_LocalPosition: {x: -0.22764134, y: -5.7731595e-17, z: 7.533981e-17}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8439494257338967284}
+  - {fileID: 8430886019108328556}
+  - {fileID: 8439396685985795126}
+  m_Father: {fileID: 8439521210071859164}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8436405828936134978
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439297195764387376}
+  m_Layer: 0
+  m_Name: Crown
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439297195764387376
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436405828936134978}
+  m_LocalRotation: {x: 0.12996013, y: -0.69506145, z: 0.12996013, w: 0.69506145}
+  m_LocalPosition: {x: -0.29759654, y: 1.7763567e-16, z: 1.7914223e-16}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8439494257338967284}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8436476053253147054
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439426448234693558}
+  m_Layer: 0
+  m_Name: UpperEyeCover
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439426448234693558
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436476053253147054}
+  m_LocalRotation: {x: 0.44996268, y: 0.5454664, z: -0.44996268, w: 0.5454664}
+  m_LocalPosition: {x: -0.12632965, y: 2.1316282e-16, z: 1.0995774e-17}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8439517562119907010}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8436517211449388664
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439248956704509810}
+  m_Layer: 0
+  m_Name: BottomEyeCover
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439248956704509810
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436517211449388664}
+  m_LocalRotation: {x: 0.44996268, y: 0.5454664, z: -0.44996268, w: 0.5454664}
+  m_LocalPosition: {x: -0.12632965, y: 1.1368684e-15, z: 1.0995774e-17}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8439517562119907010}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8436776535237543898
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439236181366124486}
+  - component: {fileID: 8428960127237688112}
+  m_Layer: 0
+  m_Name: Slime
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439236181366124486
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436776535237543898}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8439413668953451466}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &8428960127237688112
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436776535237543898}
+  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: 3
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: d357a802e5ef4d44d829d89dfb1a341c, 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
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 4300000, guid: 032e9c3d6b8f7bd4281b52741574f3af, type: 3}
+  m_Bones:
+  - {fileID: 8439521210071859164}
+  - {fileID: 8439512495488244804}
+  - {fileID: 8439494257338967284}
+  - {fileID: 8439297195764387376}
+  - {fileID: 8439517562119907010}
+  - {fileID: 8439426448234693558}
+  - {fileID: 8431058975139358266}
+  - {fileID: 8439248956704509810}
+  - {fileID: 8430886019108328556}
+  - {fileID: 8439396685985795126}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 8439521210071859164}
+  m_AABB:
+    m_Center: {x: -0.3588662, y: 0.1749603, z: 0.000000059604645}
+    m_Extent: {x: 0.62954795, y: 0.6683546, z: 0.4895594}
+  m_DirtyAABB: 0
+--- !u!1 &8436836656422519216
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439521210071859164}
+  m_Layer: 0
+  m_Name: Body
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439521210071859164
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436836656422519216}
+  m_LocalRotation: {x: -0.39340413, y: 0.5875655, z: -0.39340413, w: 0.5875655}
+  m_LocalPosition: {x: 1.5037661e-32, y: 0.0631712, z: -0.008183928}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8439512495488244804}
+  m_Father: {fileID: 8439413668953451466}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8436851742513957438
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439494257338967284}
+  m_Layer: 0
+  m_Name: Head
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439494257338967284
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436851742513957438}
+  m_LocalRotation: {x: -5.3776428e-17, y: 1.6653345e-16, z: -0.15302908, w: 0.9882217}
+  m_LocalPosition: {x: -0.2780328, y: -1.7763568e-17, z: 1.2912811e-16}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8439297195764387376}
+  - {fileID: 8439517562119907010}
+  m_Father: {fileID: 8439512495488244804}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8436876335997403404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439396685985795126}
+  m_Layer: 0
+  m_Name: Side_R
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439396685985795126
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8436876335997403404}
+  m_LocalRotation: {x: 0.0220648, y: -0.70676243, z: 0.0220648, w: 0.70676243}
+  m_LocalPosition: {x: -0.27215227, y: 0.12827092, z: 0.305791}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8439512495488244804}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8437010424349675124
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439413668953451466}
+  - component: {fileID: 8377414142725635096}
+  - component: {fileID: 9217037737240071080}
+  m_Layer: 0
+  m_Name: SlimePBR
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439413668953451466
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8437010424349675124}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.3906298, y: 0.00000023841858, z: -0.086076975}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8439521210071859164}
+  - {fileID: 8439236181366124486}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &8377414142725635096
+Animator:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8437010424349675124}
+  m_Enabled: 1
+  m_Avatar: {fileID: 9000000, guid: 032e9c3d6b8f7bd4281b52741574f3af, type: 3}
+  m_Controller: {fileID: 9100000, guid: 7862259c182c7f0488c1e8a56b2d0ae7, type: 2}
+  m_CullingMode: 1
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &9217037737240071080
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8437010424349675124}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2a6f17609e4d7c441b8f85c0f90c1a13, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &8437097380876049792
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8439517562119907010}
+  m_Layer: 0
+  m_Name: EyeCTRL
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8439517562119907010
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8437097380876049792}
+  m_LocalRotation: {x: 0.4837256, y: 0.8752197, z: 8.989413e-17, w: -2.8923308e-16}
+  m_LocalPosition: {x: 0.05909794, y: -0.1357536, z: -8.4168956e-17}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8439248956704509810}
+  - {fileID: 8431058975139358266}
+  - {fileID: 8439426448234693558}
+  m_Father: {fileID: 8439494257338967284}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8437362797197920884
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8430886019108328556}
+  m_Layer: 0
+  m_Name: Side_L
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8430886019108328556
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8437362797197920884}
+  m_LocalRotation: {x: 0.0220648, y: -0.70676243, z: 0.0220648, w: 0.70676243}
+  m_LocalPosition: {x: -0.27215242, y: 0.12827094, z: -0.30579144}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8439512495488244804}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Files/Prefabs/Arlo/SlimePBR.prefab.meta
+++ b/Files/Prefabs/Arlo/SlimePBR.prefab.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/RECURSOS YOS UNITY.meta
+guid: 28785ec045ec00946ab767b14c8f4c6d
+folderAsset: yes
+DefaultImporter:
+========
+guid: 288eb0a3190dc75419059ff7b4b70aa0
+PrefabImporter:
+>>>>>>>> origin/slimeAI:Assets/Project Files/Prefabs/Arlo/SlimePBR.prefab.meta
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Prefabs/JonasB/IceBolt.prefab
+++ b/Files/Prefabs/JonasB/IceBolt.prefab
@@ -4835,6 +4835,8 @@ 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
@@ -4897,7 +4899,7 @@ SphereCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Radius: 1
+  m_Radius: 0.5
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!135 &6090694805862981561
 SphereCollider:
@@ -4910,8 +4912,58 @@ SphereCollider:
  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
-  m_Radius: 1
+  m_Radius: 0.5
  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
@@ -0,0 +1,105 @@
+%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/EssenceWell.prefab.meta
+++ b/Files/Prefabs/JoonasP/EssenceWell.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c52ee40e56d869645af73fd6f39c1323
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  particles: {fileID: 8844865646353305354}
+  particles: {fileID: 0}
  flySpeed: 10
  testForce: 1000
 --- !u!114 &3757395767037568670
@@ -379,9 +379,3 @@ 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/Prefabs/Portals/MainBaseGreen.prefab
+++ b/Files/Prefabs/Portals/MainBaseGreen.prefab
--- a/Files/Prefabs/Portals/MainBaseGreen.prefab.meta
+++ b/Files/Prefabs/Portals/MainBaseGreen.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ae343c9db3f764a4fb226d043e7a4743
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Prefabs/Portals/MainBasePurple.prefab
+++ b/Files/Prefabs/Portals/MainBasePurple.prefab
--- a/Files/Prefabs/Portals/MainBasePurple.prefab.meta
+++ b/Files/Prefabs/Portals/MainBasePurple.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a72fc9de03049aa4c886d2034bf938aa
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Prefabs/Portals/MainBaseRed.prefab
+++ b/Files/Prefabs/Portals/MainBaseRed.prefab
--- a/Files/Prefabs/Portals/MainBaseRed.prefab.meta
+++ b/Files/Prefabs/Portals/MainBaseRed.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2f6b9693c8108f24db357c4f551127af
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Prefabs/Portals/Portal_Green.prefab
+++ b/Files/Prefabs/Portals/Portal_Green.prefab
--- a/Files/Prefabs/Portals/OtherSide.prefab.meta
+++ b/Files/Prefabs/Portals/OtherSide.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f2183625589431345976ac92219b2b97
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Prefabs/Portals/Portal_Green.prefab.meta
+++ b/Files/Prefabs/Portals/Portal_Green.prefab.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c5d51a2f14dbd754986192f475aa6719
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Prefabs/Portals/Portal_Purple.prefab
+++ b/Files/Prefabs/Portals/Portal_Purple.prefab
@@ -1,91 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &257613199430467881
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851654700168790, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_Name
-      value: Portal_Purple
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851655031599332, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: player
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851655031599332, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: linkedPortal
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2664851655392724835, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: fec29ec9aeff5d148ae4ce39ab5981f0, type: 2}
-    - target: {fileID: 2664851656537753515, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
-        type: 3}
-      propertyPath: m_InteractionManager
-      value: 
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: ef2ea3e86cf37844f9ab6a9093d855b7, type: 3}
--- a/Files/Prefabs/Portals/Portal_Purple.prefab.meta
+++ b/Files/Prefabs/Portals/Portal_Purple.prefab.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 76e270eb5751f7e4ea45ed3b158d050f
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Files/Prefabs/Portals/Portal_Red.prefab
+++ b/Files/Prefabs/Portals/Portal_Red.prefab
@@ -1,121 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &3086217307916794381
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 1022042495959285158, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_InteractionManager
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496337251419, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_Name
-      value: Portal_Red
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496669043433, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: player
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496669043433, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: linkedPortal
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042496961707374, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: bf0da4907b1b1174d82fea8c818ebf1e, type: 2}
-    - target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: InitialModule.startColor.maxColor.b
-      value: 0.17647058
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: InitialModule.startColor.maxColor.g
-      value: 0.3111662
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: InitialModule.startColor.maxColor.r
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: InitialModule.startColor.minColor.b
-      value: 0.32549024
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: InitialModule.startColor.minColor.g
-      value: 0.7882222
-      objectReference: {fileID: 0}
-    - target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
-        type: 3}
-      propertyPath: InitialModule.startColor.minColor.r
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: c5d51a2f14dbd754986192f475aa6719, type: 3}
--- a/Files/Prefabs/Portals/Portal_Red.prefab.meta
+++ b/Files/Prefabs/Portals/Portal_Red.prefab.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ef2ea3e86cf37844f9ab6a9093d855b7
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- 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/Arlo/SlimeAI.cs
+++ b/Files/Scripts/Arlo/SlimeAI.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SlimeAI : MonoBehaviour
+{
+
+    Animator animator;
+    float playerDistance;
+    // Start is called before the first frame update
+    void Start()
+    {
+        animator = GetComponent<Animator>();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Files/Scripts/Arlo/SlimeAI.cs.meta
+++ b/Files/Scripts/Arlo/SlimeAI.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2a6f17609e4d7c441b8f85c0f90c1a13
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/HandAnim.cs
+++ b/Files/Scripts/HandAnim.cs
@@ -0,0 +1,111 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.XR;
+using UnityEngine.XR.Interaction.Toolkit;
+using TMPro; // Add the TextMesh Pro namespace to access the various functions.
+using System.Linq;
+using UnityEngine.InputSystem;
+using System;
+
+public class HandAnim : MonoBehaviour
+{
+    public Animator m_animator = null;
+    [Header("Input")]
+    [SerializeField] public InputActionProperty GripAction;
+    [SerializeField] public InputActionProperty TriggerAction;
+    [SerializeField] public InputActionProperty IndexAction;
+    [SerializeField] public InputActionProperty ThumbAction;
+
+
+    public const string ANIM_LAYER_NAME_POINT = "Point Layer";
+    public const string ANIM_LAYER_NAME_THUMB = "Thumb Layer";
+    public const string ANIM_PARAM_NAME_FLEX = "Flex";
+    public const string ANIM_PARAM_NAME_POSE = "Pose";
+
+    private int m_animLayerIndexThumb = -1;
+    private int m_animLayerIndexPoint = -1;
+    private int m_animParamIndexFlex = -1;
+    private int m_animParamIndexPose = -1;
+    private Collider[] m_colliders = null;
+
+    public float anim_frames = 4f;
+    private float grip_state = 0f;
+    private float trigger_state = 0f;
+    private float triggerCap_state = 0f;
+    private float thumbCap_state = 0f;
+
+    private void Reset()
+    {
+        m_animator = GetComponentInChildren<Animator>();
+    }
+
+    private void Awake()
+    {
+        GripAction.action.performed += GripActionPerformed;
+        TriggerAction.action.performed += TriggerActionPerformed;
+        IndexAction.action.performed += IndexActionPerformed;
+        ThumbAction.action.performed += ThumbActionPerformed;
+        GripAction.action.Enable();
+        TriggerAction.action.Enable();
+        IndexAction.action.Enable();
+        ThumbAction.action.Enable();
+    }
+
+    void Start()
+    {
+        m_colliders = this.GetComponentsInChildren<Collider>().Where(childCollider => !childCollider.isTrigger).ToArray();
+        for (int i = 0; i < m_colliders.Length; ++i)
+        {
+            Collider collider = m_colliders[i];
+            // collider.transform.localScale = new Vector3(COLLIDER_SCALE_MIN, COLLIDER_SCALE_MIN, COLLIDER_SCALE_MIN);
+            collider.enabled = true;
+        }
+        m_animLayerIndexPoint = m_animator.GetLayerIndex(ANIM_LAYER_NAME_POINT);
+        m_animLayerIndexThumb = m_animator.GetLayerIndex(ANIM_LAYER_NAME_THUMB);
+        m_animParamIndexFlex = Animator.StringToHash(ANIM_PARAM_NAME_FLEX);
+        m_animParamIndexPose = Animator.StringToHash(ANIM_PARAM_NAME_POSE);
+    }
+
+    private void ThumbActionPerformed(InputAction.CallbackContext obj)
+    {
+        CalculateState(obj.ReadValue<float>(), ref thumbCap_state);
+        m_animator.SetLayerWeight(m_animLayerIndexThumb, 1f - thumbCap_state);
+    }
+
+    private void IndexActionPerformed(InputAction.CallbackContext obj)
+    {
+        CalculateState(obj.ReadValue<float>(), ref triggerCap_state);
+        m_animator.SetLayerWeight(m_animLayerIndexPoint, 1f - triggerCap_state);
+    }
+
+    private void TriggerActionPerformed(InputAction.CallbackContext obj)
+    {
+        CalculateState(obj.ReadValue<float>(), ref trigger_state);
+        m_animator.SetFloat("Pinch", trigger_state);
+    }
+
+    private void GripActionPerformed(InputAction.CallbackContext obj)
+    {
+        //Debug.Log("grip");
+        CalculateState(obj.ReadValue<float>(), ref grip_state);
+        m_animator.SetFloat(m_animParamIndexFlex, grip_state);
+    }
+
+    private void CalculateState(float value, ref float state)
+    {
+        var delta = value - state;
+        if (delta > 0f)
+        {
+            state = Mathf.Clamp(state + 1 / anim_frames, 0f, value);
+        }
+        else if (delta < 0f)
+        {
+            state = Mathf.Clamp(state - 1 / anim_frames, value, 1f);
+        }
+        else
+        {
+            state = value;
+        }
+    }
+}
--- a/Files/Scripts/HandAnim.cs.meta
+++ b/Files/Scripts/HandAnim.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 158ebba8614f70a47b5379affd3d7b17
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Helar/Inventory.cs
+++ b/Files/Scripts/Helar/Inventory.cs
@@ -1,17 +1,22 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using UnityEngine;
+using UnityEngine.SceneManagement;

-[Serializable]
 public class Inventory : MonoBehaviour
 {
+    //perhaps use these additional slots for holsters attached to the player?
    public List<InventorySlot> additionalSlots;

    public GameObject itemContainerPrefab;

    private List<InventorySlot> _inventorySlots;

+    public InventorySaveData inventorySaveData;
+
    private void Awake()
    {
        _inventorySlots = new List<InventorySlot>();
@@ -20,10 +25,15 @@ public class Inventory : MonoBehaviour
            inventorySlot.SetParentInventory(this);
            _inventorySlots.Add(inventorySlot);
        }
+        
+        Debug.Log(_inventorySlots.Count);
    }

    private void OnEnable()
    {
+        SceneManager.sceneLoaded += OnSceneLoaded;
+        
+        
        var inventorySlotsInChildren = GetComponentsInChildren<InventorySlot>();
        foreach (var inventorySlot in inventorySlotsInChildren)
        {
@@ -32,6 +42,12 @@ public class Inventory : MonoBehaviour
        }
    }

+    private void OnDisable()
+    {
+        SceneManager.sceneLoaded -= OnSceneLoaded;
+    }
+
+
    public bool AddItem(ItemData item)
    {
        if (item.canStack)
@@ -39,16 +55,17 @@ public class Inventory : MonoBehaviour
            return AddItem(ConvertToInventoryItem(item));
        }
        
-        return AddToFirstOpenSlot(item.gameObject);
+        return AddToFirstOpenSlot(item.prefab.gameObject);
    }

    public bool AddItem(InventoryItem item)
    {
+        
        //Stacks the item if it already exists in the inventory.
        foreach (var inventorySlot in _inventorySlots.Where(inventorySlot =>
                     inventorySlot.ContainsItem(item.GetItemid())))
        {
-            inventorySlot.GetItem().ChangeCount(item.Count);
+            inventorySlot.GetItem().ChangeCount(item.saveData.count);
            return true;
        }

@@ -67,11 +84,91 @@ public class Inventory : MonoBehaviour
        return false;
    }

+    private void AddToSpecificSlot(GameObject item, int slot)
+    {
+        _inventorySlots[slot].AssignItem(item);
+    }
+
    private InventoryItem ConvertToInventoryItem(ItemData item)
    {
        var inventoryItem = Instantiate(itemContainerPrefab, transform);
-        itemContainerPrefab.GetComponent<InventoryItem>().itemPrefab = item.gameObject;
+        itemContainerPrefab.GetComponent<InventoryItem>().itemPrefab = item.prefab.gameObject;

        return inventoryItem.gameObject.GetComponent<InventoryItem>();
    }
+
+
+    public void SaveInventory()
+    {
+        inventorySaveData.inventoryContents.Clear();
+        foreach (var inventoryItem in _inventorySlots.Select(inventorySlot => inventorySlot.GetItem()))
+        {
+            //adds an itemsavedata to the list if it exists or an empty one if it doesnt
+            inventorySaveData.inventoryContents.Add(inventoryItem != null
+                ? inventoryItem.saveData
+                : new ItemSaveData());
+        }
+        
+        var json = JsonUtility.ToJson(inventorySaveData);
+        Debug.Log(json);
+        using var sw = new StreamWriter(Path.Combine(Application.persistentDataPath, "invSave.dat"));
+        sw.Write(json);
+        
+        
+        Debug.Log("Inv data saved!");
+    }
+    
+    public IEnumerator LoadInventory()
+    {
+        //Wait for 1 second after loading the scene to prevent missing prefabs. (1 second delay might also break something in the future)
+        
+        yield return new WaitForSeconds(1);
+        //todo make this modular, currently only supports one inventory, although the slots can be anywhere.
+        if (File.Exists(Path.Combine(Application.persistentDataPath, "invSave.dat")))
+        {
+            var saveData = JsonUtility.FromJson<InventorySaveData>(File.ReadAllText(Path.Combine(Application.persistentDataPath, "invSave.dat")));
+            Debug.Log(saveData);
+            Debug.Log("Inv data loaded! total "+saveData.inventoryContents.Count);
+ 
+            
+            for (var i = 0; i < saveData.inventoryContents.Count; i++)
+            {
+                //prevents overwriting inventory slots when there is something already in there.
+                //if (_inventorySlots[i]._itemInSlot != null) continue;
+                
+                var data = saveData.inventoryContents[i];
+                
+                //if there isnt an item in the slot the count is 0
+                Debug.Log(data.assetPath + " "+data.count);
+                if (data.count == 0) continue;
+                
+                //Loads the prefab from resources folder
+                var load = Resources.Load(data.assetPath, typeof(GameObject)) as GameObject;
+                if (load == null)
+                {
+                    Debug.LogError("Didn't find a prefab at " + data.assetPath);
+                    yield break;
+                }
+                
+                
+                
+                Debug.Log(load);
+                AddToSpecificSlot(load, i);
+                
+                //sets the count after the item has been converted into inventoryitem
+                if (load.GetComponent<ItemData>().canStack) _inventorySlots[i]._itemInSlot.GetComponent<InventoryItem>().saveData.count = data.count;
+            }
+        }
+        else
+            Debug.LogError("There is no save data!");
+    }
+    
+   
+    void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+    {
+        Debug.Log("OnSceneLoaded: " + scene.name);
+        
+        //primitive check to only load the inventory when you are in the home scene.
+        if (scene.name.Contains("Homebase")) StartCoroutine(LoadInventory());
+    }
 }
--- a/Files/Scripts/Helar/InventorySlot.cs
+++ b/Files/Scripts/Helar/InventorySlot.cs
@@ -4,16 +4,14 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.XR.Interaction.Toolkit;

-[Serializable]
 [RequireComponent(typeof(XRSocketInteractor))]
 public class InventorySlot : MonoBehaviour
 {
    private XRSocketInteractor xrSocketInteractor;

-    private GameObject _itemInSlot;
+    public GameObject _itemInSlot;

    private Inventory _parentInventory;
-
    private void Awake()
    {
        xrSocketInteractor = GetComponent<XRSocketInteractor>();
@@ -35,6 +33,7 @@ public class InventorySlot : MonoBehaviour
        if (_itemInSlot.GetComponent<InventoryItem>() == null) return;
        if (_itemInSlot == args.interactableObject.transform.gameObject) return;
        
+        
        //Debug.Log("hoverenter "+args.interactableObject + " " + xrSocketInteractor.hasHover + " " + xrSocketInteractor.hasSelection);
        
        var newItem = args.interactableObject.transform.gameObject;
@@ -47,7 +46,7 @@ public class InventorySlot : MonoBehaviour
            
            if (inventoryItem != null)
            {
-                _itemInSlot.GetComponent<InventoryItem>().ChangeCount(inventoryItem.Count);
+                _itemInSlot.GetComponent<InventoryItem>().ChangeCount(inventoryItem.saveData.count);
            }
            else
            {
@@ -70,11 +69,13 @@ public class InventorySlot : MonoBehaviour
    private void SelectEnter(SelectEnterEventArgs args)
    {
        Debug.Log("Added to slot item " + _itemInSlot);
+        
        var newItem = args.interactableObject.transform.gameObject;
        
+        //todo: fix ones that cant stack
        
        //Converts the item into a inventory item 
-        if (newItem.GetComponent<InventoryItem>() == null && newItem.GetComponent<ItemData>().canStack)
+        if (newItem.GetComponent<InventoryItem>() == null)
        {

            var load = Resources.Load("Helar/Item", typeof(GameObject)) as GameObject;
@@ -101,12 +102,39 @@ public class InventorySlot : MonoBehaviour
            

            _itemInSlot = instance;
+            
+            //_parentInventory.AddItem(instance.GetComponent<InventoryItem>());
+            
            return;
        }
        
        _itemInSlot = newItem;
+        
+        //_parentInventory.AddItem(newItem.GetComponentInChildren<ItemData>());
        //xrSocketInteractor.attachTransform = _itemInSlot.transform;
        Debug.Log("Holstered item" + _itemInSlot.GetComponentInChildren<ItemData>());
+        
+    }
+
+    private GameObject ConvertItem(GameObject item)
+    {
+        //load container object
+        var load = Resources.Load("Helar/Item", typeof(GameObject)) as GameObject;
+        //instantiate the container object
+        var instance = Instantiate(load, transform);
+        
+        //load the container with the item to convert
+        instance.GetComponent<InventoryItem>().itemPrefab = item.gameObject;
+        
+        //set the position and scale so it fits in the container
+        instance.transform.localScale = Vector3.one;
+        instance.transform.localPosition = Vector3.zero;
+        instance.transform.rotation = Quaternion.identity;
+        
+        //enable the itemcontainer (more logic in InventoryItem OnEnable() method)
+        instance.GetComponent<InventoryItem>().enabled = true;
+
+        return instance;
    }

    private void ManagerOninteractableUnregistered(InteractableUnregisteredEventArgs obj)
@@ -126,12 +154,14 @@ public class InventorySlot : MonoBehaviour
        component.drag = 0.5f;
        
        if (!_itemInSlot.GetComponentInChildren<ItemData>().canStack ||
-            _itemInSlot.GetComponent<InventoryItem>().Count == 1)
+            _itemInSlot.GetComponent<InventoryItem>().saveData.count == 1)
        {
+            //todo change back to regular item
+            //_itemInSlot.GetComponent<InventoryItem>().PopItem();
            //var transformGameObject = _itemInSlot.GetComponentInChildren<ItemData>().transform.gameObject;
            //Debug.Log(transformGameObject);
            //args.interactableObject = transformGameObject.GetComponent<XRGrabInteractable>();
-            //todo change back to regular item
+            
        }
        Debug.Log("Removed from slot item " + _itemInSlot);
        _itemInSlot = null;
@@ -159,12 +189,21 @@ public class InventorySlot : MonoBehaviour
    }

    public void AssignItem(GameObject newObject)
+    {
+        if (newObject.GetComponent<InventoryItem>() == null)
+        {
+            _itemInSlot = ConvertItem(newObject);
+        }
+        else
        {
            _itemInSlot = newObject;
        }
+    }

    public InventoryItem GetItem()
    {
+        if (_itemInSlot == null) return null;
+        
        var inventoryItem = _itemInSlot.GetComponent<InventoryItem>();
        if (inventoryItem == null) Debug.LogError("Item in slot doesn't have InventoryItem component");
        return inventoryItem;
--- a/Files/Scripts/Helar/ItemSpawner.cs
+++ b/Files/Scripts/Helar/ItemSpawner.cs
@@ -9,7 +9,7 @@ public class ItemSpawner : MonoBehaviour
    public GameObject placeToSpawn;
    public void SpawnItem()
    {
-        Debug.Log("Spawned " + objectToSpawn);
        Instantiate(objectToSpawn, placeToSpawn.transform);
+        Debug.Log("Spawned " + objectToSpawn);
    }
 }
--- a/Files/Scripts/Helar/Items/InventoryItem.cs
+++ b/Files/Scripts/Helar/Items/InventoryItem.cs
@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using TMPro;
 using Unity.Mathematics;
-using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.XR.Interaction.Toolkit;

@@ -13,15 +12,13 @@ public class InventoryItem : MonoBehaviour
    
    public GameObject itemPrefab;

-    private int _itemId;
-
    private GameObject _childPrefab;

-    public int Count { get; private set; }
+    private TMP_Text itemCounterText;

-    public TMP_Text itemCounterText;
+    private ItemData itemData;

-    private ItemData _itemData;
+    public ItemSaveData saveData;
    

    private void OnEnable()
@@ -37,13 +34,15 @@ public class InventoryItem : MonoBehaviour
        
        if (itemCounterText == null) itemCounterText = GetComponentInChildren<TMP_Text>();

-        _childPrefab = GetComponentInChildren<ItemData>()?.gameObject;
+        _childPrefab = GetComponentInChildren<ItemData>()?.prefab.gameObject;
        //Only attaches the prefab if it doesn't already have one ([ExecuteAlways] causes one to be spawned in editor).
        if (_childPrefab != null) return;

        _childPrefab = Instantiate(itemPrefab, transform);
-        _childPrefab.transform.localPosition = new Vector3(0, -0.45f, 0);
-        _childPrefab.transform.localScale = new Vector3(2, 2, 2);
+        
+        //todo switch to multiply instead so items with non 1,1,1 scale will retain their proportions
+        _childPrefab.transform.localPosition = GetComponentInChildren<ItemData>().positionInContainer; 
+        _childPrefab.transform.localScale = GetComponentInChildren<ItemData>().scaleInContainer;
        _childPrefab.transform.rotation = quaternion.identity;
        
        //Disable prefab components that arent relevant. 
@@ -60,23 +59,28 @@ public class InventoryItem : MonoBehaviour
        var xrGrabInteractableComponent = _childPrefab.GetComponent<XRGrabInteractable>();
        if (xrGrabInteractableComponent != null) xrGrabInteractableComponent.enabled = false;

+
+        
    }

    private void Start()
    {
-        _itemData = _childPrefab.GetComponent<ItemData>();
+        itemData = _childPrefab.GetComponent<ItemData>();
        
-        if (_itemData == null) Debug.LogError("Item prefab has no attached ItemData", _childPrefab);
+        if (itemData == null) Debug.LogError("Item prefab has no attached ItemData", _childPrefab);

-        
-        _itemId = _itemData.itemId;
-        if (Count == 0) Count = 1;
+        Debug.Log(saveData);
+        if (string.IsNullOrEmpty(saveData.assetPath))
+        {
+            saveData.assetPath = itemData.assetLocation;
+            saveData.count = saveData.count == 0 ? 1 : saveData.count;
+        }
        UpdateText();
    }

    private void UpdateText()
    {
-        itemCounterText.text = _itemData.canStack ? Count.ToString() : "";
+        itemCounterText.text = itemData.canStack ? saveData.count.ToString() : "";
    }

    /**
@@ -85,11 +89,11 @@ public class InventoryItem : MonoBehaviour
     */
    public bool ChangeCount(int amount)
    {
-        if (Count + amount < 0) return false;
+        if (saveData.count + amount < 0) return false;
        
-        Count += amount;
+        saveData.count += amount;
        
-        if (Count == 0)
+        if (saveData.count == 0)
        {
            //Destroys this gameobject if the count is 0 or lower 
            Destroy(gameObject);
@@ -103,10 +107,11 @@ public class InventoryItem : MonoBehaviour

    public void PopItem()
    {
-        GameObject item = Instantiate(_itemData.prefab, transform.position + transform.forward, Quaternion.identity);
+        GameObject item = Instantiate(itemData.prefab, transform.position + transform.forward, Quaternion.identity);
+
        
        item.transform.localScale = Vector3.one;
-        item.transform.name = _itemData.name;
+        item.transform.name = itemData.itemName;

        var colliderComponent = item.GetComponent<Collider>();
        if (colliderComponent != null) colliderComponent.enabled = true;
@@ -127,13 +132,13 @@ public class InventoryItem : MonoBehaviour

    public int GetItemid()
    {
-        return _itemId;
+        return itemData.itemId;;
    }
    
    

    public override string ToString()
    {
-        return $"{base.ToString()}, Count: {Count}, ItemData: {_itemData}";
+        return $"{base.ToString()}, Count: {saveData.count}, ItemData: {itemData}";
    }
 }
--- a/Files/Scripts/Helar/Items/InventorySaveData.cs
+++ b/Files/Scripts/Helar/Items/InventorySaveData.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[Serializable]
+public class InventorySaveData
+{
+    public List<ItemSaveData> inventoryContents;
+}
--- a/Files/Scripts/Helar/Items/InventorySaveData.cs.meta
+++ b/Files/Scripts/Helar/Items/InventorySaveData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e60ec35305ed0b94099d18a09b488310
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Helar/Items/ItemData.cs
+++ b/Files/Scripts/Helar/Items/ItemData.cs
@@ -1,16 +1,44 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditor;
+using UnityEditor.SceneManagement;
 using UnityEngine;

 [Serializable]
 public class ItemData : MonoBehaviour
 {
+    [Tooltip("Location is populated automatically")]
+    public string assetLocation;
    public int itemId;
    public bool canStack;
    public string itemName;
    public string itemDescription;
    public GameObject prefab;
+    public Vector3 scaleInContainer;
+    public Vector3 positionInContainer;
+
+    private void OnValidate()
+    {
+        if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(prefab))) assetLocation = AssetDatabase.GetAssetPath(prefab);
+
+        AdjustPath();
+    }
+
+    private void AdjustPath()
+    {
+        //trims the location for use with Resources.Load later
+        if (assetLocation.StartsWith("Assets/Resources/"))
+            assetLocation = assetLocation[17 .. ^7];
+        else if (!string.IsNullOrEmpty(assetLocation))
+            if (assetLocation.StartsWith("Assets"))
+            {
+                Debug.LogError(itemName +
+                               ": item with this script should be placed in the Assets/Resources/ folder. Currently: " +
+                               assetLocation);
+            }
+        
+    }

    public override string ToString()
    {
--- a/Files/Scripts/Helar/Items/ItemSaveData.cs
+++ b/Files/Scripts/Helar/Items/ItemSaveData.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[Serializable]
+public class ItemSaveData
+{
+    public string assetPath;
+    public int count;
+    
+}
--- a/Files/Scripts/Helar/Items/ItemSaveData.cs.meta
+++ b/Files/Scripts/Helar/Items/ItemSaveData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2e553150cec08514e9aacc82fe8da007
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/JonasB/ActionGestureInteraction.cs
+++ b/Files/Scripts/JonasB/ActionGestureInteraction.cs
@@ -12,6 +12,8 @@ public class ActionGestureInteraction : MonoBehaviour
    private GameObject player;
    public float projectileSpeed = 30;

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

    public void PerformAction(string action)
    {
-        Debug.Log(action);
-        if (action == "Portal")
+        Debug.LogWarning(action);
+
+        
+        /* todo: playerinfo doesnt have these methods?
+        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")
        {
            // Raycast to find portal were looking at.
            var nearestPortal = FindPortalInFront();
@@ -41,9 +102,9 @@ public class ActionGestureInteraction : MonoBehaviour
                    // Make ice wall appear from below to block incoming projectiles
                }
            }
+        }  */
    }
-    }
-    void EnableDisablePortal(GameObject portal)
+    void MinigameEnable(GameObject portal)
    {
        // Did the raycast catch a portal in front of us?
        if (portal != null)
@@ -70,7 +131,7 @@ public class ActionGestureInteraction : MonoBehaviour
        }
    }

-    GameObject FindPortalInFront() 
+    GameObject FindMinigame()
    {
        Ray ray = playerCamera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
        RaycastHit hit;
@@ -104,6 +165,7 @@ 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/JonasB/PortalTeleporter.cs
+++ b/Files/Scripts/JonasB/PortalTeleporter.cs
@@ -20,6 +20,12 @@ public class PortalTeleporter : MonoBehaviour
    private GameObject vfx_gameobject;

    private void Start()
+    {
+        if (linkedPortal == null)
+        {
+            DisablePortal();
+        }
+        else
        {
            linkedPortalTransform = linkedPortal.transform;
            _portalCanBeUsed = true;
@@ -34,7 +40,7 @@ public class PortalTeleporter : MonoBehaviour
            {
                vfx_gameobject.SetActive(false);
            }
-        
+        } 
    }

    void OnTriggerEnter(Collider other)
@@ -43,7 +49,7 @@ public class PortalTeleporter : MonoBehaviour
        Debug.Log(_enabled);
        if (_portalCanBeUsed && !_justUsed && _enabled)
        {
-            if (other.name.StartsWith("Holster"))
+            if (other.name.StartsWith("Holster") || other.tag.Contains("Holster"))
            {
                Debug.Log("holster");
            }
--- a/Files/Scripts/JoonasP/EssenceNodeController.cs
+++ b/Files/Scripts/JoonasP/EssenceNodeController.cs
@@ -12,7 +12,10 @@ public class EssenceNodeController : MonoBehaviour

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

    private float timer;
    private Material nodeMaterial;
@@ -22,6 +25,7 @@ public class EssenceNodeController : MonoBehaviour
    private void Awake()
    {
        nodeMaterial = GetComponent<Renderer>().material;
+        //playerInfo = PlayerInfo.Instance;
        playerInventory = GameObject.Find("Inventory").GetComponent<Inventory>();
    }

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

    }
@@ -58,6 +62,7 @@ public class EssenceNodeController : MonoBehaviour

    IEnumerator Collect()
    {
+        playerInfo.AddEssenceBasic(1);
        yield return new WaitForSeconds(2f);
        //TODO: Update value in player inventory
        playerInventory.AddItem(GetComponent<ItemData>());
@@ -79,7 +84,7 @@ public class EssenceNodeController : MonoBehaviour

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

--- a/Files/Scripts/Shumpei/ArmSwingLocomotion.cs
+++ b/Files/Scripts/Shumpei/ArmSwingLocomotion.cs
@@ -8,6 +8,7 @@ public class ArmSwingLocomotion : MonoBehaviour
    public GameObject RightHand;
    public GameObject CenterEyeCamera;
    public GameObject ForwardDirection;
+    public GameObject Player;

    private Vector3 PositionPreviousFrameLeftHand;
    private Vector3 PositionPreviousFrameRightHand;
@@ -22,7 +23,7 @@ public class ArmSwingLocomotion : MonoBehaviour
    // Start is called before the first frame update
    void Start()
    {
-        PlayerPositionPreviousFrame = transform.position;
+        PlayerPositionPreviousFrame = Player.transform.position;
        PositionPreviousFrameLeftHand = LeftHand.transform.position;
        PlayerPositionPreviousFrame = RightHand.transform.position;
    }
@@ -33,13 +34,13 @@ public class ArmSwingLocomotion : MonoBehaviour



-        float Yrot = CenterEyeCamera.transform.eulerAngles.y;
-        ForwardDirection.transform.eulerAngles = new Vector3(0, Yrot, 0);
+        /*float Yrot = CenterEyeCamera.transform.eulerAngles.y;
+        ForwardDirection.transform.eulerAngles = new Vector3(0, Yrot, 0);*/

        PositionCurrentFrameLeftHand = LeftHand.transform.position;
        PositionCurrentFrameRightHand = RightHand.transform.position;

-        PlayerPositionCurrentFrame = transform.position;
+        PlayerPositionCurrentFrame = Player.transform.position;

        //Debug.Log("Previous" + PositionPreviousFrameLeftHand);
        //Debug.Log("Current" + PositionCurrentFrameLeftHand);
@@ -52,7 +53,7 @@ public class ArmSwingLocomotion : MonoBehaviour

        if (Time.timeSinceLevelLoad > 1f)
        {
-            transform.position += ForwardDirection.transform.forward * HandSpeed * Speed * Time.deltaTime;
+            Player.transform.position += ForwardDirection.transform.forward * HandSpeed * Speed * Time.deltaTime;
        }

        PositionPreviousFrameLeftHand = PositionCurrentFrameLeftHand;
--- a/Files/Scripts/Shumpei/ChangeButtonColor.cs
+++ b/Files/Scripts/Shumpei/ChangeButtonColor.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ChangeButtonColor : MonoBehaviour
+{
+    [SerializeField] private Color enterColor = Color.white;
+    [SerializeField] private Color exitColor = Color.white;
+
+    private MeshCollider _collider;
+    private MeshRenderer _renderer;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        _collider = GetComponent<MeshCollider>();
+        _renderer = GetComponent<MeshRenderer>();
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Hand")
+        {
+            _renderer.material.color = enterColor;
+            Debug.Log("Touched!");
+
+        }
+    }
+
+    private void OnTriggerExit(Collider other)
+    {
+        if (other.tag == "Hand")
+        {
+            _renderer.material.color = exitColor;
+
+        }
+    }
+}
--- a/Files/Scripts/Shumpei/ChangeButtonColor.cs.meta
+++ b/Files/Scripts/Shumpei/ChangeButtonColor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a16108a6f7081d14f9f5a046ac04b8c2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/ChangeButtonColorLocomotion.cs
+++ b/Files/Scripts/Shumpei/ChangeButtonColorLocomotion.cs
@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ChangeButtonColorLocomotion : MonoBehaviour
+{
+    [SerializeField] private Color enterColor = Color.white;
+    [SerializeField] private Color exitColor = Color.white;
+
+    private MeshCollider _collider;
+    private MeshRenderer _renderer;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        _collider = GetComponent<MeshCollider>();
+        _renderer = GetComponent<MeshRenderer>();
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Hand")
+        {
+            if(_renderer.material.color != enterColor)
+                _renderer.material.color = enterColor;
+            else
+                _renderer.material.color = exitColor;
+
+        }
+    }
+
+
+}
--- a/Files/Scripts/Shumpei/ChangeButtonColorLocomotion.cs.meta
+++ b/Files/Scripts/Shumpei/ChangeButtonColorLocomotion.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ae634ea4fe8cb874487372a3d7c595bf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/ControllLocomotion.cs
+++ b/Files/Scripts/Shumpei/ControllLocomotion.cs
@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ControllLocomotion : MonoBehaviour
+{
+    public GameObject XRorigin;
+    public GameObject ArmSwingButton;
+    public GameObject JoyStickButton;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Files/Scripts/Shumpei/ControllLocomotion.cs.meta
+++ b/Files/Scripts/Shumpei/ControllLocomotion.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ca1db91ee57976944aa22ed347811963
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/EnableArmSwing.cs
+++ b/Files/Scripts/Shumpei/EnableArmSwing.cs
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EnableArmSwing : MonoBehaviour
+{
+
+    private MeshCollider _collider;
+    private MeshRenderer _renderer;
+
+    public GameObject Player;
+    // Start is called before the first frame update
+    void Start()
+    {
+        _collider = GetComponent<MeshCollider>();
+        _renderer = GetComponent<MeshRenderer>();
+        Player.GetComponent<ArmSwingLocomotion>().enabled = false;
+
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Hand")
+        {
+            if(Player.GetComponent<ArmSwingLocomotion>().enabled == true)
+                Player.GetComponent<ArmSwingLocomotion>().enabled = false;
+            else
+                Player.GetComponent<ArmSwingLocomotion>().enabled = true;
+
+        }
+    }
+}
--- a/Files/Scripts/Shumpei/EnableArmSwing.cs.meta
+++ b/Files/Scripts/Shumpei/EnableArmSwing.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 696a55bfea145fa4b9029ff2d359c16d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/EnableDash.cs
+++ b/Files/Scripts/Shumpei/EnableDash.cs
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EnableDash : MonoBehaviour
+{
+
+    private MeshCollider _collider;
+    private MeshRenderer _renderer;
+
+    public GameObject Player;
+    // Start is called before the first frame update
+    void Start()
+    {
+        _collider = GetComponent<MeshCollider>();
+        _renderer = GetComponent<MeshRenderer>();
+        Player.GetComponent<Dash>().enabled = false;
+
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Hand")
+        {
+            if (Player.GetComponent<Dash>().enabled == true)
+                Player.GetComponent<Dash>().enabled = false;
+            else
+                Player.GetComponent<Dash>().enabled = true;
+
+        }
+    }
+}
--- a/Files/Scripts/Shumpei/EnableDash.cs.meta
+++ b/Files/Scripts/Shumpei/EnableDash.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 84e3386cbd3fd2c418ecf357af19ba5f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/EnableJoyStick.cs
+++ b/Files/Scripts/Shumpei/EnableJoyStick.cs
@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EnableJoyStick : MonoBehaviour
+{
+
+    private MeshCollider _collider;
+    private MeshRenderer _renderer;
+
+    public GameObject LocomotionSystem;
+    // Start is called before the first frame update
+    void Start()
+    {
+        _collider = GetComponent<MeshCollider>();
+        _renderer = GetComponent<MeshRenderer>();
+        LocomotionSystem.SetActive(false);
+
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Hand")
+        {
+            LocomotionSystem.SetActive(!LocomotionSystem.activeSelf);
+        }
+    }
+}
--- a/Files/Scripts/Shumpei/EnableJoyStick.cs.meta
+++ b/Files/Scripts/Shumpei/EnableJoyStick.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a63e1d5bde5a60c45aa409546e55b920
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/EnterGameScene.cs
+++ b/Files/Scripts/Shumpei/EnterGameScene.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class EnterGameScene : MonoBehaviour
+{
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Player")
+        {
+            SceneManager.LoadScene("GameScene");
+        }
+    }
+}
--- a/Files/Scripts/Shumpei/EnterGameScene.cs.meta
+++ b/Files/Scripts/Shumpei/EnterGameScene.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f1114a137d02f184db2b6291d9d31cb5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/ForwardDirection.cs
+++ b/Files/Scripts/Shumpei/ForwardDirection.cs
@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ForwardDirection : MonoBehaviour
+{
+    public GameObject CenterEyeCamera;
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        float Yrot = CenterEyeCamera.transform.eulerAngles.y;
+        transform.eulerAngles = new Vector3(0, Yrot, 0);
+    }
+}
--- a/Files/Scripts/Shumpei/ForwardDirection.cs.meta
+++ b/Files/Scripts/Shumpei/ForwardDirection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 01869e86b22555a449cd53043f5c4afa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/LocomotionSettingButton.cs
+++ b/Files/Scripts/Shumpei/LocomotionSettingButton.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LocomotionSettingButton : MonoBehaviour
+{
+
+    private MeshCollider _collider;
+
+    public GameObject LocomotionPanel;
+    // Start is called before the first frame update
+    void Start()
+    {
+        _collider = GetComponent<MeshCollider>();
+        LocomotionPanel.SetActive(false);
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Hand")
+        {
+            LocomotionPanel.SetActive(!LocomotionPanel.activeSelf);
+
+        }
+    }
+}
--- a/Files/Scripts/Shumpei/LocomotionSettingButton.cs.meta
+++ b/Files/Scripts/Shumpei/LocomotionSettingButton.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8ac280753a1d95a43a1fbcfd69708d7a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/PauseMenu.cs
+++ b/Files/Scripts/Shumpei/PauseMenu.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PauseMenu : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Files/Scripts/Shumpei/PauseMenu.cs.meta
+++ b/Files/Scripts/Shumpei/PauseMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5a2662b3abecb914cad356619e832f13
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/Player.cs
+++ b/Files/Scripts/Shumpei/Player.cs
@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Player : MonoBehaviour
+{
+    /*public int level;
+    public int health;*/
+    public void SavePlayer()
+    {
+        SaveSystem.SavePlayer(this);
+    }
+
+    public void LoadPlayer()
+    {
+        PlayerData data = SaveSystem.LoadPlayer();
+
+        Vector3 position;
+        position.x = data.position[0];
+        position.y = data.position[1];
+        position.z = data.position[2];
+        transform.position = position;
+    }
+}
--- a/Files/Scripts/Shumpei/Player.cs.meta
+++ b/Files/Scripts/Shumpei/Player.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6ff82a98832d12249b30083bc9ae2dd3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/PlayerData.cs
+++ b/Files/Scripts/Shumpei/PlayerData.cs
@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[System.Serializable]
+public class PlayerData 
+{
+    /*public int level;
+    public int health;*/
+    public float[] position;
+
+    public PlayerData(Player player)
+    {
+        /*level = player.level;
+        health = player.health;*/
+
+        position = new float[3];
+        position[0] = player.transform.position.x;
+        position[1] = player.transform.position.y;
+        position[2] = player.transform.position.z;
+    }
+}
--- a/Files/Scripts/Shumpei/PlayerData.cs.meta
+++ b/Files/Scripts/Shumpei/PlayerData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9cdb4de85d282744083c6d9cee4fef3c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/SaveSystem.cs
+++ b/Files/Scripts/Shumpei/SaveSystem.cs
@@ -0,0 +1,42 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+
+public static class SaveSystem
+{
+    public static void SavePlayer(Player player)
+    {
+        BinaryFormatter formatter = new BinaryFormatter();
+        string path = Application.persistentDataPath + "/player.data";
+        FileStream stream = new FileStream(path, FileMode.Create);
+
+        PlayerData data = new PlayerData(player);
+
+        formatter.Serialize(stream, data);
+        stream.Close();
+    }
+
+    public static PlayerData LoadPlayer ()
+    {
+        string path = Application.persistentDataPath + "/player.data";
+        if (File.Exists(path))
+        {
+            BinaryFormatter formatter = new BinaryFormatter();
+            FileStream stream = new FileStream(path, FileMode.Open);
+
+            PlayerData data = formatter.Deserialize(stream) as PlayerData;
+            stream.Close();
+
+            return data;
+        }
+
+        else
+        {
+            Debug.Log("Save File not found in " + path);
+            return null;
+        }
+    }
+    
+}
--- a/Files/Scripts/Shumpei/SaveSystem.cs.meta
+++ b/Files/Scripts/Shumpei/SaveSystem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 49c2ebd233ef7a547b12ce163244e30a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Scripts/Shumpei/TriggerDoorController.cs
+++ b/Files/Scripts/Shumpei/TriggerDoorController.cs
@@ -6,8 +6,8 @@ public class TriggerDoorController : MonoBehaviour
 {
    [SerializeField] private Animator myDoor = null;

-    [SerializeField] private bool openTrigger = false;
-    [SerializeField] private bool closeTrigger = false;
+    [SerializeField] private bool Trigger = false;
+    //[SerializeField] private bool closeTrigger = false;

    [SerializeField] private string doorOpen = "DoorOpen";
    [SerializeField] private string doorClose = "DoorClose";
@@ -19,17 +19,26 @@ public class TriggerDoorController : MonoBehaviour
        if (other.CompareTag("Player"))
        {
            Debug.Log("col");
-            if (openTrigger)
+            if (Trigger)
            {
                Debug.Log("open");
                myDoor.Play(doorOpen, 0, 0.0f);
-                gameObject.SetActive(false);
            }

-            else if (closeTrigger)
+            /*else if (closeTrigger)
+            {
+                myDoor.Play(doorClose, 0, 0.0f);
+            }*/
+        }
+    }
+
+    public void OnTriggerExit(Collider other)
+    {
+        if (other.CompareTag("Player"))
+        {
+            if (Trigger)
            {
                myDoor.Play(doorClose, 0, 0.0f);
-                gameObject.SetActive(false);
            }
        }
    }
--- a/Files/Scripts/Shumpei/XRGUI.cs
+++ b/Files/Scripts/Shumpei/XRGUI.cs
@@ -0,0 +1,45 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using TMPro;
+using UnityEngine.UI;
+
+public class XRGUI : MonoBehaviour
+{
+    [SerializeField]
+    private Button SettingsButton;
+
+    [SerializeField]
+    private Button LoadButton;
+
+    [SerializeField]
+    private Button ExitButton;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        SettingsButton.onClick.AddListener(() =>
+        {
+
+        });
+
+        LoadButton.onClick.AddListener(() =>
+        {
+
+        });
+
+
+        ExitButton.onClick.AddListener(() =>
+        {
+            Debug.Log("Clicked");
+                UnityEditor.EditorApplication.isPlaying = false;
+        });
+    }
+
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Files/Scripts/Shumpei/XRGUI.cs.meta
+++ b/Files/Scripts/Shumpei/XRGUI.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 37cfb6899ccd00b4280ac4eb92f84851
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Shaders/Portal.vfx
+++ b/Files/Shaders/Portal.vfx
--- a/Files/Shaders/Portal.vfx.meta
+++ b/Files/Shaders/Portal.vfx.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 544268b6f9cec2c4781017e5cfe72a4b
+VisualEffectImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Shaders/PortalEffect.shadergraph
+++ b/Files/Shaders/PortalEffect.shadergraph
@@ -353,8 +353,8 @@
    ],
    "m_VertexContext": {
        "m_Position": {
-            "x": 627.0000610351563,
-            "y": -144.99998474121095
+            "x": 632.0,
+            "y": -153.0
        },
        "m_Blocks": [
            {
--- a/Files/Shaders/Purple_Glow.mat
+++ b/Files/Shaders/Purple_Glow.mat
@@ -120,8 +120,8 @@ Material:
    - _WorkflowMode: 0
    - _ZWrite: 0
    m_Colors:
-    - _BaseColor: {r: 0.509434, g: 0.11294045, b: 0.6862744, a: 0.105882354}
-    - _Color: {r: 0.509434, g: 0.11294042, b: 0.6862744, a: 0.105882354}
+    - _BaseColor: {r: 0.41912836, g: 0.113725476, b: 0.6862745, a: 0.105882354}
+    - _Color: {r: 0.41912833, g: 0.113725446, b: 0.68627447, a: 0.105882354}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecColor: {r: 0.62430257, g: 0.09518514, b: 0.8773585, a: 1}
+    - _SpecColor: {r: 0.4459281, g: 0.09411766, b: 0.8784314, a: 1}
  m_BuildTextureStacks: []
--- a/Files/Shaders/VFXGraphPortalEffect.shadergraph
+++ b/Files/Shaders/VFXGraphPortalEffect.shadergraph
--- a/Files/Shaders/VFXGraphPortalEffect.shadergraph.meta
+++ b/Files/Shaders/VFXGraphPortalEffect.shadergraph.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: fd2a036a5543bae4aa06c6400342d93d
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Files/Shaders/circleglowing.png
+++ b/Files/Shaders/circleglowing.png
--- a/Files/Shaders/circleglowing.png.meta
+++ b/Files/Shaders/circleglowing.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 6b9302700f9561d469192f47e33f4860
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Files/Shaders/circleglowing2.png
+++ b/Files/Shaders/circleglowing2.png
--- a/Files/Shaders/circleglowing2.png.meta
+++ b/Files/Shaders/circleglowing2.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: e3608b948e0a96549ba9a61af21156b0
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/RECURSOS
+++ b/Assets/RECURSOS
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/RECURSOS YOS UNITY.meta
+guid: 473cf055f6630d745891c533f3ac86b3
+folderAsset: yes
+DefaultImporter:
+========
+guid: 288eb0a3190dc75419059ff7b4b70aa0
+PrefabImporter:
+>>>>>>>> origin/slimeAI:Assets/Project Files/Prefabs/Arlo/SlimePBR.prefab.meta
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/RECURSOS
+++ b/Assets/RECURSOS
--- a/Assets/RECURSOS
+++ b/Assets/RECURSOS
@@ -0,0 +1,142 @@
+fileFormatVersion: 2
+guid: 9fbaeca029ce16243b1e4f9b46bcdd42
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: 2
+    mipBias: -100
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Polyart.meta
+++ b/Polyart.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scenes/Shumpei/GameScene.unity.meta
+guid: cd402a0773c91bd4992402447594534a
+========
+guid: 92d10f5f84c81c84084b9b952b477e74
+folderAsset: yes
+>>>>>>>> origin/slimeAI:Assets/RPG Monster Duo PBR Polyart.meta
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Polyart/Animations.meta
+++ b/Polyart/Animations.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 389170da8f2a7b54fab118388ba480a6
+folderAsset: yes
+timeCreated: 1573436657
+licenseType: Store
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Polyart/Animations/Slime.meta
+++ b/Polyart/Animations/Slime.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 10e0c415a9ecedd49a3d4d5e29395d96
+folderAsset: yes
+timeCreated: 1573560048
+licenseType: Store
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Polyart/Animations/Slime/Attack01_Slime_Anim.fbx
+++ b/Polyart/Animations/Slime/Attack01_Slime_Anim.fbx
--- a/Polyart/Animations/Slime/Attack01_Slime_Anim.fbx.meta
+++ b/Polyart/Animations/Slime/Attack01_Slime_Anim.fbx.meta
@@ -0,0 +1,171 @@
+fileFormatVersion: 2
+guid: 438236b1bb4dc03468cb3f2d12fa922c
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: //RootNode
+    100002: Body
+    100004: BottomEyeCover
+    100006: Crown
+    100008: EyeBall
+    100010: EyeCTRL
+    100012: Head
+    100014: Side_L
+    100016: Side_R
+    100018: Slime
+    100020: Spine01
+    100022: UpperEyeCover
+    400000: //RootNode
+    400002: Body
+    400004: BottomEyeCover
+    400006: Crown
+    400008: EyeBall
+    400010: EyeCTRL
+    400012: Head
+    400014: Side_L
+    400016: Side_R
+    400018: Slime
+    400020: Spine01
+    400022: UpperEyeCover
+    4300000: Slime
+    7400000: Attack01
+    9500000: //RootNode
+    13700000: Slime
+  externalObjects: {}
+  materials:
+    importMaterials: 0
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 0
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 3
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Attack01
+      takeName: Take 001
+      firstFrame: 0
+      lastFrame: 25
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 1
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask:
+      - path: 
+        weight: 1
+      - path: Body
+        weight: 1
+      - path: Body/Spine01
+        weight: 1
+      - path: Body/Spine01/Head
+        weight: 1
+      - path: Body/Spine01/Head/Crown
+        weight: 1
+      - path: Body/Spine01/Head/EyeCTRL
+        weight: 1
+      - path: Body/Spine01/Head/EyeCTRL/BottomEyeCover
+        weight: 1
+      - path: Body/Spine01/Head/EyeCTRL/EyeBall
+        weight: 1
+      - path: Body/Spine01/Head/EyeCTRL/UpperEyeCover
+        weight: 1
+      - path: Body/Spine01/Side_L
+        weight: 1
+      - path: Body/Spine01/Side_R
+        weight: 1
+      - path: Slime
+        weight: 1
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
+    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 2
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
HelarJ	b1954dd40e	Basic saving, currently hardcoded to the one "chest" inventory in HomeBase. Loads when scene name contains "Homebase" and saves when button pressed.	2022-04-18 08:59:26 +03:00
helar	be8b9a987d	Merge pull request 'staging2' (#26 ) from staging2 into master Reviewed-on: #26	2022-04-11 16:26:05 +00:00
HelarJ	5f55b04eba	merge arlo	2022-04-11 19:13:05 +03:00
HelarJ	fd4432fc6d	Merge remote-tracking branch 'origin/PauseMenu' into staging2 # Conflicts: # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/TagManager.asset	2022-04-11 19:10:18 +03:00
HelarJ	029c6cf7ba	comment out missing playerinfo methods	2022-04-11 19:08:35 +03:00
HelarJ	ca41eda129	merge joonasp's branches	2022-04-11 19:03:18 +03:00
HelarJ	ec2dd764d4	merge joonasp joonasty	2022-04-11 18:56:51 +03:00
HelarJ	cd1633af54	Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2 # Conflicts: # Assets/SkyProfile-457889269655148736.asset # Assets/_TerrainData/TerrainData_521113671563848736.asset # Assets/_TerrainData/TerrainData_699485723238748736.asset # Assets/_TerrainData/TerrainData_869121471408748736.asset # Assets/_TerrainData/TerrainMaterial_521113671563848736.mat # Assets/_TerrainData/TerrainMaterial_699485723238748736.mat # Assets/_TerrainData/TerrainMaterial_869121471408748736.mat	2022-04-11 18:53:05 +03:00
jonasty	82b7e7fbb2	merge commit	2022-04-11 18:46:10 +03:00
joonasp	f032bb323a	essence add to playerinfo	2022-04-11 18:27:18 +03:00
arlo	f7e6a2e44b	started slime AI	2022-04-11 18:13:11 +03:00
LAPTOP-NFGSIHNQ\shump	ba8883786b	Changed to portal transition	2022-04-11 17:19:41 +03:00
LAPTOP-NFGSIHNQ\shump	1ed57d5c31	Add menu scene, scene transition, simple position save and load	2022-04-11 16:34:14 +03:00
joonasp	f7734432cc	branch from homebase, icebolt collision issues	2022-04-11 13:58:13 +03:00
jonasty	6f7c3eaa9b	portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed	2022-04-10 18:06:16 +03:00
LAPTOP-NFGSIHNQ\shump	26e2d0d1db	Merge branch 'master' of https://cgvrgit.ulno.net/helar/Heroes_of_Hiis into PauseMenu	2022-04-10 15:26:28 +03:00
jonasty	1f2af9127e	portal vfx rework with spawn animation	2022-04-09 14:20:46 +03:00
jonasty	9b4be15690	hand animations	2022-04-08 23:38:29 +03:00
LAPTOP-NFGSIHNQ\shump	e0f3c3e580	Fixed door interaction	2022-04-04 18:31:12 +03:00
LAPTOP-NFGSIHNQ\shump	194574ee65	Current version of pause menu panel to change settings while gameplay.	2022-04-04 17:15:27 +03:00