Fix issues with scene loading, introduce an intermediate bootstrap scene

Added Unity events to the Slotting Items, the eyes react fine but sometimes they fuck up. gonna check that out later.

Assets/Art/Animations/Characters/Birds/Eyes/BirdEyes.controller

@@ -1,5 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8622141701191891965
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: NoGuess
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5993408738867988234}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-7993130233709895848
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -17,7 +42,7 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
   m_ExitTime: 0.9594595
   m_HasExitTime: 0
@@ -37,6 +62,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -169883073761575190}
+  - {fileID: -953515106580102534}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -52,6 +78,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-953515106580102534
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: RightGuess
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -92837137932308198}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.87903225
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-169883073761575190
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -59,14 +110,17 @@ AnimatorStateTransition:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
-  m_Conditions: []
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: NoGuess
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 5993408738867988234}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
   m_ExitTime: 0.8076923
   m_HasExitTime: 1
@@ -84,7 +138,9 @@ AnimatorState:
   m_Name: ANIM_BirdEyes_Correct
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -8622141701191891965}
+  - {fileID: 1249646924704393990}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -121,6 +177,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
+  - m_Name: NoGuess
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -134,6 +196,31 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &1249646924704393990
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: WrongGuess
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2838832837941805979}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &4511680777278260622
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -151,7 +238,7 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
   m_ExitTime: 0.9594595
   m_HasExitTime: 0
@@ -201,10 +288,10 @@ AnimatorStateMachine:
     m_Position: {x: 40, y: 350, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -2838832837941805979}
-    m_Position: {x: -70, y: 450, z: 0}
+    m_Position: {x: -100, y: 450, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -92837137932308198}
-    m_Position: {x: 150, y: 450, z: 0}
+    m_Position: {x: 200, y: 450, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset

@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 84e39aac66cf4a10a89abc01b04b13af, type: 3}
+  m_Name: InteractWithFootballBird
+  m_EditorClassIdentifier: 
+  stepId: InteractFootballBird
+  displayName: Interact Football Bird
+  description: Take a picture of the Football bird
+  icon: {fileID: 0}
+  unlocks: []

Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0df54e69020c39e44b3b486cd6ac475a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset

@@ -16,4 +16,5 @@ MonoBehaviour:
   displayName: Football in luring spot A
   description: Place the Football into luring spot A
   icon: {fileID: 0}
-  unlocks: []
+  unlocks:
+  - {fileID: 11400000, guid: 0df54e69020c39e44b3b486cd6ac475a, type: 2}

Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset

@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 84e39aac66cf4a10a89abc01b04b13af, type: 3}
+  m_Name: InteractWithHammerBird
+  m_EditorClassIdentifier: 
+  stepId: InteractHammerBird
+  displayName: Interact With HammerBird
+  description: TAke  picture of the HammerBird
+  icon: {fileID: 0}
+  unlocks: []

Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 829fc7c8046e0844f93bf810dc1f0ebd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Puzzles/HammerBirdPuzzle/PlaceNailsinlureC.asset

@@ -16,4 +16,5 @@ MonoBehaviour:
   displayName: Nails In Lure C
   description: Place the Nails in the Luring Spot C
   icon: {fileID: 0}
-  unlocks: []
+  unlocks:
+  - {fileID: 11400000, guid: 829fc7c8046e0844f93bf810dc1f0ebd, type: 2}

Assets/Editor/SceneBrowserWindow.cs

@@ -0,0 +1,123 @@
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+public class SceneBrowserWindow : EditorWindow
+{
+    private class SceneInfo
+    {
+        public string path;
+        public string name;
+        public string folder;
+        public bool inBuildSettings;
+    }
+
+    private Vector2 _scroll;
+    private List<SceneInfo> _scenes = new List<SceneInfo>();
+    private Dictionary<string, List<SceneInfo>> _scenesByFolder = new Dictionary<string, List<SceneInfo>>();
+
+    [MenuItem("Tools/Scene Browser")]
+    public static void ShowWindow()
+    {
+        var window = GetWindow<SceneBrowserWindow>(false, "Scene Browser", true);
+        window.RefreshScenes();
+    }
+
+    private void OnFocus()
+    {
+        RefreshScenes();
+    }
+
+    private void RefreshScenes()
+    {
+        _scenes.Clear();
+        _scenesByFolder.Clear();
+        string[] guids = AssetDatabase.FindAssets("t:Scene", new[] { "Assets/Scenes" });
+        var buildScenes = EditorBuildSettings.scenes.Select(s => s.path).ToHashSet();
+        foreach (var guid in guids)
+        {
+            string path = AssetDatabase.GUIDToAssetPath(guid);
+            string name = Path.GetFileNameWithoutExtension(path);
+            string folder = Path.GetDirectoryName(path).Replace("\\", "/");
+            if (folder == "Assets/Scenes") folder = "";
+            var info = new SceneInfo
+            {
+                path = path,
+                name = name,
+                folder = folder,
+                inBuildSettings = buildScenes.Contains(path)
+            };
+            _scenes.Add(info);
+            if (!_scenesByFolder.ContainsKey(folder))
+                _scenesByFolder[folder] = new List<SceneInfo>();
+            _scenesByFolder[folder].Add(info);
+        }
+    }
+
+    private void OnGUI()
+    {
+        if (GUILayout.Button("Refresh"))
+            RefreshScenes();
+        _scroll = EditorGUILayout.BeginScrollView(_scroll);
+        // Top-level scenes
+        if (_scenesByFolder.ContainsKey(""))
+        {
+            foreach (var scene in _scenesByFolder[""])
+                DrawSceneRow(scene);
+            EditorGUILayout.Space();
+        }
+        // Subfolders
+        foreach (var kvp in _scenesByFolder)
+        {
+            if (string.IsNullOrEmpty(kvp.Key)) continue;
+            EditorGUILayout.LabelField(kvp.Key, EditorStyles.boldLabel);
+            foreach (var scene in kvp.Value)
+                DrawSceneRow(scene);
+            EditorGUILayout.Space();
+        }
+        EditorGUILayout.EndScrollView();
+    }
+
+    private void DrawSceneRow(SceneInfo scene)
+    {
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.LabelField(scene.name, GUILayout.Width(180));
+        if (GUILayout.Button("Open", GUILayout.Width(50)))
+        {
+            if (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
+                EditorSceneManager.OpenScene(scene.path);
+        }
+        if (GUILayout.Button("Locate", GUILayout.Width(50)))
+        {
+            var obj = AssetDatabase.LoadAssetAtPath<SceneAsset>(scene.path);
+            EditorGUIUtility.PingObject(obj);
+        }
+        bool inBuild = scene.inBuildSettings;
+        bool newInBuild = GUILayout.Toggle(inBuild, "In Build", GUILayout.Width(70));
+        if (newInBuild != inBuild)
+        {
+            ToggleSceneInBuildSettings(scene.path, newInBuild);
+            scene.inBuildSettings = newInBuild;
+        }
+        EditorGUILayout.EndHorizontal();
+    }
+
+    private void ToggleSceneInBuildSettings(string path, bool add)
+    {
+        var scenes = EditorBuildSettings.scenes.ToList();
+        if (add)
+        {
+            if (!scenes.Any(s => s.path == path))
+                scenes.Add(new EditorBuildSettingsScene(path, true));
+        }
+        else
+        {
+            scenes = scenes.Where(s => s.path != path).ToList();
+        }
+        EditorBuildSettings.scenes = scenes.ToArray();
+    }
+}
+

Assets/Editor/SceneBrowserWindow.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bda5b0c96582450e94a8b332f86c726d
+timeCreated: 1757596929

Assets/Prefabs/Characters/PlayerCharacter.prefab

@@ -119,7 +119,7 @@ MonoBehaviour:
   traversableTags: -1
   tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
   graphMask:
-    value: -1
+    value: 1
 --- !u!114 &7393789300602426170
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Characters/PulverCharacter.prefab

@@ -119,7 +119,7 @@ MonoBehaviour:
   traversableTags: -1
   tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
   graphMask:
-    value: -1
+    value: 2
 --- !u!114 &7852204877518954380
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -137,7 +137,7 @@ MonoBehaviour:
   height: 2
   canMove: 1
   maxSpeed: 15
-  gravity: {x: NaN, y: NaN, z: NaN}
+  gravity: {x: 0, y: 0, z: 0}
   groundMask:
     serializedVersion: 2
     m_Bits: 4294967295
@@ -153,11 +153,11 @@ MonoBehaviour:
     maximumInterval: 2
     visualizeSensitivity: 0
   targetCompatibility: {fileID: 0}
-  maxAcceleration: -2.5
+  maxAcceleration: 10000
   rotationSpeed: 360
   slowdownDistance: 3
   pickNextWaypointDist: 2
-  endReachedDistance: 1
+  endReachedDistance: 0.5
   alwaysDrawGizmos: 0
   slowWhenNotFacingTarget: 1
   whenCloseToDestination: 0
@@ -279,6 +279,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 2264394306674147778}
     m_Modifications:
