From 41498ca6119fbc782ccc823e099178a2664550eb Mon Sep 17 00:00:00 2001 From: Treeku Date: Sun, 4 May 2014 20:04:41 +0100 Subject: [PATCH] Reverted .project commit --- .project | 6 ------ 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/restuss.py => rori.py} | 0 scripts/static_spawns/rori/placeholder.txt | 0 scripts/static_spawns/rori/rori.py | 14 -------------- scripts/static_spawns/{tatooine => }/tatooine.py | 6 +----- scripts/static_spawns/tatooine/placeholder.txt | 0 src/services/StaticService.java | 2 +- 12 files changed, 20 insertions(+), 51 deletions(-) rename scripts/static_spawns/{kaas => }/kaas.py (100%) create mode 100644 scripts/static_spawns/lok.py delete mode 100644 scripts/static_spawns/lok/lok.py create mode 100644 scripts/static_spawns/naboo.py delete mode 100644 scripts/static_spawns/naboo/naboo.py rename scripts/static_spawns/{rori/restuss.py => rori.py} (100%) create mode 100644 scripts/static_spawns/rori/placeholder.txt delete mode 100644 scripts/static_spawns/rori/rori.py rename scripts/static_spawns/{tatooine => }/tatooine.py (71%) create mode 100644 scripts/static_spawns/tatooine/placeholder.txt diff --git a/.project b/.project index d1bd5e27..5c73c250 100644 --- a/.project +++ b/.project @@ -5,11 +5,6 @@ - - org.python.pydev.PyDevBuilder - - - org.eclipse.jdt.core.javabuilder @@ -18,6 +13,5 @@ org.eclipse.jdt.core.javanature - org.python.pydev.pythonNature diff --git a/scripts/static_spawns/kaas/kaas.py b/scripts/static_spawns/kaas.py similarity index 100% rename from scripts/static_spawns/kaas/kaas.py rename to scripts/static_spawns/kaas.py diff --git a/scripts/static_spawns/lok.py b/scripts/static_spawns/lok.py new file mode 100644 index 00000000..30c9163e --- /dev/null +++ b/scripts/static_spawns/lok.py @@ -0,0 +1,10 @@ + +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 deleted file mode 100644 index 658c4a93..00000000 --- a/scripts/static_spawns/lok/lok.py +++ /dev/null @@ -1,14 +0,0 @@ - -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 new file mode 100644 index 00000000..c1072308 --- /dev/null +++ b/scripts/static_spawns/naboo.py @@ -0,0 +1,8 @@ +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 deleted file mode 100644 index 7b0f3034..00000000 --- a/scripts/static_spawns/naboo/naboo.py +++ /dev/null @@ -1,11 +0,0 @@ -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/restuss.py b/scripts/static_spawns/rori.py similarity index 100% rename from scripts/static_spawns/rori/restuss.py rename to scripts/static_spawns/rori.py diff --git a/scripts/static_spawns/rori/placeholder.txt b/scripts/static_spawns/rori/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/scripts/static_spawns/rori/rori.py b/scripts/static_spawns/rori/rori.py deleted file mode 100644 index ff976d80..00000000 --- a/scripts/static_spawns/rori/rori.py +++ /dev/null @@ -1,14 +0,0 @@ -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/tatooine.py b/scripts/static_spawns/tatooine.py similarity index 71% rename from scripts/static_spawns/tatooine/tatooine.py rename to scripts/static_spawns/tatooine.py index 9a45d308..9e088894 100644 --- a/scripts/static_spawns/tatooine/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -3,11 +3,7 @@ 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/scripts/static_spawns/tatooine/placeholder.txt b/scripts/static_spawns/tatooine/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/services/StaticService.java b/src/services/StaticService.java index 3479748d..d41c26d8 100644 --- a/src/services/StaticService.java +++ b/src/services/StaticService.java @@ -168,7 +168,7 @@ public class StaticService implements INetworkDispatch { } } else { if (cell == null) { - System.err.println("StaticService: Cell not found for: " + template); + System.err.println("StaticService: Cell not found"); return object; }