Skip to content

Commit 3e07517

Browse files
committed
more preparation
1 parent 145ccd4 commit 3e07517

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

items/deck.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@ local misprint = {
8585
key = "misprint",
8686
order = 4,
8787
config = { cry_misprint_min = 0.25, cry_misprint_max = 4 },
88+
gameset_config = {
89+
madness = {
90+
cry_misprint_min = 0.1,
91+
cry_misprint_max = 10
92+
}
93+
},
8894
pos = { x = 4, y = 2 },
8995
atlas = "atlasdeck",
9096
apply = function(self)

items/misc.lua

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,6 @@ local azure_seal = {
433433
end
434434
for i = 1, self.config.planets_amount do
435435
local card = create_card(card_type, G.consumeables, nil, nil, nil, nil, _planet, "cry_azure")
436-
437436
card:set_edition({ negative = true }, true)
438437
card:add_to_deck()
439438
G.consumeables:emplace(card)
@@ -949,15 +948,15 @@ local glitched = {
949948
on_apply = function(card)
950949
if not card.ability.cry_glitched then
951950
Cryptid.manipulate(card, {
952-
min = 0.25,
953-
max = 4,
951+
min = Cryptid.gameset(G.P_CENTERS.e_cry_glitched) == "madness" and 0.1 or 0.25,
952+
max = Cryptid.gameset(G.P_CENTERS.e_cry_glitched) == "madness" and 10 or 4,
954953
})
955954

956955
if card.config.center.apply_glitched then
957956
card.config.center:apply_glitched(card, function(val)
958957
return Cryptid.manipulate_value(val, {
959-
min = 0.25 * (G.GAME.modifiers.cry_misprint_min or 1),
960-
max = 4 * (G.GAME.modifiers.cry_misprint_max or 1),
958+
min = (Cryptid.gameset(G.P_CENTERS.e_cry_glitched) == "madness" and 0.1 or 0.25) * (G.GAME.modifiers.cry_misprint_min or 1),
959+
max = (Cryptid.gameset(G.P_CENTERS.e_cry_glitched) == "madness" and 10 or 4) * (G.GAME.modifiers.cry_misprint_max or 1),
961960
type = "X",
962961
}, Cryptid.is_card_big(card))
963962
end)

items/misc_joker.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,7 @@ local eternalflame = {
13831383
number_format(center.ability.extra.extra),
13841384
number_format(center.ability.extra.x_mult),
13851385
},
1386-
key = Card.get_gameset(card) ~= "modest" and "j_cry_eternalflame2" or "j_cry_eternalflame",
1386+
key = Cryptid.gameset_loc({madness = "madness", mainline = "2"})
13871387
}
13881388
end,
13891389
atlas = "atlasone",
@@ -1399,7 +1399,7 @@ local eternalflame = {
13991399
}
14001400
elseif
14011401
context.selling_card
1402-
and context.card.config.center.set == "Joker"
1402+
and (context.card.config.center.set == "Joker" or Card.get_gameset(card) == "madness")
14031403
and (context.card.sell_cost >= 2 or Card.get_gameset(card) ~= "modest")
14041404
and not context.blueprint
14051405
then

localization/en-us.lua

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,14 @@ return {
16971697
"{C:inactive}(Currently {X:mult,C:white} X#2# {C:inactive} Mult)",
16981698
},
16991699
},
1700+
j_cry_eternalflame_madness = {
1701+
name = "Eternal Flame",
1702+
text = {
1703+
"This Joker gains {X:mult,C:white} X#1# {} Mult",
1704+
"for each Card {C:attention}sold{} with",
1705+
"{C:inactive}(Currently {X:mult,C:white} X#2# {C:inactive} Mult)",
1706+
},
1707+
},
17001708
j_cry_eternalflame2 = {
17011709
name = "Eternal Flame",
17021710
text = {

0 commit comments

Comments
 (0)