Skip to content

Commit 9ad6eac

Browse files
author
jolly[bot]
committed
jolly-bot: auto-format Lua files using Stylua
1 parent 0d7e084 commit 9ad6eac

File tree

4 files changed

+35
-34
lines changed

4 files changed

+35
-34
lines changed

Cryptid.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,11 @@ function SMODS.injectItems(...)
238238
Cryptid.inject_pointer_aliases()
239239

240240
--this has to be here because the colors dont exist earlier then this
241-
Cryptid.circus_rarities["rare"] = {rarity = 3, base_mult = 2, order = 1, colour = G.C.RARITY.Rare}
242-
Cryptid.circus_rarities["epic"] ={rarity = "cry_epic", base_mult = 3, order = 2, colour = G.C.RARITY.cry_epic}
243-
Cryptid.circus_rarities["legendary"] ={rarity = 4, base_mult = 4, order = 3, colour = G.C.RARITY.Legendary}
244-
Cryptid.circus_rarities["exotic"] ={rarity = "cry_exotic", base_mult = 20, order = 4, colour = G.C.RARITY.cry_exotic}
241+
Cryptid.circus_rarities["rare"] = { rarity = 3, base_mult = 2, order = 1, colour = G.C.RARITY.Rare }
242+
Cryptid.circus_rarities["epic"] = { rarity = "cry_epic", base_mult = 3, order = 2, colour = G.C.RARITY.cry_epic }
243+
Cryptid.circus_rarities["legendary"] = { rarity = 4, base_mult = 4, order = 3, colour = G.C.RARITY.Legendary }
244+
Cryptid.circus_rarities["exotic"] =
245+
{ rarity = "cry_exotic", base_mult = 20, order = 4, colour = G.C.RARITY.cry_exotic }
245246

246247
Cryptid.reload_localization()
247248
end

