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

Conflicts:
	src/services/resources/ResourceService.java

options.cfg

@@ -1,7 +1,7 @@
 LOAD.SNAPSHOT_OBJECTS=1
 LOAD.BUILDOUT_OBJECTS=1
 #LOAD.BUILDOUT_ONLY_FOR="dathomir"
-LOAD.RESOURCE.SYSTEM=1
+LOAD.RESOURCE.SYSTEM=0
 
 # Misc
-CLEAN.ODB.FOLDERS=0
+CLEAN.ODB.FOLDERS=0

scripts/commands/server.py

@@ -1,5 +1,6 @@
 import sys
 from engine.resources.scene import Point3D
+from resources.datatables import GalaxyStatus
 
 def setup():
     return
@@ -26,9 +27,9 @@ def run(core, actor, target, commandString):
 		return
 	
 	if command == 'lockServer':
-		core.setGalaxyStatus(3)
+		core.setGalaxyStatus(GalaxyStatus.Locked)
 	if command == 'unlockServer':
-		core.setGalaxyStatus(2)
+		core.setGalaxyStatus(GalaxyStatus.Online)
 	if command == 'info':
 		actor.sendSystemMessage(str(core.getActiveZoneClients()) + ' online characters.', 0)
 	if command == 'shutdown':

scripts/commands/waypoint.py

@@ -5,123 +5,124 @@ import sys
 
 
 def run(core, actor, target, commandString):
-    validPlanets = ["tatooine", "naboo", "corellia", "rori", "talus", "yavin4", "endor", "lok", "dantooine", "dathomir", "kachirho", "etyyy", "khowir", "mustafar"]
-    validColors = ["blue", "green", "orange", "purple", "white", "yellow"]
-    crc = CRC
-    commandArgs = commandString.split(" ")
-    actorPlayer = actor.getSlottedObject("ghost")
-    
-    #/wp PLANET X Z Y COLOR NAME
-    if commandArgs[0] in validPlanets and commandArgs[4] in validColors:
-        try:
-            float(commandArgs[1])
-            float(commandArgs[2])
-            float(commandArgs[3])
-        except ValueError:
-            return
-        planet = core.terrainService.getPlanetByName(commandArgs[0])
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', planet, float(commandArgs[1]), float(commandArgs[2]), float(commandArgs[3]))
-        waypoint.setActive(True)
-        waypoint.setColor(colorCheck(commandArgs[4]))
-        name = commandString.split(" ", 5)
-        waypoint.setName(name[5])
-        waypoint.setPlanetCRC(crc.StringtoCRC(planet.getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    
+	validPlanets = ["tatooine", "naboo", "corellia", "rori", "talus", "yavin4", "endor", "lok", "dantooine", "dathomir", "kachirho", "etyyy", "khowir", "mustafar"]
+	validColors = ["blue", "green", "orange", "purple", "white", "yellow"]
+	crc = CRC
+	commandArgs = commandString.split(" ")
+	actorPlayer = actor.getSlottedObject("ghost")
 
-    #/wp X Z Y NAME
-    if len(commandArgs) >= 4 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]) and isFloat(commandArgs[2]):
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[2]), float(commandArgs[1]))
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        name = commandString.split(" ", 3)
-        waypoint.setName(name[3])
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    #/wp X Z Name
-    elif len(commandArgs) >= 3 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[1]), actor.getWorldPosition().y)
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        name = commandString.split(" ", 2)
-        waypoint.setName(name[2])
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    #/wp X Z
-    elif len(commandArgs) >= 2 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[1]), actor.getWorldPosition().y)
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        waypoint.setName("Waypoint")
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    
-    #/wp planet x z y name
-    elif len(commandArgs) >= 3 and isFloat(commandArgs[2]) and isFloat(commandArgs[3]) and isFloat(commandArgs[4]):
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', core.terrainService.getPlanetByName(commandArgs[1]), float(commandArgs[2]), float(commandArgs[4]), float(commandArgs[3]))
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        name = commandString.split(" ", 5)
-        if name == "":
-            name = "Waypoint"
+	#/wp PLANET X Z Y COLOR NAME
+	if len(commandArgs) > 4 and commandArgs[0] in validPlanets and commandArgs[4] in validColors:
+		try:
+			float(commandArgs[1])
+			float(commandArgs[2])
+			float(commandArgs[3])
+		except ValueError:
+			return
 
