Skip to content

Commit 3606061

Browse files
committed
very fair deck fix
1 parent 712d24e commit 3606061

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

items/deck.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ local very_fair = {
1616
end,
1717
init = function(self)
1818
very_fair_quip = {}
19+
local avts = SMODS.add_voucher_to_shop
20+
function SMODS.add_voucher_to_shop(...)
21+
if G.GAME.modifiers.cry_no_vouchers then
22+
return
23+
end
24+
return avts(...)
25+
end
1926
end,
2027
}
2128
local equilibrium = {

lovely/very_fair.toml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@ priority = -1
77
[[patches]]
88
[patches.pattern]
99
target = "game.lua"
10-
pattern = "self.GAME.current_round.voucher = G.SETTINGS.tutorial_progress and G.SETTINGS.tutorial_progress.forced_voucher or get_next_voucher_key()"
11-
position = "at"
10+
pattern = "self.GAME.current_round.voucher = G.SETTINGS.tutorial_progress and G.SETTINGS.tutorial_progress.forced_voucher or SMODS.get_next_vouchers()"
11+
position = "after"
1212
payload = '''
13-
if not self.GAME.modifiers.cry_no_vouchers then
14-
if not G.GAME.modifiers.cry_voucher_restock_antes or G.GAME.round_resets.ante % G.GAME.modifiers.cry_voucher_restock_antes == 0 then
15-
self.GAME.current_round.voucher = G.SETTINGS.tutorial_progress and G.SETTINGS.tutorial_progress.forced_voucher or get_next_voucher_key()
16-
end
17-
else
13+
if self.GAME.modifiers.cry_no_vouchers then
1814
very_fair_quip = pseudorandom_element(G.localization.misc.very_fair_quips, pseudoseed("cry_very_fair"))
1915
end
2016
'''
@@ -25,20 +21,15 @@ match_indent = true
2521
[[patches]]
2622
[patches.pattern]
2723
target = "functions/state_events.lua"
28-
pattern = "G.GAME.current_round.voucher = get_next_voucher_key()"
29-
position = "at"
24+
pattern = "G.GAME.current_round.voucher = SMODS.get_next_vouchers()"
25+
position = "after"
3026
payload = '''
31-
if not G.GAME.modifiers.cry_no_vouchers then
32-
if not G.GAME.modifiers.cry_voucher_restock_antes or G.GAME.round_resets.ante % G.GAME.modifiers.cry_voucher_restock_antes == 0 then
33-
G.GAME.current_round.voucher = get_next_voucher_key()
34-
end
35-
else
27+
if G.GAME.modifiers.cry_no_vouchers then
3628
very_fair_quip = pseudorandom_element(G.localization.misc.very_fair_quips, pseudoseed("cry_very_fair"))
3729
end
3830
'''
3931
match_indent = true
4032

41-
4233
# Change empty voucher text on Very Fair Deck
4334
# This ain't localized, but that's a vanilla issue anyway
4435
[[patches]]

0 commit comments

Comments
 (0)