replace the NPC scaffold with data-driven prefabs, and retire the builders

NPCStandIn was written to be dropped on a sphere and carried its identity in per-instance public fields. The cost of that showed up in the scene itself: of the two spheres, one was the Bartender and the other was named "Bartender (1)" in the hierarchy while being configured as the Chair — data changed, name never was. Nothing outside the scene could see what existed, and two copies could disagree. Identity now lives in an InteractableDefinition asset and the scene only places a prefab. The migration matched the old objects by yarn node rather than by name, which is the only reason the chair ended up as the chair. InteractableDefinition rather than the planned "character definition": it covers a character and a talkable object equally, so Bartender.prefab sits under Prefabs/Characters and Chair.prefab under Prefabs/Interactables. Three components collapse into one. DialogueInteractable was in no scene at all — a dead trigger-zone variant of the same idea. ClickInteractableBridge existed only to adapt NPCStandIn without modifying it, a constraint that died with NPCStandIn; DialogueInteractor implements IClickInteractable itself. The parts worth keeping were lifted out rather than discarded: WorldSpaceLabel and InteractionPrompt are now normal components on prefab children, so a label can be seen and positioned in the Editor instead of existing only at runtime. InputDeviceTracker moved into NightclubArcadia.Core and gained a namespace, leaving no global-namespace runtime types. Characters get the same pipeline as Skills and Candidates: Assets/Characters/characters.json is the source of truth, CharacterSetup regenerates the definition assets on script reload and removes orphans. Adding an NPC is a JSON entry plus a prefab — no code, and no Unity for the data half. Phase 5.4 deletes the one-shot builders rather than disabling them. UILayerSetup, PlayerControlSetup, UILayerSetupAutoRun and YarnDemoSetup assumed the single-scene layout, had already destroyed a level scene and turned Systems binary once each, and after NPCStandIn went they no longer compiled. The prefabs they used to generate are authored and committed; the wiring knowledge is in those prefabs and in git history. The asset generators — Skill, Candidate, Character — are untouched and still work. EditMode 42/42, PlayMode 7/7, YarnCheck 9 files / 35 nodes. All three scenes still text. Co-Authored-By: Claude Opus 5 <[email protected]>
2026-08-25 21:53:06 +02:00
parent ec4619d9dc
commit 9a0618fd31
54 changed files with 2292 additions and 2195 deletions
@@ -0,0 +1,61 @@
+using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.LowLevel;
+
+namespace NightclubArcadia.Core
+{
+    /// <summary>
+    /// Which input device was most recently active, globally.
+    ///
+    /// InteractionPrompt — and anything else that shows a button glyph — reads Current
+    /// to decide between "[F]", "(X)" and "(✕)".
+    ///
+    /// Requires the Input System package, with Active Input Handling set to
+    /// "Input System Package (New)" or "Both".
+    /// </summary>
+    public static class InputDeviceTracker
+    {
+        public enum DeviceType { Keyboard, Xbox, PlayStation, Generic }
+
+        public static DeviceType Current { get; private set; } = DeviceType.Keyboard;
+
+        [RuntimeInitializeOnLoadMethod]
+        static void Init()
+        {
+            InputSystem.onEvent += OnEvent;
+        }
+
+        static void OnEvent(InputEventPtr eventPtr, InputDevice device)
+        {
+            // Only actual state changes — button, stick, key — not every event.
+            if (!eventPtr.IsA<StateEvent>() && !eventPtr.IsA<DeltaStateEvent>())
+            {
+                return;
+            }
+
+            switch (device)
+            {
+                case Keyboard:
+                case Mouse:
+                    Current = DeviceType.Keyboard;
+                    break;
+
+                case Gamepad pad:
+                    var name = pad.displayName.ToLowerInvariant();
+                    if (name.Contains("dualshock") || name.Contains("dualsense") || name.Contains("playstation"))
+                    {
+                        Current = DeviceType.PlayStation;
+                    }
+                    else if (name.Contains("xbox") || name.Contains("xinput"))
+                    {
+                        Current = DeviceType.Xbox;
+                    }
+                    else
+                    {
+                        Current = DeviceType.Generic;
+                    }
+                    break;
+            }
+        }
+    }
+}