Skip to content

Commit fb97dab

Browse files
committed
various joker changes
1 parent 8fdfb16 commit fb97dab

File tree

6 files changed

+356
-304
lines changed

6 files changed

+356
-304
lines changed

items/code.lua

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,6 +1830,9 @@ local seed = {
18301830
end,
18311831
use = function(self, card, area, copier)
18321832
local cards = Cryptid.get_highlighted_cards({ G.jokers, G.hand, G.consumeables, G.pack_cards }, card, 1, 1)
1833+
if cards[1] then
1834+
cards[1].ability.cry_rigged = true
1835+
end
18331836
if cards[1].area == G.hand then
18341837
G.E_MANAGER:add_event(Event({
18351838
trigger = "after",
@@ -2074,7 +2077,6 @@ local hook = {
20742077
end,
20752078
loc_vars = function(self, info_queue, card)
20762079
info_queue[#info_queue + 1] = { key = "cry_hooked", set = "Other", vars = { "hooked Joker" } }
2077-
info_queue[#info_queue + 1] = { key = "cry_flickering", set = "Other", vars = { 8, 8 } }
20782080
end,
20792081
use = function(self, card, area, copier)
20802082
local jokers = Cryptid.get_highlighted_cards({ G.jokers }, card, 2, 2)
@@ -2085,20 +2087,28 @@ local hook = {
20852087
for _, v in ipairs(G.jokers.cards) do
20862088
if v.sort_id == card1.ability.cry_hook_id then
20872089
v.ability.cry_hooked = false
2090+
v.ability.cry_hook_triggers = 8
2091+
v.ability.cry_hook_triggers_left = 8
20882092
end
20892093
end
20902094
end
20912095
if card2.ability.cry_hooked then
20922096
for _, v in ipairs(G.jokers.cards) do
20932097
if v.sort_id == card2.ability.cry_hook_id then
20942098
v.ability.cry_hooked = false
2099+
v.ability.cry_hook_triggers = 8
2100+
v.ability.cry_hook_triggers_left = 8
20952101
end
20962102
end
20972103
end
20982104
card1.ability.cry_hooked = true
20992105
card2.ability.cry_hooked = true
21002106
card1.ability.cry_hook_id = card2.sort_id
21012107
card2.ability.cry_hook_id = card1.sort_id
2108+
card1.ability.cry_hook_triggers = 8
2109+
card1.ability.cry_hook_triggers_left = 8
2110+
card2.ability.cry_hook_triggers = 8
2111+
card2.ability.cry_hook_triggers_left = 8
21022112
end
21032113
end,
21042114
init = function(self)
@@ -2149,7 +2159,7 @@ local hooked = {
21492159
end
21502160
var = var or ("[no joker found - " .. (card.ability.cry_hook_id or "nil") .. "]")
21512161
end
2152-
return { vars = { var or "hooked Joker" } }
2162+
return { vars = { var or "hooked Joker", card.ability.cry_hook_triggers or 8, card.ability.cry_hook_triggers_left or 8 } }
21532163
end,
21542164
key = "cry_hooked",
21552165
no_sticker_sheet = true,
@@ -2166,10 +2176,25 @@ local hooked = {
21662176
and not context.forcetrigger
21672177
and not context.other_context.forcetrigger
21682178
then
2179+
if not card.ability.cry_hook_triggers_left then card.ability.cry_hook_triggers_left = 8; card.ability.cry_hook_triggers = 8 end
21692180
for i = 1, #G.jokers.cards do
21702181
if G.jokers.cards[i].sort_id == card.ability.cry_hook_id then
21712182
local results = Cryptid.forcetrigger(G.jokers.cards[i], context)
21722183
if results and results.jokers then
2184+
card.ability.cry_hook_triggers_left = card.ability.cry_hook_triggers_left - 1
2185+
if to_big(card.ability.cry_hook_triggers_left) <= 0 then
2186+
G.E_MANAGER:add_event(Event({
2187+
func = function()
2188+
card.ability.cry_hook_id = nil
2189+
card.ability.cry_hooked = nil
2190+
G.jokers.cards[i].ability.cry_hook_id = nil
2191+
G.jokers.cards[i].ability.cry_hooked = nil
2192+
G.jokers.cards[i].ability.cry_hook_triggers_left = 8
2193+
card.ability.cry_hook_triggers_left = 8
2194+
return true
2195+
end
2196+
}))
2197+
end
21732198
return results.jokers
21742199
end
21752200
end

0 commit comments

Comments
 (0)