Skip to content

Commit efb7e8f

Browse files
committed
optimise some value manip stuff
1 parent 2a8f96b commit efb7e8f

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

lib/forcetrigger.lua

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ function Cryptid.forcetrigger(card, context)
2121
end
2222
local results = {}
2323
local check = Cryptid.forcetriggerVanillaCheck(card)
24-
G.E_MANAGER:add_event(Event({
25-
trigger = "before",
26-
func = function()
27-
play_sound("cry_forcetrigger", 1, 0.6)
28-
return true
29-
end,
30-
}))
24+
if not Talisman.config_file.disable_anims then
25+
G.E_MANAGER:add_event(Event({
26+
trigger = "before",
27+
func = function()
28+
play_sound("cry_forcetrigger", 1, 0.6)
29+
return true
30+
end,
31+
}))
32+
end
3133
if not check and card.ability.set == "Joker" then
3234
local demicontext = Cryptid.deep_copy(context)
3335
demicontext.forcetrigger = true

lib/misc.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,11 @@ function Cryptid.with_deck_effects(card, func)
296296
if not card.added_to_deck then
297297
return func(card)
298298
else
299+
card.from_quantum = true
299300
card:remove_from_deck(true)
300301
local ret = func(card)
301302
card:add_to_deck(true)
303+
card.from_quantum = nil
302304
return ret
303305
end
304306
end

lib/misprintize.lua

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -421,18 +421,6 @@ function Cryptid.manipulate(card, args)
421421
end)
422422
end
423423
end
424-
if not Cryptid.base_values[card.config.center.key] then
425-
Cryptid.base_values[card.config.center.key] = {}
426-
for i, v in pairs(card.ability) do
427-
if (type(v) == "table" and v.tetrate) or type(v) == "number" and to_big(v) < to_big(0) then
428-
Cryptid.base_values[card.config.center.key][i .. "ability"] = v
429-
elseif type(v) == "table" then
430-
for i2, v2 in pairs(v) do
431-
Cryptid.base_values[card.config.center.key][i2 .. i] = v2
432-
end
433-
end
434-
end
435-
end
436424
Cryptid.manipulate_table(card, card, "ability", args)
437425
if card.base then
438426
Cryptid.manipulate_table(card, card, "base", args)
@@ -470,6 +458,18 @@ function Cryptid.manipulate(card, args)
470458
end
471459
--ew ew ew ew
472460
G.P_CENTERS[card.config.center.key].config = config
461+
if not Cryptid.base_values[card.config.center.key] then
462+
Cryptid.base_values[card.config.center.key] = {}
463+
for i, v in pairs(card.ability) do
464+
if (type(v) == "table" and v.tetrate) or type(v) == "number" and to_big(v) < to_big(0) then
465+
Cryptid.base_values[card.config.center.key][i .. "ability"] = v
466+
elseif type(v) == "table" then
467+
for i2, v2 in pairs(v) do
468+
Cryptid.base_values[card.config.center.key][i2 .. i] = v2
469+
end
470+
end
471+
end
472+
end
473473
end
474474
end
475475

0 commit comments

Comments
 (0)