+    - target: {fileID: 566650525959955209, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3}
+      propertyPath: m_SpriteSortPoint
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1102468210854536367, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3}
       propertyPath: m_Name
       value: Pulver

Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 7442421452951837692}
   - component: {fileID: 4110666412151536905}
   m_Layer: 0
-  m_Name: SlottedItem
+  m_Name: SlottedItemA
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -87,6 +87,116 @@ SpriteRenderer:
   m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &3617455498829757156
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4388395494483065101}
+  - component: {fileID: 4237100461469772044}
+  - component: {fileID: 2472695135799577718}
+  m_Layer: 0
+  m_Name: FootballBird
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4388395494483065101
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3617455498829757156}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 2.8479085, y: -0.13594438, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.50000006, z: 0.50000006}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1924342418841580}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &4237100461469772044
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3617455498829757156}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 0
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!95 &2472695135799577718
+Animator:
+  serializedVersion: 7
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3617455498829757156}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &7249528695393012044
 GameObject:
   m_ObjectHideFlags: 0
@@ -98,9 +208,9 @@ GameObject:
   - component: {fileID: 2045549771447434109}
   - component: {fileID: 6258593095132504700}
   - component: {fileID: 5475802662781903683}
-  - component: {fileID: 3906996712691464207}
   - component: {fileID: 8818689886719637838}
   - component: {fileID: 8578055200319571631}
+  - component: {fileID: 3487003259787903584}
   m_Layer: 10
   m_Name: LureSpotA
   m_TagString: Untagged
@@ -226,20 +336,6 @@ BoxCollider2D:
   m_AutoTiling: 0
   m_Size: {x: 5.75, y: 2.78}
   m_EdgeRadius: 0
---- !u!114 &3906996712691464207
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7249528695393012044}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  itemData: {fileID: 11400000, guid: aaf36cd26cf74334e9c7db6c1b03b3fb, type: 2}
-  iconRenderer: {fileID: 6258593095132504700}
 --- !u!114 &8818689886719637838
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -252,6 +348,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isOneTime: 0
+  cooldown: -1
+  characterToInteract: 1
+  interactionStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionInterrupted:
+    m_PersistentCalls:
+      m_Calls: []
+  characterArrived:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionComplete:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!114 &8578055200319571631
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -264,14 +375,74 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OnSuccess:
+  itemData: {fileID: 11400000, guid: aaf36cd26cf74334e9c7db6c1b03b3fb, type: 2}
+  iconRenderer: {fileID: 6258593095132504700}
+  onItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  OnFailure:
+  onItemSlotRemoved:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 7602419655779381936}
+        m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp
+        m_MethodName: NoItem
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  onCorrectItemSlotted:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 7602419655779381936}
+        m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp
+        m_MethodName: CorrectItem
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  onIncorrectItemSlotted:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 7602419655779381936}
+        m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp
+        m_MethodName: IncorrectItem
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  onForbiddenItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  currentlySlottedItem: {fileID: 0}
+  slottedItemRenderer: {fileID: 4110666412151536905}
-  slottedItemRenderer: {fileID: 0}
+--- !u!114 &3487003259787903584
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7249528695393012044}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2226aecbed4b1f143a5a5c5be4236957, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  playerToPlaceDistance: 40
+  birdEyes: {fileID: 7602419655779381936}
 --- !u!1001 &7700829900874995671
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -282,27 +453,27 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1370564349707122423, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
       propertyPath: m_Name
-      value: BirdEyes
+      value: BirdEyesA
       objectReference: {fileID: 0}
     - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 5.47
+      value: 6.25
       objectReference: {fileID: 0}
     - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 8.65
+      value: 8.87
       objectReference: {fileID: 0}
     - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
       propertyPath: m_LocalPosition.z
@@ -336,17 +507,78 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3013218424693156287, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_FlipX
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3532512445619884959, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7034773904088491925, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
       propertyPath: m_FlipX
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.99999994
+      objectReference: {fileID: 0}
+    - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.99999994
+      objectReference: {fileID: 0}
+    - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -6.89
+      objectReference: {fileID: 0}
+    - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -7.05
+      objectReference: {fileID: 0}
+    - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8828658103663197825, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 5210033153524231666, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+    - {fileID: 4408373410605328204, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4388395494483065101}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+--- !u!4 &1924342418841580 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+  m_PrefabInstance: {fileID: 7700829900874995671}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &5375394469162727687 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
   m_PrefabInstance: {fileID: 7700829900874995671}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7602419655779381936 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 243176356944356711, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
+  m_PrefabInstance: {fileID: 7700829900874995671}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 13d59d3c42170824b8f92557822d9bf0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 779234943217098985}
   - component: {fileID: 7990414055343410434}
   m_Layer: 0
-  m_Name: SlottedItem
+  m_Name: SlottedItemB
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -26,7 +26,7 @@ Transform:
   m_GameObject: {fileID: 1985797937494910982}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -0.279, y: -0.097, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -99,7 +99,6 @@ GameObject:
   - component: {fileID: 6583028881099676536}
   - component: {fileID: 8374056515464764762}
   - component: {fileID: 4289780218821574471}
