diff --git a/lovely.toml b/lovely.toml index 2bfe5ba..1851ea6 100644 --- a/lovely.toml +++ b/lovely.toml @@ -45,10 +45,9 @@ position = "before" payload = '''if Jane and (type(G.ARGS.score_intensity.required_score) == "table" and G.ARGS.score_intensity.required_score:to_number() or G.ARGS.score_intensity.required_score) ~= 0 then local break_infinity = ((Talisman or {}).config_file or {}).break_infinity local big = (break_infinity == "" or break_infinity == nil) and function (x) return x end or to_big - local base = Cryptid and 10 or G.ARGS.score_intensity.required_score - local expo = Cryptid and G.ARGS.score_intensity.required_score or 10 + local base = Cryptid and 2 or G.ARGS.score_intensity.required_score + local expo = Cryptid and G.ARGS.score_intensity.required_score or 2 Jane.sinister = (G.ARGS.score_intensity.earned_score / (big(base) ^ big(expo))):to_number() > 1 - G.escapey_sinister = Jane.sinister end''' match_indent = true diff --git a/manifest.json b/manifest.json index ff2ce74..a9b2b83 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.6.0" + "version": "1.6.1" } \ No newline at end of file diff --git a/src/edition.lua b/src/edition.lua index 2a49f45..6b516dc 100644 --- a/src/edition.lua +++ b/src/edition.lua @@ -110,10 +110,12 @@ SMODS.Edition({ }, }, on_apply = function(card) - if not Cryptid and is_playing_card(card) then + if card.Jane_jumbo then return end + card.Jane_jumbo = true + Jane.q(function() Jane.resize(card, Jane.config.wee_sizemod) end, nil, nil, nil, false, false) @@ -135,10 +137,12 @@ SMODS.Edition({ end end, on_remove = function(card) - if not Cryptid and is_playing_card(card) then + if not card.Jane_jumbo then return end + card.Jane_jumbo = nil + Jane.q(function() Jane.resize(card, 1 / Jane.config.wee_sizemod) end, nil, nil, nil, false, false) diff --git a/src/joker.lua b/src/joker.lua index 5f0ba99..82a0f3f 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -120,6 +120,24 @@ local function voucher_count() return count end +local escapey_quotes = { + marble = {"there is no escape..."}, + normal = { + {"", "I can't wait to work with you!"}, + {"", "Did you need something from me?"}, + {"", "Oh! I'm just so happy to see you!"}, + {"Can I say something irrelevant?", "I promise it won't be long."}, + {"Tell me about your buddies!", "Assuming you have them, anyway."}, + }, + scared = { + "What am I going to do?!", + "I'm not scared, you are!", + "Tell me when this is over...", + "I can't keep looking at this!", + "Let me go hide in this corner... Okay?", + }, +} + SMODS.Joker { key = "escapey", atlas = "janeescapey", @@ -127,14 +145,17 @@ SMODS.Joker { loc_txt = { name = "Escapey", text = { - "Use to sell {C:attention}tags", - "for {X:money,C:white}$#1#X{} each", - "{s:0.75}If any {C:attention,s:0.75}consumables", - "{s:0.75}are unselected, sell", - "{s:0.75}those for {C:money,s:0.75}$#2# {s:0.75}instead", + "{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", + "{C:inactive,s:0.75,E:1}#4#", + "{C:inactive,s:0.75,E:1}#5#{C:red,s:1.5,E:1}#6#", }, }, - config = {extra = {money = 2, xmoney = 1.5}}, + config = {extra = {money = 2, xmoney = 1.5, max = 1000}}, attributes = {"destroy_card", "economy", "tag"}, pos = {x = 0, y = 0}, sinis = {x = 2, y = 0}, @@ -145,7 +166,15 @@ SMODS.Joker { blueprint_compat = false, perishable_compat = true, loc_vars = function(_, _, card) - return {vars = {card.ability.extra.xmoney, card.ability.extra.money}} + local extra = card.ability.extra + + local normal = Jane.sinister and "" or + pseudorandom_element(escapey_quotes.normal, pseudoseed "EscapeyQuotes") or "" + + local scared = not Jane.sinister and "" or + pseudorandom_element(escapey_quotes.scared, pseudoseed "EscapeyQuotes") or "" + + return {vars = {extra.xmoney, number_format(extra.max), extra.money, normal[1], normal[2], scared}} end, Bakery_can_use = function(_, card) if not Jane.can_use() or card.debuff or G.GAME.used_vouchers.v_jane_token_voucher then @@ -165,7 +194,7 @@ SMODS.Joker { return false end, Bakery_use_button_text = function(_, card) - return (card.debuff or G.GAME.used_vouchers.v_jane_token_voucher) and "DEBUFFED" or "ESCAPE" + return card.debuff and "DEBUFFED" or "ESCAPE" end, Bakery_use_joker = function(self, card) if card.debuff then @@ -207,7 +236,8 @@ SMODS.Joker { end end - ease_dollars(math.ceil(times * extra.money + G.GAME.dollars * (math.pow(extra.xmoney, xtimes) - 1))) + local tags = math.min(G.GAME.dollars * (math.pow(extra.xmoney, xtimes) - 1), extra.max) + ease_dollars(math.ceil(times * extra.money + tags)) end, tag_threshold = 30, } diff --git a/src/misprintize.lua b/src/misprintize.lua index c95267f..6c21d21 100644 --- a/src/misprintize.lua +++ b/src/misprintize.lua @@ -133,6 +133,7 @@ function Jane.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stack, for k, v in pairs(tbl) do if (type(tbl[k]) ~= "table") or is_number(tbl[k]) then if is_number(tbl[k]) and not + (k == "x_chips" and not Cryptid) and not (k == "id") and not (k == "colour") and not (k == "suit_nominal") and not diff --git a/src/voucher.lua b/src/voucher.lua index 35ef401..b84d3f9 100644 --- a/src/voucher.lua +++ b/src/voucher.lua @@ -35,14 +35,10 @@ SMODS.Voucher { atlas = "janetokenvoucher", loc_txt = { name = "Token Voucher", - text = {"{C:attention}Tokens {}can appear", "in the shop", "{C:inactive}(Disables Escapey)"}, + text = {"{C:attention}Tokens {}can appear", "in the shop"}, }, pos = {x = 0, y = 0}, cost = 10, - loc_vars = function(_, info_queue, _) - info_queue[#info_queue + 1] = G.P_CENTERS.j_jane_escapey - return {vars = {}} - end, redeem = function(_, _) G.GAME.jane_tokens_rate = 1.5 end,