Skip to content

Commit a340306

Browse files
MathIsFun0MathIsFun0
authored
Merge pull request #443 from SDM0/main
2 parents b985337 + 69c0e51 commit a340306

File tree

5 files changed

+243
-93
lines changed

5 files changed

+243
-93
lines changed

‎assets/1x/atlasSleeves.png‎

13.6 KB
Loading

‎assets/2x/atlasSleeves.png‎

22.8 KB
Loading

‎items/sleeve.lua‎

Lines changed: 197 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,47 @@
11
if CardSleeves then
2-
local encodedsleeve = CardSleeves.Sleeve({
3-
key = "encoded_sleeve",
4-
name = "Encoded Sleeve",
2+
local veryfairsleeve = CardSleeves.Sleeve({
3+
key = "very_fair_sleeve",
4+
name = "Very Fair Sleeve",
55
atlas = "atlasSleeves",
6-
pos = { x = 1, y = 0 },
7-
config = {},
6+
pos = { x = 0, y = 2 },
7+
config = { hands = -2, discards = -2 },
88
unlocked = true,
9-
unlock_condition = { deck = "Encoded Deck", stake = 1 },
9+
unlock_condition = { deck = "Very Fair Deck", stake = 1 },
1010
loc_vars = function(self)
1111
return { vars = {} }
1212
end,
13-
1413
trigger_effect = function(self, args) end,
1514
apply = function(self)
16-
G.E_MANAGER:add_event(Event({
17-
func = function()
18-
if G.jokers then
19-
-- Adding a before spawning becuase jen banned copy_paste
20-
if
21-
G.P_CENTERS["j_cry_CodeJoker"]
22-
and (G.GAME.banned_keys and not G.GAME.banned_keys["j_cry_CodeJoker"])
23-
then
24-
local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_cry_CodeJoker")
25-
card:add_to_deck()
26-
card:start_materialize()
27-
G.jokers:emplace(card)
28-
end
29-
if
30-
G.P_CENTERS["j_cry_copypaste"]
31-
and (G.GAME.banned_keys and not G.GAME.banned_keys["j_cry_copypaste"])
32-
then
33-
local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_cry_copypaste")
34-
card:add_to_deck()
35-
card:start_materialize()
36-
G.jokers:emplace(card)
37-
end
38-
return true
39-
end
40-
end,
41-
}))
42-
43-
--DOWNSIDE:
15+
G.GAME.starting_params.hands = G.GAME.starting_params.hands + self.config.hands
16+
G.GAME.starting_params.discards = G.GAME.starting_params.discards + self.config.discards
17+
G.GAME.modifiers.cry_no_vouchers = true
18+
end,
19+
init = function(self)
20+
very_fair_quip = {}
21+
local avts = SMODS.add_voucher_to_shop
22+
function SMODS.add_voucher_to_shop(...)
23+
if G.GAME.modifiers.cry_no_vouchers then
24+
return
25+
end
26+
return avts(...)
27+
end
28+
end,
29+
})
4430

45-
G.GAME.joker_rate = 0
46-
G.GAME.planet_rate = 0
47-
G.GAME.tarot_rate = 0
48-
G.GAME.code_rate = 1e100
31+
local infinitesleeve = CardSleeves.Sleeve({
32+
key = "infinite_sleeve",
33+
name = "Unlimited Sleeve",
34+
atlas = "atlasSleeves",
35+
pos = { x = 4, y = 0 },
36+
config = { cry_highlight_limit = 1e20, hand_size = 1 },
37+
unlocked = true,
38+
unlock_condition = { deck = "Infinite Deck", stake = 1 },
39+
loc_vars = function(self)
40+
return { vars = {} }
41+
end,
42+
trigger_effect = function(self, args) end,
43+
apply = function(self)
44+
G.GAME.modifiers.cry_highlight_limit = self.config.cry_highlight_limit
4945
end,
5046
})
5147

@@ -85,40 +81,6 @@ if CardSleeves then
8581
end,
8682
})
8783

