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

Conflicts:
	src/services/bazaar/BazaarService.java

scripts/buffs/drink_breath_of_heaven.py

@@ -1,14 +0,0 @@
-import sys
-
-def setup(core, actor, buff):
-	return
-
-def add(core, actor, buff):
-	core.skillModService.addSkillMod(actor, 'constitution_modified', 80)
-	core.skillModService.addSkillMod(actor, 'expertise_dodge', 3)
-	return
-
-def remove(core, actor, buff):
-	core.skillModService.deductSkillMod(actor, 'constitution_modified', 80)
-	core.skillModService.deductSkillMod(actor, 'expertise_dodge', 3)
-	return

scripts/buffs/invis_sp_buff_invis_notrace_1.py

@@ -0,0 +1,22 @@
+import sys
+
+def setup(core, actor, buff):
+		return
+
+def add(core, actor, buff):
+		actor.setInStealth(True)
+		actor.setRadarVisible(False)
+
+	if actor.getSkillMod('expertise_sp_covert_mastery_1'):
+		core.skillModService.addSkillMod(actor, 'sp_covert_mastery')
+
+		return
+
+def remove(core, actor, buff):
+		actor.setInStealth(False)
+		actor.setRadarVisible(True)
+
+	if actor.getSkillMod('expertise_sp_covert_mastery_1'):
+		core.skillModService.deductSkillMod(actor, 'sp_covert_mastery')
+
+		return

scripts/buffs/me_stasis_1.py

@@ -5,10 +5,10 @@ def setup(core, actor, buff):
 
 def add(core, actor, buff):
 	actor.playEffectObject('clienteffect/medic_stasis.cef', 'me_stasis_1')
