Skip to content

Commit ecab074

Browse files
Merge pull request #710 from factwixard/main
sync catalyst update
2 parents c221a6d + 2275a63 commit ecab074

File tree

1 file changed

+2
-28
lines changed

1 file changed

+2
-28
lines changed

items/epic.lua

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -296,35 +296,9 @@ local sync_catalyst = {
296296
immutable = true,
297297
atlas = "atlasepic",
298298
calculate = function(self, card, context)
299-
if ((context.joker_main and not context.debuffed_hand) or context.forcetrigger) and hand_chips and mult then
300-
local tot = hand_chips + mult
301-
if not tot.array or #tot.array < 2 or tot.array[2] < 2 then --below eXeY notation
302-
hand_chips = mod_chips(math.floor(tot / 2))
303-
mult = mod_mult(math.floor(tot / 2))
304-
else
305-
if hand_chips > mult then
306-
tot = hand_chips
307-
else
308-
tot = mult
309-
end
310-
hand_chips = mod_chips(tot)
311-
mult = mod_chips(tot)
312-
end
313-
update_hand_text({ delay = 0 }, { mult = mult, chips = hand_chips })
299+
if (context.joker_main and not context.debuffed_hand) or context.forcetrigger then
314300
return {
315-
message = localize("k_balanced"),
316-
colour = { 0.8, 0.45, 0.85, 1 },
317-
func = function()
318-
G.E_MANAGER:add_event(Event({
319-
trigger = "after",
320-
func = function()
321-
play_sound("gong", 0.94, 0.3)
322-
play_sound("gong", 0.94 * 1.5, 0.2)
323-
play_sound("tarot1", 1.5)
324-
return true
325-
end,
326-
}))
327-
end,
301+
balance = true
328302
}
329303
end
330304
end,

0 commit comments

Comments
 (0)