diff --git a/manifest.json b/manifest.json index 732da86..486ce99 100644 --- a/manifest.json +++ b/manifest.json @@ -18,5 +18,5 @@ "conflicts": [ "Jen" ], - "version": "1.11.11" + "version": "1.11.12" } \ No newline at end of file diff --git a/src/back.lua b/src/back.lua index 5530e57..ef3245f 100644 --- a/src/back.lua +++ b/src/back.lua @@ -713,6 +713,8 @@ back { end end end + + G.hand.config.card_limit = math.max(G.hand.config.card_limit or 12, 12) end, calculate = function(_, _, context) rebalance_orrery() diff --git a/src/slugcat.lua b/src/slugcat.lua index 65a5e75..bf52718 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -670,7 +670,7 @@ SMODS.Joker { end if extra.karma >= max_karma then - local karma = (extra.is_attuning or extra.is_attuned) and 0 or extra.karma + local karma = extra.is_attuning and 0 or (extra.is_attuned and 1 or extra.karma) G.jokers:change_size(karma * extra.jokers) ascend() end @@ -716,6 +716,18 @@ SMODS.Joker { G.jokers:change_size((extra.is_attuned and quota or extra.karma) * extra.jokers) ascend() end, + add_to_deck = function(_, card) + local extra = card.ability.extra + + local _ = (extra.is_attuning or extra.is_attuned) and + G.jokers:change_size(extra.karma * extra.jokers) + end, + remove_from_deck = function(_, card) + local extra = card.ability.extra + + local _ = (extra.is_attuning or extra.is_attuned) and + G.jokers:change_size(-extra.karma * extra.jokers) + end, Bakery_can_use = function(_, card) return Jane.can_use() and not card.debuff end,