-        waypoint.setName(name[5])
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
-        return
-    
-    #/wp
-    else:
-        waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), actor.getWorldPosition().x, actor.getWorldPosition().z, actor.getWorldPosition().y)
-        waypoint.setActive(True)
-        waypoint.setColor(WaypointObject.BLUE)
-        if commandString == '':
-        	waypoint.setName(actor.getPlanet().name.capitalize())
-        else:
-        	waypoint.setName(commandString)
-        waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
-        actorPlayer.waypointAdd(waypoint)
-        actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
-        return
-    
-    return
+		planet = core.terrainService.getPlanetByName(commandArgs[0])
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', planet, float(commandArgs[1]), float(commandArgs[3]), float(commandArgs[2]))
+		waypoint.setActive(True)
+		waypoint.setColor(colorCheck(commandArgs[4]))
+		name = commandString.split(" ", 5)
+		waypoint.setName(name[5])
+		waypoint.setPlanetCRC(crc.StringtoCRC(planet.getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp X Z Y NAME
+	elif len(commandArgs) > 3 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]) and isFloat(commandArgs[2]):
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[2]), float(commandArgs[1]))
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		name = commandString.split(" ", 3)
+		waypoint.setName(name[3])
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp X Z Name
+	elif len(commandArgs) > 2 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[1]), actor.getWorldPosition().y)
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		name = commandString.split(" ", 2)
+		waypoint.setName(name[2])
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp X Z
+	elif len(commandArgs) == 2 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), float(commandArgs[0]), float(commandArgs[1]), actor.getWorldPosition().y)
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		waypoint.setName("Waypoint")
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp planet x z y name
+	elif len(commandArgs) > 4 and commandArgs[0] in validPlanets and isFloat(commandArgs[1]) and isFloat(commandArgs[2]) and isFloat(commandArgs[3]):
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', core.terrainService.getPlanetByName(commandArgs[0]), float(commandArgs[1]), float(commandArgs[3]), float(commandArgs[2]))
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		name = commandString.split(" ", 4)
+		if name == "":
+			name = "Waypoint"
+
+		waypoint.setName(name[4])
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
+		return
+
+	#/wp
+	else:
+		waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), actor.getWorldPosition().x, actor.getWorldPosition().z, actor.getWorldPosition().y)
+		waypoint.setActive(True)
+		waypoint.setColor(WaypointObject.BLUE)
+		if commandString == '':
+			waypoint.setName(actor.getPlanet().name.capitalize())
+		else:
+			waypoint.setName(commandString)
+		waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
+		waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
+		actorPlayer.waypointAdd(waypoint)
+		actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
+		return
+	return
 
 def colorCheck(validcolors):
-    if validcolors == "blue":
-        return WaypointObject.BLUE
-    if validcolors == "green":
-        return WaypointObject.GREEN
-    if validcolors == "orange":
-        return WaypointObject.ORANGE
-    if validcolors == "purple":
-        return WaypointObject.PURPLE
-    if validcolors == "white":
-        return WaypointObject.WHITE
-    if validcolors == "yellow":
-        return WaypointObject.YELLOW
-    return
+	if validcolors == "blue":
+		return WaypointObject.BLUE
+	if validcolors == "green":
+		return WaypointObject.GREEN
+	if validcolors == "orange":
+		return WaypointObject.ORANGE
+	if validcolors == "purple":
+		return WaypointObject.PURPLE
+	if validcolors == "white":
+		return WaypointObject.WHITE
+	if validcolors == "yellow":
+		return WaypointObject.YELLOW
+	return
 
 def isFloat(string):
