Skip to content

Commit 8917174

Browse files
committed
edition deck related fixes
1 parent 0f92369 commit 8917174

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

items/enhanced.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Cryptid.edeck_atlas_update = function(self)
7676
if not sprite then
7777
error(self.edeck_type)
7878
end
79-
local enh_info = { Cryptid.enhanced_deck_info(self) }
79+
local enh_info = { Cryptid.enhanced_deck_info(G.cry_edeck_center and self or {}) }
8080
sprite = sprite[enh_info[sprite.order]] or sprite.default
8181
self.atlas, self.pos = sprite.atlas, sprite.pos
8282
return sprite
@@ -94,7 +94,7 @@ local e_deck = {
9494
order = 17,
9595
pos = { x = 5, y = 2 },
9696
loc_vars = function(self, info_queue, center)
97-
local aaa = Cryptid.enhanced_deck_info(self)
97+
local aaa = Cryptid.enhanced_deck_info(G.cry_edeck_center and self or {})
9898
return { vars = { localize({ type = "name_text", set = "Edition", key = "e_" .. aaa }) } }
9999
end,
100100
edeck_type = "edition",
@@ -390,7 +390,7 @@ return {
390390
if G.P_CENTERS.c_cry_chambered then
391391
G.P_CENTERS.c_cry_chambered.misprintize_caps = { extra = { num_copies = 100 } }
392392
end
393-
if Cryptid.safe_get(center, "name") == "Default Base" then -- scuffed
393+
if not G.SETTINGS.paused and Cryptid.safe_get(center, "name") == "Default Base" then -- scuffed
394394
return sa(
395395
self,
396396
(not self.no_forced_enhancement and G.GAME.modifiers.cry_force_enhancement)
@@ -405,7 +405,7 @@ return {
405405
end
406406
local se = Card.set_edition
407407
function Card:set_edition(edition, y, z, force)
408-
if not force then
408+
if not force and not G.SETTINGS.paused then
409409
return se(
410410
self,
411411
(not self.no_forced_edition and G.GAME.modifiers.cry_force_edition)
@@ -419,11 +419,11 @@ return {
419419
end
420420
local ss = Card.set_seal
421421
function Card:set_seal(seal, y, z)
422-
return ss(self, not self.no_forced_seal and G.GAME.modifiers.cry_force_seal or seal, y, z)
422+
return ss(self, not self.no_forced_seal and not G.SETTINGS.paused and G.GAME.modifiers.cry_force_seal or seal, y, z)
423423
end
424424
local cs = Card.change_suit
425425
function Card:change_suit(new_suit)
426-
return cs(self, not self.no_forced_suit and G.GAME.modifiers.cry_force_suit or new_suit)
426+
return cs(self, not self.no_forced_suit and not G.SETTINGS.paused and G.GAME.modifiers.cry_force_suit or new_suit)
427427
end
428428
local ccl = Card.click
429429
function Card:click()
@@ -441,9 +441,9 @@ return {
441441
and (Cryptid.safe_get(G.GAME, "viewed_back", "effect", "center", "edeck_type") and (self.back == "viewed_back" or self.edeck_select))
442442
then
443443
if not G.cry_edeck_select then
444-
Cryptid.enhancement_config_UI(Galdur and self.config.center or G.GAME.viewed_back.effect.center, 1)
445444
G.cry_edeck_select = true
446445
G.cry_edeck_center = Galdur and self.config.center or G.GAME.viewed_back.effect.center
446+
Cryptid.enhancement_config_UI(Galdur and self.config.center or G.GAME.viewed_back.effect.center, 1)
447447
else
448448
if self.edeck_select then
449449
G.PROFILES[G.SETTINGS.profile]["cry_edeck_" .. self.config.center.edeck_type] =

lib/ui.lua

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ SMODS.DrawStep({
1515
) == "table" and self.params.viewed_back or (self.params.viewed_back and G.GAME.viewed_back or G.GAME.selected_back))
1616
or Back(G.P_CENTERS["b_red"])
1717
if currentBack.effect.config.cry_force_edition and not currentBack.effect.config.cry_antimatter then
18-
if currentBack.effect.config.cry_force_edition_shader then
19-
self.children.back:draw_shader(
20-
currentBack.effect.config.cry_force_edition_shader,
21-
nil,
22-
self.ARGS.send_to_shader,
23-
true
24-
)
25-
else
26-
self.children.back:draw_shader(
27-
currentBack.effect.config.cry_force_edition,
28-
nil,
29-
self.ARGS.send_to_shader,
30-
true
31-
)
32-
end
3318
end
3419
if
3520
currentBack.effect.config.cry_force_seal

0 commit comments

Comments
 (0)