Add sell value on merge, handle consumables and tags separately

Prevents rigged probabilities from leaking into other cards

.editorconfig

@@ -0,0 +1,171 @@
+
+# see https://github.com/CppCXY/EmmyLuaCodeStyle
+[*.lua]
+# [basic]
+
+# optional space/tab
+indent_style = space
+# if indent_style is space, this is valid
+indent_size = 4
+# if indent_style is tab, this is valid
+tab_width = 4
+# none/single/double
+quote_style = double
+
+continuation_indent = 4
+## extend option
+# continuation_indent.before_block = 4
+# continuation_indent.in_expr = 4
+# continuation_indent.in_table = 4
+
+# this mean utf8 length , if this is 'unset' then the line width is no longer checked
+# this option decides when to chopdown the code
+max_line_length = 120
+
+# optional crlf/lf/cr/auto, if it is 'auto', in windows it is crlf other platforms are lf
+# in neovim the value 'auto' is not a valid option, please use 'unset' 
+end_of_line = lf
+
+#  none/ comma / semicolon / only_kv_colon
+table_separator_style = none
+
+#optional keep/never/always/smart
+trailing_table_separator = smart
+
+# keep/remove/remove_table_only/remove_string_only
+call_arg_parentheses = keep
+
+detect_end_of_line = false
+
+# this will check text end with new line
+insert_final_newline = true
+
+# [space]
+space_around_table_field_list = false
+
+space_before_attribute = false
+
+space_before_function_open_parenthesis = false
+
+space_before_function_call_open_parenthesis = false
+
+space_before_closure_open_parenthesis = false
+
+# optional always/only_string/only_table/none
+# or true/false
+space_before_function_call_single_arg = always
+## extend option
+## always/keep/none
+# space_before_function_call_single_arg.table = always
+## always/keep/none
+# space_before_function_call_single_arg.string = always
+
+space_before_open_square_bracket = false
+
+space_inside_function_call_parentheses = false
+
+space_inside_function_param_list_parentheses = false
+
+space_inside_square_brackets = false
+
+# like t[#t+1] = 1
+space_around_table_append_operator = false
+
+ignore_spaces_inside_function_call = false
+
+# detail number or 'keep'
+space_before_inline_comment = 1
+
+# convert '---' to '--- ' or '--' to '-- '
+space_after_comment_dash = false
+
+# [operator space]
+space_around_math_operator = true
+# space_around_math_operator.exponent = false
+
+space_after_comma = true
+
+space_after_comma_in_for_statement = true
+
+# true/false or none/always/no_space_asym
+space_around_concat_operator = true
+
+space_around_logical_operator = true
+
+# true/false or none/always/no_space_asym
+space_around_assign_operator = true
+
+# [align]
+
+align_call_args = false
+
+align_function_params = true
+
+# true/false or always
+align_continuous_assign_statement = true
+
+align_continuous_rect_table_field = true
+
+align_continuous_line_space = 2
+
+align_if_branch = false
+
+# option none / always / contain_curly/
+align_array_table = true
+
+align_continuous_similar_call_args = false
+
+align_continuous_inline_comment = true
+# option none / always / only_call_stmt
+align_chain_expr = none
+
+# [indent]
+
+never_indent_before_if_condition = false
+
+never_indent_comment_on_if_branch = false
+
+keep_indents_on_empty_lines = false
+
+allow_non_indented_comments = false
+# [line space]
+
+# The following configuration supports four expressions
+# keep  
+# fixed(n)   
+# min(n)
+# max(n)
+# for eg. min(2)
+
+line_space_after_if_statement = fixed(2)
+
+line_space_after_do_statement = fixed(2)
+
+line_space_after_while_statement = fixed(2)
+
+line_space_after_repeat_statement = fixed(2)
+
+line_space_after_for_statement = fixed(2)
+
+line_space_after_local_or_assign_statement = max(2)
+
+line_space_after_function_statement = fixed(2)
+
+line_space_after_expression_statement = max(2)
+
+line_space_after_comment = fixed(1)
+
+line_space_around_block = fixed(1)
+# [line break]
+break_all_list_when_line_exceed = false
+
+auto_collapse_lines = false
+
+break_before_braces = false
+
+# [preference]
+ignore_space_after_colon = false
+
+remove_call_expression_list_finish_comma = true
+# keep / always / same_line / replace_with_newline / never
+end_statement_with_semicolon = replace_with_newline

