Recommitted changes

scripts/static_spawns/lok.py

@@ -1,10 +0,0 @@
-
-import sys
-from resources.datatables import Options
-from resources.datatables import StateStatus
-
-def addPlanetSpawns(core, planet):
-#This Script is no longer to be used for NPC Scripting.   - Levarris
-
-	
-	return	

scripts/static_spawns/lok/lok.py

@@ -0,0 +1,14 @@
+
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+def addPlanetSpawns(core, planet):
+########################################################	
+# DO NOT ADD ANYTHING ELSE TO THIS SCRIPT, PLEASE USE THE
+# SUBFOLDERS FOR EACH PLANET AND CREATE NEW SCRIPTS FOR
+# EACH AREA OF A PLANET.  - LEVARRIS	
+########################################################	
+
+	
+	return	

scripts/static_spawns/naboo.py

@@ -1,8 +0,0 @@
-import sys
-
-def addPlanetSpawns(core, planet):
-
-	stcSvc = core.staticService
-	#this script is no longer for NPC spawning - Levarris
-	
-	return

scripts/static_spawns/naboo/naboo.py

@@ -0,0 +1,11 @@
+import sys
+
+def addPlanetSpawns(core, planet):
+
+	stcSvc = core.staticService
+########################################################	
+# DO NOT ADD ANYTHING ELSE TO THIS SCRIPT, PLEASE USE THE
+# SUBFOLDERS FOR EACH PLANET AND CREATE NEW SCRIPTS FOR
+# EACH AREA OF A PLANET.  - LEVARRIS	
+	
+	return

scripts/static_spawns/rori/rori.py

@@ -0,0 +1,14 @@
+import sys
+
+def addPlanetSpawns(core, planet):
+
+	stcSvc = core.staticService	
+	
+########################################################	
+# DO NOT ADD ANYTHING ELSE TO THIS SCRIPT, PLEASE USE THE
+# SUBFOLDERS FOR EACH PLANET AND CREATE NEW SCRIPTS FOR
+# EACH AREA OF A PLANET.  - LEVARRIS	
+########################################################	
+
+	
+	return

scripts/static_spawns/tatooine/tatooine.py

@@ -3,7 +3,11 @@ from resources.datatables import Options
 from resources.datatables import State
 
 def addPlanetSpawns(core, planet):
-	
+########################################################	
+# DO NOT ADD ANYTHING ELSE TO THIS SCRIPT, PLEASE USE THE
+# SUBFOLDERS FOR EACH PLANET AND CREATE NEW SCRIPTS FOR
+# EACH AREA OF A PLANET.  - LEVARRIS	
+########################################################	
 	stcSvc = core.staticService
 	# Blue Frog: Uncomment only when needed for testing.
 	stcSvc.spawnObject('object/tangible/terminal/shared_terminal_character_builder.iff', 'tatooine', long(0), float(3525), float(4), float(-4801), float(0.70), float(0.71))

src/services/StaticService.java

@@ -87,7 +87,7 @@ public class StaticService implements INetworkDispatch {
 			}
 			
 			if (FileUtilities.doesFileExist("scripts/static_spawns/" + planet.getName() + ".py")) {
-				core.scriptService.callScript("scripts/static_spawns/", planet.getName(), "addPlanetSpawns", core, planet);
+				//core.scriptService.callScript("scripts/static_spawns/", planet.getName(), "addPlanetSpawns", core, planet);
 			}
 			
 			System.out.println("Loaded static objects for " + planet.getName());
@@ -168,7 +168,7 @@ public class StaticService implements INetworkDispatch {
 			}
 		} else {
 			if (cell == null) {
-				System.err.println("StaticService: Cell not found");
+				System.err.println("StaticService: Cell not found for: " + template);
 				return object;
 			}