Skip to content

Commit 712d24e

Browse files
committed
bugfixes
- Ctrl+V now triggers Hologram - ERROR now has an extra check to prevent crashing when viewing its description - M Joker pool checks now work properly (for Macabre Joker, Tredecim, Neon M, etc.)
1 parent a44fd25 commit 712d24e

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

items/code.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3101,6 +3101,7 @@ local ctrl_v = {
31013101
card:add_to_deck()
31023102
table.insert(G.playing_cards, card)
31033103
G.hand:emplace(card)
3104+
playing_card_joker_effects({card})
31043105
return true
31053106
end,
31063107
}))

items/epic.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ local error_joker = {
392392
atlas = "atlasepic",
393393
loc_vars = function(self, info_queue, center)
394394
if safe_get(G.GAME, "pseudorandom") and G.STAGE == G.STAGES.RUN then
395-
cry_error_msgs[#cry_error_msgs].string = "%%" .. predict_card_for_shop()
395+
cry_error_msgs[#cry_error_msgs].string = "%%" .. (pcall(predict_card_for_shop) or "J6")
396396
else
397397
cry_error_msgs[#cry_error_msgs].string = "%%J6"
398398
end

items/m.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ local mneon = {
368368
if context.end_of_round and not context.blueprint and not context.individual and not context.repetition then
369369
local jollycount = 0
370370
for i = 1, #G.jokers.cards do
371-
if G.jokers.cards[i]:is_jolly() or safe_get(G.jokers.cards[i], "pools", "M") then
371+
if G.jokers.cards[i]:is_jolly() or safe_get(G.jokers.cards[i].config.center, "pools", "M") then
372372
jollycount = jollycount + 1
373373
end
374374
end
@@ -1218,7 +1218,7 @@ local mprime = {
12181218
elseif context.other_joker then
12191219
if
12201220
context.other_joker
1221-
and (context.other_joker:is_jolly() or safe_get(context.other_joker, "pools", "M"))
1221+
and (context.other_joker:is_jolly() or safe_get(context.other_joker.config.center, "pools", "M"))
12221222
then
12231223
if not Talisman.config_file.disable_anims then
12241224
G.E_MANAGER:add_event(Event({
@@ -1284,7 +1284,7 @@ local macabre = {
12841284
v ~= card
12851285
and not v:is_jolly()
12861286
and v.config.center.key ~= "j_cry_mprime"
1287-
and not (v.ability.eternal or v.getting_sliced or safe_get(v, "pools", "M"))
1287+
and not (v.ability.eternal or v.getting_sliced or safe_get(v.config.center, "pools", "M"))
12881288
then
12891289
destroyed_jokers[#destroyed_jokers + 1] = v
12901290
end

lib/misc.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ function get_m_jokers()
320320
local mcount = 0
321321
if G.jokers then
322322
for i = 1, #G.jokers.cards do
323-
if safe_get(G.jokers.cards[i], "pools", "M") then
323+
if safe_get(G.jokers.cards[i].config.center, "pools", "M") then
324324
mcount = mcount + 1
325325
end
326326
if G.jokers.cards[i].ability.name == "cry-mprime" then

0 commit comments

Comments
 (0)