feat: add interactions to Loading Docs (#75)

Author: aarthificial

Assets/DevTools/CSV/CsvConverter.cs

@@ -80,7 +80,6 @@ Object context
       _lookup.Add("is_RT_present", InteractionContext.IsRTPresent);
       _lookup.Add("call_other", InteractionContext.CallOther);
       _lookup.Add("enter", InteractionContext.Enter);
-      _lookup.Add("available_item", InteractionContext.AvailableItem);
       _lookup.Add("LT_item", InteractionContext.LTItem);
       _lookup.Add("RT_item", InteractionContext.RTItem);
 
@@ -155,9 +154,11 @@ Object context
         try {
           switch (cells.Type()) {
             case "fact":
-            case "item":
               CreateFactEntry(cells, previous);
               break;
+            case "item":
+              CreateItemEntry(cells, previous);
+              break;
             case "event":
               previous = CreateEventEntry(cells, previous);
               break;
@@ -209,6 +210,18 @@ BaseEntry previous
       return entry;
     }
 
+    private static BaseEntry CreateItemEntry(
+      List<string> cells,
+      BaseEntry previous
+    ) {
+      var entry = _lookup[cells.Key()].GetEntry();
+      BeginConversion(entry, cells, previous);
+      entry.Scope = InteractionContext.InteractionScope;
+      EndConversion(entry);
+
+      return entry;
+    }
+
     private static BaseEntry CreateEventEntry(
       List<string> cells,
       BaseEntry previous

Assets/Environment/Floodlight.cs

@@ -0,0 +1,43 @@
+using Aarthificial.Typewriter;
+using Aarthificial.Typewriter.Attributes;
+using Aarthificial.Typewriter.Entries;
+using Aarthificial.Typewriter.References;
+using Aarthificial.Typewriter.Tools;
+using Interactions;
+using Typewriter;
+using UnityEngine;
+using Utils;
+
+namespace Environment {
+  public class Floodlight : MonoBehaviour {
+    [SerializeField]
+    [EntryFilter(BaseType = typeof(ItemEntry), AllowEmpty = true)]
+    private EntryReference _itemFilter;
+    [SerializeField]
+    [EntryFilter(Variant = EntryVariant.Fact)]
+    private EntryReference _turnedOnFact;
+    [SerializeField] private Interactable _interactable;
+    [SerializeField] private Light[] _lights;
+
+    private TypewriterWatcher _watcher;
+    private Cached<bool> _turnedOn;
+
+    private void Update() {
+      if (!_watcher.ShouldUpdate()
+        || !_turnedOn.HasChanged(_interactable.Context.Get(_itemFilter) == 1)) {
+        return;
+      }
+
+      _interactable.Context.Set(_turnedOnFact, _turnedOn.Value ? 1 : 0);
+      if (_turnedOn) {
+        foreach (var lightItem in _lights) {
+          lightItem.enabled = true;
+        }
+      } else {
+        foreach (var lightItem in _lights) {
+          lightItem.enabled = false;
+        }
+      }
+    }
+  }
+}

Assets/Environment/Floodlight.cs.meta

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acbd653f24bbf426fc400c61f5153441de47cb50cb778977a6e7a2c045ad349e
+oid sha256:ddc66bfc6cacf3ee21f487e9be36e8dbf5530427b6af225826f71765c2c65c00
 size 20796

Assets/Environment/Models/Kiosk.fbx

@@ -0,0 +1,40 @@
+using Aarthificial.Typewriter;
+using Aarthificial.Typewriter.Attributes;
+using Aarthificial.Typewriter.Entries;
+using Aarthificial.Typewriter.References;
+using Aarthificial.Typewriter.Tools;
+using Framework;
+using UnityEngine;
+using Utils.Tweening;
+
+namespace Environment {
+  public class SecurityKiosk : MonoBehaviour {
+    [SerializeField]
+    [EntryFilter(Variant = EntryVariant.Fact)]
+    private EntryReference _doorOpenFact;
+
+    [SerializeField] private Transform _door;
+    [SerializeField] private Vector2 _doorAngles;
+    private SpringTween _doorTween;
+    private TypewriterWatcher _watcher;
+
+    private float CurrentAngle =>
+      App.Game.Story.Get(_doorOpenFact) == 0 ? _doorAngles.x : _doorAngles.y;
+
+    private void Start() {
+      _doorTween.ForceSet(CurrentAngle);
+    }
+
+    private void Update() {
+      if (_watcher.ShouldUpdate()) {
+        _doorTween.Set(CurrentAngle);
+      }
+    }
+
+    private void FixedUpdate() {
+      if (_doorTween.FixedUpdate(SpringConfig.Slow)) {
+        _door.localRotation = Quaternion.Euler(0, _doorTween.X, 0);
+      }
+    }
+  }
+}

Assets/Environment/Prefabs/LoadingDocsWorld.prefab

@@ -1,5 +1,8 @@
 using Aarthificial.Safekeeper;
 using Aarthificial.Safekeeper.Stores;
+using Aarthificial.Typewriter;
+using Aarthificial.Typewriter.Blackboards;
+using Interactions;
 using Saves;
 using System;
 using System.Collections;
@@ -9,7 +12,7 @@
 using Utils;
 
 namespace Framework {
-  public class StoryState : GameState {
+  public class StoryState : GameState, ITypewriterContext {
     [NonSerialized] public bool IsPaused;
     public event Action<bool> LoadingChanged;
     public event Action Paused;
@@ -136,5 +139,15 @@ public void AutoSave() {
     public void Save() {
       _saveScene = true;
     }
+
+    public bool TryGetBlackboard(int scope, out IBlackboard blackboard) {
+      if (scope == InteractionContext.GlobalScope) {
+        blackboard = _saveController.GlobalData.Blackboard;
+        return true;
+      }
+
+      blackboard = default;
+      return false;
+    }
   }
 }

Assets/Environment/SecurityKiosk.cs

@@ -1,11 +1,7 @@
 using Aarthificial.Typewriter;
-using Aarthificial.Typewriter.Attributes;
-using Aarthificial.Typewriter.References;
 using Cinemachine;
 using Framework;
-using Items;
 using Player;
-using Typewriter;
 using UnityEngine;
 using Utils;
 using View.Overlay;
@@ -30,18 +26,14 @@ InteractionWaypoint waypoint
     }
 
     public InteractionWaypoint[] Waypoints;
-    [EntryFilter(BaseType = typeof(ItemEntry), AllowEmpty = true)]
-    public EntryReference Item;
 
     private PlayerLookup<Interaction> _interactions;
 
     [SerializeField] private CinemachineVirtualCamera _cameraTemplate;
     [SerializeField] private float _orthoSize = 4;
     [SerializeField] private InteractionArea _area;
-    [SerializeField] private Transform _itemTransform;
 
     private CinemachineVirtualCamera _camera;
-    private Item _itemInstance;
     private Camera _mainCamera;
 
     protected override void Awake() {
@@ -62,13 +54,6 @@ protected override void Awake() {
       _camera.Priority = 100;
       _camera.m_Lens.OrthographicSize = _orthoSize;
       _camera.gameObject.SetActive(false);
-
-      Context.Set(InteractionContext.AvailableItem, Item);
-    }
-
-    protected override void Start() {
-      TryInstantiateItem();
-      base.Start();
     }
 
     private void Update() {
@@ -255,32 +240,6 @@ private int IsPresent(PlayerController player) {
       return -1;
     }
 
-    public override void UseItem(EntryReference item) {
-      base.UseItem(item);
-      Item = item;
-      TryInstantiateItem();
-    }
-
-    public override EntryReference PickUpItem() {
-      base.PickUpItem();
-      if (_itemInstance != null) {
-        Destroy(_itemInstance.gameObject);
-        _itemInstance = null;
-      }
-
-      return Item;
-    }
-
-    protected override void LoadBlackboard() {
-      Item = Context.Get(InteractionContext.AvailableItem);
-    }
-
-    private void TryInstantiateItem() {
-      if (Item.TryGetEntry(out ItemEntry itemEntry)) {
-        _itemInstance = Instantiate(itemEntry.Prefab, _itemTransform);
-      }
-    }
-
     private void UpdateGizmo() {
       var ltPosition =
         (Vector2)_mainCamera.WorldToScreenPoint(Players.LT.transform.position);

Assets/Environment/SecurityKiosk.cs.meta

@@ -2,13 +2,16 @@
 using Aarthificial.Safekeeper.Attributes;
 using Aarthificial.Safekeeper.Stores;
 using Aarthificial.Typewriter;
+using Aarthificial.Typewriter.Attributes;
 using System;
 using Aarthificial.Typewriter.Blackboards;
 using Aarthificial.Typewriter.References;
 using Aarthificial.Typewriter.Tools;
 using Player;
 using Saves;
+using Typewriter;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace Interactions {
   public class Interactable : MonoBehaviour, ISaveStore {
@@ -25,6 +28,10 @@ public class Interactable : MonoBehaviour, ISaveStore {
     [NonSerialized] public EntryReference Listener;
     public InteractionGizmo Gizmo;
     public TypewriterEvent Event;
+    [SerializeField]
+    [FormerlySerializedAs("Item")]
+    [EntryFilter(BaseType = typeof(ItemEntry), AllowEmpty = true)]
+    private EntryReference _initialItem;
 
     public Blackboard Blackboard = new();
     public InteractionContext Context;
@@ -49,8 +56,8 @@ private void OnDisable() {
 
     public void OnLoad(SaveControllerBase save) {
       Context.Global = ((SaveController)save).GlobalData.Blackboard;
-      if (save.Data.Read(_id, Blackboard)) {
-        LoadBlackboard();
+      if (!save.Data.Read(_id, Blackboard) && _initialItem.HasValue) {
+        Context.Set(_initialItem, 1);
       }
     }
 
@@ -89,19 +96,14 @@ public virtual void OnDialogueExit() {
       OnStateChanged();
     }
 
-    protected virtual void OnStateChanged() {
+    protected void OnStateChanged() {
       StateChanged?.Invoke();
     }
 
-    public virtual void UseItem(EntryReference item) {
-      Blackboard.Set(InteractionContext.AvailableItem, item);
-    }
-
-    public virtual EntryReference PickUpItem() {
-      Blackboard.Set(InteractionContext.AvailableItem, 0);
-      return 0;
+    public void UseItem(EntryReference item) {
+      if (item.HasValue) {
+        Blackboard.Set(item, 1);
+      }
     }
-
-    protected virtual void LoadBlackboard() { }
   }
 }