Skip to content

Commit 05de71c

Browse files
author
jolly[bot]
committed
jolly-bot: auto-format Lua files using Stylua
1 parent 7ba39b1 commit 05de71c

File tree

2 files changed

+23
-15
lines changed

2 files changed

+23
-15
lines changed

items/planet.lua

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -912,13 +912,15 @@ local sunplanet = {
912912
}
913913
end
914914
if Cryptid.safe_get(G, "GAME", "used_vouchers", "v_observatory") then
915-
local super_entropic_local_variable_that_stores_the_amount_of_suns = #find_joker("cry-sunplanet") + #find_joker("cry-Perkele")
915+
local super_entropic_local_variable_that_stores_the_amount_of_suns = #find_joker("cry-sunplanet")
916+
+ #find_joker("cry-Perkele")
916917
local observatory_power = 0
917918

918919
if super_entropic_local_variable_that_stores_the_amount_of_suns == 1 then
919920
observatory_power = 1
920921
elseif super_entropic_local_variable_that_stores_the_amount_of_suns > 1 then
921-
observatory_power = Cryptid.funny_log(2, super_entropic_local_variable_that_stores_the_amount_of_suns + 1)
922+
observatory_power =
923+
Cryptid.funny_log(2, super_entropic_local_variable_that_stores_the_amount_of_suns + 1)
922924
end
923925
info_queue[#info_queue + 1] = { key = "o_sunplanet", set = "Other", specific_vars = { observatory_power } }
924926
end
@@ -1423,7 +1425,7 @@ local perkele = {
14231425
-- "cry_asc_hands" is not a hand so don't include it here
14241426
hand_types = { "cry_None", "cry_WholeDeck" },
14251427
level_types = { "cry_None", "cry_WholeDeck", "cry_asc_hands" },
1426-
softlock = true
1428+
softlock = true,
14271429
},
14281430
cost = 4,
14291431

@@ -1444,9 +1446,7 @@ local perkele = {
14441446
local colours = {}
14451447

14461448
for i, lvl in ipairs(levels) do
1447-
colours[i] = to_big(lvl) == to_big(1)
1448-
and G.C.UI.TEXT_DARK
1449-
or G.C.HAND_LEVELS[to_number(math.min(7, lvl))]
1449+
colours[i] = to_big(lvl) == to_big(1) and G.C.UI.TEXT_DARK or G.C.HAND_LEVELS[to_number(math.min(7, lvl))]
14501450
end
14511451

14521452
-- don't want to entirely rework ascension power just for one consumable
@@ -1474,13 +1474,15 @@ local perkele = {
14741474
}
14751475
end
14761476
if Cryptid.safe_get(G, "GAME", "used_vouchers", "v_observatory") then
1477-
local super_entropic_local_variable_that_stores_the_amount_of_suns = #find_joker("cry-sunplanet") + #find_joker("cry-Perkele")
1477+
local super_entropic_local_variable_that_stores_the_amount_of_suns = #find_joker("cry-sunplanet")
1478+
+ #find_joker("cry-Perkele")
14781479
local observatory_power = 0
14791480

14801481
if super_entropic_local_variable_that_stores_the_amount_of_suns == 1 then
14811482
observatory_power = 1
14821483
elseif super_entropic_local_variable_that_stores_the_amount_of_suns > 1 then
1483-
observatory_power = Cryptid.funny_log(2, super_entropic_local_variable_that_stores_the_amount_of_suns + 1)
1484+
observatory_power =
1485+
Cryptid.funny_log(2, super_entropic_local_variable_that_stores_the_amount_of_suns + 1)
14841486
end
14851487
info_queue[#info_queue + 1] = {
14861488
key = "o_perkele",
@@ -1490,7 +1492,7 @@ local perkele = {
14901492
G.P_CENTERS.v_observatory.config.extra,
14911493
localize("cry_None", "poker_hands"),
14921494
localize("cry_WholeDeck", "poker_hands"),
1493-
}
1495+
},
14941496
}
14951497
end
14961498

@@ -1522,7 +1524,6 @@ local perkele = {
15221524

15231525
if context.scoring_name == "cry_None" then
15241526
return { xmult = value }
1525-
15261527
elseif context.scoring_name == "cry_WholeDeck" then
15271528
return {
15281529
message = localize({
@@ -1683,7 +1684,7 @@ function Cryptid.asc_level_up(card, copier, number, message)
16831684

16841685
if message then
16851686
SMODS.calculate_effect({
1686-
message = localize("k_level_up_ex")
1687+
message = localize("k_level_up_ex"),
16871688
}, card)
16881689
end
16891690

@@ -1741,7 +1742,7 @@ function Cryptid.suit_level_up(card, copier, number, poker_hands, message)
17411742
end
17421743
if message then
17431744
SMODS.calculate_effect({
1744-
message = localize("k_level_up_ex")
1745+
message = localize("k_level_up_ex"),
17451746
}, card)
17461747
end
17471748
for _, v in pairs(poker_hands) do

lib/ascended.lua

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,21 @@ function Cryptid.calculate_ascension_power(hand_name, hand_cards, hand_scoring_c
222222
bonus = bonus + 1
223223
end
224224
-- Get Ascension Power From Sol/Perkele (Observatory effect)
225-
if G.GAME.used_vouchers.v_observatory and (next(find_joker("cry-sunplanet")) or next(find_joker("cry-Perkele"))) then
225+
if
226+
G.GAME.used_vouchers.v_observatory and (next(find_joker("cry-sunplanet")) or next(find_joker("cry-Perkele")))
227+
then
226228
-- switch this to not use find_joker eventually please for the love of god
227-
local super_entropic_local_variable_that_stores_the_amount_of_suns = #find_joker("cry-sunplanet") + #find_joker("cry-Perkele")
229+
local super_entropic_local_variable_that_stores_the_amount_of_suns = #find_joker("cry-sunplanet")
230+
+ #find_joker("cry-Perkele")
228231

229232
if super_entropic_local_variable_that_stores_the_amount_of_suns == 1 then
230233
bonus = bonus + 1
231234
else
232-
bonus = bonus + Cryptid.nuke_decimals(Cryptid.funny_log(2, super_entropic_local_variable_that_stores_the_amount_of_suns + 1), 2)
235+
bonus = bonus
236+
+ Cryptid.nuke_decimals(
237+
Cryptid.funny_log(2, super_entropic_local_variable_that_stores_the_amount_of_suns + 1),
238+
2
239+
)
233240
end
234241
end
235242
local final = math.max(0, starting + bonus)

0 commit comments

Comments
 (0)