88-
local infinitesleeve = CardSleeves.Sleeve({
89-
key = "infinite_sleeve",
90-
name = "Unlimited Sleeve",
91-
atlas = "atlasSleeves",
92-
pos = { x = 4, y = 0 },
93-
config = { cry_highlight_limit = 1e20, hand_size = 1 },
94-
unlocked = true,
95-
unlock_condition = { deck = "Infinite Deck", stake = 1 },
96-
loc_vars = function(self)
97-
return { vars = {} }
98-
end,
99-
trigger_effect = function(self, args) end,
100-
apply = function(self)
101-
G.GAME.modifiers.cry_highlight_limit = self.config.cry_highlight_limit
102-
end,
103-
})
104-
105-
local conveyorsleeve = CardSleeves.Sleeve({
106-
key = "conveyor_sleeve",
107-
name = "Conveyor Sleeve",
108-
atlas = "atlasSleeves",
109-
pos = { x = 5, y = 0 },
110-
config = { cry_conveyor = true },
111-
unlocked = true,
112-
unlock_condition = { deck = "Conveyor Deck", stake = 1 },
113-
loc_vars = function(self)
114-
return { vars = {} }
115-
end,
116-
trigger_effect = function(self, args) end,
117-
apply = function(self)
118-
G.GAME.modifiers.cry_conveyor = true
119-
end,
120-
})
121-
12284
local CCDsleeve = CardSleeves.Sleeve({
12385
key = "ccd_sleeve",
12486
name = "CCD Sleeve",
@@ -166,6 +128,23 @@ if CardSleeves then
166128
end,
167129
})
168130

131+
local conveyorsleeve = CardSleeves.Sleeve({
132+
key = "conveyor_sleeve",
133+
name = "Conveyor Sleeve",
134+
atlas = "atlasSleeves",
135+
pos = { x = 5, y = 0 },
136+
config = { cry_conveyor = true },
137+
unlocked = true,
138+
unlock_condition = { deck = "Conveyor Deck", stake = 1 },
139+
loc_vars = function(self)
140+
return { vars = {} }
141+
end,
142+
trigger_effect = function(self, args) end,
143+
apply = function(self)
144+
G.GAME.modifiers.cry_conveyor = true
145+
end,
146+
})
147+
169148
local redeemedsleeve = CardSleeves.Sleeve({
170149
key = "redeemed_sleeve",
171150
name = "Redeemed Sleeve",
@@ -182,6 +161,30 @@ if CardSleeves then
182161
end,
183162
})
184163

