Skip to content

Commit f8eecb2

Browse files
lord-rubylord-ruby
committed
silver seal & other fixes
1 parent 1aa61f6 commit f8eecb2

File tree

7 files changed

+11
-18
lines changed

7 files changed

+11
-18
lines changed

‎compat/cryptid/cursed_jokers.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ local jokerinyellow = {
4949
func = function()
5050
local card = pseudorandom_element(cards, pseudoseed("kiy"))
5151
if card then
52-
SMODS.eval_individual(card, {banishing_card = true, banisher = card, card = card, cardarea = G.jokers})
52+
eval_card(card, {banishing_card = true, banisher = card, card = card, cardarea = G.jokers})
5353
card:start_dissolve()
5454
G.GAME.banned_keys[card.config.center.key] = true
5555
card_eval_status_text(
@@ -82,7 +82,7 @@ local jokerinyellow = {
8282
func = function()
8383
local card = pseudorandom_element(cards, pseudoseed("kiy"))
8484
if card then
85-
SMODS.eval_individual(card, {banishing_card = true, banisher = card, card = card, cardarea = G.jokers})
85+
eval_card(card, {banishing_card = true, banisher = card, card = card, cardarea = G.jokers})
8686
card:start_dissolve()
8787
G.GAME.banned_keys[card.config.center.key] = true
8888
card_eval_status_text(

‎compat/cryptid/epic_jokers.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ local metamorphosis = {
419419
context.cardarea = G.jokers
420420
local text, disp_text, poker_hands, scoring_hand, non_loc_disp_text, percent, percent_delta = G.FUNCS.get_poker_hand_info(G.play.cards)
421421
for i, v in pairs(G.jokers.cards) do
422-
local res = SMODS.eval_individual(v, {cardarea = G.jokers, joker_main = true, full_hand = G.play.cards, scoring_hand = scoring_hand, scoring_name = text, poker_hands = poker_hands}) or {}
422+
local res = eval_card(v, {cardarea = G.jokers, joker_main = true, full_hand = G.play.cards, scoring_hand = scoring_hand, scoring_name = text, poker_hands = poker_hands}) or {}
423423
if res and res.jokers then
424424
res = res.jokers
425425
for i2, v2 in pairs(res) do

‎items/jokers/misc_jokers.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ local insatiable_dagger = {
381381
card:juice_up(0.8, 0.8)
382382
sliced_card:start_dissolve({ HEX("a800ff") }, nil, 1.6)
383383
G.GAME.banned_keys[sliced_card.config.center.key] = true
384-
SMODS.eval_individual(sliced_card, {banishing_card = true, banisher = card, card = sliced_card, cardarea = sliced_card.area})
384+
eval_card(sliced_card, {banishing_card = true, banisher = card, card = sliced_card, cardarea = sliced_card.area})
385385
play_sound("slice1", 0.96 + math.random() * 0.08)
386386
local check2
387387
if not Card.no(G.jokers.cards[check], "immutable", true) then

‎items/jokers/rlegendary_jokers.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,15 +575,15 @@ local ssac = {
575575
local c_r = G.consumeables.cards[#G.consumeables.cards] and Cryptid.forcetrigger(G.consumeables.cards[#G.consumeables.cards], context) or {}
576576
local v = G.play.cards[#G.play.cards]
577577
if G.play.cards and v then
578-
local results = SMODS.eval_individual(v, {cardarea=G.play,main_scoring=true, forcetrigger=true, individual=true}) or {}
578+
local results = eval_card(v, {cardarea=G.play,main_scoring=true, forcetrigger=true, individual=true}) or {}
579579
if results then
580580
for i, v2 in pairs(results) do
581581
for i2, result in pairs(type(v2) == "table" and v2 or {}) do
582582
SMODS.calculate_individual_effect({[i2] = result}, card, i2, result, false)
583583
end
584584
end
585585
end
586-
local results = SMODS.eval_individual(v, {cardarea=G.hand,main_scoring=true, forcetrigger=true, individual=true}) or {}
586+
local results = eval_card(v, {cardarea=G.hand,main_scoring=true, forcetrigger=true, individual=true}) or {}
587587
if results then
588588
for i, v2 in pairs(results) do
589589
for i2, result in pairs(type(v2) == "table" and v2 or {}) do

‎items/misc/editions.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ local kaleidoscopic = {
463463
for i, v in pairs(actual) do
464464
context.kaleidoscopic = true
465465
context.edition = nil
466-
local eval, post = SMODS.eval_individual(v, context)
466+
local eval, post = eval_card(v, context)
467467
eval = eval or {}
468468
local effects = {eval}
469469
if context.main_scoring then

‎lib/hooks.lua‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4384,7 +4384,7 @@ function copy_card(old, new, ...)
43844384
SMODS.calculate_context{copying_card = true, original_card = old, new_card = copy}
43854385
end
43864386
for i, v in pairs(G.play and G.play.cards or {}) do
4387-
SMODS.eval_individual(v, {copying_card = true, original_card = old, new_card = copy})
4387+
eval_card(v, {copying_card = true, original_card = old, new_card = copy})
43884388
end
43894389
if old.base and old.base.nominal then copy.base.nominal = old.base.nominal end
43904390
G.GAME.modifiers.entr_twisted = tw
@@ -4542,13 +4542,6 @@ SMODS.Consumable:take_ownership("fool", {
45424542
end
45434543
}, true)
45444544

4545-
local calculate_objref = SMODS.eval_individual
4546-
function SMODS.eval_individual(individual, context)
4547-
if individual.object then
4548-
return calculate_objref(individual, context)
4549-
end
4550-
end
4551-
45524545
if HotPotato then
45534546
function PissDrawer.Shop.main_shop()
45544547
-- Reroll button for unknown goddamn reason just stuck, so I'll unstuck it

‎lib/utils.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,15 +356,15 @@ function Entropy.RandomForcetrigger(card, num,context)
356356
{ message = localize("cry_demicolon"), colour = G.C.GREEN }
357357
)
358358
elseif v.base.id and (not v.edition or v.edition.key ~= "e_entr_fractured") then
359-
local results = SMODS.eval_individual(v, {cardarea=G.play,main_scoring=true, forcetrigger=true, individual=true}) or {}
359+
local results = eval_card(v, {cardarea=G.play,main_scoring=true, forcetrigger=true, individual=true}) or {}
360360
if results then
361361
for i, v2 in pairs(results) do
362362
for i2, result in pairs(type(v2) == "table" and v2 or {}) do
363363
SMODS.calculate_individual_effect({[i2] = result}, card, i2, result, false)
364364
end
365365
end
366366
end
367-
local results = SMODS.eval_individual(v, {cardarea=G.hand,main_scoring=true, forcetrigger=true, individual=true}) or {}
367+
local results = eval_card(v, {cardarea=G.hand,main_scoring=true, forcetrigger=true, individual=true}) or {}
368368
if results then
369369
for i, v2 in pairs(results) do
370370
for i2, result in pairs(type(v2) == "table" and v2 or {}) do
@@ -1178,7 +1178,7 @@ end
11781178
function Entropy.GetRepetitions(card)
11791179
local res2 = {}
11801180
for i, v in ipairs(G.jokers.cards) do
1181-
local res = SMODS.eval_individual(v, {repetition=true, other_card=card,cardarea=card.area,card_effects={{},{}}}) or {}
1181+
local res = eval_card(v, {repetition=true, other_card=card,cardarea=card.area,card_effects={{},{}}}) or {}
11821182
if res.jokers and res.jokers.repetitions then
11831183
res2.repetitions = (res2.repetitions or 0) + res.jokers.repetitions
11841184
end

0 commit comments

Comments
 (0)