From d54033a0c6587de8d0e7b21ca04384e3b87bd3b5 Mon Sep 17 00:00:00 2001 From: xbang21 Date: Wed, 11 Dec 2013 20:15:02 -0500 Subject: [PATCH] Finished Medic Buffs and Debuffs Medic buff times with expertise tested and work properly in and out of a group --- scripts/buffs/me_buff_action_1.py | 2 ++ scripts/buffs/me_buff_action_2.py | 2 ++ scripts/buffs/me_buff_action_3.py | 2 ++ scripts/buffs/me_buff_agility_1.py | 2 ++ scripts/buffs/me_buff_agility_2.py | 2 ++ scripts/buffs/me_buff_agility_3.py | 2 ++ scripts/buffs/me_buff_health.py | 2 ++ scripts/buffs/me_buff_health_0.py | 2 ++ scripts/buffs/me_buff_health_2.py | 2 ++ scripts/buffs/me_buff_melee_gb_1.py | 2 ++ scripts/buffs/me_buff_precision_1.py | 2 ++ scripts/buffs/me_buff_precision_2.py | 2 ++ scripts/buffs/me_buff_precision_3.py | 2 ++ scripts/buffs/me_buff_ranged_gb_1.py | 2 ++ scripts/buffs/me_buff_strength_1.py | 2 ++ scripts/buffs/me_buff_strength_2.py | 2 ++ scripts/buffs/me_buff_strength_3.py | 2 ++ scripts/buffs/me_burst_1.py | 13 ++++++++++ scripts/buffs/me_cranial_smash_1.py | 12 ++++++++++ scripts/buffs/me_cure_affliction_1.py | 12 ++++++++++ scripts/buffs/me_doom.py | 9 +++++++ scripts/buffs/me_electrolyte_drain_1.py | 9 +++++++ scripts/buffs/me_evasion_1.py | 14 +++++++++++ scripts/buffs/me_rheumatic_calamity_1.py | 2 ++ scripts/buffs/me_serotonin_boost_1.py | 9 +++++++ scripts/buffs/me_serotonin_purge_1.py | 9 +++++++ scripts/commands/combat/me_burst_1.py | 11 +++++++++ scripts/commands/combat/me_cranial_smash_1.py | 11 +++++++++ scripts/commands/combat/me_doom.py | 11 +++++++++ .../commands/combat/me_electrolyte_drain_1.py | 11 +++++++++ .../commands/combat/me_induce_insanity_1.py | 3 ++- .../commands/combat/me_serotonin_purge_1.py | 11 +++++++++ scripts/commands/me_buff_health_1.py | 8 +++++++ scripts/commands/me_buff_health_2.py | 8 +++++++ scripts/commands/me_buff_health_3.py | 8 +++++++ scripts/commands/me_cure_affliction_1.py | 8 +++++++ scripts/commands/me_enhance_action_1.py | 9 +++++++ scripts/commands/me_enhance_action_2.py | 9 +++++++ scripts/commands/me_enhance_action_3.py | 9 +++++++ scripts/commands/me_enhance_agility_1.py | 9 +++++++ scripts/commands/me_enhance_agility_2.py | 9 +++++++ scripts/commands/me_enhance_agility_3.py | 8 +++++++ scripts/commands/me_enhance_block_1.py | 8 +++++++ scripts/commands/me_enhance_dodge_1.py | 8 +++++++ scripts/commands/me_enhance_precision_1.py | 8 +++++++ scripts/commands/me_enhance_precision_2.py | 8 +++++++ scripts/commands/me_enhance_precision_3.py | 8 +++++++ scripts/commands/me_enhance_strength_1.py | 8 +++++++ scripts/commands/me_enhance_strength_2.py | 8 +++++++ scripts/commands/me_enhance_strength_3.py | 8 +++++++ scripts/commands/me_evasion_1.py | 8 +++++++ scripts/commands/me_serotonin_boost_1.py | 9 +++++++ src/services/combat/CombatCommands.java | 24 ++++++++++++++++++- 53 files changed, 369 insertions(+), 2 deletions(-) create mode 100644 scripts/buffs/me_burst_1.py create mode 100644 scripts/buffs/me_cranial_smash_1.py create mode 100644 scripts/buffs/me_cure_affliction_1.py create mode 100644 scripts/buffs/me_doom.py create mode 100644 scripts/buffs/me_electrolyte_drain_1.py create mode 100644 scripts/buffs/me_evasion_1.py create mode 100644 scripts/buffs/me_serotonin_boost_1.py create mode 100644 scripts/buffs/me_serotonin_purge_1.py create mode 100644 scripts/commands/combat/me_burst_1.py create mode 100644 scripts/commands/combat/me_cranial_smash_1.py create mode 100644 scripts/commands/combat/me_doom.py create mode 100644 scripts/commands/combat/me_electrolyte_drain_1.py create mode 100644 scripts/commands/combat/me_serotonin_purge_1.py create mode 100644 scripts/commands/me_buff_health_1.py create mode 100644 scripts/commands/me_buff_health_2.py create mode 100644 scripts/commands/me_buff_health_3.py create mode 100644 scripts/commands/me_cure_affliction_1.py create mode 100644 scripts/commands/me_enhance_action_1.py create mode 100644 scripts/commands/me_enhance_action_2.py create mode 100644 scripts/commands/me_enhance_action_3.py create mode 100644 scripts/commands/me_enhance_agility_1.py create mode 100644 scripts/commands/me_enhance_agility_2.py create mode 100644 scripts/commands/me_enhance_agility_3.py create mode 100644 scripts/commands/me_enhance_block_1.py create mode 100644 scripts/commands/me_enhance_dodge_1.py create mode 100644 scripts/commands/me_enhance_precision_1.py create mode 100644 scripts/commands/me_enhance_precision_2.py create mode 100644 scripts/commands/me_enhance_precision_3.py create mode 100644 scripts/commands/me_enhance_strength_1.py create mode 100644 scripts/commands/me_enhance_strength_2.py create mode 100644 scripts/commands/me_enhance_strength_3.py create mode 100644 scripts/commands/me_evasion_1.py create mode 100644 scripts/commands/me_serotonin_boost_1.py diff --git a/scripts/buffs/me_buff_action_1.py b/scripts/buffs/me_buff_action_1.py index 32ae828b..d5cff5fb 100644 --- a/scripts/buffs/me_buff_action_1.py +++ b/scripts/buffs/me_buff_action_1.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'stamina_modified', 35) return diff --git a/scripts/buffs/me_buff_action_2.py b/scripts/buffs/me_buff_action_2.py index e49831fc..9848727e 100644 --- a/scripts/buffs/me_buff_action_2.py +++ b/scripts/buffs/me_buff_action_2.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'stamina_modified', 80) return diff --git a/scripts/buffs/me_buff_action_3.py b/scripts/buffs/me_buff_action_3.py index ce6d1523..f59277c9 100644 --- a/scripts/buffs/me_buff_action_3.py +++ b/scripts/buffs/me_buff_action_3.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'stamina_modified', 250) return diff --git a/scripts/buffs/me_buff_agility_1.py b/scripts/buffs/me_buff_agility_1.py index f050bc50..10d3a0a6 100644 --- a/scripts/buffs/me_buff_agility_1.py +++ b/scripts/buffs/me_buff_agility_1.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'agility_modified', 15) return diff --git a/scripts/buffs/me_buff_agility_2.py b/scripts/buffs/me_buff_agility_2.py index 780c1277..8130ad0f 100644 --- a/scripts/buffs/me_buff_agility_2.py +++ b/scripts/buffs/me_buff_agility_2.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'agility_modified', 45) return diff --git a/scripts/buffs/me_buff_agility_3.py b/scripts/buffs/me_buff_agility_3.py index d33b9f7a..a9727dc2 100644 --- a/scripts/buffs/me_buff_agility_3.py +++ b/scripts/buffs/me_buff_agility_3.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'agility_modified', 80) return diff --git a/scripts/buffs/me_buff_health.py b/scripts/buffs/me_buff_health.py index 7a5a8676..70dd9938 100644 --- a/scripts/buffs/me_buff_health.py +++ b/scripts/buffs/me_buff_health.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'constitution_modified', 80) return diff --git a/scripts/buffs/me_buff_health_0.py b/scripts/buffs/me_buff_health_0.py index 7a850d74..b20b680b 100644 --- a/scripts/buffs/me_buff_health_0.py +++ b/scripts/buffs/me_buff_health_0.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'constitution_modified', 35) return diff --git a/scripts/buffs/me_buff_health_2.py b/scripts/buffs/me_buff_health_2.py index a6e1381b..fc52c4a3 100644 --- a/scripts/buffs/me_buff_health_2.py +++ b/scripts/buffs/me_buff_health_2.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'constitution_modified', 250) return diff --git a/scripts/buffs/me_buff_melee_gb_1.py b/scripts/buffs/me_buff_melee_gb_1.py index 69c881a6..f052d7b9 100644 --- a/scripts/buffs/me_buff_melee_gb_1.py +++ b/scripts/buffs/me_buff_melee_gb_1.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'display_only_block', 1000) core.skillModService.addSkillMod(actor, 'combat_block_value', 200) return diff --git a/scripts/buffs/me_buff_precision_1.py b/scripts/buffs/me_buff_precision_1.py index 6e0b34c6..3006e18e 100644 --- a/scripts/buffs/me_buff_precision_1.py +++ b/scripts/buffs/me_buff_precision_1.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'precision_modified', 15) return diff --git a/scripts/buffs/me_buff_precision_2.py b/scripts/buffs/me_buff_precision_2.py index 38bb1839..fbf6d978 100644 --- a/scripts/buffs/me_buff_precision_2.py +++ b/scripts/buffs/me_buff_precision_2.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'precision_modified', 45) return diff --git a/scripts/buffs/me_buff_precision_3.py b/scripts/buffs/me_buff_precision_3.py index 19d4b742..f6490d10 100644 --- a/scripts/buffs/me_buff_precision_3.py +++ b/scripts/buffs/me_buff_precision_3.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'precision_modified', 80) return diff --git a/scripts/buffs/me_buff_ranged_gb_1.py b/scripts/buffs/me_buff_ranged_gb_1.py index 2bde9ec4..d2476abe 100644 --- a/scripts/buffs/me_buff_ranged_gb_1.py +++ b/scripts/buffs/me_buff_ranged_gb_1.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'display_only_dodge', 500) return diff --git a/scripts/buffs/me_buff_strength_1.py b/scripts/buffs/me_buff_strength_1.py index df521dbc..462d84a5 100644 --- a/scripts/buffs/me_buff_strength_1.py +++ b/scripts/buffs/me_buff_strength_1.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'strength_modified', 15) return diff --git a/scripts/buffs/me_buff_strength_2.py b/scripts/buffs/me_buff_strength_2.py index 26b3b2cd..85f6d038 100644 --- a/scripts/buffs/me_buff_strength_2.py +++ b/scripts/buffs/me_buff_strength_2.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'strength_modified', 45) return diff --git a/scripts/buffs/me_buff_strength_3.py b/scripts/buffs/me_buff_strength_3.py index 7eb580c9..6fa59e33 100644 --- a/scripts/buffs/me_buff_strength_3.py +++ b/scripts/buffs/me_buff_strength_3.py @@ -1,6 +1,8 @@ import sys def setup(core, actor, buff): + if actor.getSkillMod('expertise_buff_duration_line_me_enhance'): + buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_me_enhance'))) core.skillModService.addSkillMod(actor, 'strength_modified', 80) return diff --git a/scripts/buffs/me_burst_1.py b/scripts/buffs/me_burst_1.py new file mode 100644 index 00000000..15d5cd85 --- /dev/null +++ b/scripts/buffs/me_burst_1.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 3) + core.skillModService.addSkillMod(actor, 'strikethrough_vulnerable', 5) + core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 5) + return + +def removeBuff(core, actor, buff): + core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 3) + core.skillModService.deductSkillMod(actor, 'strikethrough_vulnerable', 5) + core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 5) + return \ No newline at end of file diff --git a/scripts/buffs/me_cranial_smash_1.py b/scripts/buffs/me_cranial_smash_1.py new file mode 100644 index 00000000..f63ec968 --- /dev/null +++ b/scripts/buffs/me_cranial_smash_1.py @@ -0,0 +1,12 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.addSkillMod(actor, 'combat_divide_damage_dealt', 10) + core.skillModService.deductSkillMod(actor, 'movement', 5) + return + +def removeBuff(core, actor, buff): + core.skillModService.addSkillMod(actor, 'movement', 5) + core.skillModService.deductSkillMod(actor, 'combat_divide_damage_dealt', 10) + return + \ No newline at end of file diff --git a/scripts/buffs/me_cure_affliction_1.py b/scripts/buffs/me_cure_affliction_1.py new file mode 100644 index 00000000..f5e1ce07 --- /dev/null +++ b/scripts/buffs/me_cure_affliction_1.py @@ -0,0 +1,12 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.addSkillMod(actor, 'dot_reduction_all', 5) + core.skillModService.addSkillMod(actor, 'dot_resist_all', 100) + return + +def removeBuff(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'dot_reduction_all', 5) + core.skillModService.deductSkillMod(actor, 'dot_resist_all', 100) + return + \ No newline at end of file diff --git a/scripts/buffs/me_doom.py b/scripts/buffs/me_doom.py new file mode 100644 index 00000000..d4f40162 --- /dev/null +++ b/scripts/buffs/me_doom.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.addSkillMod(actor, 'me_doom', 1) + return + +def removeBuff(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'me_doom', 1) + return \ No newline at end of file diff --git a/scripts/buffs/me_electrolyte_drain_1.py b/scripts/buffs/me_electrolyte_drain_1.py new file mode 100644 index 00000000..82a33b29 --- /dev/null +++ b/scripts/buffs/me_electrolyte_drain_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'movement', 5) + return + +def removeBuff(core, actor, buff): + core.skillModService.addSkillMod(actor, 'movement', 5) + return \ No newline at end of file diff --git a/scripts/buffs/me_evasion_1.py b/scripts/buffs/me_evasion_1.py new file mode 100644 index 00000000..81115a7b --- /dev/null +++ b/scripts/buffs/me_evasion_1.py @@ -0,0 +1,14 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.addSkillMod(actor, 'expertise_dodge', 35) + core.skillModService.addSkillMod(actor, 'expertise_evasion_chance', 50) + core.skillModService.addSkillMod(actor, 'combat_evasion_value', 50) + return + +def removeBuff(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'expertise_dodge', 35) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_chance', 50) + core.skillModService.deductSkillMod(actor, 'combat_evasion_value', 50) + return + \ No newline at end of file diff --git a/scripts/buffs/me_rheumatic_calamity_1.py b/scripts/buffs/me_rheumatic_calamity_1.py index e09c02e5..2884acd8 100644 --- a/scripts/buffs/me_rheumatic_calamity_1.py +++ b/scripts/buffs/me_rheumatic_calamity_1.py @@ -1,8 +1,10 @@ import sys def setup(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'action_burn', 65) return def removeBuff(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'action_burn', 65) return \ No newline at end of file diff --git a/scripts/buffs/me_serotonin_boost_1.py b/scripts/buffs/me_serotonin_boost_1.py new file mode 100644 index 00000000..5eb23142 --- /dev/null +++ b/scripts/buffs/me_serotonin_boost_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.addSkillMod(actor, 'debuff_purge', 1) + return + +def removeBuff(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'debuff_purge', 1) + return \ No newline at end of file diff --git a/scripts/buffs/me_serotonin_purge_1.py b/scripts/buffs/me_serotonin_purge_1.py new file mode 100644 index 00000000..8b288359 --- /dev/null +++ b/scripts/buffs/me_serotonin_purge_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.addSkillMod(actor, 'buff_purge', 1) + return + +def removeBuff(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'buff_purge', 1) + return \ No newline at end of file diff --git a/scripts/commands/combat/me_burst_1.py b/scripts/commands/combat/me_burst_1.py new file mode 100644 index 00000000..a8c6ccdf --- /dev/null +++ b/scripts/commands/combat/me_burst_1.py @@ -0,0 +1,11 @@ +import sys + +def setup(core, actor, target, command): + core.buffService.addBuffToCreature(target, 'me_burst_1') + return + +def preRun(core, actor, target, command): + return + +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/me_cranial_smash_1.py b/scripts/commands/combat/me_cranial_smash_1.py new file mode 100644 index 00000000..4c813179 --- /dev/null +++ b/scripts/commands/combat/me_cranial_smash_1.py @@ -0,0 +1,11 @@ +import sys + +def setup(core, actor, target, command): + core.buffService.addBuffToCreature(target, 'me_cranial_smash_1') + return + +def preRun(core, actor, target, command): + return + +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/me_doom.py b/scripts/commands/combat/me_doom.py new file mode 100644 index 00000000..9ba8326b --- /dev/null +++ b/scripts/commands/combat/me_doom.py @@ -0,0 +1,11 @@ +import sys + +def setup(core, actor, target, command): + core.buffService.addBuffToCreature(target, 'me_doom') + return + +def preRun(core, actor, target, command): + return + +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/me_electrolyte_drain_1.py b/scripts/commands/combat/me_electrolyte_drain_1.py new file mode 100644 index 00000000..6ba20964 --- /dev/null +++ b/scripts/commands/combat/me_electrolyte_drain_1.py @@ -0,0 +1,11 @@ +import sys + +def setup(core, actor, target, command): + core.buffService.addBuffToCreature(target, 'me_electrolyte_drain_1') + return + +def preRun(core, actor, target, command): + return + +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/me_induce_insanity_1.py b/scripts/commands/combat/me_induce_insanity_1.py index 76c03af9..52fefadb 100644 --- a/scripts/commands/combat/me_induce_insanity_1.py +++ b/scripts/commands/combat/me_induce_insanity_1.py @@ -1,10 +1,11 @@ import sys def setup(core, actor, target, command): + core.buffService.addBuffToCreature(target, 'me_induce_insanity_1') return def preRun(core, actor, target, command): return def run(core, actor, target, commandString): - return + return \ No newline at end of file diff --git a/scripts/commands/combat/me_serotonin_purge_1.py b/scripts/commands/combat/me_serotonin_purge_1.py new file mode 100644 index 00000000..7490ade3 --- /dev/null +++ b/scripts/commands/combat/me_serotonin_purge_1.py @@ -0,0 +1,11 @@ +import sys + +def setup(core, actor, target, command): + core.buffService.addBuffToCreature(target, 'me_serotonin_purge_1') + return + +def preRun(core, actor, target, command): + return + +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/me_buff_health_1.py b/scripts/commands/me_buff_health_1.py new file mode 100644 index 00000000..1bbefb27 --- /dev/null +++ b/scripts/commands/me_buff_health_1.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_health') + return \ No newline at end of file diff --git a/scripts/commands/me_buff_health_2.py b/scripts/commands/me_buff_health_2.py new file mode 100644 index 00000000..dad03f73 --- /dev/null +++ b/scripts/commands/me_buff_health_2.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_health_2') + return \ No newline at end of file diff --git a/scripts/commands/me_buff_health_3.py b/scripts/commands/me_buff_health_3.py new file mode 100644 index 00000000..7dce8f50 --- /dev/null +++ b/scripts/commands/me_buff_health_3.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_health_3') + return \ No newline at end of file diff --git a/scripts/commands/me_cure_affliction_1.py b/scripts/commands/me_cure_affliction_1.py new file mode 100644 index 00000000..1e9189f1 --- /dev/null +++ b/scripts/commands/me_cure_affliction_1.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addBuffToCreature(actor, 'me_cure_affliction_1') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_action_1.py b/scripts/commands/me_enhance_action_1.py new file mode 100644 index 00000000..db09845c --- /dev/null +++ b/scripts/commands/me_enhance_action_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_action_1') + return + \ No newline at end of file diff --git a/scripts/commands/me_enhance_action_2.py b/scripts/commands/me_enhance_action_2.py new file mode 100644 index 00000000..cc476e94 --- /dev/null +++ b/scripts/commands/me_enhance_action_2.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_action_2') + return + \ No newline at end of file diff --git a/scripts/commands/me_enhance_action_3.py b/scripts/commands/me_enhance_action_3.py new file mode 100644 index 00000000..e945d92c --- /dev/null +++ b/scripts/commands/me_enhance_action_3.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_action_3') + return + \ No newline at end of file diff --git a/scripts/commands/me_enhance_agility_1.py b/scripts/commands/me_enhance_agility_1.py new file mode 100644 index 00000000..5f489803 --- /dev/null +++ b/scripts/commands/me_enhance_agility_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_agility_1') + return + \ No newline at end of file diff --git a/scripts/commands/me_enhance_agility_2.py b/scripts/commands/me_enhance_agility_2.py new file mode 100644 index 00000000..f3935dcb --- /dev/null +++ b/scripts/commands/me_enhance_agility_2.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_agility_2') + return + \ No newline at end of file diff --git a/scripts/commands/me_enhance_agility_3.py b/scripts/commands/me_enhance_agility_3.py new file mode 100644 index 00000000..e1dfd7fd --- /dev/null +++ b/scripts/commands/me_enhance_agility_3.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_agility_3') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_block_1.py b/scripts/commands/me_enhance_block_1.py new file mode 100644 index 00000000..c2758143 --- /dev/null +++ b/scripts/commands/me_enhance_block_1.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_melee_gb_1') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_dodge_1.py b/scripts/commands/me_enhance_dodge_1.py new file mode 100644 index 00000000..bb1a034e --- /dev/null +++ b/scripts/commands/me_enhance_dodge_1.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_ranged_gb_1') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_precision_1.py b/scripts/commands/me_enhance_precision_1.py new file mode 100644 index 00000000..398e39fa --- /dev/null +++ b/scripts/commands/me_enhance_precision_1.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_precision_1') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_precision_2.py b/scripts/commands/me_enhance_precision_2.py new file mode 100644 index 00000000..a9bba8a5 --- /dev/null +++ b/scripts/commands/me_enhance_precision_2.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_precision_2') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_precision_3.py b/scripts/commands/me_enhance_precision_3.py new file mode 100644 index 00000000..8f218b1c --- /dev/null +++ b/scripts/commands/me_enhance_precision_3.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_precision_3') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_strength_1.py b/scripts/commands/me_enhance_strength_1.py new file mode 100644 index 00000000..6ed252e5 --- /dev/null +++ b/scripts/commands/me_enhance_strength_1.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_strength_1') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_strength_2.py b/scripts/commands/me_enhance_strength_2.py new file mode 100644 index 00000000..b56331fe --- /dev/null +++ b/scripts/commands/me_enhance_strength_2.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_strength_3') + return \ No newline at end of file diff --git a/scripts/commands/me_enhance_strength_3.py b/scripts/commands/me_enhance_strength_3.py new file mode 100644 index 00000000..b56331fe --- /dev/null +++ b/scripts/commands/me_enhance_strength_3.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addGroupBuff(actor, 'me_buff_strength_3') + return \ No newline at end of file diff --git a/scripts/commands/me_evasion_1.py b/scripts/commands/me_evasion_1.py new file mode 100644 index 00000000..52391238 --- /dev/null +++ b/scripts/commands/me_evasion_1.py @@ -0,0 +1,8 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addBuffToCreature(actor, 'me_evasion_1') + return \ No newline at end of file diff --git a/scripts/commands/me_serotonin_boost_1.py b/scripts/commands/me_serotonin_boost_1.py new file mode 100644 index 00000000..1e45f39c --- /dev/null +++ b/scripts/commands/me_serotonin_boost_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + core.buffService.addBuffToCreature(actor, 'me_serotonin_boost_1') + return + \ No newline at end of file diff --git a/src/services/combat/CombatCommands.java b/src/services/combat/CombatCommands.java index 1544a0ce..98ca7871 100644 --- a/src/services/combat/CombatCommands.java +++ b/src/services/combat/CombatCommands.java @@ -392,6 +392,7 @@ public class CombatCommands { core.commandService.registerCombatCommand("me_cranial_smash_3"); core.commandService.registerCombatCommand("me_cranial_smash_4"); core.commandService.registerCombatCommand("me_cranial_smash_5"); + core.commandService.registerCommand("me_cure_affliction_1"); core.commandService.registerCombatCommand("me_dm_1"); core.commandService.registerCombatCommand("me_dm_2"); core.commandService.registerCombatCommand("me_dm_3"); @@ -415,8 +416,11 @@ public class CombatCommands { core.commandService.registerCombatCommand("me_rv_ooc"); core.commandService.registerCombatCommand("me_rv_pvp_area"); core.commandService.registerCombatCommand("me_rv_pvp_single"); + core.commandService.registerCommand("me_serotonin_boost_1"); core.commandService.registerCombatCommand("me_serotonin_purge_1"); core.commandService.registerCombatCommand("me_sh_1"); + core.commandService.registerCommand("me_stasis_1"); + core.commandService.registerCommand("me_stasis_self_1"); core.commandService.registerCombatCommand("me_thyroid_rupture_1"); core.commandService.registerCombatCommand("me_traumatize_1"); core.commandService.registerCombatCommand("me_traumatize_2"); @@ -424,7 +428,6 @@ 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_reckless_stimulation_1"); core.commandService.registerCommand("me_reckless_stimulation_2"); @@ -432,6 +435,25 @@ public class CombatCommands { 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_buff_health_1"); + core.commandService.registerCommand("me_buff_health_2"); + core.commandService.registerCommand("me_buff_health_3"); + core.commandService.registerCommand("me_enhance_action_1"); + core.commandService.registerCommand("me_enhance_action_2"); + core.commandService.registerCommand("me_enhance_action_3"); + core.commandService.registerCommand("me_enhance_agility_1"); + core.commandService.registerCommand("me_enhance_agility_2"); + core.commandService.registerCommand("me_enhance_agility_3"); + core.commandService.registerCommand("me_enhance_block_1"); + core.commandService.registerCommand("me_enhance_dodge_1"); + core.commandService.registerCommand("me_enhance_precision_1"); + core.commandService.registerCommand("me_enhance_precision_2"); + core.commandService.registerCommand("me_enhance_precision_3"); + core.commandService.registerCommand("me_enhance_strength_1"); + core.commandService.registerCommand("me_enhance_strength_2"); + core.commandService.registerCommand("me_enhance_strength_3"); + core.commandService.registerCommand("me_evasion_1"); + // Officer