Major Changes

Author: bleonheart

documentation/docs/definitions/command.md

@@ -30,7 +30,7 @@ The command name itself is the first argument to `lia.command.add` and is stored
 | `adminOnly` | `boolean` | `false` | Restrict to admins (registers a CAMI privilege). |
 | `superAdminOnly` | `boolean` | `false` | Restrict to superadmins (registers a CAMI privilege). |
 | `privilege` | `string` | `nil` | Custom CAMI privilege name (defaults to command name). |
-| `syntax` | `string` | `""` | Human-readable argument format shown in help. |
+| `arguments` | `table` | `{}` | Ordered argument definitions used to build help text. |
 | `desc` | `string` | `""` | Short description shown in command lists and menus. |
 | `AdminStick` | `table` | `nil` | Defines how the command appears in admin utilities. |
 | `onRun(client, args)` | `function(client, table)` | **required** | Function executed when the command is invoked. |
@@ -119,32 +119,34 @@ privilege = "Manage Doors"
 
 ---
 
-### Syntax & Description
+### Arguments & Description
 
-#### `syntax`
+#### `arguments`
 
 **Type:**
 
-`string`
+`table`
 
 **Description:**
 
-Human-readable syntax string shown in help menus. Does not affect argument parsing.
+Ordered list defining each command argument. Every entry may contain:
 
-You can use spaces in argument names for better readability.
+* `name` – Argument name shown to the user.
+* `type` – One of `player`, `bool`, `table`, or `string`.
+* `optional` – Set to `true` if the argument is optional.
+* `description` – Optional human-readable help text.
+* `options` – Table or function returning options for `table` type.
+* `filter` – Function to filter players for `player` type.
 
-The in-game prompt only appears when every argument follows the `[type Name]` format.
+The displayed syntax string is generated automatically from these definitions.
 
 **Example Usage:**
 
 ```lua
-syntax = "[string Target Name] [number Amount]"
-```
-
-Include the word `optional` inside the brackets to make an argument optional:
-
-```lua
-syntax = "[string Target Name] [number Amount optional]"
+arguments = {
+    {name = "target", type = "player"},
+    {name = "reason", type = "string", optional = true}
+}
 ```
 
 ---
