Merge pull request #51 from Doogla/master

Added a few Jedi abilities

scripts/buffs/fs_buff_ca_1.py

@@ -1,6 +1,7 @@
 import sys
 
 def setup(core, actor, buff):
+	actor.playEffectObject('appearance/pt_sokan_focus.prt', 'fs_buff_ca_1')
 	core.skillModService.addSkillMod(actor, 'expertise_stance', 1)
 	
 	return

scripts/buffs/fs_buff_def_1_1.py

@@ -1,6 +1,7 @@
 import sys
 
 def setup(core, actor, buff):
+	actor.playEffectObject('appearance/pt_force_avoid_incapacitation.prt', 'fs_buff_def_1_1')
 	core.skillModService.addSkillMod(actor, 'expertise_stance', 1)
 	
 	return

scripts/buffs/fs_force_run.py

@@ -0,0 +1,17 @@
+import sys
+
+def setup(core, actor, buff):
+	actor.playEffectObject('clienteffect/pl_force_run.cef', 'fs_force_run')
+	actor.playEffectObject('appearance/pt_force_speed.prt', 'fs_force_run')
+	core.skillModService.addSkillMod(actor, 'slope_move', 5)
+	core.skillModService.addSkillMod(actor, 'movement_resist_snare', 100)
+	core.skillModService.addSkillMod(actor, 'movement_resist_root', 100)
+	
+	return
+	
+def removeBuff(core, actor, buff):
+	##Waiting for a remove particle effect function in CreatureObject. Twinkle toes won't go away without it.
+	core.skillModService.deductSkillMod(actor, 'slope_move', 5)
+	core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 100)
+	core.skillModService.deductSkillMod(actor, 'movement_resist_root', 100)
+	return

scripts/buffs/fs_saber_reflect.py

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

scripts/buffs/invis_fs_buff_invis_1.py

@@ -0,0 +1,8 @@
+import sys
+
+def setup(core, actor, buff):
+	return
+	
+def removeBuff(core, actor, buff):
+	return
+	

scripts/buffs/saberblock.py

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

scripts/commands/forcerun.py

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

scripts/commands/fs_buff_invis_1.py

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

scripts/commands/fs_saber_reflect_buff.py

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

scripts/commands/saberblock.py

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

scripts/demo.py

@@ -148,6 +148,7 @@ def addProfessionAbilities(core, object, profession):
 		inventory = object.getSlottedObject('inventory')
 		inventory.add(testObject)
 
+		##Case Sensitive
 		object.addAbility('fs_sweep_7')
 		object.addAbility('fs_drain_7')
 		object.addAbility('forceRun')
@@ -159,6 +160,7 @@ def addProfessionAbilities(core, object, profession):
 		object.addAbility('fs_dm_7')
 		object.addAbility('fs_buff_def_1_1')
 		object.addAbility('fs_buff_ca_1')
+		object.addAbility('saberBlock')
 	elif profession == 'medic_1a':
 		object.addAbility('me_bacta_bomb_5')
 		object.addAbility('me_bacta_grenade_5')

scripts/expertise/expertise_fs_general_stance_saber_block_1.py

@@ -39,10 +39,8 @@ def removeExpertisePoint(core, actor):
 # this checks what abilities the player gets by level, need to also call this on level-up
 def addAbilities(core, actor, player):
 
-
 	return
 
 def removeAbilities(core, actor, player):
 
-
 	return

scripts/skillMods/movement_resist_root.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
+	

scripts/static_map_locations.py

@@ -67,7 +67,7 @@ def nabooLocations(core, planet):
 	mapService.addLocation(planet, 'Theed', -5488, 4380, 17, 0, 0)
 	mapService.addLocation(planet, 'Keren', 1888, 2700, 17, 0, 0)
 	mapService.addLocation(planet, 'Moenia', 4836, -4830.5, 17, 0, 0)
-	mapService.addLocation(planet, 'Deeja Peek', -4686, -1375, 17, 0, 0)
+	mapService.addLocation(planet, 'Deeja Peek', 4686, -1375, 17, 0, 0)
 	mapService.addLocation(planet, 'Kaadara', 5288, 6687, 17, 0, 0)
 
 def roriLocations(core, planet):

src/services/combat/CombatCommands.java

@@ -187,8 +187,12 @@ public class CombatCommands {
 		core.commandService.registerCombatCommand("fs_sh_1");
 		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");
+		core.commandService.registerCommand("fs_buff_def_1_1"); // Stance
+		core.commandService.registerCommand("fs_buff_ca_1"); // Focus
+		core.commandService.registerCommand("fs_saber_reflect_buff"); // Saber Reflect
+		core.commandService.registerCommand("saberBlock"); // Saber Block
+		core.commandService.registerCommand("forcerun"); // Force Run
+		core.commandService.registerCommand("fs_buff_invis_1"); // Force Cloak
 
 		
 		// Commando