Skip to content

Commit 2577b00

Browse files
MathIsFun0MathIsFun0
committed
revamp enhanced deck UI/selection
1 parent c941da8 commit 2577b00

File tree

7 files changed

+289
-564
lines changed

7 files changed

+289
-564
lines changed

‎Cryptid.lua‎

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -213,75 +213,6 @@ local cryptidTabs = function() return {
213213
cry_nodes[#cry_nodes + 1] = config
214214
cry_nodes[#cry_nodes + 1] = UIBox_button({button = 'your_collection_content_sets', label = {localize('b_content_sets')}, count = modsCollectionTally(G.P_CENTER_POOLS["Content Set"]), minw = 5, minh = 1.7, scale = 0.6, id = 'your_collection_jokers'})
215215

216-
--Enchancement deck toggles (WIP, only accounts for vanilla stuff at the moment)
217-
cry_nodes[#cry_nodes + 1] = create_option_cycle({
218-
label = localize("cry_deck_one"),
219-
scale = 0.6,
220-
w = 4,
221-
options = {
222-
localize{type = "name_text", set = "Edition", key = "e_foil"},
223-
localize{type = "name_text", set = "Edition", key = "e_holo"},
224-
localize{type = "name_text", set = "Edition", key = "e_polychrome"},
225-
localize{type = "name_text", set = "Edition", key = "e_negative"},
226-
},
227-
opt_callback = 'cry_enhancement_deck_one',
228-
current_option = safe_get(G.PROFILES, G.SETTINGS.profile, "cry_enhancement_memory_one") or 1,
229-
})
230-
cry_nodes[#cry_nodes + 1] = create_option_cycle({
231-
label = localize("cry_deck_two"),
232-
scale = 0.6,
233-
w = 4,
234-
options = {
235-
localize{type = "name_text", set = "Enhanced", key = "m_bonus"},
236-
localize{type = "name_text", set = "Enhanced", key = "m_mult"},
237-
localize{type = "name_text", set = "Enhanced", key = "m_wild"},
238-
localize{type = "name_text", set = "Enhanced", key = "m_glass"},
239-
localize{type = "name_text", set = "Enhanced", key = "m_steel"},
240-
localize{type = "name_text", set = "Enhanced", key = "m_gold"},
241-
localize{type = "name_text", set = "Enhanced", key = "m_lucky"},
242-
},
243-
opt_callback = 'cry_enhancement_deck_two',
244-
current_option = safe_get(G.PROFILES, G.SETTINGS.profile, "cry_enhancement_memory_two") or 1,
245-
})
246-
cry_nodes[#cry_nodes + 1] = create_option_cycle({
247-
label = localize("cry_deck_three"),
248-
scale = 0.6,
249-
w = 4,
250-
options = {
251-
localize{type = "name_text", set = "Other", key = "eternal"},
252-
localize{type = "name_text", set = "Other", key = "perishable"},
253-
localize{type = "name_text", set = "Other", key = "rental"},
254-
localize{type = "name_text", set = "Other", key = "pinned_left"},
255-
},
256-
opt_callback = 'cry_enhancement_deck_three',
257-
current_option = safe_get(G.PROFILES, G.SETTINGS.profile, "cry_enhancement_memory_three") or 1,
258-
})
259-
cry_nodes[#cry_nodes + 1] = create_option_cycle({
260-
label = localize("cry_deck_four"),
261-
scale = 0.6,
262-
w = 4,
263-
options = {
264-
localize("Spades", 'suits_plural'),
265-
localize("Hearts", 'suits_plural'),
266-
localize("Clubs", 'suits_plural'),
267-
localize("Diamonds", 'suits_plural'),
268-
},
269-
opt_callback = 'cry_enhancement_deck_four',
270-
current_option = safe_get(G.PROFILES, G.SETTINGS.profile, "cry_enhancement_memory_four") or 1,
271-
})
272-
cry_nodes[#cry_nodes + 1] = create_option_cycle({
273-
label = localize("cry_deck_five"),
274-
scale = 0.6,
275-
w = 4,
276-
options = {
277-
localize{type = "name_text", set = "Other", key = "gold_seal"},
278-
localize{type = "name_text", set = "Other", key = "blue_seal"},
279-
localize{type = "name_text", set = "Other", key = "red_seal"},
280-
localize{type = "name_text", set = "Other", key = "purple_seal"},
281-
},
282-
opt_callback = 'cry_enhancement_deck_five',
283-
current_option = safe_get(G.PROFILES, G.SETTINGS.profile, "cry_enhancement_memory_five") or 1,
284-
})
285216
return {
286217
n = G.UIT.ROOT,
287218
config = {

‎items/code.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ local hooked = {
539539
object_type = "Sticker",
540540
atlas = "sticker",
541541
pos = { x = 5, y = 3 },
542+
no_edeck = true,
542543
loc_vars = function(self, info_queue, card)
543544
local var
544545
if not card or not card.hook_id then

‎items/deck.lua‎

Lines changed: 1 addition & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -316,183 +316,7 @@ local antimatter = {
316316
end,
317317
atlas = "atlasdeck",
318318
}
319-
local e_deck = {
320-
object_type = "Back",
321-
name = "cry-Edition Deck",
322-
key = "e_deck",
323-
order = 17,
324-
pos = { x = 1, y = 0 },
325-
atlas = "atlasdeck",
326-
loc_vars = function(self, info_queue, center)
327-
local aaa
328-
-- Won't update to the correct value if it's switched while in a game and then viewing the new value while in that same game
329-
-- Oh well
330-
if G.GAME.modifiers.cry_force_edition and not G.GAME.viewed_back then
331-
aaa = G.GAME.modifiers.cry_force_edition
332-
else
333-
aaa = cry_get_enchanced_deck_info()
334-
end
335-
return { vars = { localize{type = "name_text", set = "Edition", key = "e_" .. aaa} } }
336-
end,
337-
apply = function(self)
338-
local aaa = cry_get_enchanced_deck_info()
339-
G.GAME.modifiers.cry_force_edition = aaa
340-
--Ban Edition tags (They will never redeem)
341-
for k, v in pairs(G.P_TAGS) do
342-
if v.config and v.config.edition then
343-
G.GAME.banned_keys[k] = true
344-
end
345-
end
346-
G.E_MANAGER:add_event(Event({
347-
func = function()
348-
for c = #G.playing_cards, 1, -1 do
349-
G.playing_cards[c]:set_edition(aaa, true, true)
350-
end
351-
return true
352-
end,
353-
}))
354-
end,
355-
}
356-
local et_deck = {
357-
object_type = "Back",
358-
name = "cry-Enhancement Deck",
359-
key = "et_deck",
360-
order = 18,
361-
pos = { x = 1, y = 0 },
362-
atlas = "atlasdeck",
363-
loc_vars = function(self, info_queue, center)
364-
local aaa,bbb
365-
if G.GAME.modifiers.cry_force_enhancement and not G.GAME.viewed_back then
366-
bbb = G.GAME.modifiers.cry_force_enhancement
367-
else
368-
aaa,bbb = cry_get_enchanced_deck_info()
369-
end
370-
return { vars = { localize{type = "name_text", set = "Enhanced", key = bbb} } }
371-
end,
372-
apply = function(self)
373-
local aaa,bbb = cry_get_enchanced_deck_info()
374-
G.GAME.modifiers.cry_force_enhancement = bbb
375-
G.E_MANAGER:add_event(Event({
376-
func = function()
377-
for c = #G.playing_cards, 1, -1 do
378-
G.playing_cards[c]:set_ability(G.P_CENTERS[bbb])
379-
end
380-
return true
381-
end,
382-
}))
383-
end,
384-
}
385-
local sk_deck = {
386-
object_type = "Back",
387-
name = "cry-Sticker Deck",
388-
key = "sk_deck",
389-
order = 19,
390-
pos = { x = 1, y = 0 },
391-
atlas = "atlasdeck",
392-
loc_vars = function(self, info_queue, center)
393-
local aaa,bbb,ccc
394-
if G.GAME.modifiers.cry_force_sticker and not G.GAME.viewed_back then
395-
ccc = G.GAME.modifiers.cry_force_sticker
396-
else
397-
aaa,bbb,ccc = cry_get_enchanced_deck_info()
398-
end
399-
if ccc == "pinned" then ccc = "pinned_left" end
400-
return { vars = { localize{type = "name_text", set = "Other", key = ccc} } }
401-
end,
402-
apply = function(self)
403-
local aaa,bbb,ccc = cry_get_enchanced_deck_info()
404-
G.GAME.modifiers.cry_force_sticker = ccc
405-
G.E_MANAGER:add_event(Event({
406-
func = function()
407-
for c = #G.playing_cards, 1, -1 do
408-
G.playing_cards[c].config.center.eternal_compat = true
409-
G.playing_cards[c].config.center.perishable_compat = true
410-
if
411-
SMODS.Stickers[ccc]
412-
and SMODS.Stickers[ccc].apply
413-
then
414-
SMODS.Stickers[ccc]:apply(G.playing_cards[c], true)
415-
else
416-
G.playing_cards[c]["set_" .. ccc](G.playing_cards[c], true)
417-
end
418-
end
419-
return true
420-
end,
421-
}))
422-
end,
423-
}
424-
local st_deck = {
425-
object_type = "Back",
426-
name = "cry-Suit Deck",
427-
key = "st_deck",
428-
order = 20,
429-
pos = { x = 1, y = 0 },
430-
atlas = "atlasdeck",
431-
loc_vars = function(self, info_queue, center)
432-
local aaa,bbb,ccc,ddd
433-
if G.GAME.modifiers.cry_force_suit and not G.GAME.viewed_back then
434-
ddd = G.GAME.modifiers.cry_force_suit
435-
else
436-
aaa,bbb,ccc,ddd = cry_get_enchanced_deck_info()
437-
end
438-
return { vars = { localize(ddd, 'suits_plural') } }
439-
end,
440-
apply = function(self)
441-
local aaa,bbb,ccc,ddd = cry_get_enchanced_deck_info()
442-
if ddd == "Spades" then
443-
G.GAME.bosses_used["bl_goad"] = 1e308
444-
elseif ddd == "Hearts" then
445-
G.GAME.bosses_used["bl_head"] = 1e308
446-
elseif ddd == "Clubs" then
447-
G.GAME.bosses_used["bl_club"] = 1e308
448-
elseif ddd == "Diamonds" then
449-
G.GAME.bosses_used["bl_window"] = 1e308
450-
end
451-
G.GAME.modifiers.cry_force_suit = ddd
452-
G.E_MANAGER:add_event(Event({
453-
func = function()
454-
for c = #G.playing_cards, 1, -1 do
455-
G.playing_cards[c]:change_suit(ddd)
456-
end
457-
return true
458-
end,
459-
}))
460-
end,
461-
}
462-
local sl_deck = {
463-
object_type = "Back",
464-
name = "cry-Seal Deck",
465-
key = "sl_deck",
466-
order = 21,
467-
pos = { x = 1, y = 0 },
468-
atlas = "atlasdeck",
469-
loc_vars = function(self, info_queue, center)
470-
local aaa,bbb,ccc,ddd,eee
471-
if G.GAME.modifiers.cry_force_seal and not G.GAME.viewed_back then
472-
eee = G.GAME.modifiers.cry_force_seal
473-
else
474-
aaa,bbb,ccc,ddd,eee = cry_get_enchanced_deck_info()
475-
end
476-
--Scuffed but oh well
477-
if eee == "Gold" then eee = "gold_seal"
478-
elseif eee == "Red" then eee = "red_seal"
479-
elseif eee == "Blue" then eee = "blue_seal"
480-
elseif eee == "Purple" then eee = "purple_seal" end
481-
return { vars = { localize{type = "name_text", set = "Other", key = eee} } }
482-
end,
483-
apply = function(self)
484-
local aaa,bbb,ccc,ddd,eee = cry_get_enchanced_deck_info()
485-
G.GAME.modifiers.cry_force_seal = eee
486-
G.E_MANAGER:add_event(Event({
487-
func = function()
488-
for c = #G.playing_cards, 1, -1 do
489-
G.playing_cards[c]:set_seal(eee, true)
490-
end
491-
return true
492-
end,
493-
}))
494-
end,
495-
}
319+
496320
function antimatter_apply()
497321

498322
local bluecheck = safe_get(G.PROFILES, G.SETTINGS.profile, "deck_usage", "b_blue", "wins", 8)

0 commit comments

Comments
 (0)