Merge pull request #2 from ProjectSWGCore/master

pull

scripts/commands/requestwaypointatposition.py

@@ -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

scripts/commands/setgodmode.py

@@ -50,9 +50,9 @@ def run(core, actor, target, commandString):
 		core.playerService.grantLevel(actor, int(arg1))
 	
 	elif command == 'setSpeed' and arg1:
-		actor.sendSystemMessage('Your speed was ' + str(actor.getSpeedMultiplierBase()) + '. Don\'t forget to set this back or it\'ll permanently imbalance your speed. Default without buffs or mods is 1.', 2)
+		#actor.sendSystemMessage("Your speed was " + str(actor.getSpeedMultiplierBase()) + ". Don\'t forget to set this back or it\'ll permanently imbalance your speed. Default without buffs or mods is 1.", 2)
 		actor.setSpeedMultiplierBase(float(arg1))
-		actor.sendSystemMessage('Your new speed is ' + str(actor.getSpeedMultiplierBase()) + '.', 2)
+		actor.sendSystemMessage('Your new speed is ' + arg1 + '.', 2)
 	
 	elif command == 'teleport' and arg2 and arg3 and arg4:
 		position = Point3D(float(arg2), float(arg3), float(arg4))
@@ -146,10 +146,15 @@ def run(core, actor, target, commandString):
 		planetName = actor.getPlanet().getName()
 
 		actor.sendSystemMessage('Position.x : %s' % pos.x, 0)
+		print ('Position.x : %s' % pos.x, 0)
 		actor.sendSystemMessage('Position.y : %s' % pos.y, 0)
+		print ('Position.y : %s' % pos.y, 0)
 		actor.sendSystemMessage('Position.z : %s' % pos.z, 0)
+		print ('Position.z : %s' % pos.z, 0)
 		actor.sendSystemMessage('Orientation.y : %s' % ori.y, 0)
+		print ('Orientation.y : %s' % ori.y, 0)
 		actor.sendSystemMessage('Orientation.w : %s' % ori.w, 0)
+		print ('Orientation.w : %s' % ori.w, 0)
 		if (actor.getContainer()):
 			cid = actor.getContainer().getObjectID()
 			cellid = cid
@@ -185,4 +190,14 @@ def run(core, actor, target, commandString):
 		playerObject.setCurrentRank(int(arg1))
 		print (playerObject.getCurrentRank())
 		return
+	
+	elif command == 'addToFrogAdminList':
+		frogBuilding = core.objectService.getObject(core.devService.getFrogBuildingId())
+		
+		if frogBuilding is None:
+			return
+		
+		frogBuilding.addPlayerToAdminList(None, actor.getObjectID(), actor.getCustomName().split(' ')[0])
+		actor.sendSystemMessage('You were added to the Admin list for the Frog Building.', 0)
+		return
 	return

scripts/commands/teleport.py

@@ -0,0 +1,46 @@
+import sys
+from engine.resources.scene import Point3D
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+	playerObject = actor.getSlottedObject('ghost')
+
+	if not playerObject:
+		return
+	
+	commandArgs = commandString.split(' ')
+	arg4 = None
+	if len(commandArgs) > 0:
+		arg1 = commandArgs[0]
+	if len(commandArgs) > 1:
+		arg2 = commandArgs[1]
+	if len(commandArgs) > 2:
+		arg3 = commandArgs[2]
+	if len(commandArgs) > 3:
+		arg4 = commandArgs[3]
+	
+	if arg1 and arg2 and arg3 and arg4 is not None:
+		try:
+			actor.sendSystemMessage('Teleporting...', 0)
+			position = Point3D(float(arg1), float(arg2), float(arg3))
+			core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName(arg4), position, actor.getOrientation(), None)
+		except:
+			actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleport <x> <z> [<y>] <planet>', 0)
+			return
+		return
+	
+	elif arg1 and arg2 and arg3:
+		try:
+			actor.sendSystemMessage('Teleporting...', 0)
+			position = Point3D(float(arg1), 0, float(arg2))
+			core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName(arg3), position, actor.getOrientation(), None)
+		except:
+			actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleport <x> <z> [<y>] <planet>', 0)
+		return
+	
+	else:
+		actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleport <x> <z> [<y>] <planet>', 0)
+		return
+	return

scripts/commands/teleporttarget.py

@@ -5,25 +5,18 @@ def setup():
     return
     
 def run(core, actor, target, commandString):
