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

2026-10-16 06:13:45 -04:00 · 2014-07-15 20:51:09 -05:00
parent 5701c9e770 e5cc06708d
commit 4131b1f6af
126 changed files with 1311 additions and 261 deletions
@@ -1,12 +1,20 @@
 import sys

 def setup():
-    return
-    
+	return
+	
 def run(core, actor, target, commandString):

-    commandArgs = commandString.split("(^-,=+_)color_13548(,+-=_^)=1")
-    newString = commandArgs[0]
+	commandArgs = commandString.split(' ')
+	newString = None
+	# removes the strange varying color arguments the client sends to server
+	for arg in commandArgs:
+		if 'color' not in arg:
+			if newString is None:
+				newString = arg
+			else:
+				newString = newString + ' ' + arg
 	
-    core.commandService.callCommand(actor, 'waypoint', None, newString)
-    return
+
+	core.commandService.callCommand(actor, 'waypoint', None, newString)
+	return
@@ -31,19 +31,10 @@ def startConversation(core, actor, npc):
 			cloningFee = 5000
 			
 		convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/clone_droid:s_6", int(cloningFee)))
-		prose1 = ProsePackage('conversation/clone_droid', 's_8')
-		outOfBand2 = OutOfBand()
-		outOfBand2.addProsePackage(prose1)
-		prose2 = ProsePackage('conversation/clone_droid', 's_12')
-		outOfBand3 = OutOfBand()
-		outOfBand3.addProsePackage(prose2)
-		option1 = ConversationOption(outOfBand2, 0)
-		option2 = ConversationOption(outOfBand3, 1)
-
 		
 		options = Vector()
-		options.add(option1)
-		options.add(option2)
+		options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/clone_droid:s_8'), 0))
+		options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/clone_droid:s_12'), 1))

 		convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen)
 		return
@@ -56,18 +47,11 @@ def handleFirstScreen(core, actor, npc, selection):
 	
 	convSvc = core.conversationService
 	if selection == 0:
-		prose = ProsePackage('conversation/clone_droid', 's_10')
-		outOfBand = OutOfBand()
-		outOfBand.addProsePackage(prose)
-		convSvc.sendConversationMessage(actor, npc, outOfBand)
-		prose2 = ProsePackage('conversation/clone_droid', 's_12')
-		outOfBand2 = OutOfBand()
-		outOfBand2.addProsePackage(prose2)
-		option1 = ConversationOption(outOfBand2, 0)

-		
+		convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/clone_droid:s_10'))
+
 		options = Vector()
-		options.add(option1)
+		options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/clone_droid:s_12'), 1))

 		convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen)
 		
