Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java

README.md

@@ -12,8 +12,8 @@ The Engine(NGEngine) is a closed source library and is only licensed for use wit
 Requirements for Building the Core:
 ======== 
 
-- JDK 7
-- An IDE like Eclipse Juno
+- JDK 8
+- A Java 8 compatible IDE like Eclipse Kepler (https://wiki.eclipse.org/JDT/Eclipse_Java_8_Support_For_Kepler)
 - A valid Star Wars Galaxies Installation with the final patch
 - Postgresql server (www.postgresql.org)
 - TRE Explorer(http://forum.modsource.org/index.php?PHPSESSID=bf02fd8244123807f4716c1686abb59f&action=dlattach;topic=33.0;attach=49)

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
-	

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)
 

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)

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
 	

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
 	

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
 	

scripts/buffs/buildabuff_inspiration.py

@@ -2,26 +2,27 @@ from resources.common import BuffBuilder
 import sys
 
 def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
     
     buffWorkshop = actor.getAttachment('buffWorkshop')
     
     if buffWorkshop is None:
         return
     
-    buff.setDuration(3600) #1 hour
-    
-    for BuffBuilder in buffWorkshop:
-        core.skillModService.addSkillMod(actor, BuffBuilder.getStatAffects(), BuffBuilder.getTotalAffected())
-        print (' gave the skill mod ' + BuffBuilder.getStatAffects() + ' with affect of ' + str(BuffBuilder.getTotalAffected()))
-        return
-    
+    attached = actor.getAttachment('inspireDuration')
+
+    buff.setDuration(float(actor.getAttachment('inspireDuration') * 60))
+
+    for BuffItem in buffWorkshop:
+        core.skillModService.addSkillMod(actor, BuffItem.getSkillName(), BuffItem.getAffectAmount())
+
     return
     
-def removeBuff(core, actor, buff):
-    for BuffBuilder in actor.getAttachment('buffWorkshop'):
-        core.skillModService.deductSkillMod(actor, BuffBuilder.getStatAffects(), BuffBuilder.getTotalAffected())
-        print ('removed skill mod!')
-        return
+def remove(core, actor, buff):
+    for BuffItem in actor.getAttachment('buffWorkshop'):
+        core.skillModService.deductSkillMod(actor, BuffItem.getSkillName(), BuffItem.getAffectAmount())
     
-    actor.setAttachment('buffWorkshop', 'none')
+    actor.setAttachment('buffWorkshop', None)
     return

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

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
 	

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)
 

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:

scripts/buffs/en_action_regen.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_action_weapon_melee', 60)
+	return

scripts/buffs/en_debuff_thrill.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 2)
+	return

scripts/buffs/en_debuff_thrill_1.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 4)
+	return

scripts/buffs/en_debuff_thrill_2.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'critical_hit_vulnerable', 6)
+	return

scripts/buffs/en_spiral_kick_snare.py

@@ -0,0 +1,12 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

scripts/buffs/en_sprint.py

@@ -0,0 +1,15 @@
+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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
+	core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 100)
+	return
+	

scripts/buffs/en_sweeping_pirouette_root.py

@@ -0,0 +1,12 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 10)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 10)
+	return

scripts/buffs/en_unhealthy_fixation_debuff.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'en_unhealthy_stun', 1)
+	return

scripts/buffs/en_void_dance_buff.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 60)
+	return

scripts/buffs/en_void_dance_buff_1.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 65)
+	return

scripts/buffs/en_void_dance_buff_2.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 70)
+	return

scripts/buffs/en_void_dance_buff_3.py

@@ -0,0 +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 remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 75)
+	return

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

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

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

scripts/buffs/fs_ae_dm_cc_0.py

@@ -1,10 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	actor.setSpeedMultiplierBase(0.5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
-	return
-	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

scripts/buffs/fs_ae_dm_cc_1.py

@@ -1,10 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	actor.setSpeedMultiplierBase(0.5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
-	return
-	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

scripts/buffs/fs_ae_dm_cc_2.py

@@ -1,10 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	actor.setSpeedMultiplierBase(0.5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
-	return
-	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

scripts/buffs/fs_ae_dm_cc_3.py

@@ -1,10 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	actor.setSpeedMultiplierBase(0.5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
-	return
-	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

scripts/buffs/fs_ae_dm_cc_4.py

@@ -1,10 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	actor.setSpeedMultiplierBase(0.5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
-	return
-	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

scripts/buffs/fs_ae_dm_cc_5.py

@@ -1,10 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	actor.setSpeedMultiplierBase(0.5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
-	return
-	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

scripts/buffs/fs_ae_dm_cc_6.py

@@ -1,10 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	actor.setSpeedMultiplierBase(0.5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	actor.setSpeedMultiplierBase(1)
-	return
-	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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)

scripts/buffs/fs_force_throw.py

@@ -1,11 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	core.skillModService.addSkillMod(actor, 'movement', float(-0.5))
-	
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	core.skillModService.deductSkillMod(actor, 'movement', float(-0.5))
-	return
-	
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
+	return

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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)

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

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

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	

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

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)

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
 	

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

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

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
 	

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
 	

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	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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
 	

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)

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)

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)

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)

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)

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)

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)

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)

scripts/buffs/of_ae_dm_cc_1.py

@@ -1,9 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	core.skillModService.addSkillMod(actor, 'movement', -5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	core.skillModService.deductSkillMod(actor, 'movement', 15)
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
 	return

scripts/buffs/of_ae_dm_cc_2.py

@@ -1,9 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	core.skillModService.addSkillMod(actor, 'movement', -5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	core.skillModService.deductSkillMod(actor, 'movement', 15)
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
 	return

scripts/buffs/of_ae_dm_cc_3.py

@@ -1,9 +1,12 @@
 import sys
 
 def setup(core, actor, buff):
-	core.skillModService.addSkillMod(actor, 'movement', -5)
+	return
+
+def add(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'movement', 5)
 	return
 	
-def removeBuff(core, actor, buff):
-	core.skillModService.deductSkillMod(actor, 'movement', 15)
+def remove(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'movement', 5)
 	return

scripts/buffs/of_buff_def_1.py

@@ -1,11 +1,17 @@
 import sys
 
 def setup(core, actor, buff):
+	if actor.getSkillMod('expertise_aura_maintain'):
+		buff.setDuration(-1)
+	
+	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

scripts/buffs/of_buff_def_2.py

@@ -1,11 +1,17 @@
 import sys
 
 def setup(core, actor, buff):
+	if actor.getSkillMod('expertise_aura_maintain'):
+		buff.setDuration(-1)
+	
+	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

scripts/buffs/of_buff_def_3.py

@@ -1,11 +1,17 @@
 import sys
 
 def setup(core, actor, buff):
+	if actor.getSkillMod('expertise_aura_maintain'):
+		buff.setDuration(-1)
+	
+	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

scripts/buffs/of_buff_def_4.py

@@ -1,12 +1,18 @@
 import sys
 
 def setup(core, actor, buff):
+	if actor.getSkillMod('expertise_aura_maintain'):
+		buff.setDuration(-1)
+	
+	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)

scripts/buffs/of_buff_def_5.py

@@ -1,12 +1,18 @@
 import sys
 
 def setup(core, actor, buff):
+	if actor.getSkillMod('expertise_aura_maintain'):
+		buff.setDuration(-1)
+	
+	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)

scripts/buffs/of_buff_def_6.py

@@ -1,12 +1,18 @@
 import sys
 
 def setup(core, actor, buff):
+	if actor.getSkillMod('expertise_aura_maintain'):
+		buff.setDuration(-1)
+	
+	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)