Buff jokers in non-Cryptid
This commit is contained in:
parent
234b03d67a
commit
de4e24233e
4 changed files with 5 additions and 16 deletions
|
|
@ -17,5 +17,5 @@
|
||||||
"conflicts": [
|
"conflicts": [
|
||||||
"Jen"
|
"Jen"
|
||||||
],
|
],
|
||||||
"version": "1.5.32"
|
"version": "1.5.33"
|
||||||
}
|
}
|
||||||
|
|
@ -516,8 +516,8 @@ SMODS.Joker {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
card = card,
|
card = card,
|
||||||
colour = G.C.jane_RGB,
|
colour = Cryptid and G.C.jane_RGB or nil,
|
||||||
message = operator .. number_format(num),
|
message = Cryptid and (operator .. number_format(num)) or nil,
|
||||||
[Cryptid and "e_mult" or "x_mult"] = num,
|
[Cryptid and "e_mult" or "x_mult"] = num,
|
||||||
}, true
|
}, true
|
||||||
end
|
end
|
||||||
|
|
@ -616,7 +616,7 @@ SMODS.Joker {
|
||||||
pos = {x = 0, y = 0},
|
pos = {x = 0, y = 0},
|
||||||
soul_pos = {x = 1, y = 0},
|
soul_pos = {x = 1, y = 0},
|
||||||
config = {extra = {base = 2}},
|
config = {extra = {base = 2}},
|
||||||
rarity = exotic,
|
rarity = Cryptid and exotic or 3,
|
||||||
blueprint_compat = true,
|
blueprint_compat = true,
|
||||||
cost = Cryptid and 50 or 20,
|
cost = Cryptid and 50 or 20,
|
||||||
loc_vars = function(_, _, card)
|
loc_vars = function(_, _, card)
|
||||||
|
|
|
||||||
11
src/main.lua
11
src/main.lua
|
|
@ -218,17 +218,6 @@ function Card:nosuit()
|
||||||
return self.ability.name == "Stone Card" or self.config.center.no_suit
|
return self.ability.name == "Stone Card" or self.config.center.no_suit
|
||||||
end
|
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
|
local orig_menu = Game.main_menu
|
||||||
|
|
||||||
function Game:main_menu(change_context)
|
function Game:main_menu(change_context)
|
||||||
|
|
|
||||||
|
|
@ -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#",
|
"{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},
|
pos = {x = 0, y = 0},
|
||||||
soul_pos = {x = 1, y = 0},
|
soul_pos = {x = 1, y = 0},
|
||||||
cost = 20,
|
cost = 20,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue