Make negative copies silent
This commit is contained in:
parent
f170f855a1
commit
44367939a6
4 changed files with 16 additions and 9 deletions
|
|
@ -83,7 +83,7 @@ pattern = "local card = create_card('Tarot',G.consumeables, nil, nil, nil, nil,
|
||||||
position = "after"
|
position = "after"
|
||||||
times = 1
|
times = 1
|
||||||
payload = """if next(SMODS.find_card "j_Roland_misfortune") then
|
payload = """if next(SMODS.find_card "j_Roland_misfortune") then
|
||||||
card:set_edition "e_negative"
|
card:set_edition("e_negative", true, true)
|
||||||
end"""
|
end"""
|
||||||
match_indent = true
|
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')"
|
pattern = "local card = create_card(card_type,G.consumeables, nil, nil, nil, nil, _planet, 'blusl')"
|
||||||
position = "after"
|
position = "after"
|
||||||
payload = """if next(SMODS.find_card "j_Roland_misfortune") then
|
payload = """if next(SMODS.find_card "j_Roland_misfortune") then
|
||||||
card:set_edition "e_negative"
|
card:set_edition("e_negative", true, true)
|
||||||
end"""
|
end"""
|
||||||
match_indent = true
|
match_indent = true
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
"id": "Roland",
|
"id": "Roland",
|
||||||
"name": "Roland",
|
"name": "Roland",
|
||||||
"prefix": "Roland",
|
"prefix": "Roland",
|
||||||
"version": "2.9.79",
|
"version": "2.9.80",
|
||||||
"badge_colour": "8BE9FD",
|
"badge_colour": "8BE9FD",
|
||||||
"display_name": "Roland",
|
"display_name": "Roland",
|
||||||
"main_file": "src/main.lua",
|
"main_file": "src/main.lua",
|
||||||
|
|
|
||||||
|
|
@ -218,8 +218,8 @@ joker {
|
||||||
SMODS.calculate_context {drawing_cards = true, draw = {G.deck.cards}}
|
SMODS.calculate_context {drawing_cards = true, draw = {G.deck.cards}}
|
||||||
|
|
||||||
SMODS.calculate_context {
|
SMODS.calculate_context {
|
||||||
hand_drawn = 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]} and 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,
|
first_hand_drawn = not current_round.any_hand_drawn and facing_blind or nil,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -274,7 +274,7 @@ joker {
|
||||||
delay = 1,
|
delay = 1,
|
||||||
func = function()
|
func = function()
|
||||||
play_sound "timpani"
|
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,
|
||||||
}
|
}
|
||||||
end) or nil
|
end) or nil
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,11 @@ CardSleeves.Sleeve = CardSleeves.Sleeve
|
||||||
--- @type {aliases: { [string]: [string] }}
|
--- @type {aliases: { [string]: [string] }}
|
||||||
Cryptid = Cryptid
|
Cryptid = Cryptid
|
||||||
|
|
||||||
|
---@return Card
|
||||||
|
function copy_card(...)
|
||||||
|
error(...)
|
||||||
|
end
|
||||||
|
|
||||||
--- @type fun(area: CardArea, ...: ...): Card
|
--- @type fun(area: CardArea, ...: ...): Card
|
||||||
create_card_for_shop = create_card_for_shop
|
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}
|
---@type userdata|{getWidth: fun(self: self): number}
|
||||||
SMODS.Atlas.image_data = SMODS.Atlas.image_data
|
SMODS.Atlas.image_data = SMODS.Atlas.image_data
|
||||||
|
|
||||||
---@return Card
|
---@param context CalcContext|table|{hand_drawn: true, other_drawn: true}
|
||||||
function copy_card(...)
|
---@param return_table? table
|
||||||
error(...)
|
---@return table?
|
||||||
|
function SMODS.calculate_context(context, return_table)
|
||||||
|
error {context, return_table}
|
||||||
end
|
end
|
||||||
|
|
||||||
SMODS.Mods.Roland.config = require "config"
|
SMODS.Mods.Roland.config = require "config"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue