From 681866bfbd60640e48b71a39a9ea148fc5476a05 Mon Sep 17 00:00:00 2001 From: ThorsGirdle Date: Sat, 16 May 2026 18:43:38 -0500 Subject: [PATCH 1/2] Add files via upload --- localization/en-us.lua | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/localization/en-us.lua b/localization/en-us.lua index 732c6ecc..653f238d 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -2032,8 +2032,8 @@ return { "{C:chips}+#2#{} Chips for each", "{C:attention}Blind{} skipped this run", "{br:2}ERROR - CONTACT STEAK", - "Skipping {C:attention}Blinds{} no", - "longer skips {C:attention}Shops{}", + "Visit the {C:attention}shop{}", + "after skipping", "{C:inactive}(Currently {C:chips}+#1# {C:inactive}Chips)" } }, @@ -2095,7 +2095,7 @@ return { "{C:attention}Ancient #1#s{}", "{X:attention,C:white}1+{} : Create a {C:tarot}Tarot{} card", "{X:attention,C:white}2+{} : Earn {C:money}$#2#{}", - "{X:attention,C:white}3+{} : Create an {C:item}Item{} card", + "{X:attention,C:white}3+{} : Create a {C:item}Item{} card", "{C:inactive,s:0.8}(Must have room)", "{C:inactive,s:0.8}(Trigger {X:attention,C:white,s:0.8}3+{C:inactive,s:0.8} ability {C:attention,s:0.8}#3#{C:inactive,s:0.8} times to evolve)" } @@ -3853,7 +3853,7 @@ return { "{C:green}#3# in #4#{} chance for", "discarded {C:attention}Hazard{} cards", "to be returned to {C:attention}hand", - "{C:inactive}(Currently {C:chips}+#1#{C:inactive} Chips)", + "{C:inactive}(Currently {C:chips}+#1#{C:inactive} Chips", } }, j_poke_lileep = { @@ -3917,7 +3917,7 @@ return { name = "Milotic", text = { "Retrigger all cards played if", - "they share the same {C:attention}suit{}" + "poker hand is {C:attention}mono-suit{}" } }, j_poke_duskull = { @@ -5281,6 +5281,33 @@ return { "{C:inactive}(#3#){}" } }, + j_poke_blipbug = { + name = 'Blipbug', + text = { + "Earn {C:money}$#1#{} after using a", + "{C:attention}unique{} {C:tarot}Tarot{} card", + "{C:inactive,s:0.7}(Evolves after using {C:attention,s:0.7}#2#{C:inactive,s:0.7} unique Tarot cards)", + } + }, + j_poke_dottler = { + name = 'Dottler', + text = { + "Earn {C:money}$#1#{} after using a {C:attention}unique{} ", + "{C:tarot}Tarot{} or {C:planet}Planet{} card", + "{C:inactive,s:0.7}(Evolves after using {C:attention,s:0.7}#2#{C:inactive,s:0.7} unique Tarot or Planet cards)", + } + }, + j_poke_orbeetle = { + name = 'Orbeetle', + text = { + "Earn {C:money}$#1#{} after using a", + "{C:attention}unique{} {C:attention}consumable{}", + "{br:2}ERROR - CONTACT STEAK", + "{C:mult}+#2#{} Mult per {C:attention}unique{}", + "{C:attention}consumable{} used", + "{C:inactive}(Currently {C:mult}+#3#{C:inactive} Mult)", + } + }, j_poke_nickit = { name = "Nickit", text = { From fe59939c05c38184036e580bb35c6574790afac6 Mon Sep 17 00:00:00 2001 From: ThorsGirdle Date: Sat, 16 May 2026 18:44:49 -0500 Subject: [PATCH 2/2] Add Blipbug line --- pokemon/pokejokers_28.lua | 140 +++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 1 deletion(-) diff --git a/pokemon/pokejokers_28.lua b/pokemon/pokejokers_28.lua index 779288aa..f0229ca9 100644 --- a/pokemon/pokejokers_28.lua +++ b/pokemon/pokejokers_28.lua @@ -12,8 +12,146 @@ -- Corvisquire 822 -- Corviknight 823 -- Blipbug 824 +local blipbug = { + name = "blipbug", + --pos = {x = 0, y = 0}, + config = {extra = { consumablesUsed = {}, money_mod = 3}, evo_rqmt = 4}, + loc_vars = function(self, info_queue, card) + type_tooltip(self, info_queue, card) + return {vars = {card.ability.extra.money_mod, math.max(self.config.evo_rqmt - ((card.ability.extra.consumablesUsed and #card.ability.extra.consumablesUsed) or 0), 0)}} + end, + rarity = 1, --Common + cost = 4, + stage = "Basic", + ptype = "Grass", + gen = 8, + designer = "Thor's Girdle", + --atlas = "", + perishable_compat = true, + blueprint_compat = true, + eternal_compat = true, + poke_custom_values_to_keep = {"consumablesUsed"}, + + calculate = function(self, card, context) + if context.using_consumeable and context.consumeable.ability.set == "Tarot" then + local unique = true + local usedCard = context.consumeable + for i, v in pairs(card.ability.extra.consumablesUsed) do + if v == usedCard.config.center_key then + unique = false + break + end + end + if unique == true then + if not context.blueprint then + table.insert(card.ability.extra.consumablesUsed, usedCard.config.center_key) + end + local earned = ease_poke_dollars(card, "blipbug", card.ability.extra.money_mod) + return { + message = '$'..earned, + colour = G.C.MONEY + } + end + end + return scaling_evo(self, card, context, "j_poke_dottler", ((card.ability.extra.consumablesUsed and #card.ability.extra.consumablesUsed) or 0), self.config.evo_rqmt) + end, +} -- Dottler 825 +local dottler = { + name = "dottler", + --pos = {x = 0, y = 0}, + config = {extra = { consumablesUsed = {}, money_mod = 4}, evo_rqmt = 12}, + loc_vars = function(self, info_queue, card) + type_tooltip(self, info_queue, card) + return {vars = {card.ability.extra.money_mod, math.max(self.config.evo_rqmt - ((card.ability.extra.consumablesUsed and #card.ability.extra.consumablesUsed) or 0), 0)}} + end, + rarity = "poke_safari", + cost = 5, + stage = "One", + ptype = "Psychic", + gen = 8, + designer = "Thor's Girdle", + --atlas = "", + perishable_compat = true, + blueprint_compat = true, + eternal_compat = true, + poke_custom_values_to_keep = {"consumablesUsed"}, + + calculate = function(self, card, context) + if context.using_consumeable and (context.consumeable.ability.set == "Tarot" or context.consumeable.ability.set == "Planet") then + local unique = true + local usedCard = context.consumeable + for i, v in pairs(card.ability.extra.consumablesUsed) do + if v == usedCard.config.center_key then + unique = false + break + end + end + if unique == true then + if not context.blueprint then + table.insert(card.ability.extra.consumablesUsed, usedCard.config.center_key) + end + local earned = ease_poke_dollars(card, "dottler", card.ability.extra.money_mod) + return { + message = '$'..earned, + colour = G.C.MONEY + } + end + end + return scaling_evo(self, card, context, "j_poke_orbeetle", ((card.ability.extra.consumablesUsed and #card.ability.extra.consumablesUsed) or 0), self.config.evo_rqmt) + end, +} -- Orbeetle 826 +local orbeetle = { + name = "orbeetle", + --pos = {x = 0, y = 0}, + config = {extra = { consumablesUsed = {}, money_mod = 4, mult_mod = 1}}, + loc_vars = function(self, info_queue, card) + type_tooltip(self, info_queue, card) + return {vars = {card.ability.extra.money_mod, card.ability.extra.mult_mod, (((card.ability.extra.consumablesUsed and #card.ability.extra.consumablesUsed) or 0) * card.ability.extra.mult_mod)}} + end, + rarity = "poke_safari", + cost = 6, + stage = "Two", + ptype = "Psychic", + gen = 8, + designer = "Thor's Girdle", + --atlas = "" + perishable_compat = true, + blueprint_compat = true, + eternal_compat = true, + poke_custom_values_to_keep = {"consumablesUsed"}, + + calculate = function(self, card, context) + if context.using_consumeable then + local unique = true + local usedCard = context.consumeable + for i, v in pairs(card.ability.extra.consumablesUsed) do + if v == usedCard.config.center_key then + unique = false + break + end + end + if unique == true then + if not context.blueprint then + table.insert(card.ability.extra.consumablesUsed, usedCard.config.center_key) + end + local earned = ease_poke_dollars(card, "orbeetle", card.ability.extra.money_mod) + return { + message = '$'..earned, + colour = G.C.MONEY + } + end + end + + if context.joker_main and card.ability.extra.consumablesUsed and #card.ability.extra.consumablesUsed > 0 then + return { + mult = #card.ability.extra.consumablesUsed * card.ability.extra.mult_mod + } + end + + end, +} -- Nickit 827 local nickit={ name = "nickit", @@ -132,5 +270,5 @@ local boltund={ -- Coalossal 839 -- Applin 840 return {name = "Pokemon Jokers 811-840", - list = {nickit, thievul, yamper, boltund}, + list = {blipbug, dottler, orbeetle, nickit, thievul, yamper, boltund}, } \ No newline at end of file