Skip to content

Commit 84ca525

Browse files
committed
reorder some value manip related stuff
1 parent 64fd581 commit 84ca525

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

lib/misprintize.lua

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -453,32 +453,32 @@ function Cryptid.manipulate(card, args)
453453
end
454454
end
455455
end
456-
local config = copy_table(card.config.center.config)
457-
if card.ability.consumeable then
458-
for k, v in pairs(card.ability.consumeable) do
459-
card.ability.consumeable[k] = Cryptid.deep_copy(card.ability[k])
460-
end
461-
end
462-
--ew ew ew ew
463-
G.P_CENTERS[card.config.center.key].config = config
464-
if not Cryptid.base_values[card.config.center.key] then
465-
Cryptid.base_values[card.config.center.key] = {}
466-
for i, v in pairs(card.ability) do
467-
if (type(v) == "table" and v.tetrate) or type(v) == "number" and to_big(v) < to_big(0) then
468-
Cryptid.base_values[card.config.center.key][i .. "ability"] = v
469-
elseif type(v) == "table" then
470-
for i2, v2 in pairs(v) do
471-
Cryptid.base_values[card.config.center.key][i2 .. i] = v2
472-
end
473-
end
474-
end
456+
end
457+
local config = copy_table(card.config.center.config)
458+
if card.ability.consumeable then
459+
for k, v in pairs(card.ability.consumeable) do
460+
card.ability.consumeable[k] = Cryptid.deep_copy(card.ability[k])
475461
end
476462
end
477463
if not args.bypass_checks and not args.no_deck_effects then
478464
Cryptid.with_deck_effects(card, func)
479465
else
480466
func(card)
481467
end
468+
--ew ew ew ew
469+
G.P_CENTERS[card.config.center.key].config = config
470+
if not Cryptid.base_values[card.config.center.key] then
471+
Cryptid.base_values[card.config.center.key] = {}
472+
for i, v in pairs(config) do
473+
if (type(v) == "table" and v.tetrate) or type(v) == "number" and to_big(v) ~= to_big(0) then
474+
Cryptid.base_values[card.config.center.key][i .. "ability"] = v
475+
elseif type(v) == "table" then
476+
for i2, v2 in pairs(v) do
477+
Cryptid.base_values[card.config.center.key][i2 .. i] = v2
478+
end
479+
end
480+
end
481+
end
482482
end
483483
return true
484484
end
@@ -497,9 +497,10 @@ function Cryptid.manipulate_table(card, ref_table, ref_value, args, tblkey)
497497
if args.dont_stack then
498498
if
499499
Cryptid.base_values[card.config.center.key]
500-
and Cryptid.base_values[card.config.center.key][i .. ref_value]
500+
and (Cryptid.base_values[card.config.center.key][i .. ref_value] or
501+
(ref_value == "ability" and Cryptid.base_values[card.config.center.key][i .. "consumeable"]))
501502
then
502-
num = Cryptid.base_values[card.config.center.key][i .. ref_value]
503+
num = Cryptid.base_values[card.config.center.key][i .. ref_value] or Cryptid.base_values[card.config.center.key][i .. "consumeable"]
503504
end
504505
end
505506
if args.big ~= nil then

0 commit comments

Comments
 (0)