unified scene working - small but with inventory and portals. has simple fix coming - overlaps in script use buttons still here, need flags to fix - simple torso for player character

Assets/Project Files/Animations/PlayerAvatarMask.mask

@@ -8,4 +8,191 @@ AvatarMask:
   m_PrefabAsset: {fileID: 0}
   m_Name: PlayerAvatarMask
   m_Mask: 01000000000000000000000001000000010000000000000000000000000000000000000001000000010000000100000001000000
-  m_Elements: []
+  m_Elements:
+  - m_Path: 
+    m_Weight: 1
+  - m_Path: Character
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character L Thigh
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character L Thigh/Character L Calf
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character L Thigh/Character L Calf/Character
+      L Foot
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character L Thigh/Character L Calf/Character
+      L Foot/Character L Toe0
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character R Thigh
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character R Thigh/Character R Calf
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character R Thigh/Character R Calf/Character
+      R Foot
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character R Thigh/Character R Calf/Character
+      R Foot/Character R Toe0
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger0
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger0/Character L Finger01
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger0/Character L Finger01/Character L Finger02
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger1
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger1/Character L Finger11
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger1/Character L Finger11/Character L Finger12
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger2
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger2/Character L Finger21
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger2/Character L Finger21/Character L Finger22
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger3
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger3/Character L Finger31
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger3/Character L Finger31/Character L Finger32
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger4
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger4/Character L Finger41
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
+      L Hand/Character L Finger4/Character L Finger41/Character L Finger42
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character Neck
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character Neck/Character Head
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger0
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger0/Character R Finger01
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger0/Character R Finger01/Character R Finger02
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger1
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger1/Character R Finger11
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger1/Character R Finger11/Character R Finger12
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger2
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger2/Character R Finger21
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger2/Character R Finger21/Character R Finger22
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger3
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger3/Character R Finger31
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger3/Character R Finger31/Character R Finger32
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger4
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger4/Character R Finger41
+    m_Weight: 1
+  - m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
+      Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
+      R Hand/Character R Finger4/Character R Finger41/Character R Finger42
+    m_Weight: 1
+  - m_Path: Male_Animation_Skeleton
+    m_Weight: 1

Assets/Project Files/Prefabs/JonasB/IceBolt.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 2379572801740370593}
   - component: {fileID: 4068109678196737010}
   - component: {fileID: 6499664607162104859}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: Particles
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4834,7 +4834,7 @@ GameObject:
   - component: {fileID: 3928666337405863709}
   - component: {fileID: 824121554007831541}
   - component: {fileID: 3271421586109646936}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: IceBolt
   m_TagString: Throwable
   m_Icon: {fileID: 0}
@@ -4909,7 +4909,7 @@ GameObject:
   - component: {fileID: 2102031460483932676}
   - component: {fileID: 4375552687043340816}
   - component: {fileID: 3855994618173844762}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: Particles (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9731,7 +9731,7 @@ GameObject:
   - component: {fileID: 3673146804360629590}
   - component: {fileID: 3043515321997219863}
   - component: {fileID: 1981692454099464338}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: Particle System
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Project Files/Scripts/Helar/ItemSpawner.cs

@@ -9,7 +9,7 @@ public class ItemSpawner : MonoBehaviour
     public GameObject placeToSpawn;
     public void SpawnItem()
     {
-        //Debug.Log("Spawned " + objectToSpawn);
+        Debug.Log("Spawned " + objectToSpawn);
         Instantiate(objectToSpawn, placeToSpawn.transform);
     }
 }

Assets/Project Files/Scripts/JonasB/PortalTeleporter.cs

@@ -26,22 +26,27 @@ public class PortalTeleporter : MonoBehaviour
         traveller = other.gameObject.transform;
         if (_portalIsEnabled && !_justUsed)
         {
-            linkedPortal._portalIsEnabled = false;
-            _travellerIsOverlapping = true;
-            if (other.tag == "Throwable")
+            if (other.name.StartsWith("Holster"))
             {
-                Debug.Log("Portal entered by throwable");
-                HandleThrowable();
+                Debug.Log("holster");
             }
-            else if (other.tag == "Player")
+            else
             {
-                Debug.Log("Portal entered by player");
-                HandlePlayer();
+                linkedPortal._portalIsEnabled = false;
+                _travellerIsOverlapping = true;
+                if (other.tag == "Throwable")
+                {
+                    Debug.Log("Portal entered by throwable");
+                    HandleThrowable();
+                }
+                else if (other.tag == "Player")
+                {
+                    Debug.Log("Portal entered by player");
+                    HandlePlayer();
+                }
             }
         }
-
     }
-
     private void HandlePlayer()
     {
         Vector3 portalToTraveller = traveller.position - transform.position;
@@ -54,7 +59,10 @@ public class PortalTeleporter : MonoBehaviour
             rotationDiff += 180;
             traveller.Rotate(Vector3.up, rotationDiff);
             Vector3 positionOffset = Quaternion.Euler(0f, rotationDiff, 0f) * portalToTraveller;
+
+            // Teleport
             traveller.position = linkedPortalTransform.position + positionOffset;
+
             AudioSource.PlayClipAtPoint(TeleportSound, traveller.position, 1);
             _travellerIsOverlapping = false;
             _portalIsEnabled = false;