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

scripts/buffs/bh_armor_sprint_1.py

@@ -0,0 +1,13 @@
+import sys
+
+def setup(core, actor, buff): 
+	core.skillModService.addSkillMod(actor, 'movement', 6)
+	core.skillModService.addSkillMod(actor, 'movement_resist_snare', 100)
+	
+	return
+	
+def removeBuff(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 6)
+	core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 100)
+
+	return

scripts/buffs/bh_cover_1.py

@@ -0,0 +1,14 @@
+import sys
+
+def setup(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_damage_all', 10)
+	core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_ranged', 40)
+	core.skillModService.addSkillMod(actor, 'invis', 1)
+	return
+	
+def removeBuff(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_damage_all', 10)
+	core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_ranged', 40)
+	core.skillModService.deductSkillMod(actor, 'invis', 1)
+	return
+	

scripts/buffs/bh_return_fire_1.py

@@ -0,0 +1,12 @@
+import sys
+
+def setup(core, actor, buff):
+	buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_bh_return_fire')))
+	core.skillModService.addSkillMod(actor, 'expertise_bh_return_fire_1', 1)
+	
+	return
+	
+def removeBuff(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_bh_return_fire_1', 1)
+	return
+	

scripts/commands/bh_armor_sprint_1.py

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

scripts/commands/bh_cover_1.py

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

scripts/commands/combat/bh_return_fire_command_1.py

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

src/services/combat/CombatCommands.java

@@ -68,6 +68,8 @@ public class CombatCommands {
 		
 		core.commandService.registerCombatCommand("bh_ae_dm_1");
 		core.commandService.registerCombatCommand("bh_ae_dm_2");
+		core.commandService.registerCombatCommand("bh_armor_sprint_1");		
+		core.commandService.registerCombatCommand("bh_cover_1");
 		core.commandService.registerCombatCommand("bh_dm_1");
 		core.commandService.registerCombatCommand("bh_dm_2");
 		core.commandService.registerCombatCommand("bh_dm_3");
@@ -123,7 +125,7 @@ public class CombatCommands {
 		core.commandService.registerCombatCommand("bh_taunt_4");
 		core.commandService.registerCombatCommand("bh_taunt_5");
 		core.commandService.registerCombatCommand("bh_taunt_6");
-		core.commandService.registerCombatCommand("bh_return_fire_1");
+		core.commandService.registerCombatCommand("bh_return_fire_command_1");
 		core.commandService.registerCombatCommand("bh_sh_0");
 		core.commandService.registerCombatCommand("bh_sh_1");
 		core.commandService.registerCombatCommand("bh_sh_2");