diff --git a/assets/1x/back.png b/assets/1x/back.png index d101e62..6d08253 100644 Binary files a/assets/1x/back.png and b/assets/1x/back.png differ diff --git a/assets/2x/back.png b/assets/2x/back.png index 387e94c..ba4684f 100644 Binary files a/assets/2x/back.png and b/assets/2x/back.png differ diff --git a/assets/2x/blind.png b/assets/2x/blind.png index 7966ddb..4626f48 100644 Binary files a/assets/2x/blind.png and b/assets/2x/blind.png differ diff --git a/assets/2x/charm.png b/assets/2x/charm.png index f4ed774..6b704a8 100644 Binary files a/assets/2x/charm.png and b/assets/2x/charm.png differ diff --git a/assets/2x/icon.png b/assets/2x/icon.png index a1abccd..b5ca96d 100644 Binary files a/assets/2x/icon.png and b/assets/2x/icon.png differ diff --git a/assets/2x/joker.png b/assets/2x/joker.png index 158806d..4f367d2 100644 Binary files a/assets/2x/joker.png and b/assets/2x/joker.png differ diff --git a/assets/2x/seal.png b/assets/2x/seal.png index 2bdf78b..b53fc1b 100644 Binary files a/assets/2x/seal.png and b/assets/2x/seal.png differ diff --git a/assets/2x/spectral.png b/assets/2x/spectral.png index 17d2ff5..1c5f732 100644 Binary files a/assets/2x/spectral.png and b/assets/2x/spectral.png differ diff --git a/localization/en-us.lua b/localization/en-us.lua index de477f2..364f321 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -9,14 +9,6 @@ return { "that are {C:dark_edition}debuffed #1# times", }, }, - b_Roland_go = { - name = "Pass GO Deck", - text = { - "Start with a {C:attention}Credit Card", - "Set money to {C:money}$0 {}when", - "entering the shop", - }, - }, b_Roland_swapper = { name = "Swapper Deck", text = { @@ -320,25 +312,10 @@ return { name = "Efflorescent Sleeve", text = { "{C:attention}Blinds{} are {C:dark_edition}debuffed", - "{C:dark_edition}({X:dark_edition,C:white}ante{} {X:dark_edition,C:white}number{C:dark_edition}) times", + "{C:dark_edition}({X:dark_edition,C:white}(ante * #2#){C:dark_edition}) times", "{C:inactive}(Instead of #1#)", }, }, - sleeve_Roland_go = { - name = "Pass GO Sleeve", - text = { - "Start with a {C:attention}Credit Card", - "Set money to {C:money}$0 {}when", - "entering the shop", - }, - }, - sleeve_Roland_go_alt = { - name = "Free Parking Sleeve", - text = { - "Start with an additional", - "{X:attention,C:white}#1#{C:attention} Credit Cards", - }, - }, sleeve_Roland_swapper = { name = "Swapper Sleeve", text = { @@ -404,6 +381,7 @@ return { c_Roland_Eternally_Crimson = "Eternally Crimson", c_Roland_Eternally_Verdant = "Eternally Verdant", c_Roland_Eternally_Violet = "Eternally Violet", + c_Roland_Go = "Pass GO", c_Roland_Jokerful = "Jokerful", c_Roland_Ornate = "Ornate", c_Roland_Pastries = "Sweet Pastries", @@ -437,6 +415,7 @@ return { ch_c_Roland_Eternally_Crimson = {"{C:attention}Crimson Heart{}'s effect is active every blind"}, ch_c_Roland_Eternally_Verdant = {"{C:attention}Verdant Leaf{}'s effect is active every blind"}, 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"}, diff --git a/manifest.json b/manifest.json index 55157cb..dc432b1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "author": [ "Emik" ], - "version": "2.2.4", + "version": "2.2.5", "badge_colour": "8BE9FD", "main_file": "src/main.lua", "badge_text_colour": "44475A", diff --git a/src/back.lua b/src/back.lua index 0bb57ef..14eedb7 100644 --- a/src/back.lua +++ b/src/back.lua @@ -75,7 +75,7 @@ back { pronouns = "any_all", config = {extra = {times = 2}}, loc_vars = function(self, _, _) - return {vars = {self.config.extra.times}} + return {vars = {self.config.extra.times, self.config.extra.alt_times}} end, apply = function(_, _) G.GAME.modifiers.Roland_blossom_deck = true @@ -91,9 +91,11 @@ back { return end - local count = self:is_alt() and G.GAME.round_resets.ante or self.config.extra.times + local count = self:is_alt() and + G.GAME.round_resets.ante * self.config.extra.alt_times or + self.config.extra.times - for _ = 1, count do + f(count):each(function() G.GAME.blind:disable() q { @@ -104,48 +106,8 @@ back { play_sound "timpani" end, } - end - end, -} - -back { - key = "go", - pronouns = "he_him", - config = {extra = {times = 1, alt_times = 5}}, - loc_vars = function(self, info_queue, _) - local _ = info_queue and table.insert(info_queue, G.P_CENTERS.j_credit_card) - return {vars = {self.config.extra.alt_times - self.config.extra.times}} - end, - apply = function(self) - q(function() - local count = self:is_alt() and self.config.extra.alt_times or self.config.extra.times - - for _ = 1, count do - local c = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_credit_card", "Roland_go") - c:add_to_deck() - c:start_materialize() - G.jokers:emplace(c) - end end) end, - calculate = function(_, card, context) - if not context.starting_shop then - return - end - - ease_dollars(-G.GAME.dollars) - - attention_text { - text = localize "k_nope_ex", - backdrop_colour = G.C.MONEY, - offset = {x = 0, y = 0}, - silent = true, - major = card, - align = "cm", - scale = 1.3, - hold = 1.4, - } - end, } back { diff --git a/src/challenge.lua b/src/challenge.lua index 08d6c48..b72483a 100644 --- a/src/challenge.lua +++ b/src/challenge.lua @@ -52,6 +52,29 @@ end local jokerful, vanillas, pastries, amber, cerulean, crimson, verdant, violet, final = bans(), bans(), bans(), bans(), bans(), bans(), bans(), bans(), bans() +SMODS.Challenge { + key = "Go", + rules = {custom = {{id = "Roland_Go"}}}, + jokers = {{id = "j_credit_card"}}, + pronouns = "he_him", + calculate = function(self, context) + if context.starting_shop then + ease_dollars(-G.GAME.dollars) + + attention_text { + text = localize "k_nope_ex", + backdrop_colour = G.C.MONEY, + offset = {x = 0, y = 0}, + silent = true, + major = self, + align = "cm", + scale = 1.3, + hold = 1.4, + } + end + end, +} + SMODS.Challenge { key = "Jokerful", rules = {custom = {{id = "Roland_Jokerful"}}},