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

README.md

@@ -61,6 +61,6 @@ Now your changes will be reviewed by other developers and once the changes are a
 
 For more information please visit the wiki: https://github.com/ProjectSWGCore/NGECore2/wiki
 
-Documentation can be found here: http://projectswgcore.github.io/NGECore2/doc/
+Documentation can be found here: http://projectswg.com/doc/
 
 Please prefix all commits with Added, Changed, Removed or Fixed. If you don't have enough room for multiple changes, use the extended description. Try not to bundle multiple changes into one vague line (ie. "Changed various combat things"). Try to make all commit messages understandable by non-programmers.

scripts/buffs/buildabuff_inspiration.py

@@ -5,19 +5,15 @@ def setup(core, actor, buff):
 	return
 
 def add(core, actor, buff):
-    
     buffWorkshop = actor.getAttachment('buffWorkshop')
-    
     if buffWorkshop is None:
         return
-    
     attached = actor.getAttachment('inspireDuration')
 
     buff.setDuration(float(actor.getAttachment('inspireDuration') * 60))
 
     for BuffItem in buffWorkshop:
         core.skillModService.addSkillMod(actor, BuffItem.getSkillName(), BuffItem.getAffectAmount())
-
     return
     
 def remove(core, actor, buff):

scripts/character_builder_terminal.py

@@ -306,6 +306,7 @@ def	miscHandler(owner):
 	window.addListBoxMenuItem('Backpack', 0)
 	window.addListBoxMenuItem('Heroism Jewelry Set', 1)	
 	window.addListBoxMenuItem('Belt of Master Bodo Baas', 2)
+	window.addListBoxMenuItem('Starter Equipment Box', 3)
 	core.suiService.openSUIWindow(window);
 	
 def miscHandlerCallback(owner, window, eventType, returnList):
@@ -323,6 +324,9 @@ def miscHandlerCallback(owner, window, eventType, returnList):
 	if returnList.get(0)=='2':
 		jediBelt(owner, inventory)
 		return
+	if returnList.get(0)=='3':
+		starterEquipmentBox(owner, inventory)
+		return
 	return
 	
 def combatLevel(owner):
@@ -379,35 +383,35 @@ def combatLevelDown(owner):
 	
 def rangedWeapons(owner, inventory):
 	rifle = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_e11.iff', owner.getPlanet())
-	rifle.setDamageType("energy");
-	rifle.setWeaponType(WeaponType.RIFLE);
-	rifle.setAttackSpeed(0.8);
-	rifle.setMinDamage(518);
-	rifle.setMaxDamage(1035);
+	rifle.setDamageType('energy')
+	rifle.setWeaponType(WeaponType.RIFLE)
+	rifle.setAttackSpeed(0.8)
+	rifle.setMinDamage(518)
+	rifle.setMaxDamage(1035)
 	rifle.setMaxRange(64)
 	
 	pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44.iff', owner.getPlanet())
-	pistol.setDamageType("energy");
-	pistol.setWeaponType(WeaponType.PISTOL);
-	pistol.setAttackSpeed(0.4);
-	pistol.setMinDamage(259);
-	pistol.setMaxDamage(518);
-	pistol.setMaxRange(35);
+	pistol.setDamageType('energy')
+	pistol.setWeaponType(WeaponType.PISTOL)
+	pistol.setAttackSpeed(0.4)
+	pistol.setMinDamage(259)
+	pistol.setMaxDamage(518)
+	pistol.setMaxRange(35)
 	
 	carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_e11.iff', owner.getPlanet())
-	carbine.setDamageType("energy");
-	carbine.setWeaponType(WeaponType.CARBINE);
-	carbine.setAttackSpeed(0.6);
-	carbine.setMinDamage(389);
-	carbine.setMaxDamage(780);
-	carbine.setMaxRange(50);
+	carbine.setDamageType('energy')
+	carbine.setWeaponType(WeaponType.CARBINE)
+	carbine.setAttackSpeed(0.6)
+	carbine.setMinDamage(389)
+	carbine.setMaxDamage(780)
+	carbine.setMaxRange(50)
 	
 	heavy = core.objectService.createObject('object/weapon/ranged/heavy/shared_som_lava_cannon.iff', owner.getPlanet())
-	heavy.setDamageType("energy");
-	heavy.setWeaponType(WeaponType.HEAVYWEAPON);
-	heavy.setAttackSpeed(1);
-	heavy.setMinDamage(850);
-	heavy.setMaxDamage(1350);
+	heavy.setDamageType('energy')
+	heavy.setWeaponType(WeaponType.HEAVYWEAPON)
+	heavy.setAttackSpeed(1)
+	heavy.setMinDamage(850)
+	heavy.setMaxDamage(1350)
 	heavy.setStringAttribute('wpn_elemental_type', 'Heat')
 	heavy.setStringAttribute('wpn_elemental_value', '50')
 	heavy.setMaxRange(64)
@@ -605,6 +609,11 @@ def backpack(owner, inventory):
 	inventory.add(core.objectService.createObject("object/tangible/wearables/backpack/shared_backpack_s01.iff", owner.getPlanet()))
 	screenOne(core, owner)
 	return
