localization/en-us.lua

@@ -339,14 +339,6 @@ return {
                     "{C:attention}#2#",
                 },
             },
-            j_Roland_verdant = {
-                name = "Verdant Leaf",
-                text = {
-                    "{X:mult,C:white}X#1#{} Mult",
-                    "{C:red}Debuffs {}the {C:attention}first",
-                    "{C:attention}#2# {}scored cards",
-                },
-            },
             j_Roland_yard = {
                 name = "Yard Sale",
                 text = {

manifest.json

@@ -3,7 +3,7 @@
     "id": "Roland",
     "name": "Roland",
     "prefix": "Roland",
-    "version": "2.8.35",
+    "version": "2.8.34",
     "badge_colour": "8BE9FD",
     "display_name": "Roland",
     "main_file": "src/main.lua",

src/joker.lua

@@ -684,7 +684,7 @@ joker {
     rarity = 3,
     eternal_compat = true,
     blueprint_compat = true,
-    perishable_compat = true,
+    perishable_compat = false,
     loc_vars = function(_, _, card)
         return {vars = {card.ability.extra.xmult}}
     end,
@@ -731,7 +731,7 @@ joker {
     rarity = 3,
     eternal_compat = true,
     blueprint_compat = true,
-    perishable_compat = true,
+    perishable_compat = false,
     loc_vars = function(_, _, card)
         return {vars = {card.ability.extra.xmult}}
     end,
@@ -749,7 +749,7 @@ joker {
                 right.config.center.key == "j_Roland_crimson"
 
             if debuffed_by_crimson and v.ability.Roland_crimson == nil then
-                v.ability.Roland_crimson = not not v.debuff
+                v.ability.Roland_crimson = v.debuff and true or false
                 v:set_debuff(true)
             elseif not debuffed_by_crimson and v.ability.Roland_crimson ~= nil then
                 v:set_debuff(v.ability.Roland_crimson)
@@ -766,56 +766,6 @@ function Card:stop_drag(...)
     return orig_stop_drag(self, ...)
 end
 
-joker {
-    key = "verdant",
-    pronouns = "she_her",
-    config = {extra = {debuffs = 2, xmult = 3}},
-    pixel_size = {w = 68, h = 68},
-    attributes = {"xmult"},
-    cost = 6,
-    rarity = 3,
-    eternal_compat = true,
-    blueprint_compat = true,
-    perishable_compat = true,
-    loc_vars = function(_, _, card)
-        local extra = card.ability.extra
-        return {vars = {extra.xmult, extra.debuffs}}
-    end,
-    calculate = function(self, card, context)
-        local extra = card.ability.extra
-        self:verdant(context.scoring_hand, extra.debuffs)
-        return (context.joker_main or context.forcetrigger) and {card = card, xmult = extra.xmult} or nil
-    end,
-    update = function()
-        local _ = G.STATE == G.STATES.SELECTING_HAND and G.hand and G.hand:parse_highlighted()
-    end,
-    verdant = function(_, cards, amount)
-        return cards and next(cards) and f(G.playing_cards):each(function(v)
-            table.sort(cards, function(a, b)
-                return a.rank < b.rank
-            end)
-
-            local should_be_verdant = f(amount):map(f.index_into(cards)):any(f.eq(v))
-            local has_verdant = v.ability.Roland_verdant ~= nil
-
-            if should_be_verdant and not has_verdant then
-                v.ability.Roland_verdant = not not v.debuff
-                v:set_debuff(true)
-            elseif not should_be_verdant and has_verdant then
-                v:set_debuff(v.ability.Roland_verdant)
-                v.ability.Roland_verdant = nil
-            end
-        end) or nil
-    end,
-}
-
-local orig_unhighlight_all = CardArea.unhighlight_all
-
-function CardArea:unhighlight_all(...)
-    G.P_CENTERS.j_Roland_verdant:verdant(self.cards)
-    return orig_unhighlight_all(self, ...)
-end
-
 joker {
     key = "martingale",
     pronouns = "he_him",

src/lib/funky.lua

@@ -200,16 +200,6 @@ function f.index(v)
     end
 end
 
----@generic K, V
----@param v { [K]: V }
----@return fun(x: K): V
----@nodiscard
-function f.index_into(v)
-    return type(v) == "table" and function(x)
-        return v[x]
-    end or f.const(v)
-end
-
 ---@generic V
 ---@param v string
 ---@return fun(x: { [string]: V }): V
@@ -267,7 +257,6 @@ function f.new(fnext)
         from = f.from,
         id = f.id,
         index = f.index,
-        index_into = f.index_into,
         indices = f.indices,
         keys = f.keys,
         map = f.map,