-  - component: {fileID: 4191908717467096214}
   - component: {fileID: 3093816592344978065}
   - component: {fileID: 8758136668472096799}
   m_Layer: 10
@@ -238,20 +237,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &4191908717467096214
+  isOneTime: 0
-MonoBehaviour:
+  cooldown: -1
-  m_ObjectHideFlags: 0
+  characterToInteract: 1
-  m_CorrespondingSourceObject: {fileID: 0}
+  interactionStarted:
-  m_PrefabInstance: {fileID: 0}
+    m_PersistentCalls:
-  m_PrefabAsset: {fileID: 0}
+      m_Calls: []
-  m_GameObject: {fileID: 5835735262203788332}
+  interactionInterrupted:
-  m_Enabled: 1
+    m_PersistentCalls:
-  m_EditorHideFlags: 0
+      m_Calls: []
-  m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3}
+  characterArrived:
-  m_Name: 
+    m_PersistentCalls:
-  m_EditorClassIdentifier: 
+      m_Calls: []
-  itemData: {fileID: 11400000, guid: f97b9e24d6dceb145b56426c1152ebeb, type: 2}
+  interactionComplete:
-  iconRenderer: {fileID: 6583028881099676536}
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!114 &3093816592344978065
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -264,14 +264,24 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OnSuccess:
+  itemData: {fileID: 11400000, guid: f97b9e24d6dceb145b56426c1152ebeb, type: 2}
+  iconRenderer: {fileID: 6583028881099676536}
+  onItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  OnFailure:
+  onItemSlotRemoved:
     m_PersistentCalls:
       m_Calls: []
-  currentlySlottedItem: {fileID: 0}
+  onCorrectItemSlotted:
-  slottedItemRenderer: {fileID: 0}
+    m_PersistentCalls:
+      m_Calls: []
+  onIncorrectItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  onForbiddenItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  slottedItemRenderer: {fileID: 7990414055343410434}
 --- !u!114 &8758136668472096799
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab

@@ -94,7 +94,7 @@ GameObject:
   - component: {fileID: 1828079450404796388}
   - component: {fileID: 3806274462998212361}
   m_Layer: 0
-  m_Name: SlottedItem
+  m_Name: SlottedItemC
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -182,8 +182,8 @@ GameObject:
   - component: {fileID: 5015123355472106337}
   - component: {fileID: 1857323601952658682}
   - component: {fileID: 519585874127847016}
-  - component: {fileID: 3177191571756140058}
   - component: {fileID: 106497079666291966}
+  - component: {fileID: 3169137887822749614}
   m_Layer: 10
   m_Name: LureSpotC
   m_TagString: Untagged
@@ -321,20 +321,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &3177191571756140058
+  isOneTime: 0
-MonoBehaviour:
+  cooldown: -1
-  m_ObjectHideFlags: 0
+  characterToInteract: 1
-  m_CorrespondingSourceObject: {fileID: 0}
+  interactionStarted:
-  m_PrefabInstance: {fileID: 0}
+    m_PersistentCalls:
-  m_PrefabAsset: {fileID: 0}
+      m_Calls: []
-  m_GameObject: {fileID: 7145022056631397938}
+  interactionInterrupted:
-  m_Enabled: 1
+    m_PersistentCalls:
-  m_EditorHideFlags: 0
+      m_Calls: []
-  m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3}
+  characterArrived:
-  m_Name: 
+    m_PersistentCalls:
-  m_EditorClassIdentifier: 
+      m_Calls: []
-  itemData: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2}
+  interactionComplete:
-  iconRenderer: {fileID: 5015123355472106337}
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!114 &106497079666291966
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -347,11 +348,34 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OnSuccess:
+  itemData: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2}
+  iconRenderer: {fileID: 5015123355472106337}
+  onItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  OnFailure:
+  onItemSlotRemoved:
     m_PersistentCalls:
       m_Calls: []
-  currentlySlottedItem: {fileID: 0}
+  onCorrectItemSlotted:
-  slottedItemRenderer: {fileID: 0}
+    m_PersistentCalls:
+      m_Calls: []
+  onIncorrectItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  onForbiddenItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  slottedItemRenderer: {fileID: 3806274462998212361}
+--- !u!114 &3169137887822749614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7145022056631397938}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stepData: {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2}

Assets/Prefabs/Environment/Placeholders/SoundBird.prefab

@@ -12,7 +12,6 @@ GameObject:
   - component: {fileID: 8875860401447896107}
   - component: {fileID: 5057760771402457000}
   - component: {fileID: 5387498764853775290}
-  - component: {fileID: 6499593962557772468}
   - component: {fileID: 2433130051631076285}
   m_Layer: 10
   m_Name: SoundBird
@@ -150,20 +149,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &6499593962557772468
+  isOneTime: 0
-MonoBehaviour:
+  cooldown: -1
-  m_ObjectHideFlags: 0
+  characterToInteract: 1
-  m_CorrespondingSourceObject: {fileID: 0}
+  interactionStarted:
-  m_PrefabInstance: {fileID: 0}
+    m_PersistentCalls:
-  m_PrefabAsset: {fileID: 0}
+      m_Calls: []
-  m_GameObject: {fileID: 588897581313790951}
+  interactionInterrupted:
-  m_Enabled: 1
+    m_PersistentCalls:
-  m_EditorHideFlags: 0
+      m_Calls: []
-  m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3}
+  characterArrived:
-  m_Name: 
+    m_PersistentCalls:
-  m_EditorClassIdentifier: 
+      m_Calls: []
-  itemData: {fileID: 11400000, guid: d28f5774afad9d14f823601707150700, type: 2}
+  interactionComplete:
-  iconRenderer: {fileID: 8875860401447896107}
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!114 &2433130051631076285
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -176,13 +176,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OnSuccess:
+  itemData: {fileID: 11400000, guid: d28f5774afad9d14f823601707150700, type: 2}
+  iconRenderer: {fileID: 8875860401447896107}
+  onItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  OnFailure:
+  onItemSlotRemoved:
+    m_PersistentCalls:
+      m_Calls: []
+  onCorrectItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  onIncorrectItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  onForbiddenItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  currentlySlottedItem: {fileID: 0}
   slottedItemRenderer: {fileID: 6941190210788968874}
 --- !u!1 &4624889622840393752
 GameObject:

Assets/Prefabs/Items/BasePickup.prefab

@@ -14,7 +14,7 @@ GameObject:
   - component: {fileID: 7616859841301711022}
   - component: {fileID: 592045584872845087}
   m_Layer: 10
-  m_Name: BasePickup
+  m_Name: BurgerBuns
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -30,8 +30,8 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 3.405, y: 0, z: 0}
-  m_LocalScale: {x: 4, y: 4, z: 1}
+  m_LocalScale: {x: 2.5, y: 2.5, z: 0.625}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -79,15 +79,15 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 1
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 4273613496703388379, guid: 1d2396d3a6e78544083da828beb20888, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
+  m_Size: {x: 1.76, y: 0.75}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 0
+  m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
 --- !u!61 &3070149615425714466
