Restructured for new direction.

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

@@ -2,8 +2,11 @@ using BriarQueen.Data.Identifiers;
 using BriarQueen.Framework.Coordinators.Events;
 using BriarQueen.Framework.Events.Save;
 using BriarQueen.Framework.Events.UI;
+using BriarQueen.Framework.Managers.Input;
 using BriarQueen.Framework.Managers.IO;
 using BriarQueen.Framework.Services.Settings;
+using System.Text.RegularExpressions;
+using UnityEngine.InputSystem;
 using VContainer;
 
 namespace BriarQueen.Framework.Services.Tutorials
@@ -11,23 +14,26 @@ namespace BriarQueen.Framework.Services.Tutorials
     public class TutorialService
     {
         private readonly EventCoordinator _eventCoordinator;
-        private readonly SettingsService _settingsService;
-        private readonly SaveManager _saveManager;
+        private readonly SettingsService  _settingsService;
+        private readonly SaveManager      _saveManager;
+        private readonly InputManager     _inputManager;
 
         [Inject]
         public TutorialService(
             EventCoordinator eventCoordinator,
-            SettingsService settingsService,
-            SaveManager saveManager)
+            SettingsService  settingsService,
+            SaveManager      saveManager,
+            InputManager     inputManager)
         {
             _eventCoordinator = eventCoordinator;
-            _settingsService = settingsService;
-            _saveManager = saveManager;
+            _settingsService  = settingsService;
+            _saveManager      = saveManager;
+            _inputManager     = inputManager;
         }
 
         public void DisplayTutorial(TutorialPopupID tutorialPopupID)
         {
-            var save = _saveManager.CurrentSave;
+            var save         = _saveManager.CurrentSave;
             var tutorialVars = save?.PersistentVariables?.TutorialPopupVariables;
 
             if (tutorialVars == null)
@@ -39,9 +45,60 @@ namespace BriarQueen.Framework.Services.Tutorials
             tutorialVars.MarkDisplayed(tutorialPopupID);
 
             if (_settingsService.AreTutorialsEnabled())
-                _eventCoordinator.Publish(new DisplayTutorialPopupEvent(tutorialPopupID));
+            {
+                var resolvedText = ResolveText(tutorialPopupID);
+                _eventCoordinator.Publish(new DisplayTutorialPopupEvent(tutorialPopupID, resolvedText));
+            }
 
             _eventCoordinator.PublishImmediate(new RequestGameSaveEvent());
         }
+
+        // ── Text resolution ───────────────────────────────────────────
+
+        /// <summary>
+        /// Resolves {ActionName} tokens in the tutorial text for the given ID
+        /// to the current binding display string for that action.
+        /// Hotswap-safe — reads the current control scheme at call time.
+        /// </summary>
+        public string ResolveText(TutorialPopupID id)
+        {
+            if (!TutorialPopupTexts.AllPopups.TryGetValue(id, out var template))
+                return string.Empty;
+
+            return ResolveText(template);
+        }
+
+        /// <summary>
+        /// Resolves {ActionName} tokens in an arbitrary string to the current
+        /// binding display string for that action.
+        /// </summary>
+        public string ResolveText(string template)
+        {
+            if (string.IsNullOrWhiteSpace(template))
+                return template;
+
+            return Regex.Replace(template, @"\{(\w+)\}", match =>
+            {
+                var actionName = match.Groups[1].Value;
+                var binding    = GetBindingDisplayString(actionName);
+                return string.IsNullOrWhiteSpace(binding) ? match.Value : binding;
+            });
+        }
+
+        /// <summary>
+        /// Returns the display string for a named action's current binding,
+        /// matched to the active control scheme.
+        /// </summary>
+        public string GetBindingDisplayString(string actionName)
+        {
+            if (_inputManager == null) return string.Empty;
+
+            var action = _inputManager.GetAction(actionName);
+            if (action == null) return string.Empty;
+
+            var displayString = action.GetBindingDisplayString(group: _inputManager.CurrentControlScheme);
+
+            return string.IsNullOrWhiteSpace(displayString) ? string.Empty : displayString;
+        }
     }
 }