Skip to content

Commit 88fe6d4

Browse files
committed
Merge branch 'demicolon' of https://github.com/MathIsFun0/Cryptid into demicolon
2 parents 8a77687 + d340a10 commit 88fe6d4

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

items/epic.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1914,11 +1914,11 @@ local demicolon = {
19141914
},
19151915
},
19161916
gameset_config = {
1917-
modest = { disabled = true},
1918-
mainline = { disabled = true},
1919-
madness = { disabled = true},
1917+
modest = { disabled = true },
1918+
mainline = { disabled = true },
1919+
madness = { disabled = true },
19201920
},
1921-
extra_gamesets = {"experimental"},
1921+
extra_gamesets = { "experimental" },
19221922
name = "cry-Demicolon",
19231923
key = "demicolon",
19241924
pos = { x = 3, y = 5 },

lib/calculate.lua

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,9 @@ end
909909
-- Forced joker triggering, used by Demicolon
910910
function force_calculate(card)
911911
local context = safe_get(Cryptid.force_contexts, card.config.center.key)
912-
if not context then return false end
912+
if not context then
913+
return false
914+
end
913915
context.forced = true
914916
local eval, post = eval_card(card, context)
915917
local effects = { eval }
@@ -921,6 +923,10 @@ Cryptid.force_contexts = {
921923
-- Vanilla Jokers (collection order)
922924

923925
-- 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+
j_cry_demicolon = { joker_main = true },
927+
j_cry_m = { selling_card = true, card = {
928+
is_jolly = function(self)
929+
return true
930+
end,
931+
} },
926932
}

0 commit comments

Comments
 (0)