diff --git a/lovely.toml b/lovely.toml index df085a8..b3017d9 100644 --- a/lovely.toml +++ b/lovely.toml @@ -83,7 +83,7 @@ pattern = "local card = create_card('Tarot',G.consumeables, nil, nil, nil, nil, position = "after" times = 1 payload = """if next(SMODS.find_card "j_Roland_misfortune") then - card:set_edition "e_negative" + card:set_edition("e_negative", true, true) end""" match_indent = true @@ -105,7 +105,7 @@ target = "card.lua" pattern = "local card = create_card(card_type,G.consumeables, nil, nil, nil, nil, _planet, 'blusl')" position = "after" payload = """if next(SMODS.find_card "j_Roland_misfortune") then - card:set_edition "e_negative" + card:set_edition("e_negative", true, true) end""" match_indent = true diff --git a/manifest.json b/manifest.json index 87dbfa2..e0046e2 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.9.79", + "version": "2.9.80", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/joker.lua b/src/joker.lua index a163a7b..0cf5325 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -218,8 +218,8 @@ joker { SMODS.calculate_context {drawing_cards = true, draw = {G.deck.cards}} SMODS.calculate_context { - hand_drawn = facing_blind and {G.deck.cards[1]} and true, - other_drawn = not facing_blind and {G.deck.cards[1]} and true, + hand_drawn = facing_blind and {G.deck.cards[1]} or true, + other_drawn = not facing_blind and {G.deck.cards[1]} or true, first_hand_drawn = not current_round.any_hand_drawn and facing_blind or nil, } @@ -274,7 +274,7 @@ joker { delay = 1, func = function() play_sound "timpani" - SMODS.add_card {edition = "e_negative", key = v.config.center.key} + SMODS.add_card {edition = "e_negative", key = v.config.center.key, silent = true} end, } end) or nil diff --git a/src/lib/intellisense.lua b/src/lib/intellisense.lua index ad116b3..7bb75d0 100644 --- a/src/lib/intellisense.lua +++ b/src/lib/intellisense.lua @@ -28,6 +28,11 @@ CardSleeves.Sleeve = CardSleeves.Sleeve --- @type {aliases: { [string]: [string] }} Cryptid = Cryptid +---@return Card +function copy_card(...) + error(...) +end + --- @type fun(area: CardArea, ...: ...): Card create_card_for_shop = create_card_for_shop @@ -43,9 +48,11 @@ G.playing_cards = G.playing_cards ---@type userdata|{getWidth: fun(self: self): number} SMODS.Atlas.image_data = SMODS.Atlas.image_data ----@return Card -function copy_card(...) - error(...) +---@param context CalcContext|table|{hand_drawn: true, other_drawn: true} +---@param return_table? table +---@return table? +function SMODS.calculate_context(context, return_table) + error {context, return_table} end SMODS.Mods.Roland.config = require "config"