.vscode/settings.json

@@ -1,6 +0,0 @@
-{
-    "Lua.diagnostics.globals": [
-        "Jen",
-        "Jane"
-    ]
-}

localization/en-us.lua

@@ -3,18 +3,18 @@ return {
         Blind = {
             bl_Roland_improbable = {
                 name = "The Improbable",
-                text = {"{C:attention}All probabilities", "cannot happen"}
+                text = {"{C:attention}All probabilities", "cannot happen"},
             },
             bl_Roland_nimble = {
                 name = "The Nimble",
-                text = {"The first {C:attention}5 cards", "drawn are {C:attention}played"}
+                text = {"The first {C:attention}5 cards", "drawn are {C:attention}played"},
             },
         },
         Joker = {
             j_Roland_escapey = {
                 name = "Escapey",
                 text = {
-                    "Destroy {C:attention}tags{} and {C:attention}non-selected",
+                    "Destroy {C:attention}tags{} or {C:attention}non-selected",
                     "{C:attention}consumables{} on use. Level up",
                     "the {C:planet}most played hand{} by {C:planet}#1#{}",
                     "for each destroyed object",
@@ -23,7 +23,7 @@ return {
                     "#3#{C:inactive,s:0.75,E:1}#4#{C:red,s:1.5,E:1}#5#",
                     "#6#{C:blue,E:1}#7#{}#8#{C:inactive,s:0.75,E:1}#9#{C:red,s:1.5,E:1}#10#",
                 },
-                merge = {"Since no objects apply, merge", "with other ", " jokers"},
+                merge = {"Since no objects apply, fuse", "with other ", " jokers"},
                 quotes = {
                     marble = {{"there is no escape..."}},
                     normal = {
@@ -41,31 +41,33 @@ return {
                         {"Let me go hide in", "this corner... Okay?"},
                     },
                 },
-            }
+            },
         },
         Spectral = {
+            c_Roland_afterimage = {
+                name = "Afterimage",
+                text = {
+                    "Add {C:dark_edition}Negative {}to {C:attention}#1#",
+                    "selected card in hand",
+                    "{C:red}#2#{} hand size",
+                },
+            },
             c_Roland_void = {
                 name = "Void",
                 text = {
                     "{C:red}Destroys {X:red,C:white}all{} owned",
                     "playing cards {}for",
                     "{C:attention}#1# {C:dark_edition}Negative {C:spectral}Cryptids",
-                }
+                },
-            }
+            },
-        }
+        },
     },
     misc = {
         challenge_names = {
-            c_Roland_Soaring = "Soaring",
             c_Roland_Jokerful = "Jokerful",
-            c_Roland_Ascension = "Ascension",
-            c_Roland_Balanced_Jokers = "Balanced Jokers",
         },
         v_text = {
-            ch_c_Roland_Accelerated = {"Start with {C:blue}Accelerated Deck"},
-            ch_c_Roland_Saint = {"Start with an {C:attention}Eternal {C:legendary}Saint"},
             ch_c_Roland_Jokerful = {"Only the {C:common}default Joker{} can appear in shops"},
-            ch_c_Roland_Balanced_Jokers = {"All Cryptid and Jen's jokers {C:attention}cannot appear"},
+        },
-        }
+    },
-    }
 }

manifest.json

@@ -3,8 +3,10 @@
     "id": "Roland",
     "name": "Roland",
     "prefix": "Roland",
-    "author": ["Emik"],
+    "author": [
-    "version": "1.2.4",
+        "Emik"
+    ],
+    "version": "1.4.5",
     "badge_colour": "8BE9FD",
     "main_file": "src/main.lua",
     "badge_text_colour": "44475A",

