Skip to content

Commit 871181f

Browse files
authored
fix: fix call_other and fact scopes (#55)
1 parent 41cda27 commit 871181f

File tree

4 files changed

+607
-603
lines changed

4 files changed

+607
-603
lines changed

Assets/DevTools/CSV/CsvConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ BaseEntry previous
308308
_modifications.Clear();
309309

310310
entry.Key = cells.Key();
311-
entry.Scope = InteractionContext.InteractionScope;
311+
entry.Scope = InteractionContext.GlobalScope;
312312

313313
if (cells.Triggers() != "") {
314314
_triggers.AddRange(ParseReferences(cells.Triggers()));

Assets/Interactions/Conversation.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,15 @@ private void Update() {
7171
UpdateInteraction(PlayerType.LT);
7272
UpdateInteraction(PlayerType.RT);
7373
UpdateState();
74+
UpdateBlackboard();
75+
UpdateGizmo();
76+
}
7477

78+
private void UpdateBlackboard() {
7579
Blackboard.Set(InteractionContext.IsLTPresent, IsPresent(Players.LT));
7680
Blackboard.Set(InteractionContext.IsRTPresent, IsPresent(Players.RT));
7781
Blackboard.Set(InteractionContext.Initiator, Initiator);
7882
Blackboard.Set(InteractionContext.Listener, Listener);
79-
80-
UpdateGizmo();
8183
}
8284

8385
private void UpdateInteraction(PlayerType type) {
@@ -158,6 +160,8 @@ public void OnFocusEnter(PlayerController player) {
158160
} else {
159161
Listener = player.Fact;
160162
}
163+
164+
UpdateBlackboard();
161165
}
162166

163167
public void OnFocusExit(PlayerController player) {

Assets/Typewriter/Tables/EntryGate.asset

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)