-	
+
 	playerObject = actor.getSlottedObject('ghost')
 
 	if not playerObject:
 		return
 	
-	commandArgs = commandString.split(' ')
-	if len(commandArgs) > 0:
-		arg1 = commandArgs[0]
-	if len(commandArgs) > 1:
-		arg2 = commandArgs[1]
-	if len(commandArgs) > 2:
-		arg3 = commandArgs[2]
-	if len(commandArgs) > 3:
-		arg4 = commandArgs[3]
-	
-	if arg1 and arg2 and arg3 and arg4 target:
-		position = Point3D(float(arg2), float(arg3), float(arg4))
-		core.simulationService.transferToPlanet(target, core.terrainService.getPlanetByName(arg1), position, actor.getOrientation(), None)
-
+	if target and target.getSlottedObject('ghost') is not None:
+		actor.sendSystemMessage('Teleporting ' + target.getCustomName() + ' to you...', 0)
+		core.simulationService.teleport(target, actor.getPosition(), actor.getOrientation(), 0)
+		return
 	
+	else:
+		actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleporttarget <HoverTarget>', 0)
+		return
 	return

scripts/commands/teleportto.py

@@ -0,0 +1,30 @@
+import sys
+from engine.resources.scene import Point3D
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+
+	playerObject = actor.getSlottedObject('ghost')
+
+	if not playerObject:
+		return
+	
+	if target is None:
+		target = core.objectService.getObjectByFirstName(commandString)
+	
+	if target and target.getSlottedObject('ghost') is not None:
+		actor.sendSystemMessage('Teleporting you to ' + target.getCustomName() + '...', 0)
+		if target.getPlanetId() == actor.getPlanetId():
+			core.simulationService.teleport(actor, target.getPosition(), target.getOrientation(), target.getParentId())
+		else:
+			if target.getParentId() == 0:
+				core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetById(target.getPlanetId()), target.getPosition(), target.getOrientation(), None)
+			else:
+				core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetById(target.getPlanetId()), target.getPosition(), target.getOrientation(), core.objectService.getObject(target.getParentId()))
+		return
+	else:
+		actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleportto <playerName>', 0)
+		return
+	return

scripts/commands/transferitemmisc.py

@@ -5,7 +5,7 @@ def setup():
 		return
 	   
 def run(core, actor, target, commandString):
-
+		
 		parsedMsg = commandString.split(' ', 3)
 		objService = core.objectService
 		containerID = long(parsedMsg[1])
@@ -17,18 +17,18 @@ def run(core, actor, target, commandString):
 		if not 'cell' in container.getTemplate() and container.isFull():
 			actor.sendSystemMessage('@container_error_message:container03', 0)
 			return
-
-		if container.getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory") or target.getContainer().getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory"):	
+		
+		if container.getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory") or (target and target.getContainer().getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory")):	
 			core.equipmentService.calculateLightsaberAttributes(actor, target, container)
 			return;
-
+		
 		if target.getTemplate() == 'object/tangible/item/shared_loot_cash.iff':
 			core.lootService.handleCreditPickUp(actor,target)
 			if target.getGrandparent().getInventoryItemCount()==1:
 				core.lootService.setLooted(actor,target.getGrandparent())
 			core.objectService.destroyObject(target)
 			return
-			
+		
 		if target.isLootItem():
 			target.setLootItem(0)
 			actor.sendSystemMessage('You looted ' + target.getObjectName().getStfValue() + ' from corpse.', 0)
@@ -40,29 +40,28 @@ def run(core, actor, target, commandString):
 			target.getContainer().transferTo(actor, container, target)
 			core.simulationService.teleport(target, actor.getPosition(), Quaternion(1,0,0,0), containerID)
 			return
-			
+		
 		elif target.getContainer().getTemplate() == "object/cell/shared_cell.iff" and core.housingService.getPermissions(actor, target.getContainer()):
 			target.getContainer().transferTo(actor, container, target)
 			return
-			
+		
 		elif actorContainer != None and container.getTemplate() == "object/cell/shared_cell.iff":
 			actor.sendSystemMessage("You do not have permission to access that container!", 0)
 			return
-
+		
 		canEquip = core.equipmentService.canEquip(actor, target)
 		
 		if canEquip[0] is False and container == actor:
 			actor.sendSystemMessage(canEquip[1], 0)
 			return
 			
-			
 		if target and container and target.getContainer():
