Skip to content

Commit d4c5673

Browse files
committed
stop pointer duping fully
1 parent 840c2e2 commit d4c5673

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

items/code.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ local merge = {
13141314
can_use = function(self, card)
13151315
local hand = Cryptid.get_highlighted_cards({ G.hand }, card, 1, 1)
13161316
local consumeables = Cryptid.get_highlighted_cards({ G.consumeables }, card, 1, 1, function(card)
1317-
return card.ability.consumeable
1317+
return card.ability.consumeable and not card.config.center.hidden
13181318
end)
13191319
if
13201320
#hand ~= 1
@@ -3779,6 +3779,9 @@ local quantify = {
37793779
return
37803780
end
37813781
end
3782+
if h.config.center.hidden then
3783+
return
3784+
end
37823785
end
37833786
return t > 0 and t <= card.ability.extra
37843787
end,

localization/en-us.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,7 @@ return {
558558
text = {
559559
"Merge a selected {C:cry_code}consumable",
560560
"with a selected {C:cry_code}playing card",
561+
"{C:inactive}(Hidden consumables excluded){}",
561562
},
562563
},
563564
c_cry_commit = {
@@ -696,6 +697,7 @@ return {
696697
"Transfer {C:attention}#1#{} selected",
697698
"{C:attention}Card#<s>1#{}, or {C:attention}Booster#<s>1#{}",
698699
"to the {C:attention}Jokers{} tray",
700+
"{C:inactive}(Hidden consumables excluded){}",
699701
},
700702
},
701703
c_cry_divide = {

0 commit comments

Comments
 (0)