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

Ensure object exists

Browse source
This commit is contained in:
Emik 2026-10-01 18:34:49 +02:00
parent 8784e13aa4
commit 42d96be48a
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lovely.toml
View file

@ -8,7 +8,10 @@ priority = 115
target = "card.lua" target = "card.lua"
pattern = "if v ~= chosen_joker then" pattern = "if v ~= chosen_joker then"
position = "at" position = "at"
payload = "if v ~= chosen_joker and not next(SMODS.find_card('j_jane_saint')) then" payload = """if v ~= chosen_joker and
not next(SMODS.find_card('j_jane_saint')) and
not next(SMODS.find_card('j_jen_saint')) and
not next(SMODS.find_card('j_jen_saint_attuned')) then"""
match_indent = true match_indent = true
[[patches]] [[patches]]
@ -24,7 +27,7 @@ match_indent = true
target = "functions/common_events.lua" target = "functions/common_events.lua"
pattern = "if v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden then" 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 and Jane.hidden(v) or v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden then"
match_indent = true match_indent = true
[[patches]] [[patches]]
@ -32,7 +35,9 @@ match_indent = true
target = "functions/misc_functions.lua" target = "functions/misc_functions.lua"
pattern = "G.GAME.current_round.current_hand.chips*G.GAME.current_round.current_hand.mult" pattern = "G.GAME.current_round.current_hand.chips*G.GAME.current_round.current_hand.mult"
position = "at" position = "at"
payload = '''Jane.get_chipmult_sum(G.GAME.current_round.current_hand.chips, G.GAME.current_round.current_hand.mult)''' payload = '''Jane and
Jane.get_chipmult_sum(G.GAME.current_round.current_hand.chips, G.GAME.current_round.current_hand.mult) or
G.GAME.current_round.current_hand.chips*G.GAME.current_round.current_hand.mult'''
match_indent = true match_indent = true
[[patches]] [[patches]]
@ -159,7 +164,7 @@ match_indent = true
target = "functions/state_events.lua" target = "functions/state_events.lua"
pattern = '''hand_chips\*mult\)''' pattern = '''hand_chips\*mult\)'''
position = "at" position = "at"
payload = "Jane.get_chipmult_sum(hand_chips, mult))" payload = "Jane and Jane.get_chipmult_sum(hand_chips, mult) or hand_chips*mult)"
[[patches]] [[patches]]
[patches.pattern] [patches.pattern]
@ -286,6 +291,10 @@ SMODS.Joker {
eternal_compat = true, eternal_compat = true,
blueprint_compat = false, blueprint_compat = false,
perishable_compat = true, perishable_compat = true,
inject = not SMODS.Attribute and function(...)
SMODS.Joker.inject(...)
Bakery_API.usable_jokers.j_jen_escapey = true
end or nil,
loc_vars = function(_, _, card) loc_vars = function(_, _, card)
local extra = card.ability.extra local extra = card.ability.extra

2
manifest.json
View file

@ -16,5 +16,5 @@
"Bakery (>=3.2.0~*)" "Bakery (>=3.2.0~*)"
], ],
"conflicts": [], "conflicts": [],
"version": "1.11.29" "version": "1.11.30"
} }