-				oldContainer = target.getContainer()
-			   
-				if container == oldContainer:
-						print 'Error: New container is same as old container.'
-						return;
-			   
+			oldContainer = target.getContainer()
+			
+			if container == oldContainer:
+				print 'Error: New container is same as old container.'
+				return;
+		
 		replacedObject = None
 		slotName = None
 		replacedObjects = []	
@@ -79,18 +78,18 @@ def run(core, actor, target, commandString):
 				
 				if object != None:
 					container.transferTo(actor, container, object)	
-
+				
 				if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'):
 					core.equipmentService.equip(actor, target)
-					
+				
 				for object in replacedObjects:
 					core.equipmentService.unequip(actor, object) # Needs to be verified due to the new structure of the script
-		
+				
 		oldContainer.transferTo(actor, container, target)
 		
 		if oldContainer == actor.getSlottedObject('appearance_inventory'):
 			actor.removeObjectFromAppearanceEquipList(target)
-			
+		
 		if container == actor.getSlottedObject('appearance_inventory'):
 			actor.addObjectToAppearanceEquipList(target)		
 

scripts/conversation/medical_cloning_droid.py

@@ -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)
 		

scripts/loot/lootItems/exceptionallootchest/legendary_power_hammer.py

@@ -1,7 +1,7 @@
 
 def itemTemplate():
 
-	return ['object/weapon/melee/2h_sword/shared_quest_2h_sword_battleaxe.iff']
+	return ['object/weapon/melee/2h_sword/shared_2h_sword_maul_legendary.iff']
 
 def customItemName():
 

scripts/mobiles/tatooine/arkahn_greystar.py

@@ -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

scripts/mobiles/tatooine/careem.py

@@ -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

scripts/mobiles/tatooine/delrice_depresse.py

@@ -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

scripts/mobiles/tatooine/dewall_paez.py

@@ -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()

scripts/mobiles/tatooine/dwarf_bantha.py

@@ -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)

scripts/mobiles/tatooine/emanon.py

@@ -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

scripts/mobiles/tatooine/fighting_romo_vax.py

@@ -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()

scripts/mobiles/tatooine/fnast_drexler.py

@@ -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

scripts/mobiles/tatooine/iris_sinclair.py

@@ -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

scripts/mobiles/tatooine/romovax_henchman.py

@@ -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

scripts/mobiles/tatooine/tusken_avenger.py

@@ -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')

scripts/mobiles/tatooine/tusken_berserker.py

@@ -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')

scripts/mobiles/tatooine/tusken_blood_champion.py

@@ -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')

scripts/mobiles/tatooine/tusken_brute.py

@@ -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')

scripts/mobiles/tatooine/tusken_captain.py

@@ -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')

scripts/mobiles/tatooine/tusken_carnage_champion.py

@@ -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')

scripts/mobiles/tatooine/tusken_chief.py

@@ -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')

scripts/mobiles/tatooine/tusken_commoner.py

@@ -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')

scripts/mobiles/tatooine/tusken_death_hunter.py

@@ -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')

scripts/mobiles/tatooine/tusken_elite_guard.py

@@ -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')

scripts/mobiles/tatooine/tusken_executioner.py

@@ -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')

scripts/mobiles/tatooine/tusken_fighter.py

@@ -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')

scripts/mobiles/tatooine/tusken_flesh_hunter.py

@@ -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')

scripts/mobiles/tatooine/tusken_follower.py

@@ -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)

scripts/mobiles/tatooine/tusken_gore_chief.py

@@ -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')

scripts/mobiles/tatooine/tusken_guard.py

@@ -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')

scripts/mobiles/tatooine/tusken_king.py

@@ -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')

scripts/mobiles/tatooine/tusken_observer.py

@@ -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')

scripts/mobiles/tatooine/tusken_priest.py

@@ -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')

scripts/mobiles/tatooine/tusken_raid_champion.py

@@ -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')

scripts/mobiles/tatooine/tusken_raid_hunter.py

@@ -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')

scripts/mobiles/tatooine/tusken_raid_leader.py

@@ -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')

scripts/mobiles/tatooine/tusken_raider.py

@@ -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')

scripts/mobiles/tatooine/tusken_raider_soldier.py

@@ -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')

scripts/mobiles/tatooine/tusken_raider_warrior.py

@@ -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')

scripts/mobiles/tatooine/tusken_savage.py

@@ -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')

scripts/mobiles/tatooine/tusken_sniper.py