-    try:
-        stringFloat = float(string)
-    except ValueError:
-        return False
-    
-    else:
-        return True
-    return
+	try:
+		stringFloat = float(string)
+	except ValueError:
+		return False
+	
+	else:
+		return True
+	return

scripts/houses/player_house_generic_small_style_01.py

@@ -15,6 +15,7 @@ def setup(housingTemplates):
 	houseTemplate.addPlaceablePlanet("lok")
 	houseTemplate.setDefaultItemLimit(200)
 	houseTemplate.setBaseMaintenanceRate(8)
+	houseTemplate.setDestructionFee(800)
 	
 	housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
 	return

scripts/mobiles/endor/aged_lantern_bird.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Avian Bones")
 	mobileTemplate.setBoneAmount(46)
 	mobileTemplate.setSocialGroup("lantern")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_lantern.iff')
@@ -37,6 +37,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_slash_4')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/arachne_drone.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('arachne_drone')
+	mobileTemplate.setLevel(64)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(.5)
+	mobileTemplate.setMeatType("Insect Meat")
+	mobileTemplate.setMeatAmount(1)
+	mobileTemplate.setSocialGroup("arachne")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_arachne_hatchling.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	attacks.add('bm_damage_poison_3')
+	attacks.add('bm_defensive_3')
+	attacks.add('bm_puncture_1')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('arachne_drone', mobileTemplate)
+	return

scripts/mobiles/endor/arachne_fleshripper.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('arachne_fleshripper')
+	mobileTemplate.setLevel(64)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(.5)
+	mobileTemplate.setMeatType("Insect Meat")
+	mobileTemplate.setMeatAmount(1)
+	mobileTemplate.setSocialGroup("arachne")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_arachne_hatchling.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	attacks.add('bm_damage_poison_3')
+	attacks.add('bm_defensive_3')
+	attacks.add('bm_puncture_1')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('arachne_fleshripper', mobileTemplate)
+	return

scripts/mobiles/endor/arachne_hatchling.py

@@ -21,20 +21,23 @@ def addTemplate(core):
 	mobileTemplate.setMeatType("Insect Meat")
 	mobileTemplate.setMeatAmount(1)
 	mobileTemplate.setSocialGroup("arachne")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_arachne.iff')
+	templates.add('object/mobile/shared_arachne_hatchling.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_damage_poison_3')
+	attacks.add('bm_defensive_3')
+	attacks.add('bm_puncture_1')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/arachne_queen.py

@@ -21,12 +21,12 @@ def addTemplate(core):
 	mobileTemplate.setMeatType("Insect Meat")
 	mobileTemplate.setMeatAmount(60)
 	mobileTemplate.setSocialGroup("arachne")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_arachne.iff')
+	templates.add('object/mobile/shared_arachne_hatchling.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -35,6 +35,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_damage_poison_3')
+	attacks.add('bm_defensive_3')
+	attacks.add('bm_puncture_1')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/arachne_warrior.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('arachne_warrior')
+	mobileTemplate.setLevel(64)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(.5)
+	mobileTemplate.setMeatType("Insect Meat")
+	mobileTemplate.setMeatAmount(1)
+	mobileTemplate.setSocialGroup("arachne")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_arachne_hatchling.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	attacks.add('bm_damage_poison_3')
+	attacks.add('bm_defensive_3')
+	attacks.add('bm_puncture_1')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('arachne_warrior', mobileTemplate)
+	return

scripts/mobiles/endor/arachne_webmaster.py

@@ -26,15 +26,18 @@ def addTemplate(core):
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_arachne.iff')
+	templates.add('object/mobile/shared_arachne_hatchling.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_damage_poison_3')
+	attacks.add('bm_defensive_3')
+	attacks.add('bm_puncture_1')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/arachne_widow.py

