emik/Jane
1
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Survivor edgecase, Improve Escapey

Browse source
This commit is contained in:
Emik 2026-06-17 09:47:40 +02:00
parent 050289d7bf
commit 70895b77e8
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lovely.toml
View file

@ -89,7 +89,7 @@ target = "functions/state_events.lua"
pattern = "for _, v in ipairs(SMODS.get_card_areas('playing_cards')) do" pattern = "for _, v in ipairs(SMODS.get_card_areas('playing_cards')) do"
position = "after" position = "after"
payload = '''if v == G.hand and not (G.GAME.blind and G.GAME.blind.name == "The Card" and not G.GAME.blind.disabled) and next(SMODS.find_card("j_jane_survivor")) then payload = '''if v == G.hand and not (G.GAME.blind and G.GAME.blind.name == "The Card" and not G.GAME.blind.disabled) and next(SMODS.find_card("j_jane_survivor")) then
if Cryptid then if Jane.cry then
for _, v in ipairs(G.hand.cards) do for _, v in ipairs(G.hand.cards) do
local area = {cards = {v}} local area = {cards = {v}}
SMODS.calculate_main_scoring({cardarea = area, full_hand = area.cards, scoring_hand = area.cards, scoring_name = text, poker_hands = poker_hands}, area.cards) SMODS.calculate_main_scoring({cardarea = area, full_hand = area.cards, scoring_hand = area.cards, scoring_name = text, poker_hands = poker_hands}, area.cards)

2
manifest.json
View file

@ -18,5 +18,5 @@
"conflicts": [ "conflicts": [
"Jen" "Jen"
], ],
"version": "1.8.1" "version": "1.8.2"
} }

18
src/joker.lua
View file

@ -193,7 +193,17 @@ local esc = SMODS.Joker {
return false return false
end, end,
Bakery_use_button_text = function(_, card) Bakery_use_button_text = function(_, card)
return card.debuff and "DEBUFFED" or "ESCAPE" if card.debuff then
return "DEBUFFED"
end
for _, v in ipairs(G.consumeables.cards) do
if destructible(v) then
return "CONSUME"
end
end
return "ESCAPE"
end, end,
Bakery_use_joker = function(self, card) Bakery_use_joker = function(self, card)
if card.debuff then if card.debuff then
@ -235,9 +245,9 @@ local esc = SMODS.Joker {
end end
end end
local scaling = Jane.cry and G.GAME.dollars or math.min(G.GAME.dollars, extra.max) local tag_money = Jane.cry and G.GAME.dollars or math.min(G.GAME.dollars, extra.max)
local tags = scaling * (math.pow(extra.xmoney, xtimes) - 1) local tag_times = Jane.cry and math.pow(extra.xmoney, xtimes) - 1 or xtimes + 1
ease_dollars(math.ceil(times * extra.money + tags)) ease_dollars(math.ceil(times * extra.money + tag_money * tag_times))
end, end,
tag_threshold = 30, tag_threshold = 30,
} }