@@ -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')

scripts/mobiles/tatooine/tusken_torture_lord.py

@@ -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')

scripts/mobiles/tatooine/tusken_warlord.py

@@ -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')

scripts/mobiles/tatooine/tusken_warmaster.py

@@ -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')

scripts/mobiles/tatooine/tusken_warrior.py

@@ -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')

scripts/mobiles/tatooine/tusken_witch_doctor.py

@@ -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')

scripts/mobiles/tatooine/tusken_zealot.py

@@ -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')

scripts/mobiles/tatooine/tyrok.py

@@ -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

scripts/mobiles/tatooine/valarian_blood_vandal.py

@@ -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

scripts/mobiles/tatooine/valarian_command_enforcer.py

@@ -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

scripts/mobiles/tatooine/valarian_executioner.py

@@ -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

scripts/mobiles/tatooine/valarian_hacker.py

@@ -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

scripts/mobiles/tatooine/wayfar_spy.py

@@ -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()

scripts/object/building/corellia/cloning_corellia.py

@@ -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))

scripts/object/building/naboo/cloning_facility_naboo.py

@@ -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))

scripts/object/building/tatooine/cloning_facility_tatooine.py

@@ -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))

scripts/object/building/tatooine/cloning_facility_tatooine_small.py

@@ -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))
 		

scripts/object/mobile/21b_surgical_droid.py

@@ -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
 	

scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py

@@ -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
 	

scripts/object/tangible/deed/vehicle_deed/basilisk_war_droid.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_basilisk_war_droid.iff', 'object/intangible/vehicle/shared_basilisk_war_droid_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/flare_s_swoop.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_flare_s_swoop.iff', 'object/intangible/vehicle/shared_flare_s_swoop_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/hoverlifter_speeder.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_hoverlifter_speeder.iff', 'object/intangible/vehicle/shared_hoverlifter_speeder.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/hoverlifter_speeder_crafted.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_hoverlifter_speeder_crafted.iff', 'object/intangible/vehicle/shared_hoverlifter_speeder_crafted.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_ab1_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_ab1.iff', 'object/intangible/vehicle/shared_landspeeder_ab1.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_desert_skiff_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_desert_skiff.iff', 'object/intangible/vehicle/shared_landspeeder_desert_skiff_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_tantive4_adv_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_tantive4_adv.iff', 'object/intangible/vehicle/shared_landspeeder_tantive4_adv_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_tantive4_deed.py

@@ -5,20 +5,5 @@ def setup(core, object):
 	return
 
 def use(core, actor, object):
