Skip to content

Commit b5675f8

Browse files
update sprites
1 parent 01892f6 commit b5675f8

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

assets/1x/atlasone.png

4.82 KB
Loading

assets/2x/atlasone.png

6.58 KB
Loading

items/misc_joker.lua

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ local queensgambit = {
302302
if context.destroying_card and not context.blueprint then
303303
if
304304
G.GAME.current_round.current_hand.handname == "Royal Flush"
305-
and SMODS.Ranks[context.destroying_card.base.value].key == "Queen"
305+
and context.destroying_card:get_id() == 12
306+
and not context.destroying_card.ability.eternal
306307
then
307308
card_eval_status_text(
308309
card,
@@ -2045,7 +2046,7 @@ local redbloon = {
20452046
"Roguefort Cookie",
20462047
},
20472048
art = {
2048-
"Jevonn",
2049+
"Darren_The_Frog",
20492050
},
20502051
code = {
20512052
"Jevonn",
@@ -2681,7 +2682,7 @@ local spaceglobe = {
26812682
"Jevonn",
26822683
},
26832684
art = {
2684-
"Jevonn",
2685+
"Selicre",
26852686
},
26862687
code = {
26872688
"Jevonn",
@@ -7543,7 +7544,7 @@ local arsonist = {
75437544
if context.destroying_card then
75447545
local eval = evaluate_poker_hand(context.full_hand)
75457546
if next(eval["Full House"]) then
7546-
return true
7547+
return not context.destroying_card.ability.eternal
75477548
end
75487549
end
75497550
end,
@@ -7700,13 +7701,13 @@ local huntingseason = { -- If played hand contains three cards, destroy the midd
77007701
},
77017702
name = "cry-huntingseason",
77027703
key = "huntingseason",
7703-
pos = { x = 4, y = 0 },
7704+
pos = { x = 4, y = 5 },
77047705
order = 134,
77057706
immutable = true,
77067707
rarity = 2,
77077708
cost = 7,
77087709
blueprint_compat = false,
7709-
atlas = "placeholders",
7710+
atlas = "atlasone",
77107711
calculate = function(self, card, context)
77117712
if
77127713
(context.cardarea == G.play or context.cardarea == "unscored")
@@ -7715,10 +7716,13 @@ local huntingseason = { -- If played hand contains three cards, destroy the midd
77157716
and not context.blueprint
77167717
and not context.retrigger_joker
77177718
then
7718-
return { remove = true }
7719+
return { remove = not context.destroy_card.ability.eternal }
77197720
end
77207721
end,
77217722
cry_credits = {
7723+
art = {
7724+
"Unexian",
7725+
},
77227726
idea = {
77237727
"Nova",
77247728
},

0 commit comments

Comments
 (0)