Skip to content

Commit ea2ef7c

Browse files
Pity Prize nerf
Making pity prize self destruct to stop excessively long (sometimes infinite) chains of boosters when there are a large amount of copies or retriggers
1 parent 4135ae5 commit ea2ef7c

File tree

1 file changed

+35
-2
lines changed

1 file changed

+35
-2
lines changed

items/misc_joker.lua

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7161,6 +7161,7 @@ local tax_fraud = {
71617161
}
71627162
},
71637163
}
7164+
--TODO update desc
71647165
local pity_prize = {
71657166
object_type = "Joker",
71667167
dependencies = {
@@ -7182,9 +7183,9 @@ local pity_prize = {
71827183
calculate = function(self, card, context)
71837184
if context.skipping_booster then
71847185
local tag
7185-
repeat
7186+
repeat
71867187
tag = Tag(get_next_tag_key("cry_pity_prize"))
7187-
until tag.name ~= "Boss Tag" and tag.name ~= "Gambler's Tag" and tag.name ~= "Empowered Tag" --I saw pickle not generating boss tags because it apparently causes issues, so I did the same here
7188+
until tag.name ~= "Boss Tag" and tag.name ~= "Gambler's Tag" and tag.name ~= "Empowered Tag"
71887189
if tag.name == "Orbital Tag" then
71897190
local _poker_hands = {}
71907191
for k, v in pairs(G.GAME.hands) do
@@ -7195,6 +7196,38 @@ local pity_prize = {
71957196
tag.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pity_prize"))
71967197
end
71977198
add_tag(tag)
7199+
if Card.get_gameset(card) == "modest" and not context.blueprint and not context.retrigger_joker then
7200+
G.E_MANAGER:add_event(Event({
7201+
func = function()
7202+
play_sound("tarot1")
7203+
card.T.r = -0.2
7204+
card:juice_up(0.3, 0.4)
7205+
card.states.drag.is = true
7206+
card.children.center.pinch.x = true
7207+
G.E_MANAGER:add_event(Event({
7208+
trigger = "after",
7209+
delay = 0.3,
7210+
blockable = false,
7211+
func = function()
7212+
G.jokers:remove_card(card)
7213+
card:remove()
7214+
card = nil
7215+
return true
7216+
end,
7217+
}))
7218+
return true
7219+
end,
7220+
}))
7221+
card_eval_status_text(
7222+
card,
7223+
"extra",
7224+
nil,
7225+
nil,
7226+
nil,
7227+
{ message = localize("k_extinct_ex"), colour = G.C.FILTER }
7228+
)
7229+
end
7230+
return nil, true
71987231
end
71997232
end,
72007233
cry_credits = {

0 commit comments

Comments
 (0)