Skip to content

Commit 88120fb

Browse files
author
jolly[bot]
committed
jolly-bot: auto-format Lua files using Stylua
1 parent 863507e commit 88120fb

File tree

2 files changed

+32
-19
lines changed

2 files changed

+32
-19
lines changed

items/misc_joker.lua

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10262,7 +10262,7 @@ local pizza = { -- +1 to all listed probabilities for the highest cat tag level
1026210262
dependencies = {
1026310263
items = {
1026410264
"set_cry_misc_joker",
10265-
"j_cry_pizza_slice"
10265+
"j_cry_pizza_slice",
1026610266
},
1026710267
},
1026810268
name = "cry-pizza",
@@ -10273,21 +10273,34 @@ local pizza = { -- +1 to all listed probabilities for the highest cat tag level
1027310273
cost = 8,
1027410274
order = 141,
1027510275
demicoloncompat = true,
10276-
config = { extra = { rounds_needed = 3, rounds_left = 3, slices = 6 }, immutable = {max_spawn = 100} },
10276+
config = { extra = { rounds_needed = 3, rounds_left = 3, slices = 6 }, immutable = { max_spawn = 100 } },
1027710277
loc_vars = function(self, info_queue, card)
10278-
info_queue[#info_queue+1] = G.P_CENTERS.j_cry_pizza_slice
10279-
return { vars = { number_format(card.ability.extra.rounds_needed), number_format(card.ability.extra.rounds_left),
10280-
number_format(math.min(card.ability.extra.slices, card.ability.immutable.max_spawn)) } }
10278+
info_queue[#info_queue + 1] = G.P_CENTERS.j_cry_pizza_slice
10279+
return {
10280+
vars = {
10281+
number_format(card.ability.extra.rounds_needed),
10282+
number_format(card.ability.extra.rounds_left),
10283+
number_format(math.min(card.ability.extra.slices, card.ability.immutable.max_spawn)),
10284+
},
10285+
}
1028110286
end,
1028210287
calculate = function(self, card, context)
10283-
if context.end_of_round and not context.retrigger_joker and not context.blueprint and not context.individual and not context.repetition then
10288+
if
10289+
context.end_of_round
10290+
and not context.retrigger_joker
10291+
and not context.blueprint
10292+
and not context.individual
10293+
and not context.repetition
10294+
then
1028410295
card.ability.extra.rounds_left = card.ability.extra.rounds_left - 1
1028510296
if to_big(card.ability.extra.rounds_left) < to_big(0) then
1028610297
card.ability.extra.rounds_left = 0
1028710298
else
1028810299
return {
10289-
message = number_format(card.ability.extra.rounds_needed-card.ability.extra.rounds_left).."/"..number_format(card.ability.extra.rounds_needed),
10290-
colour = G.C.FILTER
10300+
message = number_format(card.ability.extra.rounds_needed - card.ability.extra.rounds_left)
10301+
.. "/"
10302+
.. number_format(card.ability.extra.rounds_needed),
10303+
colour = G.C.FILTER,
1029110304
}
1029210305
end
1029310306
end
@@ -10296,12 +10309,12 @@ local pizza = { -- +1 to all listed probabilities for the highest cat tag level
1029610309
for i = 1, to_number(math.min(card.ability.extra.slices, card.ability.immutable.max_spawn)), G.jokers.config.card_limit - #G.jokers.cards do
1029710310
SMODS.add_card({
1029810311
key = "j_cry_pizza_slice",
10299-
area = G.jokers
10312+
area = G.jokers,
1030010313
})
1030110314
end
1030210315
end
1030310316
end
10304-
end
10317+
end,
1030510318
}
1030610319

1030710320
local pizza_slice = { -- +1 to all listed probabilities for the highest cat tag level
@@ -10320,7 +10333,7 @@ local pizza_slice = { -- +1 to all listed probabilities for the highest cat tag
1032010333
dependencies = {
1032110334
items = {
1032210335
"set_cry_misc_joker",
10323-
"j_cry_pizza"
10336+
"j_cry_pizza",
1032410337
},
1032510338
},
1032610339
name = "cry-pizza_slice",
@@ -10336,24 +10349,24 @@ local pizza_slice = { -- +1 to all listed probabilities for the highest cat tag
1033610349
demicoloncompat = false,
1033710350
config = { extra = { xmult = 1, xmult_mod = 0.5 } },
1033810351
loc_vars = function(self, info_queue, card)
10339-
return { vars = { number_format(card.ability.extra.xmult_mod), number_format(card.ability.extra.xmult)} }
10352+
return { vars = { number_format(card.ability.extra.xmult_mod), number_format(card.ability.extra.xmult) } }
1034010353
end,
1034110354
calculate = function(self, card, context)
1034210355
if context.joker_main then
1034310356
return {
10344-
xmult = card.ability.xmult
10357+
xmult = card.ability.xmult,
1034510358
}
1034610359
end
1034710360
if context.selling_card and context.card and context.card.config.center.key == "j_cry_pizza_slice" then
1034810361
if context.card ~= card then
1034910362
card.ability.extra.xmult = card.ability.extra.xmult + card.ability.extra.xmult_mod
1035010363
return {
10351-
message = localize{ type = "variable", key = "a_xmult", vars = { card.ability.extra.xmult } },
10352-
colour = G.C.FILTER
10364+
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.extra.xmult } }),
10365+
colour = G.C.FILTER,
1035310366
}
1035410367
end
1035510368
end
10356-
end
10369+
end,
1035710370
}
1035810371

1035910372
local miscitems = {
@@ -10483,7 +10496,7 @@ local miscitems = {
1048310496
brokenhome,
1048410497
--yarnball,
1048510498
pizza,
10486-
pizza_slice
10499+
pizza_slice,
1048710500
}
1048810501
return {
1048910502
name = "Misc. Jokers",

localization/en-us.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2687,15 +2687,15 @@ return {
26872687
text = {
26882688
"After {C:attention}#1#{} {C:inactive}[#2#]{} round#<s>1#",
26892689
"sell this Joker to create",
2690-
"{C:attention}#3#{} Pizza Slices"
2690+
"{C:attention}#3#{} Pizza Slices",
26912691
},
26922692
},
26932693
j_cry_pizza_slice = {
26942694
name = "Pizza Slice",
26952695
text = {
26962696
"This Joker gains {X:mult,C:white}X#1#{}",
26972697
"per {C:attention}Pizza Slice{} sold",
2698-
"{C:inactive}(Currently{} {X:mult,C:white}X#2#{}{C:inactive}){}"
2698+
"{C:inactive}(Currently{} {X:mult,C:white}X#2#{}{C:inactive}){}",
26992699
},
27002700
},
27012701
j_cry_spaceglobe = {

0 commit comments

Comments
 (0)