Skip to content

Commit 689cfc5

Browse files
committed
various things
i had to manually move these from main cause idk what happened
1 parent 3199cce commit 689cfc5

File tree

13 files changed

+44
-8
lines changed

13 files changed

+44
-8
lines changed

assets/1x/atlasepic.png

25 KB
Loading

assets/1x/atlasexotic.png

20.3 KB
Loading

assets/1x/atlastwo.png

18.2 KB
Loading

assets/2x/atlasepic.png

41.2 KB
Loading

assets/2x/atlasexotic.png

10.4 KB
Loading

assets/2x/atlastwo.png

43.3 KB
Loading

items/code.lua

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3825,18 +3825,24 @@ local quantify = {
38253825
or {}
38263826
local card = create_card(
38273827
kind or tbl.set,
3828-
G.jokers,
3828+
nil,
38293829
tbl.legendary,
38303830
tbl.rarity,
38313831
tbl.skip_materialize,
38323832
tbl.soulable,
38333833
tbl.forced_key,
38343834
"cry_quantify_booster"
38353835
)
3836-
G.jokers:emplace(card)
38373836
if to_big(self.ability.choose) <= to_big(0) then
38383837
self:start_dissolve()
38393838
end
3839+
G.E_MANAGER:add_event(Event({
3840+
trigger = "before",
3841+
func = function()
3842+
G.jokers:emplace(card)
3843+
return true
3844+
end,
3845+
}))
38403846
end
38413847
end
38423848
end

items/epic.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ local error_joker = {
606606
"Fetch",
607607
},
608608
art = {
609-
"Mystic Misclick",
609+
"mold spores",
610610
},
611611
code = {
612612
"Math",

items/exotic.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ local exponentia = {
327327
end,
328328
cry_credits = {
329329
idea = { "Enemui" },
330-
art = { "Jevonn" },
330+
art = { "Lil Mr. Slipstream", "George the Rat" },
331331
code = { "Math" },
332332
},
333333
init = function(self)

items/m.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ local notebook = {
567567
end
568568
if
569569
to_number(jollycount) >= to_number(card.ability.extra.jollies) --if there are 5 or more jolly jokers
570-
or pseudorandom_probability(
570+
or SMODS.pseudorandom_probability(
571571
card,
572572
"cry_notebook",
573573
1,
@@ -850,7 +850,7 @@ local scrabble = {
850850
if context.cardarea == G.jokers and context.before and not context.retrigger_joker then
851851
local check = false
852852
if
853-
pseudorandom_probability(
853+
SMODS.pseudorandom_probability(
854854
card,
855855
"scrabbleother",
856856
1,

0 commit comments

Comments
 (0)