@@ -127,14 +127,14 @@ BoxCollider2D:
   m_Offset: {x: 0, y: 0}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
+    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 0, y: 0}
+    oldSize: {x: 1.76, y: 0.75}
-    newSize: {x: 0, y: 0}
+    newSize: {x: 1.76, y: 0.75}
-    adaptiveTilingThreshold: 0
+    adaptiveTilingThreshold: 0.5
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
-  m_Size: {x: 1, y: 1}
+  m_Size: {x: 2, y: 1.5}
   m_EdgeRadius: 0
 --- !u!114 &7616859841301711022
 MonoBehaviour:
@@ -148,6 +148,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isOneTime: 0
+  cooldown: -1
+  characterToInteract: 1
+  interactionStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionInterrupted:
+    m_PersistentCalls:
+      m_Calls: []
+  characterArrived:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionComplete:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!114 &592045584872845087
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -160,5 +175,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemData: {fileID: 0}
+  itemData: {fileID: 11400000, guid: 0c6986639ca176a419c92f5a327d95ce, type: 2}
   iconRenderer: {fileID: 7494677664706785084}

Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBuns.prefab

@@ -127,31 +127,5 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 200688012287672078}
   m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
---- !u!1 &5336239774528417475 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
-  m_PrefabInstance: {fileID: 3266354364519034742}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &200688012287672078
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5336239774528417475}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 21401a3b30134380bb205964d9e5c67d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  OnSuccess:
-    m_PersistentCalls:
-      m_Calls: []
-  OnFailure:
-    m_PersistentCalls:
-      m_Calls: []

Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab

@@ -0,0 +1,161 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &9194176465486785202
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: itemData
+      value: 
+      objectReference: {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.8000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.8000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.26666668
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Size.x
+      value: 3.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Size.y
+      value: 3.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.newSize.x
+      value: 2.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.newSize.y
+      value: 2.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.oldSize.x
+      value: 2.52
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.oldSize.y
+      value: 3.07
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Name
+      value: FootballBird
+      objectReference: {fileID: 0}
+    - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Size.x
+      value: 2.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Size.y
+      value: 2.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 804776353370782802, guid: b187e41d8728aba4b90917cc22005463, type: 3}
+    - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: isOneTime
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: characterToInteract
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1972611059221495588}
+  m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+--- !u!1 &1784002662241348359 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+  m_PrefabInstance: {fileID: 9194176465486785202}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1972611059221495588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1784002662241348359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stepData: {fileID: 11400000, guid: 0df54e69020c39e44b3b486cd6ac475a, type: 2}

Assets/Prefabs/Items/PrefabsPLACEHOLDER/FootballBird.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9b2d5618c8cc81743b982c6cc8d95871
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab

@@ -0,0 +1,157 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &9194176465486785202
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: itemData
+      value: 
+      objectReference: {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 54.83
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -35.53
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Size.x
+      value: 3.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Size.y
+      value: 3.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.newSize.x
+      value: 2.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.newSize.y
+      value: 2.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.oldSize.x
+      value: 2.08
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.oldSize.y
+      value: 2.83
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Name
+      value: HammerBird
+      objectReference: {fileID: 0}
+    - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Size.x
+      value: 2.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Size.y
+      value: 2.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -5464640192890044756, guid: 1bf1b8625c66fa142a1ac7ce275cd4a6, type: 3}
+    - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: characterToInteract
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1972611059221495588}
+  m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+--- !u!1 &1784002662241348359 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+  m_PrefabInstance: {fileID: 9194176465486785202}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1972611059221495588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1784002662241348359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stepData: {fileID: 11400000, guid: 829fc7c8046e0844f93bf810dc1f0ebd, type: 2}

Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e3d6494020df3a34f88a89f0ee9a3527
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab

@@ -128,9 +128,6 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 5935055277585311711}
     - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
       insertIndex: -1
       addedObject: {fileID: 5172306257923753614}
@@ -140,24 +137,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
   m_PrefabInstance: {fileID: 8543660602505065938}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &5935055277585311711
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1282228733406082151}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 21401a3b30134380bb205964d9e5c67d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  OnSuccess:
-    m_PersistentCalls:
-      m_Calls: []
-  OnFailure:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!114 &5172306257923753614
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Puzzles/BasePuzzlePickup.prefab

@@ -50,7 +50,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
       propertyPath: m_Name
-      value: BasePuzzlePickup
+      value: BurgerBuns
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scenes/BootstrapScene.unity

@@ -0,0 +1,125 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 10
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 1
+    m_PVRFilteringGaussRadiusAO: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots: []

Assets/Scenes/BootstrapScene.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 706f6dec7a10d2542be1a3c21216158b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Levels/AppleHillsOverworld.unity

@@ -1612,6 +1612,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   itemData: {fileID: 11400000, guid: e0fad48a84a6b6346ac17c84bc512500, type: 2}
   iconRenderer: {fileID: 1631660128}
+  onItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  onItemSlotRemoved:
+    m_PersistentCalls:
+      m_Calls: []
+  onCorrectItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  onIncorrectItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
+  onForbiddenItemSlotted:
+    m_PersistentCalls:
+      m_Calls: []
   slottedItemRenderer: {fileID: 124275613}
 --- !u!212 &1631660128 stripped
 SpriteRenderer:
@@ -1819,7 +1834,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   version: 1
   data:
