diff --git a/assets/1x/joker.png b/assets/1x/joker.png index 67a2bc6..bb743cc 100644 Binary files a/assets/1x/joker.png and b/assets/1x/joker.png differ diff --git a/assets/2x/back.png b/assets/2x/back.png index 673b26e..444b8e3 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 431c696..e5011f8 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 a7285af..9dd71bb 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 ee10a32..41fc8a9 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 d4c85b7..c1cd431 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 10f7854..4ff1f12 100644 Binary files a/assets/2x/seal.png and b/assets/2x/seal.png differ diff --git a/assets/2x/sleeve.png b/assets/2x/sleeve.png index 55f9fb9..6cb23bb 100644 Binary files a/assets/2x/sleeve.png and b/assets/2x/sleeve.png differ diff --git a/assets/2x/spectral.png b/assets/2x/spectral.png index ba537b9..b79fdf0 100644 Binary files a/assets/2x/spectral.png and b/assets/2x/spectral.png differ diff --git a/assets/2x/tag.png b/assets/2x/tag.png index efbfbaa..60e1399 100644 Binary files a/assets/2x/tag.png and b/assets/2x/tag.png differ diff --git a/assets/2x/tarot.png b/assets/2x/tarot.png index 7ebb8c6..3e8f85d 100644 Binary files a/assets/2x/tarot.png and b/assets/2x/tarot.png differ diff --git a/assets/2x/unicon.png b/assets/2x/unicon.png index 6c1401f..32c5f89 100644 Binary files a/assets/2x/unicon.png and b/assets/2x/unicon.png differ diff --git a/manifest.json b/manifest.json index b1b878b..70cb6ed 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.8.24", + "version": "2.8.25", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/joker.lua b/src/joker.lua index 84c6137..77ed701 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -12,13 +12,11 @@ local joker = (function() return ret end - ---@param tbl SMODS.Joker|{artist?: string, Bakery_can_use: (fun(self: self, card: Card): boolean?), Bakery_use_button_text: (fun(self: self, card: Card): string|table|nil), Bakery_use_joker: fun(self: self, card: Card), sinis?: boolean|{x: number, y: number}, soul_pos?: boolean|{x: number, y: number}, attributes?: Attributes[]} + ---@param tbl SMODS.Joker|{artist?: string, Bakery_can_use: (fun(self: self, card: Card): boolean?), Bakery_use_button_text: (fun(self: self, card: Card): string|table|nil), Bakery_use_joker: fun(self: self, card: Card), attributes?: Attributes[]} return function(tbl) tbl.pos = inc() tbl.atlas = "joker" tbl.artist = tbl.artist and "Roland_" .. tbl.artist or nil - tbl.soul_pos = tbl.soul_pos and inc() or nil - tbl.sinis = tbl.sinis and inc() or nil if ((tbl.config or {}).extra or {}).flipped ~= nil then tbl.config.extra.front_pos = tbl.pos @@ -99,6 +97,7 @@ SMODS.Sound { joker { key = "msjoker", pronouns = "she_her", + artist = "ghostlyfield", cost = 1, rarity = 1, eternal_compat = true, @@ -118,6 +117,7 @@ joker { joker { key = "jokersr", pronouns = "he_him", + artist = "ghostlyfield", config = {extra = {xmult = 1.25}}, attributes = {"xmult"}, cost = 2, @@ -137,7 +137,7 @@ joker { joker { key = "mrsbones", pronouns = "she_her", - artist = "char", + artist = "ghostlyfield", config = {extra = {xmult = 4, requirement = 4}}, attributes = {"xmult"}, cost = G.P_CENTERS.j_mr_bones.cost - 1, @@ -208,6 +208,7 @@ joker { joker { key = "hardboiled", pronouns = "it_its", + artist = "ghostlyfield", attributes = {"food", "editions", "modify_card", "on_sell"}, cost = 5, rarity = 2, @@ -232,6 +233,7 @@ joker { joker { key = "basket", pronouns = "they_them", + artist = "ghostlyfield", attributes = {"food", "generation", "on_sell"}, cost = 8, rarity = 3, @@ -376,6 +378,7 @@ joker { joker { key = "cold", pronouns = "he_him", + artist = "ghostlyfield", config = {extra = {xmult = 2}}, attributes = {"xmult"}, cost = 4, @@ -595,6 +598,7 @@ joker { joker { key = "phytoestrogens", pronouns = "she_her", + artist = "ghostlyfield", config = {extra = {xmult = 0.3}}, attributes = {"mult", "xmult"}, cost = 8, @@ -618,6 +622,7 @@ joker { joker { key = "nilly", pronouns = "any_all", + artist = "ghostlyfield", config = {extra = {flipped = false}}, attributes = {"xmult", "bakery_double_sided"}, cost = 0, diff --git a/src/main.lua b/src/main.lua index c133718..09206e3 100644 --- a/src/main.lua +++ b/src/main.lua @@ -13,31 +13,37 @@ if _G["Balatest"] then end q(function() - -- Special shoutout to all contributors. <3 - ---@type table? local contributors = (Bakery_API or {}).contributors if not contributors then return true end - contributors.Roland_aster = { - name = "asterSSH", - fg = HEX "f8f8f2ff", - bg = HEX "bd93f9ff", - } - - contributors.Roland_bakersdozenbagels = { - name = "BakersDozenBagels", - fg = HEX "362708", - bg = HEX "EDD198", - } - - contributors.Roland_char = { - name = "char (@irregulester)", - fg = HEX "f8f8f2ff", - bg = HEX "ff79c6ff", - } + -- Special shoutout to all contributors. <3 + f { + aster = { + name = "asterSSH", + fg = HEX "f8f8f2ff", + bg = HEX "bd93f9ff", + }, + bakersdozenbagels = { + name = "BakersDozenBagels", + fg = HEX "362708ff", + bg = HEX "edd198ff", + }, + char = { + name = "char (@irregulester)", + fg = HEX "f8f8f2ff", + bg = HEX "ff79c6ff", + }, + ghostlyfield = { + name = "ghostlyfield", + fg = HEX "ffffffff", + bg = HEX "b290e6ff", + }, + }:each(function(v, k) + contributors["Roland_" .. k] = v + end) if SMODS.Mods.DebugPlus and SMODS.Mods.Roland.config.import_funky then _G.f, _G.q, _G.u = unpack(qol)