From d1fff9e069d71c4c444b6426b52ecbe38a6b52e7 Mon Sep 17 00:00:00 2001 From: Treeku Date: Sat, 22 Mar 2014 02:07:53 +0000 Subject: [PATCH] Fixed buff duration check, fixed group buffs - The duration needed to be set on the buff object "before "the buff is actually added. Because of this, I made the distinction between setup(0 (setting up the buff object) and add() (adding the buff stats to the player). - Group buffs would add the buff based on each individual player's skillmods instead of the buffer's. Due to this, I made a "buffer" parameter for doAddBuff(). If there is a buffer, regardless of it's a buffer within our group, we can specify them, otherwise provide null. --- scripts/buffs/armor_break.py | 6 ++++-- scripts/buffs/bh_armor_sprint_1.py | 7 +++++-- scripts/buffs/bh_cover_1.py | 5 ++++- scripts/buffs/bh_prescience.py | 5 ++++- scripts/buffs/bh_return_fire_1.py | 5 ++++- scripts/buffs/bleeding.py | 5 ++++- scripts/buffs/buildabuff_inspiration.py | 5 ++++- scripts/buffs/co_base_of_operations.py | 5 ++++- scripts/buffs/co_first_aid_training.py | 5 ++++- scripts/buffs/co_position_secured.py | 5 ++++- scripts/buffs/co_stand_fast.py | 6 ++++-- scripts/buffs/en_action_regen.py | 5 ++++- scripts/buffs/en_debuff_thrill.py | 5 ++++- scripts/buffs/en_debuff_thrill_1.py | 5 ++++- scripts/buffs/en_debuff_thrill_2.py | 5 ++++- scripts/buffs/en_spiral_kick_snare.py | 5 ++++- scripts/buffs/en_sprint.py | 5 ++++- scripts/buffs/en_sweeping_pirouette_root.py | 5 ++++- scripts/buffs/en_unhealthy_fixation_debuff.py | 5 ++++- scripts/buffs/en_void_dance_buff.py | 5 ++++- scripts/buffs/en_void_dance_buff_1.py | 5 ++++- scripts/buffs/en_void_dance_buff_2.py | 5 ++++- scripts/buffs/en_void_dance_buff_3.py | 5 ++++- scripts/buffs/flawless_bead_1.py | 5 ++++- scripts/buffs/flawless_bead_2.py | 5 ++++- scripts/buffs/flawless_bead_3.py | 5 ++++- scripts/buffs/fs_ae_dm_cc_0.py | 5 ++++- scripts/buffs/fs_ae_dm_cc_1.py | 5 ++++- scripts/buffs/fs_ae_dm_cc_2.py | 5 ++++- scripts/buffs/fs_ae_dm_cc_3.py | 5 ++++- scripts/buffs/fs_ae_dm_cc_4.py | 5 ++++- scripts/buffs/fs_ae_dm_cc_5.py | 5 ++++- scripts/buffs/fs_ae_dm_cc_6.py | 5 ++++- scripts/buffs/fs_buff_ca_1.py | 5 ++++- scripts/buffs/fs_buff_def_1_1.py | 5 ++++- scripts/buffs/fs_dm_cc_crit_1.py | 5 ++++- scripts/buffs/fs_dm_cc_crit_2.py | 5 ++++- scripts/buffs/fs_dm_cc_crit_3.py | 5 ++++- scripts/buffs/fs_dm_cc_crit_4.py | 5 ++++- scripts/buffs/fs_dm_cc_crit_5.py | 5 ++++- scripts/buffs/fs_force_run.py | 7 +++++-- scripts/buffs/fs_force_throw.py | 5 ++++- scripts/buffs/fs_saber_reflect.py | 5 ++++- scripts/buffs/invis_fs_buff_invis_1.py | 5 ++++- scripts/buffs/me_buff_action_1.py | 5 ++++- scripts/buffs/me_buff_action_2.py | 5 ++++- scripts/buffs/me_buff_action_3.py | 5 ++++- scripts/buffs/me_buff_agility_1.py | 5 ++++- scripts/buffs/me_buff_agility_2.py | 5 ++++- scripts/buffs/me_buff_agility_3.py | 5 ++++- scripts/buffs/me_buff_health.py | 5 ++++- scripts/buffs/me_buff_health_0.py | 5 ++++- scripts/buffs/me_buff_health_2.py | 5 ++++- scripts/buffs/me_buff_melee_gb_1.py | 5 ++++- scripts/buffs/me_buff_precision_1.py | 5 ++++- scripts/buffs/me_buff_precision_2.py | 5 ++++- scripts/buffs/me_buff_precision_3.py | 5 ++++- scripts/buffs/me_buff_ranged_gb_1.py | 5 ++++- scripts/buffs/me_buff_strength_1.py | 5 ++++- scripts/buffs/me_buff_strength_2.py | 5 ++++- scripts/buffs/me_buff_strength_3.py | 5 ++++- scripts/buffs/me_burst_1.py | 5 ++++- scripts/buffs/me_cranial_smash_1.py | 5 ++++- scripts/buffs/me_cure_affliction_1.py | 5 ++++- scripts/buffs/me_doom.py | 5 ++++- scripts/buffs/me_electrolyte_drain_1.py | 5 ++++- scripts/buffs/me_evasion_1.py | 5 ++++- scripts/buffs/me_rheumatic_calamity_1.py | 5 ++++- scripts/buffs/me_serotonin_boost_1.py | 5 ++++- scripts/buffs/me_serotonin_purge_1.py | 5 ++++- scripts/buffs/me_stasis_1.py | 5 ++++- scripts/buffs/me_stasis_self_1.py | 5 ++++- scripts/buffs/me_thyroid_rupture_1.py | 5 ++++- scripts/buffs/of_adv_paint_debuff_1.py | 5 ++++- scripts/buffs/of_adv_paint_debuff_2.py | 5 ++++- scripts/buffs/of_adv_paint_debuff_3.py | 5 ++++- scripts/buffs/of_adv_paint_debuff_4.py | 5 ++++- scripts/buffs/of_adv_paint_debuff_5.py | 5 ++++- scripts/buffs/of_adv_paint_debuff_6.py | 5 ++++- scripts/buffs/of_adv_paint_debuff_7.py | 5 ++++- scripts/buffs/of_adv_paint_debuff_8.py | 5 ++++- scripts/buffs/of_adv_paint_expose_1.py | 5 ++++- scripts/buffs/of_adv_paint_expose_2.py | 5 ++++- scripts/buffs/of_adv_paint_expose_3.py | 5 ++++- scripts/buffs/of_adv_paint_expose_4.py | 5 ++++- scripts/buffs/of_adv_paint_expose_5.py | 5 ++++- scripts/buffs/of_adv_paint_expose_6.py | 5 ++++- scripts/buffs/of_adv_paint_expose_7.py | 5 ++++- scripts/buffs/of_adv_paint_expose_8.py | 5 ++++- scripts/buffs/of_ae_dm_cc_1.py | 5 ++++- scripts/buffs/of_ae_dm_cc_2.py | 5 ++++- scripts/buffs/of_ae_dm_cc_3.py | 5 ++++- scripts/buffs/of_buff_def_1.py | 5 ++++- scripts/buffs/of_buff_def_2.py | 5 ++++- scripts/buffs/of_buff_def_3.py | 5 ++++- scripts/buffs/of_buff_def_4.py | 5 ++++- scripts/buffs/of_buff_def_5.py | 5 ++++- scripts/buffs/of_buff_def_6.py | 5 ++++- scripts/buffs/of_buff_def_7.py | 5 ++++- scripts/buffs/of_buff_def_8.py | 5 ++++- scripts/buffs/of_buff_def_9.py | 5 ++++- scripts/buffs/of_cc_melee_1.py | 5 ++++- scripts/buffs/of_cc_melee_2.py | 5 ++++- scripts/buffs/of_cc_melee_3.py | 5 ++++- scripts/buffs/of_cc_melee_4.py | 5 ++++- scripts/buffs/of_cc_melee_5.py | 5 ++++- scripts/buffs/of_cc_melee_6.py | 5 ++++- scripts/buffs/of_cc_melee_7.py | 5 ++++- scripts/buffs/of_charge_1.py | 5 ++++- scripts/buffs/of_deadeye_debuff.py | 5 ++++- scripts/buffs/of_deb_def_1.py | 5 ++++- scripts/buffs/of_deb_def_2.py | 5 ++++- scripts/buffs/of_deb_def_3.py | 5 ++++- scripts/buffs/of_deb_def_4.py | 5 ++++- scripts/buffs/of_deb_def_5.py | 5 ++++- scripts/buffs/of_deb_def_6.py | 5 ++++- scripts/buffs/of_deb_def_7.py | 5 ++++- scripts/buffs/of_deb_def_8.py | 5 ++++- scripts/buffs/of_decap_bleed_1.py | 5 ++++- scripts/buffs/of_decap_bleed_2.py | 5 ++++- scripts/buffs/of_decap_bleed_3.py | 5 ++++- scripts/buffs/of_decap_bleed_4.py | 5 ++++- scripts/buffs/of_decap_bleed_5.py | 5 ++++- scripts/buffs/of_decap_bleed_6.py | 5 ++++- scripts/buffs/of_dot_bomb_1.py | 5 ++++- scripts/buffs/of_drillmaster_1.py | 5 ++++- scripts/buffs/of_emergency_shield.py | 5 ++++- scripts/buffs/of_firepower.py | 5 ++++- scripts/buffs/of_focus_fire_1.py | 5 ++++- scripts/buffs/of_focus_fire_2.py | 5 ++++- scripts/buffs/of_focus_fire_3.py | 5 ++++- scripts/buffs/of_focus_fire_4.py | 5 ++++- scripts/buffs/of_focus_fire_5.py | 5 ++++- scripts/buffs/of_focus_fire_6.py | 5 ++++- scripts/buffs/of_inspiration_1.py | 5 ++++- scripts/buffs/of_inspiration_2.py | 5 ++++- scripts/buffs/of_inspiration_3.py | 5 ++++- scripts/buffs/of_inspiration_4.py | 5 ++++- scripts/buffs/of_inspiration_5.py | 5 ++++- scripts/buffs/of_inspiration_6.py | 5 ++++- scripts/buffs/of_last_words.py | 5 ++++- scripts/buffs/of_pistol_bleed.py | 5 ++++- scripts/buffs/of_purge_1.py | 5 ++++- scripts/buffs/of_scatter_1.py | 5 ++++- scripts/buffs/of_stimulator_1.py | 5 ++++- scripts/buffs/of_vortex_bleed_1.py | 5 ++++- scripts/buffs/of_vortex_bleed_2.py | 5 ++++- scripts/buffs/of_vortex_bleed_3.py | 5 ++++- scripts/buffs/of_vortex_bleed_4.py | 5 ++++- scripts/buffs/of_vortex_bleed_5.py | 5 ++++- scripts/buffs/of_vortex_root.py | 5 ++++- scripts/buffs/poisoned.py | 5 ++++- scripts/buffs/proc_old_dark_jedi_gift.py | 5 ++++- scripts/buffs/proc_old_light_jedi_gift.py | 5 ++++- scripts/buffs/saberblock.py | 5 ++++- scripts/buffs/set_bonus_bh_dps_1.py | 5 ++++- scripts/buffs/set_bonus_bh_dps_2.py | 5 ++++- scripts/buffs/set_bonus_bh_dps_3.py | 5 ++++- scripts/buffs/set_bonus_bh_utility_a_1.py | 5 ++++- scripts/buffs/set_bonus_bh_utility_a_2.py | 5 ++++- scripts/buffs/set_bonus_bh_utility_a_3.py | 5 ++++- scripts/buffs/set_bonus_bh_utility_b_1.py | 5 ++++- scripts/buffs/set_bonus_bh_utility_b_2.py | 5 ++++- scripts/buffs/set_bonus_bh_utility_b_3.py | 5 ++++- scripts/buffs/set_bonus_hero_1.py | 5 ++++- scripts/buffs/set_bonus_hero_2.py | 5 ++++- scripts/buffs/set_bonus_hero_3.py | 5 ++++- scripts/buffs/sm_ae_dm_cc_1.py | 5 ++++- scripts/buffs/sm_ae_dm_cc_2.py | 5 ++++- scripts/buffs/sm_ae_dm_cc_3.py | 5 ++++- scripts/buffs/sm_ae_dm_cc_4.py | 5 ++++- scripts/buffs/sm_ae_dm_cc_5.py | 5 ++++- scripts/buffs/sm_ae_dm_cc_6.py | 5 ++++- scripts/buffs/sm_pistol_whip_1.py | 5 ++++- src/services/BuffService.java | 21 ++++++++++++------- src/services/GroupService.java | 3 +-- 176 files changed, 712 insertions(+), 188 deletions(-) diff --git a/scripts/buffs/armor_break.py b/scripts/buffs/armor_break.py index 288a2db0..f0a2f58e 100644 --- a/scripts/buffs/armor_break.py +++ b/scripts/buffs/armor_break.py @@ -1,12 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.addSkillMod('expertise_innate_reduction_all_player', 6 * buff.getStacks()) actor.addSkillMod('expertise_innate_reduction_all_mob', 600 * buff.getStacks()) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.deductSkillMod('expertise_innate_reduction_all_mob', 600 * buff.getStacks()) actor.deductSkillMod('expertise_innate_reduction_all_player', 6 * buff.getStacks()) return - diff --git a/scripts/buffs/bh_armor_sprint_1.py b/scripts/buffs/bh_armor_sprint_1.py index e9637ebd..5f39a64d 100644 --- a/scripts/buffs/bh_armor_sprint_1.py +++ b/scripts/buffs/bh_armor_sprint_1.py @@ -1,12 +1,15 @@ import sys -def setup(core, actor, buff): +def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 6) core.skillModService.addSkillMod(actor, 'movement_resist_snare', 100) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 6) core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 100) diff --git a/scripts/buffs/bh_cover_1.py b/scripts/buffs/bh_cover_1.py index b3ca84ce..b68de518 100644 --- a/scripts/buffs/bh_cover_1.py +++ b/scripts/buffs/bh_cover_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(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): +def remove(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) diff --git a/scripts/buffs/bh_prescience.py b/scripts/buffs/bh_prescience.py index e09c02e5..c60417a0 100644 --- a/scripts/buffs/bh_prescience.py +++ b/scripts/buffs/bh_prescience.py @@ -2,7 +2,10 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/bh_return_fire_1.py b/scripts/buffs/bh_return_fire_1.py index 7a0f25b4..95612d87 100644 --- a/scripts/buffs/bh_return_fire_1.py +++ b/scripts/buffs/bh_return_fire_1.py @@ -2,11 +2,14 @@ import sys def setup(core, actor, buff): buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_bh_return_fire'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_bh_return_fire_1', 1) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_bh_return_fire_1', 1) return \ No newline at end of file diff --git a/scripts/buffs/bleeding.py b/scripts/buffs/bleeding.py index e09c02e5..c60417a0 100644 --- a/scripts/buffs/bleeding.py +++ b/scripts/buffs/bleeding.py @@ -2,7 +2,10 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/buildabuff_inspiration.py b/scripts/buffs/buildabuff_inspiration.py index c6bf7407..2bba8272 100644 --- a/scripts/buffs/buildabuff_inspiration.py +++ b/scripts/buffs/buildabuff_inspiration.py @@ -2,6 +2,9 @@ from resources.common import BuffBuilder import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): buffWorkshop = actor.getAttachment('buffWorkshop') @@ -15,7 +18,7 @@ def setup(core, actor, buff): return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): for BuffItem in actor.getAttachment('buffWorkshop'): core.skillModService.deductSkillMod(actor, BuffItem.getSkillName(), BuffItem.getAffectAmount()) diff --git a/scripts/buffs/co_base_of_operations.py b/scripts/buffs/co_base_of_operations.py index 894c389c..8c8eb346 100644 --- a/scripts/buffs/co_base_of_operations.py +++ b/scripts/buffs/co_base_of_operations.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_innate_protection_all', 1000) core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_innate_protection_all', 1000) core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 5) return diff --git a/scripts/buffs/co_first_aid_training.py b/scripts/buffs/co_first_aid_training.py index b0ffe0f9..8679678c 100644 --- a/scripts/buffs/co_first_aid_training.py +++ b/scripts/buffs/co_first_aid_training.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_healing_all', 20) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_healing_all', 20) return \ No newline at end of file diff --git a/scripts/buffs/co_position_secured.py b/scripts/buffs/co_position_secured.py index b0b2781c..0885ccd9 100644 --- a/scripts/buffs/co_position_secured.py +++ b/scripts/buffs/co_position_secured.py @@ -1,6 +1,9 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.setSpeedMultiplierMod(0) @@ -22,7 +25,7 @@ def setup(core, actor, buff): return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.setSpeedMultiplierMod(1) diff --git a/scripts/buffs/co_stand_fast.py b/scripts/buffs/co_stand_fast.py index 17563ff9..8f8be535 100644 --- a/scripts/buffs/co_stand_fast.py +++ b/scripts/buffs/co_stand_fast.py @@ -3,7 +3,9 @@ import sys def setup(core, actor, buff): if actor.getSkillMod('expertise_buff_duration_line_co_stand_fast'): buff.setDuration(buff.getDuration() + actor.getSkillMod('expertise_buff_duration_line_co_stand_fast').getBase()) - + return + +def add(core, actor, buff): if actor.getSkillMod('expertise_damage_decrease_percentage'): core.skillModService.addSkillMod(actor, 'damage_decrease_percentage', (60 + actor.getSkillMod('expertise_damage_decrease_percentage').getBase()) / 2) else: @@ -11,7 +13,7 @@ def setup(core, actor, buff): return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): if actor.getSkillMod('expertise_damage_decrease_percentage'): core.skillModService.deductSkillMod(actor, 'damage_decrease_percentage', (60 + actor.getSkillMod('expertise_damage_decrease_percentage').getBase()) / 2) else: diff --git a/scripts/buffs/en_action_regen.py b/scripts/buffs/en_action_regen.py index 6193a43d..850186d0 100644 --- a/scripts/buffs/en_action_regen.py +++ b/scripts/buffs/en_action_regen.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_weapon_melee', 60) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_weapon_melee', 60) return \ No newline at end of file diff --git a/scripts/buffs/en_debuff_thrill.py b/scripts/buffs/en_debuff_thrill.py index 69ced2d5..9a25438b 100644 --- a/scripts/buffs/en_debuff_thrill.py +++ b/scripts/buffs/en_debuff_thrill.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 2) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 2) return \ No newline at end of file diff --git a/scripts/buffs/en_debuff_thrill_1.py b/scripts/buffs/en_debuff_thrill_1.py index 0c399bb3..cbcb2ac4 100644 --- a/scripts/buffs/en_debuff_thrill_1.py +++ b/scripts/buffs/en_debuff_thrill_1.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 4) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 4) return \ No newline at end of file diff --git a/scripts/buffs/en_debuff_thrill_2.py b/scripts/buffs/en_debuff_thrill_2.py index 0f533529..6b887e82 100644 --- a/scripts/buffs/en_debuff_thrill_2.py +++ b/scripts/buffs/en_debuff_thrill_2.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 6) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 6) return \ No newline at end of file diff --git a/scripts/buffs/en_spiral_kick_snare.py b/scripts/buffs/en_spiral_kick_snare.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/en_spiral_kick_snare.py +++ b/scripts/buffs/en_spiral_kick_snare.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/en_sprint.py b/scripts/buffs/en_sprint.py index 842e0c3c..288b25b1 100644 --- a/scripts/buffs/en_sprint.py +++ b/scripts/buffs/en_sprint.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement_resist_snare', 100) core.skillModService.addSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 100) return diff --git a/scripts/buffs/en_sweeping_pirouette_root.py b/scripts/buffs/en_sweeping_pirouette_root.py index 32ba0f8d..42418564 100644 --- a/scripts/buffs/en_sweeping_pirouette_root.py +++ b/scripts/buffs/en_sweeping_pirouette_root.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 10) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 10) return \ No newline at end of file diff --git a/scripts/buffs/en_unhealthy_fixation_debuff.py b/scripts/buffs/en_unhealthy_fixation_debuff.py index 2ae015d2..7dfe77af 100644 --- a/scripts/buffs/en_unhealthy_fixation_debuff.py +++ b/scripts/buffs/en_unhealthy_fixation_debuff.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'en_unhealthy_stun', 1) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'en_unhealthy_stun', 1) return \ No newline at end of file diff --git a/scripts/buffs/en_void_dance_buff.py b/scripts/buffs/en_void_dance_buff.py index c0318a09..3197e246 100644 --- a/scripts/buffs/en_void_dance_buff.py +++ b/scripts/buffs/en_void_dance_buff.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 60) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 60) return \ No newline at end of file diff --git a/scripts/buffs/en_void_dance_buff_1.py b/scripts/buffs/en_void_dance_buff_1.py index 2c8f2ee9..6a37025d 100644 --- a/scripts/buffs/en_void_dance_buff_1.py +++ b/scripts/buffs/en_void_dance_buff_1.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 65) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 65) return \ No newline at end of file diff --git a/scripts/buffs/en_void_dance_buff_2.py b/scripts/buffs/en_void_dance_buff_2.py index a6aa1d1f..bcd31db8 100644 --- a/scripts/buffs/en_void_dance_buff_2.py +++ b/scripts/buffs/en_void_dance_buff_2.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 70) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 70) return \ No newline at end of file diff --git a/scripts/buffs/en_void_dance_buff_3.py b/scripts/buffs/en_void_dance_buff_3.py index c4674163..e2d98d20 100644 --- a/scripts/buffs/en_void_dance_buff_3.py +++ b/scripts/buffs/en_void_dance_buff_3.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 75) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 75) return \ No newline at end of file diff --git a/scripts/buffs/flawless_bead_1.py b/scripts/buffs/flawless_bead_1.py index 84123a88..9d402987 100644 --- a/scripts/buffs/flawless_bead_1.py +++ b/scripts/buffs/flawless_bead_1.py @@ -2,6 +2,9 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/flawless_bead_2.py b/scripts/buffs/flawless_bead_2.py index 84123a88..9d402987 100644 --- a/scripts/buffs/flawless_bead_2.py +++ b/scripts/buffs/flawless_bead_2.py @@ -2,6 +2,9 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/flawless_bead_3.py b/scripts/buffs/flawless_bead_3.py index 84123a88..9d402987 100644 --- a/scripts/buffs/flawless_bead_3.py +++ b/scripts/buffs/flawless_bead_3.py @@ -2,6 +2,9 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/fs_ae_dm_cc_0.py b/scripts/buffs/fs_ae_dm_cc_0.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/fs_ae_dm_cc_0.py +++ b/scripts/buffs/fs_ae_dm_cc_0.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/fs_ae_dm_cc_1.py b/scripts/buffs/fs_ae_dm_cc_1.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/fs_ae_dm_cc_1.py +++ b/scripts/buffs/fs_ae_dm_cc_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/fs_ae_dm_cc_2.py b/scripts/buffs/fs_ae_dm_cc_2.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/fs_ae_dm_cc_2.py +++ b/scripts/buffs/fs_ae_dm_cc_2.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/fs_ae_dm_cc_3.py b/scripts/buffs/fs_ae_dm_cc_3.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/fs_ae_dm_cc_3.py +++ b/scripts/buffs/fs_ae_dm_cc_3.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/fs_ae_dm_cc_4.py b/scripts/buffs/fs_ae_dm_cc_4.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/fs_ae_dm_cc_4.py +++ b/scripts/buffs/fs_ae_dm_cc_4.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/fs_ae_dm_cc_5.py b/scripts/buffs/fs_ae_dm_cc_5.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/fs_ae_dm_cc_5.py +++ b/scripts/buffs/fs_ae_dm_cc_5.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/fs_ae_dm_cc_6.py b/scripts/buffs/fs_ae_dm_cc_6.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/fs_ae_dm_cc_6.py +++ b/scripts/buffs/fs_ae_dm_cc_6.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/fs_buff_ca_1.py b/scripts/buffs/fs_buff_ca_1.py index 5fb1239f..837e11f7 100644 --- a/scripts/buffs/fs_buff_ca_1.py +++ b/scripts/buffs/fs_buff_ca_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.playEffectObject('appearance/pt_sokan_focus.prt', 'fs_buff_ca_1') core.skillModService.addSkillMod(actor, 'expertise_focus', 1) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_focus', 1) return \ No newline at end of file diff --git a/scripts/buffs/fs_buff_def_1_1.py b/scripts/buffs/fs_buff_def_1_1.py index 0d7ad4dd..743dc69b 100644 --- a/scripts/buffs/fs_buff_def_1_1.py +++ b/scripts/buffs/fs_buff_def_1_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.playEffectObject('appearance/pt_force_avoid_incapacitation.prt', 'fs_buff_def_1_1') core.skillModService.addSkillMod(actor, 'expertise_stance', 1) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_stance', 1) return \ No newline at end of file diff --git a/scripts/buffs/fs_dm_cc_crit_1.py b/scripts/buffs/fs_dm_cc_crit_1.py index 493481d7..df2109d8 100644 --- a/scripts/buffs/fs_dm_cc_crit_1.py +++ b/scripts/buffs/fs_dm_cc_crit_1.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.setSpeedMultiplierBase(0.5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.setSpeedMultiplierBase(1) return \ No newline at end of file diff --git a/scripts/buffs/fs_dm_cc_crit_2.py b/scripts/buffs/fs_dm_cc_crit_2.py index 493481d7..df2109d8 100644 --- a/scripts/buffs/fs_dm_cc_crit_2.py +++ b/scripts/buffs/fs_dm_cc_crit_2.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.setSpeedMultiplierBase(0.5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.setSpeedMultiplierBase(1) return \ No newline at end of file diff --git a/scripts/buffs/fs_dm_cc_crit_3.py b/scripts/buffs/fs_dm_cc_crit_3.py index 493481d7..df2109d8 100644 --- a/scripts/buffs/fs_dm_cc_crit_3.py +++ b/scripts/buffs/fs_dm_cc_crit_3.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.setSpeedMultiplierBase(0.5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.setSpeedMultiplierBase(1) return \ No newline at end of file diff --git a/scripts/buffs/fs_dm_cc_crit_4.py b/scripts/buffs/fs_dm_cc_crit_4.py index 493481d7..df2109d8 100644 --- a/scripts/buffs/fs_dm_cc_crit_4.py +++ b/scripts/buffs/fs_dm_cc_crit_4.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.setSpeedMultiplierBase(0.5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.setSpeedMultiplierBase(1) return \ No newline at end of file diff --git a/scripts/buffs/fs_dm_cc_crit_5.py b/scripts/buffs/fs_dm_cc_crit_5.py index 493481d7..df2109d8 100644 --- a/scripts/buffs/fs_dm_cc_crit_5.py +++ b/scripts/buffs/fs_dm_cc_crit_5.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.setSpeedMultiplierBase(0.5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.setSpeedMultiplierBase(1) return \ No newline at end of file diff --git a/scripts/buffs/fs_force_run.py b/scripts/buffs/fs_force_run.py index f691d76f..714e8198 100644 --- a/scripts/buffs/fs_force_run.py +++ b/scripts/buffs/fs_force_run.py @@ -1,7 +1,10 @@ import sys -def setup(core, actor, buff): +def setup(core, actor, buff): buff.setDuration(buff.getDuration()+(actor.getSkillModBase('expertise_buff_duration_line_fs_force_run'))) + return + +def add(core, actor, buff): actor.playEffectObject('clienteffect/pl_force_run.cef', 'fs_force_run') actor.playEffectObject('appearance/pt_force_speed.prt', 'fs_force_run') actor.setSpeedMultiplierBase(actor.getSpeedMultiplierBase() + 2.5 + (2.5 * (actor.getSkillModBase('expertise_movement_buff_fs_force_run')) / 100)) @@ -14,7 +17,7 @@ def setup(core, actor, buff): return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.stopEffectObject('fs_force_run') actor.setSpeedMultiplierBase(actor.getSpeedMultiplierBase() - 2.5 - (2.5 * (actor.getSkillModBase('expertise_movement_buff_fs_force_run')) / 100)) core.skillModService.deductSkillMod(actor, 'slope_move', 5) diff --git a/scripts/buffs/fs_force_throw.py b/scripts/buffs/fs_force_throw.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/fs_force_throw.py +++ b/scripts/buffs/fs_force_throw.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/fs_saber_reflect.py b/scripts/buffs/fs_saber_reflect.py index cba5694e..815b8b7d 100644 --- a/scripts/buffs/fs_saber_reflect.py +++ b/scripts/buffs/fs_saber_reflect.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_saber_block', 1) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_saber_block', 1) return \ No newline at end of file diff --git a/scripts/buffs/invis_fs_buff_invis_1.py b/scripts/buffs/invis_fs_buff_invis_1.py index e09c02e5..c60417a0 100644 --- a/scripts/buffs/invis_fs_buff_invis_1.py +++ b/scripts/buffs/invis_fs_buff_invis_1.py @@ -2,7 +2,10 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/me_buff_action_1.py b/scripts/buffs/me_buff_action_1.py index d5cff5fb..7cd3cf3c 100644 --- a/scripts/buffs/me_buff_action_1.py +++ b/scripts/buffs/me_buff_action_1.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stamina_modified', 35) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stamina_modified', 35) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_action_2.py b/scripts/buffs/me_buff_action_2.py index 9848727e..0d1a1718 100644 --- a/scripts/buffs/me_buff_action_2.py +++ b/scripts/buffs/me_buff_action_2.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stamina_modified', 80) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stamina_modified', 80) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_action_3.py b/scripts/buffs/me_buff_action_3.py index f59277c9..625808f2 100644 --- a/scripts/buffs/me_buff_action_3.py +++ b/scripts/buffs/me_buff_action_3.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stamina_modified', 250) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stamina_modified', 250) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_agility_1.py b/scripts/buffs/me_buff_agility_1.py index 10d3a0a6..cc0368a7 100644 --- a/scripts/buffs/me_buff_agility_1.py +++ b/scripts/buffs/me_buff_agility_1.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'agility_modified', 15) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'agility_modified', 15) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_agility_2.py b/scripts/buffs/me_buff_agility_2.py index 8130ad0f..47ae13c6 100644 --- a/scripts/buffs/me_buff_agility_2.py +++ b/scripts/buffs/me_buff_agility_2.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'agility_modified', 45) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'agility_modified', 45) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_agility_3.py b/scripts/buffs/me_buff_agility_3.py index a9727dc2..83686069 100644 --- a/scripts/buffs/me_buff_agility_3.py +++ b/scripts/buffs/me_buff_agility_3.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'agility_modified', 80) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'agility_modified', 80) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_health.py b/scripts/buffs/me_buff_health.py index 70dd9938..f5396585 100644 --- a/scripts/buffs/me_buff_health.py +++ b/scripts/buffs/me_buff_health.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'constitution_modified', 80) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'constitution_modified', 80) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_health_0.py b/scripts/buffs/me_buff_health_0.py index b20b680b..513dabb4 100644 --- a/scripts/buffs/me_buff_health_0.py +++ b/scripts/buffs/me_buff_health_0.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'constitution_modified', 35) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'constitution_modified', 35) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_health_2.py b/scripts/buffs/me_buff_health_2.py index fc52c4a3..4c0a9502 100644 --- a/scripts/buffs/me_buff_health_2.py +++ b/scripts/buffs/me_buff_health_2.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'constitution_modified', 250) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'constitution_modified', 250) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_melee_gb_1.py b/scripts/buffs/me_buff_melee_gb_1.py index f052d7b9..9819dcb3 100644 --- a/scripts/buffs/me_buff_melee_gb_1.py +++ b/scripts/buffs/me_buff_melee_gb_1.py @@ -3,11 +3,14 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'display_only_block', 1000) core.skillModService.addSkillMod(actor, 'combat_block_value', 200) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'display_only_block', 1000) core.skillModService.deductSkillMod(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 3006e18e..6b24b151 100644 --- a/scripts/buffs/me_buff_precision_1.py +++ b/scripts/buffs/me_buff_precision_1.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'precision_modified', 15) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'precision_modified', 15) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_precision_2.py b/scripts/buffs/me_buff_precision_2.py index fbf6d978..b3c2aab5 100644 --- a/scripts/buffs/me_buff_precision_2.py +++ b/scripts/buffs/me_buff_precision_2.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'precision_modified', 45) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'precision_modified', 45) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_precision_3.py b/scripts/buffs/me_buff_precision_3.py index f6490d10..40899ffb 100644 --- a/scripts/buffs/me_buff_precision_3.py +++ b/scripts/buffs/me_buff_precision_3.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'precision_modified', 80) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'precision_modified', 80) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_ranged_gb_1.py b/scripts/buffs/me_buff_ranged_gb_1.py index d2476abe..ce5770a8 100644 --- a/scripts/buffs/me_buff_ranged_gb_1.py +++ b/scripts/buffs/me_buff_ranged_gb_1.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'display_only_dodge', 500) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'display_only_dodge', 500) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_strength_1.py b/scripts/buffs/me_buff_strength_1.py index 462d84a5..fa50d073 100644 --- a/scripts/buffs/me_buff_strength_1.py +++ b/scripts/buffs/me_buff_strength_1.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'strength_modified', 15) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'strength_modified', 15) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_strength_2.py b/scripts/buffs/me_buff_strength_2.py index 85f6d038..5f8f02d2 100644 --- a/scripts/buffs/me_buff_strength_2.py +++ b/scripts/buffs/me_buff_strength_2.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'strength_modified', 45) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'strength_modified', 45) return \ No newline at end of file diff --git a/scripts/buffs/me_buff_strength_3.py b/scripts/buffs/me_buff_strength_3.py index 6fa59e33..fcba94f9 100644 --- a/scripts/buffs/me_buff_strength_3.py +++ b/scripts/buffs/me_buff_strength_3.py @@ -3,10 +3,13 @@ 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'))) + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'strength_modified', 80) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'strength_modified', 80) return \ No newline at end of file diff --git a/scripts/buffs/me_burst_1.py b/scripts/buffs/me_burst_1.py index 15d5cd85..82f6065b 100644 --- a/scripts/buffs/me_burst_1.py +++ b/scripts/buffs/me_burst_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(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): +def remove(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) diff --git a/scripts/buffs/me_cranial_smash_1.py b/scripts/buffs/me_cranial_smash_1.py index f63ec968..3daa6068 100644 --- a/scripts/buffs/me_cranial_smash_1.py +++ b/scripts/buffs/me_cranial_smash_1.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_divide_damage_dealt', 10) core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) core.skillModService.deductSkillMod(actor, 'combat_divide_damage_dealt', 10) return diff --git a/scripts/buffs/me_cure_affliction_1.py b/scripts/buffs/me_cure_affliction_1.py index f5e1ce07..b071a958 100644 --- a/scripts/buffs/me_cure_affliction_1.py +++ b/scripts/buffs/me_cure_affliction_1.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(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): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_reduction_all', 5) core.skillModService.deductSkillMod(actor, 'dot_resist_all', 100) return diff --git a/scripts/buffs/me_doom.py b/scripts/buffs/me_doom.py index d4f40162..fe90deb5 100644 --- a/scripts/buffs/me_doom.py +++ b/scripts/buffs/me_doom.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'me_doom', 1) return -def removeBuff(core, actor, buff): +def remove(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 index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/me_electrolyte_drain_1.py +++ b/scripts/buffs/me_electrolyte_drain_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(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 index 59984429..81ea7c1d 100644 --- a/scripts/buffs/me_evasion_1.py +++ b/scripts/buffs/me_evasion_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 35) core.skillModService.addSkillMod(actor, 'display_only_evasion', 5000) core.skillModService.addSkillMod(actor, 'combat_evasion_value', 50) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 35) core.skillModService.deductSkillMod(actor, 'display_only_evasion', 5000) core.skillModService.deductSkillMod(actor, 'combat_evasion_value', 50) diff --git a/scripts/buffs/me_rheumatic_calamity_1.py b/scripts/buffs/me_rheumatic_calamity_1.py index 2884acd8..8870a12b 100644 --- a/scripts/buffs/me_rheumatic_calamity_1.py +++ b/scripts/buffs/me_rheumatic_calamity_1.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'action_burn', 65) return -def removeBuff(core, actor, buff): +def remove(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 index 5eb23142..2c931a78 100644 --- a/scripts/buffs/me_serotonin_boost_1.py +++ b/scripts/buffs/me_serotonin_boost_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'debuff_purge', 1) return -def removeBuff(core, actor, buff): +def remove(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 index 8b288359..c5540781 100644 --- a/scripts/buffs/me_serotonin_purge_1.py +++ b/scripts/buffs/me_serotonin_purge_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'buff_purge', 1) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'buff_purge', 1) return \ No newline at end of file diff --git a/scripts/buffs/me_stasis_1.py b/scripts/buffs/me_stasis_1.py index 1539e280..7d4b7fe5 100644 --- a/scripts/buffs/me_stasis_1.py +++ b/scripts/buffs/me_stasis_1.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.playEffectObject('clienteffect/medic_stasis.cef', 'me_stasis_1') actor.setSpeedMultiplierBase(0.2) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.setSpeedMultiplierBase(1) return \ No newline at end of file diff --git a/scripts/buffs/me_stasis_self_1.py b/scripts/buffs/me_stasis_self_1.py index 6341cb4c..cfb0b3f3 100644 --- a/scripts/buffs/me_stasis_self_1.py +++ b/scripts/buffs/me_stasis_self_1.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): actor.playEffectObject('clienteffect/medic_stasis.cef', 'me_stasis_self_1') actor.setSpeedMultiplierBase(0.2) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): actor.setSpeedMultiplierBase(1) return \ No newline at end of file diff --git a/scripts/buffs/me_thyroid_rupture_1.py b/scripts/buffs/me_thyroid_rupture_1.py index 03b1fba8..fcafd14c 100644 --- a/scripts/buffs/me_thyroid_rupture_1.py +++ b/scripts/buffs/me_thyroid_rupture_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_divide_damage_dealt', 25) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'combat_divide_damage_dealt', 25) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_debuff_1.py b/scripts/buffs/of_adv_paint_debuff_1.py index 7f6894de..54bbaa4e 100644 --- a/scripts/buffs/of_adv_paint_debuff_1.py +++ b/scripts/buffs/of_adv_paint_debuff_1.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_damage_vulnerability', 3) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_damage_vulnerability', 3) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_debuff_2.py b/scripts/buffs/of_adv_paint_debuff_2.py index 92f239c0..2a7c28ce 100644 --- a/scripts/buffs/of_adv_paint_debuff_2.py +++ b/scripts/buffs/of_adv_paint_debuff_2.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_damage_vulnerability', 4) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_damage_vulnerability', 4) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_debuff_3.py b/scripts/buffs/of_adv_paint_debuff_3.py index 58fe704f..18dc8a8c 100644 --- a/scripts/buffs/of_adv_paint_debuff_3.py +++ b/scripts/buffs/of_adv_paint_debuff_3.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_damage_vulnerability', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_damage_vulnerability', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_debuff_4.py b/scripts/buffs/of_adv_paint_debuff_4.py index f41ae124..ec98f8ea 100644 --- a/scripts/buffs/of_adv_paint_debuff_4.py +++ b/scripts/buffs/of_adv_paint_debuff_4.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_damage_vulnerability', 6) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_damage_vulnerability', 6) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_debuff_5.py b/scripts/buffs/of_adv_paint_debuff_5.py index d31be060..e8fc48e0 100644 --- a/scripts/buffs/of_adv_paint_debuff_5.py +++ b/scripts/buffs/of_adv_paint_debuff_5.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_damage_vulnerability', 7) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_damage_vulnerability', 7) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_debuff_6.py b/scripts/buffs/of_adv_paint_debuff_6.py index 84ffe9ed..739acd40 100644 --- a/scripts/buffs/of_adv_paint_debuff_6.py +++ b/scripts/buffs/of_adv_paint_debuff_6.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_damage_vulnerability', 8) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_damage_vulnerability', 8) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_debuff_7.py b/scripts/buffs/of_adv_paint_debuff_7.py index 231f4a1b..32276a5f 100644 --- a/scripts/buffs/of_adv_paint_debuff_7.py +++ b/scripts/buffs/of_adv_paint_debuff_7.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_damage_vulnerability', 9) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_damage_vulnerability', 9) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_debuff_8.py b/scripts/buffs/of_adv_paint_debuff_8.py index 65e1c826..7af4032c 100644 --- a/scripts/buffs/of_adv_paint_debuff_8.py +++ b/scripts/buffs/of_adv_paint_debuff_8.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'critical_damage_vulnerability', 10) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'critical_damage_vulnerability', 10) return \ No newline at end of file diff --git a/scripts/buffs/of_adv_paint_expose_1.py b/scripts/buffs/of_adv_paint_expose_1.py index e3583535..cf3db901 100644 --- a/scripts/buffs/of_adv_paint_expose_1.py +++ b/scripts/buffs/of_adv_paint_expose_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stealth_divisor', 15) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 3) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 3) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stealth_divisor', 15) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 3) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 3) diff --git a/scripts/buffs/of_adv_paint_expose_2.py b/scripts/buffs/of_adv_paint_expose_2.py index 07ed0966..cb86a0d8 100644 --- a/scripts/buffs/of_adv_paint_expose_2.py +++ b/scripts/buffs/of_adv_paint_expose_2.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stealth_divisor', 20) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 4) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 4) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stealth_divisor', 20) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 4) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 4) diff --git a/scripts/buffs/of_adv_paint_expose_3.py b/scripts/buffs/of_adv_paint_expose_3.py index 4ab6e431..7a7d18af 100644 --- a/scripts/buffs/of_adv_paint_expose_3.py +++ b/scripts/buffs/of_adv_paint_expose_3.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stealth_divisor', 25) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 5) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stealth_divisor', 25) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 5) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 5) diff --git a/scripts/buffs/of_adv_paint_expose_4.py b/scripts/buffs/of_adv_paint_expose_4.py index df8fae5c..3716ee92 100644 --- a/scripts/buffs/of_adv_paint_expose_4.py +++ b/scripts/buffs/of_adv_paint_expose_4.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stealth_divisor', 30) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 6) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 6) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stealth_divisor', 30) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 6) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 6) diff --git a/scripts/buffs/of_adv_paint_expose_5.py b/scripts/buffs/of_adv_paint_expose_5.py index d22f46f0..210f262d 100644 --- a/scripts/buffs/of_adv_paint_expose_5.py +++ b/scripts/buffs/of_adv_paint_expose_5.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stealth_divisor', 35) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 7) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 7) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stealth_divisor', 35) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 7) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 7) diff --git a/scripts/buffs/of_adv_paint_expose_6.py b/scripts/buffs/of_adv_paint_expose_6.py index 4e3af368..d58904ce 100644 --- a/scripts/buffs/of_adv_paint_expose_6.py +++ b/scripts/buffs/of_adv_paint_expose_6.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stealth_divisor', 40) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 8) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 8) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stealth_divisor', 40) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 8) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 8) diff --git a/scripts/buffs/of_adv_paint_expose_7.py b/scripts/buffs/of_adv_paint_expose_7.py index 46e42ba4..c83c4950 100644 --- a/scripts/buffs/of_adv_paint_expose_7.py +++ b/scripts/buffs/of_adv_paint_expose_7.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stealth_divisor', 45) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 9) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 9) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stealth_divisor', 45) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 9) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 9) diff --git a/scripts/buffs/of_adv_paint_expose_8.py b/scripts/buffs/of_adv_paint_expose_8.py index ff43fe6c..38a00bf2 100644 --- a/scripts/buffs/of_adv_paint_expose_8.py +++ b/scripts/buffs/of_adv_paint_expose_8.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stealth_divisor', 50) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 10) core.skillModService.addSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 10) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stealth_divisor', 50) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_buff_def', 10) core.skillModService.deductSkillMod(actor, 'expertise_damage_line_vulnerability_of_dm', 10) diff --git a/scripts/buffs/of_ae_dm_cc_1.py b/scripts/buffs/of_ae_dm_cc_1.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_ae_dm_cc_1.py +++ b/scripts/buffs/of_ae_dm_cc_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_ae_dm_cc_2.py b/scripts/buffs/of_ae_dm_cc_2.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_ae_dm_cc_2.py +++ b/scripts/buffs/of_ae_dm_cc_2.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_ae_dm_cc_3.py b/scripts/buffs/of_ae_dm_cc_3.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_ae_dm_cc_3.py +++ b/scripts/buffs/of_ae_dm_cc_3.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_buff_def_1.py b/scripts/buffs/of_buff_def_1.py index dd15adaf..68455f5b 100644 --- a/scripts/buffs/of_buff_def_1.py +++ b/scripts/buffs/of_buff_def_1.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 1) core.skillModService.addSkillMod(actor, 'constitution_modified', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 1) core.skillModService.deductSkillMod(actor, 'constitution_modified', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_buff_def_2.py b/scripts/buffs/of_buff_def_2.py index d819404b..c1cb56b4 100644 --- a/scripts/buffs/of_buff_def_2.py +++ b/scripts/buffs/of_buff_def_2.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 2) core.skillModService.addSkillMod(actor, 'constitution_modified', 10) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 2) core.skillModService.deductSkillMod(actor, 'constitution_modified', 10) return \ No newline at end of file diff --git a/scripts/buffs/of_buff_def_3.py b/scripts/buffs/of_buff_def_3.py index d18a3633..952b1963 100644 --- a/scripts/buffs/of_buff_def_3.py +++ b/scripts/buffs/of_buff_def_3.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 2) core.skillModService.addSkillMod(actor, 'constitution_modified', 20) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 2) core.skillModService.deductSkillMod(actor, 'constitution_modified', 20) return \ No newline at end of file diff --git a/scripts/buffs/of_buff_def_4.py b/scripts/buffs/of_buff_def_4.py index b115ce6b..3360e4e4 100644 --- a/scripts/buffs/of_buff_def_4.py +++ b/scripts/buffs/of_buff_def_4.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 2) core.skillModService.addSkillMod(actor, 'constitution_modified', 20) core.skillModService.addSkillMod(actor, 'combat_critical_hit_reduction', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 2) core.skillModService.deductSkillMod(actor, 'constitution_modified', 20) core.skillModService.deductSkillMod(actor, 'combat_critical_hit_reduction', 5) diff --git a/scripts/buffs/of_buff_def_5.py b/scripts/buffs/of_buff_def_5.py index 5c6ff8eb..5e0f8e8d 100644 --- a/scripts/buffs/of_buff_def_5.py +++ b/scripts/buffs/of_buff_def_5.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 3) core.skillModService.addSkillMod(actor, 'constitution_modified', 25) core.skillModService.addSkillMod(actor, 'combat_critical_hit_reduction', 6) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 3) core.skillModService.deductSkillMod(actor, 'constitution_modified', 25) core.skillModService.deductSkillMod(actor, 'combat_critical_hit_reduction', 6) diff --git a/scripts/buffs/of_buff_def_6.py b/scripts/buffs/of_buff_def_6.py index b8a4b168..46293f6b 100644 --- a/scripts/buffs/of_buff_def_6.py +++ b/scripts/buffs/of_buff_def_6.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 3) core.skillModService.addSkillMod(actor, 'constitution_modified', 35) core.skillModService.addSkillMod(actor, 'combat_critical_hit_reduction', 7) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 3) core.skillModService.deductSkillMod(actor, 'constitution_modified', 35) core.skillModService.deductSkillMod(actor, 'combat_critical_hit_reduction', 7) diff --git a/scripts/buffs/of_buff_def_7.py b/scripts/buffs/of_buff_def_7.py index 77bdd6b4..a063f2fd 100644 --- a/scripts/buffs/of_buff_def_7.py +++ b/scripts/buffs/of_buff_def_7.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 4) core.skillModService.addSkillMod(actor, 'constitution_modified', 50) core.skillModService.addSkillMod(actor, 'combat_critical_hit_reduction', 8) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 4) core.skillModService.deductSkillMod(actor, 'constitution_modified', 50) core.skillModService.deductSkillMod(actor, 'combat_critical_hit_reduction', 8) diff --git a/scripts/buffs/of_buff_def_8.py b/scripts/buffs/of_buff_def_8.py index e4b5ba0c..4136a39d 100644 --- a/scripts/buffs/of_buff_def_8.py +++ b/scripts/buffs/of_buff_def_8.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 4) core.skillModService.addSkillMod(actor, 'constitution_modified', 60) core.skillModService.addSkillMod(actor, 'combat_critical_hit_reduction', 9) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 4) core.skillModService.deductSkillMod(actor, 'constitution_modified', 60) core.skillModService.deductSkillMod(actor, 'combat_critical_hit_reduction', 9) diff --git a/scripts/buffs/of_buff_def_9.py b/scripts/buffs/of_buff_def_9.py index 6f5e35e7..2651fc29 100644 --- a/scripts/buffs/of_buff_def_9.py +++ b/scripts/buffs/of_buff_def_9.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', 5) core.skillModService.addSkillMod(actor, 'constitution_modified', 70) core.skillModService.addSkillMod(actor, 'combat_critical_hit_reduction', 10) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', 5) core.skillModService.deductSkillMod(actor, 'constitution_modified', 70) core.skillModService.deductSkillMod(actor, 'combat_critical_hit_reduction', 10) diff --git a/scripts/buffs/of_cc_melee_1.py b/scripts/buffs/of_cc_melee_1.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_cc_melee_1.py +++ b/scripts/buffs/of_cc_melee_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_cc_melee_2.py b/scripts/buffs/of_cc_melee_2.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_cc_melee_2.py +++ b/scripts/buffs/of_cc_melee_2.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_cc_melee_3.py b/scripts/buffs/of_cc_melee_3.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_cc_melee_3.py +++ b/scripts/buffs/of_cc_melee_3.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_cc_melee_4.py b/scripts/buffs/of_cc_melee_4.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_cc_melee_4.py +++ b/scripts/buffs/of_cc_melee_4.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_cc_melee_5.py b/scripts/buffs/of_cc_melee_5.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_cc_melee_5.py +++ b/scripts/buffs/of_cc_melee_5.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_cc_melee_6.py b/scripts/buffs/of_cc_melee_6.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_cc_melee_6.py +++ b/scripts/buffs/of_cc_melee_6.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_cc_melee_7.py b/scripts/buffs/of_cc_melee_7.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/of_cc_melee_7.py +++ b/scripts/buffs/of_cc_melee_7.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/of_charge_1.py b/scripts/buffs/of_charge_1.py index 1edd38b5..db0d0aa7 100644 --- a/scripts/buffs/of_charge_1.py +++ b/scripts/buffs/of_charge_1.py @@ -1,13 +1,16 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_damage_all', 10) core.skillModService.addSkillMod(actor, 'expertise_action_all', 10) core.skillModService.addSkillMod(actor, 'movement_resist_snare', 100) core.skillModService.addSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) core.skillModService.deductSkillMod(actor, 'expertise_damage_all', 10) core.skillModService.deductSkillMod(actor, 'expertise_action_all', 10) diff --git a/scripts/buffs/of_deadeye_debuff.py b/scripts/buffs/of_deadeye_debuff.py index 533e3262..be22ec3e 100644 --- a/scripts/buffs/of_deadeye_debuff.py +++ b/scripts/buffs/of_deadeye_debuff.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'action_burn', 50) core.skillModService.addSkillMod(actor, 'glancing_blow_vulnerable', 30) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'action_burn', 50) core.skillModService.deductSkillMod(actor, 'glancing_blow_vulnerable', 30) return \ No newline at end of file diff --git a/scripts/buffs/of_deb_def_1.py b/scripts/buffs/of_deb_def_1.py index 5a4b5cff..793bdf94 100644 --- a/scripts/buffs/of_deb_def_1.py +++ b/scripts/buffs/of_deb_def_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', -2) core.skillModService.addSkillMod(actor, 'expertise_parry', -2) core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 3) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', -2) core.skillModService.deductSkillMod(actor, 'expertise_parry', -2) core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 3) diff --git a/scripts/buffs/of_deb_def_2.py b/scripts/buffs/of_deb_def_2.py index 75c97f71..b8489de2 100644 --- a/scripts/buffs/of_deb_def_2.py +++ b/scripts/buffs/of_deb_def_2.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', -3) core.skillModService.addSkillMod(actor, 'expertise_parry', -3) core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 4) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', -3) core.skillModService.deductSkillMod(actor, 'expertise_parry', -3) core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 4) diff --git a/scripts/buffs/of_deb_def_3.py b/scripts/buffs/of_deb_def_3.py index 5b125b31..9ca704a3 100644 --- a/scripts/buffs/of_deb_def_3.py +++ b/scripts/buffs/of_deb_def_3.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', -3) core.skillModService.addSkillMod(actor, 'expertise_parry', -3) core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', -3) core.skillModService.deductSkillMod(actor, 'expertise_parry', -3) core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 5) diff --git a/scripts/buffs/of_deb_def_4.py b/scripts/buffs/of_deb_def_4.py index 056db66a..62a832dd 100644 --- a/scripts/buffs/of_deb_def_4.py +++ b/scripts/buffs/of_deb_def_4.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', -4) core.skillModService.addSkillMod(actor, 'expertise_parry', -4) core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 4) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', -4) core.skillModService.deductSkillMod(actor, 'expertise_parry', -4) core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 4) diff --git a/scripts/buffs/of_deb_def_5.py b/scripts/buffs/of_deb_def_5.py index ec243e5b..4c8e28fa 100644 --- a/scripts/buffs/of_deb_def_5.py +++ b/scripts/buffs/of_deb_def_5.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', -4) core.skillModService.addSkillMod(actor, 'expertise_parry', -4) core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', -4) core.skillModService.deductSkillMod(actor, 'expertise_parry', -4) core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 5) diff --git a/scripts/buffs/of_deb_def_6.py b/scripts/buffs/of_deb_def_6.py index 3ebd39ea..eb41e77b 100644 --- a/scripts/buffs/of_deb_def_6.py +++ b/scripts/buffs/of_deb_def_6.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', -5) core.skillModService.addSkillMod(actor, 'expertise_parry', -5) core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 6) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', -5) core.skillModService.deductSkillMod(actor, 'expertise_parry', -5) core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 6) diff --git a/scripts/buffs/of_deb_def_7.py b/scripts/buffs/of_deb_def_7.py index 7503918d..c1e5dd6e 100644 --- a/scripts/buffs/of_deb_def_7.py +++ b/scripts/buffs/of_deb_def_7.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', -6) core.skillModService.addSkillMod(actor, 'expertise_parry', -6) core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 7) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', -6) core.skillModService.deductSkillMod(actor, 'expertise_parry', -6) core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 7) diff --git a/scripts/buffs/of_deb_def_8.py b/scripts/buffs/of_deb_def_8.py index bc8e5334..1ad5b201 100644 --- a/scripts/buffs/of_deb_def_8.py +++ b/scripts/buffs/of_deb_def_8.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_dodge', -7) core.skillModService.addSkillMod(actor, 'expertise_parry', -7) core.skillModService.addSkillMod(actor, 'critical_hit_vulnerable', 8) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_dodge', -7) core.skillModService.deductSkillMod(actor, 'expertise_parry', -7) core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 8) diff --git a/scripts/buffs/of_decap_bleed_1.py b/scripts/buffs/of_decap_bleed_1.py index 16152e90..ff8b7fcf 100644 --- a/scripts/buffs/of_decap_bleed_1.py +++ b/scripts/buffs/of_decap_bleed_1.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 18) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 18) return \ No newline at end of file diff --git a/scripts/buffs/of_decap_bleed_2.py b/scripts/buffs/of_decap_bleed_2.py index f34171fc..1cdbd89d 100644 --- a/scripts/buffs/of_decap_bleed_2.py +++ b/scripts/buffs/of_decap_bleed_2.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 25) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 25) return \ No newline at end of file diff --git a/scripts/buffs/of_decap_bleed_3.py b/scripts/buffs/of_decap_bleed_3.py index 01d777ca..13629ef6 100644 --- a/scripts/buffs/of_decap_bleed_3.py +++ b/scripts/buffs/of_decap_bleed_3.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 32) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 32) return \ No newline at end of file diff --git a/scripts/buffs/of_decap_bleed_4.py b/scripts/buffs/of_decap_bleed_4.py index 1e847dea..3e266371 100644 --- a/scripts/buffs/of_decap_bleed_4.py +++ b/scripts/buffs/of_decap_bleed_4.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 42) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 42) return \ No newline at end of file diff --git a/scripts/buffs/of_decap_bleed_5.py b/scripts/buffs/of_decap_bleed_5.py index 596a9457..22db45c2 100644 --- a/scripts/buffs/of_decap_bleed_5.py +++ b/scripts/buffs/of_decap_bleed_5.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 50) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 50) return \ No newline at end of file diff --git a/scripts/buffs/of_decap_bleed_6.py b/scripts/buffs/of_decap_bleed_6.py index 1e96e637..8bbabdd6 100644 --- a/scripts/buffs/of_decap_bleed_6.py +++ b/scripts/buffs/of_decap_bleed_6.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 60) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 60) return \ No newline at end of file diff --git a/scripts/buffs/of_dot_bomb_1.py b/scripts/buffs/of_dot_bomb_1.py index 9ab3d9f7..1534cc2e 100644 --- a/scripts/buffs/of_dot_bomb_1.py +++ b/scripts/buffs/of_dot_bomb_1.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_fire', 200) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_fire', 200) return \ No newline at end of file diff --git a/scripts/buffs/of_drillmaster_1.py b/scripts/buffs/of_drillmaster_1.py index 9dd26849..dcb74846 100644 --- a/scripts/buffs/of_drillmaster_1.py +++ b/scripts/buffs/of_drillmaster_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_damage_all', 5) core.skillModService.addSkillMod(actor, 'expertise_action_all', 5) core.skillModService.addSkillMod(actor, 'expertise_damage_weapon_2', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_damage_all', 5) core.skillModService.deductSkillMod(actor, 'expertise_action_all', 5) core.skillModService.deductSkillMod(actor, 'expertise_damage_weapon_2', 5) diff --git a/scripts/buffs/of_emergency_shield.py b/scripts/buffs/of_emergency_shield.py index 8b27d418..e4f367c3 100644 --- a/scripts/buffs/of_emergency_shield.py +++ b/scripts/buffs/of_emergency_shield.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_divide_damage_taken', 75) core.skillModService.addSkillMod(actor, 'combat_divide_damage_dealt', 75) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'combat_divide_damage_taken', 75) core.skillModService.deductSkillMod(actor, 'combat_divide_damage_dealt', 75) return \ No newline at end of file diff --git a/scripts/buffs/of_firepower.py b/scripts/buffs/of_firepower.py index e7b0b129..9bf1f1fe 100644 --- a/scripts/buffs/of_firepower.py +++ b/scripts/buffs/of_firepower.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_damage_line_of_aoe', 125) core.skillModService.addSkillMod(actor, 'expertise_critical_line_of_aoe', 50) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_damage_line_of_aoe', 125) core.skillModService.deductSkillMod(actor, 'expertise_critical_line_of_aoe', 50) return \ No newline at end of file diff --git a/scripts/buffs/of_focus_fire_1.py b/scripts/buffs/of_focus_fire_1.py index c8e0d364..e2afcef8 100644 --- a/scripts/buffs/of_focus_fire_1.py +++ b/scripts/buffs/of_focus_fire_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_strikethrough_value', 2) core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 15) core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 2) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'combat_strikethrough_value', 2) core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 15) core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 2) diff --git a/scripts/buffs/of_focus_fire_2.py b/scripts/buffs/of_focus_fire_2.py index 7803b873..0db33d9d 100644 --- a/scripts/buffs/of_focus_fire_2.py +++ b/scripts/buffs/of_focus_fire_2.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_strikethrough_value', 3) core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 20) core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 2) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'combat_strikethrough_value', 3) core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 20) core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 2) diff --git a/scripts/buffs/of_focus_fire_3.py b/scripts/buffs/of_focus_fire_3.py index a4084512..b78066de 100644 --- a/scripts/buffs/of_focus_fire_3.py +++ b/scripts/buffs/of_focus_fire_3.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_strikethrough_value', 3) core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 23) core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 3) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'combat_strikethrough_value', 3) core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 23) core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 3) diff --git a/scripts/buffs/of_focus_fire_4.py b/scripts/buffs/of_focus_fire_4.py index 27402933..d028d699 100644 --- a/scripts/buffs/of_focus_fire_4.py +++ b/scripts/buffs/of_focus_fire_4.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_strikethrough_value', 4) core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 26) core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 3) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'combat_strikethrough_value', 4) core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 26) core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 4) diff --git a/scripts/buffs/of_focus_fire_5.py b/scripts/buffs/of_focus_fire_5.py index 9cc90e8d..0b5c3e3f 100644 --- a/scripts/buffs/of_focus_fire_5.py +++ b/scripts/buffs/of_focus_fire_5.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_strikethrough_value', 4) core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 29) core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 4) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'combat_strikethrough_value', 4) core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 29) core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 4) diff --git a/scripts/buffs/of_focus_fire_6.py b/scripts/buffs/of_focus_fire_6.py index 58879cbe..4cbaafe1 100644 --- a/scripts/buffs/of_focus_fire_6.py +++ b/scripts/buffs/of_focus_fire_6.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'combat_strikethrough_value', 5) core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 32) core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'combat_strikethrough_value', 5) core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 32) core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 5) diff --git a/scripts/buffs/of_inspiration_1.py b/scripts/buffs/of_inspiration_1.py index 6cd2da65..cbf0963e 100644 --- a/scripts/buffs/of_inspiration_1.py +++ b/scripts/buffs/of_inspiration_1.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_all', 5) core.skillModService.addSkillMod(actor, 'healing_action', 870) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_all', 870) core.skillModService.deductSkillMod(actor, 'healing_action', 870) return \ No newline at end of file diff --git a/scripts/buffs/of_inspiration_2.py b/scripts/buffs/of_inspiration_2.py index a26bbe86..1cf07e9c 100644 --- a/scripts/buffs/of_inspiration_2.py +++ b/scripts/buffs/of_inspiration_2.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_all', 5) core.skillModService.addSkillMod(actor, 'healing_action', 1111) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_all', 5) core.skillModService.deductSkillMod(actor, 'healing_action', 1111) return \ No newline at end of file diff --git a/scripts/buffs/of_inspiration_3.py b/scripts/buffs/of_inspiration_3.py index 337108a6..1162d3b3 100644 --- a/scripts/buffs/of_inspiration_3.py +++ b/scripts/buffs/of_inspiration_3.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_all', 5) core.skillModService.addSkillMod(actor, 'healing_action', 1532) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_all', 5) core.skillModService.deductSkillMod(actor, 'healing_action', 1532) return \ No newline at end of file diff --git a/scripts/buffs/of_inspiration_4.py b/scripts/buffs/of_inspiration_4.py index 5738cd3d..67879833 100644 --- a/scripts/buffs/of_inspiration_4.py +++ b/scripts/buffs/of_inspiration_4.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_all', 5) core.skillModService.addSkillMod(actor, 'healing_action', 1954) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_all', 5) core.skillModService.deductSkillMod(actor, 'healing_action', 1954) return \ No newline at end of file diff --git a/scripts/buffs/of_inspiration_5.py b/scripts/buffs/of_inspiration_5.py index 6ab7d9d3..f566e44a 100644 --- a/scripts/buffs/of_inspiration_5.py +++ b/scripts/buffs/of_inspiration_5.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_all', 5) core.skillModService.addSkillMod(actor, 'healing_action', 2374) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_all', 5) core.skillModService.deductSkillMod(actor, 'healing_action', 2374) return \ No newline at end of file diff --git a/scripts/buffs/of_inspiration_6.py b/scripts/buffs/of_inspiration_6.py index 9e7e9def..31bcc7df 100644 --- a/scripts/buffs/of_inspiration_6.py +++ b/scripts/buffs/of_inspiration_6.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_all', 5) core.skillModService.addSkillMod(actor, 'healing_action', 2800) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_all', 5) core.skillModService.deductSkillMod(actor, 'healing_action', 2800) return \ No newline at end of file diff --git a/scripts/buffs/of_last_words.py b/scripts/buffs/of_last_words.py index 9611d588..49c70490 100644 --- a/scripts/buffs/of_last_words.py +++ b/scripts/buffs/of_last_words.py @@ -1,13 +1,16 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'healing_health', 3500) core.skillModService.addSkillMod(actor, 'healing_action', 6000) core.skillModService.addSkillMod(actor, 'expertise_damage_all', 10) core.skillModService.addSkillMod(actor, 'expertise_action_all', 10) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'healing_health', 125) core.skillModService.deductSkillMod(actor, 'healing_action', 50) core.skillModService.deductSkillMod(actor, 'expertise_damage_all', 50) diff --git a/scripts/buffs/of_pistol_bleed.py b/scripts/buffs/of_pistol_bleed.py index 1e96e637..8bbabdd6 100644 --- a/scripts/buffs/of_pistol_bleed.py +++ b/scripts/buffs/of_pistol_bleed.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 60) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 60) return \ No newline at end of file diff --git a/scripts/buffs/of_purge_1.py b/scripts/buffs/of_purge_1.py index c41e52e8..21dd70e7 100644 --- a/scripts/buffs/of_purge_1.py +++ b/scripts/buffs/of_purge_1.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_divisor_all', 50) core.skillModService.addSkillMod(actor, 'dot_resist_all', 100) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_divisor_all', 50) core.skillModService.deductSkillMod(actor, 'dot_resist_all', 100) return \ No newline at end of file diff --git a/scripts/buffs/of_scatter_1.py b/scripts/buffs/of_scatter_1.py index ed252b06..7d7e729d 100644 --- a/scripts/buffs/of_scatter_1.py +++ b/scripts/buffs/of_scatter_1.py @@ -1,13 +1,16 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 2) core.skillModService.addSkillMod(actor, 'movement_resist_snare', 15) core.skillModService.addSkillMod(actor, 'movement_resist_root', 2) core.skillModService.addSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 2) core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 15) diff --git a/scripts/buffs/of_stimulator_1.py b/scripts/buffs/of_stimulator_1.py index f28888e7..4e120b7f 100644 --- a/scripts/buffs/of_stimulator_1.py +++ b/scripts/buffs/of_stimulator_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'debuff_purge', 2) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'debuff_purge', 2) return \ No newline at end of file diff --git a/scripts/buffs/of_vortex_bleed_1.py b/scripts/buffs/of_vortex_bleed_1.py index e1095bbc..188e61a7 100644 --- a/scripts/buffs/of_vortex_bleed_1.py +++ b/scripts/buffs/of_vortex_bleed_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 30) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 30) return \ No newline at end of file diff --git a/scripts/buffs/of_vortex_bleed_2.py b/scripts/buffs/of_vortex_bleed_2.py index cc0b1590..9a2bb14b 100644 --- a/scripts/buffs/of_vortex_bleed_2.py +++ b/scripts/buffs/of_vortex_bleed_2.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 44) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 44) return \ No newline at end of file diff --git a/scripts/buffs/of_vortex_bleed_3.py b/scripts/buffs/of_vortex_bleed_3.py index 12c3f4cd..711ac6ef 100644 --- a/scripts/buffs/of_vortex_bleed_3.py +++ b/scripts/buffs/of_vortex_bleed_3.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 58) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 58) return \ No newline at end of file diff --git a/scripts/buffs/of_vortex_bleed_4.py b/scripts/buffs/of_vortex_bleed_4.py index 9d2c2648..a6b25916 100644 --- a/scripts/buffs/of_vortex_bleed_4.py +++ b/scripts/buffs/of_vortex_bleed_4.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 72) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 72) return \ No newline at end of file diff --git a/scripts/buffs/of_vortex_bleed_5.py b/scripts/buffs/of_vortex_bleed_5.py index 760cc493..20f90a7f 100644 --- a/scripts/buffs/of_vortex_bleed_5.py +++ b/scripts/buffs/of_vortex_bleed_5.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'dot_bleed', 90) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'dot_bleed', 90) return \ No newline at end of file diff --git a/scripts/buffs/of_vortex_root.py b/scripts/buffs/of_vortex_root.py index 32ba0f8d..42418564 100644 --- a/scripts/buffs/of_vortex_root.py +++ b/scripts/buffs/of_vortex_root.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 10) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 10) return \ No newline at end of file diff --git a/scripts/buffs/poisoned.py b/scripts/buffs/poisoned.py index e09c02e5..c60417a0 100644 --- a/scripts/buffs/poisoned.py +++ b/scripts/buffs/poisoned.py @@ -2,7 +2,10 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/proc_old_dark_jedi_gift.py b/scripts/buffs/proc_old_dark_jedi_gift.py index e09c02e5..c60417a0 100644 --- a/scripts/buffs/proc_old_dark_jedi_gift.py +++ b/scripts/buffs/proc_old_dark_jedi_gift.py @@ -2,7 +2,10 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/proc_old_light_jedi_gift.py b/scripts/buffs/proc_old_light_jedi_gift.py index e09c02e5..c60417a0 100644 --- a/scripts/buffs/proc_old_light_jedi_gift.py +++ b/scripts/buffs/proc_old_light_jedi_gift.py @@ -2,7 +2,10 @@ import sys def setup(core, actor, buff): return + +def add(core, actor, buff): + return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): return \ No newline at end of file diff --git a/scripts/buffs/saberblock.py b/scripts/buffs/saberblock.py index 15962ce9..3386a66a 100644 --- a/scripts/buffs/saberblock.py +++ b/scripts/buffs/saberblock.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'display_only_parry', 1000 + (actor.getSkillModBase('expertise_saber_block') * 100)) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'display_only_parry', 1000 + (actor.getSkillModBase('expertise_saber_block') * 100)) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_dps_1.py b/scripts/buffs/set_bonus_bh_dps_1.py index 58d3ed08..6055bf9f 100644 --- a/scripts/buffs/set_bonus_bh_dps_1.py +++ b/scripts/buffs/set_bonus_bh_dps_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_line_dm', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_line_dm', 5) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_dps_2.py b/scripts/buffs/set_bonus_bh_dps_2.py index cf463a7a..5f0aa83c 100644 --- a/scripts/buffs/set_bonus_bh_dps_2.py +++ b/scripts/buffs/set_bonus_bh_dps_2.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_line_dm', 5) core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_bh_return_fire' , 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_line_dm', 5) core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_bh_return_fire' , 5) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_dps_3.py b/scripts/buffs/set_bonus_bh_dps_3.py index 06bcee28..4d48df3e 100644 --- a/scripts/buffs/set_bonus_bh_dps_3.py +++ b/scripts/buffs/set_bonus_bh_dps_3.py @@ -1,6 +1,9 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_action_line_dm', 10) core.skillModService.addSkillMod(actor, 'expertise_action_line_dm_crit', 10) core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_bh_return_fire' , 10) @@ -8,7 +11,7 @@ def setup(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_bh_return_fire' , 750) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_action_line_dm', 10) core.skillModService.deductSkillMod(actor, 'expertise_action_line_dm_crit', 10) core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_bh_return_fire' , 10) diff --git a/scripts/buffs/set_bonus_bh_utility_a_1.py b/scripts/buffs/set_bonus_bh_utility_a_1.py index 4f9e42e4..3035fdd8 100644 --- a/scripts/buffs/set_bonus_bh_utility_a_1.py +++ b/scripts/buffs/set_bonus_bh_utility_a_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 15) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 15) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_a_2.py b/scripts/buffs/set_bonus_bh_utility_a_2.py index 4f9e42e4..3035fdd8 100644 --- a/scripts/buffs/set_bonus_bh_utility_a_2.py +++ b/scripts/buffs/set_bonus_bh_utility_a_2.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 15) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 15) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_a_3.py b/scripts/buffs/set_bonus_bh_utility_a_3.py index e98992f3..6a3ed086 100644 --- a/scripts/buffs/set_bonus_bh_utility_a_3.py +++ b/scripts/buffs/set_bonus_bh_utility_a_3.py @@ -1,10 +1,13 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 30) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 30) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_b_1.py b/scripts/buffs/set_bonus_bh_utility_b_1.py index 0f4597fe..9115f6d4 100644 --- a/scripts/buffs/set_bonus_bh_utility_b_1.py +++ b/scripts/buffs/set_bonus_bh_utility_b_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'fast_attack_line_dm_cc', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'fast_attack_line_dm_cc', 5) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_b_2.py b/scripts/buffs/set_bonus_bh_utility_b_2.py index 945c2883..b641c6a6 100644 --- a/scripts/buffs/set_bonus_bh_utility_b_2.py +++ b/scripts/buffs/set_bonus_bh_utility_b_2.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'fast_attack_line_dm_cc', 10) core.skillModService.addSkillMod(actor, 'bh_dire_root', 20) core.skillModService.addSkillMod(actor, 'bh_dire_snare', 20) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'fast_attack_line_dm_cc', 10) core.skillModService.deductSkillMod(actor, 'bh_dire_root', 20) core.skillModService.deductSkillMod(actor, 'bh_dire_snare', 20) diff --git a/scripts/buffs/set_bonus_bh_utility_b_3.py b/scripts/buffs/set_bonus_bh_utility_b_3.py index d136c4ec..b4b4154f 100644 --- a/scripts/buffs/set_bonus_bh_utility_b_3.py +++ b/scripts/buffs/set_bonus_bh_utility_b_3.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'fast_attack_line_dm_cc', 35) core.skillModService.addSkillMod(actor, 'bh_dire_root', 45) core.skillModService.addSkillMod(actor, 'bh_dire_snare', 45) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'fast_attack_line_dm_cc', 35) core.skillModService.deductSkillMod(actor, 'bh_dire_root', 45) core.skillModService.deductSkillMod(actor, 'bh_dire_snare', 45) diff --git a/scripts/buffs/set_bonus_hero_1.py b/scripts/buffs/set_bonus_hero_1.py index d84a60fc..c589b0f4 100644 --- a/scripts/buffs/set_bonus_hero_1.py +++ b/scripts/buffs/set_bonus_hero_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stamina_modified', 60) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stamina_modified', 60) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_hero_2.py b/scripts/buffs/set_bonus_hero_2.py index 6c87d81e..630b0e30 100644 --- a/scripts/buffs/set_bonus_hero_2.py +++ b/scripts/buffs/set_bonus_hero_2.py @@ -1,11 +1,14 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stamina_modified', 90) core.skillModService.addSkillMod(actor, 'agility_modified', 90) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stamina_modified', 90) core.skillModService.deductSkillMod(actor, 'agility_modified', 90) return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_hero_3.py b/scripts/buffs/set_bonus_hero_3.py index 11c03f31..d2755af3 100644 --- a/scripts/buffs/set_bonus_hero_3.py +++ b/scripts/buffs/set_bonus_hero_3.py @@ -1,12 +1,15 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'stamina_modified', 150) core.skillModService.addSkillMod(actor, 'agility_modified', 150) core.skillModService.addSkillMod(actor, 'constitution_modified', 150) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'stamina_modified', 150) core.skillModService.deductSkillMod(actor, 'agility_modified', 150) core.skillModService.deductSkillMod(actor, 'constitution_modified', 150) diff --git a/scripts/buffs/sm_ae_dm_cc_1.py b/scripts/buffs/sm_ae_dm_cc_1.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/sm_ae_dm_cc_1.py +++ b/scripts/buffs/sm_ae_dm_cc_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/sm_ae_dm_cc_2.py b/scripts/buffs/sm_ae_dm_cc_2.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/sm_ae_dm_cc_2.py +++ b/scripts/buffs/sm_ae_dm_cc_2.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/sm_ae_dm_cc_3.py b/scripts/buffs/sm_ae_dm_cc_3.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/sm_ae_dm_cc_3.py +++ b/scripts/buffs/sm_ae_dm_cc_3.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/sm_ae_dm_cc_4.py b/scripts/buffs/sm_ae_dm_cc_4.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/sm_ae_dm_cc_4.py +++ b/scripts/buffs/sm_ae_dm_cc_4.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/sm_ae_dm_cc_5.py b/scripts/buffs/sm_ae_dm_cc_5.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/sm_ae_dm_cc_5.py +++ b/scripts/buffs/sm_ae_dm_cc_5.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/sm_ae_dm_cc_6.py b/scripts/buffs/sm_ae_dm_cc_6.py index 82a33b29..2ee81fe9 100644 --- a/scripts/buffs/sm_ae_dm_cc_6.py +++ b/scripts/buffs/sm_ae_dm_cc_6.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.deductSkillMod(actor, 'movement', 5) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.addSkillMod(actor, 'movement', 5) return \ No newline at end of file diff --git a/scripts/buffs/sm_pistol_whip_1.py b/scripts/buffs/sm_pistol_whip_1.py index 5537d303..f83a6829 100644 --- a/scripts/buffs/sm_pistol_whip_1.py +++ b/scripts/buffs/sm_pistol_whip_1.py @@ -1,9 +1,12 @@ import sys def setup(core, actor, buff): + return + +def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'sm_pistol_whip', 0) return -def removeBuff(core, actor, buff): +def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'sm_pistol_whip', 0) return \ No newline at end of file diff --git a/src/services/BuffService.java b/src/services/BuffService.java index cd8e218b..662dea25 100644 --- a/src/services/BuffService.java +++ b/src/services/BuffService.java @@ -71,15 +71,17 @@ public class BuffService implements INetworkDispatch { if(buff.isGroupBuff()) { addGroupBuff(creature, buffName); } else { - doAddBuff(creature, buffName); + doAddBuff(creature, buffName, null); } } - public Buff doAddBuff(final CreatureObject creature, String buffName) { + public Buff doAddBuff(final CreatureObject creature, String buffName, CreatureObject buffer) { final Buff buff = new Buff(buffName, creature.getObjectID()); buff.setTotalPlayTime(((PlayerObject) creature.getSlottedObject("ghost")).getTotalPlayTime()); + if(FileUtilities.doesFileExist("scripts/buffs/" + buffName + ".py")) + core.scriptService.callScript("scripts/buffs/", buffName, "setup", core, ((buffer == null) ? creature : buffer), buff); for (final Buff otherBuff : creature.getBuffList()) { if (buff.getGroup1().equals(otherBuff.getGroup1())) @@ -110,7 +112,7 @@ public class BuffService implements INetworkDispatch { } if(FileUtilities.doesFileExist("scripts/buffs/" + buffName + ".py")) - core.scriptService.callScript("scripts/buffs/", buffName, "setup", core, creature, buff); + core.scriptService.callScript("scripts/buffs/", buffName, "add", core, creature, buff); creature.addBuff(buff); @@ -153,6 +155,10 @@ public class BuffService implements INetworkDispatch { } } + if (buffer != null && creature.getGroupId() != 0 && creature.getGroupId() == buffer.getGroupId()) { + buff.setGroupBufferId(buffer.getObjectID()); + } + return buff; } @@ -168,7 +174,7 @@ public class BuffService implements INetworkDispatch { creature.removeDot(dot); } if(FileUtilities.doesFileExist("scripts/buffs/" + buff.getBuffName() + ".py")) - core.scriptService.callScript("scripts/buffs/", buff.getBuffName(), "removeBuff", core, creature, buff); + core.scriptService.callScript("scripts/buffs/", buff.getBuffName(), "remove", core, creature, buff); creature.removeBuff(buff); for (String effect : buff.getParticleEffect().split(",")) { @@ -215,20 +221,19 @@ public class BuffService implements INetworkDispatch { public void addGroupBuff(final CreatureObject buffer, String buffName) { if(buffer.getGroupId() == 0) { - doAddBuff(buffer, buffName); + doAddBuff(buffer, buffName, null); return; } GroupObject group = (GroupObject) core.objectService.getObject(buffer.getGroupId()); if(group == null) { - doAddBuff(buffer, buffName); + doAddBuff(buffer, buffName, null); return; } for(SWGObject member : group.getMemberList()) { - Buff buff = doAddBuff((CreatureObject) member, buffName); - buff.setGroupBufferId(buffer.getObjectID()); + Buff buff = doAddBuff((CreatureObject) member, buffName, buffer); } } diff --git a/src/services/GroupService.java b/src/services/GroupService.java index 5b1a9f07..4946f503 100644 --- a/src/services/GroupService.java +++ b/src/services/GroupService.java @@ -188,8 +188,7 @@ public class GroupService implements INetworkDispatch { if(otherMember != member) { for(Buff buff : ((CreatureObject) otherMember).getBuffList().get()) { if(buff.isGroupBuff()) { - Buff newBuff = core.buffService.doAddBuff(member, buff.getBuffName()); - newBuff.setGroupBufferId(buff.getGroupBufferId()); + core.buffService.doAddBuff(member, buff.getBuffName(), (CreatureObject) core.objectService.getObject(buff.getGroupBufferId())); } } return;