-    dataString: UEsDBBQAAAgIAAAIIewb8cShXAIAABIFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQF1VE1z2jAQ/SuMzk3HkNBAby0E0gMJE9rJxRchrbEGWfJIcoBk+O/dlW3s0OnJ0nv78fZD/mDK+BJEsG7plFxZCez7gNGZfRl05CMc+c6ajXqH1uZVyZCTEY82Lzwoi/iQ3LwtIDglfpidJuMEwcqozLriQe5gZn3wCGdce0DK2UDeBqGPATvi52ZKLic8je7p9I6naTI441GACeA609awNautKiM0L0qQJLkzHiWXuEltaLCcxmZE0a3WyjdaWDiVsdZNmYMDKlYqjqXF/Ld4zUHt8kCXr3d97+cs8xAaVY6f5sphj+qw7KetG1dwv6+lvXFdUaJvd1FTHXX1D30zjHTmbPHYJh7GikKuxP6FnwT3odfYPjzvlA9jgw5c7/lWw2sO5skuna2MRDK4ilwrD6N5d71UNstB7Du8lnoFVuX/x0M1nGPxx5lWxZao2DsENtrGfsfhg8PJ/ELBcTV8EwJRUvHHw2++6+9QQyyU8wGppkpD8ra2cmTKFnigxosqzKwzENFGcwmG63BaY5RwPcArrpf1illweixN7oZr38CVS4Q7+yS5otb2cJmVz+1hBT5/roJWBjrRRDxhm2bWmHq//GeSvDaVy7joee0qJT8vFpuOJxM+hXEi72+HYnx3MwSRZeMJl9tMZnwyYXHzlMEyuV7XOpvu4MxMF9zglrW/kMHS8TKuunT8sFTvhe3pUyazG+EAzHMdoe2QB4dJ8E3KB6mwPxsIQZk4bfaRMm3FHmR6CZTGSh+OwfG0i5KyUr3ZQEjKZvGfkTKCL5u8dvCm4EDJ22Bndv4LUEsDBBQAAAgIAAAIIewRqbRYbQAAAHgAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNEz0jM011FQSi9KLMgoBooYgjilmSkgdrSSpamFRaJlqqlBirmxYbKpia5hanJamqlFYkpSWkpaooWFUixQfUllQapfYm4qRE9AYklGWmZeSmZeup57UWaKO8hopdhaAFBLAQItABQAAAgIAAAIIewb8cShXAIAABIFAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDAuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAAAIIewRqbRYbQAAAHgAAAAJACQAAAAAAAAAAAAAAKkCAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAYQMAAAAA
+    dataString: UEsDBBQAAAgIAAAIIezWWttFWgIAABMFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQF1VMty2jAU/RVG66ZjSGigu5YkpAsSJrSTjTdCusYaZMkjyTyS4d97r2xjQ6crS+fcx7kP+ZMp40sQwbq5U3JhJbDvA0Zn9mXQkc9w4BtrVuoDWpt3JUNORjzavPGgLOJDcvO2gOCU+GE2mowTBCujMuuKR7mBmfXBI5xx7QEpZwN5G4Q+B+yAn5spuRzxNLqn0weepsnghEcBJoDrTFvD1qy2qozQvChBkuTOeJSc4ya1ocFyGpsRRbdaK99oYeFYxlpXZQ4OqFipOJYW89/iNQe1yQNdvt71vV+zzENoVDl+fFAOe1SHZT9t3biC+20tbcd1RYm+3UVNddTFP/TNMNKZs8Vzm3gYKwq5Ets3fhTch15j+/BDp3wYG7TnesvXGt5zMC927mxlJJLBVeRaeRg9dNdzZbMcxLbDa6lXYFX+fzxUwykWf5hpVayJir1DYKVt7HccPjiczC8UHFfDNyEQJRV/PPzmm/4ONcSTcj4g1VRpSN7aVo5M2RMeqPGiCjPrDES00VyC4ToclxglXA/wiutlvWKeOD2WJnfDtW/gyiXCnX2SXFFLuz/Pyud2vwCfv1ZBKwOdaCJesE0za0y9X/6SJK9V5TIuel6bSsnLxWLT8WTCpzBO5P3tUIzvboYgsmw84XKdyYxPJixunjJYJtfLWmfTHZxZvyUG16z9hwzmjpdx16Xj+7n6KGxPoDKZXQkHYF4vQ3hwmAUfpXyUChu0ghCUieNmnynTVmxBpudAaSz18RAcT7soKSvVzgZCUjaLP42UEXxe5aWDnYI9JW+DndjpL1BLAwQUAAAICAAACCHsldWPv1oCAAASBQAACwAkAGdyYXBoMS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BdVRLc9owEP4rjM5Nx+C86K11EtJDEqa0k4svi7XGGmTJo0eAZPjvXck2duj0xPLtt7vfPuQPJpRtsHDaLIzgT5oj+zZhwWZfJoPzEfew0Wol3rHnvAruqkCCyPkFTmjCpyHM6hqdEcV3tZGBnBDolSi1qe/5BjNtnSW4BGmRXEa7EK0I+piwPf1czEPIgazZTbDeyZonkyOZBSqHZqD2xJ7WsrwqJNQN8iB5IF9dX3b0q3QaiYra6ThpyK6lFLbTwtyhib1m0FhPnRCBC6DeooDQaoViU7mgcxz8UpYWXSfKwOFOGBpRm5X90O3carDbVtkbSI8n6W3Kp3+8F63g0uj6sa86TUIFV4li+wsOBVg3GusYvvss26sdyC2sJb5WqJ71wmivODmd8SHUW5zdDX9PjWUVFttRiVZrj/bBzf+3E5o4xub3mRT1Ori+XrbASuo47rh7NLSYn6Q4XobtUhAaZPyx+Bs24xPqHA/CWEeurk0V5K21N4HKHsgIgy+8y7RRGNFOc4MKpDssKYs7X+CZb1T1zPMA4a10tTtf/wTOQiI88JPkzLXUu9OybKV3T2irF++kUDiIDo5nGlOmlWrvazySPmzlTQnFKGzjBf98Wixdp7c3ZYJJWqSIt7MLWPNyBpheTsv5/PoWWLw9oahPkMtWaDceWpoakiu6s/4TMlkYaOKtcwO7hXiv9WjkQpV6VRhE9dJmOAlHQ0XoTfJ7LmhAK3ROqLhu9pEzqYst8vyUKI+d3u+dgXzIkrNGvGkXkJxl8ZuRswCfbnlp8E3gLhTvkx3Z8S9QSwMEFAAACAgAAAgh7H7sEB6KAAAAtgAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFtjbsOgkAQRX+FbC2EfcmsP0Bn7A3FwMzAFiIBNDHGf3c3tnb3cXLvWz153eJ9VqfCVabSzaFQ44rLtKXEZPOIlPVVBQ+AgX1NjdWDd6XmQcQDUi8kCKASbnsLjdRc28EygymxJzHI1mkJ4QioukTtr4XPeOPf8AX3SeJMcR6rdo3U5v889r/oPl9QSwECLQAUAAAICAAACCHs1lrbRVoCAAATBQAACwAkAAAAAAAAAAAAAAAAAAAAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAACCHsldWPv1oCAAASBQAACwAkAAAAAAAAAAAAAACnAgAAZ3JhcGgxLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAACCHsfuwQHooAAAC2AAAACQAkAAAAAAAAAAAAAABOBQAAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsFBgAAAAADAAMAFQEAACMGAAAAAA==
     upgradeData: 
     file_cachedStartup: {fileID: 0}
     data_cachedStartup: 

Assets/Scripts/Animation/BirdEyesBehavior.cs