+
+def starterEquipmentBox(owner, inventory):
+	inventory.add(core.objectService.createObject("object/tangible/npe/shared_npe_uniform_box.iff", owner.getPlanet()))
+	screenOne(core, owner)
+	return
 	
 def heroismJewelry(owner, inventory):
 	heroismBand = core.objectService.createObject("object/tangible/wearables/ring/shared_ring_s04.iff", owner.getPlanet(), "item_band_set_hero_01_01")					

scripts/collections/gcwrank_imperial.py

@@ -3,23 +3,23 @@ from resources.datatables import GcwRank
 
 def handleRankUp(core, actor, newrank):
 	if newrank >= GcwRank.LIEUTENANT:
-		actor.addAbility('pvp_retaliation_ability')
+		actor.addAbility('command_pvp_retaliation_ability')
 		core.collectionService.addCollection(actor, 'pvp_imperial_lieutenant')
 
 	if newrank >= GcwRank.CAPTAIN:
-		actor.addAbility('pvp_adrenaline_ability')
+		actor.addAbility('command_pvp_adrenaline_ability')
 		core.collectionService.addCollection(actor, 'pvp_imperial_captain')
 
 	if newrank >= GcwRank.MAJOR:
-		actor.addAbility('pvp_unstoppable_ability')
+		actor.addAbility('command_pvp_unstoppable_ability')
 		core.collectionService.addCollection(actor, 'pvp_imperial_major')
 
 	if newrank >= GcwRank.LTCOLONEL:
-		actor.addAbility('pvp_last_man_ability')
+		actor.addAbility('command_pvp_last_man_ability')
 		core.collectionService.addCollection(actor, 'pvp_imperial_lt_colonel')
 
 	if newrank >= GcwRank.COLONEL:
-		actor.addAbility('pvp_aura_buff_self_ability')
+		actor.addAbility('pvp_aura_buff_imperial_self')
 		core.collectionService.addCollection(actor, 'pvp_imperial_colonel')
 
 	if newrank >= GcwRank.GENERAL:
@@ -30,19 +30,19 @@ def handleRankUp(core, actor, newrank):
 
 def handleRankDown(actor, newrank):
 	if newrank < GcwRank.LIEUTENANT:
-		actor.removeAbility('pvp_retaliation_ability')
+		actor.removeAbility('command_pvp_retaliation_ability')
 
 	if newrank < GcwRank.CAPTAIN:
-		actor.removeAbility('pvp_adrenaline_ability')
+		actor.removeAbility('command_pvp_adrenaline_ability')
 
 	if newrank < GcwRank.MAJOR:
-		actor.removeAbility('pvp_unstoppable_ability')
+		actor.removeAbility('command_pvp_unstoppable_ability')
 
 	if newrank < GcwRank.LTCOLONEL:
-		actor.removeAbility('pvp_last_man_ability')
+		actor.removeAbility('command_pvp_last_man_ability')
 
 	if newrank < GcwRank.COLONEL:
-		actor.removeAbility('pvp_aura_buff_self_ability')
+		actor.removeAbility('pvp_aura_buff_imperial_self')
 
 	if newrank < GcwRank.GENERAL:
 		actor.removeAbility('pvp_airstrike_ability')

scripts/collections/gcwrank_rebel.py

@@ -3,23 +3,23 @@ from resources.datatables import GcwRank
 
 def handleRankUp(core, actor, newrank):
 	if newrank >= GcwRank.LIEUTENANT:
-		actor.addAbility('pvp_retaliation_rebel_ability')
+		actor.addAbility('command_pvp_retaliation_rebel_ability')
 		core.collectionService.addCollection(actor, 'pvp_rebel_lieutenant')
 
 	if newrank >= GcwRank.CAPTAIN:
-		actor.addAbility('pvp_adrenaline_rebel_ability')
+		actor.addAbility('command_pvp_adrenaline_rebel_ability')
 		core.collectionService.addCollection(actor, 'pvp_rebel_captain')
 
 	if newrank >= GcwRank.MAJOR:
-		actor.addAbility('pvp_unstoppable_rebel_ability')
+		actor.addAbility('command_pvp_unstoppable_rebel_ability')
 		core.collectionService.addCollection(actor, 'pvp_rebel_major')
 
 	if newrank >= GcwRank.COMMANDER:
-		actor.addAbility('pvp_last_man_rebel_ability')
+		actor.addAbility('command_pvp_last_man_rebel_ability')
 		core.collectionService.addCollection(actor, 'pvp_rebel_commander')
 
 	if newrank >= GcwRank.COLONEL:
-		actor.addAbility('pvp_aura_buff_self_rebel_ability')
+		actor.addAbility('pvp_aura_buff_rebel_self')
 		core.collectionService.addCollection(actor, 'pvp_rebel_colonel')
 
 	if newrank >= GcwRank.GENERAL:
@@ -30,19 +30,19 @@ def handleRankUp(core, actor, newrank):
 
 def handleRankDown(actor, newrank):
 	if newrank < GcwRank.LIEUTENANT:
-		actor.removeAbility('pvp_retaliation_rebel_ability')
+		actor.removeAbility('command_pvp_retaliation_rebel_ability')
 
 	if newrank < GcwRank.CAPTAIN:
-		actor.removeAbility('pvp_adrenaline_rebel_ability')
+		actor.removeAbility('command_pvp_adrenaline_rebel_ability')
 
 	if newrank < GcwRank.MAJOR:
