Skip to content

Added missing emotions from new league #2272

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.

Sign up for GitHub

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

Merged
LocalIdentity merged 1 commit into from
Jun 26, 2026
+10 −3
Merged

Added missing emotions from new league #2272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions src/Classes/NotableDBControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ local m_floor = math.floor
local m_huge = math.huge
local s_format = string.format

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

---@param node table
---@return boolean
Expand All @@ -22,7 +22,7 @@ end

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

local emotionCheckBoxes = {}
for i,emo in ipairs(emotionList) do
local emoCtl = emoCheck(emo, emotionCheckBoxes[i-1] or self.controls.emotionLabel)
local emoCtl
if i == 11 then
local ctl = new("CheckBoxControl", {"TOPLEFT", emotionCheckBoxes[1], "BOTTOMLEFT"}, {0, 2, 26, 26}, "", emoCheckOnChange(emo), "Distilled "..emo, true)
if self.emotionImages then ctl:SetCheckImage(self.emotionImages[emo]) end
emoCtl = ctl
else
emoCtl = emoCheck(emo, emotionCheckBoxes[i-1] or self.controls.emotionLabel)
end
emotionCheckBoxes[i] = emoCtl
self.controls["emotionCheckbox"..emo] = emoCtl
end
Expand Down
Loading