@@ -5,6 +5,7 @@ public class BirdEyesBehavior : MonoBehaviour
 {
     private StateMachine statemachine;
     private Animator animator;
+    public bool correctItemIsIn;
     // Start is called once before the first execution of Update after the MonoBehaviour is created
     void Start()
     {
@@ -18,16 +19,22 @@ public class BirdEyesBehavior : MonoBehaviour
 
     }
 
-    void CorrectItem()
+    public void CorrectItem()
     {
+        correctItemIsIn = true;
         animator.SetTrigger("RightGuess");
     }
 
-    void IncorrectItem()
+    public void IncorrectItem()
     {
-       animator.SetTrigger("WrongGuess"); 
+        correctItemIsIn = false;
+        animator.SetTrigger("WrongGuess");
     }
-    void BirdReveal()
+    public void NoItem()
+    {
+        animator.SetTrigger("NoGuess");
+    }
+    public void BirdReveal()
     {
        statemachine.ChangeState ("BirdSpawned"); 
     }

Assets/Scripts/Core/DebugUIMessage.cs

@@ -14,7 +14,8 @@ public class DebugUIMessage : MonoBehaviour
     /// </summary>
     /// <param name="message">The message to display.</param>
     /// <param name="duration">How long to display the message (seconds).</param>
-    public static void Show(string message, float duration = 2f)
+    /// <param name="displayColor"></param>
+    public static void Show(string message, Color displayColor, float duration = 2f)
     {
         if (instance == null)
         {
@@ -23,7 +24,7 @@ public class DebugUIMessage : MonoBehaviour
             instance.SetupUI();
             DontDestroyOnLoad(go);
         }
-        instance.ShowMessage(message, duration);
+        instance.ShowMessage(message, duration, displayColor);
     }
 
     /// <summary>
@@ -45,7 +46,7 @@ public class DebugUIMessage : MonoBehaviour
             messageText.font = customFont;
         else
             messageText.font = Resources.GetBuiltinResource<Font>("LegacyRuntime.ttf");
-        messageText.fontSize = 16;
+        messageText.fontSize = 32;
         messageText.color = Color.yellow;
         var outline = textGO.AddComponent<Outline>();
         outline.effectColor = Color.black;
@@ -55,16 +56,17 @@ public class DebugUIMessage : MonoBehaviour
         rect.anchorMax = new Vector2(0.5f, 0.5f);
         rect.pivot = new Vector2(0.5f, 0.5f);
         rect.anchoredPosition = Vector2.zero;
-        rect.sizeDelta = new Vector2(400, 40);
+        rect.sizeDelta = new Vector2(800, 40);
         messageText.text = "";
     }
 
     /// <summary>
     /// Internal method to show a message and start the hide coroutine.
     /// </summary>
-    private void ShowMessage(string message, float duration)
+    private void ShowMessage(string message, float duration, Color fontColor)
     {
         messageText.text = message;
+        messageText.color = fontColor;
         messageText.enabled = true;
         if (hideCoroutine != null)
             StopCoroutine(hideCoroutine);

Assets/Scripts/Core/SceneManagerService.cs

@@ -42,11 +42,29 @@ public class SceneManagerService : MonoBehaviour
 
     private readonly Dictionary<string, AsyncOperation> _activeLoads = new();
     private readonly Dictionary<string, AsyncOperation> _activeUnloads = new();
+    private const string BootstrapSceneName = "BootstrapScene";
 
     void Awake()
     {
         _instance = this;
         // DontDestroyOnLoad(gameObject);
+#if UNITY_EDITOR
+        // In Editor, set CurrentGameplayScene to the currently open scene at play start
+        if (Application.isPlaying)
+        {
+            var activeScene = SceneManager.GetActiveScene();
+            if (activeScene.IsValid())
+            {
+                CurrentGameplayScene = activeScene.name;
+            }
+        }
+#endif
+        // Ensure BootstrapScene is loaded at startup
+        var bootstrap = SceneManager.GetSceneByName(BootstrapSceneName);
+        if (!bootstrap.isLoaded)
+        {
+            SceneManager.LoadScene(BootstrapSceneName, LoadSceneMode.Additive);
+        }
     }
 
     void OnApplicationQuit()
@@ -196,7 +214,7 @@ public class SceneManagerService : MonoBehaviour
     }
 
     // Tracks the currently loaded gameplay scene (not persistent/bootstrapper)
-    public string CurrentGameplayScene { get; private set; } = "AppleHillsOverworld";
+    public string CurrentGameplayScene { get; private set; } = "MainMenu";
 
     // Switches from current gameplay scene to a new one
     public async Task SwitchSceneAsync(string newSceneName, IProgress<float> progress = null)
@@ -210,10 +228,8 @@ public class SceneManagerService : MonoBehaviour
             else
                 DestroyImmediate(astar.gameObject);
         }
-        // Load new scene
+        // Unload previous gameplay scene (if not BootstrapScene and not same as new)
-        await LoadSceneAsync(newSceneName, progress);
+        if (!string.IsNullOrEmpty(CurrentGameplayScene) && CurrentGameplayScene != newSceneName && CurrentGameplayScene != BootstrapSceneName)
-        // Unload previous scene (if not same)
-        if (!string.IsNullOrEmpty(CurrentGameplayScene) && CurrentGameplayScene != newSceneName)
         {
             var prevScene = SceneManager.GetSceneByName(CurrentGameplayScene);
             if (prevScene.isLoaded)
@@ -225,6 +241,14 @@ public class SceneManagerService : MonoBehaviour
                 Debug.LogWarning($"SceneManagerService: Previous scene '{CurrentGameplayScene}' is not loaded, skipping unload.");
             }
         }
+        // Ensure BootstrapScene is loaded before loading new scene
+        var bootstrap = SceneManager.GetSceneByName(BootstrapSceneName);
+        if (!bootstrap.isLoaded)
+        {
+            SceneManager.LoadScene(BootstrapSceneName, LoadSceneMode.Additive);
+        }
+        // Load new gameplay scene
+        await LoadSceneAsync(newSceneName, progress);
         // Update tracker
         CurrentGameplayScene = newSceneName;
     }

Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs

@@ -0,0 +1,16 @@
+using UnityEngine;
+
+public class AnneLiseBehaviour : MonoBehaviour
+{
+    // Start is called once before the first execution of Update after the MonoBehaviour is created
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d0d1761ee6769c243b110122f5e17b73

Assets/Scripts/DamianExperiments/DistanceMeasurer.cs

@@ -2,23 +2,33 @@ using UnityEngine;
 
 public class Distancemeasurer : MonoBehaviour
 {
-    public float playerDistanceToChange;
+    public float playerToPlaceDistance;
     public BirdEyesBehavior birdEyes;
-    private Vector2 eyesPosition;
+    private Vector2 placePosition;
     private Vector2 playerPosition;
     private float distance;
+    private GameObject player;
 
     // Start is called once before the first execution of Update after the MonoBehaviour is created
     void Start()
     {
-       eyesPosition = transform.position;
+       placePosition = transform.position;
-       playerPosition = transform.position;
+       player = GameObject.FindWithTag("Player");
+       playerPosition = player.transform.position;
+       distance = Vector2.Distance(placePosition, playerPosition);
     }
 
     // Update is called once per frame
+    // TODO: Make this less expensive by not doing it every frame
     void Update()
     {
-        
+        playerPosition = player.transform.position;
+        distance = Vector2.Distance(placePosition, playerPosition);
+        //Debug.Log("Distance to player: " + distance);
+        if (distance > playerToPlaceDistance && birdEyes.correctItemIsIn == true)
+        {
+            birdEyes.BirdReveal();
+        } 
     }
 
 

Assets/Scripts/Input/InputManager.cs

@@ -142,7 +142,7 @@ public class InputManager : MonoBehaviour
             Vector2 screenPos = positionAction.ReadValue<Vector2>();
             Vector3 worldPos = Camera.main.ScreenToWorldPoint(screenPos);
             Vector2 worldPos2D = new Vector2(worldPos.x, worldPos.y);
-            Debug.Log($"[InputManager] HoldMove update at {worldPos2D}");
+            // Debug.Log($"[InputManager] HoldMove update at {worldPos2D}");
             defaultConsumer?.OnHoldMove(worldPos2D);
         }
     }