-		actor.removeAbility('pvp_unstoppable_rebel_ability')
+		actor.removeAbility('command_pvp_unstoppable_rebel_ability')
 
 	if newrank < GcwRank.COMMANDER:
-		actor.removeAbility('pvp_last_man_rebel_ability')
+		actor.removeAbility('command_pvp_last_man_rebel_ability')
 
 	if newrank < GcwRank.COLONEL:
-		actor.removeAbility('pvp_aura_buff_self_rebel_ability')
+		actor.removeAbility('pvp_aura_buff_rebel_self')
 
 	if newrank < GcwRank.GENERAL:
 		actor.removeAbility('pvp_airstrike_rebel_ability')

scripts/commands/adjustLotCount.py

@@ -0,0 +1,15 @@
+import sys
+
+def run(core, actor, target, commandString):
+	commandArgs = commandString.split(' ')
+	arg1 = commandArgs[0]
+		
+	if target is None:
+		target = actor
+		
+	if target:
+		playerObject = target.getSlottedObject('ghost')
+		playerObject.setLotsRemaining(playerObject.getLotsRemaining() + int(arg1))
+		print(playerObject.getLotsRemaining())
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF adjustLotCount: Command completed successfully for: ' + target.getFirstName(), 0)
+	return

scripts/commands/broadcast.py

@@ -1,12 +1,14 @@
-from services.sui import SUIWindow
-from services.sui.SUIWindow import Trigger
-from java.util import Vector
-import sys
-
-def setup():
-    return
-    
-def run(core, actor, target, commandString):
-	core.chatService.broadcastGalaxy(commandString)
-	return
-
+# -- This file will be used at a later date. It's plans are for /broadcast <event | rebel | imperial> <message>. (Where imperial/rebel broadcasts to their respective factions).
+#from services.sui import SUIWindow
+#from services.sui.SUIWindow import Trigger
+#from java.util import Vector
+#import sys
+#
+#def setup():
+#    return
+#    
+#def run(core, actor, target, commandString):
+#	core.chatService.broadcastGalaxy(commandString)
+	#return
+#
+#

scripts/commands/broadcastGalaxy.py

@@ -0,0 +1,13 @@
+
+from services.sui import SUIWindow
+from services.sui.SUIWindow import Trigger
+from java.util import Vector
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+	core.chatService.broadcastGalaxy(commandString)
+	actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF broadcastGalaxy: Command completed successfully.', 0)
+	return

scripts/commands/broadcastPlanet.py

@@ -0,0 +1,12 @@
+from services.sui import SUIWindow
+from services.sui.SUIWindow import Trigger
+from java.util import Vector
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+	core.chatService.broadcastPlanet(commandString, actor.getPlanet())
+	actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF broadcastPlanet: Command completed successfully.', 0)
+	return

scripts/commands/credits.py

@@ -0,0 +1,18 @@
+import sys
+
+
+
+def run(core, actor, target, commandString):
+	commandArgs = commandString.split(' ')
+	arg1 = commandArgs[0]
+	playerObject = actor.getSlottedObject('ghost')
+
+	if actor:
+		actor.setCashCredits(actor.getCashCredits() + int(arg1))
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Credits: Command completed successfully. You have given yourself ' + arg1 + 'credits.', 0)
+		
+	if actor and target:
+		target.setCashCredits(target.getCashCredits() + int(arg1))
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Credits: Command completed successfully. You have transferred ' + arg1 + ' credits to ' + target.getFirstName() + '.', 0)
+
+	return

scripts/commands/inspire.py

@@ -10,13 +10,12 @@ def run(core, actor, target, commandString):
 
     if not playerObject or playerObject.getProfession() != "entertainer_1a":
       return
-    
     if target is None or actor.getObjectId() == target.getObjectId():
     	openBuffWindow = BuffBuilderStartMessage(actor.getObjectId(), actor.getObjectId(), actor.getObjectId())
     	objController = ObjControllerMessage(11, openBuffWindow)
     	actor.getClient().getSession().write(objController.serialize())
     	return
-    
+
     if target is None and commandString is not None:
     	target = core.chatService.getObjectByFirstName(commandString)
     	if target is None:

scripts/commands/invulnerable.py

@@ -0,0 +1,33 @@
+import sys
+from resources.datatables import Options
+
+def run(core, actor, target, commandString):
+	commandArgs = commandString.split(' ')
+	command = commandArgs[0]
+
+	
+	if  command == 'invisible':
+		if (actor.isInStealth()):
+			actor.setInStealth(False)
+			actor.setRadarVisible(True)
+			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Invulnerable invisible: Command completed successfully. You are no longer Invisible.', 0)
+			
+		else:
+			actor.setInStealth(True)
+			actor.setRadarVisible(False)
+			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Invulnerable invisible: Command completed successfully. You are now Invisible.', 0)
+	
+	if actor.getOptionsBitmask() == 128:
+		actor.setOptionsBitmask(Options.NONE)
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Invulnerable: Command completed successfully. You are now Invulnerable.', 0)
+	
+	
+	elif actor.getOptionsBitmask() == 0:
+		actor.setOptionsBitmask(Options.ATTACKABLE)
+		print(actor.getOptionsBitmask())
+		
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Invulnerable: Command completed successfully. You are no longer Invulnerable.', 0)
+
+	return
+	
+	

