cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

master #3

Open
cacahuetes wants to merge 653 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 653 Files Changed 1490 +9 -1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b9061b3190 - Show all commits

3
Questionable/Controller/Steps/Interactions/Interact.cs
View File

@ -28,6 +28,9 @@ internal static class Interact
if (step.Emote != null) if (step.Emote != null)
yield break; yield break;
if (step.ChatMessage != null)
yield break;
if (step.DataId == null) if (step.DataId == null)
yield break; yield break;
} }

7
Questionable/Controller/Steps/Interactions/Say.cs
View File

@ -17,7 +17,12 @@ internal static class Say
{ {
public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step) public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
{ {
if (step.InteractionType != EInteractionType.Say) if (step.InteractionType is EInteractionType.AcceptQuest or EInteractionType.CompleteQuest)
{
if (step.ChatMessage == null)
return [];
}
else if (step.InteractionType != EInteractionType.Say)
return []; return [];