Skip to content

Commit 603108c

Browse files
RNG (Challenge) misc changes
-Fixed Meme packs not spawning RNJoker -Unbanned Meme Pack -Unbanned Ace Aequilibrium
1 parent 136d684 commit 603108c

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

items/challenge.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,7 @@ local rng = {
285285
{ id = "tag_cry_epic" },
286286
},
287287
banned_cards = {
288-
{ id = "j_cry_equilib" },
289288
{ id = "c_cry_delete" },
290-
{ id = "p_cry_meme_1", ids = { "p_cry_meme_1", "p_cry_meme_two", "p_cry_meme_three" } },
291289
},
292290
banned_other = {},
293291
},

items/misc.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ local meme1 = {
4141
and not (G.GAME.used_jokers["j_cry_waluigi"] and not next(find_joker("Showman")))
4242
then
4343
if pseudorandom("meme1_" .. G.GAME.round_resets.ante) > 0.997 then
44-
return create_card(nil, G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
44+
return create_card("Meme", G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
4545
end
4646
end
4747
return create_card("Meme", G.pack_cards, nil, nil, true, true, nil, "cry_meme")
@@ -98,7 +98,7 @@ local meme2 = {
9898
and not (G.GAME.used_jokers["j_cry_waluigi"] and not next(find_joker("Showman")))
9999
then
100100
if pseudorandom("memetwo_" .. G.GAME.round_resets.ante) > 0.997 then
101-
return create_card(nil, G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
101+
return create_card("Meme", G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
102102
end
103103
end
104104
return create_card("Meme", G.pack_cards, nil, nil, true, true, nil, "cry_memetwo")
@@ -155,7 +155,7 @@ local meme3 = {
155155
and not (G.GAME.used_jokers["j_cry_waluigi"] and not next(find_joker("Showman")))
156156
then
157157
if pseudorandom("memethree_" .. G.GAME.round_resets.ante) > 0.997 then
158-
return create_card(nil, G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
158+
return create_card("Meme", G.pack_cards, nil, nil, true, true, "j_cry_waluigi", nil)
159159
end
160160
end
161161
return create_card("Meme", G.pack_cards, nil, nil, true, true, nil, "cry_memethree")

lib/overrides.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ function create_card(_type, area, legendary, _rarity, skip_materialize, soulable
714714
ps = Cryptid.predict_pseudoseed
715715
end
716716
local center = G.P_CENTERS.b_red
717-
if (_type == "Joker") and G.GAME and G.GAME.modifiers and G.GAME.modifiers.all_rnj then
717+
if (_type == "Joker" or _type == "Meme") and G.GAME and G.GAME.modifiers and G.GAME.modifiers.all_rnj then
718718
forced_key = "j_cry_rnjoker"
719719
end
720720
local function aeqviable(center)

0 commit comments

Comments
 (0)