diff --git a/functions/pokefamily.lua b/functions/pokefamily.lua index befe931d..3eeb1acc 100644 --- a/functions/pokefamily.lua +++ b/functions/pokefamily.lua @@ -175,6 +175,7 @@ local default_family_list = { }, { "grubbin", "charjabug", "vikavolt" }, { "rockruff", "lycanroc_day", "lycanroc_night", "lycanroc_dusk" }, + { "duraludon", "archaludon"}, { "dreepy", "drakloak", "dragapult", "dreepy_dart" }, { "hisuian_qwilfish", "overqwil" }, { "nickit", "thievul" }, diff --git a/localization/en-us.lua b/localization/en-us.lua index aeb8b93b..290c516f 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -5316,6 +5316,14 @@ return { "a {C:attention}Straight{}", } }, + j_poke_duraludon = { + name = "Duraludon", + text = { + "{X:red,C:white}X#1#{} Mult every {C:attention}2{} hands played", + "{C:inactive}#2#", + "{C:inactive,s:0.8}(Evolves with a {C:metal,s:0.8}Metal{C:inactive,s:0.8} sticker)" + } + }, j_poke_dreepy = { name = "Dreepy", text = { @@ -5625,6 +5633,19 @@ return { "{C:inactive,s:0.8}(Resets at end of round)", } }, + j_poke_archaludon = { + name = "Archaludon", + text = { + "{X:red,C:white}X#2#{} Mult every {C:attention}2{} hands played", + "{C:inactive}#3#", + "{br:3}brrrr", + "Gain {X:red,C:white}X#1#{} Mult plus an additional", + "{X:red,C:white}X#1#{} Mult for each {X:lightning,C:black}Lightning{} Joker", + "you have for every {C:attention}2{} hands played", + "{C:inactive}#4#", + "{C:inactive}(Resets at end of round){}", + } + }, j_poke_missingno = { name = 'Missingno.', text = { diff --git a/pokemon/pokejokers_30.lua b/pokemon/pokejokers_30.lua index 4c00929e..b38cafd8 100644 --- a/pokemon/pokejokers_30.lua +++ b/pokemon/pokejokers_30.lua @@ -12,6 +12,51 @@ -- Dracovish 882 -- Arctovish 883 -- Duraludon 884 +local duraludon = { + name = "duraludon", + config = {extra = { + Xmult = 2, + hands_played = 0, + }}, + loc_vars = function(self, info_queue, card) + type_tooltip(self, info_queue, card) + return { + vars = { + card.ability.extra.Xmult, + (card.ability.extra.hands_played % 2 == 0) and "1 remaining" or "Active!", + + } + } + end, + designer = "Sonfive", + rarity = 3, + cost = 8, + stage = "Basic", + ptype = "Dragon", + gen = 8, + blueprint_compat = true, + calculate = function(self, card, context) + local a = card.ability.extra + local odd, even = (a.hands_played % 2 == 1), (a.hands_played % 2 == 0) + if context.joker_main and not context.repetition then + if odd then + a.hands_played = a.hands_played + 1 + return { + message = localize{type = 'variable', key = 'a_xmult', vars = {a.Xmult}}, + colour = G.C.XMULT, + Xmult_mod = a.Xmult + } + elseif even then + a.hands_played = a.hands_played + 1 + return { + message = "Recharging.." + } + + end + end + return type_evo(self, card, context, "j_poke_archaludon", "metal") + end, +} -- Dreepy 885 local dreepy={ name = "dreepy", @@ -404,5 +449,5 @@ local kleavor={ attributes = {"destroy_card", "mult", "generation", "enhancements", "scaling"}, } return {name = "Pokemon Jokers 871-900", - list = {dreepy, drakloak, dragapult, dreepy_dart, wyrdeer, kleavor}, + list = {duraludon, dreepy, drakloak, dragapult, dreepy_dart, wyrdeer, kleavor}, } diff --git a/pokemon/pokejokers_34.lua b/pokemon/pokejokers_34.lua index 8bffe249..09fb365d 100644 --- a/pokemon/pokejokers_34.lua +++ b/pokemon/pokejokers_34.lua @@ -220,8 +220,66 @@ local gholdengo={ -- Fezandipiti 1016 -- Ogerpon 1017 -- Archaludon 1018 +local archaludon = { + name = "archaludon", + config = {extra = { + Xmult_mod = 0.5, + Xmult = 1, + Xmult1 = 1, + hands_played = 0, + }}, + loc_vars = function(self, info_queue, card) + type_tooltip(self, info_queue, card) + return { + vars = { + card.ability.extra.Xmult_mod, + card.ability.extra.Xmult, + (card.ability.extra.hands_played % 2 == 0) and "1 remaining" or "Active!", + (card.ability.extra.hands_played % 2 == 1) and "1 remaining" or "Active!", + + } + } + end, + designer = "Sonfive", + rarity = "poke_safari", + cost = 8, + stage = "One", + ptype = "Metal", + gen = 8, + blueprint_compat = true, + calculate = function(self, card, context) + local a = card.ability.extra + local odd, even = (a.hands_played % 2 == 1), (a.hands_played % 2 == 0) + local count = 1 + #find_pokemon_type("Lightning") + if context.joker_main and not context.repetition then + if odd then + a.hands_played = a.hands_played + 1 + return { + message = localize{type = 'variable', key = 'a_xmult', vars = {a.Xmult}}, + colour = G.C.XMULT, + Xmult_mod = a.Xmult + } + elseif even then + a.hands_played = a.hands_played + 1 + a.Xmult = a.Xmult + (count * a.Xmult_mod) + return { + message = "Absorbing.." + } + + end + end + + if context.end_of_round and not context.repetition and not context.individual and not context.blueprint then + a.Xmult = a.Xmult1 + return { + message = localize('k_reset'), + colour = G.C.RED + } + end + end, +} -- Hydrapple 1019 -- Gouging Fire 1020 return {name = "Pokemon Jokers 991-1020", - list = {gimmighoul, gimmighoulr, gholdengo}, + list = {gimmighoul, gimmighoulr, gholdengo, archaludon}, }