@@ -14121,10 +14121,7 @@ function makeDialogTable()
14121
14121
end
14122
14122
14123
14123
function 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
14128
14125
for _, entry in ipairs(Infinity_GetFilesOfType("BMP")) do
14129
14126
if entry[1] == worldNPCDialogPortrait:sub(1, -2) .. 'M' then
14130
14127
return entry[1]
@@ -21759,8 +21756,13 @@ function updateJournalEntry(journalId, recvTime, stateType, chapter, timeStamp)
21759
21756
--NOTE this can be placed in a loop if there needs to be more than quest to an entry
21760
21757
--this would just mean entryToQuest returns a table that we iterate over
21761
21758
local questId = entryToQuest[journalId]
21762
- if questId == nil then
21759
+ if questId == nil or stateType == const.ENTRY_TYPE_INFO then
21763
21760
--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
21764
21766
local entry = buildEntry(journalId, recvTime, stateType, chapter, timeStamp)
21765
21767
table.insert(looseEntries,entry)
21766
21768
@@ -21831,12 +21833,6 @@ function updateJournalEntry(journalId, recvTime, stateType, chapter, timeStamp)
21831
21833
--sort the objectives.
21832
21834
table.sort(quest.objectives,compareByRecvTime)
21833
21835
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
-
21840
21836
--update display data
21841
21837
buildQuestDisplay()
21842
21838
end
0 commit comments