@@ -239,7 +241,7 @@ lia.command.add("restockvendor", {
     superAdminOnly = true,                -- restrict to super administrators
     privilege = "Manage Vendors",        -- custom privilege checked before run
     desc = "Restock the vendor you are looking at.", -- shown in command lists
-    syntax = "[player Target]",          -- help text describing the argument
+    arguments = {{name = "target", type = "player"}}, -- argument definition
     alias = {"vendorrestock"},           -- other names that trigger the command
     AdminStick = {
         Name        = "Restock Vendor",  -- text on the Admin Stick button
@@ -271,7 +273,7 @@ lia.command.add("restockvendor", {
 ```lua
 lia.command.add("goto", {
     adminOnly = true,                    -- only admins may run this command
-    syntax = "[player Target]",         -- how the argument appears in help menus
+    arguments = {{name = "target", type = "player"}}, -- argument definition
     desc = "Teleport to the specified player.", -- short description
     onRun = function(client, args)
         -- look up the target player from the first argument

documentation/docs/libraries/lia.chatbox.md

@@ -67,7 +67,7 @@ Registers a new chat class and sets up its command aliases.
 
 * `data` (*table*): Table of chat class properties.
 
-  * `syntax` (string) – Argument usage description shown in command help.
+  * `arguments` (table) – Ordered argument definitions for the associated command.
 
   * `desc` (string) – Description of the command shown in menus.
 
@@ -109,7 +109,7 @@ Registers a new chat class and sets up its command aliases.
 -- Register a waving emote command
 lia.chat.register("wave", {
     desc = "Wave at those nearby",
-    syntax = "",
+    arguments = {{name = "text", type = "string", optional = true}},
     format = "* %s waves",
     prefix = {"/wave", "/greet"},
     font = "liaChatFontItalics",

documentation/docs/libraries/lia.commands.md

@@ -36,7 +36,10 @@ Registers a new command with its associated data. See [Command Fields](../defini
 -- Register a simple warn command for administrators
 lia.command.add("warn", {
     adminOnly = true,
-    syntax = "[player Target] [string Reason]",
+    arguments = {
+        {name = "target", type = "player"},
+        {name = "reason", type = "string"}
+    },
     desc = "Send a warning message to the target player.",
     onRun = function(client, args)
         local target = lia.util.findPlayer(client, args[1])
@@ -124,39 +127,6 @@ local args2 = lia.command.extractArgs("/mycommand 'other arg' another")
 
 ---
 
-### lia.command.parseSyntaxFields
-
-**Purpose**
-
-Parses a command syntax string into an ordered list of field tables. Each field contains a `name`, a `type`, and an `optional` flag derived from the syntax.
-
-**Parameters**
-
-* `syntax` (*string*): Syntax string, e.g. `[string Name] [number Time]`.
-
-  Include the word `optional` inside a bracket to mark that argument as optional.
-
-**Realm**
-
-`Shared`
-
-**Returns**
-
-* *table*: Ordered list of field tables.
-
-* *boolean*: Whether the syntax strictly used the `[type Name]` format.
-
-**Example Usage**
-
-```lua
-local fields, valid = lia.command.parseSyntaxFields("[string Name] [number Time]")
-
--- mark optional arguments with the word "optional"
-local fieldsOpt = lia.command.parseSyntaxFields("[string Name] [number Time optional]")
-```
-
----
-
 ### lia.command.run
 
 **Purpose**
@@ -258,15 +228,15 @@ lia.command.send("mycommand", "arg1", "arg2")
 
 **Purpose**
 
-Opens a window asking the player to fill in arguments for the given command. Missing fields defined as `optional` may be left blank; all others must be filled before **Submit** is enabled.
+Opens a window asking the player to fill in missing arguments for the given command. Arguments marked `optional` may be left blank; all others must be filled before **Submit** is enabled.
 
 **Parameters**
 
 * `cmdKey` (*string*): Command name.
 
-* `fields` (*table | string*): Existing arguments or the server-supplied list of missing fields.
+* `missing` (*table*): Array of argument names that still need values.
 
-* `prefix` (*table*): Legacy prefix table (optional).
+* `prefix` (*table*): Arguments already supplied (optional).
 
 **Realm**
 
@@ -279,7 +249,7 @@ Opens a window asking the player to fill in arguments for the given command. Mis
 **Example Usage**
 
 ```lua
-lia.command.openArgumentPrompt("plywhitelist")
+lia.command.openArgumentPrompt("ban", {"target", "duration"})
 ```
 
 ---

gamemode/core/derma/f1menu/cl_classes.lua

@@ -161,10 +161,12 @@ function PANEL:addClassDetails(parent, cl)
             for _, v in ipairs(cl.requirements) do
                 reqs[#reqs + 1] = L(v)
             end
+
             req = table.concat(reqs, ", ")
         else
             req = L(tostring(cl.requirements))
         end
+
         add(L("requirements") .. ": " .. req)
     end
 end
@@ -195,4 +197,4 @@ function PANEL:addJoinButton(parent, cl, canBe)
     end
 end
 
-vgui.Register("liaClasses", PANEL, "EditablePanel")
+vgui.Register("liaClasses", PANEL, "EditablePanel")

gamemode/core/derma/f1menu/cl_menu.lua

@@ -9,7 +9,7 @@ function PANEL:Init()
     self:SetPopupStayAtBack(true)
     self.noAnchor = CurTime() + 0.4
     self.anchorMode = true
-    self.invKey = lia.keybind.get(L("Open Inventory"), KEY_I)
+    self.invKey = lia.keybind.get(L("openInventory"), KEY_I)
     local baseBtnW, btnH, spacing = 150, 40, 20
     self.baseBtnW = baseBtnW
     local topBar = self:Add("DPanel")
@@ -71,6 +71,7 @@ function PANEL:Init()
         for _, btn in ipairs(btns) do
             totalW = totalW + (btn.calcW or baseBtnW) + spacing
         end
+
         local overflow = totalW - w
         if overflow > 0 then
             leftArrow:SetVisible(true)
@@ -120,6 +121,7 @@ function PANEL:Init()
         local aName, bName = tostring(L(a)):lower(), tostring(L(b)):lower()
         return aName < bName
     end)
+
     self.tabList = {}
     for _, key in ipairs(tabKeys) do
         local cb = btnDefs[key]

gamemode/core/derma/mainmenu/character.lua

@@ -230,7 +230,7 @@ function PANEL:createStartButton()
     if clientChar then
         table.insert(buttonsData, {
             id = "return",
-            text = L("return"),
+            text = L("returnText"),
             doClick = function() self:Remove() end
         })
     end
@@ -295,7 +295,7 @@ end
 
 function PANEL:createTabs()
     self.tabs:Clear()
-    self:addTab(L("return"), function() self:backToMainMenu() end, true)
+    self:addTab(L("returnText"), function() self:backToMainMenu() end, true)
 end
 
 function PANEL:backToMainMenu()
@@ -733,4 +733,4 @@ function PANEL:Think()
     end
 end
 
-vgui.Register("liaCharacter", PANEL, "EditablePanel")
+vgui.Register("liaCharacter", PANEL, "EditablePanel")

gamemode/core/derma/panels/attributes.lua

@@ -1,4 +1,4 @@
-local PANEL = {}
+local PANEL = {}
 function PANEL:Init()
     self:SetTall(20)
     self.add = self:Add("DImageButton")
@@ -252,4 +252,4 @@ function PANEL:Paint(w, h)
     surface.DrawRect(0, 0, w, h)
 end
 
-vgui.Register("liaCharacterAttribsRow", PANEL, "DPanel")
+vgui.Register("liaCharacterAttribsRow", PANEL, "DPanel")

gamemode/core/derma/panels/chatbox.lua

@@ -122,7 +122,7 @@ function PANEL:setActive(state)
                     end
 
                     btn.DoClick = function()
-                        local syntax = cmdInfo.syntax or ""
+                        local syntax = L(cmdInfo.syntax or "")
                         self.text:SetText("/" .. cmdName .. " " .. syntax)
                         self.text:RequestFocus()
                         self.commandList:Remove()

gamemode/core/derma/panels/extended_spawnmenu.lua

@@ -109,9 +109,7 @@ end, {
         action = function(p) SetClipboardText(p) end
     },
     {
-        text = function(p)
-            return isMaterialUsable(p) and L("useWithMaterialTool") or L("tryWithMaterialTool")
-        end,
+        text = function(p) return isMaterialUsable(p) and L("useWithMaterialTool") or L("tryWithMaterialTool") end,
         icon = "icon16/pencil.png",
         action = function(p)
             RunConsoleCommand("material_override", p)

gamemode/core/derma/panels/item.lua

@@ -117,7 +117,7 @@ function PANEL:setItemType(itemTypeOrID)
         self.itemType = itemTypeOrID
     end
 
-    assert(item, L("invalidItemTypeOrID", tostring(item)))
+    assert(item, L("invalidItemTypeOrID", item and item.name or itemTypeOrID))
     self.liaToolTip = true
     self.itemTable = item
     self:SetModel(item:getModel(), item:getSkin())