From 792257e70fa9956e83b102f4342d2acaa21ad6f2 Mon Sep 17 00:00:00 2001 From: Treeku Date: Sun, 4 May 2014 20:10:33 +0100 Subject: [PATCH] Recommitted changes --- scripts/static_spawns/{ => kaas}/kaas.py | 0 scripts/static_spawns/lok.py | 10 ---------- scripts/static_spawns/lok/lok.py | 14 ++++++++++++++ scripts/static_spawns/naboo.py | 8 -------- scripts/static_spawns/naboo/naboo.py | 11 +++++++++++ scripts/static_spawns/rori/placeholder.txt | 0 scripts/static_spawns/{rori.py => rori/restuss.py} | 0 scripts/static_spawns/rori/rori.py | 14 ++++++++++++++ scripts/static_spawns/tatooine/placeholder.txt | 0 scripts/static_spawns/{ => tatooine}/tatooine.py | 6 +++++- src/services/StaticService.java | 4 ++-- 11 files changed, 46 insertions(+), 21 deletions(-) rename scripts/static_spawns/{ => kaas}/kaas.py (100%) delete mode 100644 scripts/static_spawns/lok.py create mode 100644 scripts/static_spawns/lok/lok.py delete mode 100644 scripts/static_spawns/naboo.py create mode 100644 scripts/static_spawns/naboo/naboo.py delete mode 100644 scripts/static_spawns/rori/placeholder.txt rename scripts/static_spawns/{rori.py => rori/restuss.py} (100%) create mode 100644 scripts/static_spawns/rori/rori.py delete mode 100644 scripts/static_spawns/tatooine/placeholder.txt rename scripts/static_spawns/{ => tatooine}/tatooine.py (71%) diff --git a/scripts/static_spawns/kaas.py b/scripts/static_spawns/kaas/kaas.py similarity index 100% rename from scripts/static_spawns/kaas.py rename to scripts/static_spawns/kaas/kaas.py diff --git a/scripts/static_spawns/lok.py b/scripts/static_spawns/lok.py deleted file mode 100644 index 30c9163e..00000000 --- a/scripts/static_spawns/lok.py +++ /dev/null @@ -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 diff --git a/scripts/static_spawns/lok/lok.py b/scripts/static_spawns/lok/lok.py new file mode 100644 index 00000000..658c4a93 --- /dev/null +++ b/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 diff --git a/scripts/static_spawns/naboo.py b/scripts/static_spawns/naboo.py deleted file mode 100644 index c1072308..00000000 --- a/scripts/static_spawns/naboo.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def addPlanetSpawns(core, planet): - - stcSvc = core.staticService - #this script is no longer for NPC spawning - Levarris - - return \ No newline at end of file diff --git a/scripts/static_spawns/naboo/naboo.py b/scripts/static_spawns/naboo/naboo.py new file mode 100644 index 00000000..7b0f3034 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/static_spawns/rori/placeholder.txt b/scripts/static_spawns/rori/placeholder.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/static_spawns/rori.py b/scripts/static_spawns/rori/restuss.py similarity index 100% rename from scripts/static_spawns/rori.py rename to scripts/static_spawns/rori/restuss.py diff --git a/scripts/static_spawns/rori/rori.py b/scripts/static_spawns/rori/rori.py new file mode 100644 index 00000000..ff976d80 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/placeholder.txt b/scripts/static_spawns/tatooine/placeholder.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine/tatooine.py similarity index 71% rename from scripts/static_spawns/tatooine.py rename to scripts/static_spawns/tatooine/tatooine.py index 9e088894..9a45d308 100644 --- a/scripts/static_spawns/tatooine.py +++ b/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)) diff --git a/src/services/StaticService.java b/src/services/StaticService.java index d41c26d8..9ccaf996 100644 --- a/src/services/StaticService.java +++ b/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; }