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

scripts/buffs/set_bonus_medic_dps_1.py

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

scripts/buffs/set_bonus_medic_dps_2.py

@@ -0,0 +1,20 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_me_dm', 10)
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_me_burst', 10)
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_me_smash', 10)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_dm', 5)
+	core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_enhance', 900)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_dm', 10)
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_burst', 10)
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_smash', 10)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_dm', 5)
+	core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_enhance', 900)
+	return

scripts/buffs/set_bonus_medic_dps_3.py

@@ -0,0 +1,20 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_me_dm', 15)
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_me_burst', 20)
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_me_smash', 20)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_dm', 15)
+	core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_enhance', 1800)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_dm', 15)
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_burst', 20)
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_smash', 20)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_dm', 15)
+	core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_enhance', 1800)
+	return

scripts/buffs/set_bonus_medic_utility_a_1.py

@@ -0,0 +1,16 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_heal', 5)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_revive', 5)
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_evasion', 10)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_heal', 5)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_revive', 5)
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_evasion', 10)
+	return

scripts/buffs/set_bonus_medic_utility_a_2.py

@@ -0,0 +1,18 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_heal', 5)
+	core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_heal', 10)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_revive', 10)
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_evasion', 20)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_heal', 5)
+	core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_heal', 10)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_revive', 10)
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_evasion', 20)
+	return

scripts/buffs/set_bonus_medic_utility_a_3.py

@@ -0,0 +1,20 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_heal', 10)
+	core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_heal', 15)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_revive', 15)
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_evasion', 30)
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_stasis_self', 2)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_heal', 10)
+	core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_heal', 15)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_revive', 15)
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_evasion', 30)
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_stasis_self', 2)
+	return

scripts/buffs/set_bonus_medic_utility_b_1.py

@@ -0,0 +1,16 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_dot', 10)
+	core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 1)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_debuff', 5)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_dot', 10)
+	core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 1)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_debuff', 5)
+	return

scripts/buffs/set_bonus_medic_utility_b_2.py

@@ -0,0 +1,18 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_dot', 20)
+	core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 3)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_debuff', 10)
+	core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_debuff', 10)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_dot', 20)
+	core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 3)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_debuff', 10)
+	core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_debuff', 10)
+	return

scripts/buffs/set_bonus_medic_utility_b_3.py

@@ -0,0 +1,20 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_dot', 30)
+	core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 5)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_me_debuff', 15)
+	core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_debuff', 15)
+	core.skillModService.addSkillMod(actor, 'me_doom_chance', 20)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_dot', 30)
+	core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 5)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_debuff', 15)
+	core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_debuff', 15)
+	core.skillModService.deductSkillMod(actor, 'me_doom_chance', 20)
+	return

scripts/buffs/set_bonus_spy_dps_1.py

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

scripts/buffs/set_bonus_spy_dps_2.py

@@ -0,0 +1,16 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dm', 15)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_dm', 10)
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dot', 15)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dm', 15)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_dm', 10)
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dot', 15)
+	return

scripts/buffs/set_bonus_spy_dps_3.py

@@ -0,0 +1,20 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dm', 20)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_dm', 15)
+	core.skillModService.addSkillMod(actor, 'expertise_freeshot_sp_dm', 20)
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_sp_dm', 20)
+	core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dot', 25)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dm', 20)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_dm', 15)
+	core.skillModService.deductSkillMod(actor, 'expertise_freeshot_sp_dm', 20)
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_sp_dm', 20)
+	core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dot', 25)
+	return

scripts/buffs/set_bonus_spy_utility_a_1.py

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

scripts/buffs/set_bonus_spy_utility_a_2.py

@@ -0,0 +1,16 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 40)
+	core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_sp_preparation', 5)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_smoke', 15)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 40)
+	core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_sp_preparation', 5)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_smoke', 15)
+	return

scripts/buffs/set_bonus_spy_utility_a_3.py

@@ -0,0 +1,18 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 60)
+	core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_sp_preparation', 10)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_smoke', 20)
+	core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_perfect', 15)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 60)
+	core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_sp_preparation', 10)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_smoke', 20)
+	core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_perfect', 15)
+	return

scripts/buffs/set_bonus_spy_utility_b_1.py

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

scripts/buffs/set_bonus_spy_utility_b_2.py

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

