diff --git a/assets/1x/blind.png b/assets/1x/blind.png index c5edd78..a84f9a5 100644 Binary files a/assets/1x/blind.png and b/assets/1x/blind.png differ diff --git a/assets/2x/back.png b/assets/2x/back.png index bb50e53..bf23a43 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 4a2cace..3a305aa 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 5792768..fa6d242 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 d0938a5..2d300ed 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 e6a62df..2d38a0b 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 c67f4a0..0192fea 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 9321b53..4c44e78 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 55d9219..fecb9ee 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -17,6 +17,13 @@ return { "when entering the shop", }, }, + b_Roland_swapper = { + name = "Swapper Deck", + text = { + "{C:tarot}Tarot {}and {C:spectral}Spectral", + "cards swap places", + }, + }, }, BakeryCharm = { BakeryCharm_Roland_fat = { @@ -68,22 +75,15 @@ return { "Blasphemy.", "Blunder.", "Crisis.", - "Death.", "Denied.", "Failure.", "Fall.", - "Feeble.", "Foolish.", - "Ignorant.", "Illiterate.", "Judgement.", - "Misery.", "Mistake.", - "Mockery.", "Perish.", "Pity.", - "Terror.", - "Tyranny.", "Unfortunate.", "Weak.", }, @@ -272,6 +272,20 @@ return { "{X:attention,C:white}#1#{C:attention} Credit Cards", }, }, + sleeve_Roland_swapper = { + name = "Swapper Sleeve", + text = { + "{C:tarot}Tarot {}and {C:spectral}Spectral", + "cards swap places", + }, + }, + sleeve_Roland_swapper_alt = { + name = "Sleeve Swapper", + text = { + "{C:attention}All {}consumable", + "types swap places", + }, + }, }, Spectral = { c_Roland_afterimage = { diff --git a/src/blind.lua b/src/blind.lua index 975c15b..e1ecc0b 100644 --- a/src/blind.lua +++ b/src/blind.lua @@ -332,7 +332,7 @@ function Game.update(...) local boss_colour = (G.P_BLINDS.bl_Roland_venerable_visage or {}).boss_colour if boss_colour then - boss_colour[1], boss_colour[2], boss_colour[3] = hsv_to_rgb(os.clock() / 6 % 1) + boss_colour[1], boss_colour[2], boss_colour[3] = hsv_to_rgb(os.clock() / 6 % 1, 0.25, 0.75) end local improbable, orig = G.GAME.modifiers.Roland_improbable, G.GAME.probabilities diff --git a/src/main.lua b/src/main.lua index c5850fd..74b4a11 100644 --- a/src/main.lua +++ b/src/main.lua @@ -10,6 +10,23 @@ if Balatest then end) end +qol[2](function() + ---@type table + local contributors = Bakery_API.contributors + + contributors.Roland_aster = { + name = "asterSSH", + fg = HEX "f8f8f2ff", + bg = HEX "bd93f9ff", + } + + contributors.Roland_char = { + name = "char (@irregulester)", + fg = HEX "f8f8f2ff", + bg = HEX "ff79c6ff", + } +end) + SMODS.Atlas { px = 256, py = 256, @@ -17,10 +34,6 @@ SMODS.Atlas { path = "icon.png", } -SMODS.current_mod.optional_features = function() - return {cardareas = {deck = true, unscored = true}} -end - SMODS.current_mod.config_tab = function() return { n = G.UIT.ROOT, @@ -34,14 +47,6 @@ SMODS.current_mod.config_tab = function() ref_table = SMODS.Mods.Roland.config, ref_value = "equinox_assist", }, - SMODS.Mods.DebugPlus and create_toggle { - label = localize {type = "variable", key = "b_Roland_escapey_debugger"}, - ref_table = SMODS.Mods.Roland.config, - ref_value = "escapey_debugger", - callback = function(v) - G.escapey_debugger = v and print or nil - end, - }, SMODS.Mods.DebugPlus and UIBox_button { label = {localize {type = "variable", key = "b_Roland_debug_export"}}, func = G.P_CENTERS.j_Roland_escapey.debug_export, @@ -55,6 +60,10 @@ SMODS.current_mod.config_tab = function() } end +SMODS.current_mod.optional_features = function() + return {cardareas = {deck = true, unscored = true}} +end + function G.FUNCS.Roland_debug_export(_, tbl) local to = tbl or _G to.f, to.q, to.u = unpack(qol) diff --git a/src/spectral.lua b/src/spectral.lua index 761684c..0addb9d 100644 --- a/src/spectral.lua +++ b/src/spectral.lua @@ -7,7 +7,7 @@ end local spectral = (function() local x = 0 - ---@param tbl SMODS.Consumable + ---@param tbl SMODS.Consumable|{artist?: string} return function(tbl) tbl.cost = 4 tbl.set = "Spectral" @@ -15,6 +15,11 @@ local spectral = (function() tbl.pos = {x = x, y = 0} SMODS.Consumable(tbl) x = x + 1 + + local _ = tbl.artist and q(function() + tbl.artist = "Roland_" .. tbl.artist + Bakery_API.credit(tbl) + end) end end)() @@ -33,6 +38,7 @@ SMODS.Sound { spectral { key = "afterimage", pronouns = "he_they", + artist = "aster", config = {extra = {amount = 1, hand = -1}}, loc_vars = function(_, info_queue, card) table.insert(info_queue, G.P_CENTERS.e_negative) @@ -113,6 +119,7 @@ spectral { spectral { key = "void", pronouns = "it_its", + artist = "aster", hidden = not Cryptid, soul_rate = not Cryptid and 0.003 or nil, soul_set = not Cryptid and "Spectral" or nil,