Skip to content

implement attributes for all non-Joker objects #1371

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

Open
vitellaryjr wants to merge 6 commits into
base: main
Choose a base branch
from
+543 −56
Open

implement attributes for all non-Joker objects #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e36cf38
implement attributes for all non-Joker objects
vitellaryjr May 8, 2026
a21584d
i just completely forgot planet cards
vitellaryjr May 8, 2026
0d3cede
add more attributes to gift card
vitellaryjr May 8, 2026
f31c886
adjust attributes a bit more
vitellaryjr May 9, 2026
b1f01b5
address some feedback
vitellaryjr Jun 7, 2026
0719af3
syntax error. embarrassing
vitellaryjr Jun 7, 2026
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
1 change: 1 addition & 0 deletions lovely/weights.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ self.b_undiscovered = {name = 'Undiscovered', debuff_text = 'Defeat this blind t
'''
payload = '''
for key, blind in pairs(self.P_BLINDS) do
blind.set = 'Blind'
if blind.boss and blind.boss.max then
blind.boss.max = nil
if blind.boss.showdown then
Expand Down
56 changes: 56 additions & 0 deletions src/game_object.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,6 +1282,14 @@ Set `prefix_config.key = false` on your object instead.]]):format(obj.key), obj.
desc_nodes[#desc_nodes + 1] = res.main_end
end
desc_nodes.background_colour = res.background_colour
end,
has_attribute = function(self, attribute)
if not SMODS.Attributes[attribute] or not self.attributes then return false end
if self.attributes[attribute] then return true end
for _, att in ipairs(SMODS.Attributes[attribute].alias or {}) do
if self.attributes[att] then return true end
end
return false
end
}

Expand Down Expand Up @@ -1838,6 +1846,22 @@ SMODS.UndiscoveredCompat = {
end
G.P_BLINDS[self.key] = self
if self.modifies_draw then SMODS.Blinds.modifies_draw[self.key] = true end
if self.attributes then
for _, attribute in ipairs(self.attributes) do
if SMODS.Attributes[attribute] then
self.attributes[attribute] = true
SMODS.Attributes[attribute].keys = SMODS.merge_lists({SMODS.Attributes[attribute].keys or {}, {self.key}})
end
end
end
end,
has_attribute = function(self, attribute)
if not SMODS.Attributes[attribute] or not self.attributes then return false end
if self.attributes[attribute] then return true end
for _, att in ipairs(SMODS.Attributes[attribute].alias or {}) do
if self.attributes[att] then return true end
end
return false
end
}
SMODS.Blind:take_ownership('eye', {
Expand Down Expand Up @@ -1898,6 +1922,14 @@ SMODS.UndiscoveredCompat = {
self.badge_to_key[self.key:lower() .. '_seal'] = self.key
SMODS.insert_pool(G.P_CENTER_POOLS[self.set], self)
self.rng_buffer[#self.rng_buffer + 1] = self.key
if self.attributes then
for _, attribute in ipairs(self.attributes) do
if SMODS.Attributes[attribute] then
self.attributes[attribute] = true
SMODS.Attributes[attribute].keys = SMODS.merge_lists({SMODS.Attributes[attribute].keys or {}, {self.key}})
end
end
end
end,
process_loc_text = function(self)
SMODS.process_loc_text(G.localization.descriptions.Other, self.key:lower() .. '_seal', self.loc_txt)
Expand Down Expand Up @@ -1951,6 +1983,14 @@ SMODS.UndiscoveredCompat = {
create_fake_card = function(self)
return { ability = { seal = copy_table(self.config) }, fake_card = self.key }
end,
has_attribute = function(self, attribute)
if not SMODS.Attributes[attribute] or not self.attributes then return false end
if self.attributes[attribute] then return true end
for _, att in ipairs(SMODS.Attributes[attribute].alias or {}) do
if self.attributes[att] then return true end
end
return false
end
}
for _,v in ipairs { 'Purple', 'Gold', 'Blue', 'Red' } do
SMODS.Seal:take_ownership(v, { badge_colour = G.C[v:upper()], pos = G.shared_seals[v].sprite_pos, generate_ui = SMODS.Seal.generate_ui })
Expand Down Expand Up @@ -3050,6 +3090,14 @@ SMODS.UndiscoveredCompat = {
inject = function(self)
G.P_TAGS[self.key] = self
SMODS.insert_pool(G.P_CENTER_POOLS[self.set], self)
if self.attributes then
for _, attribute in ipairs(self.attributes) do
if SMODS.Attributes[attribute] then
self.attributes[attribute] = true
SMODS.Attributes[attribute].keys = SMODS.merge_lists({SMODS.Attributes[attribute].keys or {}, {self.key}})
end
end
end
end,
generate_ui = function(self, info_queue, card, desc_nodes, specific_vars, full_UI_table)
if not card then
Expand Down Expand Up @@ -3098,6 +3146,14 @@ SMODS.UndiscoveredCompat = {
desc_nodes[#desc_nodes + 1] = res.main_end
end
desc_nodes.background_colour = res.background_colour
end,
has_attribute = function(self, attribute)
if not SMODS.Attributes[attribute] or not self.attributes then return false end
if self.attributes[attribute] then return true end
for _, att in ipairs(SMODS.Attributes[attribute].alias or {}) do
if self.attributes[att] then return true end
end
return false
end
}

Expand Down
Loading