Skip to content

Commit 5c46ab6

Browse files
committed
Merge branch 'demicolon' of https://github.com/MathIsFun0/Cryptid into demicolon
2 parents 5ef23b0 + 836eac0 commit 5c46ab6

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

items/epic.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,8 @@ local m = {
686686
return context.forced and {
687687
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.extra.x_mult } }),
688688
Xmult_mod = card.ability.extra.x_mult,
689-
} or nil, true
689+
} or nil,
690+
true
690691
end
691692
end,
692693
cry_credits = {
@@ -1928,7 +1929,7 @@ local demicolon = {
19281929
blueprint_compat = true,
19291930
calculate = function(self, card, context)
19301931
if context.joker_main then
1931-
for i = 1, #G.jokers.cards-1 do
1932+
for i = 1, #G.jokers.cards - 1 do
19321933
if G.jokers.cards[i] == card then
19331934
if not Talisman.disable_anims then
19341935
G.E_MANAGER:add_event(Event({
@@ -1938,7 +1939,7 @@ local demicolon = {
19381939
end,
19391940
}))
19401941
end
1941-
return nil, force_calculate(G.jokers.cards[i+1])
1942+
return nil, force_calculate(G.jokers.cards[i + 1])
19421943
end
19431944
end
19441945
end

lib/calculate.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ function force_calculate(card)
912912
if not context then return false end
913913
context.forced = true
914914
local eval, post = eval_card(card, context)
915-
local effects = {eval}
915+
local effects = { eval }
916916
SMODS.trigger_effects(effects, card)
917917
return eval and true or post
918918
end
@@ -923,4 +923,4 @@ Cryptid.force_contexts = {
923923
-- Cryptid Jokers (alphabetical order probably?)
924924
j_cry_demicolon = {joker_main = true},
925925
j_cry_m = {selling_card = true, card = {is_jolly = function(self) return true end}},
926-
}
926+
}

localization/en-us.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ return {
12131213
text = {
12141214
"Trigger the {C:attention}Joker{} to the right",
12151215
"{E:1}regardless of its usual conditions",
1216-
}
1216+
},
12171217
},
12181218
j_cry_delirious = {
12191219
name = "Delirious Joker",

0 commit comments

Comments
 (0)