@@ -27,7 +27,7 @@ def addTemplate(core):
 	
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_arachne.iff')
+	templates.add('object/mobile/shared_arachne_hatchling.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -36,6 +36,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_damage_poison_3')
+	attacks.add('bm_defensive_3')
+	attacks.add('bm_puncture_1')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/archaic_gondula_ritualist.py

@@ -20,7 +20,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup('gondula tribe')
 	mobileTemplate.setAssistRange(1)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	
 	templates = Vector()

scripts/mobiles/endor/archaic_jinda_ritualist.py

@@ -20,7 +20,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup('jinda tribe')
 	mobileTemplate.setAssistRange(1)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	
 	templates = Vector()

scripts/mobiles/endor/archaic_panshee_ritualist.py

@@ -20,7 +20,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup('panshee tribe')
 	mobileTemplate.setAssistRange(1)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	
 	templates = Vector()

scripts/mobiles/endor/bark_mite_burrower.py

@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("bark mite")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bark_mite.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bark_mite_burrower_collector.py

@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("bark mite")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bark_mite.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bark_mite_burrower_drone.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("bark mite")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bark_mite.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bark_mite_burrower_queen.py

@@ -0,0 +1,43 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('bark_mite_burrower_queen')
+	mobileTemplate.setLevel(63)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("bark mite")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_bark_mite_burrower_queen.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()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('bark_mite_burrower_queen', mobileTemplate)
+	return

scripts/mobiles/endor/bark_mite_burrower_swarmling.py

