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

Few minnor chagnes while messing with FSM

Browse Source
This commit is contained in:
Cooldude2606
2018-06-12 16:53:00 +01:00
parent 13c5961d39
commit 864279377e
10 changed files with 102 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/ExpGamingCore/Gui/control.lua
View File

@@ -125,12 +125,6 @@ function Gui.cam_link(data)
return data.cam
end
script.on_event('on_player_joined_game',function(event)
Gui.toolbar.on_player_joined_game(event)
Gui.popup.on_player_joined_game(event)
Gui.left.on_player_joined_game(event)
end)
script.on_event('on_tick', function(event)
if Gui.left and ((event.tick+10)/(3600*game.speed)) % 15 == 0 then
Gui.left.update()
@@ -167,7 +161,12 @@ function Gui:on_init()
Gui.toolbar.on_rank_change(event)
Gui.center.on_rank_change(event)
end)
end
end
script.on_event('on_player_joined_game',function(event)
Gui.toolbar.on_player_joined_game(event)
Gui.popup.on_player_joined_game(event)
Gui.left.on_player_joined_game(event)
end)
end
function Gui:on_post()

2
modules/ExpGamingCore/Ranking/src/core.lua
View File

@@ -90,7 +90,7 @@ root:add_rank{
name='Root',
short_hand='Root',
tag='[Root]',
colour=defines.color.white,
colour={r=255,b=255,g=255},
is_root=true,
is_admin=true,
is_spectator=true,

67
modules/ExpGamingCore/softmod.json
View File

@@ -1,16 +1,30 @@
{
"name": "ExpGamingCore",
"version": "4.0.0",
"module": "Collection",
"description": "Explosive Gaming Core Files",
"keywords": ["Library","Lib","ExpGaming","Core"],
"version": "4.0.0",
"location": "url",
"keywords": [
"Library",
"Lib",
"ExpGaming",
"Core"
],
"author": "Cooldude2606",
"contact": "Discord: Cooldude2606#5241",
"license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE",
"submodules": {
"Commands": {
"name": "Commands",
"module": "commands",
"description": "A better command handler than the base game.",
"keywords": ["Library","Lib","ExpGaming","Core","Commands"],
"keywords": [
"Library",
"Lib",
"ExpGaming",
"Core",
"Commands"
],
"version": "3.4.0",
"location": "url",
"dependencies": {
@@ -25,7 +39,14 @@
"name": "Gui",
"module": "Gui",
"description": "Adds a objective version to custom guis.",
"keywords": ["Library","Lib","ExpGaming","Core","Gui","ExpGui"],
"keywords": [
"Library",
"Lib",
"ExpGaming",
"Core",
"Gui",
"ExpGui"
],
"version": "3.4.0",
"location": "url",
"dependencies": {
@@ -42,7 +63,16 @@
"name": "Ranking",
"module": "Ranking",
"description": "A full ranking system for factorio.",
"keywords": ["Library","Lib","ExpGaming","Core","Ranking","Ranks","Permissions","Roles"],
"keywords": [
"Library",
"Lib",
"ExpGaming",
"Core",
"Ranking",
"Ranks",
"Permissions",
"Roles"
],
"version": "3.4.0",
"location": "url",
"dependencies": {
@@ -57,7 +87,16 @@
"name": "Server",
"module": "Server",
"description": "Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface)",
"keywords": ["Library","Lib","ExpGaming","Core","Server","Thread","Interface","Events"],
"keywords": [
"Library",
"Lib",
"ExpGaming",
"Core",
"Server",
"Thread",
"Interface",
"Events"
],
"version": "3.4.0",
"location": "url",
"dependencies": {
@@ -74,7 +113,16 @@
"name": "Sync",
"module": "Sync",
"description": "Allows syncing with an outside server and info panle.",
"keywords": ["Library","Lib","ExpGaming","Core","Info","Sync","External","Discord"],
"keywords": [
"Library",
"Lib",
"ExpGaming",
"Core",
"Info",
"Sync",
"External",
"Discord"
],
"version": "3.4.0",
"location": "url",
"dependencies": {
@@ -86,8 +134,5 @@
"ExpGamingCore.Gui": "?^4.0.0"
}
}
},
"author": "Cooldude2606",
"contact": "Discord: Cooldude2606#5241",
"license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE"
}
}

3
modules/ExpGamingLib/control.lua
View File

@@ -279,6 +279,5 @@ function table.keysort(tbl)
return _tbl
end
-- bypasses the module sandbox and places functions into _G
ExpLib:unpack_to_G()
-- because this is marked as GlobalLib it will be auto extracted into _G
return ExpLib

2
modules/ExpGamingLib/softmod.json
View File

@@ -1,6 +1,6 @@
{
"name": "ExpGamingLib",
"module": "ExpLib",
"module": "GlobalLib",
"description": "Adds some common functions used though out all ExpGaming modules",
"keywords": ["ExpGaming","Lib"],
"version": "3.4.0",

2
modules/FactorioStdLib/softmod.json
View File

@@ -17,7 +17,7 @@
},
"Game": {
"name": "Game",
"module": "game",
"module": "Game",
"description": "The game module.",
"keywords": ["Standard Library","Lib","StdLib","Game","Extends"],
"version": "0.8.0",

25
modules/index.lua
View File

@@ -1,17 +1,16 @@
-- not_luadoc=true
--- Used to index the files to be loaded
-- @script index.lua
return {
['mod_gui']='/modules/FactorioModGui',
['ExpLib']='/modules/ExpGamingLib',
['Game']='/modules/FactorioStdLib/Game',
['Time']='/modules/FactorioStdLib/Time',
['Color']='/modules/FactorioStdLib/Color',
['table']='/modules/FactorioStdLib/Table',
['string']='/modules/FactorioStdLib/String',
['Ranking']='/modules/ExpGamingCore/Ranking',
['commands']='/modules/ExpGamingCore/Commands',
['Gui']='/modules/ExpGamingCore/Gui',
['Server']='/modules/ExpGamingCore/Server',
['Sync']='/modules/ExpGamingCore/Sync',
['GlobalLib-ExpGamingLib']='./modules/ExpGamingLib',
['commands']='./modules/ExpGamingCore/Commands',
['Gui']='./modules/ExpGamingCore/Gui',
['Ranking']='./modules/ExpGamingCore/Ranking',
['Server']='./modules/ExpGamingCore/Server',
['Sync']='./modules/ExpGamingCore/Sync',
['mod_gui']='./modules/FactorioModGui',
['Color']='./modules/FactorioStdLib/Color',
['Game']='./modules/FactorioStdLib/Game',
['string']='./modules/FactorioStdLib/String',
['table']='./modules/FactorioStdLib/Table',
['Time']='./modules/FactorioStdLib/Time',
}