Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Author: Treeku

ngengine_public.jar

@@ -0,0 +1,11 @@
+from resources.common import PlayerFlags
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    ghost = actor.getSlottedObject('ghost')
+    print ('Command recieved!')
+    ghost.toggleFlag(PlayerFlags.LFG)
+    return

odb/building/placeholder.txt

@@ -0,0 +1,10 @@
+from resources.common import PlayerFlags
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    ghost = actor.getSlottedObject('ghost')
+    ghost.toggleFlag(PlayerFlags.HELPER)
+    return

scripts/commands/lfg.py

@@ -0,0 +1,11 @@
+from java.lang import Integer
+from resources.common import PlayerFlags
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    ghost = actor.getSlottedObject('ghost')
+    ghost.toggleFlag(PlayerFlags.ROLEPLAYER)
+    return

scripts/commands/newbiehelper.py

@@ -0,0 +1,35 @@
+import sys
+from engine.resources.scene import Point3D
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+	
+	playerObject = actor.getSlottedObject('ghost')
+
+	if not playerObject:
+		return
+	
+	commandArgs = commandString.split(' ')
+	command = commandArgs[0]
+	if len(commandArgs) > 1:
+		arg1 = commandArgs[1]
+	if len(commandArgs) > 2:
+		arg2 = commandArgs[2]
+	if len(commandArgs) > 3:
+		arg3 = commandArgs[3]
+	if len(commandArgs) > 4:
+		arg4 = commandArgs[4]
+	
+	if not command:
+		return
+	
+	if command == 'lockServer':
+		core.setGalaxyStatus(3)
+	if command == 'unlockServer':
+		core.setGalaxyStatus(2)
+	if command == 'info':
+		actor.sendSystemMessage(str(core.getActiveZoneClients()) + ' online characters.', 0)
+
+	return

scripts/commands/roleplay.py

@@ -6,8 +6,8 @@ def setup():
 def run(core, actor, target, commandString):
 
     playerObject = actor.getSlottedObject('ghost')
-    print ("Title set to: " + commandString)
-    print ("List of Titles: " + playerObject.getTitleList().toString())
+    #print ("Title set to: " + commandString)
+    #print ("List of Titles: " + playerObject.getTitleList().toString())
     if playerObject is None:
         return
 

scripts/commands/server.py

@@ -0,0 +1,10 @@
+from resources.common import PlayerFlags
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    ghost = actor.getSlottedObject('ghost')
+    ghost.toggleFlag(PlayerFlags.AFK)
+    return

scripts/commands/setcurrentskilltitle.py

@@ -35,6 +35,8 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.mina.core.service.IoHandler;
+
+import protocol.swg.ChatSystemMessage;
 import net.engio.mbassy.bus.config.BusConfiguration;
 import resources.common.RadialOptions;
 import resources.common.ThreadMonitor;
@@ -108,6 +110,7 @@ public class NGECore {
 
 	private Config config = null;
 
+	private volatile boolean isShuttingDown = false;
 
 	private ConcurrentHashMap<Integer, Client> clients = new ConcurrentHashMap<Integer, Client>();
 
@@ -168,6 +171,8 @@ public class NGECore {
 
 	private BusConfiguration eventBusConfig = BusConfiguration.Default(1, new ThreadPoolExecutor(1, 4, 1, TimeUnit.MINUTES, new LinkedBlockingQueue<Runnable>()));
 
+	private ObjectDatabase buildingODB;
+
 
 	public NGECore() {
 
@@ -209,6 +214,7 @@ public void run() {
 
 		setGalaxyStatus(1);
 		creatureODB = new ObjectDatabase("creature", true, false, true);
+		buildingODB = new ObjectDatabase("building", true, false, true);
 		mailODB = new ObjectDatabase("mails", true, false, true);
 		guildODB = new ObjectDatabase("guild", true, false, true);
 		// Services
@@ -305,6 +311,7 @@ public void run() {
 		travelService.loadTravelPoints();
 		simulationService = new SimulationService(this);
 
+		objectService.loadBuildings();
 		terrainService.loadSnapShotObjects();
 		simulationService.insertSnapShotObjects();
 
@@ -438,6 +445,10 @@ public ObjectDatabase getGuildODB() {
 		return guildODB;
 	}
 
+	public ObjectDatabase getBuildingODB() {
+		return buildingODB;
+	}
+	
 	public int getActiveClients() {
 		int connections = 0;
 		for (Map.Entry<Integer, Client> c : clients.entrySet()) {
@@ -495,5 +506,39 @@ public BusConfiguration getEventBusConfig() {
 		return eventBusConfig;
 	}
 
+	public void initiateShutdown() {
+		if(isShuttingDown)
+			return;
+		try {
+	
+			for(int minutes = 15; minutes > 1; minutes--) {
+					simulationService.notifyAllClients(new ChatSystemMessage("The server will be shutting down soon. Please find a safe place to logout. (" + minutes + " minutes left)", (byte) 0 ).serialize());
+					Thread.sleep(60000);
+			}
+			setGalaxyStatus(3);
+			simulationService.notifyAllClients(new ChatSystemMessage("The server will be shutting down soon. Please find a safe place to logout. (" + 1 + " minutes left)", (byte) 0 ).serialize());
+			Thread.sleep(30000);
+			simulationService.notifyAllClients(new ChatSystemMessage("You will be disconnected in 30 seconds so the server can perform a final save before shutting down.  Please find a safe place to logout now.", (byte) 0 ).serialize());
+			Thread.sleep(20000);
+			simulationService.notifyAllClients(new ChatSystemMessage("You will be disconnected in 10 seconds so the server can perform a final save before shutting down.  Please find a safe place to logout now.", (byte) 0 ).serialize());
+			Thread.sleep(10000);
+			simulationService.notifyAllClients(new ChatSystemMessage("You will now be disconnected so the server can perform a final save before shutting down.", (byte) 0 ).serialize());
+			
+			synchronized(getActiveConnectionsMap()) {
+				for(Client client : getActiveConnectionsMap().values()) {
+					client.getSession().close(true);
+				}
+			}
+			
+			System.exit(0);
+			
+		} catch (InterruptedException e) {
+				e.printStackTrace();
+		}
+		
+		
+		
+	}
+	
 }