Skip to content

Commit 1a9a97c

Browse files
author
jolly[bot]
committed
jolly-bot: auto-format Lua files using Stylua
1 parent 15e52e6 commit 1a9a97c

File tree

8 files changed

+186
-52
lines changed

8 files changed

+186
-52
lines changed

‎items/code.lua‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5026,7 +5026,8 @@ local copypaste = {
50265026
local num, denom = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or 2)
50275027
return {
50285028
vars = {
5029-
num, denom
5029+
num,
5030+
denom,
50305031
}, -- this effectively prevents a copypaste from ever initially misprinting at above 50% odds. still allows rigging/oops
50315032
key = Cryptid.gameset_loc(self, { madness = "madness", exp_modest = "modest" }),
50325033
}
@@ -5066,7 +5067,12 @@ local copypaste = {
50665067
then
50675068
if #G.consumeables.cards + G.GAME.consumeable_buffer < G.consumeables.config.card_limit then
50685069
if
5069-
SMODS.pseudorandom_probability(card, "cry_copypaste_joker", 1, card and card.ability.extra.odds or 2)
5070+
SMODS.pseudorandom_probability(
5071+
card,
5072+
"cry_copypaste_joker",
5073+
1,
5074+
card and card.ability.extra.odds or 2
5075+
)
50705076
then
50715077
G.E_MANAGER:add_event(Event({
50725078
func = function()

‎items/epic.lua‎

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ local googol_play = {
211211
atlas = "atlasepic",
212212
soul_pos = { x = 10, y = 0, extra = { x = 4, y = 0 } },
213213
loc_vars = function(self, info_queue, card)
214-
local num, denom = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
214+
local num, denom =
215+
SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
215216
return {
216217
vars = {
217218
num,
@@ -223,7 +224,12 @@ local googol_play = {
223224
calculate = function(self, card, context)
224225
if
225226
context.joker_main
226-
and SMODS.pseudorandom_element(card, "cry_googol_play", 1, card and card.ability.extra.odds or self.config.extra.odds)
227+
and SMODS.pseudorandom_element(
228+
card,
229+
"cry_googol_play",
230+
1,
231+
card and card.ability.extra.odds or self.config.extra.odds
232+
)
227233
then
228234
return {
229235
message = localize({
@@ -877,11 +883,12 @@ local boredom = {
877883
cost = 14,
878884
blueprint_compat = true,
879885
loc_vars = function(self, info_queue, card)
880-
local num, denom = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
886+
local num, denom =
887+
SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
881888
return {
882889
vars = {
883890
num,
884-
denom
891+
denom,
885892
},
886893
}
887894
end,
@@ -893,7 +900,12 @@ local boredom = {
893900
and not (context.other_card.ability and context.other_card.ability.name == "cry-Boredom")
894901
then
895902
if
896-
SMODS.pseudorandom_element(card, "cry_boredom_joker", 1, card and card.ability.extra.odds or self.config.extra.odds)
903+
SMODS.pseudorandom_element(
904+
card,
905+
"cry_boredom_joker",
906+
1,
907+
card and card.ability.extra.odds or self.config.extra.odds
908+
)
897909
then
898910
return {
899911
message = localize("k_again_ex"),
@@ -907,7 +919,12 @@ local boredom = {
907919
if
908920
context.repetition
909921
and context.cardarea == G.play
910-
and SMODS.pseudorandom_element(card, "cry_boredom_card", 1, card and card.ability.extra.odds or self.config.extra.odds)
922+
and SMODS.pseudorandom_element(
923+
card,
924+
"cry_boredom_card",
925+
1,
926+
card and card.ability.extra.odds or self.config.extra.odds
927+
)
911928
then
912929
return {
913930
message = localize("k_again_ex"),
@@ -1468,10 +1485,12 @@ local bonusjoker = {
14681485
enhancement_gate = "m_bonus",
14691486
loc_vars = function(self, info_queue, card)
14701487
info_queue[#info_queue + 1] = G.P_CENTERS.m_bonus
1471-
local num, denom = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
1488+
local num, denom =
1489+
SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
14721490
return {
14731491
vars = {
1474-
num, denom,
1492+
num,
1493+
denom,
14751494
number_format(card.ability.extra.add),
14761495
},
14771496
}
@@ -1481,7 +1500,12 @@ local bonusjoker = {
14811500
if context.individual and context.cardarea == G.play then
14821501
if SMODS.has_enhancement(context.other_card, "m_bonus") then
14831502
if
1484-
SMODS.pseudorandom_probability(card, "bonusjoker", 1, card and card.ability.extra.odds or self.config.extra.odds)
1503+
SMODS.pseudorandom_probability(
1504+
card,
1505+
"bonusjoker",
1506+
1,
1507+
card and card.ability.extra.odds or self.config.extra.odds
1508+
)
14851509
and card.ability.immutable.check < 2
14861510
and not context.retrigger_joker
14871511
then
@@ -1576,11 +1600,12 @@ local multjoker = {
15761600
loc_vars = function(self, info_queue, card)
15771601
info_queue[#info_queue + 1] = G.P_CENTERS.m_mult
15781602
info_queue[#info_queue + 1] = G.P_CENTERS.c_cryptid
1579-
local num, denom = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
1603+
local num, denom =
1604+
SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
15801605
return {
15811606
vars = {
15821607
num,
1583-
denom
1608+
denom,
15841609
},
15851610
}
15861611
end,
@@ -1592,7 +1617,12 @@ local multjoker = {
15921617
and #G.consumeables.cards + G.GAME.consumeable_buffer < G.consumeables.config.card_limit
15931618
then
15941619
if
1595-
SMODS.pseudorandom_probability(card, "multjoker", 1, card and card.ability.extra.odds or self.config.extra.odds)
1620+
SMODS.pseudorandom_probability(
1621+
card,
1622+
"multjoker",
1623+
1,
1624+
card and card.ability.extra.odds or self.config.extra.odds
1625+
)
15961626
then
15971627
G.GAME.consumeable_buffer = G.GAME.consumeable_buffer + 1
15981628
G.E_MANAGER:add_event(Event({

‎items/m.lua‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,8 @@ local notebook = {
538538
demicoloncompat = true,
539539
loc_vars = function(self, info_queue, card)
540540
info_queue[#info_queue + 1] = G.P_CENTERS.j_jolly
541-
local num, denom = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
541+
local num, denom =
542+
SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
542543
return {
543544
vars = {
544545
num,
@@ -566,7 +567,12 @@ local notebook = {
566567
end
567568
if
568569
to_number(jollycount) >= to_number(card.ability.extra.jollies) --if there are 5 or more jolly jokers
569-
or SMODS.pseudorandom_element(card, "cry_notebook", 1, card and card.ability.extra.odds or self.config.extra.odds)
570+
or SMODS.pseudorandom_element(
571+
card,
572+
"cry_notebook",
573+
1,
574+
card and card.ability.extra.odds or self.config.extra.odds
575+
)
570576
then
571577
card.ability.immutable.slots = to_number(
572578
math.min(
@@ -831,19 +837,25 @@ local scrabble = {
831837
if Cryptid.enabled("e_cry_m") == true then
832838
info_queue[#info_queue + 1] = G.P_CENTERS.e_cry_m
833839
end
834-
local num, denom = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
840+
local num, denom =
841+
SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
835842
return {
836843
vars = {
837844
num,
838-
denom
845+
denom,
839846
},
840847
}
841848
end,
842849
calculate = function(self, card, context)
843850
if context.cardarea == G.jokers and context.before and not context.retrigger_joker then
844851
local check = false
845852
if
846-
SMODS.pseudorandom_element(card, "scrabbleother", 1, card and card.ability.extra.odds or self.config.extra.odds)
853+
SMODS.pseudorandom_element(
854+
card,
855+
"scrabbleother",
856+
1,
857+
card and card.ability.extra.odds or self.config.extra.odds
858+
)
847859
then
848860
check = true
849861
local card = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "scrabbletile")

‎items/misc.lua‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ local echo = {
2929
vars = {
3030
card and card.ability.retriggers or self.config.retriggers,
3131
num,
32-
denom
32+
denom,
3333
},
3434
}
3535
end,
@@ -210,15 +210,23 @@ local abstract = {
210210
config = { extra = { Emult = 1.15, odds_after_play = 2, odds_after_round = 4, marked = false, survive = false } },
211211
--#1# emult, #2# in #3# chance card is destroyed after play, #4# in #5$ chance card is destroyed at end of round (even discarded or in deck)
212212
loc_vars = function(self, info_queue, card)
213-
local num1, denom1 = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds_after_play or self.config.extra.odds_after_play)
214-
local num2, denom2 = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds_after_round or self.config.extra.odds_after_round)
213+
local num1, denom1 = SMODS.get_probability_vars(
214+
card,
215+
1,
216+
card and card.ability.extra.odds_after_play or self.config.extra.odds_after_play
217+
)
218+
local num2, denom2 = SMODS.get_probability_vars(
219+
card,
220+
1,
221+
card and card.ability.extra.odds_after_round or self.config.extra.odds_after_round
222+
)
215223
return {
216224
vars = {
217225
card.ability.extra.Emult,
218226
num1,
219227
denom1,
220228
num2,
221-
denom2
229+
denom2,
222230
},
223231
}
224232
end,
@@ -230,7 +238,12 @@ local abstract = {
230238
and not card.ability.extra.marked
231239
and not card.ability.eternal
232240
and not card.ability.extra.survive --this presvents repitition of shatter chance by shutting it out once it confirms to "survive"
233-
and SMODS.pseudorandom_probability(card, "cry_abstract_destroy", 1, card and card.ability.extra.odds_after_play or self.config.extra.odds_after_play)
241+
and SMODS.pseudorandom_probability(
242+
card,
243+
"cry_abstract_destroy",
244+
1,
245+
card and card.ability.extra.odds_after_play or self.config.extra.odds_after_play
246+
)
234247
then -- the 'card.area' part makes sure the card has a chance to survive if in the play area
235248
card.ability.extra.marked = true
236249
elseif context.cardarea == G.play and not card.ability.extra.marked then
@@ -2539,7 +2552,12 @@ return {
25392552
function Card:calculate_abstract_break()
25402553
if self.config.center_key == "m_cry_abstract" and not self.ability.extra.marked then
25412554
if
2542-
SMODS.pseudorandom_probability(card, "cry_abstract_destroy2", 1, card and card.ability.extra.odds_after_round or self.config.extra.odds_after_round)
2555+
SMODS.pseudorandom_probability(
2556+
card,
2557+
"cry_abstract_destroy2",
2558+
1,
2559+
card and card.ability.extra.odds_after_round or self.config.extra.odds_after_round
2560+
)
25432561
then
25442562
self.ability.extra.marked = true
25452563
--KUFMO HAS abstract!!!!111!!!

‎items/misc_joker.lua‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3841,7 +3841,7 @@ local rnjoker = {
38413841
or (card.ability.extra and card.ability.extra.value)
38423842
or 0,
38433843
denom,
3844-
num
3844+
num,
38453845
},
38463846
}
38473847
if card.ability.extra and card.ability.extra.color then
@@ -4071,7 +4071,12 @@ local rnjoker = {
40714071
end
40724072
elseif j.cond == "odds" then
40734073
if
4074-
SMODS.pseudorandom_probability(card, "rnj", 1, card and card.ability.extra.cond_value or 0)
4074+
SMODS.pseudorandom_probability(
4075+
card,
4076+
"rnj",
4077+
1,
4078+
card and card.ability.extra.cond_value or 0
4079+
)
40754080
then
40764081
cond_passed = true
40774082
end
@@ -4353,7 +4358,11 @@ local rnjoker = {
43534358
end
43544359
elseif j.cond == "odds" then
43554360
if
4356-
SMODS.pseudorandom_element(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
4361+
SMODS.pseudorandom_element(
4362+
card,
4363+
1,
4364+
card and card.ability.extra.odds or self.config.extra.odds
4365+
)
43574366
then
43584367
cond_passed = true
43594368
end
@@ -4436,7 +4445,12 @@ local rnjoker = {
44364445
end
44374446
elseif j.cond == "odds" then
44384447
if
4439-
SMODS.pseudorandom_probability(card, "rnj", 1, card and card.ability.extra.cond_value or 0)
4448+
SMODS.pseudorandom_probability(
4449+
card,
4450+
"rnj",
4451+
1,
4452+
card and card.ability.extra.cond_value or 0
4453+
)
44404454
then
44414455
cond_passed = true
44424456
end
@@ -7607,11 +7621,12 @@ local oldblueprint = {
76077621
},
76087622
}
76097623
end
7610-
local num, denom = SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
7624+
local num, denom =
7625+
SMODS.get_probability_vars(card, 1, card and card.ability.extra.odds or self.config.extra.odds)
76117626
return {
76127627
vars = {
76137628
num,
7614-
denom
7629+
denom,
76157630
},
76167631
main_end = main_end,
76177632
}
@@ -7804,7 +7819,8 @@ local busdriver = {
78047819
blueprint_compat = true,
78057820
demicoloncompat = true,
78067821
loc_vars = function(self, info_queue, card)
7807-
local num, denom = SMODS.get_probability_vars(card, 3, card and card.ability.extra.odds or self.config.extra.odds)
7822+
local num, denom =
7823+
SMODS.get_probability_vars(card, 3, card and card.ability.extra.odds or self.config.extra.odds)
78087824
local num2 = denom - num
78097825
return {
78107826
vars = {
@@ -7819,7 +7835,12 @@ local busdriver = {
78197835
if context.joker_main and (to_big(card.ability.extra.mult) > to_big(0)) then
78207836
local oddy = math.max(1, card.ability.extra.odds)
78217837
if
7822-
SMODS.pseudorandom_element(card, "cry_busdriver", 3, card and card.ability.extra.odds or self.config.extra.odds)
7838+
SMODS.pseudorandom_element(
7839+
card,
7840+
"cry_busdriver",
7841+
3,
7842+
card and card.ability.extra.odds or self.config.extra.odds
7843+
)
78237844
then
78247845
return {
78257846
message = localize({
@@ -9358,9 +9379,7 @@ local digitalhallucinations = {
93589379

93599380
if
93609381
context.open_booster
9361-
and (
9362-
SMODS.pseudorandom_element(card, "digi", 1, card and card.ability.odds or self.config.odds)
9363-
)
9382+
and (SMODS.pseudorandom_element(card, "digi", 1, card and card.ability.odds or self.config.odds))
93649383
then
93659384
local boosty = context.card
93669385
-- finally mod compat?

0 commit comments

Comments
 (0)