Assets/Scripts/Input/PlayerTouchController.cs

@@ -12,7 +12,7 @@ namespace Input
         // --- Movement State ---
         private Vector3 targetPosition;
         private Vector3 directMoveVelocity; // default is Vector3.zero
-        private bool isHolding;
+        internal bool isHolding;
         private Vector2 lastHoldPosition;
         private Coroutine pathfindingDragCoroutine;
         private float pathfindingDragUpdateInterval = 0.1f; // Interval in seconds
@@ -28,6 +28,10 @@ namespace Input
         private Transform artTransform;
         private SpriteRenderer spriteRenderer;
 
+        // --- Last direct movement direction ---
+        private Vector3 _lastDirectMoveDir = Vector3.right;
+        public Vector3 LastDirectMoveDir => _lastDirectMoveDir;
+
         // --- MoveToAndNotify State ---
         public delegate void ArrivedAtTargetHandler();
         private Coroutine moveToCoroutine;
@@ -184,6 +188,9 @@ namespace Input
                 adjustedMove = toTarget;
             }
             transform.position += adjustedMove;
+
+            // Cache the last direct movement direction
+            _lastDirectMoveDir = directMoveVelocity.normalized;
         }
 
         /// <summary>

Assets/Scripts/Interactions/Interactable.cs

@@ -130,7 +130,7 @@ namespace Interactions
             var step = GetComponent<PuzzleS.ObjectiveStepBehaviour>();
             if (step != null && !step.IsStepUnlocked())
             {
-                DebugUIMessage.Show("This step is locked!", 2f);
+                DebugUIMessage.Show("This step is locked!", Color.yellow);
                 BroadcastInteractionComplete(false);
                 // Reset variables for next time
                 _interactionInProgress = false;

Assets/Scripts/Interactions/ItemSlot.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Events;
 
 namespace Interactions
 {
@@ -9,11 +10,15 @@ namespace Interactions
     [RequireComponent(typeof(Interactable))]
     public class ItemSlot : Pickup
     {
+        public UnityEvent onItemSlotted;
+        public UnityEvent onItemSlotRemoved;
+        public UnityEvent onCorrectItemSlotted;
+        public UnityEvent onIncorrectItemSlotted;
+        public UnityEvent onForbiddenItemSlotted;
         private PickupItemData _currentlySlottedItemData;
         public SpriteRenderer slottedItemRenderer;
         private GameObject _currentlySlottedItemObject = null;
         
-        
         public GameObject GetSlottedObject()
         {
             return _currentlySlottedItemObject;
@@ -32,71 +37,41 @@ namespace Interactions
         {
             var heldItemData = FollowerController.CurrentlyHeldItemData;
             var heldItemObj = FollowerController.GetHeldPickupObject();
-            var pickup = GetComponent<Pickup>();
+            var config = GameManager.Instance.GetSlotItemConfig(itemData);
-            var slotItem = pickup != null ? pickup.itemData : null;
-            var config = GameManager.Instance.GetSlotItemConfig(slotItem);
-            var allowed = config?.allowedItems ?? new List<PickupItemData>();
             var forbidden = config?.forbiddenItems ?? new List<PickupItemData>();
             
+            // Held item, slot empty -> try to slot item
+            if (heldItemData != null && _currentlySlottedItemObject == null)
+            {
+                // First check for forbidden items at the very start so we don't continue unnecessarily
+                if (forbidden.Contains(heldItemData))
+                {
+                    DebugUIMessage.Show("Can't place that here.", Color.red);
+                    onForbiddenItemSlotted?.Invoke();
+                    Interactable.BroadcastInteractionComplete(false);
+                    return;
+                }
+
+                SlotItem(heldItemObj, heldItemData, true);
+                return;
+            }
+            
+            // Either pickup or swap items
             if ((heldItemData == null && _currentlySlottedItemObject != null) 
                 || (heldItemData != null && _currentlySlottedItemObject != null))
             {
-                FollowerController.TryPickupItem(_currentlySlottedItemObject, _currentlySlottedItemData);
+                FollowerController.TryPickupItem(_currentlySlottedItemObject, _currentlySlottedItemData, false);
-                _currentlySlottedItemObject = null;
+                onItemSlotRemoved?.Invoke();
-                _currentlySlottedItemData = null;
+                SlotItem(heldItemObj, heldItemData, _currentlySlottedItemObject == null);
-                UpdateSlottedSprite();
                 return;
             }
             
-            // // CASE 1: No held item, slot has item -> pick up slotted item
+            // No held item, slot empty -> show warning
-            // if (heldItemData == null && _cachedSlottedObject != null)
-            // {
-            //     InteractionOrchestrator.Instance.PickupItem(FollowerController, _cachedSlottedObject);
-            //     _cachedSlottedObject = null;
-            //     currentlySlottedItem = null;
-            //     UpdateSlottedSprite();
-            //     Interactable.BroadcastInteractionComplete(false);
-            //     return;
-            // }
-            // // CASE 2: Held item, slot has item -> swap
-            // if 
-            // {
-            //     InteractionOrchestrator.Instance.SwapItems(FollowerController, this);
-            //     currentlySlottedItem = heldItemData;
-            //     UpdateSlottedSprite();
-            //     return;
-            // }
-            // CASE 3: Held item, slot empty -> slot the held item
-            if (heldItemData != null && _currentlySlottedItemObject == null)
-            {
-                if (forbidden.Contains(heldItemData))
-                {
-                    DebugUIMessage.Show("Can't place that here.");
-                    Interactable.BroadcastInteractionComplete(false);
-                    return;
-                }
-
-                SlotItem(heldItemObj, heldItemData);
-                if (allowed.Contains(heldItemData))
-                {
-                    Interactable.BroadcastInteractionComplete(true);
-                    return;
-                }
-                else
-                {
-                    DebugUIMessage.Show("I'm not sure this works.");
-                    Interactable.BroadcastInteractionComplete(false);
-                    return;
-                }
-            }
-            
-            // CASE 4: No held item, slot empty -> show warning
             if (heldItemData == null && _currentlySlottedItemObject == null)
             {
-                DebugUIMessage.Show("This requires an item.");
+                DebugUIMessage.Show("This requires an item.", Color.red);
                 return;
             }
-            return;
         }
 
         /// <summary>
@@ -128,18 +103,49 @@ namespace Interactions
             }
         }
         
-        public void SlotItem(GameObject itemToSlot, PickupItemData itemToSlotData)
+        public void SlotItem(GameObject itemToSlot, PickupItemData itemToSlotData, bool clearFollowerHeldItem = true)
         {
             if (itemToSlot == null)
-                return;
+            {
-            
+                _currentlySlottedItemObject = null;
-            itemToSlot.SetActive(false);
+                _currentlySlottedItemData = null;
-            itemToSlot.transform.SetParent(null);
+            }
-            SetSlottedObject(itemToSlot);
+            else
-            
+            {
-            _currentlySlottedItemData = itemToSlotData;
+                itemToSlot.SetActive(false);
+                itemToSlot.transform.SetParent(null);
+                SetSlottedObject(itemToSlot);
+                _currentlySlottedItemData = itemToSlotData;
+            }
+            if (clearFollowerHeldItem)
+            {
+                FollowerController.ClearHeldItem();
+            }
             UpdateSlottedSprite();
-            FollowerController.ClearHeldItem();
+            
+            // Once an item is slotted, we know it is not forbidden, so we can skip that check, but now check if it was
+            // the correct item we're looking for
+            var config = GameManager.Instance.GetSlotItemConfig(itemData);
+            var allowed = config?.allowedItems ?? new List<PickupItemData>();
+            if (allowed.Contains(itemToSlotData))
+            {
+                if (itemToSlot != null)
+                {
+                    DebugUIMessage.Show("You correctly slotted " + itemToSlotData.itemName + " into: " + itemData.itemName, Color.green);
+                    onCorrectItemSlotted?.Invoke();
+                }
+                    
+                Interactable.BroadcastInteractionComplete(true);
+            }
+            else
+            {
+                if (itemToSlot != null)
+                {
+                    DebugUIMessage.Show("I'm not sure this works.", Color.yellow);
+                    onIncorrectItemSlotted?.Invoke();
+                }
+                Interactable.BroadcastInteractionComplete(false);
+            }
         }
     }
 }

