diff --git a/manifest.json b/manifest.json index b013523..c724662 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.9.55", + "version": "2.9.56", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/credits.lua b/src/credits.lua new file mode 100644 index 0000000..b30f8db --- /dev/null +++ b/src/credits.lua @@ -0,0 +1,33 @@ +-- Special shoutout to all contributors. <3 +return { + 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", + }, + hamester = { + name = "Hamester", + fg = HEX "ffffffff", + bg = HEX "ffa100ff", + }, + redstoad = { + name = "RedsToad", + fg = HEX "ffffffff", + bg = HEX "da4044ff", + }, +} diff --git a/src/main.lua b/src/main.lua index dd0b2c7..f8d2580 100644 --- a/src/main.lua +++ b/src/main.lua @@ -13,44 +13,8 @@ q { return false end - -- Special shoutout to all contributors. <3 - local credits = { - 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", - }, - hamester = { - name = "Hamester", - fg = HEX "ffffffff", - bg = HEX "ffa100ff", - }, - redstoad = { - name = "RedsToad", - fg = HEX "ffffffff", - bg = HEX "da4044ff", - }, - } - - f(credits):each(function(v, k) + f(assert(SMODS.load_file "src/credits.lua")() or require "credits"):each(function(v, k) contributors["Roland_" .. k] = v - -- G.ARGS.LOC_COLOURS["Bakery_credit_fg_Roland_" .. k] = v.fg - -- G.ARGS.LOC_COLOURS["Bakery_credit_bg_Roland_" .. k] = v.bg end) if not SMODS.Mods.DebugPlus or not SMODS.Mods.Roland.config.import_funky then @@ -65,6 +29,7 @@ f { "challenge", "spectral", "edition", + "voucher", "tweaks", "blind", "charm", @@ -73,16 +38,13 @@ f { "back", "seal", "tag", - "voucher", }:each(function(v) assert(SMODS.load_file("src/" .. v .. ".lua"))(qol) end) -if Balatest then - f {"joker", "blind", "spectral"}:each(function(v) - assert(SMODS.load_file("src/tests/" .. v .. ".tests.lua"))(qol) - end) -end +local _ = Balatest and f {"joker", "blind", "spectral"}:each(function(v) + assert(SMODS.load_file("src/tests/" .. v .. ".tests.lua"))(qol) +end) local function toggle(id) return create_toggle { @@ -93,6 +55,7 @@ local function toggle(id) } end +SMODS.current_mod.qol = qol local animated = SMODS.Mods.Roland.config.animated_icon SMODS.Atlas { @@ -127,5 +90,3 @@ function SMODS.current_mod.config_tab() }}, } end - -SMODS.current_mod.qol = qol