From de4e24233e22de404f6b0d8988aea8942585a927 Mon Sep 17 00:00:00 2001 From: Emik Date: Tue, 7 Apr 2026 00:38:18 +0200 Subject: [PATCH] Buff jokers in non-Cryptid --- manifest.json | 2 +- src/joker.lua | 6 +++--- src/main.lua | 11 ----------- src/slugcat.lua | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/manifest.json b/manifest.json index b8c754b..8c7da80 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.5.32" + "version": "1.5.33" } \ No newline at end of file diff --git a/src/joker.lua b/src/joker.lua index 2242d6e..4d63ca2 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -516,8 +516,8 @@ SMODS.Joker { return { card = card, - colour = G.C.jane_RGB, - message = operator .. number_format(num), + colour = Cryptid and G.C.jane_RGB or nil, + message = Cryptid and (operator .. number_format(num)) or nil, [Cryptid and "e_mult" or "x_mult"] = num, }, true end @@ -616,7 +616,7 @@ SMODS.Joker { pos = {x = 0, y = 0}, soul_pos = {x = 1, y = 0}, config = {extra = {base = 2}}, - rarity = exotic, + rarity = Cryptid and exotic or 3, blueprint_compat = true, cost = Cryptid and 50 or 20, loc_vars = function(_, _, card) diff --git a/src/main.lua b/src/main.lua index 7e337c4..fad6300 100644 --- a/src/main.lua +++ b/src/main.lua @@ -218,17 +218,6 @@ function Card:nosuit() return self.ability.name == "Stone Card" or self.config.center.no_suit end -local orig_can_highlight = CardArea.can_highlight - -function CardArea:can_highlight(...) - if self ~= G.hand or not next(SMODS.find_card("j_jane_gourmand")) then - return orig_can_highlight(self, ...) - end - - self.config.highlighted_limit = math.max(self.config.highlighted_limit, 6) - return true -end - local orig_menu = Game.main_menu function Game:main_menu(change_context) diff --git a/src/slugcat.lua b/src/slugcat.lua index c175600..a764ef3 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -489,7 +489,7 @@ SMODS.Joker { "{C:inactive,s:1.25}#6#{C:attention,s:1.25}#7#{C:inactive,s:1.25}#8#{C:inactive}#9#", }, }, - config = {extra = {karma = 0, max_karma = Cryptid and 10 or 3}}, + config = {extra = {karma = 0, max_karma = Cryptid and 10 or 2}}, pos = {x = 0, y = 0}, soul_pos = {x = 1, y = 0}, cost = 20,