diff --git a/assets/1x/default/v_jane_token_voucher_plus.png b/assets/1x/default/v_jane_token_voucher_plus.png new file mode 100644 index 0000000..6c198a4 Binary files /dev/null and b/assets/1x/default/v_jane_token_voucher_plus.png differ diff --git a/assets/2x/default/v_jane_token_voucher_plus.png b/assets/2x/default/v_jane_token_voucher_plus.png new file mode 100644 index 0000000..8465290 Binary files /dev/null and b/assets/2x/default/v_jane_token_voucher_plus.png differ diff --git a/manifest.json b/manifest.json index aa528d9..9515bc0 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.6.12" + "version": "1.6.13" } \ No newline at end of file diff --git a/src/joker.lua b/src/joker.lua index 83a9ee6..441fb0c 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -155,7 +155,7 @@ SMODS.Joker { "{C:inactive,s:0.75,E:1}#5#{C:red,s:1.5,E:1}#6#", }, }, - config = {extra = {money = 2, xmoney = 1.5, max = 10000}}, + config = {extra = {money = 2, xmoney = 1.5, max = 1000}}, attributes = {"destroy_card", "economy", "tag"}, pos = {x = 0, y = 0}, sinis = {x = 2, y = 0}, @@ -177,7 +177,7 @@ SMODS.Joker { 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 + if not Jane.can_use() or card.debuff then return false end diff --git a/src/voucher.lua b/src/voucher.lua index b84d3f9..9e9b317 100644 --- a/src/voucher.lua +++ b/src/voucher.lua @@ -12,6 +12,13 @@ SMODS.Atlas { path = Jane.config.texture_pack .. "/v_jane_token_voucher.png", } +SMODS.Atlas { + key = "janetokenvoucherplus", + px = 71, + py = 95, + path = Jane.config.texture_pack .. "/v_jane_token_voucher_plus.png", +} + if Cryptid then SMODS.Voucher { key = "jolly_voucher", @@ -35,11 +42,26 @@ SMODS.Voucher { atlas = "janetokenvoucher", loc_txt = { name = "Token Voucher", - text = {"{C:attention}Tokens {}can appear", "in the shop"}, + text = {"{C:attention}Token {} cards appear", "can appear", "in the shop"}, }, pos = {x = 0, y = 0}, cost = 10, redeem = function(_, _) - G.GAME.jane_tokens_rate = 1.5 + G.GAME.jane_tokens_rate = 1 + end, +} + +SMODS.Voucher { + key = "token_voucher_plus", + atlas = "janetokenvoucherplus", + loc_txt = { + name = "Token Voucher+", + text = {"{C:attention}Token {}cards appear", "{C:attention}3X {}more frequently", "in the shop"}, + }, + requires = {"v_jane_token_voucher"}, + pos = {x = 0, y = 0}, + cost = 10, + redeem = function(_, _) + G.GAME.jane_tokens_rate = (G.GAME.jane_tokens_rate or 1) * 3 end, }