Skip to content

fix: fix call_other and fact scopes #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2023
Merged

fix: fix call_other and fact scopes #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/DevTools/CSV/CsvConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
8 changes: 6 additions & 2 deletions Assets/Interactions/Conversation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -158,6 +160,8 @@ public void OnFocusEnter(PlayerController player) {
} else {
Listener = player.Fact;
}

UpdateBlackboard();
}

public void OnFocusExit(PlayerController player) {
Expand Down
34 changes: 17 additions & 17 deletions Assets/Typewriter/Tables/EntryGate.asset
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading