Revamp the puzzle registration system

Assets/Scripts/Interactions/Interactable.cs

@@ -418,7 +418,8 @@ namespace Interactions
         {
             // Check for ObjectiveStepBehaviour and lock state
             var step = GetComponent<PuzzleS.ObjectiveStepBehaviour>();
-            if (step != null && !step.IsStepUnlocked())
+            var slot = GetComponent<ItemSlot>();
+            if (step != null && !step.IsStepUnlocked() && slot == null)
             {
                 DebugUIMessage.Show("This step is locked!", Color.yellow);
                 BroadcastInteractionComplete(false);

Assets/Scripts/PuzzleS/ObjectiveStepBehaviour.cs

@@ -1,10 +1,7 @@
 using Input;
 using Interactions;
 using UnityEngine;
-using System;
-using AppleHills.Core.Settings;
 using Core;
-using UnityEngine.Serialization;
 
 namespace PuzzleS
 {
@@ -37,23 +34,46 @@ namespace PuzzleS
         void Awake()
         {
             _interactable = GetComponent<Interactable>();
+            
+            // Initialize the indicator if it exists, but ensure it's hidden initially
+            if (puzzleIndicator != null)
+            {
+                // The indicator should start inactive until we determine its proper state
+                puzzleIndicator.SetActive(false);
+                
+                // Get the IPuzzlePrompt component
+                _indicator = puzzleIndicator.GetComponent<IPuzzlePrompt>();
+                
+                if (_indicator == null)
+                {
+                    // Try to find it in children if not on the root
+                    _indicator = puzzleIndicator.GetComponentInChildren<IPuzzlePrompt>();
+                }
+                
+                if (_indicator == null)
+                {
+                    Logging.Warning($"[Puzzles] Indicator prefab for {stepData?.stepId} does not implement IPuzzlePrompt");
+                }
+            }
         }
 
         void OnEnable()
         {
             if (_interactable == null)
                 _interactable = GetComponent<Interactable>();
+            
             if (_interactable != null)
             {
                 _interactable.interactionStarted.AddListener(OnInteractionStarted);
                 _interactable.interactionComplete.AddListener(OnInteractionComplete);
             }
+        }
+
+        void Start()
+        {
+            // Register with PuzzleManager, regardless of enabled/disabled state
+            // PuzzleManager will call UnlockStep or LockStep based on current puzzle state
             PuzzleManager.Instance?.RegisterStepBehaviour(this);
-            // Check if this step was already unlocked
-            if (stepData != null && PuzzleManager.Instance != null && PuzzleManager.Instance.IsStepUnlocked(stepData))
-            {
-                UnlockStep();
-            }
         }
 
         void OnDestroy()
@@ -73,7 +93,7 @@ namespace PuzzleS
         public void UpdateProximityState(ProximityState newState)
         {
             if (_currentProximityState == newState) return;
-            if (_indicator == null) return;
+            if (!_isUnlocked) return; // Don't process state changes if locked
             
             // Determine state changes and call appropriate methods
             if (newState == ProximityState.Close)
@@ -97,6 +117,9 @@ namespace PuzzleS
         /// </summary>
         public virtual void OnShow()
         {
+            if (puzzleIndicator != null)
+                puzzleIndicator.SetActive(true);
+                
             // Delegate to indicator if available
             if (IsIndicatorValid())
             {
@@ -104,7 +127,6 @@ namespace PuzzleS
                 return;
             }
             
-            // Default fallback behavior
             Logging.Debug($"[Puzzles] Prompt shown for {stepData?.stepId} on {gameObject.name}");
         }
         
@@ -113,14 +135,15 @@ namespace PuzzleS
         /// </summary>
         public virtual void OnHide()
         {
+            if (puzzleIndicator != null)
+                puzzleIndicator.SetActive(false);
+                
             // Delegate to indicator if available
             if (IsIndicatorValid())
             {
                 _indicator.OnHide();
-                return;
             }
             
-            // Default fallback behavior
             Logging.Debug($"[Puzzles] Prompt hidden for {stepData?.stepId} on {gameObject.name}");
         }
         
@@ -138,9 +161,6 @@ namespace PuzzleS
                 _indicator.ShowFar();
                 return;
             }
-            
-            // Default fallback behavior
-            Logging.Debug($"[Puzzles] Player entered far range of {stepData?.stepId} on {gameObject.name}");
         }
         
         /// <summary>
@@ -157,9 +177,6 @@ namespace PuzzleS
                 _indicator.ShowClose();
                 return;
             }
-            
-            // Default fallback behavior
-            Logging.Debug($"[Puzzles] Player entered close range of {stepData?.stepId} on {gameObject.name}");
         }
         
         /// <summary>