scripts/commands/server.py

@@ -24,18 +24,23 @@ def run(core, actor, target, commandString):
 		arg4 = commandArgs[4]
 	
 	if not command:
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Server: Invalid Syntax. Syntax is: /server <lockServer | unlockServer | shutdown | stop>.', 0)
 		return
 	
 	if command == 'lockServer':
 		core.setGalaxyStatus(GalaxyStatus.Locked)
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Server lockServer: Command completed successfully. Server is now in Locked Status.', 0)
 	if command == 'unlockServer':
 		core.setGalaxyStatus(GalaxyStatus.Online)
-	if command == 'info':
-		actor.sendSystemMessage(str(core.getActiveZoneClients()) + ' online characters.', 0)
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Server unlockServer: Command completed successfully. Server is now in Online Status.', 0)
+	#if command == 'restart': //This command currently causes an error at NGEcore.java like 593 whole attempting to close databaseConnection2
+		#core.restart()
+		#actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Server restart: Command completed successfully. Server restart initiated.', 0)
 	if command == 'shutdown':
 		core.initiateShutdown()
-	if command == 'getheight':
-		actor.sendSystemMessage(str(core.terrainService.getHeight(actor.getPlanetId(), actor.getWorldPosition().x, actor.getWorldPosition().z)), 0)
-
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Server shutdown: Command completed successfully. Server shutdown initiated.', 0)
+	if command == 'stop':
+		core.initiateStop()
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Server stop: Command completed successfully. Emergency server shutdown initiated.', 0)
 		
 	return

scripts/commands/setRank.py

@@ -0,0 +1,41 @@
+import sys
+from resources.datatables import GcwRank
+from services.gcw import GCWService
+
+def run(core, actor, target, commandString):
+	commandArgs = commandString.split(' ')
+	arg1 = commandArgs[0]
+	if len(commandArgs) > 1:
+		arg2 = commandArgs[1]
+		
+	if target is None:
+		target = actor
+	
+	if target.getFaction() == 'rebel' or 'imperial' and arg1 == 'up':
+			playerObject = target.getSlottedObject('ghost')
+			playerObject.setCurrentRank(int(arg2))
+			newrank = playerObject.getCurrentRank()
+			core.scriptService.callScript("scripts/collections/", "gcwrank_" + target.getFaction(), "handleRankUp", core, target, newrank)
+			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF setRank: Command completed successfully.', 0)
+	if target.getFaction() == 'rebel' or 'imperial' and arg1 == 'down':
+			playerObject = target.getSlottedObject('ghost')	
+			playerObject.setCurrentRank(int(arg2))
+			newrank = playerObject.getCurrentRank()
+			core.scriptService.callScript("scripts/collections/", "gcwrank_" + target.getFaction(), "handleRankDown", target, newrank)
+			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF setRank: Command completed successfully.', 0)
+			
+#	if target.getFaction() == 'imperial' and arg1 == 'up':
+#		if arg1 == 'up':
+#			playerObject = actor.getSlottedObject('ghost')
+#			playerObject.setCurrentRank(int(arg2))
+#			newrank = playerObject.getCurrentRank()
+#			core.scriptService.callScript("scripts/collections/", "gcwrank_" + target.getFaction(), "handleRankUp", core, target, newrank)
+#			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF setRank: Command completed successfully.', 0)
+#	if target.getFaction() == 'imperial' and arg1 == 'down':
+#			playerObject = actor.getSlottedObject('ghost')	
+#			playerObject.setCurrentRank(int(arg2))
+#			newrank = playerObject.getCurrentRank()
+#			core.scriptService.callScript("scripts/collections/", "gcwrank_" + target.getFaction(), "handleRankDown", target, newrank)
+#			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF setRank: Command completed successfully.', 0)
+	
+	return

scripts/commands/setgodmode.py

@@ -17,6 +17,8 @@ def run(core, actor, target, commandString):
 	
 	playerObject = actor.getSlottedObject('ghost')
 	
+	global str
+	
 	if not playerObject:
 		return
 		

scripts/commands/teleport.py

@@ -23,24 +23,24 @@ def run(core, actor, target, commandString):
 	
 	if arg1 and arg2 and arg3 and arg4 is not None:
 		try:
-			actor.sendSystemMessage('gm: teleport: Command completed successfully.', 0)
+			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Command completed successfully.', 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)
+			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Invalid Syntax. Syntax is: /teleport <x> <y> [<z>] <planet>.', 0)
 			return
 		return
 	
 	elif arg1 and arg2 and arg3:
 		try:
-			actor.sendSystemMessage('gm: teleport: Command completed successfully.', 0)
+			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Command completed successfully.', 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)
+			actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Invalid Syntax. Syntax is: /teleport <x> <y> [<z>] <planet>.', 0)
 		return
 	
 	else:
-		actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleport <x> <z> [<y>] <planet>', 0)
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Invalid Syntax. Syntax is: /teleport <x> <y> [<z>] <planet>.', 0)
 		return
 	return

scripts/commands/teleporttarget.py

@@ -12,11 +12,11 @@ def run(core, actor, target, commandString):
 		return
 	
 	if target and target.getSlottedObject('ghost') is not None:
