@@ -14121,10 +14121,7 @@ function makeDialogTable()
1412114121end
1412214122
1412314123function getDialogPortrait()
14124- if worldNPCDialogPortrait == nil or worldNPCDialogPortrait == 'NONE' then
14125- return 'NOPORTLS'
14126- end
14127- if worldNPCDialogPortrait:sub(-1) == 'S' then
14124+ if worldNPCDialogPortrait ~= nil and worldNPCDialogPortrait:sub(-1) == 'S' then
1412814125 for _, entry in ipairs(Infinity_GetFilesOfType("BMP")) do
1412914126 if entry[1] == worldNPCDialogPortrait:sub(1, -2) .. 'M' then
1413014127 return entry[1]
@@ -21759,8 +21756,13 @@ function updateJournalEntry(journalId, recvTime, stateType, chapter, timeStamp)
2175921756 --NOTE this can be placed in a loop if there needs to be more than quest to an entry
2176021757 --this would just mean entryToQuest returns a table that we iterate over
2176121758 local questId = entryToQuest[journalId]
21762- if questId == nil then
21759+ if questId == nil or stateType == const.ENTRY_TYPE_INFO then
2176321760 --add loose entries into the looseEntries table so they still get displayed.
21761+ for _,entry in pairs(looseEntries) do
21762+ if entry.text == journalId then
21763+ return
21764+ end
21765+ end
2176421766 local entry = buildEntry(journalId, recvTime, stateType, chapter, timeStamp)
2176521767 table.insert(looseEntries,entry)
2176621768
@@ -21831,12 +21833,6 @@ function updateJournalEntry(journalId, recvTime, stateType, chapter, timeStamp)
2183121833 --sort the objectives.
2183221834 table.sort(quest.objectives,compareByRecvTime)
2183321835
21834- if stateType == const.ENTRY_TYPE_INFO then
21835- --add loose entries into the looseEntries table so they still get displayed.
21836- local entry = buildEntry(journalId, recvTime, stateType, chapter, timeStamp)
21837- table.insert(looseEntries,entry)
21838- end
21839-
2184021836 --update display data
2184121837 buildQuestDisplay()
2184221838end
0 commit comments