From 63b4076a32f1709c2112529c4b05f69688aa758a Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Fri, 20 Dec 2013 17:20:41 +0100 Subject: [PATCH 01/16] Jedi - Fixed Strike Damage modifier --- scripts/commands/combat/fs_dm_1.py | 9 +++++++++ scripts/commands/combat/fs_dm_2.py | 9 +++++++++ scripts/commands/combat/fs_dm_3.py | 9 +++++++++ scripts/commands/combat/fs_dm_4.py | 9 +++++++++ scripts/commands/combat/fs_dm_5.py | 9 +++++++++ scripts/commands/combat/fs_dm_6.py | 9 +++++++++ scripts/commands/combat/fs_dm_7.py | 9 +++++++++ 7 files changed, 63 insertions(+) create mode 100644 scripts/commands/combat/fs_dm_1.py create mode 100644 scripts/commands/combat/fs_dm_2.py create mode 100644 scripts/commands/combat/fs_dm_3.py create mode 100644 scripts/commands/combat/fs_dm_4.py create mode 100644 scripts/commands/combat/fs_dm_5.py create mode 100644 scripts/commands/combat/fs_dm_6.py create mode 100644 scripts/commands/combat/fs_dm_7.py diff --git a/scripts/commands/combat/fs_dm_1.py b/scripts/commands/combat/fs_dm_1.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_dm_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_2.py b/scripts/commands/combat/fs_dm_2.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_dm_2.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_3.py b/scripts/commands/combat/fs_dm_3.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_dm_3.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_4.py b/scripts/commands/combat/fs_dm_4.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_dm_4.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_5.py b/scripts/commands/combat/fs_dm_5.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_dm_5.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_6.py b/scripts/commands/combat/fs_dm_6.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_dm_6.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_7.py b/scripts/commands/combat/fs_dm_7.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_dm_7.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file From aa585f038c3df67fb2754fa01c5c21e970c0a425 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Fri, 20 Dec 2013 17:22:29 +0100 Subject: [PATCH 02/16] Jedi - Strike Damage for Flurry --- scripts/commands/combat/fs_flurry_1.py | 9 +++++++++ scripts/commands/combat/fs_flurry_2.py | 9 +++++++++ scripts/commands/combat/fs_flurry_3.py | 9 +++++++++ scripts/commands/combat/fs_flurry_4.py | 9 +++++++++ scripts/commands/combat/fs_flurry_5.py | 9 +++++++++ scripts/commands/combat/fs_flurry_6.py | 9 +++++++++ scripts/commands/combat/fs_flurry_7.py | 9 +++++++++ 7 files changed, 63 insertions(+) create mode 100644 scripts/commands/combat/fs_flurry_1.py create mode 100644 scripts/commands/combat/fs_flurry_2.py create mode 100644 scripts/commands/combat/fs_flurry_3.py create mode 100644 scripts/commands/combat/fs_flurry_4.py create mode 100644 scripts/commands/combat/fs_flurry_5.py create mode 100644 scripts/commands/combat/fs_flurry_6.py create mode 100644 scripts/commands/combat/fs_flurry_7.py diff --git a/scripts/commands/combat/fs_flurry_1.py b/scripts/commands/combat/fs_flurry_1.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_flurry_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_2.py b/scripts/commands/combat/fs_flurry_2.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_flurry_2.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_3.py b/scripts/commands/combat/fs_flurry_3.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_flurry_3.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_4.py b/scripts/commands/combat/fs_flurry_4.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_flurry_4.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_5.py b/scripts/commands/combat/fs_flurry_5.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_flurry_5.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_6.py b/scripts/commands/combat/fs_flurry_6.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_flurry_6.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_7.py b/scripts/commands/combat/fs_flurry_7.py new file mode 100644 index 00000000..47e927c5 --- /dev/null +++ b/scripts/commands/combat/fs_flurry_7.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_dm'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file From 38263b72894c966295ab756a954b04f7a5e39e03 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Fri, 20 Dec 2013 20:41:51 +0100 Subject: [PATCH 03/16] Jedi - Added Strike Critical Chance --- scripts/commands/combat/fs_dm_1.py | 3 +++ scripts/commands/combat/fs_dm_2.py | 3 +++ scripts/commands/combat/fs_dm_3.py | 3 +++ scripts/commands/combat/fs_dm_4.py | 3 +++ scripts/commands/combat/fs_dm_5.py | 3 +++ scripts/commands/combat/fs_dm_6.py | 3 +++ scripts/commands/combat/fs_dm_7.py | 3 +++ 7 files changed, 21 insertions(+) diff --git a/scripts/commands/combat/fs_dm_1.py b/scripts/commands/combat/fs_dm_1.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_dm_1.py +++ b/scripts/commands/combat/fs_dm_1.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_2.py b/scripts/commands/combat/fs_dm_2.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_dm_2.py +++ b/scripts/commands/combat/fs_dm_2.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_3.py b/scripts/commands/combat/fs_dm_3.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_dm_3.py +++ b/scripts/commands/combat/fs_dm_3.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_4.py b/scripts/commands/combat/fs_dm_4.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_dm_4.py +++ b/scripts/commands/combat/fs_dm_4.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_5.py b/scripts/commands/combat/fs_dm_5.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_dm_5.py +++ b/scripts/commands/combat/fs_dm_5.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_6.py b/scripts/commands/combat/fs_dm_6.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_dm_6.py +++ b/scripts/commands/combat/fs_dm_6.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_7.py b/scripts/commands/combat/fs_dm_7.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_dm_7.py +++ b/scripts/commands/combat/fs_dm_7.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file From c7ae8f12b3950941e975a711a87e440ddf4507ee Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Fri, 20 Dec 2013 20:42:54 +0100 Subject: [PATCH 04/16] Jedi - Strike Critical for Flurry --- scripts/commands/combat/fs_flurry_1.py | 3 +++ scripts/commands/combat/fs_flurry_2.py | 3 +++ scripts/commands/combat/fs_flurry_3.py | 3 +++ scripts/commands/combat/fs_flurry_4.py | 3 +++ scripts/commands/combat/fs_flurry_5.py | 3 +++ scripts/commands/combat/fs_flurry_6.py | 3 +++ scripts/commands/combat/fs_flurry_7.py | 3 +++ 7 files changed, 21 insertions(+) diff --git a/scripts/commands/combat/fs_flurry_1.py b/scripts/commands/combat/fs_flurry_1.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_flurry_1.py +++ b/scripts/commands/combat/fs_flurry_1.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_2.py b/scripts/commands/combat/fs_flurry_2.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_flurry_2.py +++ b/scripts/commands/combat/fs_flurry_2.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_3.py b/scripts/commands/combat/fs_flurry_3.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_flurry_3.py +++ b/scripts/commands/combat/fs_flurry_3.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_4.py b/scripts/commands/combat/fs_flurry_4.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_flurry_4.py +++ b/scripts/commands/combat/fs_flurry_4.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_5.py b/scripts/commands/combat/fs_flurry_5.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_flurry_5.py +++ b/scripts/commands/combat/fs_flurry_5.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_6.py b/scripts/commands/combat/fs_flurry_6.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_flurry_6.py +++ b/scripts/commands/combat/fs_flurry_6.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_7.py b/scripts/commands/combat/fs_flurry_7.py index 47e927c5..fc780307 100644 --- a/scripts/commands/combat/fs_flurry_7.py +++ b/scripts/commands/combat/fs_flurry_7.py @@ -4,6 +4,9 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) + if actor.getSkillMod('expertise_critical_line_fs_dm'): + command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + return def run(core, actor, target, commandString): return \ No newline at end of file From 0a9df0a35af5815f9689e4d972f061a232ea6fa0 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Fri, 20 Dec 2013 20:57:03 +0100 Subject: [PATCH 05/16] Jedi - Added Sweep Damage --- scripts/commands/combat/fs_sweep_1.py | 9 +++++++++ scripts/commands/combat/fs_sweep_2.py | 9 +++++++++ scripts/commands/combat/fs_sweep_3.py | 9 +++++++++ scripts/commands/combat/fs_sweep_4.py | 9 +++++++++ scripts/commands/combat/fs_sweep_5.py | 9 +++++++++ scripts/commands/combat/fs_sweep_6.py | 9 +++++++++ scripts/commands/combat/fs_sweep_7.py | 9 +++++++++ 7 files changed, 63 insertions(+) create mode 100644 scripts/commands/combat/fs_sweep_1.py create mode 100644 scripts/commands/combat/fs_sweep_2.py create mode 100644 scripts/commands/combat/fs_sweep_3.py create mode 100644 scripts/commands/combat/fs_sweep_4.py create mode 100644 scripts/commands/combat/fs_sweep_5.py create mode 100644 scripts/commands/combat/fs_sweep_6.py create mode 100644 scripts/commands/combat/fs_sweep_7.py diff --git a/scripts/commands/combat/fs_sweep_1.py b/scripts/commands/combat/fs_sweep_1.py new file mode 100644 index 00000000..b312443d --- /dev/null +++ b/scripts/commands/combat/fs_sweep_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_sweep'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_2.py b/scripts/commands/combat/fs_sweep_2.py new file mode 100644 index 00000000..b312443d --- /dev/null +++ b/scripts/commands/combat/fs_sweep_2.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_sweep'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_3.py b/scripts/commands/combat/fs_sweep_3.py new file mode 100644 index 00000000..b312443d --- /dev/null +++ b/scripts/commands/combat/fs_sweep_3.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_sweep'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_4.py b/scripts/commands/combat/fs_sweep_4.py new file mode 100644 index 00000000..b312443d --- /dev/null +++ b/scripts/commands/combat/fs_sweep_4.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_sweep'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_5.py b/scripts/commands/combat/fs_sweep_5.py new file mode 100644 index 00000000..b312443d --- /dev/null +++ b/scripts/commands/combat/fs_sweep_5.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_sweep'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_6.py b/scripts/commands/combat/fs_sweep_6.py new file mode 100644 index 00000000..b312443d --- /dev/null +++ b/scripts/commands/combat/fs_sweep_6.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_sweep'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_7.py b/scripts/commands/combat/fs_sweep_7.py new file mode 100644 index 00000000..b312443d --- /dev/null +++ b/scripts/commands/combat/fs_sweep_7.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.getSkillMod('expertise_damage_line_fs_sweep'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file From 7a108a9c022bc9dc14fddd8fbe1ae371f010af43 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Fri, 20 Dec 2013 21:39:43 +0100 Subject: [PATCH 06/16] Jedi - Soothing Aura now handled in scripts --- scripts/commands/combat/fs_sh_0.py | 9 +++++++++ scripts/commands/combat/fs_sh_1.py | 9 +++++++++ scripts/commands/combat/fs_sh_2.py | 9 +++++++++ scripts/commands/combat/fs_sh_3.py | 9 +++++++++ src/services/combat/CombatService.java | 4 +--- 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 scripts/commands/combat/fs_sh_0.py create mode 100644 scripts/commands/combat/fs_sh_1.py create mode 100644 scripts/commands/combat/fs_sh_2.py create mode 100644 scripts/commands/combat/fs_sh_3.py diff --git a/scripts/commands/combat/fs_sh_0.py b/scripts/commands/combat/fs_sh_0.py new file mode 100644 index 00000000..84134341 --- /dev/null +++ b/scripts/commands/combat/fs_sh_0.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.hasBuff('fs_buff_def_1_1') and actor.getSkillMod('expertise_stance_healing_line_fs_heal'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_stance_healing_line_fs_heal').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sh_1.py b/scripts/commands/combat/fs_sh_1.py new file mode 100644 index 00000000..84134341 --- /dev/null +++ b/scripts/commands/combat/fs_sh_1.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.hasBuff('fs_buff_def_1_1') and actor.getSkillMod('expertise_stance_healing_line_fs_heal'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_stance_healing_line_fs_heal').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sh_2.py b/scripts/commands/combat/fs_sh_2.py new file mode 100644 index 00000000..84134341 --- /dev/null +++ b/scripts/commands/combat/fs_sh_2.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.hasBuff('fs_buff_def_1_1') and actor.getSkillMod('expertise_stance_healing_line_fs_heal'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_stance_healing_line_fs_heal').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sh_3.py b/scripts/commands/combat/fs_sh_3.py new file mode 100644 index 00000000..84134341 --- /dev/null +++ b/scripts/commands/combat/fs_sh_3.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, actor, target, command): + if actor.hasBuff('fs_buff_def_1_1') and actor.getSkillMod('expertise_stance_healing_line_fs_heal'): + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_stance_healing_line_fs_heal').getBase())/100)) + + return +def run(core, actor, target, commandString): + return \ No newline at end of file diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 9e4d2ba2..bd2565ed 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -900,9 +900,7 @@ public class CombatService implements INetworkDispatch { healPotency += healer.getSkillMod("expertise_healing_line_sm_heal").getBase(); if(healer.getSkillMod("expertise_healing_line_sp_heal") != null) healPotency += healer.getSkillMod("expertise_healing_line_sp_heal").getBase(); - if(healer.hasBuff("fs_buff_def_1_1")) - if(healer.getSkillMod("expertise_stance_healing_line_fs_heal") != null) - healPotency += healer.getSkillMod("expertise_stance_healing_line_fs_heal").getBase(); + if(healPotency > 0) healAmount += ((healAmount * healPotency) / 100); if(target.getSkillMod("expertise_healing_reduction") != null) From 17f040cf1201984f8d19794bee1e4bbe7e8273d3 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Fri, 20 Dec 2013 22:39:36 +0100 Subject: [PATCH 07/16] Jedi - Added Strike Action Cost Reduction --- scripts/commands/combat/fs_dm_1.py | 4 ++++ scripts/commands/combat/fs_dm_2.py | 4 ++++ scripts/commands/combat/fs_dm_3.py | 4 ++++ scripts/commands/combat/fs_dm_4.py | 4 ++++ scripts/commands/combat/fs_dm_5.py | 4 ++++ scripts/commands/combat/fs_dm_6.py | 4 ++++ scripts/commands/combat/fs_dm_7.py | 4 ++++ scripts/commands/combat/fs_flurry_1.py | 4 ++++ scripts/commands/combat/fs_flurry_2.py | 4 ++++ scripts/commands/combat/fs_flurry_3.py | 4 ++++ scripts/commands/combat/fs_flurry_4.py | 4 ++++ scripts/commands/combat/fs_flurry_5.py | 4 ++++ scripts/commands/combat/fs_flurry_6.py | 4 ++++ scripts/commands/combat/fs_flurry_7.py | 4 ++++ 14 files changed, 56 insertions(+) diff --git a/scripts/commands/combat/fs_dm_1.py b/scripts/commands/combat/fs_dm_1.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_dm_1.py +++ b/scripts/commands/combat/fs_dm_1.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_2.py b/scripts/commands/combat/fs_dm_2.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_dm_2.py +++ b/scripts/commands/combat/fs_dm_2.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_3.py b/scripts/commands/combat/fs_dm_3.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_dm_3.py +++ b/scripts/commands/combat/fs_dm_3.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_4.py b/scripts/commands/combat/fs_dm_4.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_dm_4.py +++ b/scripts/commands/combat/fs_dm_4.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_5.py b/scripts/commands/combat/fs_dm_5.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_dm_5.py +++ b/scripts/commands/combat/fs_dm_5.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_6.py b/scripts/commands/combat/fs_dm_6.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_dm_6.py +++ b/scripts/commands/combat/fs_dm_6.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_dm_7.py b/scripts/commands/combat/fs_dm_7.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_dm_7.py +++ b/scripts/commands/combat/fs_dm_7.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_1.py b/scripts/commands/combat/fs_flurry_1.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_flurry_1.py +++ b/scripts/commands/combat/fs_flurry_1.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_2.py b/scripts/commands/combat/fs_flurry_2.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_flurry_2.py +++ b/scripts/commands/combat/fs_flurry_2.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_3.py b/scripts/commands/combat/fs_flurry_3.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_flurry_3.py +++ b/scripts/commands/combat/fs_flurry_3.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_4.py b/scripts/commands/combat/fs_flurry_4.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_flurry_4.py +++ b/scripts/commands/combat/fs_flurry_4.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_5.py b/scripts/commands/combat/fs_flurry_5.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_flurry_5.py +++ b/scripts/commands/combat/fs_flurry_5.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_6.py b/scripts/commands/combat/fs_flurry_6.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_flurry_6.py +++ b/scripts/commands/combat/fs_flurry_6.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file diff --git a/scripts/commands/combat/fs_flurry_7.py b/scripts/commands/combat/fs_flurry_7.py index fc780307..1d6cd02c 100644 --- a/scripts/commands/combat/fs_flurry_7.py +++ b/scripts/commands/combat/fs_flurry_7.py @@ -7,6 +7,10 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_critical_line_fs_dm'): command.setCriticalChance(command.getCriticalChance() + actor.getSkillMod('expertise_critical_line_fs_dm').getBase()) + if actor.getSkillMod('expertise_action_line_fs_dm'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_dm').getBase())/100)) + return + def run(core, actor, target, commandString): return \ No newline at end of file From af18a56e058e4b44a4eeb8fc961382a74b3c5548 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Fri, 20 Dec 2013 22:49:43 +0100 Subject: [PATCH 08/16] Jedi - Action Cost Reduction for Sweep --- scripts/commands/combat/fs_sweep_1.py | 7 ++++++- scripts/commands/combat/fs_sweep_2.py | 7 ++++++- scripts/commands/combat/fs_sweep_3.py | 7 ++++++- scripts/commands/combat/fs_sweep_4.py | 7 ++++++- scripts/commands/combat/fs_sweep_5.py | 7 ++++++- scripts/commands/combat/fs_sweep_6.py | 7 ++++++- scripts/commands/combat/fs_sweep_7.py | 7 ++++++- 7 files changed, 42 insertions(+), 7 deletions(-) diff --git a/scripts/commands/combat/fs_sweep_1.py b/scripts/commands/combat/fs_sweep_1.py index b312443d..3151d83b 100644 --- a/scripts/commands/combat/fs_sweep_1.py +++ b/scripts/commands/combat/fs_sweep_1.py @@ -4,6 +4,11 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_sweep'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + if actor.getSkillMod('expertise_action_line_fs_sweep'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + return + def run(core, actor, target, commandString): - return \ No newline at end of file + return + \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_2.py b/scripts/commands/combat/fs_sweep_2.py index b312443d..3151d83b 100644 --- a/scripts/commands/combat/fs_sweep_2.py +++ b/scripts/commands/combat/fs_sweep_2.py @@ -4,6 +4,11 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_sweep'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + if actor.getSkillMod('expertise_action_line_fs_sweep'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + return + def run(core, actor, target, commandString): - return \ No newline at end of file + return + \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_3.py b/scripts/commands/combat/fs_sweep_3.py index b312443d..3151d83b 100644 --- a/scripts/commands/combat/fs_sweep_3.py +++ b/scripts/commands/combat/fs_sweep_3.py @@ -4,6 +4,11 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_sweep'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + if actor.getSkillMod('expertise_action_line_fs_sweep'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + return + def run(core, actor, target, commandString): - return \ No newline at end of file + return + \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_4.py b/scripts/commands/combat/fs_sweep_4.py index b312443d..3151d83b 100644 --- a/scripts/commands/combat/fs_sweep_4.py +++ b/scripts/commands/combat/fs_sweep_4.py @@ -4,6 +4,11 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_sweep'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + if actor.getSkillMod('expertise_action_line_fs_sweep'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + return + def run(core, actor, target, commandString): - return \ No newline at end of file + return + \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_5.py b/scripts/commands/combat/fs_sweep_5.py index b312443d..3151d83b 100644 --- a/scripts/commands/combat/fs_sweep_5.py +++ b/scripts/commands/combat/fs_sweep_5.py @@ -4,6 +4,11 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_sweep'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + if actor.getSkillMod('expertise_action_line_fs_sweep'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + return + def run(core, actor, target, commandString): - return \ No newline at end of file + return + \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_6.py b/scripts/commands/combat/fs_sweep_6.py index b312443d..3151d83b 100644 --- a/scripts/commands/combat/fs_sweep_6.py +++ b/scripts/commands/combat/fs_sweep_6.py @@ -4,6 +4,11 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_sweep'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + if actor.getSkillMod('expertise_action_line_fs_sweep'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + return + def run(core, actor, target, commandString): - return \ No newline at end of file + return + \ No newline at end of file diff --git a/scripts/commands/combat/fs_sweep_7.py b/scripts/commands/combat/fs_sweep_7.py index b312443d..3151d83b 100644 --- a/scripts/commands/combat/fs_sweep_7.py +++ b/scripts/commands/combat/fs_sweep_7.py @@ -4,6 +4,11 @@ def setup(core, actor, target, command): if actor.getSkillMod('expertise_damage_line_fs_sweep'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + if actor.getSkillMod('expertise_action_line_fs_sweep'): + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + return + def run(core, actor, target, commandString): - return \ No newline at end of file + return + \ No newline at end of file From 0775adb2d8fe765ed12b4957e49da180292222f6 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sat, 21 Dec 2013 01:31:00 +0100 Subject: [PATCH 09/16] Jedi - Added Strike cooldown reduction modifier --- scripts/commands/combat/fs_dm_1.py | 4 ++++ scripts/commands/combat/fs_dm_2.py | 4 ++++ scripts/commands/combat/fs_dm_3.py | 4 ++++ scripts/commands/combat/fs_dm_4.py | 4 ++++ scripts/commands/combat/fs_dm_5.py | 4 ++++ scripts/commands/combat/fs_dm_6.py | 4 ++++ scripts/commands/combat/fs_dm_7.py | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/scripts/commands/combat/fs_dm_1.py b/scripts/commands/combat/fs_dm_1.py index 1d6cd02c..825798d5 100644 --- a/scripts/commands/combat/fs_dm_1.py +++ b/scripts/commands/combat/fs_dm_1.py @@ -1,6 +1,10 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_dm'): + command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10)) + if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) diff --git a/scripts/commands/combat/fs_dm_2.py b/scripts/commands/combat/fs_dm_2.py index 1d6cd02c..825798d5 100644 --- a/scripts/commands/combat/fs_dm_2.py +++ b/scripts/commands/combat/fs_dm_2.py @@ -1,6 +1,10 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_dm'): + command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10)) + if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) diff --git a/scripts/commands/combat/fs_dm_3.py b/scripts/commands/combat/fs_dm_3.py index 1d6cd02c..825798d5 100644 --- a/scripts/commands/combat/fs_dm_3.py +++ b/scripts/commands/combat/fs_dm_3.py @@ -1,6 +1,10 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_dm'): + command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10)) + if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) diff --git a/scripts/commands/combat/fs_dm_4.py b/scripts/commands/combat/fs_dm_4.py index 1d6cd02c..825798d5 100644 --- a/scripts/commands/combat/fs_dm_4.py +++ b/scripts/commands/combat/fs_dm_4.py @@ -1,6 +1,10 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_dm'): + command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10)) + if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) diff --git a/scripts/commands/combat/fs_dm_5.py b/scripts/commands/combat/fs_dm_5.py index 1d6cd02c..825798d5 100644 --- a/scripts/commands/combat/fs_dm_5.py +++ b/scripts/commands/combat/fs_dm_5.py @@ -1,6 +1,10 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_dm'): + command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10)) + if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) diff --git a/scripts/commands/combat/fs_dm_6.py b/scripts/commands/combat/fs_dm_6.py index 1d6cd02c..825798d5 100644 --- a/scripts/commands/combat/fs_dm_6.py +++ b/scripts/commands/combat/fs_dm_6.py @@ -1,6 +1,10 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_dm'): + command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10)) + if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) diff --git a/scripts/commands/combat/fs_dm_7.py b/scripts/commands/combat/fs_dm_7.py index 1d6cd02c..825798d5 100644 --- a/scripts/commands/combat/fs_dm_7.py +++ b/scripts/commands/combat/fs_dm_7.py @@ -1,6 +1,10 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_dm'): + command.setCooldown(command.getCooldown() + (actor.getSkillMod('expertise_cooldown_line_fs_dm').getBase()/10)) + if actor.getSkillMod('expertise_damage_line_fs_dm'): command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_dm').getBase())/100)) From 9b87d4b91cf8c01eed1bdb3a1d5e2b1b594e2a31 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sat, 21 Dec 2013 01:35:12 +0100 Subject: [PATCH 10/16] Jedi - Added Sweep Cooldown Reduction modifiers --- scripts/commands/combat/fs_sweep_1.py | 8 ++++++-- scripts/commands/combat/fs_sweep_2.py | 8 ++++++-- scripts/commands/combat/fs_sweep_3.py | 8 ++++++-- scripts/commands/combat/fs_sweep_4.py | 8 ++++++-- scripts/commands/combat/fs_sweep_5.py | 8 ++++++-- scripts/commands/combat/fs_sweep_6.py | 8 ++++++-- scripts/commands/combat/fs_sweep_7.py | 8 ++++++-- 7 files changed, 42 insertions(+), 14 deletions(-) diff --git a/scripts/commands/combat/fs_sweep_1.py b/scripts/commands/combat/fs_sweep_1.py index 3151d83b..6671e0ad 100644 --- a/scripts/commands/combat/fs_sweep_1.py +++ b/scripts/commands/combat/fs_sweep_1.py @@ -1,11 +1,15 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_sweep'): + command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10)) + if actor.getSkillMod('expertise_damage_line_fs_sweep'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100)) if actor.getSkillMod('expertise_action_line_fs_sweep'): - command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100)) return diff --git a/scripts/commands/combat/fs_sweep_2.py b/scripts/commands/combat/fs_sweep_2.py index 3151d83b..6671e0ad 100644 --- a/scripts/commands/combat/fs_sweep_2.py +++ b/scripts/commands/combat/fs_sweep_2.py @@ -1,11 +1,15 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_sweep'): + command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10)) + if actor.getSkillMod('expertise_damage_line_fs_sweep'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100)) if actor.getSkillMod('expertise_action_line_fs_sweep'): - command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100)) return diff --git a/scripts/commands/combat/fs_sweep_3.py b/scripts/commands/combat/fs_sweep_3.py index 3151d83b..6671e0ad 100644 --- a/scripts/commands/combat/fs_sweep_3.py +++ b/scripts/commands/combat/fs_sweep_3.py @@ -1,11 +1,15 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_sweep'): + command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10)) + if actor.getSkillMod('expertise_damage_line_fs_sweep'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100)) if actor.getSkillMod('expertise_action_line_fs_sweep'): - command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100)) return diff --git a/scripts/commands/combat/fs_sweep_4.py b/scripts/commands/combat/fs_sweep_4.py index 3151d83b..6671e0ad 100644 --- a/scripts/commands/combat/fs_sweep_4.py +++ b/scripts/commands/combat/fs_sweep_4.py @@ -1,11 +1,15 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_sweep'): + command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10)) + if actor.getSkillMod('expertise_damage_line_fs_sweep'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100)) if actor.getSkillMod('expertise_action_line_fs_sweep'): - command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100)) return diff --git a/scripts/commands/combat/fs_sweep_5.py b/scripts/commands/combat/fs_sweep_5.py index 3151d83b..6671e0ad 100644 --- a/scripts/commands/combat/fs_sweep_5.py +++ b/scripts/commands/combat/fs_sweep_5.py @@ -1,11 +1,15 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_sweep'): + command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10)) + if actor.getSkillMod('expertise_damage_line_fs_sweep'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100)) if actor.getSkillMod('expertise_action_line_fs_sweep'): - command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100)) return diff --git a/scripts/commands/combat/fs_sweep_6.py b/scripts/commands/combat/fs_sweep_6.py index 3151d83b..6671e0ad 100644 --- a/scripts/commands/combat/fs_sweep_6.py +++ b/scripts/commands/combat/fs_sweep_6.py @@ -1,11 +1,15 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_sweep'): + command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10)) + if actor.getSkillMod('expertise_damage_line_fs_sweep'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100)) if actor.getSkillMod('expertise_action_line_fs_sweep'): - command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100)) return diff --git a/scripts/commands/combat/fs_sweep_7.py b/scripts/commands/combat/fs_sweep_7.py index 3151d83b..6671e0ad 100644 --- a/scripts/commands/combat/fs_sweep_7.py +++ b/scripts/commands/combat/fs_sweep_7.py @@ -1,11 +1,15 @@ import sys def setup(core, actor, target, command): + + if actor.getSkillMod('expertise_cooldown_line_fs_sweep'): + command.setCooldown(command.getCooldown() + (actor.getSkillModBase('expertise_cooldown_line_fs_sweep')/10)) + if actor.getSkillMod('expertise_damage_line_fs_sweep'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_damage_line_fs_sweep').getBase())/100)) + command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillModBase('expertise_damage_line_fs_sweep'))/100)) if actor.getSkillMod('expertise_action_line_fs_sweep'): - command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillMod('expertise_action_line_fs_sweep').getBase())/100)) + command.setActionCost(command.getActionCost() - ((command.getActionCost() * actor.getSkillModBase('expertise_action_line_fs_sweep'))/100)) return From b26374faf7196c9c8b627d0139996c6e65e00a3b Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Tue, 24 Dec 2013 00:23:17 +0100 Subject: [PATCH 11/16] Items - Profession restrictions --- scripts/commands/transferitemarmor.py | 3 ++ scripts/commands/transferitemmisc.py | 3 ++ scripts/commands/transferitemweapon.py | 3 ++ src/services/EquipmentService.java | 53 +++++++++++++++++++++----- 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/scripts/commands/transferitemarmor.py b/scripts/commands/transferitemarmor.py index b5090996..2b890936 100644 --- a/scripts/commands/transferitemarmor.py +++ b/scripts/commands/transferitemarmor.py @@ -4,6 +4,9 @@ def setup(): return def run(core, actor, target, commandString): + if core.equipmentService.canEquip(actor, target) is False: + return + parsedMsg = commandString.split(' ', 3) objService = core.objectService containerID = long(parsedMsg[1]) diff --git a/scripts/commands/transferitemmisc.py b/scripts/commands/transferitemmisc.py index 7a3f5199..79ef9455 100644 --- a/scripts/commands/transferitemmisc.py +++ b/scripts/commands/transferitemmisc.py @@ -4,6 +4,9 @@ def setup(): return def run(core, actor, target, commandString): + if core.equipmentService.canEquip(actor, target) is False: + return + parsedMsg = commandString.split(' ', 3) objService = core.objectService containerID = long(parsedMsg[1]) diff --git a/scripts/commands/transferitemweapon.py b/scripts/commands/transferitemweapon.py index 8c54e57a..9b403eaf 100644 --- a/scripts/commands/transferitemweapon.py +++ b/scripts/commands/transferitemweapon.py @@ -4,6 +4,9 @@ def setup(): return def run(core, actor, target, commandString): + if core.equipmentService.canEquip(actor, target) is False: + return + parsedMsg = commandString.split(' ', 3) objService = core.objectService containerID = long(parsedMsg[1]) diff --git a/src/services/EquipmentService.java b/src/services/EquipmentService.java index 975125ce..417bf093 100644 --- a/src/services/EquipmentService.java +++ b/src/services/EquipmentService.java @@ -33,6 +33,7 @@ import main.NGECore; import engine.resources.objects.SWGObject; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; +import resources.objects.player.PlayerObject; public class EquipmentService implements INetworkDispatch { @@ -88,11 +89,42 @@ public class EquipmentService implements INetworkDispatch { } } + public String getFormalProfessionName(String stfName) { + String formalName = ""; + + switch (stfName) { + case "force_sensitive_1a": formalName = "Jedi"; break; + case "bounty_hunter_1a": formalName = "Bounty Hunter"; break; + case "officer_1a": formalName = "Officer"; break; + case "smuggler_1a": formalName = "Smuggler"; break; + case "entertainer_1a": formalName = "Entertainer"; break; + case "spy_1a": formalName = "Spy"; break; + case "medic_1a": formalName = "Medic"; break; + case "commando_1a": formalName = "Commando"; break; + + default: formalName = "Trader"; break; // Ziggy: Trader profession names are a bit irregular, so this is used. + + } + return formalName; + } + + public boolean canEquip(CreatureObject actor, SWGObject item) { + boolean result = true; + + if (item.getStringAttribute("class_required") != null) { + String profession = ((PlayerObject) actor.getSlottedObject("ghost")).getProfession(); + if (item.getStringAttribute("class_required").contentEquals(getFormalProfessionName(profession))) { + result = true; + } else{ + return false; + } + } + + return result; + } + public void equip(CreatureObject actor, SWGObject item) { - //if(replacedItem != null) - // unequip(actor, replacedItem); - String template = ((item.getAttachment("customServerTemplate") == null) ? item.getTemplate() : (item.getTemplate().split("shared_")[0] + "shared_" + ((String) item.getAttachment("customServerTemplate")) + ".iff")); String serverTemplate = template.replace(".iff", ""); PyObject func = core.scriptService.getMethod("scripts/" + serverTemplate.split("shared_" , 2)[0].replace("shared_", ""), serverTemplate.split("shared_" , 2)[1], "equip"); @@ -100,14 +132,18 @@ public class EquipmentService implements INetworkDispatch { func.__call__(Py.java2py(core), Py.java2py(actor), Py.java2py(item)); // TODO: add health/action bonus from crafted weapon with augmentations (also seen with cybernetics) - // TODO: faction restrictions - // TODO: Species restrictions? - // TODO: Gender restrictions? + // TODO: faction restrictions - You had to be a Combatant as minimum in order to EQUIP an item. + // TODO: Species restrictions + // TODO: Gender restrictions // TODO: crit enhancement from crafted weapons // TODO: Jedi robes Force Protection Intensity // TODO: check for armor category in order to add resistance to certain DoT types - // TODO: if weapon, add the weapon specific crit to display_only_critical - // TODO: bio-link + // TODO: Calculate actual armor values (REMINDER: Check if the player is wearing a jedi robe/cloak (look for force protection intensity). If they are, they shouldn't receive any additional protection from other items with armour.) + // TODO: bio-link (assign it by objectID with setAttachment and then just display it as a character name). + // TODO: item level requirement. if actorLevel >= itemLevel + // TODO: refactor equipable items that grant buffs. use setAttachment("itemBuff", "buffname") - example: object.setAttachment("itemBuff", "fs_buff_def_1_1") + // if(item.getAttachment("itemBuff") != null ) + // core.buffService.addBuffToCreature(actor, item.getAttachment("itemBuff")); if (actor.getSlotNameForObject(item).contentEquals("hold_r") == true) weaponCriticalToDisplay(actor, item, true); @@ -115,7 +151,6 @@ public class EquipmentService implements INetworkDispatch { Map attributes = new TreeMap(item.getAttributes()); for(Entry e : attributes.entrySet()) { - if(e.getKey().startsWith("cat_skill_mod_bonus.@stat_n:")) { core.skillModService.addSkillMod(actor, e.getKey().replace("cat_skill_mod_bonus.@stat_n:", ""), Integer.parseInt((String) e.getValue())); } From 08d1e68df84676bc163432dd8e091525b19d2b03 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Tue, 24 Dec 2013 18:02:50 +0100 Subject: [PATCH 12/16] Revert "Jedi - Soothing Aura now handled in scripts" This reverts commit 7a108a9c022bc9dc14fddd8fbe1ae371f010af43. --- scripts/commands/combat/fs_sh_0.py | 9 --------- scripts/commands/combat/fs_sh_1.py | 9 --------- scripts/commands/combat/fs_sh_2.py | 9 --------- scripts/commands/combat/fs_sh_3.py | 9 --------- src/services/combat/CombatService.java | 4 +++- 5 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 scripts/commands/combat/fs_sh_0.py delete mode 100644 scripts/commands/combat/fs_sh_1.py delete mode 100644 scripts/commands/combat/fs_sh_2.py delete mode 100644 scripts/commands/combat/fs_sh_3.py diff --git a/scripts/commands/combat/fs_sh_0.py b/scripts/commands/combat/fs_sh_0.py deleted file mode 100644 index 84134341..00000000 --- a/scripts/commands/combat/fs_sh_0.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.hasBuff('fs_buff_def_1_1') and actor.getSkillMod('expertise_stance_healing_line_fs_heal'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_stance_healing_line_fs_heal').getBase())/100)) - - return -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sh_1.py b/scripts/commands/combat/fs_sh_1.py deleted file mode 100644 index 84134341..00000000 --- a/scripts/commands/combat/fs_sh_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.hasBuff('fs_buff_def_1_1') and actor.getSkillMod('expertise_stance_healing_line_fs_heal'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_stance_healing_line_fs_heal').getBase())/100)) - - return -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sh_2.py b/scripts/commands/combat/fs_sh_2.py deleted file mode 100644 index 84134341..00000000 --- a/scripts/commands/combat/fs_sh_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.hasBuff('fs_buff_def_1_1') and actor.getSkillMod('expertise_stance_healing_line_fs_heal'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_stance_healing_line_fs_heal').getBase())/100)) - - return -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/scripts/commands/combat/fs_sh_3.py b/scripts/commands/combat/fs_sh_3.py deleted file mode 100644 index 84134341..00000000 --- a/scripts/commands/combat/fs_sh_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def setup(core, actor, target, command): - if actor.hasBuff('fs_buff_def_1_1') and actor.getSkillMod('expertise_stance_healing_line_fs_heal'): - command.setAddedDamage(command.getAddedDamage() + ((command.getAddedDamage() * actor.getSkillMod('expertise_stance_healing_line_fs_heal').getBase())/100)) - - return -def run(core, actor, target, commandString): - return \ No newline at end of file diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index bd2565ed..9e4d2ba2 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -900,7 +900,9 @@ public class CombatService implements INetworkDispatch { healPotency += healer.getSkillMod("expertise_healing_line_sm_heal").getBase(); if(healer.getSkillMod("expertise_healing_line_sp_heal") != null) healPotency += healer.getSkillMod("expertise_healing_line_sp_heal").getBase(); - + if(healer.hasBuff("fs_buff_def_1_1")) + if(healer.getSkillMod("expertise_stance_healing_line_fs_heal") != null) + healPotency += healer.getSkillMod("expertise_stance_healing_line_fs_heal").getBase(); if(healPotency > 0) healAmount += ((healAmount * healPotency) / 100); if(target.getSkillMod("expertise_healing_reduction") != null) From a115c62887bf8e09fc4a7225d910ff79e5755dc2 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Wed, 25 Dec 2013 05:15:53 +0100 Subject: [PATCH 13/16] Items - Action and Health attributes --- src/services/EquipmentService.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/services/EquipmentService.java b/src/services/EquipmentService.java index 417bf093..f96e0e2c 100644 --- a/src/services/EquipmentService.java +++ b/src/services/EquipmentService.java @@ -141,9 +141,7 @@ public class EquipmentService implements INetworkDispatch { // TODO: Calculate actual armor values (REMINDER: Check if the player is wearing a jedi robe/cloak (look for force protection intensity). If they are, they shouldn't receive any additional protection from other items with armour.) // TODO: bio-link (assign it by objectID with setAttachment and then just display it as a character name). // TODO: item level requirement. if actorLevel >= itemLevel - // TODO: refactor equipable items that grant buffs. use setAttachment("itemBuff", "buffname") - example: object.setAttachment("itemBuff", "fs_buff_def_1_1") - // if(item.getAttachment("itemBuff") != null ) - // core.buffService.addBuffToCreature(actor, item.getAttachment("itemBuff")); + // TODO: refactor equipable items that grant buffs. use setAttachment("itemBuff", "buffname") if (actor.getSlotNameForObject(item).contentEquals("hold_r") == true) weaponCriticalToDisplay(actor, item, true); @@ -153,7 +151,13 @@ public class EquipmentService implements INetworkDispatch { for(Entry e : attributes.entrySet()) { if(e.getKey().startsWith("cat_skill_mod_bonus.@stat_n:")) { core.skillModService.addSkillMod(actor, e.getKey().replace("cat_skill_mod_bonus.@stat_n:", ""), Integer.parseInt((String) e.getValue())); - } + } + if(e.getKey().startsWith("cat_attrib_mod_bonus.attr_health")) { + actor.setMaxHealth(actor.getMaxHealth() + Integer.parseInt((String) e.getValue())); + } + if(e.getKey().startsWith("cat_attrib_mod_bonus.attr_action")) { + actor.setMaxAction(actor.getMaxAction() + Integer.parseInt((String) e.getValue())); + } } @@ -179,6 +183,12 @@ public class EquipmentService implements INetworkDispatch { if(e.getKey().startsWith("cat_skill_mod_bonus.@stat_n:")) { core.skillModService.deductSkillMod(actor, e.getKey().replace("cat_skill_mod_bonus.@stat_n:", ""), Integer.parseInt((String) e.getValue())); + } + if(e.getKey().startsWith("cat_attrib_mod_bonus.attr_health")) { + actor.setMaxHealth(actor.getMaxHealth() - Integer.parseInt((String) e.getValue())); + } + if(e.getKey().startsWith("cat_attrib_mod_bonus.attr_action")) { + actor.setMaxAction(actor.getMaxAction() - Integer.parseInt((String) e.getValue())); } } From 2f8d36ea576d38253a43d41e9b1561c7bd5c9dd6 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Thu, 26 Dec 2013 07:27:14 +0100 Subject: [PATCH 14/16] Trading - Fixed an issue with No Trade labeled items --- src/services/trade/TradeService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/services/trade/TradeService.java b/src/services/trade/TradeService.java index d1bd7b26..e425d282 100644 --- a/src/services/trade/TradeService.java +++ b/src/services/trade/TradeService.java @@ -202,8 +202,7 @@ public class TradeService implements INetworkDispatch{ } else { - - if (objectToTrade.getIntAttribute("no_trade") == 1) { + if(objectToTrade.getAttributes().toString().contains("no_trade")) { return; } From 11f100239dbd7bce308f2c47536a7489cf656592 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Thu, 26 Dec 2013 19:32:51 +0100 Subject: [PATCH 15/16] Roadmap - Added some rewards --- .../wearables/robe/item_npe_fs_robe_02_02.py | 13 +++++++++++++ .../weapon_roadmap_lightsaber_02_02.py | 12 ++++++++++++ scripts/roadmap/roadmap_rewards.py | 7 ++++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 scripts/object/tangible/wearables/robe/item_npe_fs_robe_02_02.py create mode 100644 scripts/object/weapon/melee/sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py diff --git a/scripts/object/tangible/wearables/robe/item_npe_fs_robe_02_02.py b/scripts/object/tangible/wearables/robe/item_npe_fs_robe_02_02.py new file mode 100644 index 00000000..faf7ac17 --- /dev/null +++ b/scripts/object/tangible/wearables/robe/item_npe_fs_robe_02_02.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, object): + + object.setStfFilename('static_item_n') + object.setStfName('item_npe_fs_robe_02_02') + object.setDetailFilename('static_item_d') + object.setDetailName('item_npe_fs_robe_02_02') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 21) + object.setStringAttribute('protection_level', 'Faint') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 20) + return diff --git a/scripts/object/weapon/melee/sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py b/scripts/object/weapon/melee/sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py new file mode 100644 index 00000000..aa616f3d --- /dev/null +++ b/scripts/object/weapon/melee/sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py @@ -0,0 +1,12 @@ +import sys + +def setup(core, object): + object.setCustomName('First Generation Lightsaber') + + object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 1) + object.setStringAttribute('class_required', 'Jedi') + object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy') + object.setStringAttribute('cat_wpn_damage.damage', '200-400') + object.setStringAttribute('cat_wpn_damage.elemental_value', '200-400') + object.setIntAttribute('cap_wpn_damage.dps', object.getDamagePerSecond()) + return \ No newline at end of file diff --git a/scripts/roadmap/roadmap_rewards.py b/scripts/roadmap/roadmap_rewards.py index 2f11d77e..b1071bbc 100644 --- a/scripts/roadmap/roadmap_rewards.py +++ b/scripts/roadmap/roadmap_rewards.py @@ -1,4 +1,9 @@ import sys def get(name): - return "" + + if name == 'item_npe_fs_robe_02_02': + return "object/tangible/wearables/robe/shared_robe_jedi_padawan.iff" + + if name == 'weapon_roadmap_lightsaber_02_02': + return "object/weapon/melee/sword/crafted_saber/shared_sword_lightsaber_one_handed_s1.iff" \ No newline at end of file From 491ef2c4bd32d8bb2214bbf6ac39633550041046 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sat, 28 Dec 2013 15:18:22 +0100 Subject: [PATCH 16/16] Roadmap - Jedi lightsaber --- .../sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/object/weapon/melee/sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py b/scripts/object/weapon/melee/sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py index aa616f3d..38a9f07e 100644 --- a/scripts/object/weapon/melee/sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py +++ b/scripts/object/weapon/melee/sword/crafted_saber/weapon_roadmap_lightsaber_02_02.py @@ -7,6 +7,6 @@ def setup(core, object): object.setStringAttribute('class_required', 'Jedi') object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy') object.setStringAttribute('cat_wpn_damage.damage', '200-400') - object.setStringAttribute('cat_wpn_damage.elemental_value', '200-400') - object.setIntAttribute('cap_wpn_damage.dps', object.getDamagePerSecond()) + + ## finish this ## return \ No newline at end of file