Swap Gourmand and Rivulet, but with a twist

This commit is contained in:
Emik 2026-06-23 21:43:37 +02:00
parent 65fd36476a
commit 2af1d9be76
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
3 changed files with 23 additions and 24 deletions

View file

@ -18,5 +18,5 @@
"conflicts": [
"Jen"
],
"version": "1.9.4"
"version": "1.10.0"
}

View file

@ -153,7 +153,7 @@ local rain_world_jokers = {
"j_jane_monk",
"j_jane_survivor",
"j_jane_spearmaster",
"j_jane_rivulet",
"j_jane_gourmand",
"j_jane_saint",
}

View file

@ -275,22 +275,16 @@ SMODS.Joker {
atlas = "janegourmand",
loc_txt = {
name = "The Gourmand",
text = {
"Values on {C:attention}consumables",
"are {C:attention}" .. (Jane.cry and "multiplied" or "added") .. "{} by {C:attention}#1#" .. (Jane.cry and "" or "{} when"),
(Jane.cry and "when " or "") .. "they are created",
"{C:inactive}(If possible)",
},
text = {"All cards are {C:dark_edition}Jumbo"},
},
loc_vars = function(_, _, center)
return {vars = {center.ability.modifier}}
end,
config = {modifier = Jane.cry and 2 or 1},
pos = {x = 0, y = 0},
soul_pos = {x = 1, y = 0},
blueprint_compat = false,
cost = 8,
rarity = 3,
cost = 20,
rarity = 4,
loc_vars = function(_, info_queue)
info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_jumbo
end,
}
local function add_to_consumable_ability_by(n)
@ -344,14 +338,14 @@ local orig_set_ability = Card.set_ability
function Card:set_ability(center, initial, delay_sprites)
orig_set_ability(self, center, initial, delay_sprites)
if next(SMODS.find_card("j_jane_gourmand")) and
if next(SMODS.find_card("j_jane_rivulet")) and
self.gc and
self:gc().key ~= "c_base" and
string.sub(self:gc().key, 1, 2) == "c_" then
if Jane.cry or not ((SMODS.Mods.Roland or {}).qol or {})[1] then
local mod = 1
for _, v in pairs(SMODS.find_card("j_jane_gourmand")) do
for _, v in pairs(SMODS.find_card("j_jane_rivulet")) do
mod = mod * v.ability.modifier
end
@ -359,7 +353,7 @@ function Card:set_ability(center, initial, delay_sprites)
else
local mod = 0
for _, v in pairs(SMODS.find_card("j_jane_gourmand")) do
for _, v in pairs(SMODS.find_card("j_jane_rivulet")) do
mod = mod + v.ability.modifier
end
@ -522,15 +516,21 @@ SMODS.Joker {
loc_txt = {
name = "The Rivulet",
text = {
"All cards are given",
"a random {C:dark_edition}Edition",
"Values on {C:attention}consumables",
"are {C:attention}" .. (Jane.cry and "multiplied" or "added") .. "{} by {C:attention}#1#" .. (Jane.cry and "" or "{} when"),
(Jane.cry and "when " or "") .. "they are created",
"{C:inactive}(If possible)",
},
},
config = {modifier = Jane.cry and 2 or 1},
pos = {x = 0, y = 0},
soul_pos = {x = 1, y = 0},
blueprint_compat = false,
cost = 20,
rarity = 4,
cost = 8,
rarity = 3,
loc_vars = function(_, _, center)
return {vars = {center.ability.modifier}}
end,
}
local orig_draw = Card.draw
@ -558,9 +558,8 @@ function Card:draw(layer)
(self.added_to_deck or (self.area and self.area == G.hand)) and not
self.edition and
(self.area == G.consumeables or cen.set ~= "Booster") and
next(SMODS.find_card("j_jane_rivulet")) then
local edition = poll_edition("rivulet_edition", nil, true, true)
self:set_edition(edition == "e_Roland_frozen" and "e_jane_polygloss" or edition)
next(SMODS.find_card("j_jane_gourmand")) then
self:set_edition("e_jane_jumbo")
end
orig_draw(self, layer)