From d8bb39d66138176a992ffbea087de27058893a3d Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Wed, 30 May 2018 00:08:59 +0100 Subject: [PATCH] Last Time Chaning Doc For StdLib --- doc/index.html | 22 +- doc/modules/Event.html | 210 -------------- doc/modules/ExpGamingLib.html | 12 +- doc/modules/FSM.html | 12 +- doc/modules/{Color.html => StdLib.Color.html} | 87 +++++- doc/modules/{Game.html => StdLib.Game.html} | 19 +- .../{string.html => StdLib.String.html} | 14 +- doc/modules/{table.html => StdLib.Table.html} | 14 +- .../{defines.time.html => StdLib.Time.html} | 19 +- doc/modules/{Time.html => StdLib.html} | 37 +-- doc/modules/expcore.commands.html | 12 +- doc/modules/expcore.gui.html | 12 +- doc/modules/expcore.guiparts.center.html | 12 +- doc/modules/expcore.guiparts.inputs.html | 12 +- doc/modules/expcore.guiparts.left.html | 12 +- doc/modules/expcore.guiparts.popup.html | 12 +- doc/modules/expcore.guiparts.toolbar.html | 12 +- doc/modules/expcore.ranking.html | 12 +- doc/modules/expcore.server.html | 12 +- doc/modules/expcore.sync.html | 12 +- ...html => modules.factoriostdlib.color.html} | 270 +++++++++++------- doc/scripts/control.lua.html | 12 +- doc/scripts/index.lua.html | 12 +- modules/FactorioStdLib/color.lua | 7 +- modules/FactorioStdLib/game.lua | 3 +- modules/FactorioStdLib/string.lua | 2 +- modules/FactorioStdLib/table.lua | 2 +- modules/FactorioStdLib/time.lua | 5 +- 28 files changed, 369 insertions(+), 510 deletions(-) delete mode 100644 doc/modules/Event.html rename doc/modules/{Color.html => StdLib.Color.html} (86%) rename doc/modules/{Game.html => StdLib.Game.html} (92%) rename doc/modules/{string.html => StdLib.String.html} (95%) rename doc/modules/{table.html => StdLib.Table.html} (98%) rename doc/modules/{defines.time.html => StdLib.Time.html} (88%) rename doc/modules/{Time.html => StdLib.html} (83%) rename doc/modules/{defines.color.html => modules.factoriostdlib.color.html} (66%) diff --git a/doc/index.html b/doc/index.html index 0c5889c6..d797fba0 100644 --- a/doc/index.html +++ b/doc/index.html @@ -43,11 +43,11 @@
  • expcore.sync
  • FSM
  • ExpGamingLib
  • -
  • Color
  • -
  • Game
  • -
  • String
  • -
  • Table
  • -
  • Time
  • +
  • StdLib.Color
  • +
  • StdLib.Game
  • +
  • StdLib.String
  • +
  • StdLib.Table
  • +
  • StdLib.Time
  • Scripts

    Scripts

    Scripts

    Scripts

    - -
    - - Time -
    -
    - Allows index to deines.time though the Time module - - - - - - -
    @@ -159,7 +136,7 @@
    generated by LDoc 1.4.6 -Last updated 2018-05-29 22:53:53 +Last updated 2018-05-30 00:08:33
    diff --git a/doc/modules/expcore.commands.html b/doc/modules/expcore.commands.html index c7194b1e..1d31df15 100644 --- a/doc/modules/expcore.commands.html +++ b/doc/modules/expcore.commands.html @@ -50,11 +50,11 @@
  • expcore.sync
  • FSM
  • ExpGamingLib
  • -
  • Color
  • -
  • Game
  • -
  • String
  • -
  • Table
  • -
  • Time
  • +
  • StdLib.Color
  • +
  • StdLib.Game
  • +
  • StdLib.String
  • +
  • StdLib.Table
  • +
  • StdLib.Time
  • Scripts

    Scripts

    Scripts

    Scripts

    Scripts

    Scripts

    Scripts

    Scripts

    Scripts

    Scripts

    Scripts

    @@ -78,7 +78,7 @@
    generated by LDoc 1.4.6 -Last updated 2018-05-29 22:53:53 +Last updated 2018-05-30 00:08:40
    diff --git a/doc/scripts/index.lua.html b/doc/scripts/index.lua.html index aeb35e86..f912ae6d 100644 --- a/doc/scripts/index.lua.html +++ b/doc/scripts/index.lua.html @@ -51,11 +51,11 @@
  • expcore.sync
  • FSM
  • ExpGamingLib
  • -
  • Color
  • -
  • Game
  • -
  • String
  • -
  • Table
  • -
  • Time
  • +
  • StdLib.Color
  • +
  • StdLib.Game
  • +
  • StdLib.String
  • +
  • StdLib.Table
  • +
  • StdLib.Time
  • @@ -78,7 +78,7 @@
    generated by LDoc 1.4.6 -Last updated 2018-05-29 22:53:53 +Last updated 2018-05-30 00:08:40
    diff --git a/modules/FactorioStdLib/color.lua b/modules/FactorioStdLib/color.lua index 4a5e4c8d..9ccedbc5 100644 --- a/modules/FactorioStdLib/color.lua +++ b/modules/FactorioStdLib/color.lua @@ -1,7 +1,6 @@ --- A defines module for retrieving colors by name. -- Extends the Factorio defines table. --- @usage require('stdlib/defines/color') --- @module Color +-- @module StdLib.Color -- @alias defines.color -- defines table is automatically required in all mod loading stages. @@ -79,7 +78,7 @@ defines.anticolor = { red = colors.white -- defines.color.white } ---- Returns a lighter color of a named color. +--- Returns a lighter color of a named color -- @table defines.lightcolor defines.lightcolor = { white = colors.lightgrey, -- defines.color.lightgrey @@ -196,6 +195,7 @@ function Color.from_hex(hex, alpha) end --added by cooldude2606 + --- Converts a color in the color table format to rgb -- @tparam table color the color to convert -- @treturn table the color as rgb @@ -208,6 +208,7 @@ function Color.to_rgb(color) end --added by cooldude2606 + --- Converts a color in the color table format to hex -- @tparam table color the color to convert -- @treturn string the color as hex diff --git a/modules/FactorioStdLib/game.lua b/modules/FactorioStdLib/game.lua index e108610e..219b88f7 100644 --- a/modules/FactorioStdLib/game.lua +++ b/modules/FactorioStdLib/game.lua @@ -1,6 +1,5 @@ --- The game module. --- @module Game --- @usage local Game = require('stdlib/game') +-- @module StdLib.Game local Game = { --luacheck: allow defined top VALID_FILTER = function(v) diff --git a/modules/FactorioStdLib/string.lua b/modules/FactorioStdLib/string.lua index 27a3aaed..24ff26ad 100644 --- a/modules/FactorioStdLib/string.lua +++ b/modules/FactorioStdLib/string.lua @@ -1,5 +1,5 @@ --- Extends Lua 5.2 string. --- @module String +-- @module StdLib.String -- @alias string -- luacheck: globals string (Allow mutating string) diff --git a/modules/FactorioStdLib/table.lua b/modules/FactorioStdLib/table.lua index 2afaf62b..f2c63683 100644 --- a/modules/FactorioStdLib/table.lua +++ b/modules/FactorioStdLib/table.lua @@ -1,5 +1,5 @@ --- Extends Lua 5.2 table. --- @module Table +-- @module StdLib.Table -- @alias table -- luacheck: globals table (Allow mutating global table) diff --git a/modules/FactorioStdLib/time.lua b/modules/FactorioStdLib/time.lua index f885f0e6..23554339 100644 --- a/modules/FactorioStdLib/time.lua +++ b/modules/FactorioStdLib/time.lua @@ -1,8 +1,7 @@ --- A defines module for retrieving the number of ticks in 1 unit of time. -- Extends the Factorio defines table. --- @module Time +-- @module StdLib.Time -- @alias defines.time --- @usage require('stdlib/defines/time') -- defines table is automatically required in all mod loading stages. -- luacheck: ignore 122/defines @@ -31,6 +30,4 @@ defines.time = { year = YEAR, -- the number of Factorio ticks in a year (365 days) } ---- Allows index to deines.time though the Time module ---@table Time return setmetatable({},{__index=defines.time}) \ No newline at end of file