From 251b159b13299a760218b28c343de60783ee9a9c Mon Sep 17 00:00:00 2001 From: DAK- Date: Wed, 11 Dec 2013 03:20:55 -0600 Subject: [PATCH 1/2] Bounty Hunter: Return Fire Buff and command works, cools down and is modified by skill mods, (i.e. from "Enforcer set") --- scripts/buffs/bh_return_fire_1.py | 12 ++++++++++++ scripts/commands/combat/bh_return_fire_command_1.py | 11 +++++++++++ src/services/combat/CombatCommands.java | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 scripts/buffs/bh_return_fire_1.py create mode 100644 scripts/commands/combat/bh_return_fire_command_1.py diff --git a/scripts/buffs/bh_return_fire_1.py b/scripts/buffs/bh_return_fire_1.py new file mode 100644 index 00000000..7a0f25b4 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/commands/combat/bh_return_fire_command_1.py b/scripts/commands/combat/bh_return_fire_command_1.py new file mode 100644 index 00000000..9542ec56 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/src/services/combat/CombatCommands.java b/src/services/combat/CombatCommands.java index e742a16e..bb48adac 100644 --- a/src/services/combat/CombatCommands.java +++ b/src/services/combat/CombatCommands.java @@ -123,7 +123,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"); From 5f88bab13b9c6627d35c8f47333fc37b20e4ac30 Mon Sep 17 00:00:00 2001 From: DAK- Date: Wed, 11 Dec 2013 04:48:45 -0600 Subject: [PATCH 2/2] Bounty Hunter: Take Cover & Armor Sprint Registered commands, added buff and command scripts. Buffs apply, needs further testing. --- scripts/buffs/bh_armor_sprint_1.py | 13 +++++++++++++ scripts/buffs/bh_cover_1.py | 14 ++++++++++++++ scripts/commands/bh_armor_sprint_1.py | 8 ++++++++ scripts/commands/bh_cover_1.py | 8 ++++++++ src/services/combat/CombatCommands.java | 2 ++ 5 files changed, 45 insertions(+) create mode 100644 scripts/buffs/bh_armor_sprint_1.py create mode 100644 scripts/buffs/bh_cover_1.py create mode 100644 scripts/commands/bh_armor_sprint_1.py create mode 100644 scripts/commands/bh_cover_1.py diff --git a/scripts/buffs/bh_armor_sprint_1.py b/scripts/buffs/bh_armor_sprint_1.py new file mode 100644 index 00000000..e9637ebd --- /dev/null +++ b/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 diff --git a/scripts/buffs/bh_cover_1.py b/scripts/buffs/bh_cover_1.py new file mode 100644 index 00000000..b3ca84ce --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/commands/bh_armor_sprint_1.py b/scripts/commands/bh_armor_sprint_1.py new file mode 100644 index 00000000..b7e33772 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/commands/bh_cover_1.py b/scripts/commands/bh_cover_1.py new file mode 100644 index 00000000..f9217c4e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/src/services/combat/CombatCommands.java b/src/services/combat/CombatCommands.java index bb48adac..68c44549 100644 --- a/src/services/combat/CombatCommands.java +++ b/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");