PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 15:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #226 from Fate-JH/re-silo

Browse source 
Anguta's NTU Silo
This commit is contained in:
Fate-JH 2018-07-30 09:43:58 -04:00 • committed by GitHub
commit 2f0629d83a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pslogin/src/main/scala/Maps.scala
View file

@ -1250,6 +1250,7 @@ object Maps {
LocalObject(2050, Terminal.Constructor(repair_silo)) //rearm terminal A LocalObject(2050, Terminal.Constructor(repair_silo)) //rearm terminal A
LocalObject(2061, ProximityTerminal.Constructor(repair_silo)) //repair terminal B LocalObject(2061, ProximityTerminal.Constructor(repair_silo)) //repair terminal B
LocalObject(2062, Terminal.Constructor(repair_silo)) //rearm terminal B LocalObject(2062, Terminal.Constructor(repair_silo)) //rearm terminal B
LocalObject(2094, ResourceSilo.Constructor)
LocalObject(2239, Terminal.Constructor(spawn_terminal)) LocalObject(2239, Terminal.Constructor(spawn_terminal))
LocalObject(2244, Terminal.Constructor(spawn_terminal)) LocalObject(2244, Terminal.Constructor(spawn_terminal))
LocalObject(2245, Terminal.Constructor(spawn_terminal)) LocalObject(2245, Terminal.Constructor(spawn_terminal))
@ -1371,6 +1372,7 @@ object Maps {
ObjectToBuilding(2050, 2) ObjectToBuilding(2050, 2)
ObjectToBuilding(2061, 2) ObjectToBuilding(2061, 2)
ObjectToBuilding(2062, 2) ObjectToBuilding(2062, 2)
ObjectToBuilding(2094, 2)
ObjectToBuilding(2145, 2) ObjectToBuilding(2145, 2)
ObjectToBuilding(2146, 2) ObjectToBuilding(2146, 2)
ObjectToBuilding(2147, 2) ObjectToBuilding(2147, 2)

9
pslogin/src/main/scala/PsLogin.scala
View file

@ -151,8 +151,13 @@ object PsLogin {
sys.exit(1) sys.exit(1)
} }
// TODO: pluralize "processors" val procNum = Runtime.getRuntime.availableProcessors()
logger.info(s"Detected ${Runtime.getRuntime.availableProcessors()} available logical processors") logger.info(if(procNum == 1) {
"Detected 1 available logical processor"
}
else {
s"Detected $procNum available logical processors"
})
logger.info("Starting actor subsystems...") logger.info("Starting actor subsystems...")
/** Make sure we capture Akka messages (but only INFO and above) /** Make sure we capture Akka messages (but only INFO and above)