Skip to content
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.

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

Fix inconsistency in NPC answers about a person and their location #2713

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
22 changes: 22 additions & 0 deletions Assets/Scripts/Game/TalkManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,28 @@ NPCKnowledgeAboutItem GetNPCKnowledgeAboutItem(ListItem listItem)
return NPCKnowledgeAboutItem.KnowsAboutItem;
}

// Fixed from classic: an NPC who is no aware of the location of a quest building
// where a quest person is located obviously can't know the person location
if (listItem.questionType == QuestionType.Person && currentKeySubjectBuildingKey != -1)
{
foreach (ListItem buildingGroupListItem in listTopicLocation)
{
ListItem buildingListItem = buildingGroupListItem.listChildItems.Find(x => x.buildingKey == currentKeySubjectBuildingKey);
if (buildingListItem != null)
{
// Set the NPC knowledge about the building if it has not been set yet
if (buildingListItem.npcKnowledgeAboutItem == NPCKnowledgeAboutItem.NotSet)
buildingListItem.npcKnowledgeAboutItem = GetNPCKnowledgeAboutItem(buildingListItem);

if (buildingListItem.npcKnowledgeAboutItem == NPCKnowledgeAboutItem.DoesNotKnowAboutItem)
return NPCKnowledgeAboutItem.DoesNotKnowAboutItem;

// Found the building, no need to continue
break;
}
}
}

// Make roll result be the same every time for a given NPC
if (currentNPCType == NPCType.Mobile)
DFRandom.Seed = (uint)lastTargetMobileNPC.GetHashCode();
Expand Down