Skip to content

Commit f235464

Browse files
committed
Added missing emotions from new league and extended anoint gui to accomodate them
1 parent de56576 commit f235464

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

src/Classes/NotableDBControl.lua

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local m_floor = math.floor
1212
local m_huge = math.huge
1313
local s_format = string.format
1414

15-
local emotionList = {"Ire", "Guilt", "Greed", "Paranoia", "Envy", "Disgust", "Despair", "Fear", "Suffering", "Isolation" }
15+
local emotionList = {"Ire", "Guilt", "Greed", "Paranoia", "Envy", "Disgust", "Despair", "Fear", "Suffering", "Isolation", "Contempt", "Ferocity", "Melancholy"}
1616

1717
---@param node table
1818
---@return boolean
@@ -22,7 +22,7 @@ end
2222

2323
---@class NotableDBControl : ListControl
2424
local NotableDBClass = newClass("NotableDBControl", "ListControl", function(self, anchor, rect, itemsTab, db, dbType)
25-
local headerHeight = 68
25+
local headerHeight = 96
2626
local innerRect = {rect[1], rect[2]+headerHeight, rect[3], rect[4]-headerHeight}
2727
self.ListControl(anchor, innerRect, 16, "VERTICAL", false)
2828
self.itemsTab = itemsTab
@@ -77,7 +77,14 @@ local NotableDBClass = newClass("NotableDBControl", "ListControl", function(self
7777

7878
local emotionCheckBoxes = {}
7979
for i,emo in ipairs(emotionList) do
80-
local emoCtl = emoCheck(emo, emotionCheckBoxes[i-1] or self.controls.emotionLabel)
80+
local emoCtl
81+
if i == 11 then
82+
local ctl = new("CheckBoxControl", {"TOPLEFT", emotionCheckBoxes[1], "BOTTOMLEFT"}, {0, 2, 26, 26}, "", emoCheckOnChange(emo), "Distilled "..emo, true)
83+
if self.emotionImages then ctl:SetCheckImage(self.emotionImages[emo]) end
84+
emoCtl = ctl
85+
else
86+
emoCtl = emoCheck(emo, emotionCheckBoxes[i-1] or self.controls.emotionLabel)
87+
end
8188
emotionCheckBoxes[i] = emoCtl
8289
self.controls["emotionCheckbox"..emo] = emoCtl
8390
end

0 commit comments

Comments
 (0)