master #4

Merged
cacahuetes merged 75 commits from liza/Questionable:master into master 2024-09-02 21:50:11 +00:00
2 changed files with 9 additions and 1 deletions
Showing only changes of commit b9061b3190 - Show all commits

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;
} }

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 [];