Skip to content

Commit 4e87707

Browse files
lord-rubylord-ruby
committed
voucher stuff
1 parent e619c67 commit 4e87707

File tree

4 files changed

+49
-55
lines changed

4 files changed

+49
-55
lines changed

‎items/code.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2136,6 +2136,7 @@ local hook = {
21362136
end,
21372137
loc_vars = function(self, info_queue, card)
21382138
info_queue[#info_queue + 1] = { key = "cry_hooked", set = "Other", vars = { "hooked Joker" } }
2139+
info_queue[#info_queue + 1] = { key = "cry_flickering", set = "Other", vars = { 8, 8 } }
21392140
end,
21402141
use = function(self, card, area, copier)
21412142
local jokers = Cryptid.get_highlighted_cards({ G.jokers }, card, 2, 2)

‎items/epic.lua‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -933,18 +933,16 @@ local boredom = {
933933
end
934934
end
935935
local joker = pseudorandom_element(cards, pseudoseed("cry_boredom_joker"))
936-
joker.cry_boredom_marked = card
936+
card.cry_boredom_marked = joker
937937
end
938938
if context.after then
939-
for i, v in pairs(G.jokers.cards) do
940-
v.cry_boredom_marked = nil
941-
end
939+
card.cry_boredom_marked = nil
942940
end
943941
if
944942
context.retrigger_joker_check
945943
and not context.retrigger_joker
946944
and not (context.other_card.ability and context.other_card.ability.name == "cry-Boredom")
947-
and context.other_card.cry_boredom_marked == card
945+
and card.cry_boredom_marked == context.other_card
948946
then
949947
if
950948
pseudorandom("cry_boredom_joker")

‎items/voucher.lua‎

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,19 @@ local copies = { -- DTag T1; Double tags become Triple Tags and are 2X as common
3333
pos = { x = 1, y = 1 },
3434
loc_vars = function(self, info_queue)
3535
info_queue[#info_queue + 1] = { set = "Tag", key = "tag_double" }
36-
info_queue[#info_queue + 1] = { set = "Tag", key = "tag_cry_triple", specific_vars = { 2 } }
3736
return { vars = {} }
3837
end,
3938
init = function(self)
4039
--Copies and upgrades
4140
local tinit = Tag.init
4241
function Tag:init(tag, for_collection, _blind_type)
4342
if not for_collection then
44-
if tag == "tag_double" and G.GAME.used_vouchers.v_cry_copies then
43+
if tag == "tag_double" and G.GAME.used_vouchers.v_cry_tag_printer then
4544
tag = "tag_cry_triple"
4645
end
47-
if (tag == "tag_double" or tag == "tag_cry_triple") and G.GAME.used_vouchers.v_cry_tag_printer then
46+
if (tag == "tag_double" or tag == "tag_cry_triple") and G.GAME.used_vouchers.v_cry_clone_machine then
4847
tag = "tag_cry_quadruple"
4948
end
50-
if
51-
(tag == "tag_double" or tag == "tag_cry_triple" or tag == "tag_cry_quadruple")
52-
and G.GAME.used_vouchers.v_cry_clone_machine
53-
then
54-
tag = "tag_cry_quintuple"
55-
end
5649
end
5750
return tinit(self, tag, for_collection, _blind_type)
5851
end
@@ -85,7 +78,7 @@ local tag_printer = { --DTag T2; Double tags become Quadruple Tags and are 3X as
8578
pos = { x = 1, y = 2 },
8679
loc_vars = function(self, info_queue)
8780
info_queue[#info_queue + 1] = { set = "Tag", key = "tag_double" }
88-
info_queue[#info_queue + 1] = { set = "Tag", key = "tag_cry_quadruple", specific_vars = { 3 } }
81+
info_queue[#info_queue + 1] = { set = "Tag", key = "tag_cry_triple", specific_vars = { 2 } }
8982
return { vars = {} }
9083
end,
9184
requires = { "v_cry_copies" },
@@ -273,7 +266,7 @@ local grapplinghook = { -- CSL T2; +2 card selection limit
273266
},
274267
},
275268
key = "grapplinghook",
276-
config = { extra = 2 },
269+
config = { extra = 1 },
277270
atlas = "atlasvoucher",
278271
order = 20008,
279272
pos = { x = 1, y = 5 },
@@ -444,11 +437,21 @@ local massproduct = { -- Clearance Sale T3; All cards and packs in the shop cost
444437
pos = { x = 6, y = 4 },
445438
requires = { "v_liquidation" },
446439
pools = { ["Tier3"] = true },
440+
config = {
441+
discount_percent = 75
442+
},
443+
loc_vars = function(self, q, card)
444+
return {
445+
vars = {
446+
card.ability.discount_percentage
447+
}
448+
}
449+
end
447450
redeem = function(self)
448451
G.E_MANAGER:add_event(Event({
449452
func = function()
450453
G.GAME.backup_discount_percent = G.GAME.backup_discount_percent or G.GAME.discount_percent
451-
G.GAME.discount_percent = 100
454+
G.GAME.discount_percent = card.ability.discount_percentage
452455
for k, v in pairs(G.I.CARD) do
453456
if v.set_cost then
454457
v:set_cost()
@@ -531,16 +534,19 @@ local rerollexchange = { -- Reroll Surplus T3; All rerolls cost $2
531534
pos = { x = 6, y = 2 },
532535
requires = { "v_reroll_glut" },
533536
pools = { ["Tier3"] = true },
537+
config ={
538+
extra = -5
539+
},
540+
loc_vars = function(self, _, card)
541+
return {
542+
vars = {
543+
card.ability.extra
544+
}
545+
}
546+
end
534547
redeem = function(self)
535-
--most of the code for this (one line) is in cryptid.lua, check out the reroll function there
536-
G.E_MANAGER:add_event(Event({
537-
func = function()
538-
if G.GAME.current_round.reroll_cost > 2 then
539-
G.GAME.current_round.reroll_cost = 2
540-
end
541-
return true
542-
end,
543-
}))
548+
G.GAME.round_resets.reroll_cost = G.GAME.round_resets.reroll_cost - self.ability.extra
549+
G.GAME.current_round.reroll_cost = math.max(0, G.GAME.current_round.reroll_cost - self.ability.extra)
544550
end,
545551
unredeem = function(self)
546552
G.E_MANAGER:add_event(Event({
@@ -764,7 +770,7 @@ local moneybean = { -- Seed Money T3; Raise the cap on interest earned in each r
764770
},
765771
},
766772
key = "moneybean",
767-
config = { extra = 1e300 },
773+
config = { extra = 75 },
768774
atlas = "atlasvoucher",
769775
order = 32668,
770776
pos = { x = 5, y = 1 },
@@ -813,7 +819,7 @@ local fabric = { -- Blank Voucher T3; +2 Joker slots
813819
},
814820
},
815821
key = "fabric",
816-
config = { extra = 2 },
822+
config = { extra = 1 },
817823
atlas = "atlasvoucher",
818824
order = 32669,
819825
pos = { x = 6, y = 0 },
@@ -898,15 +904,15 @@ local asteroglyph = { -- Heiroglyph T3; Set Ante to 0
898904
pos = { x = 5, y = 2 },
899905
requires = { "v_petroglyph" },
900906
pools = { ["Tier3"] = true },
901-
loc_vars = function(self, info_queue)
902-
return { vars = { Cryptid.asteroglyph_ante() } }
907+
config = {
908+
ante_mod = 1
909+
}
910+
loc_vars = function(self, info_queue, card)
911+
return { vars = { card.ability.ante_mod } }
903912
end,
904913
redeem = function(self)
905-
local mod = -G.GAME.round_resets.ante + Cryptid.asteroglyph_ante()
914+
local mod = -card.ability.ante_mod
906915
ease_ante(mod)
907-
G.GAME.modifiers.cry_astero_ante = (G.GAME.modifiers.cry_astero_ante or 0) > 0
908-
and math.min(math.ceil(G.GAME.modifiers.cry_astero_ante ^ 1.13), 1e300)
909-
or 1
910916
G.E_MANAGER:add_event(Event({
911917
func = function()
912918
G.GAME.round_resets.blind_ante = mod
@@ -926,17 +932,6 @@ local asteroglyph = { -- Heiroglyph T3; Set Ante to 0
926932
unlock_card(self)
927933
end
928934
end,
929-
init = function(self)
930-
function Cryptid.asteroglyph_ante()
931-
if not (G.GAME or {}).modifiers then
932-
return 0
933-
end
934-
if not G.GAME.modifiers.cry_astero_ante then
935-
G.GAME.modifiers.cry_astero_ante = 0
936-
end
937-
return G.GAME.modifiers.cry_astero_ante
938-
end
939-
end,
940935
}
941936
local DCUTT3PLACEHOLDER = { -- RESERVED FOR DIRECTOR'S CUT T3
942937
object_type = "Voucher",
@@ -1028,7 +1023,7 @@ local clone_machine = { -- DTag Voucher T3; Double tags become Quintuple Tags an
10281023
pools = { ["Tier3"] = true },
10291024
loc_vars = function(self, info_queue)
10301025
info_queue[#info_queue + 1] = { set = "Tag", key = "tag_double" }
1031-
info_queue[#info_queue + 1] = { set = "Tag", key = "tag_cry_quintuple", specific_vars = { 4 } }
1026+
info_queue[#info_queue + 1] = { set = "Tag", key = "tag_cry_quadruple", specific_vars = { 3 } }
10321027
return { vars = {} }
10331028
end,
10341029
requires = { "v_cry_tag_printer" },
@@ -1123,7 +1118,7 @@ local hyperspacetether = { -- CSL T3; +2 card selection limit, all* selected car
11231118
},
11241119
},
11251120
key = "hyperspacetether",
1126-
config = { extra = 2 },
1121+
config = { extra = 1 },
11271122
atlas = "atlasvoucher",
11281123
pos = { x = 2, y = 5 },
11291124
order = 32767,

‎localization/en-us.lua‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,6 +2075,7 @@ return {
20752075
text = {
20762076
"Create a {C:attention}Jolly Joker{} when",
20772077
"{C:attention}Blind{} is selected",
2078+
"{C:inactive}(Must have room){}"
20782079
},
20792080
},
20802081
j_cry_macabre = {
@@ -3986,16 +3987,15 @@ return {
39863987
v_cry_copies = {
39873988
name = "Copies",
39883989
text = {
3989-
"Double Tags become",
3990-
"{C:attention}Triple Tags{} and are",
3990+
"Double Tags are",
39913991
"{C:attention}2X{} as common",
39923992
},
39933993
},
39943994
v_cry_tag_printer = {
39953995
name = "Tag Printer",
39963996
text = {
39973997
"Double Tags become",
3998-
"{C:attention}Quadruple Tags{} and",
3998+
"{C:attention}Triple Tags{} and",
39993999
"are {C:attention}3X{} as common",
40004000
},
40014001
},
@@ -4076,7 +4076,7 @@ return {
40764076
name = "Mass Production",
40774077
text = {
40784078
"All cards and packs",
4079-
"in shop cost {C:attention}$1{}",
4079+
"in shop are {C:attention}#1#%{} off",
40804080
},
40814081
unlock = {
40824082
"Redeem {C:attention}25",
@@ -4099,8 +4099,8 @@ return {
40994099
v_cry_rerollexchange = {
41004100
name = "Reroll Exchange",
41014101
text = {
4102-
"All rerolls",
4103-
"cost {C:attention}$2{}",
4102+
"Reroll costs",
4103+
"starts at {C:attention}$#1#{}",
41044104
},
41054105
unlock = {
41064106
"{C:attention}Reroll{} the shop",
@@ -4211,7 +4211,7 @@ return {
42114211
v_cry_asteroglyph = {
42124212
name = "Asteroglyph",
42134213
text = {
4214-
"Set Ante to {C:attention}#1#{}",
4214+
"{C:attention}-#1#{} Ante",
42154215
},
42164216
unlock = {
42174217
"Reach Ante {C:attention}36",
@@ -4233,7 +4233,7 @@ return {
42334233
name = "Clone Machine",
42344234
text = {
42354235
"Double Tags become",
4236-
"{C:attention}Quintuple Tags{} and",
4236+
"{C:attention}Quadruple Tags{} and",
42374237
"are {C:attention}4X{} as common",
42384238
},
42394239
},

0 commit comments

Comments
 (0)