aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 20:41:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few inconsitancy

Browse Source
This commit is contained in:
Cooldude2606
2018-05-20 19:04:24 +01:00
parent 7ccf1083d2
commit 28c6610a20
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ExpCore/gui.lua
View File

@@ -29,7 +29,7 @@ function Gui._get_data(key) return Gui_data[key] end
function Gui:_load_parts(parts) function Gui:_load_parts(parts)
for _,part in pairs(parts) do for _,part in pairs(parts) do
verbose('Gui Extraction: '..part) verbose('Gui Extraction: '..part)
self[part] = require('/GuiParts/'..part) self[part] = require('GuiParts/'..part)
end end
end end

6
StdLib/color.lua
View File

@@ -214,9 +214,6 @@ setmetatable(defines.lightcolor, _mt.lightcolor)
-- @module Color -- @module Color
-- @usage local Color = require('stdlib/color/color') -- @usage local Color = require('stdlib/color/color')
--require 'stdlib/defines/color'
local fail_if_missing = require 'game'['fail_if_missing']
local Color = {} --luacheck: allow defined top local Color = {} --luacheck: allow defined top
--- Set a value for the alpha channel in the given color table. --- Set a value for the alpha channel in the given color table.
@@ -266,7 +263,8 @@ end
-- @tparam[opt=1] float alpha the alpha value to set; such that ***[ 0 ⋜ value ⋜ 1 ]*** -- @tparam[opt=1] float alpha the alpha value to set; such that ***[ 0 ⋜ value ⋜ 1 ]***
-- @treturn Concepts.Color a color table with RGB converted from Hex and with alpha -- @treturn Concepts.Color a color table with RGB converted from Hex and with alpha
function Color.from_hex(hex, alpha) function Color.from_hex(hex, alpha)
fail_if_missing(hex, "missing color hex value") if not _G.Game then error('StdLib/Game not loaded') end
_G.Game.fail_if_missing(hex, "missing color hex value")
if hex:find("#") then hex = hex:sub(2) end if hex:find("#") then hex = hex:sub(2) end
if not(#hex == 6) then error("invalid color hex value: "..hex) end if not(#hex == 6) then error("invalid color hex value: "..hex) end
local number = tonumber(hex, 16) local number = tonumber(hex, 16)

11
StdLib/event.lua
View File

@@ -5,9 +5,6 @@
-- @module Event -- @module Event
-- @usage require('stdlib/event/event') -- @usage require('stdlib/event/event')
local fail_if_missing = require 'game'['fail_if_missing']
local Game = require 'game'
local Event = { --luacheck: allow defined top local Event = { --luacheck: allow defined top
_registry = {}, _registry = {},
core_events = { core_events = {
@@ -58,7 +55,8 @@ end]]
-- @tparam function handler Function to call when event is triggered -- @tparam function handler Function to call when event is triggered
-- @treturn Event -- @treturn Event
function Event.register(event, handler) function Event.register(event, handler)
fail_if_missing(event, "missing event argument") if not _G.Game then error('StdLib/Game not loaded') end
_G.Game.fail_if_missing(event, "missing event argument")
event = (type(event) == "table" and event) or {event} event = (type(event) == "table" and event) or {event}
@@ -146,8 +144,9 @@ end
-- @tparam function handler to remove -- @tparam function handler to remove
-- @return Event -- @return Event
function Event.remove(event, handler) function Event.remove(event, handler)
fail_if_missing(event, "missing event argument") if not _G.Game then error('StdLib/Game not loaded') end
fail_if_missing(handler, "missing handler argument") _G.Game.fail_if_missing(event, "missing event argument")
_G.Game.fail_if_missing(handler, "missing handler argument")
event = (type(event) == "table" and event) or {event} event = (type(event) == "table" and event) or {event}

2
control.lua
View File

@@ -34,7 +34,7 @@ require_return_err = false -- Set to false when removing files; set to true for
_require = require _require = require
require = function(path) require = function(path)
local _path = path local _path = path
if not string.sub(path,1) == '/' then path = '/'..path end if string.sub(path,1) ~= '/' then path = '/'..path end
local _return = {pcall(_require,path)} local _return = {pcall(_require,path)}
if not table.remove(_return, 1) then if not table.remove(_return, 1) then
local __return = {pcall(_require,'/..'..path)} local __return = {pcall(_require,'/..'..path)}