From b5a33f72131aafbf47628d7de4f0e05995ebb1ac Mon Sep 17 00:00:00 2001 From: Eternalnacho Date: Wed, 22 Jul 2026 22:19:45 -0500 Subject: [PATCH 1/4] pumpkaboo discard counter fix --- pokemon/pokejokers_24.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pokemon/pokejokers_24.lua b/pokemon/pokejokers_24.lua index 48bc3ca1..a32e6f60 100644 --- a/pokemon/pokejokers_24.lua +++ b/pokemon/pokejokers_24.lua @@ -100,12 +100,12 @@ local pumpkaboo = { calculate = function(self, card, context) if context.pre_discard and not context.blueprint then local jacks = pokermon.filter(context.full_hand, function(v) return v:get_id() == 11 and not v.debuff end) - local discarded, target = card.ability.extra.jacks_discarded, card.ability.extra.jack_target + local target = card.ability.extra.jack_target for _, v in ipairs(jacks) do - discarded = discarded + 1 - if discarded == target then + card.ability.extra.jacks_discarded = card.ability.extra.jacks_discarded + 1 + if card.ability.extra.jacks_discarded == target then v['pumpkaboo_trigger'..card.unique_val] = true - discarded = 0 + card.ability.extra.jacks_discarded = 0 end end end From 2dad9387cc59ee91aebdee011e37ad4a5485056b Mon Sep 17 00:00:00 2001 From: Eternalnacho Date: Wed, 22 Jul 2026 22:20:21 -0500 Subject: [PATCH 2/4] remove unneeded shorthand --- pokemon/pokejokers_24.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pokemon/pokejokers_24.lua b/pokemon/pokejokers_24.lua index a32e6f60..8dbb8424 100644 --- a/pokemon/pokejokers_24.lua +++ b/pokemon/pokejokers_24.lua @@ -100,10 +100,9 @@ local pumpkaboo = { calculate = function(self, card, context) if context.pre_discard and not context.blueprint then local jacks = pokermon.filter(context.full_hand, function(v) return v:get_id() == 11 and not v.debuff end) - local target = card.ability.extra.jack_target for _, v in ipairs(jacks) do card.ability.extra.jacks_discarded = card.ability.extra.jacks_discarded + 1 - if card.ability.extra.jacks_discarded == target then + if card.ability.extra.jacks_discarded == card.ability.extra.jack_target then v['pumpkaboo_trigger'..card.unique_val] = true card.ability.extra.jacks_discarded = 0 end From 16dbc2f3f1be868aa11c965351cfe579ae81c043 Mon Sep 17 00:00:00 2001 From: Eternalnacho Date: Wed, 22 Jul 2026 22:21:48 -0500 Subject: [PATCH 3/4] fix gourgeist too --- pokemon/pokejokers_24.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pokemon/pokejokers_24.lua b/pokemon/pokejokers_24.lua index 8dbb8424..22f61b78 100644 --- a/pokemon/pokejokers_24.lua +++ b/pokemon/pokejokers_24.lua @@ -171,12 +171,11 @@ local gourgeist = { calculate = function(self, card, context) if context.pre_discard and not context.blueprint then local jacks = pokermon.filter(context.full_hand, function(v) return v:get_id() == 11 and not v.debuff end) - local discarded, target = card.ability.extra.jacks_discarded, card.ability.extra.jack_target for _, v in ipairs(jacks) do - discarded = discarded + 1 - if discarded == target then + card.ability.extra.jacks_discarded = card.ability.extra.jacks_discarded + 1 + if card.ability.extra.jacks_discarded == card.ability.extra.jack_target then v['gourgeist_trigger'..card.unique_val] = true - discarded = 0 + card.ability.extra.jacks_discarded = 0 end end end From 58c84714d794639890d4b7d491870bf55a22002f Mon Sep 17 00:00:00 2001 From: Eternalnacho Date: Thu, 23 Jul 2026 11:35:18 -0500 Subject: [PATCH 4/4] change pumpkaboo line scaling in event for shop reasons --- pokemon/pokejokers_24.lua | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pokemon/pokejokers_24.lua b/pokemon/pokejokers_24.lua index 22f61b78..0a5402e1 100644 --- a/pokemon/pokejokers_24.lua +++ b/pokemon/pokejokers_24.lua @@ -84,7 +84,12 @@ local pumpkaboo = { if self.discovered then local form = card.ability.extra.form local scale = form and ({ 0.7, 1, 1.1, 1.2 })[form + 1] or 1 - card.T.scale = card.children.center.original_T.scale * scale * 0.95 + G.E_MANAGER:add_event(Event({ + func = function() + card.T.scale = card.children.center.original_T.scale * scale * 0.95 + return true + end + })) self:set_sprites(card) end end, @@ -154,7 +159,12 @@ local gourgeist = { if self.discovered then local form = card.ability.extra.form local scale = form and ({ 0.7, 1, 1.1, 1.2 })[form + 1] or 1 - card.T.scale = card.children.center.original_T.scale * scale * 0.95 + G.E_MANAGER:add_event(Event({ + func = function() + card.T.scale = card.children.center.original_T.scale * scale * 0.95 + return true + end + })) self:set_sprites(card) end end,