diff --git a/.gitignore b/.gitignore index d4de02f8b..0c9fa34bb 100644 --- a/.gitignore +++ b/.gitignore @@ -200,3 +200,5 @@ core/EditionAPI.lua # LSP/Editor settings .vscode .luarc.json + +.lovelyignore diff --git a/assets/1x/default_achievements.png b/assets/1x/default_achievements.png index 112362f36..79c33a9c4 100644 Binary files a/assets/1x/default_achievements.png and b/assets/1x/default_achievements.png differ diff --git a/assets/1x/mod_tags.png b/assets/1x/mod_tags.png index c236b92df..5b8a8dcfe 100644 Binary files a/assets/1x/mod_tags.png and b/assets/1x/mod_tags.png differ diff --git a/assets/2x/default_achievements.png b/assets/2x/default_achievements.png index 5bfbaff17..f7510388a 100644 Binary files a/assets/2x/default_achievements.png and b/assets/2x/default_achievements.png differ diff --git a/assets/2x/mod_tags.png b/assets/2x/mod_tags.png index 2ada9aaa8..09b3651f6 100644 Binary files a/assets/2x/mod_tags.png and b/assets/2x/mod_tags.png differ diff --git a/icon.png b/icon.png index a30fc6557..cfd1d4493 100644 Binary files a/icon.png and b/icon.png differ diff --git a/libs/nativefs/icon.png b/libs/nativefs/icon.png index 20ae91794..735fef055 100644 Binary files a/libs/nativefs/icon.png and b/libs/nativefs/icon.png differ diff --git a/lsp_def/classes/font.lua b/lsp_def/classes/font.lua index 7e7e45ce4..a483cd762 100644 --- a/lsp_def/classes/font.lua +++ b/lsp_def/classes/font.lua @@ -1,9 +1,9 @@ ---@meta ---@class SMODS.Font: SMODS.GameObject ----@field obj_table? table Table of objects registered to this class. ----@field super? SMODS.GameObject|table Parent class. ----@field path? string Name of the font file, including the extension. +---@field obj_table? table Table of objects registered to this class. +---@field super? SMODS.GameObject|table Parent class. +---@field path? string Name of the font file, including the extension. ---@field render_scale? number Set the size of the font. This is generally better as a higher value so it can be scaled down. The default value is `200`. ---@field TEXT_HEIGHT_SCALE? number Determines line spacing. The default value is `0.83`. ---@field TEXT_OFFSET? table|{x: number, y: number} Determines the offset that the font is rendered. You might need to adjust this if the font renders in unexpected places. The default value is `{x=0, y=0}`. @@ -11,25 +11,25 @@ ---@field squish? number Determines horizontal width of each character. The default value is `1`. ---@field DESCSCALE? number Determines how big the description text should be in relation to normal text. Keep in mind that mobile UI makes this 1.5x bigger. The default font's value is `1`. ---@field __call? fun(self: SMODS.Font|table, o: SMODS.Font|table): nil|table|SMODS.Font ----@field extend? fun(self: SMODS.Font|table, o: SMODS.Font|table): table Primary method of creating a class. ----@field check_duplicate_register? fun(self: SMODS.Font|table): boolean? Ensures objects already registered will not register. ----@field check_duplicate_key? fun(self: SMODS.Font|table): boolean? Ensures objects with duplicate keys will not register. Checked on `__call` but not `take_ownership`. For take_ownership, the key must exist. ----@field register? fun(self: SMODS.Font|table) Registers the object. ----@field check_dependencies? fun(self: SMODS.Font|table): boolean? Returns `true` if there's no failed dependencies. ----@field process_loc_text? fun(self: SMODS.Font|table) Called during `inject_class`. Handles injecting loc_text. ----@field send_to_subclasses? fun(self: SMODS.Font|table, func: string, ...: any) Starting from this class, recusively searches for functions with the given key on all subordinate classes and run all found functions with the given arguments. ----@field pre_inject_class? fun(self: SMODS.Font|table) Called before `inject_class`. Injects and manages class information before object injection. ----@field post_inject_class? fun(self: SMODS.Font|table) Called after `inject_class`. Injects and manages class information after object injection. ----@field inject_class? fun(self: SMODS.Font|table) Injects all direct instances of class objects by calling `obj:inject` and `obj:process_loc_text`. Also injects anything necessary for the class itself. Only called if class has defined both `obj_table` and `obj_buffer`. ----@field inject? fun(self: SMODS.Font|table, i?: number) Called during `inject_class`. Injects the object into the game. +---@field extend? fun(self: SMODS.Font|table, o: SMODS.Font|table): table Primary method of creating a class. +---@field check_duplicate_register? fun(self: SMODS.Font|table): boolean? Ensures objects already registered will not register. +---@field check_duplicate_key? fun(self: SMODS.Font|table): boolean? Ensures objects with duplicate keys will not register. Checked on `__call` but not `take_ownership`. For take_ownership, the key must exist. +---@field register? fun(self: SMODS.Font|table) Registers the object. +---@field check_dependencies? fun(self: SMODS.Font|table): boolean? Returns `true` if there's no failed dependencies. +---@field process_loc_text? fun(self: SMODS.Font|table) Called during `inject_class`. Handles injecting loc_text. +---@field send_to_subclasses? fun(self: SMODS.Font|table, func: string, ...: any) Starting from this class, recusively searches for functions with the given key on all subordinate classes and run all found functions with the given arguments. +---@field pre_inject_class? fun(self: SMODS.Font|table) Called before `inject_class`. Injects and manages class information before object injection. +---@field post_inject_class? fun(self: SMODS.Font|table) Called after `inject_class`. Injects and manages class information after object injection. +---@field inject_class? fun(self: SMODS.Font|table) Injects all direct instances of class objects by calling `obj:inject` and `obj:process_loc_text`. Also injects anything necessary for the class itself. Only called if class has defined both `obj_table` and `obj_buffer`. +---@field inject? fun(self: SMODS.Font|table, i?: number) Called during `inject_class`. Injects the object into the game. ---@field take_ownership? fun(self: SMODS.Font|table, key: string, obj: SMODS.Font|table, silent?: boolean): nil|table|SMODS.Font Takes control of vanilla objects. Child class must have get_obj for this to function ----@field get_obj? fun(self: SMODS.Font|table, key: string): SMODS.Font|table? Returns an object if one matches the `key`. +---@field get_obj? fun(self: SMODS.Font|table, key: string): SMODS.Font|table? Returns an object if one matches the `key`. ---@overload fun(self: SMODS.Font): SMODS.Font SMODS.Font = setmetatable({}, { - __call = function(self) - return self - end + __call = function(self) + return self + end }) ---@type table -SMODS.Fonts = {} \ No newline at end of file +SMODS.Fonts = {}