-		actor.sendSystemMessage('gm: teleporttarget: Command completed successfully.', 0)
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF teleportTarget: Command completed successfully.', 0)
 		core.simulationService.teleport(target, actor.getPosition(), actor.getOrientation(), 0)
 		return
 	
 	else:
-		actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleporttarget <HoverTarget>', 0)
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF teleportTarget: Invalid Syntax. Syntax is: /teleportTarget <HoverTarget>', 0)
 		return
 	return

scripts/commands/teleportto.py

@@ -15,7 +15,7 @@ def run(core, actor, target, commandString):
 		target = core.objectService.getObjectByFirstName(commandString)
 	
 	if target and target.getSlottedObject('ghost') is not None:
-		actor.sendSystemMessage('gm: teleportto: Command completed successfully.', 0)
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF teleportTo: Command completed successfully.', 0)
 		if target.getPlanetId() == actor.getPlanetId():
 			core.simulationService.teleport(actor, target.getPosition(), target.getOrientation(), target.getParentId())
 		else:
@@ -25,6 +25,6 @@ def run(core, actor, target, commandString):
 				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)
+		actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF teleportTo: Invalid Syntax. Syntax is: /teleportTo <playerName>', 0)
 		return
 	return

scripts/mobiles/corellia/grassland_slice_hound.py

@@ -44,5 +44,5 @@ def addTemplate(core):
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	
-	core.spawnService.addMobileTemplate('gassland_slice_hound', mobileTemplate)
+	core.spawnService.addMobileTemplate('grassland_slice_hound', mobileTemplate)
 	return

scripts/mobiles/dantooine/baby_bol.py