Assets/Scripts/Movement/FollowerController.cs

@@ -20,6 +20,7 @@ public class FollowerController: MonoBehaviour
     /// </summary>
     public float manualMoveSmooth = 8f;
 
+    private GameObject _playerRef;
     private Transform _playerTransform;
     private AIPath _playerAIPath;
     private AIPath _aiPath;
@@ -58,9 +59,8 @@ public class FollowerController: MonoBehaviour
     /// </summary>
     public event FollowerPickupHandler OnPickupReturned;
     private Coroutine _pickupCoroutine;
-    private bool _lastInteractionSuccess = true;
-
     
+    private Input.PlayerTouchController _playerTouchController;
     
     void Awake()
     {
@@ -186,8 +186,10 @@ public class FollowerController: MonoBehaviour
         GameObject playerObj = GameObject.FindGameObjectWithTag("Player");
         if (playerObj != null)
         {
+            _playerRef = playerObj;
             _playerTransform = playerObj.transform;
             _playerAIPath = playerObj.GetComponent<AIPath>();
+            _playerTouchController = playerObj.GetComponent<Input.PlayerTouchController>();
             if (_playerAIPath != null)
             {
                 _playerMaxSpeed = _playerAIPath.maxSpeed;
@@ -199,6 +201,7 @@ public class FollowerController: MonoBehaviour
         {
             _playerTransform = null;
             _playerAIPath = null;
+            _playerTouchController = null;
         }
     }
     
@@ -225,6 +228,11 @@ public class FollowerController: MonoBehaviour
                 moveDir = _playerAIPath.velocity.normalized;
                 _lastMoveDir = moveDir;
             }
+            else if (_playerTouchController != null && _playerTouchController.isHolding && _playerTouchController.LastDirectMoveDir.sqrMagnitude > 0.01f)
+            {
+                moveDir = _playerTouchController.LastDirectMoveDir;
+                _lastMoveDir = moveDir;
+            }
             else
             {
                 moveDir = _lastMoveDir;
@@ -314,9 +322,9 @@ public class FollowerController: MonoBehaviour
 #endregion Movement
     
 #region ItemInteractions
-    public void TryPickupItem(GameObject itemObject, PickupItemData itemData)
+    public void TryPickupItem(GameObject itemObject, PickupItemData itemData, bool dropItem = true)
     {
-        if (_currentlyHeldItemData != null && _cachedPickupObject != null)
+        if (_currentlyHeldItemData != null && _cachedPickupObject != null && dropItem)
         {
             // Drop the currently held item at the current position
             DropHeldItemAt(transform.position);

Assets/Scripts/PuzzleS/ObjectiveStepBehaviour.cs

@@ -32,6 +32,11 @@ namespace PuzzleS
                 _interactable.interactionComplete.AddListener(OnInteractionComplete);
             }
             PuzzleManager.Instance?.RegisterStepBehaviour(this);
+            // Check if this step was already unlocked
+            if (stepData != null && PuzzleManager.Instance != null && PuzzleManager.Instance.IsStepUnlocked(stepData))
+            {
+                UnlockStep();
+            }
         }
 
         void OnDestroy()

Assets/Scripts/PuzzleS/PuzzleManager.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using System.Collections.Generic;
 using PuzzleS;
+using UnityEngine.SceneManagement;
 
 /// <summary>
 /// Manages puzzle step registration, dependency management, and step completion for the puzzle system.
@@ -44,6 +45,18 @@ public class PuzzleManager : MonoBehaviour
     {
         _instance = this;
         // DontDestroyOnLoad(gameObject);
+        SceneManager.sceneLoaded += OnSceneLoaded;
+    }
+
+    void OnDestroy()
+    {
+        SceneManager.sceneLoaded -= OnSceneLoaded;
+    }
+
+    private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+    {
+        BuildRuntimeDependencies();
+        UnlockInitialSteps();
     }
 
     /// <summary>
@@ -71,12 +84,6 @@ public class PuzzleManager : MonoBehaviour
         Debug.Log($"[Puzzles] Unregistered step: {behaviour.stepData.stepId} on {behaviour.gameObject.name}");
     }
 
-    void Start()
-    {
-        BuildRuntimeDependencies();
-        UnlockInitialSteps();
-    }
-
     /// <summary>
     /// Builds the runtime dependency graph for all registered steps.
     /// </summary>
@@ -172,6 +179,14 @@ public class PuzzleManager : MonoBehaviour
         }
     }
 
+    /// <summary>
+    /// Returns whether a step is already unlocked.
+    /// </summary>
+    public bool IsStepUnlocked(PuzzleStepSO step)
+    {
+        return unlockedSteps.Contains(step);
+    }
+
     void OnApplicationQuit()
     {
         _isQuitting = true;

Assets/Scripts/UI/MainMenu.cs

@@ -1,12 +1,14 @@
+using System;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
 public class MainMenu : MonoBehaviour
 {
-    public void StartGame()
+    public async void StartGame()
     {
         // Replace with the actual scene name as set in Build Settings
-        SceneManager.LoadScene("AppleHillsOverworld");
+        var progress = new Progress<float>(p => Debug.Log($"Loading progress: {p * 100:F0}%"));
+        await SceneManagerService.Instance.SwitchSceneAsync("AppleHillsOverworld", progress);
     }
 
     public void QuitGame()

ProjectSettings/EditorBuildSettings.asset

@@ -20,6 +20,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/MiniGames/DivingForPictures.unity
     guid: 0d57c89693f4e964b8b66e00e39ed1e7
+  - enabled: 1
+    path: Assets/Scenes/BootstrapScene.unity
+    guid: 706f6dec7a10d2542be1a3c21216158b
   m_configObjects:
     com.unity.addressableassets: {fileID: 11400000, guid: ae6ab785ade6a78439b79df6808becd2, type: 2}
     com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}