-	datapad = actor.getSlottedObject('datapad')
-	pcd = core.objectService.createObject('object/intangible/vehicle/shared_landspeeder_tantive4_pcd.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y)
-
-	if datapad and pcd:
-	
-		datapad.add(pcd)
-		core.objectService.destroyObject(object)
-		
-		vehicleId = actor.getAttachment('activeVehicleID')
-		
-		if vehicleId == None:
-			vehicle = core.objectService.createObject('object/mobile/vehicle/shared_landspeeder_tantive4.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y)
-			vehicle.setOwnerId(actor.getObjectID())
-			core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True)
-			actor.setAttachment('activeVehicleID', vehicle.getObjectID())
-	
-	return
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_tantive4.iff', 'object/intangible/vehicle/shared_landspeeder_tantive4_pcd.iff')
+	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_usv5_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_usv5.iff', 'object/intangible/vehicle/shared_landspeeder_usv5_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_v35_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_v35.iff', 'object/intangible/vehicle/shared_landspeeder_v35_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_x31_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_x31.iff', 'object/intangible/vehicle/shared_landspeeder_x31_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_x34_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_x34.iff', 'object/intangible/vehicle/shared_landspeeder_x34_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_xp38_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_xp38.iff', 'object/intangible/vehicle/shared_landspeeder_xp38_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/mustafar_panning_droid.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_mustafar_panning_droid.iff', 'object/intangible/vehicle/shared_mustafar_panning_droid_pcd.iff')
 	return

scripts/object/tangible/deed/vehicle_deed/speederbike_deed.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_speederbike.iff', 'object/intangible/vehicle/shared_speederbike_pcd.iff')
 	return

scripts/object/tangible/tcg/series1/vehicle_deed_organa_speeder.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_organa.iff', 'object/intangible/vehicle/shared_landspeeder_organa_pcd.iff')
 	return

scripts/object/tangible/tcg/series4/vehicle_deed_geonosian_speeder.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_geonosian_speeder.iff', 'object/intangible/vehicle/shared_geonosian_speeder_pcd.iff')
 	return

scripts/object/tangible/tcg/series7/garage_display_vehicles/grievous_wheel_bike.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
+	return
+
+def use(core, actor, object):
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_grievous_wheel_bike.iff', 'object/intangible/vehicle/shared_grievous_wheel_bike.iff')
 	return

scripts/object/tangible/wearables/armor/padded/armor_spy_roadmap_chest_02_01.py

@@ -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	

scripts/radial/item/recolorable.py

@@ -4,7 +4,6 @@ import sys
 def createRadial(core, owner, target, radials):
 	radials.add(RadialOptions(0, 98, 0, 'Modify primary color'))
 	radials.add(RadialOptions(0, 99, 0, 'Modify secondary color'))
-	radials.add(RadialOptions(0, 100, 0, 'Modify tertiary color'))
 	return
 	
 def handleSelection(core, owner, target, option):
@@ -12,7 +11,5 @@ def handleSelection(core, owner, target, option):
 		core.suiService.sendColorPicker(owner, target, '/private/index_color_1')
 	if option == 99 and target:
 		core.suiService.sendColorPicker(owner, target, '/private/index_color_2')
-	if option == 100 and target:
-		core.suiService.sendColorPicker(owner, target, '/private/index_color_3')
 	return
 	

scripts/static_spawns/tatooine/great_sarlacc.py

@@ -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
+	
+	

scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py

@@ -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
+	

scripts/static_spawns/tatooine/jabba_tp_spice_dealer_camp.py

@@ -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
+	

scripts/static_spawns/tatooine/jabba_tp_valarian_brute_camp.py

@@ -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
+	

scripts/static_spawns/tatooine/jabba_tp_valarian_hacker_bunker.py

@@ -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
+	

scripts/static_spawns/tatooine/jabba_tp_valarian_security_bunker.py

@@ -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
+	

scripts/static_spawns/tatooine/jabba_tp_wayfar_camp.py

@@ -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

scripts/static_spawns/tatooine/jabbas_palace.py

@@ -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))

scripts/static_spawns/tatooine/mos_eisley.py

@@ -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))

scripts/static_spawns/tatooine/mos_eisley_medical_center.py

@@ -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
+	
+	

scripts/static_spawns/tatooine/tatooine.py

@@ -10,7 +10,7 @@ def addPlanetSpawns(core, planet):
 ########################################################	
 	stcSvc = core.staticService
 	# Blue Frog: Uncomment only when needed for testing.
-	stcSvc.spawnObject('object/tangible/terminal/shared_terminal_character_builder.iff', 'tatooine', long(0), float(3525), float(4), float(-4801), float(0.70), float(0.71))
+	#stcSvc.spawnObject('object/tangible/terminal/shared_terminal_character_builder.iff', 'tatooine', long(0), float(3525), float(4), float(-4801), float(0.70), float(0.71))
 
 ########################################################	
 # DO NOT ADD ANYTHING ELSE TO THIS SCRIPT, PLEASE USE THE

scripts/static_spawns/tatooine/tatooine_ben_kenobis_house.py

@@ -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
+	

src/main/NGECore.java

@@ -344,7 +344,6 @@ public class NGECore {
 		skillModService = new SkillModService(this);
 		equipmentService = new EquipmentService(this);
 		entertainmentService = new EntertainmentService(this);
-		devService = new DevService(this);
 		conversationService = new ConversationService(this);
 		bazaarService = new BazaarService(this);
 		housingService = new HousingService(this);
@@ -561,6 +560,7 @@ public class NGECore {
 		
 		browserService = new BrowserService(this);
 		//battlefieldService = new BattlefieldService(this);
+		devService = new DevService(this);
 		
 		DevLogQueuer devLogQueuer = new DevLogQueuer();
 		

src/protocol/swg/ErrorMessage.java

@@ -49,6 +49,6 @@ public class ErrorMessage extends SWGMessage {
 		result.put(getAsciiString(errorMessage));
 		result.put((byte)0);
 		
-		return result;
+		return result.flip();
 	}
 }

src/protocol/swg/objectControllerObjects/ObjectMenuDirty.java

@@ -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.......
 
-
-
 }

src/resources/common/Forager.java

@@ -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";
 

src/resources/objects/SWGList.java

@@ -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;