@@ -176,9 +193,6 @@ namespace PuzzleS
                 _indicator.HideClose();
                 return;
             }
-            
-            // Default fallback behavior
-            Logging.Debug($"[Puzzles] Player exited close range of {stepData?.stepId} on {gameObject.name}");
         }
         
         /// <summary>
@@ -195,9 +209,6 @@ namespace PuzzleS
                 _indicator.HideFar();
                 return;
             }
-            
-            // Default fallback behavior
-            Logging.Debug($"[Puzzles] Player exited far range of {stepData?.stepId} on {gameObject.name}");
         }
 
         /// <summary>
@@ -205,57 +216,42 @@ namespace PuzzleS
         /// </summary>
         public void UnlockStep()
         {
+            if (_isUnlocked) return;
+            
             _isUnlocked = true;
             Logging.Debug($"[Puzzles] Step unlocked: {stepData?.stepId} on {gameObject.name}");
 
-            // Show indicator if enabled in settings
-            if (puzzleIndicator != null)
+            // Make the indicator visible since this step is now unlocked
+            OnShow();
+            
+            if (IsIndicatorValid())
             {
-                // Try to get the IPuzzlePrompt component from the spawned indicator
-                _indicator = puzzleIndicator.GetComponent<IPuzzlePrompt>();
-                
-                if (_indicator == null)
+                // Set the correct state based on current player distance
+                Transform playerTransform = GameObject.FindGameObjectWithTag("Player")?.transform;
+                if (playerTransform != null)
                 {
-                    // Try to find it in children if not on the root
-                    _indicator = puzzleIndicator.GetComponentInChildren<IPuzzlePrompt>();
-                }
-                
-                if (_indicator == null)
-                {
-                    Logging.Warning($"[Puzzles] Indicator prefab for {stepData?.stepId} does not implement IPuzzlePrompt");
-                }
-                else
-                {
-                    // First show the indicator
-                    _indicator.OnShow();
+                    float distance = Vector3.Distance(transform.position, playerTransform.position);
+                    float promptRange = AppleHills.SettingsAccess.GetPuzzlePromptRange();
                     
-                    // Then set the correct state based on current player distance
-                    Transform playerTransform = GameObject.FindGameObjectWithTag("Player")?.transform;
-                    if (playerTransform != null)
+                    if (distance <= promptRange)
                     {
-                        float distance = Vector3.Distance(transform.position, playerTransform.position);
-                        float promptRange = AppleHills.SettingsAccess.GetPuzzlePromptRange();
-                        
-                        if (distance <= promptRange)
-                        {
-                            // Player is in close range
-                            _currentProximityState = ProximityState.Close;
-                            _indicator.ShowClose();
-                        }
-                        else
-                        {
-                            // Player is in far range
-                            _currentProximityState = ProximityState.Far;
-                            _indicator.ShowFar();
-                        }
+                        // Player is in close range
+                        _currentProximityState = ProximityState.Close;
+                        _indicator.ShowClose();
                     }
                     else
                     {
-                        // Default to far if player not found
+                        // Player is in far range
                         _currentProximityState = ProximityState.Far;
                         _indicator.ShowFar();
                     }
                 }
+                else
+                {
+                    // Default to far if player not found
+                    _currentProximityState = ProximityState.Far;
+                    _indicator.ShowFar();
+                }
             }
         }
 
