Skip to content

Commit 3327179

Browse files
authored
partially fix virgo, remove monster hack
small fixes to my earlier pr, though somehow using scaling detection has left virgo completely fucked as even with the fix it doesn't increase in value
1 parent 190cd69 commit 3327179

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

items/m.lua

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,8 +1308,9 @@ local virgo = {
13081308
then
13091309
--this doesn't seem to work with retrigger jokers. Intentional?
13101310
local msg = SMODS.scale_card(card, {
1311-
ref_table = card.ability.extra,
1311+
ref_table = card.ability,
13121312
ref_value = "extra_value",
1313+
scalar_table = card.ability.extra,
13131314
scalar_value = "bonus",
13141315
})
13151316
card:set_cost()
@@ -1324,8 +1325,9 @@ local virgo = {
13241325
return nil, true
13251326
elseif context.forcetrigger then
13261327
SMODS.scale_card(card, {
1327-
ref_table = card.ability.extra,
1328+
ref_table = card.ability,
13281329
ref_value = "extra_value",
1330+
scalar_table = card.ability.extra,
13291331
scalar_value = "bonus",
13301332
})
13311333

@@ -1863,14 +1865,13 @@ local longboi = {
18631865
atlas = "atlasthree",
18641866
calculate = function(self, card, context)
18651867
if context.end_of_round and not context.individual and not context.repetition then
1866-
card.ability.extra.secret_variable_so_smods_scale_works_correctly = G.GAME.monstermult
18671868
card.ability.extra.bonus = math.max(card.ability.extra.bonus, card.ability.immutable.max_bonus) -- maybe remove this entirely
18681869
local msg = SMODS.scale_card(card, {
1869-
ref_table = card.ability.extra,
1870-
ref_value = "secret_variable_so_smods_scale_works_correctly",
1870+
ref_table = G.GAME,
1871+
ref_value = "monstermult",
1872+
scalar_table = card.ability.extra,
18711873
scalar_value = "bonus",
18721874
})
1873-
G.GAME.monstermult = lenient_bignum(card.ability.extra.secret_variable_so_smods_scale_works_correctly)
18741875
if not context.retrigger_joker and (not msg or type(msg) == "string") then
18751876
return {
18761877
card_eval_status_text(context.blueprint_card or card, "extra", nil, nil, nil, {
@@ -1890,9 +1891,13 @@ local longboi = {
18901891
}
18911892
end
18921893
if context.forcetrigger then
1893-
G.GAME.monstermult = lenient_bignum(
1894-
G.GAME.monstermult + math.max(card.ability.immutable.max_bonus, to_big(card.ability.extra.bonus))
1895-
)
1894+
card.ability.extra.bonus = math.max(card.ability.extra.bonus, card.ability.immutable.max_bonus) -- maybe remove this entirely
1895+
SMODS.scale_card(card, {
1896+
ref_table = G.GAME,
1897+
ref_value = "monstermult",
1898+
scalar_table = card.ability.extra,
1899+
scalar_value = "bonus",
1900+
})
18961901
return {
18971902
message = localize({
18981903
type = "variable",

0 commit comments

Comments
 (0)