@@ -0,0 +1,43 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from resources.datatables import FactionStatus
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('imperial_recruiter')
+	mobileTemplate.setLevel(1)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE)
+	mobileTemplate.setConversationFileName('imp_recruiter')
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_imperial_officer_f.iff')
+	templates.add('object/mobile/shared_dressed_imperial_officer_m.iff')
+	templates.add('object/mobile/shared_dressed_imperial_officer_m_2.iff')
+	templates.add('object/mobile/shared_dressed_imperial_officer_m_3.iff')
+	templates.add('object/mobile/shared_dressed_imperial_officer_m_4.iff')
+	templates.add('object/mobile/shared_dressed_imperial_officer_m_5.iff')
+	templates.add('object/mobile/shared_dressed_imperial_officer_m_6.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 0, 'kinetic')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('meleeHit')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('imperial_recruiter', mobileTemplate)
+	return
@@ -0,0 +1,40 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from resources.datatables import FactionStatus
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('rebel_recruiter')
+	mobileTemplate.setLevel(1)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE)
+	mobileTemplate.setConversationFileName('reb_recruiter')
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_rebel_recruiter_human_female_01.iff')
+	templates.add('object/mobile/shared_dressed_rebel_recruiter_human_female_02.iff')
+	templates.add('object/mobile/shared_dressed_rebel_recruiter_moncal_male_01.iff')
+	templates.add('object/mobile/shared_dressed_rebel_recruiter_twilek_female_01.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 0, 'kinetic')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('meleeHit')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('rebel_recruiter', mobileTemplate)
+	return
@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('jabbas_palace_arkahn_greystar')
+	mobileTemplate.setLevel(18)
+	mobileTemplate.setDifficulty(Difficulty.ELITE)
+
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("jabba")
+	mobileTemplate.setAssistRange(6)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+
+	templates.add('object/mobile/shared_arkahn_greystar.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+		
+	core.spawnService.addMobileTemplate('jabbas_palace_arkahn_greystar', mobileTemplate)
+	return
@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('jabbas_palace_careem')
+	mobileTemplate.setLevel(18)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("jabba")
+	mobileTemplate.setAssistRange(6)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+
+	templates.add('object/mobile/shared_careem.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+		
+	core.spawnService.addMobileTemplate('jabbas_palace_careem', mobileTemplate)
+	return
@@ -0,0 +1,38 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('jabbas_palace_delrice_capreese')
+	mobileTemplate.setLevel(17)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("jabba")
+	mobileTemplate.setAssistRange(6)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_ithorian_male.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('jabbas_palace_delrice_capreese', mobileTemplate)
+	return
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("wayfar spy")
 	mobileTemplate.setAssistRange(3)
 	mobileTemplate.setStalker(False)
-	#mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	
 	templates = Vector()
@@ -11,7 +11,7 @@ def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
 	mobileTemplate.setCreatureName('dwarf_bantha')
-	mobileTemplate.setLevel(10)
+	mobileTemplate.setLevel(18)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)

 	mobileTemplate.setMinSpawnDistance(4)
@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('jabbas_palace_emanon')
+	mobileTemplate.setLevel(18)
+	mobileTemplate.setDifficulty(Difficulty.ELITE)
+
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("jabba")
+	mobileTemplate.setAssistRange(6)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+
+	templates.add('object/mobile/shared_emanon.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+		
+	core.spawnService.addMobileTemplate('jabbas_palace_emanon', mobileTemplate)
+	return
@@ -21,9 +21,11 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("sennex")
 	mobileTemplate.setAssistRange(10)
 	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_dressed_trader_thug_male_human_01.iff')
+	templates.add('object/mobile/shared_dressed_trader_thug_male_human_01.iff') #need to find correct template
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('jabbas_palace_fnast_drexler')
+	mobileTemplate.setLevel(18)
+	mobileTemplate.setDifficulty(Difficulty.ELITE)
+
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("jabba")
+	mobileTemplate.setAssistRange(6)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+
+	templates.add('object/mobile/shared_fnast_drexler.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('jabbas_palace_fnast_drexler', mobileTemplate)
+	return
@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('jabbas_palace_iris_sinclair')
+	mobileTemplate.setLevel(18)
+	mobileTemplate.setDifficulty(Difficulty.ELITE)
+
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("jabba")
+	mobileTemplate.setAssistRange(6)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+
+	templates.add('object/mobile/shared_iris_sinclair.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+		
+	core.spawnService.addMobileTemplate('jabbas_palace_iris_sinclair', mobileTemplate)
+	return
@@ -0,0 +1,46 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('tatooine_romo_vax_henchman')
+	mobileTemplate.setLevel(20)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("sennex")
+	mobileTemplate.setAssistRange(10)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	templates = Vector()  #need to find correct template
+	templates.add('object/mobile/shared_dressed_trader_thug_female_human_01.iff')
+	templates.add('object/mobile/shared_dressed_trader_thug_female_human_02.iff')
+	templates.add('object/mobile/shared_dressed_trader_thug_female_human_03.iff')
+	templates.add('object/mobile/shared_dressed_trader_thug_female_twk_01.iff')
+	templates.add('object/mobile/shared_dressed_trader_thug_female_twk_02.iff')
+	templates.add('object/mobile/shared_dressed_trader_thug_male_human_02.iff')
+	templates.add('object/mobile/shared_dressed_trader_thug_male_human_03.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShot')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('romovax_henchman', mobileTemplate)
+	return
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(False)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(False)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(False)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -23,7 +23,6 @@ def addTemplate(core):
 	mobileTemplate.setStalker(False)
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)	
 	
-	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
 	mobileTemplate.setTemplates(templates)
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(False)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(False)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,6 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(4)
 	mobileTemplate.setStalker(True)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(4)
 	mobileTemplate.setStalker(False)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,6 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(4)
 	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,6 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(4)
 	mobileTemplate.setStalker(True)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,6 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(4)
 	mobileTemplate.setStalker(True)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(4)
 	mobileTemplate.setStalker(False)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')
@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('jabbas_palace_tyrok')
+	mobileTemplate.setLevel(17)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("jabba")
+	mobileTemplate.setAssistRange(6)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+
+	templates.add('object/mobile/shared_trandoshan_male.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+		
+	core.spawnService.addMobileTemplate('jabbas_palace_tyrok', mobileTemplate)
+	return
@@ -0,0 +1,56 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('tatooine_valarian_vandal')
+	mobileTemplate.setLevel(15)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("valarian")
+	mobileTemplate.setAssistRange(4)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_female_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_male_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_bothan_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_bothan_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_female_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_male_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_rodian_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_rodian_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_trandoshan_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_trandoshan_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_zabrak_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_zabrak_male_01.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('tatooine_valarian_vandal', mobileTemplate)
+	return
@@ -0,0 +1,41 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('tatooine_valarian_enforcer')
+	mobileTemplate.setLevel(15)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("valarian")
+	mobileTemplate.setAssistRange(4)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_criminal_thug_trandoshan_male_01.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('tatooine_valarian_enforcer', mobileTemplate)
+	return
@@ -0,0 +1,42 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('tatooine_valarian_executioner')
+	mobileTemplate.setLevel(15)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("valarian")
+	mobileTemplate.setAssistRange(4)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_noble_naboo_twilek_female_01.iff')
+	templates.add('object/mobile/shared_dressed_noble_naboo_twilek_female_02.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('tatooine_valarian_executioner', mobileTemplate)
+	return
@@ -0,0 +1,56 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('tatooine_valarian_hacker')
+	mobileTemplate.setLevel(19)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("valarian_hacker")
+	mobileTemplate.setAssistRange(4)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_female_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_male_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_bothan_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_bothan_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_female_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_male_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_rodian_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_rodian_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_trandoshan_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_trandoshan_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_zabrak_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_zabrak_male_01.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShotpistol')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('valarian_hacker', mobileTemplate)
+	return
@@ -21,20 +21,26 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("wayfar spy")
 	mobileTemplate.setAssistRange(3)
 	mobileTemplate.setStalker(False)
-	#mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_moncal_male.iff')
-	templates.add('object/mobile/shared_moncal_female.iff')
-	templates.add('object/mobile/shared_rodian_male.iff')
-	templates.add('object/mobile/shared_rofian_female.iff')
-	templates.add('object/mobile/shared_zabrak_male.iff')
-	templates.add('object/mobile/shared_zabrak_female.iff')
-	templates.add('object/mobile/shared_human_male.iff')
-	templates.add('object/mobile/shared_human_female.iff')
-	templates.add('object/mobile/shared_sullustan_male.iff')
-	templates.add('object/mobile/shared_sullustan_female.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_female_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_aqualish_male_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_bothan_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_bothan_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_female_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_human_male_02.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_rodian_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_rodian_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_trandoshan_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_trandoshan_male_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_zabrak_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_thug_zabrak_male_01.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -6,6 +6,8 @@ def setup(core, object):
 	objSvc = core.objectService
 	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_cloning.iff', float(1), float(-0.05), float(2.5), float(0), float(1), 2)
 	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_cloning.iff', float(1), float(-0.05), float(-1.35), float(1), float(0), 2)
+	
+	objSvc.createChildObject(object, 'object/mobile/shared_21b_surgical_droid.iff', float(-3.2), float(0.1), float(0.6), float(0), float(0), 2)

 	spawnPoints = Vector()
 	spawnPoints.add(SpawnPoint(-16.6514, -4.29167, -10.4976, 0.709453, 0.704753, 4))
@@ -7,6 +7,8 @@ def setup(core, object):
 	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_cloning.iff', float(1), float(-0.05), float(2.5), float(0), float(1), 2)
 	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_cloning.iff', float(1), float(-0.05), float(-1.35), float(1), float(0), 2)

+	objSvc.createChildObject(object, 'object/mobile/shared_21b_surgical_droid.iff', float(-3.2), float(0.1), float(0.6), float(0), float(0), 2)
+
 	spawnPoints = Vector()
 	spawnPoints.add(SpawnPoint(-16.66, -4.29, -10.50, 0.71, 0.70, 4))
 	spawnPoints.add(SpawnPoint(-16.60, -4.29, -14.17, 0.72, 0.69, 4))
@@ -7,6 +7,8 @@ def setup(core, object):
 	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_cloning.iff', float(1), float(-0.05), float(2.5), float(0), float(1), 2)
 	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_cloning.iff', float(1), float(-0.05), float(-1.35), float(1), float(0), 2)
 	
+	objSvc.createChildObject(object, 'object/mobile/shared_21b_surgical_droid.iff', float(-3.2), float(0.1), float(0.6), float(0), float(0), 2)
+		
 	spawnPoints = Vector()
 	spawnPoints.add(SpawnPoint(-16.6514, -4.29167, -10.4976, 0.709453, 0.704753, 4))
 	spawnPoints.add(SpawnPoint(-16.5965, -4.29167, -14.1652, 0.721346, 0.692575, 4))
@@ -6,6 +6,8 @@ def setup(core, object):
 	objSvc = core.objectService
 	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_cloning.iff', float(-0.42), float(-0.38), float(-0.4), float(1), float(0), 10)
 		
+	objSvc.createChildObject(object, 'object/mobile/shared_21b_surgical_droid.iff', float(3.8), float(0.3), float(5.1), float(0), float(0), 1)
+	
 	spawnPoints = Vector()
 	spawnPoints.add(SpawnPoint(0.445015, 0.271775, 1.39199, 0.707038, 0.707176, 9))
 		
@@ -6,6 +6,6 @@ def setup(core, object):
 	object.setAttachment('conversationFile','medical_cloning_droid')
 	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
 	object.setStfFilename('mob/creature_names')
-	object.setStfName('surgical_droid')
+	object.setStfName('surgical_droid_21b')
 	return
 	
@@ -1,12 +1,6 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
+
@@ -1,4 +1,5 @@
 import sys

 def setup(core, object):
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','reb_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('rebel_recruiter')
-	
 	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
 	return
@@ -1,13 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','reb_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('rebel_recruiter')
-	
 	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
-		
 	return
@@ -1,13 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','reb_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('rebel_recruiter')	
-	
 	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
-	
 	return
@@ -1,13 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','reb_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('rebel_recruiter')
-	
 	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
-	
 	return
@@ -4,6 +4,6 @@ def setup(core, object):
 	object.setStringAttribute('condition', '100/100')
 	object.setStringAttribute('@obj_attr_n:color', 'Lava')
 	object.setAttachment('radial_filename', 'item/tunable')
-	object.setStringAttribute('@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ')
+	object.setStringAttribute('@obj_attr_n:crystal_owner', '\\#D1F56F UNTUNED \\#FFFFFF ')
 	return
 	
@@ -14,4 +14,4 @@ def setup(core, object):
 	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 1640)
 	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 1640)
 	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 1640)
-	return	
+	return	
@@ -11,20 +11,23 @@ def addPlanetSpawns(core, planet):
 	
 	stcSvc = core.staticService
 	objSvc = core.objectService
+	
+#Imperial Recruiters
+	
 	#Imp recruiter Eisley
 	smallImpHouse = core.objectService.getObject(long(1280129))
-	stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_f.iff', 'tatooine', smallImpHouse.getCellByCellNumber(3), float(-6), float(1), float(9.2), float(0.71), float(0), float(0.70), float(0))	
+	stcSvc.spawnObject('imperial_recruiter', 'tatooine', smallImpHouse.getCellByCellNumber(3), float(-6), float(1), float(9.2), float(0.71), float(0), float(0.70), float(0))	

 	#Imp recruiter Bestine
 	#Hill
-	stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_5.iff', 'tatooine', long(0), float(-1138), float(98), float(-3897), float(0.71), float(0), float(0.70), float(0))
+	stcSvc.spawnObject('imperial_recruiter', 'tatooine', long(0), float(-1138), float(98), float(-3897), float(0.71), float(0), float(0.70), float(0))
 	#outside SP
-	stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_3.iff', 'tatooine', long(0), float(-1275), float(12), float(-3594), float(0), float(0), float(0), float(0))	
+	stcSvc.spawnObject('imperial_recruiter', 'tatooine', long(0), float(-1275), float(12), float(-3594), float(0), float(0), float(0), float(0))	

-	# Reb Recruiter
+#Rebel Recruiters
 	
 	#Anchorhead cantina
 	anchCantina = core.objectService.getObject(long(1213343)) 
-	stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_01.iff', 'tatooine', anchCantina.getCellByCellNumber(2), float(-2.2), float(0.4), float(-5.4), float(0), float(0), float(0), float(0))		
-
+	stcSvc.spawnObject('rebel_recruiter', 'tatooine', anchCantina.getCellByCellNumber(6), float(-6.1), float(-1.8), float(-6.2), float(0), float(0), float(0), float(-90))		
+	
 	return
@@ -0,0 +1,30 @@
+import sys
+# Project SWG: Great Sarlacc:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+
+	
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6098), float(25.2), float(-3337), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6087.4), float(22.3), float(-3327), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6105), float(22.6), float(-3329.2), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6116.1), float(22.1), float(-3313.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6088.1), float(21.1), float(-3301.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6059), float(22.3), float(-3300.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6057.7), float(25.4), float(-3285.5), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6094.6), float(24.6), float(-3282.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jundland_eopie', 'tatooine', long(0), float(-6122.7), float(24.6), float(-3299.3), float(0), float(0), float(0), float(0), 45)
+	return
+	
+	
@@ -0,0 +1,48 @@
+import sys
+# Project SWG:   Jabba TP Romo Vax Bunker:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+		
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', long(0), float(-5079.1), float(47.9), float(-6970.5), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', long(0), float(-5063.5), float(49.2), float(-6998.4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', long(0), float(-5051.8), float(45.7), float(-6989.7), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', long(0), float(-5030.7), float(46.5), float(-6972.5), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', long(0), float(-5019), float(48.3), float(-6946.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', long(0), float(-5045.8), float(42.6), float(-6936), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', long(0), float(-5053.7), float(43.6), float(-6961.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', long(0), float(-5057.5), float(43.9), float(-6961.5), float(0), float(0), float(0), float(0), 45)
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+	bunker = core.objectService.getObject(long(-466404037494797872))
+	
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(2), float(-3.8), float(0.3), float(2.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(3), float(3.6), float(0.3), float(-3.7), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(5), float(29.8), float(-12), float(25.4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(5), float(32.7), float(-12), float(35), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(5), float(22.9), float(-12), float(30.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(4), float(3.9), float(-12), float(21), float(0), float(0), float(0), float(0), 45)	
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(4), float(3.9), float(-12), float(38.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(6), float(3.5), float(-16), float(53), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(8), float(58.8), float(-16), float(61), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(8), float(74.4), float(-16), float(66.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(8), float(68.3), float(-16), float(79.2), float(0), float(0), float(0), float(0), 45)	
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(8), float(44.6), float(-16), float(82.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(7), float(26), float(-16), float(79), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(7), float(6.9), float(-16), float(78.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(7), float(-5.2), float(-16), float(77.5), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(7), float(-19.9), float(-16), float(78.8), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(9), float(32.4), float(-14), float(78.7), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('fighting_romo_vax', 'tatooine', bunker.getCellByCellNumber(9), float(-42.7), float(-14), float(-79.1), float(0), float(0), float(0), float(0), 45)
+	return
+	
@@ -0,0 +1,21 @@
+import sys
+# Project SWG:   Jabba TP spicedealer Camp:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+	
+	stcSvc.spawnObject('jabbas_palace_delrice_capreese', 'tatooine', long(0), float(-4330.8), float(23), float(-5024.4), float(0), float(0), float(0), float(0), 45)
+
+	return
+	
@@ -0,0 +1,27 @@
+import sys
+# Project SWG:   Jabba TP spicedealer Camp:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+	
+	stcSvc.spawnObject('jabbas_palace_tyrok', 'tatooine', long(0), float(-4933.3), float(31.2), float(-5541.8), float(0), float(0), float(0), float(0), 45)
+
+	stcSvc.spawnObject('mountain_squill', 'tatooine', long(0), float(-4939.9), float(30.6), float(-5547.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', long(0), float(-4946.3), float(30.1), float(-5555.7), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', long(0), float(-4938.6), float(29.7), float(-5554.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', long(0), float(-4933.1), float(29.5), float(-5554.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', long(0), float(-4929.2), float(29.2), float(-5561.3), float(0), float(0), float(0), float(0), 45)
+
+	return
+	
@@ -0,0 +1,38 @@
+import sys
+# Project SWG:   Jabba TP Valarian Hacker Bunker:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+	
+	
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', long(0), float(-5371.3), float(64.1), float(-6897.5), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', long(0), float(-5372.5), float(64.3), float(-6902.4), float(0), float(0), float(0), float(0), 45)
+	
+	bunker = core.objectService.getObject(long(-466404036467088174))
+		
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(2), float(-3.7), float(0.3), float(3.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(3), float(3.8), float(-0.3), float(-4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(4), float(3.4), float(-3.3), float(4.8), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(5), float(-2), float(-6.8), float(-8.7), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(5), float(-7.4), float(-6.8), float(-1.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(6), float(-7), float(-6.8), float(-14.5), float(0), float(0), float(0), float(0), 45)	
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(6), float(6.7), float(-6.8), float(-14.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(7), float(5), float(-6.8), float(-1.8), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(8), float(-2), float(-13.8), float(8.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(9), float(1.5), float(-13.8), float(-3.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(9), float(-6.7), float(-13.8), float(-15.1), float(0), float(0), float(0), float(0), 45)	
+	stcSvc.spawnObject('valarian_hacker', 'tatooine', bunker.getCellByCellNumber(9), float(2.7), float(-13.8), float(-11.9), float(0), float(0), float(0), float(0), 45)
+
+	return
+	
@@ -0,0 +1,70 @@
+import sys
+# Project SWG:   Jabba TP Valarian Security Bunker:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+	
+	stcSvc.spawnObject('tatooine_valarian_enforcer', 'tatooine', long(0), float(-3941.2), float(4.9), float(-3994), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', long(0), float(-3935.9), float(6.5), float(-4012.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', long(0), float(-3937.7), float(5.4), float(-3983.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_enforcer', 'tatooine', long(0), float(-3952.5), float(6.8), float(-4015.5), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', long(0), float(-3954.1), float(6.7), float(-4019.8), float(0), float(0), float(0), float(0), 45)	
+
+
+	bunker = core.objectService.getObject(long(-466404037065936405))
+	
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(5), float(3.1), float(-12), float(31.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(5), float(24.9), float(-12), float(46.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(5), float(4), float(-12), float(54.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(5), float(-15.4), float(-12), float(47.1), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(7), float(-50.4), float(-20), float(38.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_enforcer', 'tatooine', bunker.getCellByCellNumber(7), float(-57), float(-20), float(36.8), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(7), float(-59.6), float(-20), float(44.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_enforcer', 'tatooine', bunker.getCellByCellNumber(7), float(-50.7), float(-20), float(66.6), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_executioner', 'tatooine', bunker.getCellByCellNumber(8), float(-70.5), float(-20), float(14.4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jabbas_palace_iris_sinclair', 'tatooine', bunker.getCellByCellNumber(8), float(-49.8), float(-20), float(13.1), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_executioner', 'tatooine', bunker.getCellByCellNumber(9), float(-70.3), float(-20), float(77.5), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jabbas_palace_fnast_drexler', 'tatooine', bunker.getCellByCellNumber(9), float(-49), float(-20), float(82.5), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(10), float(35.7), float(-12), float(34.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(10), float(36.2), float(-12), float(77.1), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_executioner', 'tatooine', bunker.getCellByCellNumber(12), float(72.5), float(-12), float(58.6), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_executioner', 'tatooine', bunker.getCellByCellNumber(11), float(49.8), float(-12), float(83), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jabbas_palace_arkahn_greystar', 'tatooine', bunker.getCellByCellNumber(11), float(71.6), float(-12), float(83.2), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_executioner', 'tatooine', bunker.getCellByCellNumber(13), float(36.4), float(-20), float(123.2), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_executioner', 'tatooine', bunker.getCellByCellNumber(13), float(19), float(-20), float(122.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jabbas_palace_emanon', 'tatooine', bunker.getCellByCellNumber(13), float(22.1), float(-20), float(139.4), float(0), float(0), float(0), float(0), 45)
+
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(21), float(-8.2), float(-20), float(66.2), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(21), float(-2.3), float(-20), float(77), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_executioner', 'tatooine', bunker.getCellByCellNumber(19), float(-23), float(-20), float(100.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('jabbas_palace_careem', 'tatooine', bunker.getCellByCellNumber(19), float(-22.4), float(-20), float(117.5), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(18), float(-30.7), float(-20), float(49.5), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(16), float(-15.5), float(-20), float(2.9), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(14), float(21.1), float(-12), float(-1.2), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(14), float(51.6), float(-12), float(24.6), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(14), float(58.7), float(-12), float(20.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tatooine_valarian_vandal', 'tatooine', bunker.getCellByCellNumber(14), float(55.2), float(-12), float(16.9), float(0), float(0), float(0), float(0), 45)
+	return
+	
@@ -22,4 +22,25 @@ def addPlanetSpawns(core, planet):
 	stcSvc.spawnObject('object/static/item/shared_lair_wooden_tent.iff', 'tatooine', long(0), float(-5491.42), float(45.0825), float(-6608.95), float(0.499163), float(-0.143837), float(0.853988), float(-0.0291871))
 	
 	
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5467.4), float(46.7), float(-6601.4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5468.5), float(46), float(-6583.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5488.4), float(46), float(-6590.4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5503.4), float(46.7), float(-6589.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5524.5), float(46.4), float(-6586.2), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5539.6), float(40.1), float(-6602.4), float(0), float(0), float(0), float(0), 45)	
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5553.3), float(38.5), float(-6613.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5553.4), float(42), float(-6634.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5556.7), float(47.5), float(-6650.8), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5538.1), float(47.9), float(-6661.1), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5525.2), float(45.2), float(-6642.3), float(0), float(0), float(0), float(0), 45)	
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5508.7), float(41.9), float(-6627.1), float(0), float(0), float(0), float(0), 45)	
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5478.3), float(47.2), float(-6624.4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5486.8), float(48.2), float(-6645.4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5503.6), float(46.5), float(-6660.3), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5517.6), float(48), float(-6654.9), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5487.3), float(45), float(-6618.9), float(0), float(0), float(0), float(0), 45)	
+	stcSvc.spawnObject('wayfar_spy', 'tatooine', long(0), float(-5464.6), float(48.7), float(-6621.8), float(0), float(0), float(0), float(0), 45)
+	
+	stcSvc.spawnObject('dewall_paez', 'tatooine', long(0), float(-5516.1), float(40.1), float(-6615.1), float(0), float(0), float(0), float(0), 45)
+	
 	return
@@ -49,7 +49,7 @@ def addPlanetSpawns(core, planet):
 	stcSvc.spawnObject('object/mobile/shared_boba_fett.iff', 'tatooine', building.getCellByCellNumber(22), float(-1.0), float(3.0), float(33.1), float(0), float(0), float(0), float(0))

 	#EV9D9
-	stcSvc.spawnObject('object/mobile/shared_ev_9d9.iff', 'tatooine', building.getCellByCellNumber(14), float(18.8), float(0.2), float(78.7), float(0), float(0), float(1.0), float(0))
+	stcSvc.spawnObject('object/mobile/shared_ev_9d9.iff', 'tatooine', building.getCellByCellNumber(14), float(23.1), float(0.2), float(87.8), float(0), float(0), float(1.0), float(0))
 	
 	#malakili 
 	stcSvc.spawnObject('object/mobile/shared_malakili.iff', 'tatooine', building.getCellByCellNumber(37), float(17.3), float(-11.0), float(43.8), float(0), float(0), float(0), float(0))
@@ -320,7 +320,7 @@ def addPlanetSpawns(core, planet):
 	

 	#Profession Counselor
-	stcSvc.spawnObject('object/mobile/shared_respec_seller_f_1.iff', 'tatooine', long(0), float(3533.14), float(5), float(-4788.86), float(-0.3327), float(0.9288))
+	#stcSvc.spawnObject('object/mobile/shared_respec_seller_f_1.iff', 'tatooine', long(0), float(3533.14), float(5), float(-4788.86), float(-0.3327), float(0.9288))
 	
 	#Junk Dealers
 	stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3355), float(5), float(-4823), float(0.71), float(0.71))