@@ -264,14 +260,18 @@ namespace PuzzleS
         /// </summary>
         public void LockStep()
         {
+            if (!_isUnlocked && puzzleIndicator != null) 
+            {
+                // Make sure indicator is hidden if we're already locked
+                puzzleIndicator.SetActive(false);
+                return;
+            }
+            
             _isUnlocked = false;
             Logging.Debug($"[Puzzles] Step locked: {stepData?.stepId} on {gameObject.name}");
 
-            // Hide indicator
-            if (IsIndicatorValid())
-            {
-                _indicator.OnHide();
-            }
+            // Hide the indicator
+            OnHide();
         }
 
         /// <summary>
@@ -287,7 +287,7 @@ namespace PuzzleS
         /// </summary>
         private void OnInteractionStarted(PlayerTouchController playerRef, FollowerController followerRef)
         {
-            // Optionally handle started interaction (e.g. visual feedback)
+            // Empty - handled by Interactable
         }
 
         /// <summary>
@@ -297,12 +297,17 @@ namespace PuzzleS
         private void OnInteractionComplete(bool success)
         {
             if (!_isUnlocked) return;
-            if (success)
+            if (success && !_isCompleted)
             {
                 Logging.Debug($"[Puzzles] Step interacted: {stepData?.stepId} on {gameObject.name}");
                 _isCompleted = true;
                 PuzzleManager.Instance?.MarkPuzzleStepCompleted(stepData);
-                Destroy(puzzleIndicator);
+                
+                if (puzzleIndicator != null)
+                {
+                    Destroy(puzzleIndicator);
+                    _indicator = null;
+                }
             }
         }
 
@@ -323,7 +328,7 @@ namespace PuzzleS
             
             // Draw threshold circle
             Gizmos.color = Color.cyan;
-            Gizmos.DrawWireSphere(transform.position, promptRange / 2f);
+            Gizmos.DrawWireSphere(transform.position, promptRange);
         }
     }
 }

Assets/Scripts/PuzzleS/PuzzleChainSO.cs

