diff --git a/.project b/.project
index 5c73c250..d1bd5e27 100644
--- a/.project
+++ b/.project
@@ -5,6 +5,11 @@
+
+ org.python.pydev.PyDevBuilder
+
+
+
org.eclipse.jdt.core.javabuilder
@@ -13,5 +18,6 @@
org.eclipse.jdt.core.javanature
+ org.python.pydev.pythonNature
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/jabbas_palace.py b/scripts/static_spawns/tatooine/jabbas_palace.py
new file mode 100644
index 00000000..35e8b46e
--- /dev/null
+++ b/scripts/static_spawns/tatooine/jabbas_palace.py
@@ -0,0 +1,80 @@
+import sys
+# Project SWG: Jabba's Palace: Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+def addPlanetSpawns(core, planet):
+
+
+ stcSvc = core.staticService
+ objSvc = core.objectService
+
+ # TODO Check all NPCs for personalized scripting, change format.
+
+ reelo = stcSvc.spawnObject('object/mobile/shared_reelo_baruk.iff', 'tatooine', long(26560), float(-3.5), float(0.2), float(113.5), float(0), float(0))
+ reelo.setCustomName2('Reelo Baruk')
+ reelo.setOptionsBitmask(264)
+
+ reeyees = stcSvc.spawnObject('object/mobile/shared_dressed_gran_thug_male_01.iff', 'tatooine', long(26560), float(5.8), float(0.2), float(115.7), float(0.70), float(-0.71))
+ reeyees.setCustomName2('Ree-Yees')
+ reeyees.setOptionsBitmask(264)
+
+ ephant = stcSvc.spawnObject('object/mobile/shared_ephant_mon.iff', 'tatooine', long(26564), float(-6.1), float(5.8), float(86.1), float(0), float(0))
+ ephant.setCustomName2('Ephant Mon')
+ ephant.setOptionsBitmask(264)
+
+ porcellus = stcSvc.spawnObject('object/mobile/shared_dressed_porcellus.iff', 'tatooine', long(26572), float(-44.0), float(3.0), float(63.4), float(0), float(0))
+ porcellus.setCustomName2('Porcellus')
+ porcellus.setOptionsBitmask(264)
+
+ barada = stcSvc.spawnObject('object/mobile/shared_barada.iff', 'tatooine', long(26596), float(31.2), float(0.2), float(-1.0), float(0.98), float(-0.17))
+ barada.setCustomName2('Barada')
+ barada.setOptionsBitmask(264)
+
+ bibMain = stcSvc.spawnObject('object/mobile/shared_bib_fortuna.iff', 'tatooine', long(26582), float(-11.1), float(2.0), float(49.5), float(0.70), float(0.71))
+ bibMain.setCustomName2('Bib Fortuna')
+ bibMain.setOptionsBitmask(264)
+
+ jabba = stcSvc.spawnObject('object/mobile/shared_jabba_the_hutt.iff', 'tatooine', long(26582), float(-17.0), float(2.8), float(44.9), float(0.70), float(0.71))
+ jabba.setCustomName2('Jabba the Hutt')
+ jabba.setOptionsBitmask(264)
+
+ oola = stcSvc.spawnObject('object/mobile/shared_oola.iff', 'tatooine', long(26582), float(-10.3), float(2.0), float(43.9), float(0.70), float(-0.71))
+ oola.setCustomName2('Oola')
+ oola.setOptionsBitmask(264)
+
+ bobaFett = stcSvc.spawnObject('object/mobile/shared_boba_fett.iff', 'tatooine', long(26582), float(-1.0), float(3.0), float(33.1), float(0), float(0))
+ bobaFett.setCustomName2('Boba Fett')
+ bobaFett.setOptionsBitmask(264)
+
+ ev9d9 = stcSvc.spawnObject('object/mobile/shared_ev_9d9.iff', 'tatooine', long(26574), float(18.8), float(0.2), float(78.7), float(1.0), float(0))
+ ev9d9.setCustomName2('EV-9D9')
+ ev9d9.setOptionsBitmask(264)
+
+ malakili = stcSvc.spawnObject('object/mobile/shared_malakili.iff', 'tatooine', long(26599), float(17.3), float(-11.0), float(43.8), float(0), float(0))
+ malakili.setCustomName2('Malakili')
+ malakili.setOptionsBitmask(264)
+
+# TODO Need to somehow get the cellID for the Rancor Pit or it will NEVER be spawned.
+
+ maxRebo = stcSvc.spawnObject('object/mobile/shared_max_rebo.iff', 'tatooine', long(26582), float(-1.4), float(3.0), float(26.9), float(0.42), float(-0.9))
+ maxRebo.setCustomName2('Max Rebo')
+ maxRebo.setOptionsBitmask(264)
+
+ droopy = stcSvc.spawnObject('object/mobile/shared_droopy_mccool.iff', 'tatooine', long(26582), float(-3.9), float(3.0), float(26.1), float(0.42), float(-0.9))
+ droopy.setCustomName2('Droopy McCool')
+ droopy.setOptionsBitmask(264)
+
+ sySnootles = stcSvc.spawnObject('object/mobile/shared_sy_snootles.iff', 'tatooine', long(26582), float(-1.4), float(3.0), float(29.8), float(0.42), float(-0.))
+ sySnootles.setCustomName2('Sy Snootles')
+ sySnootles.setOptionsBitmask(264)
+
+ g5po = stcSvc.spawnObject('object/mobile/shared_3po_protocol_droid_red.iff', 'tatooine', long(26582), float(-14.3), float(2.0), float(47.4), float(0.70), float(0.71))
+ g5po.setCustomName2('G5-PO')
+ g5po.setOptionsBitmask(264)
+ return
+
diff --git a/scripts/static_spawns/tatooine/mos_eisley.py b/scripts/static_spawns/tatooine/mos_eisley.py
new file mode 100644
index 00000000..617c248a
--- /dev/null
+++ b/scripts/static_spawns/tatooine/mos_eisley.py
@@ -0,0 +1,322 @@
+import sys
+# Project SWG: Mos Eisley: Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+def addPlanetSpawns(core, planet):
+
+
+ stcSvc = core.staticService
+ objSvc = core.objectService
+
+ # TODO Check all NPCs for personalized scripting, change format.
+
+ #Cantina Interior
+ wuher = stcSvc.spawnObject('object/mobile/shared_wuher.iff', 'tatooine', long(1082877), float(8.6), float(-0.9), float(0.4), float(0.71), float(0.71))
+ wuher.setCustomName2('Wuher')
+ wuher.setOptionsBitmask(256)
+
+ chadraFanFemale = stcSvc.spawnObject('object/mobile/shared_chadra_fan_female.iff', 'tatooine', long(1082877), float(10.6), float(-0.9), float(-1.5), float(0.42), float(0.90))
+ chadraFanFemale.setCustomName2('a Chadra Fan Female')
+ chadraFanFemale.setOptionsBitmask(256)
+
+ chadraFanMale = stcSvc.spawnObject('object/mobile/shared_chadra_fan_male.iff', 'tatooine', long(1082877), float(10.7), float(-0.9), float(-0.3), float(0.64), float(0.77))
+ chadraFanMale.setCustomName2('a Chadra Fan Male')
+ chadraFanMale.setOptionsBitmask(256)
+
+ muftak = stcSvc.spawnObject('object/mobile/shared_muftak.iff', 'tatooine', long(1082877), float(20.3), float(-0.9), float(4.9), float(0.82), float(0.57))
+ muftak.setCustomName2('Muftak')
+ muftak.setOptionsBitmask(256)
+
+ chissMale1 = stcSvc.spawnObject('object/mobile/ep3/shared_ep3_etyyy_chiss_poacher_01.iff', 'tatooine', long(1082877), float(1.7), float(-0.9), float(-5.0), float(0.71), float(0.71))
+ chissMale1.setCustomName2('a Chiss Male')
+ chissMale1.setOptionsBitmask(256)
+
+ chissMale2 = stcSvc.spawnObject('object/mobile/ep3/shared_ep3_etyyy_chiss_poacher_02.iff', 'tatooine', long(1082877), float(3.4), float(-0.9), float(-4.8), float(0), float(0))
+ chissMale2.setCustomName2('a Chiss Male')
+ chissMale2.setOptionsBitmask(256)
+
+ cantinaStorm = stcSvc.spawnObject('object/mobile/shared_stormtrooper.iff', 'tatooine', long(1082877), float(2.9), float(-0.9), float(-6.5), float(0.71), float(0.71))
+ cantinaStorm.setCustomName2('a Stormtrooper')
+ cantinaStorm.setOptionsBitmask(256)
+
+ cantinaStormL = stcSvc.spawnObject('object/mobile/shared_stormtrooper_groupleader.iff', 'tatooine', long(1082877), float(3.6), float(-0.9), float(-7.9), float(0.71), float(0.71))
+ cantinaStormL.setCustomName2('a Stormtrooper Squad Leader')
+ cantinaStormL.setOptionsBitmask(256)
+
+ figrinDan = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(3.7), float(-0.9), float(-14.4), float(0.42), float(0.91))
+ figrinDan.setCustomName2('Figrin D\'an')
+ figrinDan.setOptionsBitmask(256)
+
+ techMor = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(4.0), float(-0.9), float(-17.0), float(0.42), float(0.91))
+ techMor.setCustomName2('Tech M\'or')
+ techMor.setOptionsBitmask(256)
+
+ doikkNats = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(2.2), float(-0.9), float(-16.4), float(0.42), float(0.91))
+ doikkNats.setCustomName2('Doikk Na\'ts')
+ doikkNats.setOptionsBitmask(256)
+
+ tednDahai = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(1.3), float(-0.9), float(-15.2), float(0.42), float(0.91))
+ tednDahai.setCustomName2('Tedn Dahai')
+ tednDahai.setOptionsBitmask(256)
+
+ nalanCheel = stcSvc.spawnObject('object/mobile/tatooine_npc/shared_figrin_dan.iff', 'tatooine', long(1082880), float(0.5), float(-0.9), float(-17.1), float(0.42), float(0.91))
+ nalanCheel.setCustomName2('Nalan Cheel')
+ nalanCheel.setOptionsBitmask(256)
+
+ businessman1 = stcSvc.spawnObject('object/mobile/shared_dressed_businessman_human_male_01.iff', 'tatooine', long(1082877), float(11.0), float(-0.9), float(2.1), float(0.38), float(-0.92))
+ businessman1.setCustomName2('a Businessman')
+ businessman1.setOptionsBitmask(256)
+
+ commoner1 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_aqualish_male_01.iff', 'tatooine', long(1082877), float(10.3), float(-0.9), float(2.7), float(0.82), float(0.57))
+ commoner1.setCustomName2('a Commoner')
+ commoner1.setOptionsBitmask(256)
+
+ entertainer1 = stcSvc.spawnObject('object/mobile/shared_dressed_entertainer_trainer_twk_female_01.iff', 'tatooine', long(1082877), float(9.4), float(-0.9), float(3.9), float(0.38), float(-0.92))
+ entertainer1.setCustomName2('an Entertainer')
+ entertainer1.setOptionsBitmask(256)
+
+ noble1 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_trandoshan_male_01.iff', 'tatooine', long(1082877), float(8.6), float(-0.9), float(4.8), float(0.82), float(0.57))
+ noble1.setCustomName2('a Noble')
+ noble1.setOptionsBitmask(256)
+
+ commoner2 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_trandoshan_female_01.iff', 'tatooine', long(1082877), float(4.1), float(-0.9), float(5.7), float(1), float(0))
+ commoner2.setCustomName2('a Commoner')
+ commoner2.setOptionsBitmask(256)
+
+ commoner3 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_bothan_female_01.iff', 'tatooine', long(1082877), float(3.1), float(-0.9), float(5.9), float(1), float(0))
+ commoner3.setCustomName2('a Commoner')
+ commoner3.setOptionsBitmask(256)
+
+ commoner4 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_fat_twilek_male_01.iff', 'tatooine', long(1082877), float(1.7), float(-0.9), float(6.0), float(1), float(0))
+ commoner4.setCustomName2('a Commoner')
+ commoner4.setOptionsBitmask(256)
+
+ commoner5 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_bothan_male_01.iff', 'tatooine', long(1082877), float(-0.4), float(-0.9), float(5.9), float(1), float(0))
+ commoner5.setCustomName2('a Commoner')
+ commoner5.setOptionsBitmask(256)
+
+ commoner6 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_05.iff', 'tatooine', long(1082877), float(16.0), float(-0.9), float(4.1), float(0), float(0))
+ commoner6.setCustomName2('a Commoner')
+ commoner6.setOptionsBitmask(256)
+
+ commoner7 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_fat_zabrak_male_01.iff', 'tatooine', long(1082877), float(8.8), float(-0.9), float(-6.0), float(0.98), float(-0.22))
+ commoner7.setCustomName2('a Patron')
+ commoner7.setOptionsBitmask(256)
+
+ commoner8 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_08.iff', 'tatooine', long(1082877), float(6.8), float(-0.9), float(-6.5), float(0.98), float(-0.22))
+ commoner8.setCustomName2('a Patron')
+ commoner8.setOptionsBitmask(256)
+
+ commoner9 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_aqualish_male_09.iff', 'tatooine', long(1082877), float(1.1), float(-0.9), float(-7.7), float(0.42), float(0.91))
+ commoner9.setCustomName2('a Commoner')
+ commoner9.setOptionsBitmask(256)
+
+ commoner10 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_nikto_male_04.iff', 'tatooine', long(1082877), float(2.1), float(-0.9), float(-8.4), float(0.42), float(0.91))
+ commoner10.setCustomName2('a Commoner')
+ commoner10.setOptionsBitmask(256)
+
+ anetiaKahryn = stcSvc.spawnObject('object/mobile/shared_dressed_twk_entertainer.iff', 'tatooine', long(1082878), float(19.8), float(-0.9), float(-21), float(-0.03), float(0.99))
+ anetiaKahryn.setCustomName2('Anetia Kah\'ryn')
+ anetiaKahryn.setOptionsBitmask(256)
+
+ dravis = stcSvc.spawnObject('object/mobile/shared_space_privateer_tier1_tatooine.iff', 'tatooine', long(1082886), float(-21.7), float(-0.9), float(25.5), float(0.99), float(0.03))
+ dravis.setCustomName2('Dravis')
+ dravis.setOptionsBitmask(256)
+
+ talonKarrde = stcSvc.spawnObject('object/mobile/shared_dressed_talon_karrde.iff', 'tatooine', long(1082887), float(-25.7), float(-0.5), float(8.8), float(0.21), float(0.97))
+ talonKarrde.setCustomName2('Talon Karrde')
+ talonKarrde.setOptionsBitmask(256)
+
+ #Starport Interior
+
+ bartender1 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_nikto_male_04.iff', 'tatooine', long(1106380), float(-59.1), float(2.6), float(39.5), float(0), float(0))
+ bartender1.setCustomName2('a Bartender')
+ bartender1.setOptionsBitmask(256)
+
+ #City Hall Interior
+
+ #Lucky Despot Interior
+
+ hansolo1 = stcSvc.spawnObject('object/mobile/shared_han_solo.iff', 'tatooine', long(26949), float(32.3), float(7.0), float(1.6), float(0), float(0))
+ hansolo1.setCustomName2('Han Solo')
+ hansolo1.setOptionsBitmask(256)
+
+ #Medical Center Interior
+
+ #Theater Interior
+
+ #Miscellaneous Building Interiors
+
+ #Outside
+ businessman2 = stcSvc.spawnObject('object/mobile/shared_dressed_businessman_human_male_01.iff', 'tatooine', long(0), float(3663.3), float(4.0), float(-4738.6), float(0), float(0))
+ businessman2.setCustomName2('a Businessman')
+ businessman2.setOptionsBitmask(256)
+
+ noble2 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_human_female_01.iff', 'tatooine', long(0), float(3542.3), float(5.0), float(-4826.0), float(0.42), float(0.91))
+ noble2.setCustomName2('a Noble')
+ noble2.setOptionsBitmask(256)
+
+ commoner11 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_06.iff', 'tatooine', long(0), float(3529.1), float(5.0), float(-4900.4), float(0.42), float(0.91))
+ commoner11.setCustomName2('a Commoner')
+ commoner11.setOptionsBitmask(256)
+
+ businessman3 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_trandoshan_male_02.iff', 'tatooine', long(0), float(3595.7), float(5.0), float(-4740.1), float(0), float(0))
+ businessman3.setCustomName2('a Businessman')
+ businessman3.setOptionsBitmask(256)
+
+ jawa1 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3663.3), float(5.0), float(-4858.6), float(0), float(0))
+ jawa1.setCustomName2('a Jawa')
+ jawa1.setOptionsBitmask(256)
+
+ commoner12 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_moncal_male_01.iff', 'tatooine', long(0), float(3490.3), float(5.0), float(-4799.4), float(0), float(0))
+ commoner12.setCustomName2('a Scientist')
+ commoner12.setOptionsBitmask(256)
+
+ commoner13 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_zabrak_female_02.iff', 'tatooine', long(0), float(3559.7), float(5.0), float(-4725.9), float(0), float(0))
+ commoner13.setCustomName2('a Commoner')
+ commoner13.setOptionsBitmask(256)
+
+ commoner14 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_devaronian_male_01.iff', 'tatooine', long(0), float(3527.7), float(5.0), float(-4721.1), float(0.71), float(0.71))
+ commoner14.setCustomName2('a Commoner')
+ commoner14.setOptionsBitmask(256)
+
+ commoner15 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_aqualish_female_01.iff', 'tatooine', long(0), float(3514.9), float(5.0), float(-4737.8), float(0), float(0))
+ commoner15.setCustomName2('a Commoner')
+ commoner15.setOptionsBitmask(256)
+
+ jawa2 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3485.2), float(4.9), float(-4859.2), float(0), float(0))
+ jawa2.setCustomName2('a Jawa')
+ jawa2.setOptionsBitmask(256)
+
+ jawa3 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3465.3), float(5.0), float(-4860.1), float(0.71), float(-0.71))
+ jawa3.setCustomName2('a Jawa')
+ jawa3.setOptionsBitmask(256)
+
+ jawa4 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3486.8), float(5.0), float(-4884.7), float(0.43051), float(-0.9025))
+ jawa4.setCustomName2('a Jawa')
+ jawa4.setOptionsBitmask(256)
+
+ jawa5 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3487.1), float(5.0), float(-4886.0), float(0.95105), float(0.3090))
+ jawa5.setCustomName2('a Jawa')
+ jawa5.setOptionsBitmask(256)
+
+ jawa6 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3488.8), float(5.0), float(-4884.4), float(0.3255), float(-0.9455))
+ jawa6.setCustomName2('a Jawa')
+ jawa6.setOptionsBitmask(256)
+
+ jawa7 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3472.2), float(5.0), float(-4918.4), float(0), float(0))
+ jawa7.setCustomName2('a Jawa')
+ jawa7.setOptionsBitmask(256)
+
+ jawa8 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3471.4), float(5.0), float(-4919.5), float(0), float(0))
+ jawa8.setCustomName2('a Jawa')
+ jawa8.setOptionsBitmask(256)
+
+ jawa9 = stcSvc.spawnObject('object/mobile/shared_jawa.iff', 'tatooine', long(0), float(3470.3), float(5.0), float(-4918.7), float(0), float(0))
+ jawa9.setCustomName2('a Jawa')
+ jawa9.setOptionsBitmask(256)
+
+ bib = stcSvc.spawnObject('object/mobile/shared_bib_fortuna.iff', 'tatooine', long(0), float(3552.4), float(5.0), float(-4933.2), float(0.31730), float(-0.9483))
+ bib.setCustomName2('Bib Fortuna')
+ bib.setOptionsBitmask(256)
+
+ commoner16 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_human_male_06.iff', 'tatooine', long(0), float(3398.2), float(4.0), float(-4654.2), float(0.42), float(0.91))
+ commoner16.setCustomName2('a Commoner')
+ commoner16.setOptionsBitmask(256)
+
+ noble3 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_human_female_01.iff', 'tatooine', long(0), float(3396.3), float(4.0), float(-4774.1), float(0.42), float(0.91))
+ noble3.setCustomName2('a Noble')
+ noble3.setOptionsBitmask(256)
+
+ entertainer1 = stcSvc.spawnObject('object/mobile/shared_dressed_entertainer_trainer_twk_female_01.iff', 'tatooine', long(0), float(3305.7), float(5.6), float(-4771.7), float(0), float(0))
+ entertainer1.setCustomName2('an Entertainer')
+ entertainer1.setOptionsBitmask(256)
+
+ r3m6 = stcSvc.spawnObject('object/mobile/shared_r3.iff', 'tatooine', long(0), float(3460.1), float(4.0), float(-4898.2), float(0.38), float(-0.92))
+ r3m6.setCustomName2('R3-M6')
+ r3m6.setOptionsBitmask(256)
+
+ eg1 = stcSvc.spawnObject('object/mobile/shared_eg6_power_droid.iff', 'tatooine', long(0), float(3463.8), float(4.0), float(-4882.6), float(-0.38), float(0.92))
+ eg1.setCustomName2('an EG-6 Power Droid')
+ eg1.setOptionsBitmask(256)
+
+ commoner17 = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_naboo_zabrak_female_02.iff', 'tatooine', long(0), float(3452.6), float(4.0), float(-4937.1), float(0), float(0))
+ commoner17.setCustomName2('a Commoner')
+ commoner17.setOptionsBitmask(256)
+
+ lifter1 = stcSvc.spawnObject('object/mobile/shared_cll8_binary_load_lifter.iff', 'tatooine', long(0), float(3547), float(5.0), float(-4768.9), float(0), float(0))
+ lifter1.setCustomName2('a CLL-8 Binary Load Lifter')
+ lifter1.setOptionsBitmask(256)
+
+ r3j7 = stcSvc.spawnObject('object/mobile/shared_r3.iff', 'tatooine', long(0), float(3311.1), float(4.0), float(-4820.2), float(0.38), float(-0.92))
+ r3j7.setCustomName2('R3-J7')
+ r3j7.setOptionsBitmask(256)
+
+ noble4 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_human_female_03.iff', 'tatooine', long(0), float(3255.3), float(4.0), float(-4848.1), float(0.42), float(0.91))
+ noble4.setCustomName2('a Noble')
+ noble4.setOptionsBitmask(256)
+
+ byxlePedette = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_opening_byxle.iff', 'tatooine', long(0), float(3365), float(5), float(-4639), float(0.99), float(0.12))
+ byxlePedette.setCustomName2('Byxle Pedette')
+ byxlePedette.setOptionsBitmask(256)
+
+ errikDarksider = stcSvc.spawnObject('object/mobile/shared_dressed_herald_tatooine_01.iff', 'tatooine', long(0), float(3381), float(4.6), float(-4498), float(0.91), float(0.40))
+ errikDarksider.setCustomName2('Errik Darksider')
+ errikDarksider.setOptionsBitmask(256)
+
+ gendra = stcSvc.spawnObject('object/mobile/shared_dressed_gendra.iff', 'tatooine', long(0), float(3308), float(5.6), float(-4785), float(0.84), float(0.53))
+ gendra.setCustomName2('Gendra')
+ gendra.setOptionsBitmask(256)
+
+ lurval = stcSvc.spawnObject('object/mobile/shared_lurval.iff', 'tatooine', long(0), float(3387), float(5), float(-4791), float(-0.4), float(0.91))
+ lurval.setCustomName2('Lurval')
+ lurval.setOptionsBitmask(256)
+
+ matildaCarson = stcSvc.spawnObject('object/mobile/shared_dressed_noble_human_female_02.iff', 'tatooine', long(0), float(3490.2), float(5), float(-4778), float(0.87), float(0.48))
+ matildaCarson.setCustomName2('Matilda Carson')
+ matildaCarson.setOptionsBitmask(256)
+
+ vanvi = stcSvc.spawnObject('object/mobile/shared_dressed_bestine_artist01.iff', 'tatooine', long(0), float(3312), float(5), float(-4655), float(0.95), float(-0.28))
+ vanvi.setCustomName2('Vanvi Hotn')
+ vanvi.setOptionsBitmask(256)
+
+ #Eisley Legacy Quest NPCs
+
+ vourk = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_opening_santos.iff', 'tatooine', long(0), float(3520.0), float(5.0), float(-4821.0), float(0.42), float(0.91))
+ vourk.setCustomName2('Vourk Ver\'Zremp')
+ vourk.setOptionsBitmask(256)
+
+ mayor = stcSvc.spawnObject('object/mobile/shared_dressed_mayor_mikdanyell_guhrantt.iff', 'tatooine', long(1279960), float(1.2), float(2.5), float(5.4), float(0), float(0))
+ mayor.setCustomName2('Mayor Mikdanyell Guh\'rantt')
+ mayor.setOptionsBitmask(256)
+
+ enthaKandela = stcSvc.spawnObject('object/mobile/shared_dressed_entha_kandela.iff', 'tatooine', long(0), float(3511), float(5.0), float(-4785), float(0.70), float(0.71))
+ enthaKandela.setCustomName2('Entha Kandela')
+ enthaKandela.setOptionsBitmask(256)
+
+ purvis = stcSvc.spawnObject('object/mobile/shared_dressed_purvis_arrison.iff', 'tatooine', long(0), float(3512.4), float(5.0), float(-4764.9), float(0.38), float(-0.92))
+ purvis.setCustomName2('Purvis Arrison')
+ purvis.setOptionsBitmask(256)
+
+ peawpRdawc = stcSvc.spawnObject('object/mobile/shared_peawp_bodyguard_trainer.iff', 'tatooine', long(1189639), float(-11.8), float(1.1), float(-10.1), float(0), float(0))
+ peawpRdawc.setCustomName2('Peawp R\'dawc')
+ peawpRdawc.setOptionsBitmask(256)
+
+ nikoBrehe = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_opening_niko.iff', 'tatooine', long(0), float(3506.7), float(5.0), float(-4795.8), float(0.70), float(0.71))
+ nikoBrehe.setCustomName2('Niko Brehe')
+ nikoBrehe.setOptionsBitmask(256)
+
+ dunir = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_opening_dunir.iff', 'tatooine', long(0), float(3520.7), float(5.0), float(-4683.7), float(0.99), float(-0.08))
+ dunir.setCustomName2('Dunir')
+ dunir.setOptionsBitmask(256)
+
+ #Eisley Ship Controller
+ stcSvc.spawnObject('object/mobile/shared_distant_ship_controller.iff', 'tatooine', long(0), float(3542.3), float(5.0), float(-4826.0), float(0.42), float(0.91))
+
+ return
+
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 85%
rename from scripts/static_spawns/tatooine.py
rename to scripts/static_spawns/tatooine/tatooine.py
index 1ce34894..429116bd 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 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
+########################################################
stcSvc = core.staticService
# Objects
diff --git a/src/services/StaticService.java b/src/services/StaticService.java
index d41c26d8..3479748d 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");
+ System.err.println("StaticService: Cell not found for: " + template);
return object;
}