Skip to content

Commit 0a4cdaa

Browse files
lord-rubylord-ruby
committed
stat changes
1 parent 63ff745 commit 0a4cdaa

File tree

4 files changed

+127
-101
lines changed

4 files changed

+127
-101
lines changed

‎items/epic.lua‎

Lines changed: 93 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -614,10 +614,15 @@ local error_joker = {
614614
jokers[#jokers + 1] = G.jokers.cards[i]
615615
end
616616
end
617+
local buff = 0
618+
local cards = #G.jokers.cards
617619
for i = 1, #jokers do
618-
local card = copy_card(jokers[i])
619-
card:add_to_deck()
620-
G.jokers:emplace(card)
620+
if cards + buff < G.jokers.config.card_limit then
621+
local card = copy_card(jokers[i])
622+
card:add_to_deck()
623+
G.jokers:emplace(card)
624+
buff = buff + 1
625+
end
621626
end
622627
return nil, true
623628
end
@@ -1711,7 +1716,7 @@ local goldjoker = {
17111716
config = {
17121717
extra = {
17131718
percent_mod = 2,
1714-
percent = 0,
1719+
percent = 10,
17151720
},
17161721
},
17171722
dependencies = {
@@ -1759,12 +1764,9 @@ local goldjoker = {
17591764
end
17601765
end
17611766
end,
1762-
calc_dollar_bonus = function(self, card)
1763-
local bonus =
1764-
lenient_bignum(math.max(0, math.floor(0.01 * to_big(card.ability.extra.percent) * (G.GAME.dollars or 0))))
1765-
if to_big(bonus) > to_big(0) then
1766-
return bonus
1767-
end
1767+
cry_calc_interest = function(self, card, interest)
1768+
local old = lenient_bignum(card.ability.extra.percent)
1769+
return (1 + old / 100) * interest
17681770
end,
17691771
cry_credits = {
17701772
idea = {
@@ -2153,26 +2155,49 @@ local jtron = {
21532155
return {
21542156
message = localize({
21552157
type = "variable",
2156-
key = "a_powmult",
2158+
key = "a_xmult",
21572159
vars = {
21582160
number_format(card.ability.immutable.current),
21592161
},
21602162
}),
2161-
Emult_mod = lenient_bignum(card.ability.immutable.current),
2162-
colour = G.C.DARK_EDITION,
2163+
Xmult_mod = lenient_bignum(card.ability.immutable.current),
2164+
colour = G.C.MULT,
21632165
}
21642166
end
2167+
if context.end_of_round then
2168+
if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
2169+
G.E_MANAGER:add_event(Event{
2170+
func = function()
2171+
SMODS.add_card{
2172+
key="j_joker",
2173+
area=G.jokers
2174+
}
2175+
return true
2176+
end
2177+
})
2178+
end
2179+
end
21652180
if context.forcetrigger then
2181+
G.GAME.joker_buffer = G.GAME.joker_buffer + 1
2182+
G.E_MANAGER:add_event(Event{
2183+
func = function()
2184+
SMODS.add_card{
2185+
key="j_joker",
2186+
area=G.jokers
2187+
}
2188+
return true
2189+
end
2190+
})
21662191
return {
21672192
message = localize({
21682193
type = "variable",
2169-
key = "a_powmult",
2194+
key = "a_xmult",
21702195
vars = {
21712196
number_format(1 + to_big(card.ability.extra.bonus)),
21722197
},
21732198
}),
2174-
Emult_mod = lenient_bignum(1 + to_big(card.ability.extra.bonus)),
2175-
colour = G.C.DARK_EDITION,
2199+
Xmult_mod = lenient_bignum(1 + to_big(card.ability.extra.bonus)),
2200+
colour = G.C.MULT,
21762201
}
21772202
end
21782203
end,
@@ -2595,6 +2620,57 @@ local starfruit = {
25952620
end,
25962621
}
25972622

2623+
local chad = {
2624+
object_type = "Joker",
2625+
dependencies = {
2626+
items = {
2627+
"set_cry_meme",
2628+
},
2629+
},
2630+
name = "cry-Chad",
2631+
key = "chad",
2632+
pos = { x = 0, y = 3 },
2633+
order = 301,
2634+
config = {
2635+
extra = { retriggers = 2 },
2636+
immutable = { max_retriggers = 25 },
2637+
},
2638+
pools = { ["Meme"] = true },
2639+
rarity = "cry_epic",
2640+
cost = 10,
2641+
blueprint_compat = true,
2642+
loc_vars = function(self, info_queue, center)
2643+
return { vars = { math.min(center.ability.immutable.max_retriggers, center.ability.extra.retriggers) } }
2644+
end,
2645+
atlas = "atlasone",
2646+
calculate = function(self, card, context)
2647+
if context.retrigger_joker_check and not context.retrigger_joker and context.other_card ~= self then
2648+
if context.other_card == G.jokers.cards[1] then
2649+
return {
2650+
message = localize("k_again_ex"),
2651+
repetitions = to_number(
2652+
math.min(card.ability.immutable.max_retriggers, card.ability.extra.retriggers)
2653+
),
2654+
card = card,
2655+
}
2656+
else
2657+
return nil, true
2658+
end
2659+
end
2660+
end,
2661+
cry_credits = {
2662+
idea = {
2663+
"Jevonn",
2664+
},
2665+
art = {
2666+
"SDM_0",
2667+
},
2668+
code = {
2669+
"Math",
2670+
},
2671+
},
2672+
}
2673+
25982674
return {
25992675
name = "Epic Jokers",
26002676
items = {
@@ -2625,5 +2701,6 @@ return {
26252701
clockwork,
26262702
demicolon,
26272703
starfruit,
2704+
chad
26282705
},
26292706
}

‎items/misc_joker.lua‎

Lines changed: 25 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,6 +1385,7 @@ local eternalflame = {
13851385
}
13861386
elseif
13871387
context.selling_card
1388+
and context.card.config.center.set == "Joker"
13881389
and (context.card.sell_cost >= 2 or Card.get_gameset(card) ~= "modest")
13891390
and not context.blueprint
13901391
then
@@ -1577,56 +1578,6 @@ local seal_the_deal = {
15771578
},
15781579
},
15791580
}
1580-
local chad = {
1581-
object_type = "Joker",
1582-
dependencies = {
1583-
items = {
1584-
"set_cry_meme",
1585-
},
1586-
},
1587-
name = "cry-Chad",
1588-
key = "chad",
1589-
pos = { x = 0, y = 3 },
1590-
order = 71,
1591-
config = {
1592-
extra = { retriggers = 2 },
1593-
immutable = { max_retriggers = 25 },
1594-
},
1595-
pools = { ["Meme"] = true },
1596-
rarity = 3,
1597-
cost = 10,
1598-
blueprint_compat = true,
1599-
loc_vars = function(self, info_queue, center)
1600-
return { vars = { math.min(center.ability.immutable.max_retriggers, center.ability.extra.retriggers) } }
1601-
end,
1602-
atlas = "atlasone",
1603-
calculate = function(self, card, context)
1604-
if context.retrigger_joker_check and not context.retrigger_joker and context.other_card ~= self then
1605-
if context.other_card == G.jokers.cards[1] then
1606-
return {
1607-
message = localize("k_again_ex"),
1608-
repetitions = to_number(
1609-
math.min(card.ability.immutable.max_retriggers, card.ability.extra.retriggers)
1610-
),
1611-
card = card,
1612-
}
1613-
else
1614-
return nil, true
1615-
end
1616-
end
1617-
end,
1618-
cry_credits = {
1619-
idea = {
1620-
"Jevonn",
1621-
},
1622-
art = {
1623-
"SDM_0",
1624-
},
1625-
code = {
1626-
"Math",
1627-
},
1628-
},
1629-
}
16301581
local jimball = {
16311582
object_type = "Joker",
16321583
dependencies = {
@@ -1961,7 +1912,7 @@ local waluigi = {
19611912
key = "waluigi",
19621913
pos = { x = 0, y = 3 },
19631914
soul_pos = { x = 1, y = 3 },
1964-
config = { extra = { Xmult = 2.5 } },
1915+
config = { extra = { Xmult = 1.4 } },
19651916
loc_vars = function(self, info_queue, center)
19661917
return { vars = { number_format(center.ability.extra.Xmult) } }
19671918
end,
@@ -1971,14 +1922,16 @@ local waluigi = {
19711922
blueprint_compat = true,
19721923
demicoloncompat = true,
19731924
calculate = function(self, card, context)
1974-
if context.other_joker and context.other_joker.ability.set == "Joker" then
1975-
if not Talisman.config_file.disable_anims then
1976-
G.E_MANAGER:add_event(Event({
1977-
func = function()
1978-
context.other_joker:juice_up(0.5, 0.5)
1979-
return true
1980-
end,
1981-
}))
1925+
if context.post_trigger or context.forcetrigger then
1926+
if not context.forcetrigger then
1927+
if not Talisman.config_file.disable_anims then
1928+
G.E_MANAGER:add_event(Event({
1929+
func = function()
1930+
context.other_joker:juice_up(0.5, 0.5)
1931+
return true
1932+
end,
1933+
}))
1934+
end
19821935
end
19831936
return {
19841937
message = localize({
@@ -1989,16 +1942,6 @@ local waluigi = {
19891942
Xmult_mod = lenient_bignum(card.ability.extra.Xmult),
19901943
}
19911944
end
1992-
if context.forcetrigger then
1993-
return {
1994-
message = localize({
1995-
type = "variable",
1996-
key = "a_xmult",
1997-
vars = { number_format(card.ability.extra.Xmult) },
1998-
}),
1999-
Xmult_mod = lenient_bignum(card.ability.extra.Xmult),
2000-
}
2001-
end
20021945
end,
20031946
atlas = "atlastwo",
20041947
cry_credits = {
@@ -2025,7 +1968,7 @@ local wario = {
20251968
order = 88,
20261969
pos = { x = 2, y = 3 },
20271970
soul_pos = { x = 3, y = 3 },
2028-
config = { extra = { money = 3 } },
1971+
config = { extra = { money = 2 } },
20291972
demicoloncompat = true,
20301973
loc_vars = function(self, info_queue, center)
20311974
return { vars = { number_format(center.ability.extra.money) } }
@@ -2800,17 +2743,21 @@ local magnet = {
28002743
config = {
28012744
extra = {
28022745
money = 2,
2803-
Xmoney = 5,
28042746
slots = 4,
28052747
},
2748+
immutable = {
2749+
Xmoney = 4
2750+
}
28062751
},
28072752
gameset_config = {
28082753
modest = {
28092754
extra = {
28102755
money = 2,
2811-
Xmoney = 3,
28122756
slots = 3,
28132757
},
2758+
immutable = {
2759+
Xmoney = 3
2760+
}
28142761
},
28152762
},
28162763
rarity = 1,
@@ -2822,20 +2769,20 @@ local magnet = {
28222769
return {
28232770
vars = {
28242771
number_format(center.ability.extra.money),
2825-
number_format(center.ability.extra.Xmoney),
2772+
number_format(center.ability.immutable.Xmoney),
28262773
number_format(center.ability.extra.slots),
28272774
},
28282775
}
28292776
end,
28302777
atlas = "atlastwo",
28312778
calculate = function(self, card, context)
28322779
if context.forcetrigger then
2833-
ease_dollars(lenient_bignum(to_big(card.ability.extra.money) * card.ability.extra.Xmoney))
2780+
ease_dollars(lenient_bignum(to_big(card.ability.extra.money) * center.ability.immutable.Xmoney))
28342781
end
28352782
end,
28362783
calc_dollar_bonus = function(self, card)
28372784
if to_big(#G.jokers.cards) <= to_big(card.ability.extra.slots) then
2838-
return lenient_bignum(to_big(card.ability.extra.money) * card.ability.extra.Xmoney)
2785+
return lenient_bignum(to_big(card.ability.extra.money) * center.ability.immutable.Xmoney)
28392786
else
28402787
return lenient_bignum(card.ability.extra.money)
28412788
end
@@ -7588,7 +7535,7 @@ local wheelhope = {
75887535
pos = { x = 1, y = 1 },
75897536
config = {
75907537
extra = {
7591-
extra = 0.5,
7538+
extra = 0.2,
75927539
x_mult = 1,
75937540
},
75947541
},
@@ -7911,7 +7858,7 @@ local busdriver = {
79117858
},
79127859
name = "cry-busdriver",
79137860
key = "busdriver",
7914-
config = { extra = { mult = 50, odds = 4 } },
7861+
config = { extra = { mult = 25, odds = 4 } },
79157862
pos = { x = 5, y = 1 },
79167863
rarity = 2,
79177864
cost = 7,
@@ -8375,6 +8322,7 @@ local oldinvisible = {
83758322
func = function()
83768323
local card =
83778324
copy_card(pseudorandom_element(eligibleJokers, pseudoseed("cry_oldinvis")), nil)
8325+
if card.edition and card.edition.negative then card:set_edition() end
83788326
card:add_to_deck()
83798327
G.jokers:emplace(card)
83808328
return true
@@ -10672,7 +10620,6 @@ local miscitems = {
1067210620
big_cube,
1067310621
nice,
1067410622
sus,
10675-
chad,
1067610623
jimball,
1067710624
waluigi,
1067810625
wario,

‎items/spooky.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ local candy_basket = {
921921
extra = {
922922
candies = 0,
923923
candy_mod = 1,
924-
candy_boss_mod = 2,
924+
candy_boss_mod = 1,
925925
},
926926
immutable = {
927927
current_win_count = 0,
@@ -1588,7 +1588,7 @@ local candy_buttons = {
15881588
pos = { x = 1, y = 2 },
15891589
order = 140,
15901590
rarity = "cry_candy",
1591-
config = { extra = { rerolls = 15 } },
1591+
config = { extra = { rerolls = 10 } },
15921592
cost = 10,
15931593
atlas = "atlasspooky",
15941594
blueprint_compat = true,

0 commit comments

Comments
 (0)