Skip to content

Commit 60f3ef5

Browse files
committed
fix voucher related stuff
1 parent c8db1bd commit 60f3ef5

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

items/voucher.lua

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ local massproduct = { -- Clearance Sale T3; All cards and packs in the shop cost
438438
requires = { "v_liquidation" },
439439
pools = { ["Tier3"] = true },
440440
config = {
441-
discount_percent = 75,
441+
discount_percentage = 75,
442442
},
443443
loc_vars = function(self, q, card)
444444
return {
@@ -447,7 +447,7 @@ local massproduct = { -- Clearance Sale T3; All cards and packs in the shop cost
447447
},
448448
}
449449
end,
450-
redeem = function(self)
450+
redeem = function(self, card)
451451
G.E_MANAGER:add_event(Event({
452452
func = function()
453453
G.GAME.backup_discount_percent = G.GAME.backup_discount_percent or G.GAME.discount_percent
@@ -546,12 +546,13 @@ local rerollexchange = { -- Reroll Surplus T3; All rerolls cost $2
546546
end,
547547
redeem = function(selfm, card)
548548
G.GAME.backup_cost = G.GAME.backup_cost or G.GAME.round_resets.reroll_cost
549-
G.GAME.round_resets.reroll_cost = G.GAME.round_resets.reroll_cost - card.ability.extra
550-
G.GAME.current_round.reroll_cost = math.max(0, G.GAME.current_round.reroll_cost - card.ability.extra)
549+
G.GAME.round_resets.reroll_cost = card.ability.extra
550+
G.GAME.current_round.reroll_cost = card.ability.extra
551+
G.GAME.current_round.reroll_cost_increase = 0
551552
end,
552553
unredeem = function(self, card)
553-
G.GAME.round_resets.reroll_cost = G.GAME.backup_cost + card.ability.extra
554-
G.GAME.current_round.reroll_cost = math.max(0, G.GAME.current_round.reroll_cost + card.ability.extra)
554+
G.GAME.round_resets.reroll_cost = G.GAME.backup_cost
555+
G.GAME.current_round.reroll_cost = G.GAME.backup_cost
555556
G.E_MANAGER:add_event(Event({
556557
func = function()
557558
calculate_reroll_cost(true)
@@ -780,7 +781,7 @@ local moneybean = { -- Seed Money T3; Raise the cap on interest earned in each r
780781
requires = { "v_money_tree" },
781782
pools = { ["Tier3"] = true },
782783
loc_vars = function(self, info_queue, card)
783-
return { vars = { (card and card.ability.extra or self.config.extra) / 5 } }
784+
return { vars = { (card and card.ability.extra or self.config.extra) } }
784785
end,
785786
redeem = function(self, card) -- this doesn't really matter with the whole interest overwrite
786787
G.E_MANAGER:add_event(Event({

0 commit comments

Comments
 (0)