Skip to content

Commit 2cfb8ad

Browse files
lord-rubylord-ruby
committed
revert a few things
1 parent 109b389 commit 2cfb8ad

File tree

6 files changed

+93
-70
lines changed

6 files changed

+93
-70
lines changed

‎items/epic.lua‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -405,26 +405,32 @@ local canvas = {
405405
cost = 18,
406406
blueprint_compat = true,
407407
atlas = "atlasepic",
408+
loc_vars = function(self, info_queue, center)
409+
return { key = Cryptid.gameset_loc(self, { modest = "balanced" }) }
410+
end,
408411
calculate = function(self, card, context)
409-
if
410-
context.retrigger_joker_check
411-
and not context.retrigger_joker
412-
and context.other_card == G.jokers.cards[1]
413-
then
412+
if context.retrigger_joker_check and not context.retrigger_joker then
414413
local num_retriggers = 0
415-
local rarities = {}
416414
for i = 1, #G.jokers.cards do
417-
local joker = G.jokers.cards[i]
418-
if not rarities[joker.config.center.rarity] then
419-
rarities[joker.config.center.rarity] = true
415+
if
416+
card.T.x + card.T.w / 2 < G.jokers.cards[i].T.x + G.jokers.cards[i].T.w / 2
417+
and G.jokers.cards[i].config.center.rarity ~= 1
418+
and (G.jokers.cards[i].config.center.rarity ~= "cry_candy" or Card.get_gameset(card) ~= "modest")
419+
then
420420
num_retriggers = num_retriggers + 1
421421
end
422422
end
423-
return {
424-
message = localize("k_again_ex"),
425-
repetitions = Card.get_gameset(card) ~= "modest" and num_retriggers or math.min(2, num_retriggers),
426-
card = card,
427-
}
423+
if
424+
card.T
425+
and context.other_card.T
426+
and (card.T.x + card.T.w / 2 > context.other_card.T.x + context.other_card.T.w / 2)
427+
then
428+
return {
429+
message = localize("k_again_ex"),
430+
repetitions = Card.get_gameset(card) ~= "modest" and num_retriggers or math.min(2, num_retriggers),
431+
card = card,
432+
}
433+
end
428434
end
429435
end,
430436
cry_credits = {
@@ -840,16 +846,18 @@ local M = {
840846
demicoloncompat = true,
841847
loc_vars = function(self, info_queue, center)
842848
info_queue[#info_queue + 1] = G.P_CENTERS.j_jolly
849+
if not center.edition or not center.edition.negative then
850+
info_queue[#info_queue + 1] = G.P_CENTERS.e_negative
851+
end
843852
end,
844853
atlas = "atlasepic",
845854
calculate = function(self, card, context)
846855
if (context.setting_blind and not (context.blueprint_card or self).getting_sliced) or context.forcetrigger then
847-
if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
848-
local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
849-
card:add_to_deck()
850-
G.jokers:emplace(card)
851-
return nil, true
852-
end
856+
local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
857+
card:add_to_deck()
858+
card:set_edition("e_negative")
859+
G.jokers:emplace(card)
860+
return nil, true
853861
end
854862
end,
855863
pools = { ["M"] = true },
@@ -1932,6 +1940,7 @@ local soccer = {
19321940
card.ability.extra.holygrail = math.floor(card.ability.extra.holygrail)
19331941
local mod = card.ability.extra.holygrail
19341942
G.consumeables.config.card_limit = G.consumeables.config.card_limit + mod
1943+
G.jokers.config.card_limit = G.jokers.config.card_limit + mod
19351944
G.hand:change_size(mod)
19361945
SMODS.change_booster_limit(mod)
19371946
SMODS.change_voucher_limit(mod)
@@ -1940,6 +1949,7 @@ local soccer = {
19401949
card.ability.extra.holygrail = math.floor(card.ability.extra.holygrail)
19411950
local mod = card.ability.extra.holygrail
19421951
G.consumeables.config.card_limit = G.consumeables.config.card_limit - mod
1952+
G.jokers.config.card_limit = G.jokers.config.card_limit - mod
19431953
G.hand:change_size(-mod)
19441954
SMODS.change_booster_limit(-mod)
19451955
SMODS.change_voucher_limit(-mod)

‎items/m.lua‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -857,15 +857,13 @@ local scrabble = {
857857
card and card.ability.extra.odds or self.config.extra.odds
858858
)
859859
then
860-
if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
861-
check = true
862-
local card = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "scrabbletile")
863-
if Cryptid.enabled("e_cry_m") == true then
864-
card:set_edition({ cry_m = true })
865-
end
866-
card:add_to_deck()
867-
G.jokers:emplace(card)
860+
check = true
861+
local card = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "scrabbletile")
862+
if Cryptid.enabled("e_cry_m") == true then
863+
card:set_edition({ cry_m = true })
868864
end
865+
card:add_to_deck()
866+
G.jokers:emplace(card)
869867
end
870868
if check then
871869
card_eval_status_text(
@@ -954,19 +952,15 @@ local sacrifice = {
954952
card.ability.extra.unc = 1
955953
end
956954
for i = 1, math.min(card.ability.immutable.max_spawns, card.ability.extra.unc) do
957-
if G.GAME.joker_buffer + #G.jokers.cards < G.jokers.config.card_limit then
958-
local unc = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "sacrifice")
959-
unc:add_to_deck()
960-
G.jokers:emplace(unc)
961-
unc:start_materialize()
962-
end
955+
local unc = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "sacrifice")
956+
unc:add_to_deck()
957+
G.jokers:emplace(unc)
958+
unc:start_materialize()
963959
end
964960
for i = 1, math.min(card.ability.immutable.max_spawns, card.ability.extra.jollies) do
965-
if G.GAME.joker_buffer + #G.jokers.cards < G.jokers.config.card_limit then
966-
local jolly = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
967-
jolly:add_to_deck()
968-
G.jokers:emplace(jolly)
969-
end
961+
local jolly = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
962+
jolly:add_to_deck()
963+
G.jokers:emplace(jolly)
970964
end
971965
card_eval_status_text(
972966
context.blueprint_card or card,

‎items/misc_joker.lua‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ local wee_fib = {
470470
config = {
471471
extra = {
472472
mult = 0,
473-
mult_mod = 2,
473+
mult_mod = 3,
474474
},
475475
},
476476
gameset_config = {
@@ -2710,6 +2710,7 @@ local magnet = {
27102710
extra = {
27112711
money = 2,
27122712
slots = 4,
2713+
multiplier = 5
27132714
},
27142715
},
27152716
gameset_config = {
@@ -2729,7 +2730,7 @@ local magnet = {
27292730
return {
27302731
vars = {
27312732
number_format(center.ability.extra.money),
2732-
4 - (Card.get_gameset(card) == "modest" and 1 or 0),
2733+
number_format(card.ability.extra.multiplier - (Card.get_gameset(card) == "modest" and 1 or 0)),
27332734
number_format(center.ability.extra.slots),
27342735
},
27352736
}
@@ -2738,14 +2739,14 @@ local magnet = {
27382739
calculate = function(self, card, context)
27392740
if context.forcetrigger then
27402741
ease_dollars(
2741-
lenient_bignum(to_big(card.ability.extra.money) * (4 - (Card.get_gameset(card) == "modest" and 1 or 0)))
2742+
lenient_bignum(to_big(card.ability.extra.money) * (card.ability.extra.multiplier - (Card.get_gameset(card) == "modest" and 1 or 0)))
27422743
)
27432744
end
27442745
end,
27452746
calc_dollar_bonus = function(self, card)
27462747
if to_big(#G.jokers.cards) <= to_big(card.ability.extra.slots) then
27472748
return lenient_bignum(
2748-
to_big(card.ability.extra.money) * (4 - (Card.get_gameset(card) == "modest" and 1 or 0))
2749+
to_big(card.ability.extra.money) * (card.ability.extra.multiplier - (Card.get_gameset(card) == "modest" and 1 or 0))
27492750
)
27502751
else
27512752
return lenient_bignum(card.ability.extra.money)
@@ -8582,7 +8583,7 @@ local kidnap = {
85828583
order = 23,
85838584
pos = { x = 1, y = 2 },
85848585
config = {
8585-
extra = { money = 3 },
8586+
extra = { money = 4 },
85868587
},
85878588
gameset_config = {
85888589
modest = {

‎items/spectral.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ local vacuum = {
156156
name = "cry-Vacuum",
157157
key = "vacuum",
158158
pos = { x = 3, y = 1 },
159-
config = { extra = 3 },
159+
config = { extra = 4 },
160160
cost = 4,
161161
order = 452,
162162
atlas = "atlasnotjokers",

‎items/voucher.lua‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -440,18 +440,11 @@ local massproduct = { -- Clearance Sale T3; All cards and packs in the shop cost
440440
config = {
441441
discount_percentage = 75,
442442
},
443-
loc_vars = function(self, q, card)
444-
return {
445-
vars = {
446-
card.ability.discount_percentage,
447-
},
448-
}
449-
end,
450-
redeem = function(self, card)
443+
redeem = function(self)
451444
G.E_MANAGER:add_event(Event({
452445
func = function()
453446
G.GAME.backup_discount_percent = G.GAME.backup_discount_percent or G.GAME.discount_percent
454-
G.GAME.discount_percent = card.ability.discount_percentage
447+
G.GAME.discount_percent = 100
455448
for k, v in pairs(G.I.CARD) do
456449
if v.set_cost then
457450
v:set_cost()
@@ -823,7 +816,7 @@ local fabric = { -- Blank Voucher T3; +2 Joker slots
823816
},
824817
},
825818
key = "fabric",
826-
config = { extra = 1 },
819+
config = { extra = 2 },
827820
atlas = "atlasvoucher",
828821
order = 32669,
829822
pos = { x = 6, y = 0 },
@@ -908,15 +901,15 @@ local asteroglyph = { -- Heiroglyph T3; Set Ante to 0
908901
pos = { x = 5, y = 2 },
909902
requires = { "v_petroglyph" },
910903
pools = { ["Tier3"] = true },
911-
config = {
912-
ante_mod = 2,
913-
},
914-
loc_vars = function(self, info_queue, card)
915-
return { vars = { card.ability.ante_mod } }
904+
loc_vars = function(self, info_queue)
905+
return { vars = { Cryptid.asteroglyph_ante() } }
916906
end,
917-
redeem = function(self, card)
918-
local mod = -card.ability.ante_mod
907+
redeem = function(self)
908+
local mod = -G.GAME.round_resets.ante + Cryptid.asteroglyph_ante()
919909
ease_ante(mod)
910+
G.GAME.modifiers.cry_astero_ante = (G.GAME.modifiers.cry_astero_ante or 0) > 0
911+
and math.min(math.ceil(G.GAME.modifiers.cry_astero_ante ^ 1.13), 1e300)
912+
or 1
920913
G.E_MANAGER:add_event(Event({
921914
func = function()
922915
G.GAME.round_resets.blind_ante = mod
@@ -936,6 +929,17 @@ local asteroglyph = { -- Heiroglyph T3; Set Ante to 0
936929
unlock_card(self)
937930
end
938931
end,
932+
init = function(self)
933+
function Cryptid.asteroglyph_ante()
934+
if not (G.GAME or {}).modifiers then
935+
return 0
936+
end
937+
if not G.GAME.modifiers.cry_astero_ante then
938+
G.GAME.modifiers.cry_astero_ante = 0
939+
end
940+
return G.GAME.modifiers.cry_astero_ante
941+
end
942+
end,
939943
}
940944
local DCUTT3PLACEHOLDER = { -- RESERVED FOR DIRECTOR'S CUT T3
941945
object_type = "Voucher",
@@ -1122,7 +1126,7 @@ local hyperspacetether = { -- CSL T3; +2 card selection limit, all* selected car
11221126
},
11231127
},
11241128
key = "hyperspacetether",
1125-
config = { extra = 1 },
1129+
config = { extra = 2 },
11261130
atlas = "atlasvoucher",
11271131
pos = { x = 2, y = 5 },
11281132
order = 32767,

‎localization/en-us.lua‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,9 +1259,23 @@ return {
12591259
j_cry_canvas = {
12601260
name = "Canvas",
12611261
text = {
1262-
"{C:attention}Retrigger{} the leftmost {C:attention}Joker{}",
1263-
"once for {C:attention}every{} unique {C:attention}Joker Rarity{C:attention}",
1264-
"currently held",
1262+
"{C:attention}Retrigger{} all {C:attention}Jokers{} to the left",
1263+
"once for {C:attention}every{} non-{C:blue}Common{C:attention} Joker{}",
1264+
"to the right of this Joker",
1265+
},
1266+
unlock = {
1267+
"Retrigger a {C:attention}Joker",
1268+
"{C:attention}114{} times",
1269+
"in one hand",
1270+
},
1271+
},
1272+
j_cry_canvas_balanced = {
1273+
name = "Canvas",
1274+
text = {
1275+
"{C:attention}Retrigger{} all {C:attention}Jokers{} to the left",
1276+
"once for {C:attention}every{} non-{C:blue}Common{C:attention} Joker{}",
1277+
"to the right of this Joker",
1278+
"{C:inactive}(Up to 2 retriggers)",
12651279
},
12661280
unlock = {
12671281
"Retrigger a {C:attention}Joker",
@@ -2072,9 +2086,9 @@ return {
20722086
j_cry_M = {
20732087
name = "M",
20742088
text = {
2075-
"Create a {C:attention}Jolly Joker{} when",
2089+
"Create a {C:dark_edition}Negative{}",
2090+
"{C:attention}Jolly Joker{} when",
20762091
"{C:attention}Blind{} is selected",
2077-
"{C:inactive}(Must have room){}",
20782092
},
20792093
},
20802094
j_cry_macabre = {
@@ -3945,7 +3959,7 @@ return {
39453959
name = "Mass Production",
39463960
text = {
39473961
"All cards and packs",
3948-
"in shop are {C:attention}#1#%{} off",
3962+
"in shop cost {C:attention}$1{}",
39493963
},
39503964
unlock = {
39513965
"Redeem {C:attention}25",
@@ -4080,7 +4094,7 @@ return {
40804094
v_cry_asteroglyph = {
40814095
name = "Asteroglyph",
40824096
text = {
4083-
"{C:attention}-#1#{} Ante",
4097+
"Set Ante to {C:attention}#1#{}",
40844098
},
40854099
unlock = {
40864100
"Reach Ante {C:attention}36",

0 commit comments

Comments
 (0)