diff --git a/manifest.json b/manifest.json index 5f41486..dc1a8db 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.7.4" + "version": "1.7.5" } \ No newline at end of file diff --git a/src/joker.lua b/src/joker.lua index 94058ba..cdf77e7 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -138,7 +138,7 @@ local escapey_quotes = { }, } -SMODS.Joker { +local esc = SMODS.Joker { key = "escapey", atlas = "janeescapey", pronouns = "they_them", @@ -147,7 +147,6 @@ SMODS.Joker { text = { "{s:1.25}Use to sell {C:attention,s:1.25}tags", "{s:1.25}for {X:money,C:white,s:1.25}$#1#X{s:1.25} each", - "{C:inactive,s:1.25}(Max of {C:money,s:1.25}$#2#{C:inactive,s:1.25})", "If any {C:attention}consumables", "are unselected, sell", "those for {C:money}$#3# {}instead", @@ -236,12 +235,19 @@ SMODS.Joker { end end - local tags = math.min(G.GAME.dollars, extra.max) * (math.pow(extra.xmoney, xtimes) - 1) + local scaling = Cryptid and G.GAME.dollars or math.min(G.GAME.dollars, extra.max) + local tags = scaling * (math.pow(extra.xmoney, xtimes) - 1) ease_dollars(math.ceil(times * extra.money + tags)) end, tag_threshold = 30, } +local _ = Cryptid or table.insert( + esc.loc_txt.text, + 3, + "{C:inactive,s:1.25}(Max of {C:money,s:1.25}$#2#{C:inactive,s:1.25})" +) + local maxie_quotes = { normal = { "Hey! I hope we can become great friends together!",