@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("bark mite")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bark_mite.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bark_mite_burrower_worker.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("bark mite")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bark_mite.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
 	mobileTemplate.setDefaultAttack('creatureRangedAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bedraggled_korga_laborer.py

@@ -20,7 +20,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup('korga tribe')
 	mobileTemplate.setAssistRange(1)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	
 	templates = Vector()

scripts/mobiles/endor/bedraggled_pubam_laborer.py

@@ -20,7 +20,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup('pubam tribe')
 	mobileTemplate.setAssistRange(1)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	
 	templates = Vector()

scripts/mobiles/endor/beguilding_korga_scout.py

@@ -20,7 +20,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup('korga tribe')
 	mobileTemplate.setAssistRange(1)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	
 	templates = Vector()

scripts/mobiles/endor/beguiling_donkuwah_scout.py

@@ -20,7 +20,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup('donkuwah tribe')
 	mobileTemplate.setAssistRange(1)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	
 	templates = Vector()

scripts/mobiles/endor/beguiling_pubam_scout.py

@@ -20,6 +20,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup('pubam tribe')
 	mobileTemplate.setAssistRange(1)
 	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	
 	templates = Vector()

scripts/mobiles/endor/blood_drenched_merek_king.py

@@ -26,7 +26,7 @@ def addTemplate(core):
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_merek.iff')
+	templates.add('object/mobile/shared_blood_drenched_merek_king.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()

scripts/mobiles/endor/blood_frenzied_boar_wolf.py

@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_charge_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blood_stained_merek.py

@@ -35,6 +35,10 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bloodseeker_mite.py

@@ -0,0 +1,43 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('bloodseeker_mite')
+	mobileTemplate.setLevel(64)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("bloodseeker")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_bloodseeker_mite.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('bloodseeker_mite', mobileTemplate)
+	return

scripts/mobiles/endor/bloodseeker_mite_drone.py

@@ -21,6 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("bloodseeker")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bloodseeker.iff')
@@ -32,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bloodseeker_mite_guardian.py

@@ -0,0 +1,43 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('bloodseeker_mite_guardian')
+	mobileTemplate.setLevel(64)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("bloodseeker")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_bloodseeker_mite.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('bloodseeker_mite_guardian', mobileTemplate)
+	return

scripts/mobiles/endor/bloodseeker_mite_hunter.py

@@ -0,0 +1,43 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('bloodseeker_mite_drone')
+	mobileTemplate.setLevel(64)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("bloodseeker")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_bloodseeker.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()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('bloodseeker_mite_drone', mobileTemplate)
+	return

scripts/mobiles/endor/bloodseeker_mite_queen.py

@@ -19,12 +19,12 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(True)
 	mobileTemplate.setScale(1.2)
 	mobileTemplate.setSocialGroup("bloodseeker")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_bloodseeker.iff')
+	templates.add('object/mobile/shared_bloodseeker_mite_queen.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blooming_jax.py

@@ -23,12 +23,12 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(25)
 	mobileTemplate.setSocialGroup("jax")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_jax.iff')
+	templates.add('object/mobile/shared_blooming_jax.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -37,6 +37,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_2')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blurrg.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("blurrg")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_blurrg.iff')
@@ -33,6 +33,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blurrg_hunter.py

@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("blurrg")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_blurrg.iff')
@@ -33,6 +33,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blurrg_pup.py

@@ -19,12 +19,12 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(.5)
 	mobileTemplate.setSocialGroup("blurrg")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_blurrg.iff')
+	templates.add('object/mobile/shared_blurrg_pup.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -33,6 +33,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blurrg_raptor.py

@@ -20,7 +20,6 @@ def addTemplate(core):
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("blurrg")
 	mobileTemplate.setAssistRange(12)
-	mobileTemplate.setStalker(True)
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
@@ -33,6 +32,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blurrg_sand_crawler.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("blurrg")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_blurrg.iff')
@@ -33,6 +33,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blurrg_tracker.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("blurrg")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_blurrg.iff')
@@ -33,6 +33,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/blushing_jax.py

@@ -23,12 +23,12 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(25)
 	mobileTemplate.setSocialGroup("jax")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_jax.iff')
+	templates.add('object/mobile/shared_blushing_jax.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -37,6 +37,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/boar_wolf.py

@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("boar wolf")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_boar_wolf.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_charge_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/boar_wolf_cub.py

@@ -19,12 +19,12 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(.5)
 	mobileTemplate.setSocialGroup("boar wolf")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_boar_wolf.iff')
+	templates.add('object/mobile/shared_boar_wolf_cub.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_charge_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/boar_wolf_ravager.py

@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("boar wolf")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_boar_wolf.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_charge_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bolle_bol_bark_biter.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(180)
 	mobileTemplate.setSocialGroup("bolle bol")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bolle_bol.iff')
@@ -37,6 +37,11 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_5')
+	attacks.add('bm_charge_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bolle_bol_calf.py

@@ -23,12 +23,12 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(180)
 	mobileTemplate.setSocialGroup("bolle bol")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_bolle_bol.iff')
+	templates.add('object/mobile/shared_bolle_bol_calf.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -37,6 +37,11 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_5')
+	attacks.add('bm_charge_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bolle_bol_colt.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(180)
 	mobileTemplate.setSocialGroup("bolle bol")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bolle_bol.iff')
@@ -37,6 +37,11 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_5')
+	attacks.add('bm_charge_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bolle_bol_female.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(180)
 	mobileTemplate.setSocialGroup("bolle bol")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bolle_bol.iff')
@@ -37,6 +37,11 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_5')
+	attacks.add('bm_charge_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bolle_bol_herd_leader.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(180)
 	mobileTemplate.setSocialGroup("bolle bol")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bolle_bol.iff')
@@ -37,6 +37,11 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_5')
+	attacks.add('bm_charge_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bolle_bol_male.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(180)
 	mobileTemplate.setSocialGroup("bolle bol")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bolle_bol.iff')
@@ -37,6 +37,11 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_5')
+	attacks.add('bm_charge_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bolle_bol_stomper.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(180)
 	mobileTemplate.setSocialGroup("bolle bol")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bolle_bol.iff')
@@ -37,6 +37,11 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_5')
+	attacks.add('bm_charge_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bordok_ancient.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("bordok")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bordok.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_defensive_4')
+	attacks.add('bm_kick_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bordok_foal.py

@@ -19,12 +19,12 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(.5)
 	mobileTemplate.setSocialGroup("bordok")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_bordok.iff')
+	templates.add('object/mobile/shared_bordok_foal.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_defensive_4')
+	attacks.add('bm_kick_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bordok_herd_master.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1.2)
 	mobileTemplate.setSocialGroup("bordok")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bordok.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_defensive_4')
+	attacks.add('bm_kick_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/bordok_mare.py

@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("bordok")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_bordok.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_defensive_4')
+	attacks.add('bm_kick_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/borgle_life_sapper.py

@@ -0,0 +1,47 @@
+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('borgle_life_sapper')
+	mobileTemplate.setLevel(63)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setHideType("Leathery Hide")
+	mobileTemplate.setHideAmount(5)
+	mobileTemplate.setBoneType("Avian Bones")
+	mobileTemplate.setBoneAmount(5)
+	mobileTemplate.setSocialGroup("borgle")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(True)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_borgle.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	attacks.add('bm_health_leech_2')
+	attacks.add('bm_puncture_2')
+	attacks.add('bm_wing_buffet_4')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('borgle_life_sapper', mobileTemplate)
+	return

scripts/mobiles/endor/bounding_jax.py

@@ -23,12 +23,12 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(25)
 	mobileTemplate.setSocialGroup("jax")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_jax.iff')
+	templates.add('object/mobile/shared_bearded_jax.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()

scripts/mobiles/endor/cowardly_gurreck.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("gurreck")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_gurreck.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_2')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/crazed_gurreck.py

@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_2')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/crimson_blurrg.py

@@ -19,7 +19,7 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("blurrg")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
@@ -33,6 +33,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/delirious_merek_avenger.py

@@ -21,7 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setHideType("Leathery Hide")
 	mobileTemplate.setHideAmount(45)
 	mobileTemplate.setSocialGroup("merek")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
@@ -30,11 +30,15 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureRangedAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/deranged_mantigrue.py

@@ -33,6 +33,10 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_slash_4')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/deranged_ravisher.py

@@ -11,7 +11,7 @@ def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 		
 	mobileTemplate.setCreatureName('squill_deranged_ravisher')		
-	mobileTemplate.setLevel(33)
+	mobileTemplate.setLevel(35)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 
 	mobileTemplate.setMinSpawnDistance(4)

scripts/mobiles/endor/desert_gurreck_charger.py

@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_2')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/desert_scavenger.py

@@ -25,10 +25,10 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("borgle")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_borgle.iff')
+	templates.add('object/mobile/shared_gackle_bat.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()

scripts/mobiles/endor/diminutive_bounding_jax.py

@@ -9,7 +9,7 @@ from java.util import Vector
 
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
-		
+
 	mobileTemplate.setCreatureName('jax_bounding_dwarf')		
 	mobileTemplate.setLevel(25)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)
@@ -23,22 +23,22 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(25)
 	mobileTemplate.setSocialGroup("jax")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
-	
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+
 	templates = Vector()
-	templates.add('object/mobile/shared_jax.iff')
+	templates.add('object/mobile/shared_bearded_jax.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('diminutive_bounding_jax', mobileTemplate)
 	return

scripts/mobiles/endor/diseased_blurrg.py

@@ -33,6 +33,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/domesticated_blurrg.py

@@ -19,9 +19,9 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(.8)
 	mobileTemplate.setSocialGroup("self")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_blurrg.iff')
@@ -33,6 +33,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_hamstring_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/domesticated_merek.py

@@ -21,9 +21,9 @@ def addTemplate(core):
 	mobileTemplate.setHideType("Leathery Hide")
 	mobileTemplate.setHideAmount(45)
 	mobileTemplate.setSocialGroup("self")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_merek.iff')
@@ -35,6 +35,10 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureRangedAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/elder_hanadak_matriarch.py

@@ -26,12 +26,12 @@ def addTemplate(core):
 	mobileTemplate.setBoneAmount(35)
 	mobileTemplate.setSocialGroup("hanadak")
 	mobileTemplate.setAssistRange(12)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	mobileTemplate.setStalker(True)
 	
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_hanadak.iff')
+	templates.add('object/mobile/shared_elder_hanadak_matriarch.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -40,6 +40,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/elder_squall.py

@@ -23,8 +23,8 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Animal Bones")
 	mobileTemplate.setBoneAmount(8)
 	mobileTemplate.setSocialGroup("squall")
-	mobileTemplate.setAssistRange(0)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	mobileTemplate.setStalker(True)
 	
 	templates = Vector()
@@ -37,6 +37,7 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/erratic_swirl_prong.py

@@ -19,8 +19,8 @@ def addTemplate(core):
 	mobileTemplate.setDeathblow(False)
 	mobileTemplate.setScale(1)
 	mobileTemplate.setSocialGroup("swirl prong")
-	mobileTemplate.setAssistRange(0)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	mobileTemplate.setStalker(True)
 	
 	templates = Vector()
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_charge_2')
+	attacks.add('bm_defensive_2')
+	attacks.add('bm_slash_2')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/festering_squill.py

@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_defensive_4')
+	attacks.add('bm_disease_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/fierce_borgle.py

@@ -37,6 +37,8 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_puncture_2')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/gleaming_lantern_bird.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Avian Bones")
 	mobileTemplate.setBoneAmount(46)
 	mobileTemplate.setSocialGroup("lantern")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_lantern_bird.iff')
@@ -37,6 +37,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_slash_4')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/gorax.py

@@ -0,0 +1,40 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('gorax')
+	mobileTemplate.setLevel(83)
+	mobileTemplate.setDifficulty(Difficulty.BOSS)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("gorax")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_gorax.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('gorax', mobileTemplate)
+	return

scripts/mobiles/endor/gurreck.py

@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_2')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/gurreck_forest_stalker.py

@@ -10,7 +10,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 		
-	mobileTemplate.setCreatureName('woodland_gurreck')	
+	mobileTemplate.setCreatureName('woodland_gurreck')
 	mobileTemplate.setLevel(64)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_2')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/hanadak_ancient.py

@@ -16,7 +16,7 @@ def addTemplate(core):
 
 	mobileTemplate.setMinSpawnDistance(4)
 	mobileTemplate.setMaxSpawnDistance(8)
-	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setDeathblow(True)
 	mobileTemplate.setScale(1.2)
 	mobileTemplate.setMeatType("Carnivore Meat")
 	mobileTemplate.setMeatAmount(40)
@@ -39,6 +39,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/hanadak_drifter.py

@@ -37,6 +37,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/highland_remmer.py

@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
 	mobileTemplate.setDefaultAttack('creatureSpitAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/hilltop_gurreck_hunter.py

@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_2')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/insane_mantigrue_berserker.py

@@ -33,6 +33,10 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_3')
+	attacks.add('bm_damage_poison_3')
+	attacks.add('bm_slash_3')
+	attacks.add('bm_wing_buffet_3')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/king_merek_harvester.py

@@ -26,7 +26,7 @@ def addTemplate(core):
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_merek.iff')
+	templates.add('object/mobile/shared_king_merek_harvester.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
@@ -35,6 +35,10 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureRangedAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/lantern_bird.py

@@ -23,9 +23,9 @@ def addTemplate(core):
 	mobileTemplate.setBoneType("Avian Bones")
 	mobileTemplate.setBoneAmount(46)
 	mobileTemplate.setSocialGroup("lantern")
-	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_lantern_bird.iff')
@@ -37,6 +37,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_slash_4')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/lice_ridden_remmer_queen.py

@@ -24,16 +24,19 @@ def addTemplate(core):
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_remmer.iff')
+	templates.add('object/mobile/shared_lice_ridden_remmer_queen.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
-	mobileTemplate.setDefaultAttack('creatureSpitAttack')
+	attacks.add('bm_bite_4')
+	attacks.add('bm_bolster_armor_4')
+	attacks.add('bm_enfeeble_4')
+	mobileTemplate.setDefaultAttack('creatureRangedAttack')
 	mobileTemplate.setAttacks(attacks)
 	
 	core.spawnService.addMobileTemplate('lice_ridden_remmer_queen', mobileTemplate)

scripts/mobiles/endor/mantigrue_hunter.py

@@ -28,11 +28,15 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_slash_4')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/mantigrue_night_stalker.py

@@ -24,15 +24,19 @@ def addTemplate(core):
 	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
-	templates.add('object/mobile/shared_condor_dragon.iff')
+	templates.add('object/mobile/shared_mantigrue_night_stalker.iff')
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_slash_4')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureRangedAttack')
 	mobileTemplate.setAttacks(attacks)
 

scripts/mobiles/endor/mantigrue_reaper.py

@@ -28,11 +28,15 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_slash_4')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureRangedAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/mantigrue_screecher.py

@@ -33,6 +33,10 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_slash_4')
+	attacks.add('bm_wing_buffet_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/mature_hanadak.py

@@ -39,6 +39,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/mature_hanadak_rock_smasher.py

@@ -37,6 +37,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_shaken_2')
+	attacks.add('bm_stomp_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/merek_assassin.py

@@ -35,6 +35,10 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_dampen_poison_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/merek_cavern_creeper.py

@@ -30,11 +30,15 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_dampen_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/merek_deaths_head.py

@@ -30,11 +30,15 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic')
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_damage_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/merek_harvester.py

@@ -23,7 +23,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("merek")
 	mobileTemplate.setAssistRange(12)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_merek.iff')
@@ -35,6 +35,10 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_damage_poison_4')
+	attacks.add('bm_damage_pain_4')
+	attacks.add('bm_slash_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/mine_rat.py

@@ -12,16 +12,16 @@ def addTemplate(core):
 	
 	mobileTemplate.setCreatureName('death_watch_quenker')
 	mobileTemplate.setLevel(83)
-	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+	mobileTemplate.setDifficulty(Difficulty.ELITE)
 
 	mobileTemplate.setMinSpawnDistance(4)
 	mobileTemplate.setMaxSpawnDistance(8)
 	mobileTemplate.setDeathblow(True)
 	mobileTemplate.setScale(.6)
 	mobileTemplate.setSocialGroup("death watch")
-	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(False)
-	mobileTemplate.setOptionsBitmask(128)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_barbed_quenker.iff')
@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_5')
+	attacks.add('bm_bolster_armor_5')
+	attacks.add('bm_enfeeble_5')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/noxious_squill.py

@@ -33,6 +33,9 @@ def addTemplate(core):
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
 	attacks = Vector()
+	attacks.add('bm_bite_4')
+	attacks.add('bm_defensive_4')
+	attacks.add('bm_disease_4')
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)
 	

scripts/mobiles/endor/pouncing_jax.py

@@ -0,0 +1,47 @@
+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('pouncing_jax')
+	mobileTemplate.setLevel(60)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setHideType("Bristley Hide")
+	mobileTemplate.setHideAmount(35)
+	mobileTemplate.setBoneType("Animal Bones")
+	mobileTemplate.setBoneAmount(25)
+	mobileTemplate.setSocialGroup("jax")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(True)
+	mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_bearded_jax.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()
+	attacks.add('bm_claw_4')
+	attacks.add('bm_flank_2')
+	attacks.add('bm_slash_4')
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('pouncing_jax', mobileTemplate)
+	return