diff --git a/scripts/commands/combat/bh_dm_crit_2.py b/scripts/commands/combat/bh_dm_crit_2.py deleted file mode 100644 index c12e2a2a..00000000 --- a/scripts/commands/combat/bh_dm_crit_2.py +++ /dev/null @@ -1,19 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.getSkillMod('expertise_cooldown_line_dm_crit'): - command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10)) - - if actor.getSkillMod('expertise_damage_line_dm_crit'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_action_line_dm_crit'): - command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_critical_line_dm_crit'): - command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit')) - - return - -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/bh_dm_crit_3.py b/scripts/commands/combat/bh_dm_crit_3.py deleted file mode 100644 index 59349465..00000000 --- a/scripts/commands/combat/bh_dm_crit_3.py +++ /dev/null @@ -1,19 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.getSkillMod('expertise_cooldown_line_dm_crit'): - command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10)) - - if actor.getSkillMod('expertise_damage_line_dm_crit'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_action_line_dm_crit'): - command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_critical_line_dm_crit'): - command.setCriticalChance(command.getCriticalChance() + actor.getSkillModBase('expertise_critical_line_dm_crit')) - - return - -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/bh_dm_crit_4.py b/scripts/commands/combat/bh_dm_crit_4.py deleted file mode 100644 index c12e2a2a..00000000 --- a/scripts/commands/combat/bh_dm_crit_4.py +++ /dev/null @@ -1,19 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.getSkillMod('expertise_cooldown_line_dm_crit'): - command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10)) - - if actor.getSkillMod('expertise_damage_line_dm_crit'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_action_line_dm_crit'): - command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_critical_line_dm_crit'): - command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit')) - - return - -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/bh_dm_crit_5.py b/scripts/commands/combat/bh_dm_crit_5.py deleted file mode 100644 index c12e2a2a..00000000 --- a/scripts/commands/combat/bh_dm_crit_5.py +++ /dev/null @@ -1,19 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.getSkillMod('expertise_cooldown_line_dm_crit'): - command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10)) - - if actor.getSkillMod('expertise_damage_line_dm_crit'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_action_line_dm_crit'): - command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_critical_line_dm_crit'): - command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit')) - - return - -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/bh_dm_crit_6.py b/scripts/commands/combat/bh_dm_crit_6.py deleted file mode 100644 index c12e2a2a..00000000 --- a/scripts/commands/combat/bh_dm_crit_6.py +++ /dev/null @@ -1,19 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.getSkillMod('expertise_cooldown_line_dm_crit'): - command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10)) - - if actor.getSkillMod('expertise_damage_line_dm_crit'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_action_line_dm_crit'): - command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_critical_line_dm_crit'): - command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit')) - - return - -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/bh_dm_crit_7.py b/scripts/commands/combat/bh_dm_crit_7.py deleted file mode 100644 index c12e2a2a..00000000 --- a/scripts/commands/combat/bh_dm_crit_7.py +++ /dev/null @@ -1,19 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.getSkillMod('expertise_cooldown_line_dm_crit'): - command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10)) - - if actor.getSkillMod('expertise_damage_line_dm_crit'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_action_line_dm_crit'): - command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_critical_line_dm_crit'): - command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit')) - - return - -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/bh_dm_crit_8.py b/scripts/commands/combat/bh_dm_crit_8.py deleted file mode 100644 index c12e2a2a..00000000 --- a/scripts/commands/combat/bh_dm_crit_8.py +++ /dev/null @@ -1,19 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.getSkillMod('expertise_cooldown_line_dm_crit'): - command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10)) - - if actor.getSkillMod('expertise_damage_line_dm_crit'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage()*actor.getSkillModBase('expertise_damage_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_action_line_dm_crit'): - command.setActionCost(command.getActionCost() - ((command.getActionCost()*actor.getSkillModBase('expertise_action_line_dm_crit'))/100)) - - if actor.getSkillMod('expertise_critical_line_dm_crit'): - command.setCriticalChance(command.getCriticalChance + actor.getSkillModBase('expertise_critical_line_dm_crit')) - - return - -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/bh_dm_crit_1.py b/scripts/commands/combat/specialline/dm_crit.py similarity index 99% rename from scripts/commands/combat/bh_dm_crit_1.py rename to scripts/commands/combat/specialline/dm_crit.py index c12e2a2a..255abc90 100644 --- a/scripts/commands/combat/bh_dm_crit_1.py +++ b/scripts/commands/combat/specialline/dm_crit.py @@ -1,6 +1,7 @@ import sys def setup(core, actor, target, command): + if actor.getSkillMod('expertise_cooldown_line_dm_crit'): command.setCooldown(command.getCooldown() - (actor.getSkillModBase('expertise_cooldown_line_dm_crit')/10))