Skip to content

Commit 81af5ac

Browse files
author
jolly[bot]
committed
jolly-bot: auto-format Lua files using Stylua
1 parent 04f0f66 commit 81af5ac

File tree

6 files changed

+4593
-4594
lines changed

6 files changed

+4593
-4594
lines changed

items/m.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,8 +1063,8 @@ local smallestm = {
10631063
local tag = Tag("tag_cry_double_m")
10641064
tag.ability.shiny = cry_rollshinybool()
10651065
add_tag(tag)
1066-
play_sound('generic1', 0.9 + math.random()*0.1, 0.8)
1067-
play_sound('holo1', 1.2 + math.random()*0.1, 0.4)
1066+
play_sound("generic1", 0.9 + math.random() * 0.1, 0.8)
1067+
play_sound("holo1", 1.2 + math.random() * 0.1, 0.4)
10681068
card_eval_status_text(context.blueprint_card or card, "extra", nil, nil, nil, {
10691069
message = localize("cry_m_ex"),
10701070
colour = G.C.FILTER,

items/misc_joker.lua

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -669,17 +669,14 @@ local pickle = {
669669
if context.setting_blind and not context.blueprint then
670670
card.ability.extra.tags = card.ability.extra.tags - card.ability.extra.tags_mod
671671
if to_big(card.ability.extra.tags) > to_big(0) then
672-
card_eval_status_text(
673-
card,
674-
"extra",
675-
nil,
676-
nil,
677-
nil,
678-
{
679-
message = localize({ type = "variable", key = card.ability.extra.tags_mod == 1 and "a_tag_minus" or "a_tags_minus", vars = { card.ability.extra.tags_mod } })[1],
680-
colour = G.C.FILTER,
681-
}
682-
)
672+
card_eval_status_text(card, "extra", nil, nil, nil, {
673+
message = localize({
674+
type = "variable",
675+
key = card.ability.extra.tags_mod == 1 and "a_tag_minus" or "a_tags_minus",
676+
vars = { card.ability.extra.tags_mod },
677+
})[1],
678+
colour = G.C.FILTER,
679+
})
683680
return nil, true
684681
else
685682
G.E_MANAGER:add_event(Event({
@@ -6669,9 +6666,7 @@ local kittyprinter = {
66696666
return { vars = { card.ability.extra.Xmult } }
66706667
end,
66716668
calculate = function(self, card, context)
6672-
if
6673-
context.joker_main
6674-
then
6669+
if context.joker_main then
66756670
return {
66766671
message = localize({
66776672
type = "variable",
@@ -7022,7 +7017,7 @@ local cookie = {
70227017
cost = 4,
70237018
atlas = "atlastwo",
70247019
order = 129,
7025-
config = {extra = {chips = 150, chip_mod = 1}},
7020+
config = { extra = { chips = 150, chip_mod = 1 } },
70267021
blueprint_compat = true,
70277022
eternal_compat = false,
70287023
perishable_compat = false,

items/tag.lua

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -235,21 +235,23 @@ local gambler = {
235235
if context.type == "new_blind_choice" then
236236
if pseudorandom("cry_gambler_tag") < G.GAME.probabilities.normal / tag.config.odds then
237237
local lock = tag.ID
238-
G.CONTROLLER.locks[lock] = true
239-
tag:yep('+', G.C.SECONDARY_SET.Spectral,function()
240-
local emp = Tag("tag_cry_empowered")
241-
if tag.ability.shiny then -- good fucking luck
238+
G.CONTROLLER.locks[lock] = true
239+
tag:yep("+", G.C.SECONDARY_SET.Spectral, function()
240+
local emp = Tag("tag_cry_empowered")
241+
if tag.ability.shiny then -- good fucking luck
242242
emp.ability.shiny = cry_rollshinybool()
243243
end
244244
add_tag(emp)
245-
emp:apply_to_run({type = 'new_blind_choice'})
246-
G.CONTROLLER.locks[lock] = nil
247-
return true
248-
end)
245+
emp:apply_to_run({ type = "new_blind_choice" })
246+
G.CONTROLLER.locks[lock] = nil
247+
return true
248+
end)
249249
else
250250
tag:nope()
251251
for i = 1, #G.GAME.tags do
252-
if G.GAME.tags[i]:apply_to_run({type = 'new_blind_choice'}) then break end
252+
if G.GAME.tags[i]:apply_to_run({ type = "new_blind_choice" }) then
253+
break
254+
end
253255
end
254256
end
255257
tag.triggered = true
@@ -283,13 +285,13 @@ local bundle = {
283285
local lock = tag.ID
284286
G.CONTROLLER.locks[lock] = true
285287
tag:yep("+", G.C.ATTENTION, function()
286-
local tags = {'standard', 'charm', 'meteor', 'buffoon'}
288+
local tags = { "standard", "charm", "meteor", "buffoon" }
287289
for i, v in ipairs(tags) do
288-
local _tag = Tag("tag_"..v)
290+
local _tag = Tag("tag_" .. v)
289291
_tag.ability.shiny = cry_rollshinybool()
290292
add_tag(_tag)
291293
if i == 1 then
292-
_tag:apply_to_run({type = 'new_blind_choice'})
294+
_tag:apply_to_run({ type = "new_blind_choice" })
293295
end
294296
end
295297
G.CONTROLLER.locks[lock] = nil

lib/misc.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ function save_cryptid()
460460
shinytags = {},
461461
}
462462
data.shinytags = copy_table(Cryptid.shinytagdata)
463-
compress_and_save( G.SETTINGS.profile..'/'..'cryptidsave.jkr', STR_PACK(data))
463+
compress_and_save(G.SETTINGS.profile .. "/" .. "cryptidsave.jkr", STR_PACK(data))
464464
end
465465

466466
local sppref = set_profile_progress

lib/modifiers.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -741,14 +741,14 @@ local tagability = Tag.set_ability
741741
function Tag:set_ability()
742742
tagability(self)
743743
if self.ability.blind_type then
744-
745744
G.GAME.cry_shiny_choices = G.GAME.cry_shiny_choices or {}
746745
G.GAME.cry_shiny_choices[G.GAME.round_resets.ante] = G.GAME.cry_shiny_choices[G.GAME.round_resets.ante] or {}
747-
746+
748747
if not G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] then
749748
G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] = cry_rollshiny()
750749
end
751-
self.ability.shiny = G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] == 'shiny' and true
750+
self.ability.shiny = G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] == "shiny"
751+
and true
752752
end
753753
end
754754

0 commit comments

Comments
 (0)