diff --git a/scripts/buffs/fs_force_run.py b/scripts/buffs/fs_force_run.py index 77f15bb1..e826d8bf 100644 --- a/scripts/buffs/fs_force_run.py +++ b/scripts/buffs/fs_force_run.py @@ -1,17 +1,21 @@ 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'))) 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, 'slope_move', 1) core.skillModService.addSkillMod(actor, 'movement_resist_snare', 100) core.skillModService.addSkillMod(actor, 'movement_resist_root', 100) + ##For Testing Purposes + ##actor.sendSystemMessage('You are running at ' + str(actor.getSpeedMultiplierBase()) + ' times the running speed.', 0) + 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, 'slope_move', 1) core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 100) core.skillModService.deductSkillMod(actor, 'movement_resist_root', 100) return diff --git a/scripts/buffs/saberblock.py b/scripts/buffs/saberblock.py index 932c2c68..15962ce9 100644 --- a/scripts/buffs/saberblock.py +++ b/scripts/buffs/saberblock.py @@ -1,11 +1,10 @@ import sys def setup(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_saber_block', 10) - + core.skillModService.addSkillMod(actor, 'display_only_parry', 1000 + (actor.getSkillModBase('expertise_saber_block') * 100)) return def removeBuff(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_saber_block', 10) + core.skillModService.deductSkillMod(actor, 'display_only_parry', 1000 + (actor.getSkillModBase('expertise_saber_block') * 100)) return \ No newline at end of file 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 7ea93dee..15799877 100644 --- a/scripts/expertise/expertise_fs_general_stance_saber_block_1.py +++ b/scripts/expertise/expertise_fs_general_stance_saber_block_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_stance_saber_block_1') - actor.addSkillMod('expertise_stance_saber_block', 10) + actor.addSkillMod('display_only_parry', 1000) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_stance_saber_block_1') - actor.removeSkillMod('expertise_stance_saber_block', 10) + actor.removeSkillMod('display_only_parry', 1000) removeAbilities(core, actor, player) diff --git a/scripts/skillMods/expertise_saber_block.py b/scripts/skillMods/expertise_saber_block.py new file mode 100644 index 00000000..ee7769e2 --- /dev/null +++ b/scripts/skillMods/expertise_saber_block.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/skillMods/slope_move.py b/scripts/skillMods/slope_move.py index ee7769e2..36febb30 100644 --- a/scripts/skillMods/slope_move.py +++ b/scripts/skillMods/slope_move.py @@ -2,9 +2,11 @@ import sys def add(core, actor, name, base): actor.addSkillMod(name, base) + actor.setSpeedMultiplierBase(2.5 + (2.5 * (actor.getSkillModBase('expertise_movement_buff_fs_force_run')) / 100)) return def deduct(core, actor, name, base): actor.deductSkillMod(name, base) + actor.setSpeedMultiplierBase(1) return \ No newline at end of file