items/epic.lua

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,8 +1121,7 @@ local circus = {
11211121
name = "cry-circus",
11221122
key = "circus",
11231123
pos = { x = 4, y = 4 },
1124-
config = {
1125-
},
1124+
config = {},
11261125
dependencies = {
11271126
items = {
11281127
"set_cry_epic",
@@ -1136,42 +1135,44 @@ local circus = {
11361135
local mults = {}
11371136
Cryptid.circus_rarities["exotic"].colour = G.C.CRY_EXOTIC
11381137
for i, v in pairs(Cryptid.circus_rarities) do
1139-
extra_rarities[#extra_rarities+1] = v
1138+
extra_rarities[#extra_rarities + 1] = v
11401139
end
1141-
table.sort(extra_rarities, function(a, b) return a.order < b.order end)
1142-
mults.colours = {
1143-
1144-
}
1140+
table.sort(extra_rarities, function(a, b)
1141+
return a.order < b.order
1142+
end)
1143+
mults.colours = {}
11451144
for i, v in pairs(extra_rarities) do
11461145
if not v.hidden then
1147-
mults[#mults+1] = number_format(center.ability.extra[tostring(v.rarity).."_mult_mod"])
1146+
mults[#mults + 1] = number_format(center.ability.extra[tostring(v.rarity) .. "_mult_mod"])
11481147
mults.colours[#mults.colours + 1] = v.colour
11491148
end
11501149
end
11511150
return {
11521151
vars = mults,
11531152
}
1154-
end,
1153+
end,
11551154
set_ability = function(self, center)
11561155
local extra_rarities = {}
11571156
local mults = {}
11581157
local mult_numbers = {}
11591158
for i, v in pairs(Cryptid.circus_rarities) do
1160-
extra_rarities[#extra_rarities+1] = v
1159+
extra_rarities[#extra_rarities + 1] = v
11611160
end
1162-
table.sort(extra_rarities, function(a, b) return a.order < b.order end)
1161+
table.sort(extra_rarities, function(a, b)
1162+
return a.order < b.order
1163+
end)
11631164
for i, v in pairs(extra_rarities) do
1164-
mult_numbers[tostring(v.rarity).."_mult_mod"] = v.base_mult
1165-
mults[v.rarity] = tostring(v.rarity).."_mult_mod"
1165+
mult_numbers[tostring(v.rarity) .. "_mult_mod"] = v.base_mult
1166+
mults[v.rarity] = tostring(v.rarity) .. "_mult_mod"
11661167
end
11671168
if not self.config.extra then
11681169
self.config.extra = mult_numbers
11691170
center.ability.extra = mult_numbers
11701171
self.config.immutable = {
1171-
rarity_map = mults
1172+
rarity_map = mults,
11721173
}
11731174
center.ability.immutable = {
1174-
rarity_map = mults
1175+
rarity_map = mults,
11751176
}
11761177
end
11771178
end,
@@ -1180,7 +1181,6 @@ local circus = {
11801181
blueprint_compat = true,
11811182
demicoloncompat = true,
11821183
calculate = function(self, card, context)
1183-
11841184
if context.other_joker and card ~= context.other_joker then
11851185
local mod_key = card.ability.immutable.rarity_map[context.other_joker.config.center.rarity]
11861186
if mod_key and card.ability.extra[mod_key] and to_big(card.ability.extra[mod_key]) > to_big(1) then
@@ -1211,9 +1211,7 @@ local circus = {
12111211
end
12121212
end
12131213
return {
1214-
Xmult_mod = (
1215-
total
1216-
),
1214+
Xmult_mod = total,
12171215
}
12181216
end
12191217
end,

lib/misc.lua

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,24 +1007,26 @@ function Cryptid.get_circus_description()
10071007
local extra_rarities = {}
10081008
for i, v in pairs(Cryptid.circus_rarities) do
10091009
if not v.hidden then
1010-
extra_rarities[#extra_rarities+1] = v
1010+
extra_rarities[#extra_rarities + 1] = v
10111011
end
10121012
end
1013-
table.sort(extra_rarities, function(a, b) return a.order < b.order end)
1013+
table.sort(extra_rarities, function(a, b)
1014+
return a.order < b.order
1015+
end)
10141016
for i, v in pairs(extra_rarities) do
10151017
local rarity = v.rarity
10161018
rarity = localize(({
1017-
[1] = "k_common",
1018-
[2] = "k_uncommon",
1019-
[3] = "k_rare",
1020-
[4] = "k_legendary"
1021-
})[rarity] or "k_"..rarity)
1019+
[1] = "k_common",
1020+
[2] = "k_uncommon",
1021+
[3] = "k_rare",
1022+
[4] = "k_legendary",
1023+
})[rarity] or "k_" .. rarity)
10221024
local orig = localize("cry_circus_generic")
10231025
orig = string.gsub(orig, "#1#", ind)
10241026
orig = string.gsub(orig, "#2#", rarity)
1025-
orig = string.gsub(orig, "#3#", "#"..tostring(ind).."#")
1026-
desc[#desc+1] = orig
1027+
orig = string.gsub(orig, "#3#", "#" .. tostring(ind) .. "#")
1028+
desc[#desc + 1] = orig
10271029
ind = ind + 1
10281030
end
10291031
return desc
1030-
end
1032+
end

localization/en-us.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5019,7 +5019,7 @@ return {
50195019
b_reset_gameset_mainline = "Reset Gameset Config (Mainline)",
50205020
b_reset_gameset_madness = "Reset Gameset Config (Madness)",
50215021

5022-
cry_circus_generic = "{V:#1#}#2#{} Jokers each give {X:mult,C:white} X#3# {} Mult"
5022+
cry_circus_generic = "{V:#1#}#2#{} Jokers each give {X:mult,C:white} X#3# {} Mult",
50235023
},
50245024
labels = {
50255025
food_jokers = "Food Jokers",

0 commit comments

Comments
 (0)