Skip to content

Commit 5ef23b0

Browse files
committed
make demicolon experimental and trigger itself
1 parent 18ec1e5 commit 5ef23b0

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

items/epic.lua

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -661,10 +661,6 @@ local m = {
661661
return { vars = { center.ability.extra.extra, center.ability.extra.x_mult } }
662662
end,
663663
atlas = "atlasepic",
664-
force_context = {
665-
selling_card = true,
666-
card = { is_jolly = function(self) return true end},
667-
},
668664
calculate = function(self, card, context)
669665
if context.joker_main and (to_big(card.ability.extra.x_mult) > to_big(1)) then
670666
return {
@@ -1916,6 +1912,12 @@ local demicolon = {
19161912
"set_cry_misc_joker",
19171913
},
19181914
},
1915+
gameset_config = {
1916+
modest = { disabled = true},
1917+
mainline = { disabled = true},
1918+
madness = { disabled = true},
1919+
},
1920+
extra_gamesets = {"experimental"},
19191921
name = "cry-Demicolon",
19201922
key = "demicolon",
19211923
pos = { x = 3, y = 5 },

lib/calculate.lua

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -908,13 +908,19 @@ end
908908

909909
-- Forced joker triggering, used by Demicolon
910910
function force_calculate(card)
911-
local context = {}
912-
if card.config.center.force_context then
913-
context = card.config.center.force_context
914-
end
911+
local context = safe_get(Cryptid.force_contexts, card.config.center.key)
912+
if not context then return false end
915913
context.forced = true
916914
local eval, post = eval_card(card, context)
917915
local effects = {eval}
918916
SMODS.trigger_effects(effects, card)
919917
return eval and true or post
920-
end
918+
end
919+
920+
Cryptid.force_contexts = {
921+
-- Vanilla Jokers (collection order)
922+
923+
-- Cryptid Jokers (alphabetical order probably?)
924+
j_cry_demicolon = {joker_main = true},
925+
j_cry_m = {selling_card = true, card = {is_jolly = function(self) return true end}},
926+
}

0 commit comments

Comments
 (0)