Fix Junk rarity
This commit is contained in:
parent
817f1bc59a
commit
7e674bca9c
2 changed files with 20 additions and 13 deletions
|
|
@ -18,5 +18,5 @@
|
||||||
"conflicts": [
|
"conflicts": [
|
||||||
"Jen"
|
"Jen"
|
||||||
],
|
],
|
||||||
"version": "1.11.24"
|
"version": "1.11.25"
|
||||||
}
|
}
|
||||||
|
|
@ -63,10 +63,25 @@ local exotic = Jane.cry and "cry_exotic" or 4
|
||||||
|
|
||||||
SMODS.Rarity {
|
SMODS.Rarity {
|
||||||
key = "junk",
|
key = "junk",
|
||||||
default_weight = 0.05,
|
default_weight = 0,
|
||||||
pools = {Joker = true},
|
pools = {Joker = true},
|
||||||
loc_txt = {name = "Junk"},
|
loc_txt = {name = "Junk"},
|
||||||
badge_colour = G.C.JOKER_GREY,
|
badge_colour = G.C.JOKER_GREY,
|
||||||
|
get_weight = function()
|
||||||
|
local rarity = 0.05
|
||||||
|
|
||||||
|
if next(SMODS.find_card("j_jane_rot")) then
|
||||||
|
return rarity
|
||||||
|
end
|
||||||
|
|
||||||
|
for _, v in pairs(SMODS.find_card("j_jane_honey")) do
|
||||||
|
if tonumber(v.ability.extra.level) == #Jane.rarity_ids - 1 then
|
||||||
|
return rarity
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return 0
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
local monk_limit = 25
|
local monk_limit = 25
|
||||||
|
|
@ -803,18 +818,10 @@ SMODS.Joker {
|
||||||
pos = {x = 0, y = 0},
|
pos = {x = 0, y = 0},
|
||||||
soul_pos = {x = 1, y = 0},
|
soul_pos = {x = 1, y = 0},
|
||||||
blueprint_compat = true,
|
blueprint_compat = true,
|
||||||
cost = 1,
|
cost = 2,
|
||||||
rarity = "jane_junk",
|
rarity = "jane_junk",
|
||||||
in_pool = function(_, _)
|
in_pool = function()
|
||||||
if next(SMODS.find_card("j_jane_rot")) then
|
return true, {allow_duplicates = true}
|
||||||
return true, {allow_duplicates = true}
|
|
||||||
end
|
|
||||||
|
|
||||||
for _, v in pairs(SMODS.find_card("j_jane_honey")) do
|
|
||||||
if tonumber(v.ability.extra.level) == #Jane.rarity_ids - 1 then
|
|
||||||
return true, {allow_duplicates = true}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end,
|
end,
|
||||||
calculate = Jane.cry and function(_, card, context)
|
calculate = Jane.cry and function(_, card, context)
|
||||||
local function has_room()
|
local function has_room()
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue