fix: fix call_other and fact scopes (#55)

aarthificial-unity · Sep 28, 2023 · 871181f · 871181f
1 parent 41cda27
commit 871181f
Show file tree

Hide file tree

Showing 4 changed files with 607 additions and 603 deletions.
diff --git a/Assets/DevTools/CSV/CsvConverter.cs b/Assets/DevTools/CSV/CsvConverter.cs
@@ -308,7 +308,7 @@ BaseEntry previous
       _modifications.Clear();
 
       entry.Key = cells.Key();
-      entry.Scope = InteractionContext.InteractionScope;
+      entry.Scope = InteractionContext.GlobalScope;
 
       if (cells.Triggers() != "") {
         _triggers.AddRange(ParseReferences(cells.Triggers()));

diff --git a/Assets/Interactions/Conversation.cs b/Assets/Interactions/Conversation.cs
@@ -71,13 +71,15 @@ private void Update() {
       UpdateInteraction(PlayerType.LT);
       UpdateInteraction(PlayerType.RT);
       UpdateState();
+      UpdateBlackboard();
+      UpdateGizmo();
+    }
 
+    private void UpdateBlackboard() {
       Blackboard.Set(InteractionContext.IsLTPresent, IsPresent(Players.LT));
       Blackboard.Set(InteractionContext.IsRTPresent, IsPresent(Players.RT));
       Blackboard.Set(InteractionContext.Initiator, Initiator);
       Blackboard.Set(InteractionContext.Listener, Listener);
-
-      UpdateGizmo();
     }
 
     private void UpdateInteraction(PlayerType type) {
@@ -158,6 +160,8 @@ public void OnFocusEnter(PlayerController player) {
       } else {
         Listener = player.Fact;
       }
+
+      UpdateBlackboard();
     }
 
     public void OnFocusExit(PlayerController player) {

diff --git a/Assets/Typewriter/Tables/EntryGate.asset b/Assets/Typewriter/Tables/EntryGate.asset