@@ -13916,6 +13916,14 @@ function dragMessagesY(newY)
13916
13916
setQuickLootOffset()
13917
13917
chatboxScrollToBottom = 1
13918
13918
end
13919
+
13920
+ function clean(str)
13921
+ -- remove extra space in front of innate abilities
13922
+ str = str:gsub('(%^%-: %^0x%x%x%x%x%x%x%x%x) ', '%1')
13923
+ -- remove empty name
13924
+ str = str:gsub('%^0x%x%x%x%x%x%x%x%x %^%-: ', '')
13925
+ return str
13926
+ end
13919
13927
`
13920
13928
menu
13921
13929
{
@@ -13963,7 +13971,7 @@ menu
13963
13971
label
13964
13972
{
13965
13973
area 0 0 816 -1
13966
- text lua "combatLog[rowNumber]"
13974
+ text lua "clean( combatLog[rowNumber]) "
13967
13975
text style "normal"
13968
13976
}
13969
13977
}
@@ -14085,7 +14093,7 @@ function getDialogText(row)
14085
14093
idx2 = idx2 - 1
14086
14094
end
14087
14095
14088
- return trim(row == 1 and worldMessageBoxText:sub(1, idx1) or worldMessageBoxText:sub(idx1 + 1))
14096
+ return clean( trim(row == 1 and worldMessageBoxText:sub(1, idx1) or worldMessageBoxText:sub(idx1 + 1) ))
14089
14097
end
14090
14098
14091
14099
function B3Split(inputstr, sep)
@@ -16147,7 +16155,10 @@ function specialistFrame(num)
16147
16155
return 0
16148
16156
end
16149
16157
function specialistOrSelectedFrame(num)
16150
- if chargen.choose_spell[rowNumber].enabled or chargen.choose_spell[rowNumber].known then
16158
+ if chargen.choose_spell[rowNumber].known then
16159
+ return 4
16160
+ end
16161
+ if chargen.choose_spell[rowNumber].enabled then
16151
16162
return 2
16152
16163
end
16153
16164
return specialistFrame(num)
@@ -21692,25 +21703,23 @@ function createEntry(questId, objectiveId, entryId, previousObjectives, subGroup
21692
21703
table.insert(subGroups[subGroup],entry)
21693
21704
end
21694
21705
21695
- --This code is different if we're sod or BG
21696
21706
local lineCount = 1
21697
21707
local fullStr = Infinity_FetchString(entryId)
21698
21708
for line in string.gmatch(fullStr, "[^\r\n]+") do
21699
21709
if(lineCount == 1) then
21700
21710
--objective text is first line.
21701
21711
objective.text = line
21702
- end
21703
- if(lineCount > 1) then
21712
+ else
21704
21713
--entry text is everything after first
21705
21714
entry.text = entry.text .. line .. "\n"
21706
21715
end
21707
21716
lineCount = lineCount + 1
21717
+ if(line:sub(-1) == ".") then break end
21708
21718
end
21709
21719
if(lineCount == 2) then
21710
21720
--it looks like sometimes entries are just an unbroken paragraph
21711
21721
--in this case the entry should get the paragraph and the objective gets nothing
21712
- --note lineCount == 2 is a bit misleading, there's only one line in this case.
21713
- entry.text = objective.text
21722
+ entry.text = fullStr
21714
21723
objective.text = Infinity_FetchString(quest.text)
21715
21724
end
21716
21725
objective.entries = {entry}
0 commit comments