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

scripts/buffs/fs_buff_ca_1.py

@@ -0,0 +1,11 @@
+import sys
+
+def setup(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_stance', 1)
+	
+	return
+	
+def removeBuff(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_stance', 1)
+	return
+	

scripts/buffs/fs_buff_def_1_1.py

@@ -1,8 +1,11 @@
 import sys
 
 def setup(core, actor, buff):
+	core.skillModService.addSkillMod(actor, 'expertise_stance', 1)
+	
 	return
 	
 def removeBuff(core, actor, buff):
+	core.skillModService.deductSkillMod(actor, 'expertise_stance', 1)
 	return
 	

scripts/commands/fs_buff_ca_1.py

@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+	
+def run(core, actor, target, commandString):
+	core.buffService.addBuffToCreature(actor, 'fs_buff_ca_1')
+	return
+	

scripts/demo.py

@@ -104,6 +104,7 @@ def addProfessionAbilities(core, object, profession):
 		object.addAbility('fs_dm_cc_6')
 		object.addAbility('fs_dm_7')
 		object.addAbility('fs_buff_def_1_1')
+		object.addAbility('fs_buff_ca_1')
 	elif profession == 'medic_1a':
 		object.addAbility('me_bacta_bomb_5')
 		object.addAbility('me_bacta_grenade_5')

scripts/skillMods/expertise_stance.py

@@ -0,0 +1,10 @@
+import sys
+
+def add(core, actor, name, base):
+	actor.addSkillMod(name, base)
+	return
+	
+def deduct(core, actor, name, base):
+	actor.deductSkillMod(name, base)
+	return
+	

src/services/combat/CombatCommands.java

@@ -188,6 +188,7 @@ public class CombatCommands {
 		core.commandService.registerCombatCommand("fs_sh_2");
 		core.commandService.registerCombatCommand("fs_sh_3");
 		core.commandService.registerCommand("fs_buff_def_1_1");
+		core.commandService.registerCommand("fs_buff_ca_1");
 
 		
 		// Commando