Merge pull request #123 from Ziggeh/master

Added profession badges and changed healing CD reduction to be done through scripts

scripts/buffs/co_first_aid_training.py

@@ -0,0 +1,10 @@
+import sys
+
+def setup(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_healing_all', 20)
+	return
+	
+def removeBuff(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_healing_all', 20)
+	return
+	

scripts/collections/master_bounty_hunter_1a.py

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,14 @@
+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/commands/co_first_aid_training.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup():
+	return
+	
+def run(core, actor, target, commandString):
+
+	core.buffService.addBuffToCreature(actor, 'co_first_aid_training')
+	return

scripts/commands/combat/of_sh_0.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_of_heal'):
+		command.setCooldown(command.getCooldown() - actor.getSkillMod('expertise_cooldown_line_of_heal').getBase())
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/of_sh_1.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_of_heal'):
+		command.setCooldown(command.getCooldown() - actor.getSkillMod('expertise_cooldown_line_of_heal').getBase())
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/of_sh_2.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, target, command):
+	if actor.getSkillMod('expertise_cooldown_line_of_heal'):
+		command.setCooldown(command.getCooldown() - actor.getSkillMod('expertise_cooldown_line_of_heal').getBase())
+	return
+def run(core, actor, target, commandString):
+	return

scripts/commands/combat/of_sh_3.py

@@ -0,0 +1,10 @@
+import sys
+
+def setup(core, actor, target, command):
+
+	if actor.getSkillMod('expertise_cooldown_line_of_heal'):
+		command.setCooldown(command.getCooldown() - actor.getSkillMod('expertise_cooldown_line_of_heal').getBase())
+	return
+	
+def run(core, actor, target, commandString):
+	return

scripts/commands/requestwaypointatposition.py

@@ -6,9 +6,7 @@ def setup():
 def run(core, actor, target, commandString):
 
     commandArgs = commandString.split("(^-,=+_)color_13548(,+-=_^)=1")
-
     newString = commandArgs[0]
-    print (newString)
-    cmdService = core.commandService
-    cmdService.callCommand(actor, 'waypoint', None, newString) # No need to re-create a script
+	
+    core.commandService.callCommand(actor, 'waypoint', None, newString)
     return

scripts/commands/waypoint.py

@@ -74,7 +74,6 @@ def run(core, actor, target, commandString):
         waypoint.setActive(True)
         waypoint.setColor(WaypointObject.BLUE)
         name = commandString.split(" ", 5)
-        print (name)
         if name == "":
             name = "Waypoint"