164+
local glowingsleeve = CardSleeves.Sleeve({
165+
key = "glowing_sleeve",
166+
name = "Glowing Sleeve",
167+
atlas = "atlasSleeves",
168+
pos = { x = 0, y = 2 },
169+
config = { cry_glowing = true },
170+
unlocked = true,
171+
unlock_condition = { deck = "Glowing Deck", stake = 1 },
172+
loc_vars = function(self)
173+
return { vars = { " " } }
174+
end,
175+
calculate = function(self, back, context)
176+
if context.context == "eval" and safe_get(G.GAME, "last_blind", "boss") then
177+
for i = 1, #G.jokers.cards do
178+
if not Card.no(G.jokers.cards[i], "immutable", true) then
179+
cry_with_deck_effects(G.jokers.cards[i], function(card)
180+
cry_misprintize(card, { min = 1.25, max = 1.25 }, nil, true)
181+
end)
182+
end
183+
end
184+
end
185+
end,
186+
})
187+
185188
local criticalsleeve = CardSleeves.Sleeve({
186189
key = "critical_sleeve",
187190
name = "Critical Sleeve",
@@ -238,6 +241,119 @@ if CardSleeves then
238241
end
239242
end,
240243
})
244+
245+
local encodedsleeve = CardSleeves.Sleeve({
246+
key = "encoded_sleeve",
247+
name = "Encoded Sleeve",
248+
atlas = "atlasSleeves",
249+
pos = { x = 1, y = 0 },
250+
config = {},
251+
unlocked = true,
252+
unlock_condition = { deck = "Encoded Deck", stake = 1 },
253+
loc_vars = function(self)
254+
return { vars = {} }
255+
end,
256+
257+
trigger_effect = function(self, args) end,
258+
apply = function(self)
259+
G.E_MANAGER:add_event(Event({
260+
func = function()
261+
if G.jokers then
262+
-- Adding a before spawning becuase jen banned copy_paste
263+
if
264+
G.P_CENTERS["j_cry_CodeJoker"]
265+
and (G.GAME.banned_keys and not G.GAME.banned_keys["j_cry_CodeJoker"])
266+
then
267+
local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_cry_CodeJoker")
268+
card:add_to_deck()
269+
card:start_materialize()
270+
G.jokers:emplace(card)
271+
end
272+
if
273+
G.P_CENTERS["j_cry_copypaste"]
274+
and (G.GAME.banned_keys and not G.GAME.banned_keys["j_cry_copypaste"])
275+
then
276+
local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_cry_copypaste")
277+
card:add_to_deck()
278+
card:start_materialize()
279+
G.jokers:emplace(card)
280+
end
281+
return true
282+
end
283+
end,
284+
}))
285+
286+
--DOWNSIDE:
287+
288+
G.GAME.joker_rate = 0
289+
G.GAME.planet_rate = 0
290+
G.GAME.tarot_rate = 0
291+
G.GAME.code_rate = 1e100
292+
end,
293+
})
294+
295+
local nostalgicsleeve = CardSleeves.Sleeve({
296+
key = "beta_sleeve",
297+
name = "Nostalgic Sleeve",
298+
atlas = "atlasSleeves",
299+
pos = { x = 0, y = 2 },
300+
config = { cry_beta = true },
301+
unlocked = true,
302+
unlock_condition = { deck = "Nostalgic Deck", stake = 1 },
303+
loc_vars = function(self)
304+
return { vars = {} }
305+
end,
306+
307+
trigger_effect = function(self, args) end,
308+
apply = function(self)
309+
G.GAME.modifiers.cry_beta = true
310+
end,
311+
})
312+
313+
local bountifulsleeve = CardSleeves.Sleeve({
314+
key = "bountiful_sleeve",
315+
name = "Bountiful Sleeve",
316+
atlas = "atlasSleeves",
317+
pos = { x = 0, y = 2 },
318+
config = { cry_forced_draw_amount = 5 },
319+
unlocked = true,
320+
unlock_condition = { deck = "Bountiful Deck", stake = 1 },
321+
loc_vars = function(self)
322+
return { vars = {} }
323+
end,
324+
325+
trigger_effect = function(self, args) end,
326+
apply = function(self)
327+
G.GAME.modifiers.cry_forced_draw_amount = self.config.cry_forced_draw_amount
328+
end,
329+
})
330+
331+
local beigesleeve = CardSleeves.Sleeve({
332+
key = "beige_sleeve",
333+
name = "Beige Sleeve",
334+
atlas = "atlasSleeves",
335+
pos = { x = 3, y = 1 },
336+
unlocked = true,
337+
unlock_condition = { deck = "Beige Deck", stake = 1 },
338+
loc_vars = function(self)
339+
local key
340+
if self.get_current_deck_key() == "b_cry_beige" then
341+
key = self.key .. "_alt"
342+
return { key = key, vars = {} }
343+
end
344+
return { vars = {} }
345+
end,
346+
347+
trigger_effect = function(self, args) end,
348+
apply = function(self)
349+
if self.get_current_deck_key() ~= "b_cry_beige" then
350+
G.GAME.modifiers.cry_common_value_quad = true
351+
else
352+
G.GAME.modifiers.cry_uncommon_value_quad = true
353+
end
354+
end,
355+
})
356+
241357
local legendarysleeve = CardSleeves.Sleeve({
242358
key = "legendary_sleeve",
243359
name = "Legendary Sleeve",
@@ -328,38 +444,26 @@ if CardSleeves then
328444
}))
329445
end,
330446
})
331-
local bountifulsleeve = CardSleeves.Sleeve({
332-
key = "bountiful_sleeve",
333-
name = "Bountiful Sleeve",
334-
atlas = "atlasSleeves",
335-
pos = { x = 0, y = 2 },
336-
config = { cry_forced_draw_amount = 5 },
337-
unlocked = true,
338-
unlock_condition = { deck = "Bountiful Deck", stake = 1 },
339-
loc_vars = function(self)
340-
return { vars = {} }
341-
end,
342447

343-
trigger_effect = function(self, args) end,
344-
apply = function(self)
345-
G.GAME.modifiers.cry_forced_draw_amount = self.config.cry_forced_draw_amount
346-
end,
347-
})
348448
local sleeveitems = {}
349449
if CardSleeves then
350450
sleeveitems = {
351-
encodedsleeve,
451+
veryfairsleeve,
452+
infinitesleeve,
352453
equilibriumsleeve,
353454
misprintsleeve,
354-
infinitesleeve,
355-
conveyorsleeve,
356455
CCDsleeve,
357456
wormholesleeve,
457+
conveyorsleeve,
358458
redeemedsleeve,
459+
glowingsleeve,
359460
criticalsleeve,
461+
encodedsleeve,
462+
nostalgicsleeve,
463+
bountifulsleeve,
464+
beigesleeve,
360465
legendarysleeve,
361466
spookysleeve,
362-
bountifulsleeve,
363467
}
364468
end
365469
end

‎lib/overrides.lua‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,11 @@ function create_card(_type, area, legendary, _rarity, skip_materialize, soulable
994994
cry_misprintize(card, { min = 4, max = 4 }, nil, true)
995995
end
996996
end
997+
if _type == "Joker" and G.GAME.modifiers.cry_uncommon_value_quad then
998+
if card.config.center.rarity == 2 then
999+
cry_misprintize(card, { min = 4, max = 4 }, nil, true)
1000+
end
1001+
end
9971002
if card.ability.consumeable and card.pinned then -- counterpart is in Sticker.toml
9981003
G.GAME.cry_pinned_consumeables = G.GAME.cry_pinned_consumeables + 0
9991004
end

0 commit comments

Comments
 (0)