From b0582bd5d55efa7d471d15b640ab7f9370cf6721 Mon Sep 17 00:00:00 2001 From: ThorsGirdle Date: Tue, 26 May 2026 17:11:23 -0500 Subject: [PATCH 1/2] Add files via upload --- localization/en-us.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/localization/en-us.lua b/localization/en-us.lua index 6a5175dd..95b07845 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -5230,6 +5230,15 @@ return { "sticker to leftmost {C:attention}Joker" } }, + j_poke_volcanion = { + name = 'Volcanion', + text = { + "Gain {X:mult,C:white}X#2#{} if total {C:chips}chips{} of scoring hand", + "is greater than previous total: {C:chips}#3#{}", + "double {X:mult,C:white}X{} Mult then reset self on failure", + "{C:inactive}(Currently {X:mult,C:white}X#1#{C:inactive})", + } + }, j_poke_grubbin = { name = 'Grubbin', text = { From 635c4cc01b8620bc07ee46b0ae52b70de69c2a7e Mon Sep 17 00:00:00 2001 From: ThorsGirdle Date: Tue, 26 May 2026 17:11:56 -0500 Subject: [PATCH 2/2] Add Volcanion --- pokemon/pokejokers_25.lua | 52 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/pokemon/pokejokers_25.lua b/pokemon/pokejokers_25.lua index 1ff1b427..82b178d3 100644 --- a/pokemon/pokejokers_25.lua +++ b/pokemon/pokejokers_25.lua @@ -1,4 +1,54 @@ -- Volcanion 721 +local volcanion ={ + name = "volcanion", + --pos = {x = 0, y = 0}, + --soul_pos = { x = 0, y = 0}, + config = {extra = {currXmult = 1, Xmult_mod = 1, chipTotal = 0, reset = false}}, + loc_vars = function(self, info_queue, card) + type_tooltip(self, info_queue, card) + return {vars = {card.ability.extra.currXmult, card.ability.extra.Xmult_mod, card.ability.extra.chipTotal}} + end, + rarity = 4, --Legendary + cost = 20, + stage = "Legendary", + ptype = "Fire", + --atlas = "", + gen = 6, + blueprint_compat = true, + designer = "Thor's Girdle", + + calculate = function(self, card, context) + if context.before and not context.blueprint then + local tempChipTotal = 0 + for i, v in ipairs(context.scoring_hand) do + if not v.debuff then + tempChipTotal = tempChipTotal + poke_total_chips(v) + end + end + if tempChipTotal > card.ability.extra.chipTotal then + card.ability.extra.currXmult = card.ability.extra.currXmult + card.ability.extra.Xmult_mod + card.ability.extra.chipTotal = tempChipTotal + else + card.ability.extra.reset = true + end + end + + if context.joker_main then + if card.ability.extra.reset == true and not context.blueprint then + card.ability.extra.currXmult = card.ability.extra.currXmult * 2 + end + return { + xmult = card.ability.extra.currXmult + } + end + + if context.after and card.ability.extra.reset == true and not context.blueprint then + card.ability.extra.currXmult = 1 + card.ability.extra.reset = false + card.ability.extra.chipTotal = 0 + end + end, +} -- Rowlet 722 -- Dartrix 723 -- Decidueye 724 @@ -308,5 +358,5 @@ local lycanroc_dusk={ -- Mudbray 749 -- Mudsdale 750 return {name = "Pokemon Jokers 721-750", - list = {grubbin, charjabug, vikavolt, rockruff, lycanroc_day, lycanroc_night, lycanroc_dusk}, + list = {volcanion, grubbin, charjabug, vikavolt, rockruff, lycanroc_day, lycanroc_night, lycanroc_dusk}, }