-	actor.setSpeedMultiplierBase(0.2)
+	core.skillModService.deductSkillMod(actor, 'movement', 8)
 	return
 	
 def remove(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
+	core.skillModService.addSkillMod(actor, 'movement', 8)
 	return
 	

scripts/collections/master_bounty_hunter_1a.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_bountyhunter_master")
-	return

scripts/collections/master_commando_1a.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_commando_master")
-	return

scripts/collections/master_entertainer_1a.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_social_entertainer_master")
-	return

scripts/collections/master_force_sensitive_1a.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_jedi_master")
-	return

scripts/collections/master_medic_1a.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_medic_master")
-	return

scripts/collections/master_officer_1a.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_officer_master")
-	return

scripts/collections/master_smuggler_1a.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_smuggler_master")
-	return

scripts/collections/master_spy_1a.py

@@ -1,12 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_spy_master")
-	return

scripts/collections/master_trader_0a.py

@@ -1,15 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_chef_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_tailor_master")
-	return

scripts/collections/master_trader_0b.py

@@ -1,14 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_architect_master")
-	return

scripts/collections/master_trader_0c.py

@@ -1,15 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_armorsmith_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_weaponsmith_master")
-	return

scripts/collections/master_trader_0d.py

@@ -1,14 +0,0 @@
-import sys
-
-def setup():
-	return
-	
-def run():
-	return
-	
-def addMasterBadge(core, actor):
-	if actor.getLevel() == 90:
-		core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
-		core.collectionService.addCollection(actor, "new_prof_crafting_droidengineer_master")
-	return

scripts/collections/profession_master.py

@@ -0,0 +1,60 @@
+import sys
+
+def bounty_hunter_1a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_bountyhunter_master")
+	return
+	
+def commando_1a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_commando_master")
+	return
+	
+def entertainer_1a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_social_entertainer_master")
+	return
+	
+def force_sensitive_1a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_jedi_master")
+	return
+	
+def medic_1a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_medic_master")
+	return	
+	
+def officer_1a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_officer_master")
+	return
+	
+def smuggler_1a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_officer_master")
+	return
+	
+def spy_1a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_spy_master")
+	return
+	
+def trader_0a(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_chef_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_tailor_master")	
+	return
+	
+def trader_0b(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_architect_master")
+	return
+	
+def trader_0c(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_armorsmith_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_weaponsmith_master")
+	return
+	
+def trader_0d(core, actor):
+	core.collectionService.addCollection(actor, "new_prof_crafting_merchant_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_artisan_master")
+	core.collectionService.addCollection(actor, "new_prof_crafting_droidengineer_master")	
+	return
+	

scripts/commands/bh_armor_sprint_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, buff):
-	core.buffService.addBuffToCreature(actor, 'bh_power_sprint_1')
+	core.buffService.addBuffToCreature(actor, 'bh_power_sprint_1', actor)
 	return
 	
 def run(core, actor, target, commandString):

scripts/commands/bh_cover_1.py

@@ -4,5 +4,5 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addBuffToCreature(actor, 'bh_cover_1')
+	core.buffService.addBuffToCreature(actor, 'bh_cover_1', actor)
 	return

scripts/commands/bh_shields_1.py

@@ -4,7 +4,7 @@ def setup(core, actor, target, command):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addBuffToCreature(actor, 'bh_shields')
-	core.buffService.addBuffToCreature(actor, 'bh_shields_charged')
-	core.buffService.addBuffToCreature(actor, 'bh_shields_handler')
+	core.buffService.addBuffToCreature(actor, 'bh_shields', actor)
+	core.buffService.addBuffToCreature(actor, 'bh_shields_charged', actor)
+	core.buffService.addBuffToCreature(actor, 'bh_shields_handler', actor)
 	return 

scripts/commands/co_first_aid_training.py

@@ -4,5 +4,5 @@ def setup():
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addBuffToCreature(actor, 'co_first_aid_training')
+	core.buffService.addBuffToCreature(actor, 'co_first_aid_training', actor)
 	return

scripts/commands/combat/bh_return_fire_command_1.py

@@ -6,6 +6,6 @@ def setup(core, actor, target, command):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addBuffToCreature(actor, 'bh_return_fire_1')
+	core.buffService.addBuffToCreature(actor, 'bh_return_fire_1', actor)
 	return
 	

scripts/commands/combat/en_spiral_kick_0.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
+	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_spiral_kick_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
+	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_spiral_kick_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
+	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_spiral_kick_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
+	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_spiral_kick_4.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare')
+	core.buffService.addBuffToCreature(target, 'en_spiral_kick_snare', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_thrill.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_debuff_thrill')
+	core.buffService.addBuffToCreature(target, 'en_debuff_thrill', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_thrill_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1')
+	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_thrill_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1')
+	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_thrill_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_2')
+	core.buffService.addBuffToCreature(target, 'en_debuff_thrill_2', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_void_dance_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_1')
+	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_void_dance_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_2')
+	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_2', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/en_void_dance_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_3')
+	core.buffService.addBuffToCreature(target, 'en_void_dance_buff_3', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/me_burst_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'me_burst_1')
+	core.buffService.addBuffToCreature(target, 'me_burst_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/me_cranial_smash_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'me_cranial_smash_1')
+	core.buffService.addBuffToCreature(target, 'me_cranial_smash_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/me_doom.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'me_doom')
+	core.buffService.addBuffToCreature(target, 'me_doom', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/me_electrolyte_drain_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'me_electrolyte_drain_1')
+	core.buffService.addBuffToCreature(target, 'me_electrolyte_drain_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/me_induce_insanity_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'me_induce_insanity_1')
+	core.buffService.addBuffToCreature(target, 'me_induce_insanity_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/me_serotonin_purge_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'me_serotonin_purge_1')
+	core.buffService.addBuffToCreature(target, 'me_serotonin_purge_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/me_stasis_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('me_stasis_1')
+	core.buffService.addBuffToCreature(target, 'me_stasis_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_ae_dm_cc_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_1')
+	core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_ae_dm_cc_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_2')
+	core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_2', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_ae_dm_cc_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_3')
+	core.buffService.addBuffToCreature(target, 'of_ae_dm_cc_3', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_cc_melee_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_1')
+	core.buffService.addBuffToCreature(target, 'of_cc_melee_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_cc_melee_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_2')
+	core.buffService.addBuffToCreature(target, 'of_cc_melee_2', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_cc_melee_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_3')
+	core.buffService.addBuffToCreature(target, 'of_cc_melee_3', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_cc_melee_4.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_4')
+	core.buffService.addBuffToCreature(target, 'of_cc_melee_4', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_cc_melee_5.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_5')
+	core.buffService.addBuffToCreature(target, 'of_cc_melee_5', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_cc_melee_6.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_6')
+	core.buffService.addBuffToCreature(target, 'of_cc_melee_6', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_cc_melee_7.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_cc_melee_7')
+	core.buffService.addBuffToCreature(target, 'of_cc_melee_7', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deadeye_debuff.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	core.buffService.addBuffToCreature(target, 'of_deadeye_debuff')
+	core.buffService.addBuffToCreature(target, 'of_deadeye_debuff', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deb_def_1.py

@@ -1,11 +1,11 @@
 def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_1')
+    core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
     if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_1')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_1')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_1', actor)
     if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_1')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_1')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_1', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_1', actor)
 		return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deb_def_2.py

@@ -1,11 +1,11 @@
 def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_2')
+    core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
     if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_2')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_2')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_2', actor)
     if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_2')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_2')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_2', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_2', actor)
 		return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deb_def_3.py

@@ -1,11 +1,11 @@
 def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_3')
+    core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
     if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_3')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_3')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_3', actor)
     if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_3')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_3')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_3', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_3', actor)
 		return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deb_def_4.py

@@ -1,11 +1,11 @@
 def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_4')
+    core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
     if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_4')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_4')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_4', actor)
     if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_4')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_4')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_4', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_4', actor)
 		return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deb_def_5.py

@@ -1,11 +1,11 @@
 def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_5')
+    core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
     if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_5')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_5')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_5', actor)
     if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_5')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_5')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_5', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_5', actor)
 		return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deb_def_6.py

@@ -1,11 +1,11 @@
 def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_6')
+    core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
     if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_6')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_6')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_6', actor)
     if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_6')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_6')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_6', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_6', actor)
 		return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deb_def_7.py