src/LuaFunctional

@@ -1 +1 @@
-Subproject commit 5954713389e218b093dafd6121828de978af1dc2
+Subproject commit 4f3eae046476664b720a96f91b0e04f388709bbb

src/blind.lua

@@ -32,19 +32,19 @@ function Game:update(dt)
     orig_update(self, dt)
     local orig = G.GAME.probabilities
 
-    if not G.GAME.improbable or not getmetatable(orig) then
+    if not G.GAME.improbable or getmetatable(orig) then
         return
     end
 
+    local normal = orig.normal
+
     local mt = {
         orig = orig,
         __index = function(_, k)
             return k == "normal" and 0 or orig[k]
         end,
         __newindex = function(_, k, v)
-            if k ~= "normal" or v ~= 0 then
+            orig[k] = (k == "normal" and v == 0) and normal or v
-                orig[k] = v
-            end
         end,
     }
 

src/challenge.lua

@@ -1,46 +1,14 @@
 local jokerful = {banned_cards = {}}
-local balanced_jokers = {banned_cards = {}}
 
 SMODS.Challenge {
     key = "Jokerful",
     rules = {custom = {{id = "Roland_Jokerful"}}},
-    restrictions = jokerful
+    restrictions = jokerful,
-}
-
-local deck = {}
-local card = {eternal = true, cry_absolute = true}
-
-SMODS.Challenge {
-    key = "Ascension",
-    deck = deck,
-    jokers = {card},
-    rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}},
-}
-
-if Cryptid then
-    SMODS.Challenge {
-        key = "Soaring",
-        deck = deck,
-        jokers = {card},
-        sleeve = "sleeve_cry_equilibrium_sleeve",
-        rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}},
-    }
-end
-
-SMODS.Challenge {
-    key = "Balanced_Jokers",
-    restrictions = balanced_jokers,
-    rules = {custom = {{id = "Roland_Balanced_Jokers"}}},
 }
 
 G.E_MANAGER:add_event(Event {
     trigger = "immediate",
     func = function()
-        if Jen or Jane then
-            deck.type = Jen and "b_jen_nitro" or "b_jane_nitro"
-            card.id = Jen and "j_jen_saint" or "j_jane_saint"
-        end
-
         F.foreach(
             F.filter(
                 G.P_CENTERS,
@@ -49,14 +17,6 @@ G.E_MANAGER:add_event(Event {
             function(v) table.insert(jokerful.banned_cards, {id = v.key}) end
         )
 
-        F.foreach(
-            F.filter(
-                jokerful.banned_cards,
-                function (v) return v.id:sub(1, 6) == "j_cry_" or v.id:sub(1, 6) == "j_jen_" end
-            ),
-            function (v) table.insert(balanced_jokers.banned_cards, {id = v.key}) end
-        )
-
         return true
-    end
+    end,
 })

src/joker.lua

@@ -26,7 +26,7 @@ end
 local function is_mergeable_with(it)
     return function(card)
         return it.rank ~= card.rank and
-            card.label == 'j_Roland_Escapey' and not
+            card.label == "j_Roland_escapey" and not
             (card.ability or {}).eternal
     end
 end
@@ -52,12 +52,23 @@ SMODS.Joker {
     blueprint_compat = false,
     loc_vars = function(_, _, card)
         local loc_self = G.localization.descriptions.Joker.j_Roland_escapey
-        local quotes = loc_self.quotes
-        local merge = G.jokers and F.count(F.filter(G.jokers.cards, is_mergeable_with(card))) > 1 and loc_self.merge or {}
-        local normal = (merge[1] or (Jen or Jane or {}).sinister) and {} or pseudorandom_element(quotes.normal, pseudoseed("EscapeyQuotes")) or {}
-        local scared = (merge[1] or not (Jen or Jane or {}).sinister) and {} or pseudorandom_element(quotes.scared, pseudoseed("EscapeyQuotes")) or {}
 
-        return {vars = {
+        ---@diagnostic disable-next-line: undefined-global
+        local sinister = (Jen or {}).sinister or G.escapey_sinister
+        local quotes = loc_self.quotes
+
+        local merge = G.jokers
+            and F.count(F.filter(G.jokers.cards, is_mergeable_with(card))) > 0
+            and loc_self.merge or {}
+
+        local normal = (merge[1] or sinister) and {} or
+            pseudorandom_element(quotes.normal, pseudoseed("EscapeyQuotes")) or {}
+
+        local scared = (merge[1] or not sinister) and {} or
+            pseudorandom_element(quotes.scared, pseudoseed("EscapeyQuotes")) or {}
+
+        return {
+            vars = {
                 card.ability.extra.level_up_by,
                 localize(common_hand(), "poker_hands"),
                 merge[1] or "",
@@ -68,13 +79,15 @@ SMODS.Joker {
                 merge[3] or "",
                 normal[2] or "",
                 scared[2] or "",
-        }}
+            },
+        }
     end,
     calculate = function(_, _, context)
         if type(G.escapey_debugger) == "function" then
             G.escapey_debugger(F.reduce(context, "", function(acc, _, next) return acc .. ", " .. next end, pairs):sub(2))
         end
     end,
+    ---@param card Card
     Bakery_can_use = function(_, card)
         return not card.debuff and can_use() and (
             #G.GAME.tags ~= 0 or
@@ -82,27 +95,40 @@ SMODS.Joker {
             F.any(F.filter(G.jokers.cards, is_mergeable_with(card)))
         )
     end,
+    ---@param card Card
     Bakery_use_button_text = function(_, card)
-        return card.debuff and "DEBUFFED" or
+        if card.debuff then
-            ((#G.GAME.tags == 0 and not
+            return "DEBUFFED"
-                F.any(G.consumeables.cards, destructible) and
+        end
-                F.any(F.filter(G.jokers.cards, is_mergeable_with(card)))) and "MERGE" or "ESCAPE")
+
+        return #G.GAME.tags == 0 and F.count(G.consumeables.cards, destructible) == 0 and
+            F.any(F.filter(G.jokers.cards, is_mergeable_with(card))) and "FUSE" or "ESCAPE"
     end,
+    ---@param card Card
     Bakery_use_joker = function(_, card)
-        local hand, object_count = common_hand(), F.count(F.filter(G.consumeables.cards, destructible)) + #G.GAME.tags
+        if card.debuff then
+            return
+        end
+
+        local consumables = F.filter(G.consumeables.cards, destructible)
+        local consumable_count = F.count(consumables)
+        local object_count = consumable_count + #G.GAME.tags
 
         if object_count == 0 then
-            local sum = 0
+            local level_sum, sell_sum = 0, 0
 
             F.foreach(
                 F.filter(G.jokers.cards, is_mergeable_with(card)),
                 function(v)
-                    sum = sum + v.ability.extra.level_up_by * (v.getEvalQty and v:getEvalQty() or 1)
+                    level_sum = level_sum + v.ability.extra.level_up_by * (v.getEvalQty and v:getEvalQty() or 1)
+                    sell_sum = sell_sum + v.sell_cost * (v.getEvalQty and v:getEvalQty() or 1)
                     v:start_dissolve({HEX("57ecab")}, nil, 1.6)
                 end
             )
 
-            card.ability.extra.level_up_by = card.ability.extra.level_up_by + sum
+            card.ability.extra.level_up_by = card.ability.extra.level_up_by + level_sum
+            card.sell_cost = card.sell_cost + sell_sum
+            return
         end
 
         local function update(name, chip, mul, lv, notif, snd, vol, pit, de)
@@ -110,13 +136,13 @@ SMODS.Joker {
                 sound = type(snd) == "string" and snd or type(snd) == "nil" and "button",
                 volume = vol or 0.7,
                 pitch = pit or 0.8,
-                delay = de or 0.3
+                delay = de or 0.3,
             }, {
                 handname = name or "????",
                 chips = chip or "?",
                 level = lv or "?",
                 mult = mul or "?",
-                StatusText = notif
+                StatusText = notif,
             })
         end
 
@@ -139,6 +165,8 @@ SMODS.Joker {
             end
         end
 
+        local hand = common_hand()
+
         if hand == "all" or hand == "allhands" or hand == "all_hands" then
             update(localize("k_all_hands"), "...", "...", "")
         elseif G.GAME.hands[hand or "NO_HAND_SPECIFIED"] then
@@ -150,19 +178,24 @@ SMODS.Joker {
             )
         end
 
-        F.foreach(
+        if consumable_count == 0 then
-            F.filter(G.consumeables.cards, destructible),
+            local trigger = #G.GAME.tags >= 30 and "immediate" or "before"
-            function (v)
+            local delay = #G.GAME.tags >= 30 and 0 or 1 / #G.GAME.tags
-                v:start_dissolve({HEX("57ecab")}, nil, 1.6)
-            end
-        )
 
             F.foreach(
                 G.GAME.tags,
                 function(v)
-                G.E_MANAGER:add_event(Event({trigger = "immediate", func = fast_delete(v)}))
+                    G.E_MANAGER:add_event(Event {trigger = trigger, blocking = #G.GAME.tags < 30, delay = delay, func = fast_delete(v)})
                 end
             )
+        else
+            F.foreach(
+                consumables,
+                function(v)
+                    v:start_dissolve({HEX("57ecab")}, nil, 1.6)
+                end
+            )
+        end
 
         level_up_hand(card, hand, nil, object_count * card.ability.extra.level_up_by)
 

src/main.lua

@@ -1,4 +1,4 @@
-F = SMODS.load_file("src/LuaFunctional/functional.lua")
+F = assert(SMODS.load_file("src/LuaFunctional/functional.lua"))()
 assert(SMODS.load_file("src/challenge.lua"))()
 assert(SMODS.load_file("src/spectral.lua"))()
 assert(SMODS.load_file("src/blind.lua"))()

src/spectral.lua

@@ -1,5 +1,3 @@
-SMODS.Sound({key = "void", path = "void.ogg"})
-
 local function can_use()
     return not ((G.play and #G.play.cards > 0 or
             G.CONTROLLER.locked or
@@ -9,11 +7,56 @@ local function can_use()
         G.STATE ~= G.STATES.PLAY_TAROT)
 end
 
+SMODS.Sound({key = "void", path = "void.ogg"})
+
+SMODS.Atlas {
+    px = 71,
+    py = 95,
+    key = "afterimage",
+    path = "afterimage.png",
+}
+
 SMODS.Atlas {
     px = 71,
     py = 95,
     key = "void",
-    path = "void.png"
+    path = "void.png",
+}
+
+SMODS.Consumable {
+    key = "afterimage",
+    set = "Spectral",
+    pos = {x = 0, y = 0},
+    cost = 6,
+    atlas = "afterimage",
+    config = {extra = {amount = 1, hand = -1}},
+    loc_vars = function(_, _, card)
+        return {vars = {card.ability.extra.amount, card.ability.extra.hand}}
+    end,
+    can_use = function(_, card)
+        return can_use() and card.ability.extra.amount == #Bakery_API.get_highlighted()
+    end,
+    use = function(_, card, _, _)
+        for _, v in ipairs(Bakery_API.get_highlighted()) do
+            G.E_MANAGER:add_event(Event {
+                delay = 0.1,
+                func = function()
+                    v:set_edition({negative = true})
+                    v:juice_up(0.5, 0.5)
+                    return true
+                end,
+            })
+        end
+
+        G.E_MANAGER:add_event(Event {
+            delay = 0.1,
+            func = function()
+                G.hand:change_size(card.ability.extra.hand)
+                Bakery_API.unhighlight_all()
+                return true
+            end,
+        })
+    end,
 }
 
 SMODS.Consumable {
@@ -79,7 +122,7 @@ SMODS.Consumable {
             delay = 0.27,
             timer = "REAL",
             trigger = "after",
-            func = void
+            func = void,
         }))
-    end
+    end,
 }