Add new art
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 845 KiB After Width: | Height: | Size: 242 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
44
src/main.lua
|
|
@ -13,31 +13,37 @@ if _G["Balatest"] then
|
|||
end
|
||||
|
||||
q(function()
|
||||
-- Special shoutout to all contributors. <3
|
||||
---@type table<string, {name: string, fg: table, bg: 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)
|
||||
|
|
|
|||