Skip to content

Commit e4e8924

Browse files
author
jolly[bot]
committed
jolly-bot: auto-format Lua files using Stylua
1 parent 4e4e40c commit e4e8924

File tree

5 files changed

+62
-97
lines changed

5 files changed

+62
-97
lines changed

items/code.lua

Lines changed: 47 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2930,51 +2930,51 @@ local exploit = {
29302930
"high",
29312931
"1oak",
29322932
"1 of a kind",
2933-
"haha one"
2933+
"haha one",
29342934
},
2935-
["Pair"] = {
2935+
["Pair"] = {
29362936
"pair",
29372937
"2oak",
29382938
"2 of a kind",
29392939
"m",
2940-
"window"
2940+
"window",
29412941
},
2942-
["Two Pair"] = {
2942+
["Two Pair"] = {
29432943
"two pair",
29442944
"2 pair",
29452945
"mm",
29462946
"pairpair",
2947-
"pair of a kind"
2947+
"pair of a kind",
29482948
},
2949-
["Three of a Kind"] = {
2950-
"three of a kind",
2951-
"3 of a kind",
2952-
"3oak",
2953-
"trips",
2954-
"triangle"
2949+
["Three of a Kind"] = {
2950+
"three of a kind",
2951+
"3 of a kind",
2952+
"3oak",
2953+
"trips",
2954+
"triangle",
29552955
},
2956-
["Straight"] = {
2957-
"straight",
2958-
"lesbian",
2959-
"gay",
2960-
"bisexual",
2956+
["Straight"] = {
2957+
"straight",
2958+
"lesbian",
2959+
"gay",
2960+
"bisexual",
29612961
"asexual",
2962-
"staircase"
2962+
"staircase",
29632963
},
2964-
["Flush"] = {
2965-
"flush",
2966-
"skibidi",
2967-
"toilet",
2964+
["Flush"] = {
2965+
"flush",
2966+
"skibidi",
2967+
"toilet",
29682968
"floosh",
2969-
"monotone"
2969+
"monotone",
29702970
},
29712971
["Full House"] = {
29722972
"full house",
29732973
"full",
29742974
"that 70s show",
29752975
"modern family",
29762976
"family matters",
2977-
"the middle"
2977+
"the middle",
29782978
},
29792979
["Four of a Kind"] = {
29802980
"four of a kind",
@@ -2984,59 +2984,59 @@ local exploit = {
29842984
"quads",
29852985
"four to the floor",
29862986
},
2987-
["Straight Flush"] = {
2987+
["Straight Flush"] = {
29882988
"straight flush",
29892989
"strush",
29902990
"slush",
29912991
"slushie",
29922992
"slushy",
2993-
"monotone staircase"
2993+
"monotone staircase",
29942994
},
29952995
["Five of a Kind"] = {
29962996
"five of a kind",
29972997
"5 of a kind",
29982998
"5oak",
2999-
"quints"
2999+
"quints",
30003000
},
3001-
["Flush House"] = {
3001+
["Flush House"] = {
30023002
"flush house",
30033003
"flouse",
30043004
"outhouse",
30053005
"monotone house",
3006-
"the grey house"
3006+
"the grey house",
30073007
},
3008-
["Flush Five"] = {
3008+
["Flush Five"] = {
30093009
"flush five",
30103010
"fish",
30113011
"you know what that means",
30123012
"five of a flush",
3013-
"monotone fish"
3013+
"monotone fish",
30143014
},
3015-
["cry_Bulwark"] = {
3015+
["cry_Bulwark"] = {
30163016
"bulwark",
30173017
"flush rock",
30183018
"stoned",
30193019
"stone flush",
30203020
"flush stone",
3021-
"rock and stone"
3021+
"rock and stone",
30223022
},
3023-
["cry_Clusterfuck"] = {
3023+
["cry_Clusterfuck"] = {
30243024
"clusterfuck",
30253025
"fuck",
30263026
"wtf",
30273027
"cluster",
3028-
"what"
3028+
"what",
30293029
},
3030-
["cry_UltPair"] = {
3030+
["cry_UltPair"] = {
30313031
"ultimate pair",
30323032
"ultpair",
30333033
"ult pair",
30343034
"pairpairpair",
30353035
"flush pair of a kind of a kind",
30363036
"2f2oakoak",
3037-
"two flush two of a kind of a kind"
3037+
"two flush two of a kind of a kind",
30383038
},
3039-
["cry_WholeDeck"] = {
3039+
["cry_WholeDeck"] = {
30403040
"the entire fucking deck",
30413041
"deck",
30423042
"tefd",
@@ -3045,7 +3045,7 @@ local exploit = {
30453045
"deck of a kind",
30463046
"the entire deck",
30473047
"everything of a kind",
3048-
"everything"
3048+
"everything",
30493049
},
30503050
}
30513051
local current_hand = nil
@@ -3186,23 +3186,17 @@ local rework = {
31863186
if not G.GAME.modifiers.cry_beta then
31873187
return #G.jokers.highlighted == 1
31883188
and not G.jokers.highlighted[1].ability.eternal
3189-
and G.jokers.highlighted[1].ability.name ~= (
3190-
"cry-meteor"
3191-
or "cry-exoplanet"
3192-
or "cry-stardust"
3193-
or "cry_cursed"
3194-
or ("Diet Cola" or Card.get_gameset(card) == "madness")
3195-
)
3189+
and G.jokers.highlighted[1].ability.name
3190+
~= ("cry-meteor" or "cry-exoplanet" or "cry-stardust" or "cry_cursed" or ("Diet Cola" or Card.get_gameset(
3191+
card
3192+
) == "madness"))
31963193
else
31973194
return #G.jokers.highlighted == 2
3198-
and not G.jokers.highlighted[1].ability.eternal
3199-
and G.jokers.highlighted[1].ability.name ~= (
3200-
"cry-meteor"
3201-
or "cry-exoplanet"
3202-
or "cry-stardust"
3203-
or "cry_cursed"
3204-
or ("Diet Cola" or Card.get_gameset(card) == "madness")
3205-
)
3195+
and not G.jokers.highlighted[1].ability.eternal
3196+
and G.jokers.highlighted[1].ability.name
3197+
~= ("cry-meteor" or "cry-exoplanet" or "cry-stardust" or "cry_cursed" or ("Diet Cola" or Card.get_gameset(
3198+
card
3199+
) == "madness"))
32063200
end
32073201
end,
32083202
use = function(self, card, area, copier)

items/enhanced.lua

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -334,45 +334,9 @@ return {
334334
-- D Invisible Joker
335335

336336
if
337-
center and center.name == (
338-
"Fortune Teller"
339-
or "Shoot the Moon"
340-
or "Riff-raff"
341-
or "Chaos the Clown"
342-
or "Dusk"
343-
or "Mime"
344-
or "Hack"
345-
or "Sock and Buskin"
346-
or "Invisible Joker"
347-
or "Swashbuckler"
348-
or "Smeared Joker"
349-
or "Certificate"
350-
or "Mr. Bones"
351-
or "Diet Cola"
352-
or "Luchador"
353-
or "Midas Mask"
354-
or "Shortcut"
355-
or "Seance"
356-
or "Superposition"
357-
or "Sixth Sense"
358-
or "DNA"
359-
or "Splash"
360-
or "Supernova"
361-
or "Pareidolia"
362-
or "Raised Fist"
363-
or "Marble Joker"
364-
or "Four Fingers"
365-
or "Joker Stencil"
366-
or "Showman"
367-
or "Blueprint"
368-
or "Oops! All 6s"
369-
or "Brainstorm"
370-
or "Cartomancer"
371-
or "Astronomer"
372-
or "Burnt Joker"
373-
or "Chicot"
374-
or "Perkeo"
375-
)
337+
center
338+
and center.name
339+
== ("Fortune Teller" or "Shoot the Moon" or "Riff-raff" or "Chaos the Clown" or "Dusk" or "Mime" or "Hack" or "Sock and Buskin" or "Invisible Joker" or "Swashbuckler" or "Smeared Joker" or "Certificate" or "Mr. Bones" or "Diet Cola" or "Luchador" or "Midas Mask" or "Shortcut" or "Seance" or "Superposition" or "Sixth Sense" or "DNA" or "Splash" or "Supernova" or "Pareidolia" or "Raised Fist" or "Marble Joker" or "Four Fingers" or "Joker Stencil" or "Showman" or "Blueprint" or "Oops! All 6s" or "Brainstorm" or "Cartomancer" or "Astronomer" or "Burnt Joker" or "Chicot" or "Perkeo")
376340
then
377341
self.config.center.immutable = true
378342
end

items/epic.lua

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,8 +1860,13 @@ local spectrogram = {
18601860
end
18611861
end
18621862
end
1863-
1864-
if context.retrigger_joker_check and not context.retrigger_joker and context.other_card == G.jokers.cards[#G.jokers.cards] and context.other_card ~= self then
1863+
1864+
if
1865+
context.retrigger_joker_check
1866+
and not context.retrigger_joker
1867+
and context.other_card == G.jokers.cards[#G.jokers.cards]
1868+
and context.other_card ~= self
1869+
then
18651870
if card.ability.extra.echonum and card.ability.extra.echonum > 0 then
18661871
return {
18671872
message = localize("k_again_ex"),

lib/gameset.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,9 @@ function Card:get_gameset(center)
599599
end
600600
local csa = Card.set_ability
601601
function Card:set_ability(center, y, z)
602-
if not center then return end
602+
if not center then
603+
return
604+
end
603605
if not center.config then
604606
center.config = {} --crashproofing
605607
end

lib/misprintize.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function Cryptid.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stac
1818
and not (k == "qty")
1919
and not (k == "x_mult" and v == 1 and not tbl.override_x_mult_check)
2020
and not (k == "x_chips" and v == 1 and not tbl.override_x_chips_check)
21-
and not (k == ("h_x_chips"))
21+
and not (k == "h_x_chips")
2222
and not (k == "selected_d6_face")
2323
then --Temp fix, even if I did clamp the number to values that wouldn't crash the game, the fact that it did get randomized means that there's a higher chance for 1 or 6 than other values
2424
if not Cryptid.base_values[name] then
@@ -53,7 +53,7 @@ function Cryptid.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stac
5353
and not (_k == "qty")
5454
and not (k == "x_mult" and v == 1 and not tbl[k].override_x_mult_check)
5555
and not (k == "x_chips" and v == 1 and not tbl[k].override_x_chips_check)
56-
and not (k == ("h_x_chips"))
56+
and not (k == "h_x_chips")
5757
and not (_k == "selected_d6_face")
5858
then --Refer to above
5959
if not Cryptid.base_values[name] then

0 commit comments

Comments
 (0)