scripts/buffs/set_bonus_spy_utility_b_3.py

@@ -0,0 +1,20 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+
+def add(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 3)
+	core.skillModService.addSkillMod(actor, 'expertise_action_all', 15)
+	core.skillModService.addSkillMod(actor, 'expertise_avoidance_overpower', 5)
+	core.skillModService.addSkillMod(actor, 'movement_resist_snare', 100)
+	core.skillModService.addSkillMod(actor, 'movement_resist_root', 100)
+	return
+	
+def remove(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 3)
+	core.skillModService.deductSkillMod(actor, 'expertise_action_all', 15)
+	core.skillModService.deductSkillMod(actor, 'expertise_avoidance_overpower', 5)
+	core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 100)
+	core.skillModService.deductSkillMod(actor, 'movement_resist_root', 100)
+	return

scripts/commands/startdance.py

@@ -46,7 +46,7 @@ def handleStartdance(core, owner, eventType, returnList):
 
     if not item:
       return
-        
+
     #if eventType == 0:
     startDance(coreObject, actorObject, '', int(item.getObjectId()))
     return
@@ -90,7 +90,7 @@ def startDance(core, actor, danceName, visual):
     if not actor.getPerformanceWatchee():
       #this also notifies the client with a delta4
       actor.setPerformanceWatchee(actor)
-      actor.addAudience(actor)
+      actor.addSpectator(actor)
  
     #this should send a CREO3 
     actor.setPosture(0x09);

scripts/commands/stopdance.py

@@ -11,10 +11,5 @@ def run(core, actor, target, commandString):
       actor.sendSystemMessage('@performance:dance_not_performing', 0)
       return
 
-    #since we need to stop performance for any posture change,
-    # all packets are triggered in setPosture.
-    # this may not be very consistent, but it prevents
-    # duplicate code.
     actor.stopPerformance()
-
     return

scripts/commands/stopwatching.py

@@ -10,7 +10,7 @@ def run(core, actor, target, commandString):
     
     if performer is None:
     	return
-    performer.removeAudience(actor)
+    performer.removeSpectator(actor)
     actor.setPerformanceWatchee(None)
     if not actor.getPerformanceListenee():
       actor.setMoodAnimation('')

scripts/equipment/bonus_sets/set_bonus_jedi_robe.py

@@ -0,0 +1,39 @@
+import sys
+from services.equipment import BonusSetTemplate
+from java.util import Vector
+
+def addBonusSet(core):
+	bonusSet = BonusSetTemplate("set_bonus_jedi_robe")
+	
+	# Waistpack
+	bonusSet.addRequiredTemplate("object/tangible/wearables/backpack/shared_fannypack_s01.iff")
+	
+	# Jedi Robes - Light
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_light_s01.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_light_s02.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_light_s03.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_light_s04.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_light_s05.iff")
+	
+	# Jedi Robes - Dark
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_dark_s01.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_dark_s02.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_dark_s03.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_dark_s04.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_jedi_dark_s05.iff")
+	
+	# Jedi Cloaks
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_s32.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_s32_h1.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_s33.iff")
+	bonusSet.addRequiredTemplate("object/tangible/wearables/robe/shared_robe_s33_h1.iff")
+	
+	core.equipmentService.addBonusSetTemplate(bonusSet)
+	
+def handleChange(core, creature, set):
+	wornItems = set.getWornTemplateCount(creature)
+	
+	if wornItems == 2:
+		core.buffService.addBuffToCreature(creature, "set_bonus_jedi_robe_1", creature)
+	else:
+		core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_robe_1")

scripts/object/tangible/wearables/backpack/fannypack_s01.py

@@ -1,4 +1,16 @@
 import sys
 
 def setup(core, object):
+	object.setStfFilename('static_item_n')
+	object.setStfName('item_fannypack_04_01')
+	object.setDetailFilename('static_item_d')
+	object.setDetailName('item_fannypack_04_01')
+
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 50)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 50)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 50)
+	
+	object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1')
+	object.setAttachment('setBonus', 'set_bonus_jedi_robe')
 	return

scripts/object/tangible/wearables/robe/robe_jedi_light_s03.py

@@ -2,15 +2,20 @@ import sys
 
 def setup(core, object):
 	object.setStfFilename('static_item_n')
