Merge pull request #2 from ProjectSWGCore/master

pull
2026-09-11 21:45:43 -04:00 · 2014-08-07 21:37:46 -07:00
parent bae95657d8 8ae66375da
commit 5cbdfa7551
134 changed files with 1385 additions and 81 deletions
@@ -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):
@@ -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('GM: Adjust Lot Count: Completed Successfully for ' + target.getFirstName(), 0)
+	return
@@ -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.broadcastGalaxy(commandString)
+	return
@@ -0,0 +1,11 @@
+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())
+	return
@@ -0,0 +1,20 @@
+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(actor.getFirstName() + ' has removed ' + arg1 + ' credits from Project SWG\'s bank.', 0)
+		
+	if actor and target:
+		target.setCashCredits(target.getCashCredits() + int(arg1))
+		target.sendSystemMessage('You have recieved ' + arg1 + ' credits from ' + actor.getFirstName(), 0)
+		actor.sendSystemMessage('You have transferred ' + arg1 + ' credits to ' + target.getFirstName(), 0)
+
+		
+	return
@@ -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:
@@ -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('GM Command Successfull: You are no longer Invisible.', 0)
+			
+		else:
+			actor.setInStealth(True)
+			actor.setRadarVisible(False)
+			actor.sendSystemMessage('GM Command Successfull: You are now Invisible.', 0)
+	
+	if actor.getOptionsBitmask() == 128:
+		actor.setOptionsBitmask(Options.NONE)
+		actor.sendSystemMessage('GM Command Successfull: You are now Invulnerable.', 0)
+	
+	
+	elif actor.getOptionsBitmask() == 0:
+		actor.setOptionsBitmask(Options.ATTACKABLE)
+		print(actor.getOptionsBitmask())
+		
+		actor.sendSystemMessage('GM Command Successfull: You are no longer Invulnerable.', 0)
+
+	return
+	
+	
@@ -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('GM: Set Rank: 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('GM: Set Rank: 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('GM: Set Rank: 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('GM: Set Rank: Completed Successfully', 0)
+	
+	return
@@ -17,6 +17,8 @@ def run(core, actor, target, commandString):
 	
 	playerObject = actor.getSlottedObject('ghost')
 	
+	global str
+	
 	if not playerObject:
 		return
 		
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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	
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,4 +6,6 @@ def addTemplate(core):
 	mobileTemplates.add('huurton')
 	mobileTemplates.add('huurton_howler')
 	mobileTemplates.add('huurton_matron')
-	core.spawnService.addLairTemplate('dantooine_huurton_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff')
+	
+	core.spawnService.addLairTemplate('dantooine_huurton_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff')
+	return
@@ -6,4 +6,6 @@ def addTemplate(core):
 	mobileTemplates.add('huurton_pub')
 	mobileTemplates.add('huurton_reaper')
 	mobileTemplates.add('huurton_stalker')
-	core.spawnService.addLairTemplate('dantooine_huurton_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff')
+	
+	core.spawnService.addLairTemplate('dantooine_huurton_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff')
+	return
@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('huurton_matron')
+
+	
+	core.spawnService.addLairTemplate('dantooine_huurton_matron_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/bramble_light.iff')
+	return
@@ -1,4 +1,5 @@
 import sys

 def addTemplate(core):
-	core.spawnService.addLairTemplate('dantooine_piket_lair_1', 'piket', 15, 'object/tangible/lair/base/shared_earthmound_light.iff')
+	core.spawnService.addLairTemplate('dantooine_piket_lair_1', 'piket', 15, 'object/tangible/lair/base/shared_earthmound_light.iff')
+	return
@@ -5,5 +5,6 @@ def addTemplate(core):
 	mobileTemplates = Vector()
 	mobileTemplates.add('piket_longhorn')
 	mobileTemplates.add('piket_longhorn_female')
-	mobileTemplates.add('piket_plains_walker')
-	core.spawnService.addLairTemplate('dantooine_piket_longhorn_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_earthmound_light.iff')
+	
+	core.spawnService.addLairTemplate('dantooine_piket_longhorn_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/lair_base_mound_bramble_dark.iff')
+	return
@@ -0,0 +1,10 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('piket_longhorn')
+	mobileTemplates.add('piket_longhorn_female')
+	
+	core.spawnService.addLairTemplate('dantooine_piket_longhorn_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return
@@ -4,4 +4,6 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplates = Vector()
 	mobileTemplates.add('piket_plains_walker')
-	core.spawnService.addLairTemplate('dantooine_piket_plains_walker_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_earthmound_light.iff')
+	
+	core.spawnService.addLairTemplate('dantooine_piket_plains_walker_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_earthmound_light.iff')
+	return
@@ -0,0 +1,5 @@
+import sys
+
+def addTemplate(core):
+	core.spawnService.addLairTemplate('dantooine_piket_protector_lair_1', 'fierce_piket_protector', 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff')
+	return
@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('bile_drenched_quenker')
+
+	core.spawnService.addLairTemplate('dantooine_quenker_bile_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small_fog_green.iff')
+	return
@@ -0,0 +1,9 @@
+import sys
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplates = Vector()
+	mobileTemplates.add('bile_drenched_quenker')
+
+	core.spawnService.addLairTemplate('dantooine_quenker_bile_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_fog_green.iff')
+	return
--- a/Show More
+++ b/Show More