@@ -0,0 +1,24 @@
+import sys
+# Project SWG: Medical center:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+	cloner2 = core.objectService.getObject(long(9655494))
+	
+	stcSvc.spawnObject('object/mobile/shared_21b_surgical_droid.iff', 'tatooine', cloner2.getCellByCellNumber(2), float(-0.4), float(0.2), float(-2.5), float(0), float(0), float(0), float(0))
+
+	
+	return
+	
+	
@@ -0,0 +1,26 @@
+import sys
+# Project SWG:   Jabba TP Alkharan Camp:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+	
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-4505.5), float(35), float(-2270.4), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-4511), float(35), float(-2261.7), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-4522.7), float(35), float(-2262.8), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-4519.7), float(35), float(-2253.8), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-4529.8), float(35), float(-2253.7), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('dwarf_bantha', 'tatooine', long(0), float(-4524.3), float(35), float(-2257.7), float(0), float(0), float(0), float(0), 45)	
+
+	return
+	
@@ -49,6 +49,6 @@ public class ErrorMessage extends SWGMessage {
 		result.put(getAsciiString(errorMessage));
 		result.put((byte)0);
 		
-		return result;
+		return result.flip();
 	}
 }
@@ -25,10 +25,6 @@ import java.nio.ByteOrder;

 import org.apache.mina.core.buffer.IoBuffer;

