Implement missing logic from The Saint

This commit is contained in:
Emik 2025-03-26 15:06:59 +01:00
parent de47926a26
commit 8f5d6b830e
Signed by untrusted user who does not match committer: emik
GPG key ID: 09CDFF9E5703688D
2 changed files with 10 additions and 3 deletions

View file

@ -3,6 +3,14 @@ version = "1.0.0"
dump_lua = true dump_lua = true
priority = 2147483647 priority = 2147483647
[[patches]]
[patches.pattern]
target = "card.lua"
pattern = "if v ~= chosen_joker then"
position = "at"
payload = "if v ~= chosen_joker and not next(SMODS.find_card('j_jane_saint')) then"
match_indent = true
[[patches]] [[patches]]
[patches.pattern] [patches.pattern]
target = "globals.lua" target = "globals.lua"
@ -20,7 +28,6 @@ pattern = "if v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden then"
position = "at" position = "at"
payload = "if Jane.hidden(v) then" payload = "if Jane.hidden(v) then"
match_indent = true match_indent = true
overwrite = false
[[patches]] [[patches]]
[patches.pattern] [patches.pattern]
@ -47,7 +54,7 @@ match_indent = true
target = "functions/state_events.lua" 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
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)

View file

@ -441,7 +441,7 @@ SMODS.Joker {
return {vars = { return {vars = {
attuned and " (Attuned)" or "", attuned and " (Attuned)" or "",
Cryptid and "Gateway" or "Ankh", Cryptid and "Ankh and Gateway" or "Ankh",
attuned and "" or "Attune ", attuned and "" or "Attune ",
attuned and "" or "after using ", attuned and "" or "after using ",
attuned and (Cryptid and "^^" or "^") .. attunement or max_karma, attuned and (Cryptid and "^^" or "^") .. attunement or max_karma,