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 'testing'

Browse Source
This commit is contained in:
Cooldude2606
2018-05-14 20:26:50 +01:00
parent e711d5d2ca 26be816ce6
commit c293f029ad
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Addons/Admin/auto-chat.lua
View File

@@ -42,6 +42,14 @@ local commands = {
['aids']={'chat-bot.aids'}, ['aids']={'chat-bot.aids'},
['riot']={'chat-bot.riot'}, ['riot']={'chat-bot.riot'},
['lenny']={'chat-bot.lenny'}, ['lenny']={'chat-bot.lenny'},
['orderpizza']=function(player) Server.new_thread{
timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true
}:on_event('timeout',function(self)
if self.data[2]==0 then game.print{'chat-bot.message',{'chat-bot.order-pizza-2',self.data[1]}}
elseif self.data[2]==1 then game.print{'chat-bot.message',{'chat-bot.order-pizza-3',self.data[1]}} self.reopen = false
end
self.data[2]=self.data[2]+1
end):open() return {'chat-bot.order-pizza-1'} end,
['maketea']=function(player) Server.new_thread{ ['maketea']=function(player) Server.new_thread{
timeout=math.floor(180*(math.random()+0.5)),data=player.name timeout=math.floor(180*(math.random()+0.5)),data=player.name
}:on_event('timeout',function(self) }:on_event('timeout',function(self)
@@ -73,4 +81,4 @@ Event.register(defines.events.on_console_chat,function(event)
else player_return({'chat-bot.rank-error'},nil,player) end else player_return({'chat-bot.rank-error'},nil,player) end
end end
end end
end) end)

8
ExpCore/server.lua
View File

@@ -294,9 +294,11 @@ function Server._thread:close()
end end
end) end)
end end
if is_type(self.name,'string') then threads.paused[self.name]=self.uuid self.opened=nil self.opened=nil
if self.reopen == true then self:open() end if self.reopen == true then self:open() else
else threads.all[uuid] = nil threads.all._n = threads.all._n-1 end if is_type(self.name,'string') then threads.paused[self.name]=self.uuid
else threads.all[uuid] = nil threads.all._n = threads.all._n-1 end
end
return _return return _return
end end

5
locale/en/chat-bot.cfg
View File

@@ -21,4 +21,7 @@ riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹
loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!!
lenny=( ͡° ͜ʖ ͡°) lenny=( ͡° ͜ʖ ͡°)
make-tea-1= ☕ Boiling the water... ☕ make-tea-1= ☕ Boiling the water... ☕
make-tea-2= ☕ __1__ your tea is done! ☕ make-tea-2= ☕ __1__ your tea is done! ☕
order-pizza-1= 🍕 Finding nearest pizza supplier... 🍕
order-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕
order-pizza-3= 🍕 __1__ your pizza is here! 🍕

2
locale/sv-SE/chat-bot.cfg
View File

@@ -19,4 +19,4 @@ links=För att se länkar, öppna readme och klicka "länkar".
magic=Frukta admin-magin (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ magic=Frukta admin-magin (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
aids=≖ ‿ ≖Fear the aids of a public server ≖ ‿ ≖ aids=≖ ‿ ≖Fear the aids of a public server ≖ ‿ ≖
riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)
loops=INGA LOOPAR; LOOPAR ÄR DÅLIGT; JUST INGA LOOPAR!!!!!; OM DU GJÖR EN LOOP.... DET KOMMER INTE ATT SLUTA VÄL!!!!!!! loops=INGA LOOPAR; LOOPAR ÄR DÅLIGT; JUST INGA LOOPAR!!!!!; OM DU GJÖR EN LOOP.... DET KOMMER INTE ATT SLUTA VÄL!!!!!!!