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

Merge branch 'wip' into testing

Browse Source
This commit is contained in:
Unknown
2017-12-28 13:36:11 +00:00
parent cef921e7ed 9f46ff15ae
commit 3acaeeb7f1
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ExpCore/ranking.lua
View File

@@ -216,19 +216,29 @@ end
-- @param rtn any value you want to return -- @param rtn any value you want to return
function Ranking._rank:print(rtn,colour) function Ranking._rank:print(rtn,colour)
local colour = colour or defines.color.white local colour = colour or defines.color.white
local meta_data = Ranking._presets().meta
local default = Ranking.get_rank(meta_data.default)
if not Server or not Server._thread then if not Server or not Server._thread then
for _,player in pairs(self:get_players()) do for _,player in pairs(self:get_players()) do
player_return(rtn,colour,player) if thread.data.rank.name == thread.data.default then
player_return({'ranking.all-rank-print',rtn},colour,player)
else
player_return({'ranking.rank-print',self.name,rtn},colour,player)
end
end end
else else
-- using threads to make less lag -- using threads to make less lag
Server.new_thread{ Server.new_thread{
data={rank=self,rtn=rtn} data={rank=self,rtn=rtn,default=default.name}
}:on_event('resolve',function(thread) }:on_event('resolve',function(thread)
return thread.data.rank:get_players(true) return thread.data.rank:get_players(true)
end):on_event('success',function(thread,players) end):on_event('success',function(thread,players)
for _,player in pairs(players) do for _,player in pairs(players) do
player_return(thread.data.rtn,colour,player) if thread.data.rank.name == thread.data.default then
player_return({'ranking.all-rank-print',thread.data.rtn},colour,player)
else
player_return({'ranking.rank-print',thread.data.rank.name,thread.data.rtn},colour,player)
end
end end
end):queue() end):queue()
end end

3
locale/en/exp-core.cfg
View File

@@ -1,6 +1,4 @@
[commands] [commands]
no-help=No Help Given
help-format= __1__ __2__
unauthorized=401 - Unauthorized: Access is denied due to invalid credentials unauthorized=401 - Unauthorized: Access is denied due to invalid credentials
invalid-inputs=Invalid Input, /__1__ __2__ invalid-inputs=Invalid Input, /__1__ __2__
invalid-player=Invaild Player Name, __1__ ,try using tab key to auto-complete the name invalid-player=Invaild Player Name, __1__ ,try using tab key to auto-complete the name
@@ -8,6 +6,7 @@ command-ran=Command Complete
[ranking] [ranking]
all-rank-print=[Everyone]: __1__ all-rank-print=[Everyone]: __1__
rank-print=[__1__]: __2__
rank-up=__1__ was promoted to __2__ by __3__ rank-up=__1__ was promoted to __2__ by __3__
rank-down=__1__ was demoted to __2__ by __3__ rank-down=__1__ was demoted to __2__ by __3__
rank-given=You have been given the __1__ Rank! rank-given=You have been given the __1__ Rank!