feat: Add weights to every object and SMODS.Attribute

lovely/card_limit.toml

@@ -286,7 +286,7 @@ position = "at"
 payload = """local hand_space = e
 local cards_to_draw = {}
 local space_taken = 0
-local limit = G.hand.config.card_limit - #G.hand.cards - (SMODS.cards_to_draw or 0)
+local limit = (G.hand.config.card_limit - #G.hand.cards - (SMODS.cards_to_draw or 0))
 local flags = SMODS.calculate_context({drawing_cards = true, amount = limit})
 limit = flags.cards_to_draw or flags.modify or limit
 local unfixed = not G.hand.config.fixed_limit

lovely/weights.toml

@@ -0,0 +1,84 @@
+[manifest]
+version = "1.0.0"
+dump_lua = true
+priority = -10
+
+# Bypass get_new_boss()
+[[patches]]
+[patches.pattern]
+target = 'functions/common_events.lua'
+match_indent = true
+position = 'after'
+pattern = '''
+function get_new_boss()
+'''
+payload = '''
+-- Use SMODS object weight system when enabled
+if SMODS.optional_features.object_weights then return SMODS.poll_object({type = 'Blind'}) end
+'''
+
+# Bypass create_card_for_shop()
+[[patches]]
+[patches.pattern]
+target = 'functions/UI_definitions.lua'
+match_indent = true
+position = 'after'
+pattern = '''
+function create_card_for_shop(area)
+'''
+payload = '''
+-- Use SMODS object weight system when enabled
+if SMODS.optional_features.object_weights then return SMODS.create_shop_card(area) end
+'''
+
+# Bypass create_card key selection
+[[patches]]
+[patches.pattern]
+target = 'functions/common_events.lua'
+match_indent = true
+position = 'before'
+pattern = '''
+if forced_key and not G.GAME.banned_keys[forced_key] then 
+'''
+payload = '''
+-- Use SMODS object weight system when enabled
+if not forced_key and SMODS.optional_features.object_weights then forced_key = SMODS.poll_object({type = _type, guaranteed = true}) end
+
+'''
+
+# These patches add functionality for polling blinds, but are a precursor for full support of modded small and big blinds
+# TODO: move to blind related toml
+# Adjust vanilla blinds max ante property
+[[patches]]
+[patches.pattern]
+target = 'game.lua'
+match_indent = true
+position = 'before'
+pattern = '''
+self.b_undiscovered = {name = 'Undiscovered', debuff_text = 'Defeat this blind to discover', pos = {x=0,y=30}}
+'''
+payload = '''
+for key, blind in pairs(self.P_BLINDS) do
+    if blind.boss and blind.boss.max then
+        blind.boss.max = nil
+        if blind.boss.showdown then
+            blind.boss.min = nil
+        end
+    end
+    if key == 'bl_small' then blind.small = {min = 1} end
+    if key == 'bl_big' then blind.big = {min = 1} end
+end
+'''
+
+# Add custom small/big blinds to `G.GAME.bosses_used`
+[[patches]]
+[patches.pattern]
+target = 'game.lua'
+match_indent = true
+position = 'after'
+pattern = '''
+if v.boss then bosses_used[k] = 0 end
+'''
+payload = '''
+if v.small or v.big then bosses_used[k] = 0 end
+'''

src/core.lua

@@ -6,6 +6,7 @@ for _, path in ipairs {
     "src/overrides.lua",
     "src/game_object.lua",
     "src/compat_0_9_8.lua",
+    "src/utils/weights.lua"
 } do
     assert(load(SMODS.NFS.read(SMODS.path..path), ('=[SMODS _ "%s"]'):format(path)))()
 end

src/game_object.lua

@@ -115,6 +115,10 @@ Set `prefix_config.key = false` on your object instead.]]):format(obj.key), obj.
     -- Checked on __call but not take_ownership. For take_ownership, the key must exist
     function SMODS.GameObject:check_duplicate_key()
         if self.obj_table[self.key] or (self.get_obj and self:get_obj(self.key)) then
+            if self.set == 'Attribute' then
+                SMODS.Attributes[self.key].keys = SMODS.merge_lists({SMODS.Attributes[self.key].keys, self.keys})
+                return true
+            end
             sendWarnMessage(('Object %s has the same key as an existing object, not registering.'):format(self.key), self.set)
             sendWarnMessage('If you want to modify an existing object, use take_ownership()', self.set)
             return true
@@ -389,6 +393,12 @@ Set `prefix_config.key = false` on your object instead.]]):format(obj.key), obj.
         end,
     }
 
+    -------------------------------------------------------------------------------------------------
+    ----- API CODE GameObject.Attribute
+    -------------------------------------------------------------------------------------------------
+
+    assert(load(SMODS.NFS.read(SMODS.path..'src/game_objects/attributes.lua'), ('=[SMODS _ "src/game_objects/attributes.lua"]')))()
+
     -------------------------------------------------------------------------------------------------
     ----- INTERNAL API CODE GameObject._Loc_Pre
     -------------------------------------------------------------------------------------------------
@@ -1188,6 +1198,13 @@ Set `prefix_config.key = false` on your object instead.]]):format(obj.key), obj.
                     v:inject_card(self)
                 end
             end
+            if self.attributes then
+                for _, attribute in ipairs(self.attributes) do
+                    if SMODS.Attributes[attribute] then
+                        SMODS.Attributes[attribute].keys = SMODS.merge_lists({SMODS.Attributes[attribute].keys or {}, {self.key}})
+                    end
+                end
+            end
         end,
         delete = function(self)
             G.P_CENTERS[self.key] = nil