-import protocol.swg.ObjControllerMessage;
-
-
-
 public class ObjectMenuDirty extends ObjControllerObject {
 	
 	private long characterId;
@@ -37,13 +33,11 @@ public class ObjectMenuDirty extends ObjControllerObject {
 		this.characterId = characterId;
 	}
 	
-	
-
 	@Override
 	public void deserialize(IoBuffer buffer) {

 	}
-
+	
 	@Override
 	public IoBuffer serialize() {
 		IoBuffer result = IoBuffer.allocate(45).order(ByteOrder.LITTLE_ENDIAN);
@@ -58,6 +52,4 @@ public class ObjectMenuDirty extends ObjControllerObject {
 //	0000:   05 00 46 5E CE 80 1B 00 00 00 2B 02 00 00 7C 0E    ..F^......+...|.
 //	0010:   31 D6 41 00 00 00 00 00 00 00                      1.A.......

-
-
 }
@@ -37,8 +37,6 @@ import resources.objects.creature.CreatureObject;
 import resources.objects.group.GroupObject;
 import resources.objects.tangible.TangibleObject;
 import services.ai.AIActor;
-import services.ai.states.FollowState;
-import tools.DevLog;

 /** 
 * @author Charon 
@@ -127,6 +125,7 @@ public class Forager {
 		
 	}
 	
+	@SuppressWarnings("unused")
 	public boolean handleForageResults(CreatureObject forager){
 		// determine foraged object
 		SWGObject foragerInventory = forager.getSlottedObject("inventory");
@@ -547,7 +546,7 @@ public class Forager {
 	
 	
 	public void configureTreasureLoot(TangibleObject treasureContainer, CreatureObject owner, short spawnLevel){
-		List<LootGroup> lootgroups = new ArrayList<LootGroup>();
+		@SuppressWarnings("unused") List<LootGroup> lootgroups = new ArrayList<LootGroup>();
 		
 		String levelRange = "61";

@@ -23,7 +23,6 @@ package resources.objects;

 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -39,7 +38,6 @@ import java.util.stream.Stream;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.python.google.common.collect.Lists;

-import engine.resources.common.StringUtilities;
 import engine.resources.objects.Baseline;
 import engine.resources.objects.Delta;
 import engine.resources.objects.IDelta;
@@ -34,8 +34,6 @@ import java.util.function.Function;

 import org.apache.mina.core.buffer.IoBuffer;

-import com.sleepycat.persist.model.Persistent;
-
 import engine.resources.objects.Baseline;
 import engine.resources.objects.Delta;
 import engine.resources.objects.IDelta;
@@ -43,7 +41,6 @@ import engine.resources.objects.SWGObject;

 /* A SWGMap element should extend Delta or implement IDelta */

-@Persistent
 public class SWGMap<K, V> implements Map<K, V>, Serializable {
 	
 	private static final long serialVersionUID = 1L;
@@ -884,8 +884,8 @@ public class CreatureObject extends TangibleObject implements Serializable {
 		synchronized(objectMutex) {
 			this.moodAnimation = moodAnimation;
 		}
-		IoBuffer moodAnimationDelta = messageBuilder.buildMoodAnimationDelta(moodAnimation);
-		notifyObservers(moodAnimationDelta, true);
+		//IoBuffer moodAnimationDelta = messageBuilder.buildMoodAnimationDelta(moodAnimation);
+		//notifyObservers(moodAnimationDelta, true);
 	}

 	public long getWeaponId() {
@@ -93,7 +93,7 @@ public class FactoryCrateMessageBuilder extends TangibleMessageBuilder{
 	}
 	
 	public IoBuffer buildBaseline6() {
-		FactoryCrateObject factoryCrateObject = (FactoryCrateObject) object;
+		@SuppressWarnings("unused") FactoryCrateObject factoryCrateObject = (FactoryCrateObject) object;
 		IoBuffer buffer = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN);
 		buffer.setAutoExpand(true);
 				
@@ -27,7 +27,6 @@ import main.NGECore;

 import org.apache.mina.core.buffer.IoBuffer;

-import resources.objectives.DefaultMissionObjective;
 import resources.objects.intangible.IntangibleObject;
 import resources.objects.waypoint.WaypointObject;
 import services.mission.MissionLocation;
@@ -99,8 +99,11 @@ public class GalacticResource extends SWGObject implements Serializable {
 	

 	private byte poolNumber;	
+	@SuppressWarnings("unused")
 	private String stfName;
+	@SuppressWarnings("unused")
 	private String iffName;
+	@SuppressWarnings("unused")
 	private int type;
 	private byte generalType;	
 	private byte containerType;
@@ -48,7 +48,6 @@ import resources.objects.ObjectMessageBuilder;
 import resources.objects.SWGList;
 import resources.objects.SWGSet;
 import resources.objects.creature.CreatureObject;
-import tools.DevLog;
 import engine.clientdata.ClientFileManager;
 import engine.clientdata.visitors.IDManagerVisitor;
 import engine.clients.Client;
@@ -127,6 +127,11 @@ public class WeaponObject extends TangibleObject implements Serializable {
 	}

 	public int getWeaponType() {
+		if (getStringAttribute("cat_wpn_damage.wpn_category") == null) {
+			System.err.println("Error: Weapon Type not defined for " + getTemplate());
+			return 6;
+		}
+		
 		return Integer.parseInt(getStringAttribute("cat_wpn_damage.wpn_category").replace("@obj_attr_n:wpn_category_", ""));
 	}
 	
@@ -22,6 +22,7 @@
 package services;

 import java.util.Map;
+
 import protocol.swg.LaunchBrowserMessage;
 import resources.objects.creature.CreatureObject;
 import main.NGECore;
@@ -30,6 +31,7 @@ import engine.resources.service.INetworkRemoteEvent;

 public class BrowserService implements INetworkDispatch {
 	
+	@SuppressWarnings("unused")
 	private NGECore core;
 	
 	public BrowserService(NGECore core) {
@@ -222,8 +222,10 @@ public class DevService implements INetworkDispatch {

 					// Character
 					case 10: // Set combat level to 90
-						core.playerService.grantLevel(player, 90); // Commented out until fixed
-					    //core.playerService.giveExperience(player, 999999999);
+						if (player.getAttachment("hasLeveled") == null) {
+							player.setAttachment("hasLeveled", true);
+							core.playerService.grantLevel(player, 90);
+						}
 						return;
 					case 11: // Give 100,000 credits
 						player.setCashCredits(player.getCashCredits() + 100000);
@@ -683,7 +683,7 @@ public class EntertainmentService implements INetworkDispatch {

 		spectator.setPerformanceWatchee(performer);
 		performer.addSpectator(spectator);
-		spectator.setMoodAnimation("entertained");
+		//spectator.setMoodAnimation("entertained");

 		final ScheduledFuture<?> spectatorTask = scheduler.scheduleAtFixedRate(() -> {
 			try {
@@ -699,10 +699,13 @@ public class EntertainmentService implements INetworkDispatch {
 						spectator.sendSystemMessage("You stop listening to " + performer.getCustomName() + " because " + performer.getCustomName()
 								+ " is out of range.", (byte) 0);
 					}
-					spectator.setMoodAnimation("neutral");
+					//spectator.setMoodAnimation("neutral");
 					performer.removeSpectator(spectator);
 	
-					if (spectator.getInspirationTick().cancel(true))
+					if (spectator.getInspirationTick() != null) 
+						spectator.getInspirationTick().cancel(true);
+					
+					if (spectator.getSpectatorTask() != null)
 						spectator.getSpectatorTask().cancel(true);
 					
 				}
@@ -207,7 +207,7 @@ public class GuildService implements INetworkDispatch {
 					if (name == "" || name == " ")
 						return;
 					
-					SWGObject transferTarget = core.chatService.getObjectByFirstName(name);
+					SWGObject transferTarget = core.objectService.getObjectByFirstName(name); //chatService.getObjectByFirstName(name);
 					
 					if (transferTarget == null) {
 						actor.sendSystemMessage("@guild:ml_not_loaded", DisplayType.Broadcast);
@@ -92,6 +92,11 @@ public class LoginService implements INetworkDispatch{

 			public void handlePacket(IoSession session, IoBuffer data) throws Exception {
 				
+				if (session == null) {
+					System.out.println("Login attempted with NULL session!");
+					return;
+				}
+				
 				data = data.order(ByteOrder.LITTLE_ENDIAN);
 				LoginClientId clientID = new LoginClientId();
 				data.position(0);
@@ -116,16 +121,19 @@ public class LoginService implements INetworkDispatch{
 							err = "user is banned";
 							break;
 					}
-					ErrorMessage errMsg = new ErrorMessage("Invalid Login", err);
+					
+					// No matter what, this will always show that the login server is unavailable at this time. Removing the error message will just keep the connecting message up.
+					ErrorMessage errMsg = new ErrorMessage("Wrong Password", "The username or password you entered was incorrect.");
 					session.write(errMsg.serialize());
+					
 					Disconnect disconnect = new Disconnect((Integer)session.getAttribute("connectionId"), 6);
 					session.write(disconnect);
-					session.close(false);
+					
+					// Closing the session for some reason will not show any error messages, even if write messages are queued.. 
+					//As result, the infinite "Connection to the login server is now open..." loop., also it randomly denies any logins from that client for some reason
 					return;
 				}
 				
-				System.out.println(user + " successfully logged in.");
-				
 				Client client = new Client(session.getRemoteAddress());
 				client.setAccountName(user);
 				client.setPassword(pass);
@@ -137,6 +145,16 @@ public class LoginService implements INetworkDispatch{
 				
 				core.addClient(session, client);
 				
+				if (!core.getActiveConnectionsMap().containsKey(session)) {
+					Disconnect disconnect = new Disconnect((Integer)session.getAttribute("connectionId"), 6);
+					session.write(disconnect);
+					ErrorMessage errMsg = new ErrorMessage("Error Logging In", "Your client could not be added to the connections at this time.");
+					session.write(errMsg.serialize());
+					session.close(false);
+					
+					System.out.println(client.getAccountName() + " was not added to active connections map.");
+					return;				
+				}
 				/*if(!checkIfAccountExistInGameDB(id)) {
 					createAccountForGameDB(id, user, email, encryptPass);
 				}*/
@@ -153,9 +171,7 @@ public class LoginService implements INetworkDispatch{
 				ServerNowEpochTime time = new ServerNowEpochTime((int) (System.currentTimeMillis() / 1000));
 				
 				if (client.getSession().containsAttribute("tradeSession") == true) {
-					System.out.println("Has attribute: " + session.getAttribute("tradeSession").toString());
 					client.getSession().removeAttribute("tradeSession");
-					System.out.println("Removed tradeSession Attribute @ LoginService.java");
 				}
 				
 				session.write(time.serialize());
@@ -165,6 +181,8 @@ public class LoginService implements INetworkDispatch{
 				session.write(serverStatus.serialize());
 				session.write(jediSlot.serialize());
 				session.write(characters.serialize());
+				
+				System.out.println(user + " successfully logged in.");
 			}

 		});
@@ -197,12 +197,16 @@ public class PlayerService implements INetworkDispatch {
 		}, 0, 1000, TimeUnit.MILLISECONDS));
 		
 		scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
-			long[] ids = creature.getAwareObjects().stream().mapToLong(SWGObject::getObjectID).toArray();
-			for(int i = 0; i < ids.length; i++) {
-				for(int j = 0; j < ids.length; j++) {
-					if(ids[i] == ids[j] && i != j) 
-						System.err.println("Detected duplicate ids, Template " + core.objectService.getObject(ids[i]).getTemplate());
+			try {
+				long[] ids = creature.getAwareObjects().stream().mapToLong(SWGObject::getObjectID).toArray();
+				for(int i = 0; i < ids.length; i++) {
+					for(int j = 0; j < ids.length; j++) {
+						if(ids[i] == ids[j] && i != j) 
+							System.err.println("Detected duplicate ids, Template " + core.objectService.getObject(ids[i]).getTemplate());
+					}
 				}
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
 		}, 0, 5000, TimeUnit.MILLISECONDS));

@@ -374,6 +378,11 @@ public class PlayerService implements INetworkDispatch {
 			
 			CreatureObject targetPlayer = (CreatureObject) core.objectService.getObject(request.getCharacterId());
 			
+			if (targetPlayer == null) {
+				System.err.println("PlayerService::GuildRequestMessage: Target is null: " + request.getCharacterId());
+				return;
+			}
+			
 			if (targetPlayer.getGuildId() != 0) {
 				Guild targetGuild = core.guildService.getGuildById(targetPlayer.getGuildId());
 				GuildResponseMessage response = new GuildResponseMessage(request.getCharacterId(), targetGuild.getName());
--- a/Show More
+++ b/Show More