@@ -1,11 +1,11 @@
 def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_7')
+    core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
     if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_7')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_7')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_7', actor)
     if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_7')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_7')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_7', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_7', actor)
 		return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_deb_def_8.py

@@ -1,11 +1,11 @@
 def setup(core, actor, target, command):
-    core.buffService.addBuffToCreature(target, 'of_deb_def_8;)
+    core.buffService.addBuffToCreature(target, 'of_deb_def_8', actor)
     if actor.getSkillMod('expertise_of_adv_paint_debuff'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_8')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_8')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_8', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_debuff_8', actor)
     if actor.getSkillMod('expertise_of_adv_paint_expose'):
-		core.buffService.addBuffToCreature(target, 'of_deb_def_8')
-		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_8')
+		core.buffService.addBuffToCreature(target, 'of_deb_def_8', actor)
+		core.buffService.addBuffToCreature(target, 'of_adv_paint_expose_8', actor)
 		return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_decapitate_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_decap_bleed_1')
+	core.buffService.addBuffToCreature(target, 'of_decap_bleed_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_decapitate_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_decap_bleed_2')
+	core.buffService.addBuffToCreature(target, 'of_decap_bleed_2', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_decapitate_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_decap_bleed_3')
+	core.buffService.addBuffToCreature(target, 'of_decap_bleed_3', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_decapitate_4.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_decap_bleed_4')
+	core.buffService.addBuffToCreature(target, 'of_decap_bleed_4', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_decapitate_5.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_decap_bleed_5')
+	core.buffService.addBuffToCreature(target, 'of_decap_bleed_5', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_decapitate_6.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_decap_bleed_6')
+	core.buffService.addBuffToCreature(target, 'of_decap_bleed_6', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_del_ae_dm_dot_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_dot_bomb_1')
+	core.buffService.addBuffToCreature(target, 'of_dot_bomb_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_del_ae_dm_dot_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_dot_bomb_1')
+	core.buffService.addBuffToCreature(target, 'of_dot_bomb_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_del_ae_dm_dot_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_dot_bomb_1')
+	core.buffService.addBuffToCreature(target, 'of_dot_bomb_1', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_pistol_bleed_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_pistol_bleed')
+	core.buffService.addBuffToCreature(target, 'of_pistol_bleed', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_vortex_1.py

@@ -1,8 +1,8 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_vortex_bleed_1')
-	command.setBuffNameTarget('of_vortex_root')
+	core.buffService.addBuffToCreature(target, 'of_vortex_bleed_1', actor)
+	core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_vortex_2.py

@@ -1,8 +1,8 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_vortex_bleed_2')
-	command.setBuffNameTarget('of_vortex_root')
+	core.buffService.addBuffToCreature(target, 'of_vortex_bleed_2', actor)
+	core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_vortex_3.py

@@ -1,8 +1,8 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_vortex_bleed_3')
-	command.setBuffNameTarget('of_vortex_root')
+	core.buffService.addBuffToCreature(target, 'of_vortex_bleed_3', actor)
+	core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_vortex_4.py

@@ -1,8 +1,8 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_vortex_bleed_4')
-	command.setBuffNameTarget('of_vortex_root')
+	core.buffService.addBuffToCreature(target, 'of_vortex_bleed_4', actor)
+	core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/combat/of_vortex_5.py

@@ -1,8 +1,8 @@
 import sys
 
 def setup(core, actor, target, command):
-	command.setBuffNameTarget('of_vortex_bleed_5')
-	command.setBuffNameTarget('of_vortex_root')
+	core.buffService.addBuffToCreature(target, 'of_vortex_bleed_5', actor)
+	core.buffService.addBuffToCreature(target, 'of_vortex_root', actor)
 	return
 	
 def preRun(core, actor, target, command):

scripts/commands/dismissgroupmember.py

@@ -0,0 +1,10 @@
+import sys
+
+def setup():
+	return
+	
+def run(core, actor, target, commandString):
+	if actor and target:
+		core.groupService.handleGroupKick(actor, target)
+	return
+	

scripts/commands/en_action_regen.py

@@ -4,5 +4,5 @@ def setup():
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addBuffToCreature(actor, 'en_action_regen')
+	core.buffService.addBuffToCreature(actor, 'en_action_regen', actor)
 	return

scripts/commands/forcerun.py

@@ -4,6 +4,6 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addBuffToCreature(actor, 'fs_force_run', actor)
+	core.buffService.addBuffToCreature(target, 'fs_force_run', actor)
 	return
 	

scripts/commands/gc.py

@@ -9,5 +9,5 @@ def run(core, actor, target, commandString):
 	if group is None:
 		return
 	
-	core.chatService.sendChatRoomMessage(actor, group.getChatRoomId(), commandString)
+	core.chatService.sendChatRoomMessage(actor, group.getChatRoomId(), 0, commandString)
 	return

scripts/commands/guild.py

@@ -0,0 +1,15 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    guild = core.guildService.getGuildById(actor.getGuildId())
+    
+    if guild is None:
+        print ('none.')
+        return
+    
+    core.chatService.sendChatRoomMessage(actor, guild.getChatRoomId(), 0, commandString)
+    print ('sent message')
+    return

scripts/commands/guildsay.py

@@ -0,0 +1,13 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    guild = core.guildService.getGuildById(actor.getGuildId())
+
+    if guild is None:
+        return
+    
+    core.chatService.sendChatRoomMessage(actor, guild.getChatRoomId(), 0, commandString)
+    return

scripts/commands/me_cure_affliction_1.py

@@ -4,5 +4,5 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addBuffToCreature(actor, 'me_cure_affliction_1', target)
+	core.buffService.addBuffToCreature(actor, 'me_cure_affliction_1', actor)
 	return

scripts/commands/pvp.py

@@ -14,6 +14,9 @@ def run(core, actor, target, commandString):
 	if actor.getPvpStatus(PvpStatus.GoingOvert) or actor.getPvpStatus(PvpStatus.GoingCovert):
 		actor.sendSystemMessage('@faction_recruiter:pvp_status_changing', 0)
 		return
+	if core.gcwService.isInPvpZone(actor):
+		actor.sendSystemMessage('@gcw:pvp_advanced_region_cannot_go_covert', 0)
+		return
 	
 	if commandString != '' and commandString != faction:
 		if commandString == 'rebel' or commandString == 'imperial' or commandString == 'neutral':
@@ -60,6 +63,8 @@ def run(core, actor, target, commandString):
 		actor.sendSystemMessage('@faction_recruiter:covert_to_overt', 0)
 		actor.setPvpStatus(PvpStatus.GoingOvert, True)
 		time.sleep(30)
+		if core.gcwService.isInPvpZone(actor):
+			return
 		actor.setFactionStatus(FactionStatus.SpecialForces)
 		actor.setPvpStatus(PvpStatus.GoingOvert, False)
 		actor.sendSystemMessage('@faction_recruiter:overt_complete', 0)
@@ -70,6 +75,8 @@ def run(core, actor, target, commandString):
 		actor.sendSystemMessage('@faction_recruiter:overt_to_covert', 0)
 		actor.setPvpStatus(PvpStatus.GoingCovert, True)
 		time.sleep(300)
+		if core.gcwService.isInPvpZone(actor):
+			return
 		actor.setFactionStatus(FactionStatus.Combatant)
 		actor.setPvpStatus(PvpStatus.GoingCovert, False)
 		actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)

scripts/commands/transferitemmisc.py

@@ -28,7 +28,7 @@ def run(core, actor, target, commandString):
 			
         if target.isLootItem():
             target.setLootItem(0)
-            actor.sendSystemMessage('You looted ' + target.getTrueName() + ' from corpse.', 0)
+            actor.sendSystemMessage('You looted ' + target.getObjectName().getStfValue() + ' from corpse.', 0)
         
         if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer):
 			target.getContainer().transferTo(actor, container, target)
@@ -95,4 +95,4 @@ def run(core, actor, target, commandString):
                                 #core.scriptService.callScript(path, 'unequip', module, core, actor, target)
                                 core.equipmentService.unequip(actor, target)
 
-        return
+        return

scripts/conversation/respec.py

@@ -6,91 +6,55 @@ import sys
 
 def startConversation(core, actor, npc):
 	convSvc = core.conversationService
-	prose = ProsePackage('conversation/respecseller', 's_31')
-	outOfBand = OutOfBand()
-	outOfBand.addProsePackage(prose)
-	convSvc.sendConversationMessage(actor, npc, outOfBand)
-	prose2 = ProsePackage('conversation/respecseller', 's_32')
-	outOfBand2 = OutOfBand()
-	outOfBand2.addProsePackage(prose2)
-	prose3 = ProsePackage('conversation/respecseller', 's_33')
-	outOfBand3 = OutOfBand()
-	outOfBand3.addProsePackage(prose3)
-	option1 = ConversationOption(outOfBand2, 0)
-	option2 = ConversationOption(outOfBand3, 1)
+	
+	convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/respecseller:s_31'))
+	
 	options = Vector()
-	options.add(option1)
-	options.add(option2)
+	options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_32'), 0))
+	options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_33'), 1))
 	convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen)
-	return
 	
+	return
+
 def handleFirstScreen(core, actor, npc, selection):
-
-	if selection == 0:
-		# respec
-		# TODO: check for prices
-		convSvc = core.conversationService
-		prose = ProsePackage('conversation/respecseller', 's_58')
-		outOfBand = OutOfBand()
-		outOfBand.addProsePackage(prose)
-		convSvc.sendConversationMessage(actor, npc, outOfBand)
-		prose2 = ProsePackage('conversation/respecseller', 's_60')
-		outOfBand2 = OutOfBand()
-		outOfBand2.addProsePackage(prose2)
-		prose3 = ProsePackage('conversation/respecseller', 's_64')
-		outOfBand3 = OutOfBand()
-		outOfBand3.addProsePackage(prose3)
-		option1 = ConversationOption(outOfBand2, 0)
-		option2 = ConversationOption(outOfBand3, 1)
-		options = Vector()
-		options.add(option1)
-		options.add(option2)
-		convSvc.sendConversationOptions(actor, npc, options, handleRespecScreen)
-		return
-	if selection == 1:
-		# expertise reset
-		# TODO: check for prices
-		convSvc = core.conversationService
-		prose = ProsePackage('conversation/respecseller', 's_35')
-		outOfBand = OutOfBand()
-		outOfBand.addProsePackage(prose)
-		convSvc.sendConversationMessage(actor, npc, outOfBand)
-		prose2 = ProsePackage('conversation/respecseller', 's_71')
-		outOfBand2 = OutOfBand()
-		outOfBand2.addProsePackage(prose2)
-		prose3 = ProsePackage('conversation/respecseller', 's_72')
-		outOfBand3 = OutOfBand()
-		outOfBand3.addProsePackage(prose3)
-		option1 = ConversationOption(outOfBand2, 0)
-		option2 = ConversationOption(outOfBand3, 1)
-		options = Vector()
-		options.add(option1)
-		options.add(option2)
-		convSvc.sendConversationOptions(actor, npc, options, handleResetScreen)
-
-
-	return
+	convSvc = core.conversationService
 	
-def handleRespecScreen(core, actor, npc, selection):
+	# TODO: check for prices
+	
+	if selection == 0: # respec
+		convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/respecseller:s_58'))
+		
+		options = Vector()
+		options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_60'), 0))
+		options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_64'), 1))
+		convSvc.sendConversationOptions(actor, npc, options, handleRespecScreen)
+	
+	if selection == 1: # expertise reset
+		convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/respecseller:s_35'))
+		
+		options = Vector()
+		options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_71'), 0))
+		options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/respecseller:s_72'), 1))
+		convSvc.sendConversationOptions(actor, npc, options, handleResetScreen)
+	
+	return
 
+def handleRespecScreen(core, actor, npc, selection):
 	if selection == 0:
 		core.skillService.sendRespecWindow(actor)
-		
+	
 	core.conversationService.handleEndConversation(actor, npc)
-
+	
 	return
 
-	
 def handleResetScreen(core, actor, npc, selection):
-
 	if selection == 0:
 		core.skillService.resetExpertise(actor)
-		
-	core.conversationService.handleEndConversation(actor, npc)
-
-	return
 	
+	core.conversationService.handleEndConversation(actor, npc)
+	
+	return
+
 def endConversation(core, actor, npc):
 	core.conversationService.sendStopConversation(actor, npc, 'conversation/respecseller', 's_38')
 	return
-	

scripts/loot/lootItems/weapons/knife/janta_knife.py

@@ -0,0 +1,15 @@
+
+def itemTemplate():
+
+	return ['object/weapon/melee/knife/shared_knife_janta.iff']
+
+def itemStats():
+
+	stats = ['mindamage','12','27']
+	stats += ['maxdamage','48','95']
+	stats += ['attackspeed','1.0','1.0']
+	stats += ['maxrange','0','4']
+	stats += ['damagetype','kinetic','kinetic']
+	stats += ['weapontype','4','4']
+	
+	return stats 

scripts/loot/lootPools/random_loot_primitives.py

@@ -0,0 +1,8 @@
+
+def itemNames():
+	
+	return ['janta_knife']
+	
+def itemChances():
+	return [100]
+	

scripts/mobiles/corellia/agrilat_rasp.py

@@ -0,0 +1,43 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('agrilat rasp')
+	mobileTemplate.setLevel(34)
+	mobileTemplate.setMinLevel(34)
+	mobileTemplate.setMaxLevel(36)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Avian Meat")
+	mobileTemplate.setMeatAmount(3)
+	mobileTemplate.setBoneType("Avian Bones")
+	mobileTemplate.setBoneAmount(2)
+	mobileTemplate.setSocialGroup("rasp")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_rasp.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('agrilat_rasp', mobileTemplate)
+	return

scripts/mobiles/corellia/bageraset.py

@@ -0,0 +1,45 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('bageraset')
+	mobileTemplate.setLevel(29)
+	mobileTemplate.setMinLevel(29)
+	mobileTemplate.setMaxLevel(31)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Herbivore Meat")
+	mobileTemplate.setMeatAmount(230)
+	mobileTemplate.setHideType("Leathery Hide")
+	mobileTemplate.setHideAmount(130)
+	mobileTemplate.setBoneType("Mammal Bones")
+	mobileTemplate.setBoneAmount(80)
+	mobileTemplate.setSocialGroup("bageraset")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_bageraset.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('bageraset', mobileTemplate)
+	return

scripts/mobiles/corellia/bageraset_bruiser.py

@@ -0,0 +1,45 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('bageraset bruiser')
+	mobileTemplate.setLevel(9)
+	mobileTemplate.setMinLevel(9)
+	mobileTemplate.setMaxLevel(9)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Herbivore Meat")
+	mobileTemplate.setMeatAmount(230)
+	mobileTemplate.setHideType("Leathery Hide")
+	mobileTemplate.setHideAmount(130)
+	mobileTemplate.setBoneType("Mammal Bones")
+	mobileTemplate.setBoneAmount(80)
+	mobileTemplate.setSocialGroup("bageraset")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_bageraset.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('bageraset_bruiser', mobileTemplate)
+	return

scripts/mobiles/corellia/bloated_gubbur.py

@@ -0,0 +1,45 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('bloated gubbur')
+	mobileTemplate.setLevel(23)
+	mobileTemplate.setMinLevel(23)
+	mobileTemplate.setMaxLevel(23)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Carnivore Meat")
+	mobileTemplate.setMeatAmount(4)
+	mobileTemplate.setHideType("Leathery Hide")
+	mobileTemplate.setHideAmount(3)
+	mobileTemplate.setBoneType("Mammal Bones")
+	mobileTemplate.setBoneAmount(3)
+	mobileTemplate.setSocialGroup("gubbur")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_gubber.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('bloated_gubbur', mobileTemplate)
+	return

scripts/mobiles/corellia/blood_stained_prowler.py

@@ -0,0 +1,46 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('blood-stained prowler')
+	mobileTemplate.setLevel(21)
+	mobileTemplate.setMinLevel(21)
+	mobileTemplate.setMaxLevel(21)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Carnivore Meat")
+	mobileTemplate.setMeatAmount(70)
+	mobileTemplate.setHideType("Bristley Hide")
+	mobileTemplate.setHideAmount(40)
+	mobileTemplate.setBoneType("Mammal Bones")
+	mobileTemplate.setBoneAmount(35)
+	mobileTemplate.setSocialGroup("wrix")
+	mobileTemplate.setAssistRange(10)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(192)
+
+	templates = Vector()
+	templates.add('object/mobile/shared_wrix.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+
+	core.spawnService.addMobileTemplate('blood_stained_prowler', mobileTemplate)
+	return

scripts/mobiles/corellia/blood_thirsty_monarch.py

@@ -0,0 +1,44 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('blood-thirsty monarch')
+	mobileTemplate.setLevel(19)
+	mobileTemplate.setMinLevel(19)
+	mobileTemplate.setMaxLevel(19)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Insect Meat")
+	mobileTemplate.setMeatAmount(27)
+	mobileTemplate.setHideType("Scaley Hide")
+	mobileTemplate.setHideAmount(27)
+	mobileTemplate.setSocialGroup("corellian butterfly")
+	mobileTemplate.setAssistRange(6)
+	mobileTemplate.setStalker(True)
+	mobileTemplate.setOptionsBitmask(192)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_corellian_butterfly.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('blood_thirsty_monarch', mobileTemplate)
+	return

scripts/mobiles/corellia/canoid.py

@@ -0,0 +1,45 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('canoid')
+	mobileTemplate.setLevel(29)
+	mobileTemplate.setMinLevel(29)
+	mobileTemplate.setMaxLevel(29)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Carnivore Meat")
+	mobileTemplate.setMeatAmount(65)
+	mobileTemplate.setHideType("Bristley Hide")
+	mobileTemplate.setHideAmount(35)
+	mobileTemplate.setBoneType("Mammal Bones")
+	mobileTemplate.setBoneAmount(30)
+	mobileTemplate.setSocialGroup("canoid")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_canoid.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('canoid', mobileTemplate)
+	return

scripts/mobiles/corellia/canoid_hunter.py

@@ -0,0 +1,46 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('canoid hunter')
+	mobileTemplate.setLevel(29)
+	mobileTemplate.setMinLevel(29)
+	mobileTemplate.setMaxLevel(29)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Carnivore Meat")
+	mobileTemplate.setMeatAmount(65)
+	mobileTemplate.setHideType("Bristley Hide")
+	mobileTemplate.setHideAmount(35)
+	mobileTemplate.setBoneType("Mammal Bones")
+	mobileTemplate.setBoneAmount(30)
+	mobileTemplate.setSocialGroup("canoid")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(192)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_canoid.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('canoid_hunter', mobileTemplate)
+	return

scripts/mobiles/corellia/canoid_pack_leader.py

@@ -0,0 +1,46 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('canoid pack leader')
+	mobileTemplate.setLevel(30)
+	mobileTemplate.setMinLevel(30)
+	mobileTemplate.setMaxLevel(30)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1.2)
+	mobileTemplate.setMeatType("Carnivore Meat")
+	mobileTemplate.setMeatAmount(65)
+	mobileTemplate.setHideType("Bristley Hide")
+	mobileTemplate.setHideAmount(35)
+	mobileTemplate.setBoneType("Mammal Bones")
+	mobileTemplate.setBoneAmount(30)
+	mobileTemplate.setSocialGroup("canoid")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(192)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_canoid.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('canoid_pack_leader', mobileTemplate)
+	return

scripts/mobiles/corellia/carrion_spat.py

@@ -0,0 +1,43 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('carrion spat')
+	mobileTemplate.setLevel(31)
+	mobileTemplate.setMinLevel(31)
+	mobileTemplate.setMaxLevel(31)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Avian Meat")
+	mobileTemplate.setMeatAmount(260)
+	mobileTemplate.setBoneType("Avian Bones")
+	mobileTemplate.setBoneAmount(180)
+	mobileTemplate.setSocialGroup("carrion spat")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_carrion_spat.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('carrion_spat', mobileTemplate)
+	return

scripts/mobiles/corellia/carrion_spat_corpsereaver.py

@@ -0,0 +1,44 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('carrion spat corpsereaver')
+	mobileTemplate.setLevel(10)
+	mobileTemplate.setMinLevel(10)
+	mobileTemplate.setMaxLevel(10)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Avian Meat")
+	mobileTemplate.setMeatAmount(260)
+	mobileTemplate.setBoneType("Avian Bones")
+	mobileTemplate.setBoneAmount(180)
+	mobileTemplate.setSocialGroup("carrion spat")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(192)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_carrion_spat.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('carrion_spat_corpsereaver', mobileTemplate)
+	return

scripts/mobiles/corellia/durni.py

@@ -1,16 +1,45 @@
-import sys
-from services.spawn import MobileTemplate
-from java.util import Vector
-
-def addTemplate(core):
-	mobileTemplate = MobileTemplate()
-	templates = Vector()
-	templates.add('object/mobile/shared_durni.iff')
-	mobileTemplate.setCreatureName('durni')
-	mobileTemplate.setTemplates(templates)
-	mobileTemplate.setLevel(4)
-	attacks = Vector()
-	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
-	mobileTemplate.setAttacks(attacks)
-	core.spawnService.addMobileTemplate('durni', mobileTemplate)
-	
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('durni')
+	mobileTemplate.setLevel(25)
+	mobileTemplate.setMinLevel(25)
+	mobileTemplate.setMaxLevel(26)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Herbivore Meat")
+	mobileTemplate.setMeatAmount(5)
+	mobileTemplate.setHideType("Wooly Hide")
+	mobileTemplate.setHideAmount(3)
+	mobileTemplate.setBoneType("Mammal Bones")
+	mobileTemplate.setBoneAmount(2)
+	mobileTemplate.setSocialGroup("durni")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_durni.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('durni', mobileTemplate)
+	return

scripts/mobiles/dantooine/abandoned_rebel_private.py

@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('abandoned_rebel_private')
+	mobileTemplate.setLevel(61)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(24)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(0)
+	mobileTemplate.setMinSpawnDistance(3)
+	mobileTemplate.setMaxSpawnDistance(5)
+	mobileTemplate.setDeathblow(True)
+	mobileTemplate.setSocialGroup('rebel')
+	mobileTemplate.setAssistRange(1)
+	
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_human_01.iff')
+	
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_dh17.iff', 0, 1.0)
+	weaponTemplates.add(weapontemplate)
+	weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_rebel.iff', 0, 1.0)
+	weaponTemplates.add(weapontemplate)	
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShot')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('abandoned_rebel_private', mobileTemplate)
+	

scripts/mobiles/dantooine/ancient_graul.py

@@ -0,0 +1,43 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()	
+	mobileTemplate.setCreatureName('ancient_graul')
+	mobileTemplate.setLevel(74)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(5)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setMinSpawnDistance(5)
+	mobileTemplate.setMaxSpawnDistance(10)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setMeatType("Carnivore Meat")
+	mobileTemplate.setMeatAmount(950)
+	mobileTemplate.setHideType("Leathery Hide")
+	mobileTemplate.setBoneAmount(875)	
+	mobileTemplate.setBoneType("Mammal Bone")
+	mobileTemplate.setHideAmount(775)
+	mobileTemplate.setSocialGroup("graul")
+	mobileTemplate.setAssistRange(12)
+	mobileTemplate.setStalker(False)	
+	mobileTemplate.setOptionsBitmask(192)
+
+	templates = Vector()
+	templates.add('object/mobile/shared_slinking_voritor_hunter.iff')
+	mobileTemplate.setTemplates(templates)
+
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('ancient_graul', mobileTemplate)
+	return