Refactor identifiers and add subtitle UI

Assets/Scripts/AGENTS.md

@@ -27,6 +27,14 @@ mainly on vines and thorns.
 11. **Workflow** - You're not to make any code changes until you've shown me the proposed changes, I'll then either approve, deny, or modify them before you make the change.
 12. **Events** - We use C# events, actions, and delegates rather than UnityEvents, except when dealing with raw/stock ui components. 
 
+## Semantics
+
+1. **Access**  - All methods, properties, and fields, should always be the minimum required access. 
+2. **Const** - All const fields and variables should be ALL_CAP_UNDERSCORED for names. 
+3. **Variable Ordering** -  Const variables followed by Unity serialized fields, followed by private/protected variables, followed by public access.
+4. **Method Ordering** - vContainer injection method, followed by private Unity Methods (Awake, Start, Update, etc), followed by public methods, then protected, then followed by private methods.
+
+
 ## Documentation
 
 UniTask - https://github.com/Cysharp/UniTask

Assets/Scripts/Data/IO/Saves/SaveGame.cs

@@ -13,7 +13,7 @@ namespace BriarQueen.Data.IO.Saves
     [MemoryPackable]
     public partial class SaveGame
     {
-        public string SaveVersion = "0.0.2-alpha";
+        public string SaveVersion;
         public string SaveFileName;
         
         // Key Unlocks
@@ -115,12 +115,12 @@ namespace BriarQueen.Data.IO.Saves
         // -------- Helper Methods --------
         public bool IsPuzzleCompleted(PuzzleKey puzzle)
         {
-            return PuzzleCompleted.TryGetValue(PuzzleIdentifiers.AllPuzzles[puzzle], out var completed) && completed;
+            return PuzzleCompleted.TryGetValue(PuzzleIdentifiers.Get(puzzle), out var completed) && completed;
         }
 
         public void SetPuzzleCompleted(PuzzleKey puzzle, bool completed = true)
         {
-            PuzzleCompleted[PuzzleIdentifiers.AllPuzzles[puzzle]] = completed;
+            PuzzleCompleted[PuzzleIdentifiers.Get(puzzle)] = completed;
         }
 
         public bool GetLevelFlag(LevelFlag flag)

Assets/Scripts/Data/Identifiers/AchievementIDs.cs

@@ -2,10 +2,6 @@ namespace BriarQueen.Data.Identifiers
 {
     public enum AchievementID
     {
-        WorkshopSafeUnlocked,
+        AshwickGateKeypadUnlocked,
-        WorkshopPuzzleBoxSolved,
-        FountainGemPuzzleSolved,
-        FireplaceLockboxPuzzleBoxSolved,
-        LaxleyGrandfatherClockPuzzleSolved,
     }
 }

Assets/Scripts/Data/Identifiers/AudioNameIdentifiers.cs

@@ -51,7 +51,7 @@ namespace BriarQueen.Data.Identifiers
     
     public static class AudioNameIdentifiers
     {
-        public static readonly IReadOnlyDictionary<MusicKey, string> Music =
+        private static readonly IReadOnlyDictionary<MusicKey, string> _music =
             new ReadOnlyDictionary<MusicKey, string>(
                 new Dictionary<MusicKey, string>
                 {
@@ -59,7 +59,7 @@ namespace BriarQueen.Data.Identifiers
                     // { MusicKey.SomeTrack, "Music:SomeTrack" }
                 });
 
-        public static readonly IReadOnlyDictionary<SFXKey, string> SFX =
+        private static readonly IReadOnlyDictionary<SFXKey, string> _sfx =
             new ReadOnlyDictionary<SFXKey, string>(
                 new Dictionary<SFXKey, string>
                 {
@@ -68,7 +68,7 @@ namespace BriarQueen.Data.Identifiers
                     { SFXKey.AshwickGateOpening, "SFX:Level:AshwickOutskirts:GateOpening" },
                 });
 
-        public static readonly IReadOnlyDictionary<UIFXKey, string> UIFX =
+        private static readonly IReadOnlyDictionary<UIFXKey, string> _uifx =
             new ReadOnlyDictionary<UIFXKey, string>(
                 new Dictionary<UIFXKey, string>
                 {
@@ -76,14 +76,14 @@ namespace BriarQueen.Data.Identifiers
                     { UIFXKey.CodexEntryUnlocked, "UIFX:General:CodexEntryUnlocked" },
                 });
 
-        public static readonly IReadOnlyDictionary<AmbienceKey, string> Ambience =
+        private static readonly IReadOnlyDictionary<AmbienceKey, string> _ambience =
             new ReadOnlyDictionary<AmbienceKey, string>(
                 new Dictionary<AmbienceKey, string>
                 {
                     // Add ambience mappings here
                 });
 
-        public static readonly IReadOnlyDictionary<VoiceKey, string> Voice =
+        private static readonly IReadOnlyDictionary<VoiceKey, string> _voice =
             new ReadOnlyDictionary<VoiceKey, string>(
                 new Dictionary<VoiceKey, string>
                 {
@@ -106,27 +106,27 @@ namespace BriarQueen.Data.Identifiers
 
         public static string Get(MusicKey key)
         {
-            return Music.TryGetValue(key, out var value) ? value : string.Empty;
+            return _music.TryGetValue(key, out var value) ? value : string.Empty;
         }
 
         public static string Get(SFXKey key)
         {
-            return SFX.TryGetValue(key, out var value) ? value : string.Empty;
+            return _sfx.TryGetValue(key, out var value) ? value : string.Empty;
         }
 
         public static string Get(UIFXKey key)
         {
-            return UIFX.TryGetValue(key, out var value) ? value : string.Empty;
+            return _uifx.TryGetValue(key, out var value) ? value : string.Empty;
         }
 
         public static string Get(AmbienceKey key)
         {
-            return Ambience.TryGetValue(key, out var value) ? value : string.Empty;
+            return _ambience.TryGetValue(key, out var value) ? value : string.Empty;
         }
 
         public static string Get(VoiceKey key)
         {
-            return Voice.TryGetValue(key, out var value) ? value : string.Empty;
+            return _voice.TryGetValue(key, out var value) ? value : string.Empty;
         }
     }
 }

Assets/Scripts/Data/Identifiers/CodexEntryIDs.cs

@@ -22,25 +22,25 @@ namespace BriarQueen.Data.Identifiers
 
     public static class CodexEntryIDs
     {
-        private const string DOCUMENT_PREFIX = "Codex:Document:";
+        private const string DOCUMENT_PREFIX = "Codex:Document";
-        private const string CLUE_PREFIX = "Codex:Clue:";
+        private const string CLUE_PREFIX = "Codex:Clue";
-        private const string PHOTO_PREFIX = "Codex:Photo:";
+        private const string PHOTO_PREFIX = "Codex:Photo";
 
-        public static readonly IReadOnlyDictionary<DocumentEntryID, string> Documents =
+        private static readonly IReadOnlyDictionary<DocumentEntryID, string> _documents =
             new ReadOnlyDictionary<DocumentEntryID, string>(
                 new Dictionary<DocumentEntryID, string>
                 {
                     { DocumentEntryID.C1CarNewspaper, GetDocumentIdentifier(DocumentEntryID.C1CarNewspaper) },
                 });
 
-        public static readonly IReadOnlyDictionary<ClueEntryID, string> Clues =
+        private static readonly IReadOnlyDictionary<ClueEntryID, string> _clues =
             new ReadOnlyDictionary<ClueEntryID, string>(
                 new Dictionary<ClueEntryID, string>
                 {
-                    { ClueEntryID.JasonsNote, $"{PHOTO_PREFIX}:AshwickMarketGate" },
+                    { ClueEntryID.JasonsNote, GetClueIdentifier(ClueEntryID.JasonsNote) },
                 });
 
-        public static readonly IReadOnlyDictionary<PhotoEntryID, string> Photos =
+        private static readonly IReadOnlyDictionary<PhotoEntryID, string> _photos =
             new ReadOnlyDictionary<PhotoEntryID, string>(
                 new Dictionary<PhotoEntryID, string>
                 {
@@ -48,32 +48,32 @@ namespace BriarQueen.Data.Identifiers
 
         public static string Get(DocumentEntryID id)
         {
-            return Documents.TryGetValue(id, out var value) ? value : string.Empty;
+            return _documents.TryGetValue(id, out var value) ? value : string.Empty;
         }
 
         public static string Get(ClueEntryID id)
         {
-            return Clues.TryGetValue(id, out var value) ? value : string.Empty;
+            return _clues.TryGetValue(id, out var value) ? value : string.Empty;
         }
 
         public static string Get(PhotoEntryID id)
         {
-            return Photos.TryGetValue(id, out var value) ? value : string.Empty;
+            return _photos.TryGetValue(id, out var value) ? value : string.Empty;
         }
 
         private static string GetDocumentIdentifier(DocumentEntryID id)
         {
-            return $"{DOCUMENT_PREFIX}{id}";
+            return $"{DOCUMENT_PREFIX}:{id}";
         }
 
         private static string GetClueIdentifier(ClueEntryID id)
         {
-            return $"{CLUE_PREFIX}{id}";
+            return $"{CLUE_PREFIX}:{id}";
         }
 
         private static string GetPhotoIdentifier(PhotoEntryID id)
         {
-            return $"{PHOTO_PREFIX}{id}";
+            return $"{PHOTO_PREFIX}:{id}";
         }
     }
 }

Assets/Scripts/Data/Identifiers/InteractEventIDs.cs

@@ -40,7 +40,7 @@ namespace BriarQueen.Data.Identifiers
 
     public static class InteractEventIDs
     {
-        public static readonly IReadOnlyDictionary<ItemInteractKey, string> ItemInteractions =
+        private static readonly IReadOnlyDictionary<ItemInteractKey, string> _itemInteractions =
             new ReadOnlyDictionary<ItemInteractKey, string>(
                 new Dictionary<ItemInteractKey, string>
                 {
@@ -54,13 +54,13 @@ namespace BriarQueen.Data.Identifiers
                     
                 });
 
-        public static readonly IReadOnlyDictionary<LevelInteractKey, string> LevelInteractions =
+        private static readonly IReadOnlyDictionary<LevelInteractKey, string> _levelInteractions =
             new ReadOnlyDictionary<LevelInteractKey, string>(
                 new Dictionary<LevelInteractKey, string>
                 {
                 });
 
-        public static readonly IReadOnlyDictionary<EnvironmentInteractKey, string> EnvironmentInteractions =
+        private static readonly IReadOnlyDictionary<EnvironmentInteractKey, string> _environmentInteractions =
             new ReadOnlyDictionary<EnvironmentInteractKey, string>(
                 new Dictionary<EnvironmentInteractKey, string>
                 {
@@ -73,7 +73,7 @@ namespace BriarQueen.Data.Identifiers
                     { EnvironmentInteractKey.ClockTower, "Even from here, something about that clock tower feels wrong."}
                 });
 
-        public static readonly IReadOnlyDictionary<UIInteractKey, string> UIInteractions =
+        private static readonly IReadOnlyDictionary<UIInteractKey, string> _uiInteractions =
             new ReadOnlyDictionary<UIInteractKey, string>(
                 new Dictionary<UIInteractKey, string>
                 {
@@ -82,22 +82,22 @@ namespace BriarQueen.Data.Identifiers
 
         public static string Get(ItemInteractKey key)
         {
-            return ItemInteractions.TryGetValue(key, out var value) ? value : string.Empty;
+            return _itemInteractions.TryGetValue(key, out var value) ? value : string.Empty;
         }
 
         public static string Get(LevelInteractKey key)
         {
-            return LevelInteractions.TryGetValue(key, out var value) ? value : string.Empty;
+            return _levelInteractions.TryGetValue(key, out var value) ? value : string.Empty;
         }
 
         public static string Get(EnvironmentInteractKey key)
         {
-            return EnvironmentInteractions.TryGetValue(key, out var value) ? value : string.Empty;
+            return _environmentInteractions.TryGetValue(key, out var value) ? value : string.Empty;
         }
 
         public static string Get(UIInteractKey key)
         {
-            return UIInteractions.TryGetValue(key, out var value) ? value : string.Empty;
+            return _uiInteractions.TryGetValue(key, out var value) ? value : string.Empty;
         }
     }
 }

Assets/Scripts/Data/Identifiers/ItemIDs.cs

@@ -25,19 +25,19 @@ namespace BriarQueen.Data.Identifiers
 
     public static class ItemIDs
     {
-        public static readonly IReadOnlyDictionary<PuzzleSlotKey, string> PuzzleSlots =
+        private static readonly IReadOnlyDictionary<PuzzleSlotKey, string> _puzzleSlots =
             new ReadOnlyDictionary<PuzzleSlotKey, string>(
                 new Dictionary<PuzzleSlotKey, string>
                 {
                 });
 
-        public static readonly IReadOnlyDictionary<EnvironmentKey, string> Environment =
+        private static readonly IReadOnlyDictionary<EnvironmentKey, string> _environment =
             new ReadOnlyDictionary<EnvironmentKey, string>(
                 new Dictionary<EnvironmentKey, string>
                 {
                 });
 
-        public static readonly IReadOnlyDictionary<ItemKey, string> Pickups =
+        private static readonly IReadOnlyDictionary<ItemKey, string> _pickups =
             new ReadOnlyDictionary<ItemKey, string>(
                 new Dictionary<ItemKey, string>
                 {
@@ -48,37 +48,37 @@ namespace BriarQueen.Data.Identifiers
 
         public static string Get(ItemKey key)
         {
-            return Pickups.TryGetValue(key, out var id) ? id : string.Empty;
+            return _pickups.TryGetValue(key, out var id) ? id : string.Empty;
         }
 
         public static string Get(EnvironmentKey key)
         {
-            return Environment.TryGetValue(key, out var id) ? id : string.Empty;
+            return _environment.TryGetValue(key, out var id) ? id : string.Empty;
         }
 
         public static string Get(PuzzleSlotKey key)
         {
-            return PuzzleSlots.TryGetValue(key, out var id) ? id : string.Empty;
+            return _puzzleSlots.TryGetValue(key, out var id) ? id : string.Empty;
         }
 
         public static bool TryGet(ItemKey key, out string id)
         {
-            return Pickups.TryGetValue(key, out id);
+            return _pickups.TryGetValue(key, out id);
         }
 
         public static bool TryGet(EnvironmentKey key, out string id)
         {
-            return Environment.TryGetValue(key, out id);
+            return _environment.TryGetValue(key, out id);
         }
 
         public static bool TryGet(PuzzleSlotKey key, out string id)
         {
-            return PuzzleSlots.TryGetValue(key, out id);
+            return _puzzleSlots.TryGetValue(key, out id);
         }
 
         public static IEnumerable<string> GetAllItemIDs()
         {
-            return Pickups.Values;
+            return _pickups.Values;
         }
     }
 }

Assets/Scripts/Data/Identifiers/PuzzleIdentifiers.cs

@@ -1,23 +1,30 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 namespace BriarQueen.Data.Identifiers
 {
     public enum PuzzleKey
     {
-        AshwickMarketGate,
+        AshwickOutskirtsGate,
     }
 
     public static class PuzzleIdentifiers
     {
-        public static readonly Dictionary<PuzzleKey, string> AllPuzzles = new()
+        private static readonly IReadOnlyDictionary<PuzzleKey, string> _allPuzzles =
+            new ReadOnlyDictionary<PuzzleKey, string>(
+                new Dictionary<PuzzleKey, string>
                 {
-            { PuzzleKey.AshwickMarketGate, "CH1:Puzzle:AshwickMarketGate" },
+                    { PuzzleKey.AshwickOutskirtsGate, "CH1:Puzzle:AshwickOutskirtsGate" },
-        };
+                });
+
+        public static string Get(PuzzleKey key)
+        {
+            return _allPuzzles.TryGetValue(key, out var value) ? value : string.Empty;
+        }
 
-        // Optional helper to get all puzzle IDs
         public static IEnumerable<string> GetAllPuzzleIDs()
         {
-            return AllPuzzles.Values;
+            return _allPuzzles.Values;
         }
     }
 }

Assets/Scripts/Data/Identifiers/SubtitleIdentifiers.cs

@@ -25,7 +25,7 @@ namespace BriarQueen.Data.Identifiers
 
     public static class SubtitleIdentifiers
     {
-        public static readonly IReadOnlyDictionary<SubtitleKey, SubtitleEntry> Subtitles =
+        private static readonly IReadOnlyDictionary<SubtitleKey, SubtitleEntry> _subtitles =
             new ReadOnlyDictionary<SubtitleKey, SubtitleEntry>(
                 new Dictionary<SubtitleKey, SubtitleEntry>
                 {
@@ -34,22 +34,22 @@ namespace BriarQueen.Data.Identifiers
 
         public static bool TryGet(SubtitleKey key, out SubtitleEntry entry)
         {
-            return Subtitles.TryGetValue(key, out entry);
+            return _subtitles.TryGetValue(key, out entry);
         }
 
         public static string GetText(SubtitleKey key)
         {
-            return Subtitles.TryGetValue(key, out var entry) ? entry.Text : string.Empty;
+            return _subtitles.TryGetValue(key, out var entry) ? entry.Text : string.Empty;
         }
 
         public static float GetPreferredDuration(SubtitleKey key)
         {
-            return Subtitles.TryGetValue(key, out var entry) ? entry.PreferredDurationSeconds : 0f;
+            return _subtitles.TryGetValue(key, out var entry) ? entry.PreferredDurationSeconds : 0f;
         }
 
         public static IEnumerable<SubtitleKey> GetAllKeys()
         {
-            return Subtitles.Keys;
+            return _subtitles.Keys;
         }
     }
 }

Assets/Scripts/Data/Identifiers/ToolID.cs

@@ -6,8 +6,6 @@ namespace BriarQueen.Data.Identifiers
     {
         [DisplayName("Empty Hands")]
         None = 0,
-        [DisplayName("Sharpened Knife")]
-        Knife = 1,
         
     }
     

Assets/Scripts/Data/Identifiers/TutorialPopupID.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 namespace BriarQueen.Data.Identifiers
 {
@@ -21,7 +22,9 @@ namespace BriarQueen.Data.Identifiers
 
     public static class TutorialPopupTexts
     {
-        public static readonly Dictionary<TutorialPopupID, string> AllPopups = new()
+        private static readonly IReadOnlyDictionary<TutorialPopupID, string> _allPopups =
+            new ReadOnlyDictionary<TutorialPopupID, string>(
+                new Dictionary<TutorialPopupID, string>
                 {
                     {
                         TutorialPopupID.ReturnToPreviousLevel,
@@ -59,7 +62,6 @@ namespace BriarQueen.Data.Identifiers
                         TutorialPopupID.LeavingPuzzles,
                         "When you leave a puzzle, your progress is saved."
                     },
-
                     {
                         TutorialPopupID.Tools,
                         "You'll find tools as you explore. Try them on different objects. Press '{Show_Tools}' to open your tools."
@@ -76,8 +78,21 @@ namespace BriarQueen.Data.Identifiers
                         TutorialPopupID.ToolCycling,
                         "Press '{Previous_Tool}' or '{Next_Tool}' to cycle through your tools."
                     },
-        };
+                });
 
-        public static IEnumerable<string> GetAllTexts() => AllPopups.Values;
+        public static bool TryGet(TutorialPopupID id, out string text)
+        {
+            return _allPopups.TryGetValue(id, out text);
+        }
+
+        public static string Get(TutorialPopupID id)
+        {
+            return _allPopups.TryGetValue(id, out var value) ? value : string.Empty;
+        }
+
+        public static IEnumerable<string> GetAllTexts()
+        {
+            return _allPopups.Values;
+        }
     }
 }

Assets/Scripts/Framework/Managers/IO/SaveManager.cs

@@ -208,7 +208,7 @@ namespace BriarQueen.Framework.Managers.IO
             CurrentSave = new SaveGame
             {
                 SaveFileName = saveFileName,
-                SaveVersion = "0.0.1a",
+                SaveVersion = Application.version,
                 OpeningCinematicPlayed = false
             };
             IsGameLoaded = true;

Assets/Scripts/Framework/Services/Tutorials/TutorialService.cs

@@ -62,7 +62,7 @@ namespace BriarQueen.Framework.Services.Tutorials
         /// </summary>
         public string ResolveText(TutorialPopupID id)
         {
-            if (!TutorialPopupTexts.AllPopups.TryGetValue(id, out var template))
+            if (!TutorialPopupTexts.TryGet(id, out var template))
                 return string.Empty;
 
             return ResolveText(template);

Assets/Scripts/Game/Cinematics/BaseCinematic.cs

@@ -97,8 +97,8 @@ namespace BriarQueen.Game.Cinematics
 
         private Sequence _skipTextSequence;
 
-        protected EventCoordinator EventCoordinator;
+        protected EventCoordinator _eventCoordinator;
-        protected InputManager InputManager;
+        protected InputManager _inputManager;
 
         protected virtual void Awake()
         {
@@ -116,7 +116,7 @@ namespace BriarQueen.Game.Cinematics
         {
             if (!_isPlaying) return;
             if (!_allowKeyboardEscapeSkipFallback) return;
-            if (InputManager != null) return;
+            if (_inputManager != null) return;
 
             var kb = Keyboard.current;
             if (kb != null && kb.escapeKey.wasPressedThisFrame)
@@ -247,14 +247,14 @@ namespace BriarQueen.Game.Cinematics
 
         protected virtual void BindSkipAction()
         {
-            if (InputManager == null)
+            if (_inputManager == null)
                 return;
 
-            InputManager.BindPauseForSkip(OnSkipPerformed);
+            _inputManager.BindPauseForSkip(OnSkipPerformed);
 
             if (_skipText != null)
             {
-                var inputType = InputManager.DeviceInputType;
+                var inputType = _inputManager.DeviceInputType;
                 switch (inputType)
                 {
                     case DeviceInputType.KeyboardAndMouse:
@@ -278,10 +278,10 @@ namespace BriarQueen.Game.Cinematics
 
         protected virtual void UnbindSkipAction()
         {
-            if (InputManager == null)
+            if (_inputManager == null)
                 return;
 
-            InputManager.ResetPauseBind(OnSkipPerformed);
+            _inputManager.ResetPauseBind(OnSkipPerformed);
         }
 
         private void OnSkipPerformed(InputAction.CallbackContext _)
@@ -535,7 +535,7 @@ namespace BriarQueen.Game.Cinematics
         {
             StopSkipTextTween();
 
-            if (EventCoordinator != null)
+            if (_eventCoordinator != null)
             {
                 if (_cinematicCanvasGroup != null)
                 {
@@ -544,7 +544,7 @@ namespace BriarQueen.Game.Cinematics
                     _cinematicCanvasGroup.alpha = 1f;
                 }
 
-                EventCoordinator.PublishImmediate(new FadeEvent(false, 1f));
+                _eventCoordinator.PublishImmediate(new FadeEvent(false, 1f));
 
                 return;
             }
@@ -679,8 +679,8 @@ namespace BriarQueen.Game.Cinematics
         [Inject]
         public void Construct(EventCoordinator eventCoordinator, InputManager inputManager)
         {
-            EventCoordinator = eventCoordinator;
+            _eventCoordinator = eventCoordinator;
-            InputManager = inputManager;
+            _inputManager = inputManager;
         }
     }
 }

Assets/Scripts/Game/Items/Zones/TransitionZone.cs

@@ -39,12 +39,12 @@ namespace BriarQueen.Game.Items.HoverZones
         [SerializeField]
         private SFXKey _soundEffectOnClick;
 
-        protected EventCoordinator EventCoordinator;
+        protected EventCoordinator _eventCoordinator;
-        protected LevelManager LevelManager;
+        protected LevelManager _levelManager;
-        protected SaveManager SaveManager;
+        protected SaveManager _saveManager;
-        protected AudioManager AudioManager;
+        protected AudioManager _audioManager;
         
-        protected TutorialService TutorialService;
+        protected TutorialService _tutorialService;
 
         public CanvasGroup CanvasGroup;
 
@@ -76,13 +76,13 @@ namespace BriarQueen.Game.Items.HoverZones
                 var message = !string.IsNullOrEmpty(_lockedInteractText) ? _lockedInteractText 
                     : InteractEventIDs.Get(EnvironmentInteractKey.Locked);
                 
-                EventCoordinator.Publish(new DisplayInteractEvent(message));
+                _eventCoordinator.Publish(new DisplayInteractEvent(message));
                 return;
             }
 
             if (item != null)
             {
-                EventCoordinator.Publish(new DisplayInteractEvent(InteractEventIDs.Get(ItemInteractKey.CantUseItem)));
+                _eventCoordinator.Publish(new DisplayInteractEvent(InteractEventIDs.Get(ItemInteractKey.CantUseItem)));
                 return;
             }
 
@@ -90,17 +90,17 @@ namespace BriarQueen.Game.Items.HoverZones
 
             if (_soundEffectOnClick != SFXKey.None)
             {
-                AudioManager.Play(AudioNameIdentifiers.Get(_soundEffectOnClick));
+                _audioManager.Play(AudioNameIdentifiers.Get(_soundEffectOnClick));
             }
             
-            var loaded = await LevelManager.LoadLevel(levelId);
+            var loaded = await _levelManager.LoadLevel(levelId);
 
             if (!loaded)
             {
-                EventCoordinator.Publish(new DisplayInteractEvent(InteractEventIDs.Get(EnvironmentInteractKey.CantGoThere)));
+                _eventCoordinator.Publish(new DisplayInteractEvent(InteractEventIDs.Get(EnvironmentInteractKey.CantGoThere)));
             }
             
-            TutorialService.DisplayTutorial(TutorialPopupID.ReturnToPreviousLevel);
+            _tutorialService.DisplayTutorial(TutorialPopupID.ReturnToPreviousLevel);
         }
 
         public virtual UniTask EnterHover()
@@ -127,11 +127,11 @@ namespace BriarQueen.Game.Items.HoverZones
         public void Construct(LevelManager levelManager, EventCoordinator eventCoordinator, 
             SaveManager saveManager, AudioManager audioManager, TutorialService tutorialService)
         {
-            LevelManager = levelManager;
+            _levelManager = levelManager;
-            EventCoordinator = eventCoordinator;
+            _eventCoordinator = eventCoordinator;
-            SaveManager = saveManager;
+            _saveManager = saveManager;
-            AudioManager = audioManager;    
+            _audioManager = audioManager;    
-            TutorialService = tutorialService;
+            _tutorialService = tutorialService;
         }
     }
 }

Assets/Scripts/Game/Puzzles/ChapterOne/AshwickHallow/AshwickGateKeypadPuzzle.cs

@@ -16,6 +16,7 @@ using PrimeTween;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using VContainer;
 
@@ -29,8 +30,8 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
 
     public class AshwickGateKeypadPuzzle : BasePuzzle, IPuzzleStateful, IUIWindow, IUIBackHandler, IUIOverlayHost
     {
-        private const string CorrectCode = "312";
+        private const string CORRECT_CODE = "312";
-        private const int RequiredDigits = 3;
+        private const int REQUIRED_DIGITS = 3;
 
         [Header("Scene References")]
         [SerializeField] private AshwickOutskirts _outskirts;
@@ -50,7 +51,7 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
 
         [SerializeField] private TweenSettings _panelFadeTweenSettings = new()
         {
-            duration        = 1.5f,
+            duration        = 0.8f,
             ease            = Ease.OutQuad,
             useUnscaledTime = true
         };
@@ -71,7 +72,7 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
         private TutorialService _tutorialService;
         private UIManager _uiManager;
 
-        public override string PuzzleID => PuzzleIdentifiers.AllPuzzles[PuzzleKey.AshwickMarketGate];
+        public override string PuzzleID => PuzzleIdentifiers.Get(PuzzleKey.AshwickOutskirtsGate);
         public bool IsCompleted => _isCompleted || SaveManager.GetLevelFlag(LevelFlag.AshwickGateOpen);
         public WindowType WindowType => WindowType.AshwickGateKeypadWindow;
         public UIPauseBehavior PauseBehavior => UIPauseBehavior.OpenPauseOverlay;
@@ -161,11 +162,12 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
                 var restored = MemoryPackSerializer.Deserialize<AshwickGateKeypadPuzzleState>(state);
                 _currentDigits = restored?.Digits ?? string.Empty;
 
-                if (_currentDigits.Length > RequiredDigits)
+                if (_currentDigits.Length > REQUIRED_DIGITS)
-                    _currentDigits = _currentDigits[..RequiredDigits];
+                    _currentDigits = _currentDigits[..REQUIRED_DIGITS];
             }
 
             SyncDisplay();
+            ResetFeedbackState();
             return UniTask.CompletedTask;
         }
 
@@ -178,7 +180,7 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
             _currentDigits = string.Empty;
             SyncDisplay();
 
-            SaveManager.SetPuzzleCompleted(PuzzleKey.AshwickMarketGate, true, requestSave: false);
+            SaveManager.SetPuzzleCompleted(PuzzleKey.AshwickOutskirtsGate, true, requestSave: false);
             _skipSaveOnHide = true;
             _uiManager?.CloseWindow(WindowType);
             AudioManager.Play(AudioNameIdentifiers.Get(SFXKey.AshwickGateOpening));
@@ -195,6 +197,7 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
 
             SetPanelState(0f, false, true);
             SyncDisplay();
+            ResetFeedbackState();
             EnsureExclusiveRaycaster();
 
             try
@@ -229,6 +232,7 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
 
             _isOpen = false;
             ResetPanelTween();
+            ResetFeedbackState();
 
             if (_panelGroup != null)
             {
@@ -349,13 +353,16 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
 
         private void OnDigitPressed(int digit)
         {
-            if (_isEvaluating || IsCompleted || !_isOpen || _currentDigits.Length >= RequiredDigits)
+            if (_isEvaluating || IsCompleted || !_isOpen || _currentDigits.Length >= REQUIRED_DIGITS)
                 return;
 
+            if (_currentDigits.Length == 0)
+                ResetFeedbackState();
+
             _currentDigits += digit.ToString();
             SyncDisplay();
 
-            if (_currentDigits.Length == RequiredDigits)
+            if (_currentDigits.Length == REQUIRED_DIGITS)
                 EvaluateCode().Forget();
         }
 
@@ -366,7 +373,7 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
             if (_panelGroup != null)
                 _panelGroup.interactable = false;
 
-            if (_currentDigits == CorrectCode)
+            if (_currentDigits == CORRECT_CODE)
             {
                 if (_statusGlow != null)
                 {
@@ -438,6 +445,21 @@ namespace BriarQueen.Game.Puzzles.ChapterOne.AshwickHallow
             _displayField.text = _currentDigits;
         }
 
+        private void ResetFeedbackState()
+        {
+            _statusGlow?.TurnOff().Forget();
+            ResetCloseButtonSelection();
+        }
+
+        private void ResetCloseButtonSelection()
+        {
+            if (_closeButton == null || EventSystem.current == null)
+                return;
+
+            if (EventSystem.current.currentSelectedGameObject == _closeButton.gameObject)
+                EventSystem.current.SetSelectedGameObject(null);
+        }
+
         private void SetPanelState(float alpha, bool interactable, bool blocksRaycasts)
         {
             if (_panelGroup == null)

Assets/Scripts/UI/HUD/CursorTooltip.cs

@@ -270,7 +270,6 @@ namespace BriarQueen.UI.HUD
             return toolID switch
             {
                 ToolID.None => string.Empty,
-                ToolID.Knife => "Knife",
                 _ => toolID.ToString()
             };
         }

ProjectSettings/ProjectSettings.asset

@@ -12,7 +12,7 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: DefaultCompany
+  companyName: Porta Interactive
   productName: BriarQueen
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
@@ -144,7 +144,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 0.1.0
+  bundleVersion: 0.2.0-build
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 11400000, guid: 1d6ed6270200a436ab407f74dc7890af, type: 2}