diff --git a/localization/en-us.lua b/localization/en-us.lua index e829fff..d90be94 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -416,6 +416,7 @@ return { c_Roland_Ornate = "Ornate", c_Roland_Pastries = "Sweet Pastries", c_Roland_Showdown = "Showdown", + c_Roland_Spin_To_Win = "Spin to Win", }, v_dictionary = { b_Roland_add = "ADD", diff --git a/manifest.json b/manifest.json index 3df869a..3d2f6fb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "author": [ "Emik" ], - "version": "2.6.3", + "version": "2.6.4", "badge_colour": "8BE9FD", "main_file": "src/main.lua", "badge_text_colour": "44475A", diff --git a/src/challenge.lua b/src/challenge.lua index 3f9ab2a..4f798c8 100644 --- a/src/challenge.lua +++ b/src/challenge.lua @@ -75,6 +75,25 @@ SMODS.Challenge { end, } +SMODS.Challenge { + key = "Spin_To_Win", + jokers = f(4):map(f().const {id = "j_Bakery_Spinner", eternal = true}):table(), + restrictions = {banned_cards = {{id = "c_Roland_coolheaded"}}}, + pronouns = "they_them", + apply = function(self) + self.rotation = 0 + end, + calculate = function(self, context) + if not context.card_added or context.card.config.center.key ~= "j_Bakery_Spinner" then + return + end + + context.card.ability.extra.rotation = self.rotation + self.rotation = self.rotation + 1 + end, + rotation = 0, +} + SMODS.Challenge { key = "Jokerful", rules = {custom = {{id = "Roland_Jokerful"}}}, @@ -96,8 +115,14 @@ SMODS.Challenge { pronouns = "she_them", } -local finalizers = { +SMODS.Challenge { + key = "Pastries", + rules = {custom = {{id = "Roland_Pastries"}}}, + restrictions = pastries, + pronouns = "she_them", +} +local finalizers = { SMODS.Challenge { key = "Eternally_Amber", rules = {custom = {{id = "Roland_Eternally_Amber"}, {id = "Roland_Showdown_Amber"}}}, @@ -242,7 +267,7 @@ local finalizers = { restrictions = violet, calculate = function(_, context) if context.setting_blind then - G.GAME.blind.chips = G.GAME.blind.chips * (6 / G.GAME.blind.mult) + G.GAME.blind.chips = G.GAME.blind.chips * 6 G.GAME.blind.chip_text = number_format(G.GAME.blind.chips) end end, diff --git a/src/joker.lua b/src/joker.lua index 1e02689..a69d1ca 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -641,7 +641,7 @@ joker { return {card = card, xmult = card.ability.extra.xmult} end - if not context.press_play then + if card.debuff or context.blueprint or not context.press_play then return end