From f1e6007cbd4927879a8f5a5bff93e891eaeb4302 Mon Sep 17 00:00:00 2001 From: Emik Date: Fri, 18 Apr 2025 00:41:38 +0200 Subject: [PATCH] Allow The Wee to be disabled --- manifest.json | 2 +- src/back.lua | 6 +++++- src/blind.lua | 15 ++++++++++++--- src/slugcat.lua | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/manifest.json b/manifest.json index 73875d2..99a4984 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.3.2" + "version": "1.3.3" } \ No newline at end of file diff --git a/src/back.lua b/src/back.lua index cb45469..2f38516 100644 --- a/src/back.lua +++ b/src/back.lua @@ -479,6 +479,9 @@ back { "are always " .. (Cryptid and "{C:cry_ascendant}" or "{C:attention}") .. "equalized", }, }, + alt_apply = function(_) + apply_orrery() + end, apply = function(_) apply_orrery() end, @@ -610,7 +613,7 @@ back { }, }, alt_loc_txt = { - name = "Weeckweeck", + name = "We", text = { "Every stat and", "card number is {C:attention}2", @@ -630,6 +633,7 @@ back { p.boosters_in_shop = 2 p.consumable_slots = 2 p.vouchers_in_shop = 2 + G.GAME.round_resets.temp_handsize = 2 G.GAME.weeckweeck = true for _, v in pairs(G.GAME.hands) do diff --git a/src/blind.lua b/src/blind.lua index 44e2586..49d840c 100644 --- a/src/blind.lua +++ b/src/blind.lua @@ -142,7 +142,14 @@ SMODS.Blind { pos = {x = 0, y = 3}, vars = {}, dollars = 2, - debuff_hand = function(_, cards, _, _, _) + disable = function(self) + self.disabled = true + end, + debuff_hand = function(self, cards, _, _, _) + if self.disabled then + return false + end + for _, v in ipairs(cards) do if (v:norank() or v:get_id() ~= 2) and (v.ability or {}).aikoyori_letters_stickers ~= "2" then return true @@ -152,8 +159,10 @@ SMODS.Blind { get_loc_debuff_text = function(_) return "Hand must contain only 2s" end, - recalc_debuff = function(_, card, _) - return (card:norank() or card:get_id() ~= 2) and (card.ability or {}).aikoyori_letters_stickers ~= "2" + recalc_debuff = function(self, card, _) + return not self.disabled and + (card:norank() or card:get_id() ~= 2) and + (card.ability or {}).aikoyori_letters_stickers ~= "2" end, set_blind = function(self) if to_number(self.mult) == 0 then diff --git a/src/slugcat.lua b/src/slugcat.lua index 37d5385..1d3f865 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -527,7 +527,7 @@ SMODS.Joker { card.ability.perish_tally = 1e9 end - if ({[false] = context.cardarea ~= G.play or context.repetition, [true] = not context.joker_main})[not not Cryptid] then + if ({[false] = context.repetition, [true] = not context.joker_main})[not not Cryptid] then return end