@@ -0,0 +1,45 @@
+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('baby_bol')
+	mobileTemplate.setLevel(58)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(5)
+	mobileTemplate.setMaxSpawnDistance(10)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Wild Meat")
+	mobileTemplate.setMeatAmount(0)
+	mobileTemplate.setHideType("Leathery Hide")
+	mobileTemplate.setBoneAmount(300)	
+	mobileTemplate.setBoneType("Animal Bone")
+	mobileTemplate.setHideAmount(180)
+	mobileTemplate.setSocialGroup("bol")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+
+	templates = Vector()
+	templates.add('object/mobile/shared_baby_bol.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('baby_bol', mobileTemplate)
+	return

scripts/mobiles/lairgroups/lok_bosstest.py

@@ -0,0 +1,11 @@
+import sys
+from services.spawn import LairSpawnTemplate
+from java.util import Vector
+
+def addLairGroup(core):
+	spawnTemplate1 = LairSpawnTemplate(-1, 'lok_gurk_lair', 5, 20)	
+	spawnTemplates = Vector()
+	spawnTemplates.add(spawnTemplate1)	
+
+	core.spawnService.addLairGroup('lok_bosstest', spawnTemplates)
+	return

scripts/mobiles/lairs/corellia_bageraset_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('bageraset')
+	
+	core.spawnService.addLairTemplate('corellia_bageraset_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small.iff')
+	return

scripts/mobiles/lairs/corellia_bageraset_lair_2.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('bageraset')
+	mobileTemplates.add('bageraset_bruiser')
+		
+	core.spawnService.addLairTemplate('corellia_bageraset_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small.iff')
+	return

scripts/mobiles/lairs/corellia_canoid_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('canoid')
+	
+	core.spawnService.addLairTemplate('corellia_canoid_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_small.iff')
+	return

scripts/mobiles/lairs/corellia_canoid_lair_2.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('canoid')
+	mobileTemplates.add('canoid_hunter')
+	mobileTemplates.add('canoid_pack_leader')
+	
+	core.spawnService.addLairTemplate('corellia_canoid_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_small.iff')
+	return

scripts/mobiles/lairs/corellia_carrion_spat_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('carrion_spat')
+	
+	core.spawnService.addLairTemplate('corellia_carrion_spat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_large_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_carrion_spat_lair_2.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('carrion_spat')
+	mobileTemplates.add('carrion_spat_corpsereaver')
+	
+	core.spawnService.addLairTemplate('corellia_carrion_spat_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_large_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_corellian_butterfly_lair_1.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('corellian_butterfly')
+	mobileTemplates.add('corellian_butterfly_monarch')
+	mobileTemplates.add('corellian_butterfly_worker')
+	
+	core.spawnService.addLairTemplate('corellia_corellian_butterfly_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_insecthill_small_evil_fire_green.iff')
+	return

scripts/mobiles/lairs/corellia_corellian_butterfly_lair_2.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('blood_thirsty_monarch')
+	mobileTemplates.add('corellian_butterfly_monarch')
+	mobileTemplates.add('corellian_butterfly_warrior')
+	
+	core.spawnService.addLairTemplate('corellia_corellian_butterfly_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_insecthill_small_fog_red.iff')
+	return

scripts/mobiles/lairs/corellia_corellian_butterfly_lair_3.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('corellian_butterfly')
+	mobileTemplates.add('corellian_butterfly_warrior')
+	
+	core.spawnService.addLairTemplate('corellia_corellian_butterfly_lair_3', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_insecthill_small.iff')
+	return

scripts/mobiles/lairs/corellia_corellian_butterfly_lair_4.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('corellian_butterfly_worker')
+	mobileTemplates.add('corellian_butterfly_defender')
+	mobileTemplates.add('corellian_butterfly_drone')
+	
+	core.spawnService.addLairTemplate('corellia_corellian_butterfly_lair_4', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_insecthill_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_crazed_durni_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('crazed_durni')
+	
+	core.spawnService.addLairTemplate('corellia_crazed_durni_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_fog_gray.iff')
+	return

scripts/mobiles/lairs/corellia_crimson_sand_panther_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('crimson_razor_cat')
+	
+	core.spawnService.addLairTemplate('corellia_crimson_sand_panther_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large_fog_red.iff')
+	return

scripts/mobiles/lairs/corellia_dalyrake_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('dalyrake')
+	
+	core.spawnService.addLairTemplate('corellia_dalyrake_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_mound_large.iff')
+	return

scripts/mobiles/lairs/corellia_dalyrake_lair_2.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('dalyrake_martriarch')
+	mobileTemplates.add('dalyrake_harvester')
+	
+	core.spawnService.addLairTemplate('corellia_dalyrake_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_large.iff')
+	return

scripts/mobiles/lairs/corellia_deranged_wrix_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('deranged_wrix')
+	
+	core.spawnService.addLairTemplate('corellia_deranged_wrix_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_red.iff')
+	return

scripts/mobiles/lairs/corellia_devil_gulginaw_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('devil_gulginaw')
+	
+	core.spawnService.addLairTemplate('corellia_devil_gulginaw_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones_evil_fire_redpoi_all_lair_bones_evil_fire_red.iff')
+	return

scripts/mobiles/lairs/corellia_dire_cat_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('dire_cat')
+	
+	core.spawnService.addLairTemplate('corellia_dire_cat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_small.iff')
+	return

scripts/mobiles/lairs/corellia_dire_cat_lair_2.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('dire_cat')
+	mobileTemplates.add('feral_orphan')
+	
+	core.spawnService.addLairTemplate('corellia_dire_cat_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_diseased_vrelt_lair_1.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('diseased_vrelt')
+	mobileTemplates.add('diseased_vrelt_matriarch')
+	
+	core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_diseased_vrelt_lair_2.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('diseased_vrelt')
+	
+	core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_evil_fire_green.iff')
+	return

scripts/mobiles/lairs/corellia_diseased_vrelt_lair_3.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('diseased_vrelt')
+	mobileTemplates.add('noxious_vrelt_scavenger')
+	
+	core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_3', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_mustard.iff')
+	return

scripts/mobiles/lairs/corellia_diseased_vrelt_lair_4.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('noxious_vrelt_scavenger')
+	
+	core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_4', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_green.iff')
+	return

scripts/mobiles/lairs/corellia_diseased_vrelt_lair_5.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('diseased_vrelt')
+	mobileTemplates.add('diseased_vrelt_matriarch')
+	
+	core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_gray.iff')
+	return	

scripts/mobiles/lairs/corellia_diseased_vrelt_lair_6.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('diseased_vrelt')
+	mobileTemplates.add('diseased_vrelt_matriarch')
+	
+	core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_mustard.iff')
+	return

scripts/mobiles/lairs/corellia_diseased_vrelt_lair_7.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('diseased_vrelt')
+	mobileTemplates.add('diseased_vrelt_matriarch')
+	
+	core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_green.iff')
+	return

scripts/mobiles/lairs/corellia_diseased_vrelt_lair_8.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('diseased_vrelt')
+	
+	core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_durni_warren_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('durni')
+	
+	core.spawnService.addLairTemplate('corellia_durni_warren_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small.iff')
+	return

scripts/mobiles/lairs/corellia_durni_warren_lair_2.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('durni')
+	mobileTemplates.add('vehement_warrior')
+	
+	core.spawnService.addLairTemplate('corellia_durni_warren_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_forest_murra_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('forest_murra')
+	
+	core.spawnService.addLairTemplate('corellia_forest_murra_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_dead_log_small_evil_fire_green.iff')
+	return

scripts/mobiles/lairs/corellia_forest_slice_hound_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('forest_slice_hound')
+	
+	core.spawnService.addLairTemplate('corellia_forest_slice_hound_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones_evil_fire_green.iff')
+	return

scripts/mobiles/lairs/corellia_giant_carrion_spat_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('giant_carrion_spat')
+	
+	core.spawnService.addLairTemplate('corellia_giant_carrion_spat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_large_evil_fire_red.iff')
+	return

scripts/mobiles/lairs/corellia_giant_dalyrake_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('giant_dalyrake')
+	
+	core.spawnService.addLairTemplate('corellia_giant_dalyrake_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_mound_large_evil_fire_green.iff')
+	return

scripts/mobiles/lairs/corellia_giant_gubbur_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('giant_gubbur')
+	
+	core.spawnService.addLairTemplate('corellia_giant_gubbur_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_grand_wrix_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('grand_wrix')
+
+	core.spawnService.addLairTemplate('corellia_grand_wrix_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_green.iff')
+	return

scripts/mobiles/lairs/corellia_grassland_slice_hound_lair_1.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('grassland_slice_hound')
+	mobileTemplates.add('female_grassland_slice_hound')
+	
+	core.spawnService.addLairTemplate('corellia_grassland_slice_hound_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones_large_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_greater_gulginaw_nest_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('greater_gulginaw')
+	
+	core.spawnService.addLairTemplate('corellia_greater_gulginaw_nest_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_gronda_lair_1.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('gronda')
+	mobileTemplates.add('dwarf_gronda')
+		
+	core.spawnService.addLairTemplate('corellia_gronda_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return

scripts/mobiles/lairs/corellia_gubbur_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('gubbur')
+		
+	core.spawnService.addLairTemplate('corellia_gubbur_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small.iff')
+	return

scripts/mobiles/lairs/corellia_gulginaw_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('gulginaw')
+		
+	core.spawnService.addLairTemplate('corellia_gulginaw_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_small.iff')
+	return

scripts/mobiles/lairs/corellia_gurrcat_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('gurrcat')
+		
+	core.spawnService.addLairTemplate('corellia_gurrcat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones.iff')
+	return

scripts/mobiles/lairs/corellia_humbaba_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('humbaba')
+		
+	core.spawnService.addLairTemplate('corellia_humbaba_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_large.iff')
+	return

scripts/mobiles/lairs/corellia_krahbu_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('krahbu')
+		
+	core.spawnService.addLairTemplate('corellia_krahbu_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small.iff')
+	return

scripts/mobiles/lairs/corellia_mountain_murra_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('mountain_murra')
+		
+	core.spawnService.addLairTemplate('corellia_mountain_murra_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_dead_log_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_murra_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('murra')
+		
+	core.spawnService.addLairTemplate('corellia_murra_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_dead_log_small.iff')
+	return

scripts/mobiles/lairs/corellia_paralope_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('paralope')
+		
+	core.spawnService.addLairTemplate('corellia_paralope_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small.iff')
+	return

scripts/mobiles/lairs/corellia_plumed_rasp_eyrie_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('majestic_plumed_rasp')
+		
+	core.spawnService.addLairTemplate('corellia_plumed_rasp_eyrie_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_plumed_rasp_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('plumed_rasp')
+		
+	core.spawnService.addLairTemplate('corellia_plumed_rasp_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_small.iff')
+	return

scripts/mobiles/lairs/corellia_razor_cat_pride_lair_1.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('razor_cat')
+	mobileTemplates.add('female_razor_cat')
+	
+	core.spawnService.addLairTemplate('corellia_razor_cat_pride_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large.iff')
+	return

scripts/mobiles/lairs/corellia_razor_cat_pride_lair_2.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('razor_cat')
+	mobileTemplates.add('female_razor_cat')
+	mobileTemplates.add('razor_cat_eviscerator')
+	
+	core.spawnService.addLairTemplate('corellia_razor_cat_pride_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large_evil_fire_red.iff')
+	return

scripts/mobiles/lairs/corellia_savage_humbaba_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('savage_humbaba')
+		
+	core.spawnService.addLairTemplate('corellia_savage_humbaba_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_large_evil_fire_red.iff')
+	return

scripts/mobiles/lairs/corellia_scavenger_rat_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('scavenger_rat')
+		
+	core.spawnService.addLairTemplate('corellia_scavenger_rat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small.iff')
+	return

scripts/mobiles/lairs/corellia_sharnaff_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('sharnaff')
+		
+	core.spawnService.addLairTemplate('corellia_sharnaff_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return

scripts/mobiles/lairs/corellia_sharnaff_lair_2.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('sharnaff')
+	mobileTemplates.add('sharnaff_reckless_ravager')
+	mobileTemplates.add('sharnaff_bull')	
+	
+	core.spawnService.addLairTemplate('corellia_sharnaff_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_slice_hound_lair_1.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('female_slice_hound')
+	mobileTemplates.add('slice_hound')
+	
+	core.spawnService.addLairTemplate('corellia_grassland_slice_hound_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones.iff')
+	return

scripts/mobiles/lairs/corellia_swamp_gurrcat_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('gulginaw')
+		
+	core.spawnService.addLairTemplate('corellia_gulginaw_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones.iff')
+	return

scripts/mobiles/lairs/corellia_swamp_humbaba_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('swamp_humbaba')
+		
+	core.spawnService.addLairTemplate('corellia_swamp_humbaba_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_large_fog_red.iff')
+	return

scripts/mobiles/lairs/corellia_tabage_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('tabage')
+		
+	core.spawnService.addLairTemplate('corellia_tabage_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_small.iff')
+	return

scripts/mobiles/lairs/corellia_tabage_lair_2.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('tabage_scavenger')
+		
+	core.spawnService.addLairTemplate('corellia_tabage_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_small_evil_fire_small.iff')
+	return

scripts/mobiles/lairs/corellia_violent_krahbu_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('violent_krahbu')
+		
+	core.spawnService.addLairTemplate('corellia_krahbu_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small_evil_fire_red..iff')
+	return

scripts/mobiles/lairs/corellia_vrelt_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('vrelt')
+		
+	core.spawnService.addLairTemplate('corellia_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small.iff')
+	return

scripts/mobiles/lairs/corellia_vynock_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('vynock')
+		
+	core.spawnService.addLairTemplate('corellia_vynock_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_small.iff')
+	return

scripts/mobiles/lairs/corellia_war_gronda_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('war_gronda')
+		
+	core.spawnService.addLairTemplate('corellia_war_gronda_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_green.iff')
+	return

scripts/mobiles/lairs/corellia_wooded_paralope_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('wooded_paralope')
+		
+	core.spawnService.addLairTemplate('corellia_wooded_paralope_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small_evil_fire_green.iff')
+	return

scripts/mobiles/lairs/corellia_wrix_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('wrix')
+		
+	core.spawnService.addLairTemplate('corellia_wrix_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return

scripts/mobiles/lairs/dantooine_ancient_graul_lair_1.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('ancient_graul')
+
+	
+	core.spawnService.addLairTemplate('dantooine_ancient_graul_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/cave_small_light.iff')
+	return

scripts/mobiles/lairs/dantooine_bol_lair_1.py

@@ -3,7 +3,9 @@ from java.util import Vector
 
 def addTemplate(core):
 	mobileTemplates = Vector()
-	mobileTemplates.add('lesser_plains_bol')
-	mobileTemplates.add('seething_bol_crusher')
-	mobileTemplates.add('swift_charging_bol')
-	core.spawnService.addLairTemplate('dantooine_bol_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff')
+	mobileTemplates.add('bol')
+	mobileTemplates.add('bol_pack_runner')
+	mobileTemplates.add('baby_bol')
+	
+	core.spawnService.addLairTemplate('dantooine_bol_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large.iff')
+	return

scripts/mobiles/lairs/dantooine_bol_lair_2.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('bol')
+	mobileTemplates.add('bol_pack_runner')
+	mobileTemplates.add('baby_bol')
+	
+	core.spawnService.addLairTemplate('dantooine_bol_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return

scripts/mobiles/lairs/dantooine_bol_lair_3.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('bol')
+	mobileTemplates.add('bol_pack_runner')
+	mobileTemplates.add('swift_charging_bol')
+	
+	core.spawnService.addLairTemplate('dantooine_bol_lair_3', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return

scripts/mobiles/lairs/dantooine_bol_lair_4.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('bol')
+	mobileTemplates.add('bol_pack_runner')
+	mobileTemplates.add('swift_charging_bol')
+	
+	core.spawnService.addLairTemplate('dantooine_bol_lair_4', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large.iff')
+	return

scripts/mobiles/lairs/dantooine_bol_lair_5.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('lesser_plains_bol')
+	
+	core.spawnService.addLairTemplate('dantooine_bol_lair_5', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_small.iff')
+	return

scripts/mobiles/lairs/dantooine_bol_lair_6.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('lesser_plains_bol')
+	
+	core.spawnService.addLairTemplate('dantooine_bol_lair_6', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_small.iff')
+	return

scripts/mobiles/lairs/dantooine_bol_lair_7.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('seething_bol_crusher')
+	
+	core.spawnService.addLairTemplate('dantooine_bol_lair_6', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return

scripts/mobiles/lairs/dantooine_bol_lair_8.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('seething_bol_crusher')
+	
+	core.spawnService.addLairTemplate('dantooine_bol_lair_6', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large.iff')
+	return

scripts/mobiles/lairs/dantooine_frenzied_graul_lair_1.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('frenzied_graul')
+
+	
+	core.spawnService.addLairTemplate('dantooine_frenzied_graul_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/cave_small_dark.iff')
+	return

scripts/mobiles/lairs/dantooine_graul_lair_1.py

@@ -2,8 +2,5 @@ import sys
 from java.util import Vector
 
 def addTemplate(core):
-	mobileTemplates = Vector()
-	mobileTemplates.add('lesser_plains_bol')
-	mobileTemplates.add('seething_bol_crusher')
-	mobileTemplates.add('swift_charging_bol')
-	core.spawnService.addLairTemplate('dantooine_bol_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff')
+	core.spawnService.addLairTemplate('dantooine_graul_mauler_lair_1', 'graul', 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return

scripts/mobiles/lairs/dantooine_graul_mauler_lair_1.py

@@ -2,4 +2,5 @@ import sys
 from java.util import Vector
 
 def addTemplate(core):
-	core.spawnService.addLairTemplate('dantooine_graul_mauler_lair_1', 'graul_mauler', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff')
+	core.spawnService.addLairTemplate('dantooine_graul_mauler_lair_1', 'graul_mauler', 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_red.iff')
+	return

scripts/mobiles/lairs/dantooine_graul_mauler_lair_2.py

@@ -0,0 +1,11 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	
+	mobileTemplates = Vector()
+	mobileTemplates.add('graul_mauler')
+	mobileTemplates.add('graul_mangler')
+	
+	core.spawnService.addLairTemplate('dantooine_graul_mauler_lair_1', mobileTemplates , 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_red.iff')
+	return

scripts/mobiles/lairs/dantooine_huurton_howler_lair_1.py

@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('huurton_howler')
+	
+	core.spawnService.addLairTemplate('dantooine_huurton_howler_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/bramble_light.iff')
+	return

scripts/mobiles/lairs/dantooine_huurton_howler_lair_2.py

@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('huurton_howler')
+	mobileTemplates.add('huurton_bloodhunter')
+	
+	core.spawnService.addLairTemplate('dantooine_huurton_howler_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_large_fog_mustard.iff')
+	return