diff --git a/scripts/buffs/co_first_aid_training.py b/scripts/buffs/co_first_aid_training.py new file mode 100644 index 00000000..b0ffe0f9 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/commands/co_first_aid_training.py b/scripts/commands/co_first_aid_training.py new file mode 100644 index 00000000..baf4621d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/commands/combat/of_sh_3.py b/scripts/commands/combat/of_sh_3.py index 2ecc4873..e19f3ca1 100644 --- a/scripts/commands/combat/of_sh_3.py +++ b/scripts/commands/combat/of_sh_3.py @@ -1,11 +1,10 @@ import sys -import java.util.Random; def setup(core, actor, target, command): - if R - else: - if actor.getSkillMod('expertise_cooldown_line_of_heal'): - command.setCooldown(command.getCooldown() - actor.getSkillMod('expertise_cooldown_line_of_heal').getBase()) - return + + 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 \ No newline at end of file diff --git a/src/services/combat/CombatCommands.java b/src/services/combat/CombatCommands.java index 1544a0ce..e742a16e 100644 --- a/src/services/combat/CombatCommands.java +++ b/src/services/combat/CombatCommands.java @@ -307,6 +307,7 @@ public class CombatCommands { core.commandService.registerCommand("co_hw_dot"); core.commandService.registerCommand("co_ae_hw_dot"); core.commandService.registerCommand("co_position_secured"); + core.commandService.registerCommand("co_first_aid_training"); // Entertainer @@ -424,14 +425,15 @@ public class CombatCommands { core.commandService.registerCombatCommand("me_traumatize_4"); core.commandService.registerCombatCommand("me_traumatize_5"); core.commandService.registerCombatCommand("me_stasis_1"); - core.commandService.registerCommand("me_stasis_self_1"); core.commandService.registerCommand("me_drag_1"); + core.commandService.registerCommand("me_enhance_action_1"); core.commandService.registerCommand("me_reckless_stimulation_1"); core.commandService.registerCommand("me_reckless_stimulation_2"); core.commandService.registerCommand("me_reckless_stimulation_3"); core.commandService.registerCommand("me_reckless_stimulation_4"); core.commandService.registerCommand("me_reckless_stimulation_5"); core.commandService.registerCommand("me_reckless_stimulation_6"); + core.commandService.registerCommand("me_stasis_self_1"); // Officer