Skip to content

Commit b028da6

Browse files
author
jolly[bot]
committed
jolly-bot: auto-format Lua files using Stylua
1 parent d0264fd commit b028da6

File tree

2 files changed

+41
-19
lines changed

2 files changed

+41
-19
lines changed

‎items/exotic.lua‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ local exponentia = {
294294
object_type = "Joker",
295295
name = "cry-Exponentia",
296296
key = "exponentia",
297-
config = { extra = { Emult = 1, e_mult = 0.03 } },
297+
config = { extra = { Emult = 1, e_mult = 0.03 } },
298298
pos = { x = 0, y = 0 },
299299
rarity = "cry_exotic",
300300
cost = 50,
@@ -307,13 +307,13 @@ local exponentia = {
307307
calculate = function(self, card, context)
308308
if context.joker_main and (to_big(card.ability.extra.Emult) > to_big(1)) then
309309
return {
310-
e_mult = lenient_bignum(card.ability.extra.Emult),
310+
e_mult = lenient_bignum(card.ability.extra.Emult),
311311
}
312312
end
313313
if context.forcetrigger then
314314
card.ability.extra.Emult = card.ability.extra.Emult + card.ability.extra.Emult_mod
315315
return {
316-
e_mult = lenient_bignum(card.ability.extra.Emult),
316+
e_mult = lenient_bignum(card.ability.extra.Emult),
317317
}
318318
end
319319
end,
@@ -740,7 +740,7 @@ local primus = {
740740
if context.joker_main and (to_big(card.ability.extra.Emult) > to_big(1)) then
741741
card.children.floating_sprite:set_sprite_pos({ x = 8, y = 6 })
742742
return {
743-
e_mult = lenient_bignum(card.ability.extra.Emult),
743+
e_mult = lenient_bignum(card.ability.extra.Emult),
744744
}
745745
end
746746
if context.end_of_round then
@@ -749,7 +749,7 @@ local primus = {
749749
if context.forcetrigger then
750750
card.ability.extra.Emult = lenient_bignum(to_big(card.ability.extra.Emult) + card.ability.extra.Emult_mod)
751751
return {
752-
e_mult = lenient_bignum(card.ability.extra.Emult),
752+
e_mult = lenient_bignum(card.ability.extra.Emult),
753753
}
754754
end
755755
end,
@@ -916,7 +916,7 @@ local stella_mortis = {
916916
end
917917
if (context.joker_main and (to_big(card.ability.extra.Emult) > to_big(1))) or context.forcetrigger then
918918
return {
919-
e_mult = lenient_bignum(card.ability.extra.Emult),
919+
e_mult = lenient_bignum(card.ability.extra.Emult),
920920
}
921921
end
922922
end,
@@ -983,13 +983,13 @@ local circulus_pistoris = {
983983
pi = 2 * pi
984984
end
985985
return {
986-
e_chips = pi,
987-
e_mult = pi,
986+
e_chips = pi,
987+
e_mult = pi,
988988
message = localize({
989989
type = "variable",
990990
key = "a_powmultchips",
991991
vars = { (Cryptid.safe_get(card, "edition", "cry_oversat") and "tau" or "pi") },
992-
sound = "cry_echips"
992+
sound = "cry_echips",
993993
}),
994994
colour = { 0.8, 0.45, 0.85, 1 }, --plasma colors
995995
}
@@ -1106,15 +1106,15 @@ local facile = {
11061106
if to_big(card.ability.immutable.check2) <= to_big(card.ability.extra.check) then
11071107
card.ability.immutable.check2 = 0
11081108
return {
1109-
e_mult = lenient_bignum(card.ability.extra.Emult),
1109+
e_mult = lenient_bignum(card.ability.extra.Emult),
11101110
}
11111111
else
11121112
card.ability.immutable.check2 = 0
11131113
end
11141114
end
11151115
if context.forcetrigger then
11161116
return {
1117-
e_mult = lenient_bignum(card.ability.extra.Emult),
1117+
e_mult = lenient_bignum(card.ability.extra.Emult),
11181118
}
11191119
end
11201120
end,
@@ -1577,7 +1577,7 @@ local formidiulosus = {
15771577
end
15781578
if context.cardarea == G.jokers and (to_big(card.ability.extra.Emult) > to_big(1)) and context.joker_main then
15791579
return {
1580-
e_mult = lenient_bignum(card.ability.extra.Emult),
1580+
e_mult = lenient_bignum(card.ability.extra.Emult),
15811581
}
15821582
end
15831583
if context.forcetrigger then
@@ -1588,7 +1588,7 @@ local formidiulosus = {
15881588
G.jokers:emplace(card)
15891589
end
15901590
return {
1591-
e_mult = lenient_bignum(card.ability.extra.Emult),
1591+
e_mult = lenient_bignum(card.ability.extra.Emult),
15921592
}
15931593
end
15941594
end,

‎lib/overrides.lua‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,7 +2029,6 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
20292029
end
20302030
local scie = SMODS.calculate_individual_effect
20312031
function SMODS.calculate_individual_effect(effect, scored_card, key, amount, from_edition)
2032-
20332032
if (key == "e_chips" or key == "echips" or key == "Echip_mod") and amount ~= 1 then
20342033
if effect.card then
20352034
juice_card(effect.card)
@@ -2049,7 +2048,9 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
20492048
elseif key ~= "Echip_mod" then
20502049
if effect.echip_message or effect.message then
20512050
local msg = effect.echip_message or effect.message
2052-
if not msg.sound then msg.sound = "cry_echips" end
2051+
if not msg.sound then
2052+
msg.sound = "cry_echips"
2053+
end
20532054
card_eval_status_text(
20542055
scored_card or effect.card or effect.focus,
20552056
"e_chips",
@@ -2059,7 +2060,14 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
20592060
msg
20602061
)
20612062
else
2062-
card_eval_status_text(scored_card or effect.card or effect.focus, "e_chips", amount, percent, nil, {colour = G.C.DARK_EDITION})
2063+
card_eval_status_text(
2064+
scored_card or effect.card or effect.focus,
2065+
"e_chips",
2066+
amount,
2067+
percent,
2068+
nil,
2069+
{ colour = G.C.DARK_EDITION }
2070+
)
20632071
end
20642072
end
20652073
end
@@ -2079,12 +2087,19 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
20792087
nil,
20802088
percent,
20812089
nil,
2082-
{ message = "^" .. amount .. " " .. localize("k_mult"), colour = G.C.EDITION, edition = true, sound = "cry_emult" }
2090+
{
2091+
message = "^" .. amount .. " " .. localize("k_mult"),
2092+
colour = G.C.EDITION,
2093+
edition = true,
2094+
sound = "cry_emult",
2095+
}
20832096
)
20842097
elseif key ~= "Emult_mod" then
20852098
if effect.emult_message or effect.message then
20862099
local msg = effect.echip_message or effect.message
2087-
if not msg.sound then msg.sound = "cry_emult" end
2100+
if not msg.sound then
2101+
msg.sound = "cry_emult"
2102+
end
20882103
card_eval_status_text(
20892104
scored_card or effect.card or effect.focus,
20902105
"e_mult",
@@ -2094,7 +2109,14 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
20942109
msg
20952110
)
20962111
else
2097-
card_eval_status_text(scored_card or effect.card or effect.focus, "e_mult", amount, percent, nil, {colour = G.C.DARK_EDITION})
2112+
card_eval_status_text(
2113+
scored_card or effect.card or effect.focus,
2114+
"e_mult",
2115+
amount,
2116+
percent,
2117+
nil,
2118+
{ colour = G.C.DARK_EDITION }
2119+
)
20982120
end
20992121
end
21002122
end

0 commit comments

Comments
 (0)