diff --git a/localization/en-us.lua b/localization/en-us.lua index 88caeef..73dcc50 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -165,8 +165,8 @@ return { j_Roland_bulldozer = { name = "Bulldozer", text = { - "Give {X:red,C:white}XMult{} equal to", - "the current {C:attention}Blind Size{C:attention}", + "Give the {C:attention}Blind", + "{C:attention}Base {}as {X:red,C:white}XMult", "{C:inactive}(Currently {X:red,C:white}X#1#{C:inactive})", }, }, @@ -212,6 +212,7 @@ return { "to {C:attention}pull {}this {C:attention}Joker", "{C:inactive}(Currently {C:attention}#2#{C:inactive})", }, + unlock = {"Have only {C:enhanced}Stone", "cards in your deck"}, }, j_Roland_excalibur_Back = { name = "Excalibur", diff --git a/manifest.json b/manifest.json index 5f0bd3f..eb8b3d7 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.9.32", + "version": "2.9.33", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/joker.lua b/src/joker.lua index 423908d..891a8f9 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -35,8 +35,6 @@ local joker = (function() end if tbl.defeated_blind then - tbl.discovered, tbl.unlocked = false, false - function tbl.check_for_unlock() return Bakery_API.defeated_blinds[tbl.defeated_blind] > 0 end @@ -48,6 +46,10 @@ local joker = (function() end end + if tbl.check_for_unlock then + tbl.discovered, tbl.unlocked = false, false + end + return q(SMODS.Joker(tbl)) end end)() @@ -1200,11 +1202,20 @@ joker { eternal_compat = true, blueprint_compat = false, perishable_compat = true, + check_for_unlock = function(_, args) + return args.type == "modify_deck" and f(G.playing_cards):all(function(v) + return SMODS.has_enhancement(v, "m_stone") + end) + end, loc_vars = function(_, info_queue, card) local extra = card.ability.extra local _ = card.fake_card or table.insert(info_queue, G.P_CENTERS.m_stone) return {vars = {extra.required, extra.scored, extra.xmult}} end, + locked_loc_vars = function(_, info_queue, card) + local _ = card.fake_card or table.insert(info_queue, G.P_CENTERS.m_stone) + return {vars = {}} + end, generate_ui = function(self, info_queue, card, ...) Bakery_API.werewolf_ui "j_Roland_excalibur_Back" (self, info_queue, card, ...)