-	object.setStfName('item_jedi_robe_light_04_04')
+	object.setStfName('item_jedi_robe_light_03_03')
 	object.setDetailFilename('static_item_d')
-	object.setDetailName('item_jedi_robe_light_04_04')
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 185)
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 185)
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 185)
+	object.setDetailName('item_jedi_robe_light_03_03')
+	
 	object.setStringAttribute('protection_level', 'Luminous')
 	object.setStringAttribute('class_required', 'Jedi')
 	object.setIntAttribute('required_combat_level', 80)
-	object.setAttachment('type', 'jedi_robe')
+	
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 185)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 185)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 185)
+	
 	object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1')
+	
+	object.setAttachment('type', 'jedi_robe')
+	object.setAttachment('setBonus', 'set_bonus_jedi_robe')
 	return

scripts/object/tangible/wearables/robe/robe_jedi_light_s04.py

@@ -5,15 +5,22 @@ def setup(core, object):
 	object.setStfName('item_jedi_robe_light_04_04')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('item_jedi_robe_light_04_04')
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 250)
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 250)
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 250)
+	
 	object.setStringAttribute('protection_level', 'Radiant')
 	object.setStringAttribute('class_required', 'Jedi')
 	object.setIntAttribute('required_combat_level', 90)
-	object.setAttachment('type', 'jedi_robe')
+	
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 250)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 250)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 250)
+	
+	
 	object.setStringAttribute('proc_name', '@ui_buff:proc_old_light_jedi_gift')
 	object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1')
+	
+	object.setAttachment('type', 'jedi_robe')
+	object.setAttachment('setBonus', 'set_bonus_jedi_robe')
+	
 	return
 
 	

scripts/radial/player.py

@@ -7,7 +7,7 @@ def createRadial(core, owner, target, radials):
 		if owner.getPerformanceWatchee() == target:
 			if target.getPerformanceType() is True:
 				radials.add(RadialOptions(0, 141, 3, 'Stop Watching'))
-		elif owner.getPerformanceListenee() == target: # TODO: Get rid of PerformanceWatchee variable, no need for listenee (same thing really)
+		elif owner.getPerformanceListenee() == target:
 			radials.add(RadialOptions(0, 141, 3, 'Stop Listening'))
 		else:
 			if target.getPerformanceType() is True:
@@ -27,6 +27,6 @@ def handleSelection(core, owner, target, option):
 		return
 	
 	if option == 141:
-		#core.commandService.callCommand(owner, 'stopwatching', target, '') #SWGList error for remove audience in CreatureObject
+		core.commandService.callCommand(owner, 'stopwatching', target, '')
 		return
 	return

scripts/skillMods/actionPercent.py

@@ -1,12 +1,14 @@
 import sys
 
+# Temporarily disabled until the skillmod calculation system is refactored
+
 def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
-	actor.setMaxAction(actor.getMaxAction() + int((float(actor.getMaxAction()) * (float(base) / float(100)))))
+	#actor.addSkillMod(name, base)
+	#actor.setMaxAction(actor.getMaxAction() + int((float(actor.getMaxAction()) * (float(base) / float(100)))))
 	return
 	
 def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
-	actor.setMaxAction(actor.getMaxAction() - int((float(actor.getMaxAction()) * (float(base) / float(100)))))
+	#actor.deductSkillMod(name, base)
+	#actor.setMaxAction(actor.getMaxAction() - int((float(actor.getMaxAction()) * (float(base) / float(100)))))
 	return
 	

scripts/skillMods/healthPercent.py

@@ -1,12 +1,14 @@
 import sys
 
+# Temporarily disabled until the skillmod calculation system is refactored
+
 def add(core, actor, name, base):
-	actor.addSkillMod(name, base)	
-	actor.setMaxHealth(actor.getMaxHealth() + int((float(actor.getMaxHealth()) * (float(base) / float(100)))))
+	#actor.addSkillMod(name, base)	
+	#actor.setMaxHealth(actor.getMaxHealth() + int((float(actor.getMaxHealth()) * (float(base) / float(100)))))
 	return
 	
 def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
-	actor.setMaxHealth(actor.getMaxHealth() - int((actor.getMaxHealth() * (float(base) / float(100)))))
+	#actor.deductSkillMod(name, base)
+	#actor.setMaxHealth(actor.getMaxHealth() - int((actor.getMaxHealth() * (float(base) / float(100)))))
 	return