diff --git a/localization/en-us.lua b/localization/en-us.lua index 7ed7e20..0e9b332 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -417,7 +417,6 @@ return { c_Roland_Eternally_Violet = "Eternally Violet", c_Roland_Go = "Pass GO", c_Roland_Jokerful = "Jokerful", - c_Roland_Ornate = "Ornate", c_Roland_Pastries = "Sweet Pastries", c_Roland_Spin_To_Win = "Spin to Win", }, @@ -455,7 +454,6 @@ return { ch_c_Roland_Eternally_Violet = {"{C:attention}Violet Vessel{}'s effect is active every blind"}, ch_c_Roland_Go = {"Set money to {C:money}$0 {}when entering the shop"}, ch_c_Roland_Jokerful = {"The only jokers are {C:mult}Joker{} and {C:chips}Ms. Joker"}, - ch_c_Roland_Ornate = {"Anything vanilla is banned"}, ch_c_Roland_Pastries = {"All blinds, cards, and tags are of {C:gold}Bakery{} or {C:blue}Roland"}, ch_c_Roland_Showdown_Amber = {"Showdown blinds are {C:attention}Amber Acorn {}(stacks with above)"}, ch_c_Roland_Showdown_Cerulean = {"Showdown blinds are {C:attention}Cerulean Bell {}(stacks with above)"}, diff --git a/manifest.json b/manifest.json index 78e6f60..aadbfd1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "author": [ "Emik" ], - "version": "2.6.8", + "version": "2.6.9", "badge_colour": "8BE9FD", "main_file": "src/main.lua", "badge_text_colour": "44475A", diff --git a/src/challenge.lua b/src/challenge.lua index 2577064..eb6194b 100644 --- a/src/challenge.lua +++ b/src/challenge.lua @@ -39,14 +39,8 @@ local function is_showdown_except(key) end end -local function is_vanilla(v) - return v.set and not v.mod and f(G.P_CENTERS):concat(G.P_CARDS, G.P_TAGS):any(function(c) - return c.mod and not c.in_pool and c.set == v.set - end) -end - -local vanillas, pastries, amber, cerulean, crimson, verdant, violet -= bans(), bans(), bans(), bans(), bans(), bans(), bans() +local pastries, amber, cerulean, crimson, verdant, violet = + bans(), bans(), bans(), bans(), bans(), bans() SMODS.Challenge { key = "Go", @@ -90,13 +84,6 @@ local spin_to_win = SMODS.Challenge { rotation = 0, } -SMODS.Challenge { - key = "Ornate", - rules = {custom = {{id = "Roland_Ornate"}}}, - restrictions = vanillas, - pronouns = "any_all", -} - SMODS.Challenge { key = "Pastries", rules = {custom = {{id = "Roland_Pastries"}}}, @@ -264,9 +251,6 @@ q(function() end f { - {G.P_TAGS, is_vanilla, vanillas.banned_tags}, - {G.P_BLINDS, is_vanilla, vanillas.banned_other}, - {G.P_CENTERS, is_vanilla, vanillas.banned_cards}, {G.P_TAGS, is_banned_from_pastry, pastries.banned_tags}, {G.P_BLINDS, is_banned_from_pastry, pastries.banned_other}, {G.P_CENTERS, is_center_banned_from_pastry, pastries.banned_cards},