diff --git a/assets/1x/joker.png b/assets/1x/joker.png index 8b861ec..67a2bc6 100644 Binary files a/assets/1x/joker.png and b/assets/1x/joker.png differ diff --git a/assets/2x/back.png b/assets/2x/back.png index e22fcda..ac30996 100644 Binary files a/assets/2x/back.png and b/assets/2x/back.png differ diff --git a/assets/2x/blind.png b/assets/2x/blind.png index ed8e392..f0100e7 100644 Binary files a/assets/2x/blind.png and b/assets/2x/blind.png differ diff --git a/assets/2x/charm.png b/assets/2x/charm.png index bc483df..268c3fc 100644 Binary files a/assets/2x/charm.png and b/assets/2x/charm.png differ diff --git a/assets/2x/icon.png b/assets/2x/icon.png index cdfd4f6..532719d 100644 Binary files a/assets/2x/icon.png and b/assets/2x/icon.png differ diff --git a/assets/2x/joker.png b/assets/2x/joker.png index d4e2ee1..cbd1f09 100644 Binary files a/assets/2x/joker.png and b/assets/2x/joker.png differ diff --git a/assets/2x/seal.png b/assets/2x/seal.png index 2e4d755..7973ab9 100644 Binary files a/assets/2x/seal.png and b/assets/2x/seal.png differ diff --git a/assets/2x/spectral.png b/assets/2x/spectral.png index 82e3256..d502cd6 100644 Binary files a/assets/2x/spectral.png and b/assets/2x/spectral.png differ diff --git a/assets/2x/tag.png b/assets/2x/tag.png index 0ebc6d0..95e70ab 100644 Binary files a/assets/2x/tag.png and b/assets/2x/tag.png differ diff --git a/assets/2x/tarot.png b/assets/2x/tarot.png index 886c6c9..62e88d0 100644 Binary files a/assets/2x/tarot.png and b/assets/2x/tarot.png differ diff --git a/manifest.json b/manifest.json index 5f2ef21..9a0265c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "author": [ "Emik" ], - "version": "2.5.10", + "version": "2.6.0", "badge_colour": "8BE9FD", "main_file": "src/main.lua", "badge_text_colour": "44475A", diff --git a/src/joker.lua b/src/joker.lua index edc95e0..1e02689 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -523,33 +523,6 @@ joker { end, } -joker { - key = "temple", - pronouns = "any_all", - config = {extra = {xmult = 2}}, - attributes = {"xmult", "enhancements"}, - cost = 6, - rarity = 2, - eternal_compat = true, - blueprint_compat = true, - perishable_compat = true, - loc_vars = function(_, info_queue, card) - table.insert(info_queue, G.P_CENTERS.m_wild) - return {vars = {card.ability.extra.xmult}} - end, - calculate = function(_, card, context) - return ((context.individual and - context.cardarea == "unscored" and - SMODS.has_enhancement(context.other_card, "m_wild") - ) or context.forcetrigger) and {xmult = card.ability.extra.xmult} or nil - end, - in_pool = function() - return f(G.playing_cards):any(function(v) - return SMODS.has_enhancement(v, "m_wild") - end) - end, -} - joker { key = "bulldozer", pronouns = "it_its", diff --git a/src/main.lua b/src/main.lua index 288c07f..2b425fd 100644 --- a/src/main.lua +++ b/src/main.lua @@ -70,7 +70,3 @@ function SMODS.current_mod.config_tab() }}, } end - -function SMODS.current_mod.optional_features() - return {cardareas = {deck = true, unscored = true}} -end