diff --git a/lovely.toml b/lovely.toml index 8c89a48..d823129 100644 --- a/lovely.toml +++ b/lovely.toml @@ -8,7 +8,10 @@ priority = 115 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" +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 [[patches]] @@ -24,7 +27,7 @@ match_indent = true target = "functions/common_events.lua" pattern = "if v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden then" 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 [[patches]] @@ -32,7 +35,9 @@ match_indent = true target = "functions/misc_functions.lua" pattern = "G.GAME.current_round.current_hand.chips*G.GAME.current_round.current_hand.mult" 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 [[patches]] @@ -159,7 +164,7 @@ match_indent = true target = "functions/state_events.lua" pattern = '''hand_chips\*mult\)''' 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.pattern] @@ -286,6 +291,10 @@ SMODS.Joker { eternal_compat = true, blueprint_compat = false, 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) local extra = card.ability.extra diff --git a/manifest.json b/manifest.json index 67eea36..12e5c34 100644 --- a/manifest.json +++ b/manifest.json @@ -16,5 +16,5 @@ "Bakery (>=3.2.0~*)" ], "conflicts": [], - "version": "1.11.29" + "version": "1.11.30" } \ No newline at end of file