From 9331ec2f64a4ca031a0ac9f706bf6c43bd6a152a Mon Sep 17 00:00:00 2001 From: Doogla Date: Fri, 27 Sep 2013 03:38:27 -0700 Subject: [PATCH] a few jedi abilities added force run with particle effects, saber intercept, saber block, added particle effects for stance and focus, moved the marker for Dee'ja Peak to its correct location on the map. --- scripts/buffs/fs_buff_ca_1.py | 1 + scripts/buffs/fs_buff_def_1_1.py | 1 + scripts/buffs/fs_force_run.py | 17 +++++++++++++++++ scripts/buffs/fs_saber_reflect.py | 11 +++++++++++ scripts/buffs/invis_fs_buff_invis_1.py | 13 +++++++++++++ scripts/buffs/saberblock.py | 11 +++++++++++ scripts/commands/forcerun.py | 9 +++++++++ scripts/commands/fs_buff_invis_1.py | 9 +++++++++ scripts/commands/fs_saber_reflect_buff.py | 9 +++++++++ scripts/commands/saberblock.py | 9 +++++++++ scripts/demo.py | 2 ++ ...expertise_fs_general_stance_saber_block_1.py | 2 -- scripts/skillMods/movement_resist_root.py | 10 ++++++++++ scripts/static_map_locations.py | 2 +- src/services/combat/CombatCommands.java | 8 ++++++-- 15 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 scripts/buffs/fs_force_run.py create mode 100644 scripts/buffs/fs_saber_reflect.py create mode 100644 scripts/buffs/invis_fs_buff_invis_1.py create mode 100644 scripts/buffs/saberblock.py create mode 100644 scripts/commands/forcerun.py create mode 100644 scripts/commands/fs_buff_invis_1.py create mode 100644 scripts/commands/fs_saber_reflect_buff.py create mode 100644 scripts/commands/saberblock.py create mode 100644 scripts/skillMods/movement_resist_root.py diff --git a/scripts/buffs/fs_buff_ca_1.py b/scripts/buffs/fs_buff_ca_1.py index d5941811..92ce6405 100644 --- a/scripts/buffs/fs_buff_ca_1.py +++ b/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 diff --git a/scripts/buffs/fs_buff_def_1_1.py b/scripts/buffs/fs_buff_def_1_1.py index d5941811..0d7ad4dd 100644 --- a/scripts/buffs/fs_buff_def_1_1.py +++ b/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 diff --git a/scripts/buffs/fs_force_run.py b/scripts/buffs/fs_force_run.py new file mode 100644 index 00000000..77f15bb1 --- /dev/null +++ b/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 diff --git a/scripts/buffs/fs_saber_reflect.py b/scripts/buffs/fs_saber_reflect.py new file mode 100644 index 00000000..cba5694e --- /dev/null +++ b/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 + \ 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 new file mode 100644 index 00000000..9bb2d286 --- /dev/null +++ b/scripts/buffs/invis_fs_buff_invis_1.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, actor, buff): + core.skillModService.addSkillMod(actor, 'movement', 0) + core.skillModService.addSkillMod(actor, 'invis', 0) + + return + +def removeBuff(core, actor, buff): + core.skillModService.deductSkillMod(actor, 'movement', 0) + core.skillModService.deductSkillMod(actor, 'invis', 0) + return + \ No newline at end of file diff --git a/scripts/buffs/saberblock.py b/scripts/buffs/saberblock.py new file mode 100644 index 00000000..932c2c68 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/commands/forcerun.py b/scripts/commands/forcerun.py new file mode 100644 index 00000000..df72153b --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/commands/fs_buff_invis_1.py b/scripts/commands/fs_buff_invis_1.py new file mode 100644 index 00000000..57ed4a59 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/commands/fs_saber_reflect_buff.py b/scripts/commands/fs_saber_reflect_buff.py new file mode 100644 index 00000000..898e2530 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/commands/saberblock.py b/scripts/commands/saberblock.py new file mode 100644 index 00000000..55e12c59 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/demo.py b/scripts/demo.py index f030192a..8ac8f88d 100644 --- a/scripts/demo.py +++ b/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') diff --git a/scripts/expertise/expertise_fs_general_stance_saber_block_1.py b/scripts/expertise/expertise_fs_general_stance_saber_block_1.py index 8abdcf0c..7ea93dee 100644 --- a/scripts/expertise/expertise_fs_general_stance_saber_block_1.py +++ b/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 diff --git a/scripts/skillMods/movement_resist_root.py b/scripts/skillMods/movement_resist_root.py new file mode 100644 index 00000000..ee7769e2 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/scripts/static_map_locations.py b/scripts/static_map_locations.py index 098d0ebf..2222447d 100644 --- a/scripts/static_map_locations.py +++ b/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): diff --git a/src/services/combat/CombatCommands.java b/src/services/combat/CombatCommands.java index d1935736..2d012146 100644 --- a/src/services/combat/CombatCommands.java +++ b/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