Skip to content

Finishing Out The Rarity Decks #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexZGreat wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Finishing Out The Rarity Decks #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1964402
Added new edition decks
AlexZGreat Jul 18, 2025
0794831
jolly-bot: auto-format Lua files using Stylua
Jul 18, 2025
6394e61
ordering adjustment
AlexZGreat Jul 18, 2025
0708e42
jolly-bot: auto-format Lua files using Stylua
Jul 18, 2025
ccc23ea
cyan deck hook
AlexZGreat Jul 18, 2025
58a73d1
jolly-bot: auto-format Lua files using Stylua
Jul 18, 2025
df40d26
New deck locs
AlexZGreat Jul 18, 2025
97959ee
jolly-bot: auto-format Lua files using Stylua
Jul 18, 2025
b19a99a
deck art
AlexZGreat Jul 18, 2025
ea44aed
deck art
AlexZGreat Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/1x/atlasdeck.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/atlasdeck.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
202 changes: 201 additions & 1 deletion items/deck.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ local beige = {
name = "cry-Beige",
key = "beige",
pos = { x = 1, y = 6 },
order = 15,
order = 17,
atlas = "atlasdeck",
apply = function(self)
G.GAME.modifiers.cry_common_value_quad = true
Expand All @@ -648,6 +648,136 @@ local beige = {
end
end,
}
local magenta = {
object_type = "Back",
dependencies = {
items = {
"set_cry_deck",
},
},
name = "cry-Magenta",
key = "magenta",
pos = { x = 4, y = 6 },
order = 18,
atlas = "atlasdeck",
calculate = function(self, back, context)
if context.selling_card and context.card.config.center.set == "Joker" and context.card.sell_cost > 0 then
G.E_MANAGER:add_event(Event({
func = function()
if G.jokers then
local card = create_card("Joker", G.jokers, nil, 0.95, nil, nil, nil, "cry_magenta")
card.sell_cost = context.card.sell_cost - 1
card:add_to_deck()
card:start_materialize()
G.jokers:emplace(card)
return true
end
end,
}))
end
end,
unlocked = false,
check_for_unlock = function(self, args)
if args.type == "discover_amount" then
if args.amount >= 250 then
unlock_card(self)
end
end
if args.type == "cry_lock_all" then
lock_card(self)
end
if args.type == "cry_unlock_all" then
unlock_card(self)
end
end,
}
local cyan = {
object_type = "Back",
dependencies = {
items = {
"set_cry_deck",
},
},
name = "cry-Cyan",
key = "cyan",
pos = { x = 5, y = 6 },
order = 19,
atlas = "atlasdeck",
apply = function(self)
G.GAME.modifiers.cry_rare_blueprints = true
end,
unlocked = false,
check_for_unlock = function(self, args)
if args.type == "discover_amount" then
if args.amount >= 300 then
unlock_card(self)
end
end
if args.type == "cry_lock_all" then
lock_card(self)
end
if args.type == "cry_unlock_all" then
unlock_card(self)
end
end,
}
local herculean = {
object_type = "Back",
dependencies = {
items = {
"set_cry_deck",
},
},
name = "cry-Herculean",
key = "herculean",
pos = { x = 4, y = 2 },
order = 15,
atlas = "placeholders",
calculate = function(self, back, context)
if
context.context == "eval"
and G.GAME.last_blind
and G.GAME.last_blind.boss
and G.GAME.current_round.discards_used == 0
and G.GAME.current_round.discards_left > 0
then
G.E_MANAGER:add_event(Event({
func = function()
add_tag(Tag("tag_cry_epic"))
play_sound("generic1", 0.9 + math.random() * 0.1, 0.8)
play_sound("holo1", 1.2 + math.random() * 0.1, 0.4)
return true
end,
}))
G.E_MANAGER:add_event(Event({
trigger = "after",
delay = 1,
func = function()
add_tag(Tag("tag_cry_epic"))
play_sound("generic1", 0.9 + math.random() * 0.1, 0.8)
play_sound("holo1", 1.2 + math.random() * 0.1, 0.4)
return true
end,
}))
end
end,
unlocked = false,
check_for_unlock = function(self, args)
if Cryptid.safe_get(G, "jokers") then
for i = 1, #G.jokers.cards do
if G.jokers.cards[i].config.center.rarity == "cry_epic" then
unlock_card(self)
end
end
end
if args.type == "cry_lock_all" then
lock_card(self)
end
if args.type == "cry_unlock_all" then
unlock_card(self)
end
end,
}
local blank = {
object_type = "Back",
dependencies = {
Expand Down Expand Up @@ -970,9 +1100,40 @@ local antimatter = {
then
G.GAME.modifiers.cry_common_value_quad = true
end
--Cyan Deck
if
(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_cyan", "wins", 8) or 0) ~= 0
or skip
then
G.GAME.modifiers.cry_rare_blueprints = true
end
end

function Cryptid.antimatter_trigger_final_scoring(self, context, skip)
--Magenta Deck
if context.selling_card and context.card.config.center.set == "Joker" and context.card.sell_cost > 0 then
if
(
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_magenta", "wins", 8)
or 0
)
~= 0
or skip
then
G.E_MANAGER:add_event(Event({
func = function()
if G.jokers then
local card = create_card("Joker", G.jokers, nil, 0.95, nil, nil, nil, "cry_magenta")
card.sell_cost = context.card.sell_cost - 1
card:add_to_deck()
card:start_materialize()
G.jokers:emplace(card)
return true
end
end,
}))
end
end
if context.context == "final_scoring_step" then
local crit_poll = pseudorandom(pseudoseed("cry_critical"))
crit_poll = crit_poll / (G.GAME.probabilities.normal or 1)
Expand Down Expand Up @@ -1128,6 +1289,42 @@ local antimatter = {
end
end
end
--Herculean Deck
if
(
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_cry_herculean", "wins", 8)
or 0
)
~= 0
or skip
then
if
context.context == "eval"
and G.GAME.last_blind
and G.GAME.last_blind.boss
and G.GAME.current_round.discards_used == 0
and G.GAME.current_round.discards_left > 0
then
G.E_MANAGER:add_event(Event({
func = function()
add_tag(Tag("tag_cry_epic"))
play_sound("generic1", 0.9 + math.random() * 0.1, 0.8)
play_sound("holo1", 1.2 + math.random() * 0.1, 0.4)
return true
end,
}))
G.E_MANAGER:add_event(Event({
trigger = "after",
delay = 1,
func = function()
add_tag(Tag("tag_cry_epic"))
play_sound("generic1", 0.9 + math.random() * 0.1, 0.8)
play_sound("holo1", 1.2 + math.random() * 0.1, 0.4)
return true
end,
}))
end
end
--Anaglyph Deck
if
(Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_anaglyph", "wins", 8) or 0)
Expand Down Expand Up @@ -1250,6 +1447,9 @@ return {
beta,
bountiful,
beige,
magenta,
cyan,
herculean,
blank,
antimatter,
e_deck,
Expand Down
10 changes: 5 additions & 5 deletions items/enhanced.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ local e_deck = {
},
name = "cry-Edition Deck",
key = "e_deck",
order = 17,
order = 20,
pos = { x = 5, y = 2 },
loc_vars = function(self, info_queue, center)
local aaa = Cryptid.enhanced_deck_info(G.cry_edeck_center and self or {})
Expand Down Expand Up @@ -141,7 +141,7 @@ local et_deck = {
},
name = "cry-Enhancement Deck",
key = "et_deck",
order = 18,
order = 21,
pos = { x = 5, y = 2 },
edeck_type = "enhancement",
config = {},
Expand Down Expand Up @@ -184,7 +184,7 @@ local sk_deck = {
},
name = "cry-Sticker Deck",
key = "sk_deck",
order = 19,
order = 22,
pos = { x = 5, y = 2 },
edeck_type = "sticker",
config = {},
Expand Down Expand Up @@ -236,7 +236,7 @@ local st_deck = {
name = "cry-Suit Deck",
key = "st_deck",
config = {},
order = 20,
order = 23,
pos = { x = 5, y = 2 },
edeck_type = "suit",
loc_vars = function(self, info_queue, center)
Expand Down Expand Up @@ -286,7 +286,7 @@ local sl_deck = {
},
name = "cry-Seal Deck",
key = "sl_deck",
order = 21,
order = 24,
pos = { x = 5, y = 2 },
config = {},
edeck_type = "seal",
Expand Down
Loading