@@ -0,0 +1,103 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+
+namespace PuzzleS
+{
+    /// <summary>
+    /// Represents a complete chain of puzzle steps that form a logical sequence.
+    /// This is automatically generated from folder structure during asset import.
+    /// </summary>
+    [CreateAssetMenu(fileName = "PuzzleChain", menuName = "AppleHills/Items & Puzzles/PuzzleChain")]
+    public class PuzzleChainSO : ScriptableObject
+    {
+        /// <summary>
+        /// Unique identifier for this puzzle chain, automatically set to match folder name
+        /// </summary>
+        public string chainId;
+        
+        /// <summary>
+        /// Display name for this chain
+        /// </summary>
+        public string displayName;
+        
+        /// <summary>
+        /// Description of this puzzle chain
+        /// </summary>
+        [TextArea]
+        public string description;
+        
+        /// <summary>
+        /// All steps that belong to this puzzle chain
+        /// </summary>
+        public List<PuzzleStepSO> allSteps = new List<PuzzleStepSO>();
+        
+        /// <summary>
+        /// Initial steps that should be unlocked when the puzzle chain starts
+        /// (steps with no dependencies)
+        /// </summary>
+        public List<PuzzleStepSO> initialSteps = new List<PuzzleStepSO>();
+        
+        /// <summary>
+        /// Optional requirement for this entire chain to be activated
+        /// If not null, this chain requires the specified chain to be completed first
+        /// </summary>
+        public PuzzleChainSO requiredChain;
+        
+        /// <summary>
+        /// Pre-processed dependency data built at edit time.
+        /// Maps step IDs to arrays of dependency step IDs
+        /// </summary>
+        [HideInInspector]
+        public Dictionary<string, string[]> stepDependencies = new Dictionary<string, string[]>();
+        
+        /// <summary>
+        /// Gets all steps that will be unlocked by completing the given step
+        /// </summary>
+        public List<PuzzleStepSO> GetUnlockedSteps(string stepId)
+        {
+            var result = new List<PuzzleStepSO>();
+            foreach (var step in allSteps)
+            {
+                if (step.stepId == stepId && step != null)
+                {
+                    return step.unlocks;
+                }
+            }
+            return result;
+        }
+        
+        /// <summary>
+        /// Gets all steps that will be unlocked by completing the given step
+        /// </summary>
+        public List<PuzzleStepSO> GetUnlockedSteps(PuzzleStepSO completedStep)
+        {
+            return completedStep != null ? completedStep.unlocks : new List<PuzzleStepSO>();
+        }
+
+        /// <summary>
+        /// Check if this step is an initial step (no dependencies)
+        /// </summary>
+        public bool IsInitialStep(PuzzleStepSO step)
+        {
+            return step != null && initialSteps.Contains(step);
+        }
+
+        /// <summary>
+        /// Check if all steps in this chain are completed
+        /// </summary>
+        public bool IsChainComplete(HashSet<PuzzleStepSO> completedSteps)
+        {
+            if (completedSteps == null) return false;
+            
+            foreach (var step in allSteps)
+            {
+                if (step != null && !completedSteps.Contains(step))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+}

Assets/Scripts/PuzzleS/PuzzleChainSO.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 58109a40325e47f2a8a3b9264d8938dd
+timeCreated: 1760532067

Assets/Scripts/PuzzleS/PuzzleLevelDataSO.cs

@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+
+namespace PuzzleS
+{
+    /// <summary>
+    /// Represents all puzzle steps in a level.
+    /// This is automatically generated from folder structure during asset import.
+    /// </summary>
+    [CreateAssetMenu(fileName = "LevelPuzzleData", menuName = "AppleHills/Items & Puzzles/LevelPuzzleData")]
+    public class PuzzleLevelDataSO : ScriptableObject
+    {
+        /// <summary>
+        /// Unique identifier for this level, automatically set to match folder name
+        /// </summary>
+        public string levelId;
+        
+        /// <summary>
+        /// Display name for this level
+        /// </summary>
+        public string displayName;
+        
+        /// <summary>
+        /// All puzzle steps in this level
+        /// </summary>
+        public List<PuzzleStepSO> allSteps = new List<PuzzleStepSO>();
+        
+        /// <summary>
+        /// Steps that should be unlocked at level start (no dependencies)
+        /// </summary>
+        public List<PuzzleStepSO> initialSteps = new List<PuzzleStepSO>();
+        
+        /// <summary>
+        /// Pre-processed dependency data built at edit time.
+        /// Maps step IDs to arrays of dependency step IDs (which steps are required by each step)
+        /// </summary>
+        public Dictionary<string, string[]> stepDependencies = new Dictionary<string, string[]>();
+        
+        /// <summary>
+        /// Check if all steps in the level are complete
+        /// </summary>
+        public bool IsLevelComplete(HashSet<PuzzleStepSO> completedSteps)
+        {
+            if (completedSteps == null) return false;
+            
+            foreach (var step in allSteps)
+            {
+                if (step != null && !completedSteps.Contains(step))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+        
+        /// <summary>
+        /// Gets all steps that will be unlocked by completing the given step
+        /// </summary>
+        public List<PuzzleStepSO> GetUnlockedSteps(PuzzleStepSO completedStep)
+        {
+            return completedStep != null ? completedStep.unlocks : new List<PuzzleStepSO>();
+        }
+
+        /// <summary>
+        /// Check if this step is an initial step (no dependencies)
+        /// </summary>
+        public bool IsInitialStep(PuzzleStepSO step)
+        {
+            return step != null && initialSteps.Contains(step);
+        }
+    }
+}

Assets/Scripts/PuzzleS/PuzzleLevelDataSO.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0a79780a5a0d498084afd737d4515e3b
+timeCreated: 1760532084

Assets/Scripts/PuzzleS/PuzzleManager.cs

@@ -5,7 +5,10 @@ using System.Linq;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using AppleHills.Core.Settings;
-using Core; // Added for IInteractionSettings
+using Core;
+using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using Utils;
 
 namespace PuzzleS
 {
@@ -26,6 +29,11 @@ namespace PuzzleS
         // Settings reference
         private IInteractionSettings _interactionSettings;
 
+        // Current level puzzle data
+        private PuzzleLevelDataSO _currentLevelData;
+        private AsyncOperationHandle<PuzzleLevelDataSO> _levelDataLoadOperation;
+        private bool _isLoadingLevelData = false;
+
         /// <summary>
         /// Singleton instance of the PuzzleManager.
         /// </summary>
@@ -50,47 +58,76 @@ namespace PuzzleS
         // Events to notify about step lifecycle
         public event Action<PuzzleStepSO> OnStepCompleted;
         public event Action<PuzzleStepSO> OnStepUnlocked;
+        public event Action<PuzzleLevelDataSO> OnLevelDataLoaded;
+        public event Action<PuzzleLevelDataSO> OnAllPuzzlesComplete;
 
         private HashSet<PuzzleStepSO> _completedSteps = new HashSet<PuzzleStepSO>();
         private HashSet<PuzzleStepSO> _unlockedSteps = new HashSet<PuzzleStepSO>();
         // Registration for ObjectiveStepBehaviour
         private Dictionary<PuzzleStepSO, ObjectiveStepBehaviour> _stepBehaviours = new Dictionary<PuzzleStepSO, ObjectiveStepBehaviour>();
-        // Runtime dependency graph
-        private Dictionary<PuzzleStepSO, List<PuzzleStepSO>> _runtimeDependencies = new Dictionary<PuzzleStepSO, List<PuzzleStepSO>>();
 
         void Awake()
         {
             _instance = this;
             // DontDestroyOnLoad(gameObject);
-            SceneManager.sceneLoaded += OnSceneLoaded;
-
+            
             // Initialize settings reference
             _interactionSettings = GameManager.GetSettingsObject<IInteractionSettings>();
         }
 
+        void OnEnable()
+        {
+            // Subscribe to scene manager events
+            
+        }
+        
         void Start()
         {
+            SceneManagerService.Instance.SceneLoadCompleted += OnSceneLoadCompleted;
+            
             // Find player transform
             _playerTransform = GameObject.FindGameObjectWithTag("Player")?.transform;
             
             // Start proximity check coroutine
             StartProximityChecks();
+            
+            // Load puzzle data for the current scene if not already loading
+            if (_currentLevelData == null && !_isLoadingLevelData)
+            {
+                LoadPuzzleDataForCurrentScene();
+            }
         }
 
         void OnDestroy()
         {
-            SceneManager.sceneLoaded -= OnSceneLoaded;
             StopProximityChecks();
+            
+            // Unsubscribe from scene manager events
+            if (SceneManagerService.Instance != null)
+            {
+                SceneManagerService.Instance.SceneLoadCompleted -= OnSceneLoadCompleted;
+            }
+            
+            // Release addressable handle if needed
+            if (_levelDataLoadOperation.IsValid())
+            {
+                Addressables.Release(_levelDataLoadOperation);
+            }
         }
 
-        private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+        /// <summary>
+        /// Called when a scene is loaded
+        /// </summary>
+        public void  OnSceneLoadCompleted(string sceneName)
         {
-            SceneManager.sceneLoaded -= OnSceneLoaded;
+            // Skip for non-gameplay scenes
+            if (sceneName == "BootstrapScene" || string.IsNullOrEmpty(sceneName))
+            {
+                return;
+            }
             
-            Logging.Debug("[MDPI] OnSceneLoaded");
-            _runtimeDependencies.Clear();
-            BuildRuntimeDependencies();
-            UnlockInitialSteps();
+            Logging.Debug($"[Puzzles] Scene loaded: {sceneName}, loading puzzle data");
+            LoadPuzzleDataForCurrentScene(sceneName);
             
             // Find player transform again in case it changed with scene load
             _playerTransform = GameObject.FindGameObjectWithTag("Player")?.transform;
@@ -99,6 +136,66 @@ namespace PuzzleS
             StartProximityChecks();
         }
 
+        /// <summary>
+        /// Load puzzle data for the current scene
+        /// </summary>
+        private void LoadPuzzleDataForCurrentScene(string sceneName = null)
+        {
+            string currentScene = sceneName ?? SceneManagerService.Instance.CurrentGameplayScene;
+            if (string.IsNullOrEmpty(currentScene))
+            {
+                Logging.Warning("[Puzzles] Cannot load puzzle data: Current scene name is empty");
+                return;
+            }
+            
+            _isLoadingLevelData = true;
+            string addressablePath = $"Puzzles/{currentScene}";
+            
+            Logging.Debug($"[Puzzles] Loading puzzle data from addressable: {addressablePath}");
+            
+            // Release previous handle if needed
+            if (_levelDataLoadOperation.IsValid())
+            {
+                Addressables.Release(_levelDataLoadOperation);
+            }
+
+            if (!AppleHillsUtils.AddressableKeyExists(addressablePath))
+            {
+                Logging.Warning($"[Puzzles] Puzzle key does not exist in Addressables: {addressablePath}. Returning early!");
+                return;
+            }
+            
+            // Load the level data asset
+            _levelDataLoadOperation = Addressables.LoadAssetAsync<PuzzleLevelDataSO>(addressablePath);
+            _levelDataLoadOperation.Completed += handle => 
+            {
+                _isLoadingLevelData = false;
+                
+                if (handle.Status == AsyncOperationStatus.Succeeded)
+                {
+                    _currentLevelData = handle.Result;
+                    Logging.Debug($"[Puzzles] Loaded level data: {_currentLevelData.levelId} with {_currentLevelData.allSteps.Count} steps");
+                    
+                    // Reset state
+                    _completedSteps.Clear();
+                    _unlockedSteps.Clear();
+                    
+                    // Unlock initial steps
+                    UnlockInitialSteps();
+                    
+                    // Update existing ObjectiveStepBehaviours with the current state
+                    UpdateRegisteredStepStates();
+                    
+                    // Notify listeners
+                    OnLevelDataLoaded?.Invoke(_currentLevelData);
+                }
+                else
+                {
+                    Logging.Warning($"[Puzzles] Failed to load puzzle data for {currentScene}: {handle.OperationException?.Message}");
+                }
+            };
+        }
+
         /// <summary>
         /// Start the proximity check coroutine.
         /// </summary>
@@ -138,7 +235,7 @@ namespace PuzzleS
                     foreach (var kvp in _stepBehaviours)
                     {
                         if (kvp.Value == null) continue;
-                        if (IsPuzzleStepCompleted(kvp.Value.stepData.stepId)) continue;
+                        if (IsPuzzleStepCompleted(kvp.Key.stepId)) continue;
                         
                         float distance = Vector3.Distance(_playerTransform.position, kvp.Value.transform.position);
                         
@@ -164,18 +261,48 @@ namespace PuzzleS
         public void RegisterStepBehaviour(ObjectiveStepBehaviour behaviour)
         {
             if (behaviour?.stepData == null) return;
+            
             if (!_stepBehaviours.ContainsKey(behaviour.stepData))
             {
                 _stepBehaviours.Add(behaviour.stepData, behaviour);
-                _runtimeDependencies.Clear();
-                foreach (var step in _stepBehaviours.Values)
-                {
-                    step.LockStep();
-                }
-                _unlockedSteps.Clear();
-                BuildRuntimeDependencies();
-                UnlockInitialSteps();
                 Logging.Debug($"[Puzzles] Registered step: {behaviour.stepData.stepId} on {behaviour.gameObject.name}");
+                
+                // Immediately set the correct state based on current puzzle state
+                UpdateStepState(behaviour);
+            }
+        }
+        
+        /// <summary>
+        /// Updates a step's state based on the current puzzle state.
+        /// </summary>
+        private void UpdateStepState(ObjectiveStepBehaviour behaviour)
+        {
+            if (behaviour?.stepData == null) return;
+            
+            // If step is already completed, ignore
+            if (_completedSteps.Contains(behaviour.stepData)) 
+                return;
+                
+            // If step is already unlocked, update the behaviour
+            if (_unlockedSteps.Contains(behaviour.stepData))
+            {
+                behaviour.UnlockStep();
+            }
+            else
+            {
+                // Make sure it's locked
+                behaviour.LockStep();
+            }
+        }
+        
+        /// <summary>
+        /// Updates the states of all registered step behaviours based on current puzzle state.
+        /// </summary>
+        private void UpdateRegisteredStepStates()
+        {
+            foreach (var kvp in _stepBehaviours)
+            {
+                UpdateStepState(kvp.Value);
             }
         }
 
@@ -191,52 +318,19 @@ namespace PuzzleS
         }
 
         /// <summary>
-        /// Builds the runtime dependency graph for all registered steps.
-        /// </summary>
-        private void BuildRuntimeDependencies()
-        {
-            _runtimeDependencies = PuzzleGraphUtility.BuildDependencyGraph(_stepBehaviours.Keys);
-            foreach (var step in _runtimeDependencies.Keys)
-            {
-                foreach (var dep in _runtimeDependencies[step])
-                {
-                    Logging.Debug($"[Puzzles] Step {step.stepId} depends on {dep.stepId}");
-                }
-            }
-            Logging.Debug($"[Puzzles] Runtime dependencies built. Total steps: {_stepBehaviours.Count}");
-        }
-
-        /// <summary>
-        /// Unlocks all initial steps (those with no dependencies) and any steps whose dependencies are already met.
+        /// Unlocks all initial steps (those with no dependencies)
         /// </summary>
         private void UnlockInitialSteps()
         {
-            // First, unlock all steps with no dependencies (initial steps)
-            var initialSteps = PuzzleGraphUtility.FindInitialSteps(_runtimeDependencies);
-            foreach (var step in initialSteps)
+            if (_currentLevelData == null) return;
+            
+            // Unlock initial steps
+            foreach (var step in _currentLevelData.initialSteps)
             {
-                Logging.Debug($"[Puzzles] Initial step unlocked: {step.stepId}");
                 UnlockStep(step);
             }
             
-            // Keep trying to unlock steps as long as we're making progress
-            bool madeProgress;
-            do
-            {
-                madeProgress = false;
-                
-                // Check all steps that haven't been unlocked yet
-                foreach (var step in _runtimeDependencies.Keys.Where(s => !_unlockedSteps.Contains(s)))
-                {
-                    // Check if all dependencies have been completed
-                    if (AreRuntimeDependenciesMet(step))
-                    {
-                        Logging.Debug($"[Puzzles] Chain step unlocked: {step.stepId}");
-                        UnlockStep(step);
-                        madeProgress = true;
-                    }
-                }
-            } while (madeProgress);
+            Logging.Debug($"[Puzzles] Unlocked {_unlockedSteps.Count} initial steps");
         }
 
         /// <summary>
@@ -246,24 +340,29 @@ namespace PuzzleS
         public void MarkPuzzleStepCompleted(PuzzleStepSO step)
         {
             if (_completedSteps.Contains(step)) return;
+            if (_currentLevelData == null) return;
+            
             _completedSteps.Add(step);
             Logging.Debug($"[Puzzles] Step completed: {step.stepId}");
 
             // Broadcast completion
             OnStepCompleted?.Invoke(step);
 
-            foreach (var unlock in step.unlocks)
+            // Unlock steps that are unlocked by this step
+            foreach (var unlockStep in _currentLevelData.GetUnlockedSteps(step))
             {
-                if (AreRuntimeDependenciesMet(unlock))
+                if (AreStepDependenciesMet(unlockStep))
                 {
-                    Logging.Debug($"[Puzzles] Unlocking step {unlock.stepId} after completing {step.stepId}");
-                    UnlockStep(unlock);
+                    Logging.Debug($"[Puzzles] Unlocking step {unlockStep.stepId} after completing {step.stepId}");
+                    UnlockStep(unlockStep);
                 }
                 else
                 {
-                    Logging.Debug($"[Puzzles] Step {unlock.stepId} not unlocked yet, waiting for other dependencies");
+                    Logging.Debug($"[Puzzles] Step {unlockStep.stepId} not unlocked yet, waiting for other dependencies");
                 }
             }
+            
+            // Check if all puzzle steps are now complete
             CheckPuzzleCompletion();
         }
 
@@ -272,13 +371,33 @@ namespace PuzzleS
         /// </summary>
         /// <param name="step">The step to check.</param>
         /// <returns>True if all dependencies are met, false otherwise.</returns>
-        private bool AreRuntimeDependenciesMet(PuzzleStepSO step)
+        private bool AreStepDependenciesMet(PuzzleStepSO step)
         {
-            if (!_runtimeDependencies.ContainsKey(step) || _runtimeDependencies[step].Count == 0) return true;
-            foreach (var dep in _runtimeDependencies[step])
+            if (_currentLevelData == null || step == null) return false;
+            
+            // If it's an initial step, it has no dependencies
+            if (_currentLevelData.IsInitialStep(step)) return true;
+            
+            // Check if dependencies are met using pre-processed data
+            if (_currentLevelData.stepDependencies.TryGetValue(step.stepId, out string[] dependencies))
             {
-                if (!_completedSteps.Contains(dep)) return false;
+                foreach (var depId in dependencies)
+                {
+                    // Find the dependency step
+                    bool dependencyMet = false;
+                    foreach (var completedStep in _completedSteps)
+                    {
+                        if (completedStep.stepId == depId)
+                        {
+                            dependencyMet = true;
+                            break;
+                        }
+                    }
+                    
+                    if (!dependencyMet) return false;
+                }
             }
+            
             return true;
         }
 
@@ -290,6 +409,7 @@ namespace PuzzleS
         {
             if (_unlockedSteps.Contains(step)) return;
             _unlockedSteps.Add(step);
+            
             if (_stepBehaviours.TryGetValue(step, out var behaviour))
             {
                 behaviour.UnlockStep();
@@ -301,14 +421,18 @@ namespace PuzzleS
         }
 
         /// <summary>
-        /// Checks if the puzzle is complete (all steps finished).
+        /// Checks if the puzzle is complete (all steps in level finished).
         /// </summary>
         private void CheckPuzzleCompletion()
         {
-            if (_completedSteps.Count == _stepBehaviours.Count)
+            if (_currentLevelData == null) return;
+            
+            if (_currentLevelData.IsLevelComplete(_completedSteps))
             {
-                Logging.Debug("[Puzzles] Puzzle complete! All steps finished.");
-                // TODO: Fire puzzle complete event or trigger outcome logic
+                Logging.Debug("[Puzzles] All puzzles complete! Level finished.");
+                
+                // Fire level complete event
+                OnAllPuzzlesComplete?.Invoke(_currentLevelData);
             }
         }
 
@@ -317,9 +441,6 @@ namespace PuzzleS
         /// </summary>
         public bool IsStepUnlocked(PuzzleStepSO step)
         {
-            // _runtimeDependencies.Clear();
-            // BuildRuntimeDependencies();
-            // UnlockInitialSteps();
             return _unlockedSteps.Contains(step);
         }
 
@@ -332,6 +453,14 @@ namespace PuzzleS
         {
             return _completedSteps.Any(step => step.stepId == stepId);
         }
+        
+        /// <summary>
+        /// Get the current level puzzle data
+        /// </summary>
+        public PuzzleLevelDataSO GetCurrentLevelData()
+        {
+            return _currentLevelData;
+        }
 
         void OnApplicationQuit()
         {

Assets/Scripts/UI/Tutorial/DivingTutorial.cs

@@ -42,22 +42,21 @@ public class DivingTutorial : MonoBehaviour, ITouchInputConsumer
 
     public void OnTap(Vector2 position)
     {
-
         stateMachine.Next(true);
     }
 
     public void OnHoldStart(Vector2 position)
     {
-        throw new System.NotImplementedException();
+        return;
     }
 
     public void OnHoldMove(Vector2 position)
     {
-        throw new System.NotImplementedException();
+        return;
     }
 
     public void OnHoldEnd(Vector2 position)
     {
-        throw new System.NotImplementedException();
+        return;
     }
 }

Assets/Scripts/Utils/AppleHillsUtils.cs

@@ -1,6 +1,9 @@
-using UnityEngine;
+using System.Collections.Generic;
+using UnityEngine;
 using AppleHills.Core.Settings;
 using Core;
+using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.ResourceLocations;
 
 namespace Utils
 {
@@ -68,5 +71,11 @@ namespace Utils
             // Apply screen normalization
             return frameAdjustedSpeed * screenNormalizationFactor;
         }
+        
+        public static bool AddressableKeyExists(object key)
+        {
+            IList<IResourceLocation> locations;
+            return Addressables.LoadResourceLocationsAsync(key).WaitForCompletion()?.Count > 0;
+        }
     }
 }