diff --git a/manifest.json b/manifest.json index 0a10964..dbc8513 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "3.0.1", + "version": "3.0.2", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/challenge.lua b/src/challenge.lua index c7fe33e..b1cfbb9 100644 --- a/src/challenge.lua +++ b/src/challenge.lua @@ -82,8 +82,6 @@ SMODS.Challenge { end, } -local yard_sale - SMODS.Challenge { key = "Spring_Cleaning", config = {no_interest = true}, @@ -340,12 +338,14 @@ q { return false end + table.insert(Bakery_API.econ_only_items, "j_Roland_yard") + table.insert(Bakery_API.econ_only_items, "j_Roland_artemis") local orig = Bakery_API.no_money_decks Bakery_API.no_money_decks = setmetatable({}, { orig = orig, __index = function(_, k) - return (G.GAME or {}).challenge == "c_Roland_Spring_Cleaning" and not yard_sale or orig[k] + return (G.GAME or {}).challenge == "c_Roland_Spring_Cleaning" or orig[k] end, }) diff --git a/src/joker.lua b/src/joker.lua index 7c33ee1..e270a11 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -1371,16 +1371,3 @@ joker { end end, } - -q { - blocking = false, - no_delete = true, - func = function() - if not Bakery_API then - return false - end - - table.insert(Bakery_API.econ_only_items, "j_Roland_yard") - table.insert(Bakery_API.econ_only_items, "j_Roland_artemis") - end, -}