From 403fa12d072b1c6ce461175119b9d16ae90754a6 Mon Sep 17 00:00:00 2001 From: Doogla Date: Fri, 8 Nov 2013 10:17:59 -0800 Subject: [PATCH] More Jedi Expertise Work Lots of fixes and updates to Jedi expertise. Everything included in this update should now work properly, changing the characters stats correctly based off of expertise choices. Added a line in CombatService that factors in melee damage increases from expertise when determining raw damage. --- scripts/buffs/fs_buff_ca_1.py | 4 ++-- .../expertise/expertise_fs_general_alacrity_1.py | 4 ++-- .../expertise/expertise_fs_general_alacrity_2.py | 4 ++-- .../expertise/expertise_fs_general_alacrity_3.py | 4 ++-- .../expertise/expertise_fs_general_alacrity_4.py | 4 ++-- .../expertise_fs_general_enhanced_agility_1.py | 4 ++-- .../expertise_fs_general_enhanced_agility_2.py | 4 ++-- ...pertise_fs_general_enhanced_constitution_1.py | 4 ++-- ...pertise_fs_general_enhanced_constitution_2.py | 4 ++-- .../expertise_fs_general_enhanced_stamina_1.py | 4 ++-- .../expertise_fs_general_enhanced_stamina_2.py | 7 ++++--- .../expertise_fs_general_enhanced_strength_1.py | 4 ++-- .../expertise_fs_general_enhanced_strength_2.py | 4 ++-- .../expertise/expertise_fs_general_fidelity_1.py | 4 ++-- .../expertise/expertise_fs_general_fidelity_2.py | 4 ++-- .../expertise_fs_general_incisiveness_1.py | 4 ++-- .../expertise_fs_general_incisiveness_2.py | 4 ++-- .../expertise_fs_general_incisiveness_3.py | 4 ++-- .../expertise_fs_general_premonition_1.py | 10 +++++----- .../expertise_fs_general_premonition_2.py | 8 ++++---- .../expertise_fs_general_premonition_3.py | 8 ++++---- .../expertise_fs_general_premonition_4.py | 8 ++++---- .../expertise/expertise_fs_path_brutality_1.py | 4 ++-- .../expertise/expertise_fs_path_brutality_2.py | 4 ++-- .../expertise/expertise_fs_path_brutality_3.py | 4 ++-- .../expertise/expertise_fs_path_brutality_4.py | 4 ++-- .../expertise_fs_path_cautious_nature_1.py | 12 ++++++------ .../expertise_fs_path_cautious_nature_2.py | 12 ++++++------ .../expertise_fs_path_cautious_nature_3.py | 12 ++++++------ .../expertise_fs_path_cautious_nature_4.py | 12 ++++++------ .../expertise_fs_path_ruthless_precision_1.py | 4 ++-- .../expertise_fs_path_ruthless_precision_2.py | 4 ++-- .../expertise_fs_path_ruthless_precision_3.py | 4 ++-- .../expertise_fs_path_ruthless_precision_4.py | 4 ++-- .../skillMods/expertise_critical_niche_all.py | 2 ++ scripts/skillMods/expertise_evasion_chance.py | 12 ++++++++++++ scripts/skillMods/expertise_evasion_value.py | 2 ++ scripts/skillMods/expertise_focus.py | 16 ++++++++++++++++ scripts/skillMods/expertise_glancing_blow_all.py | 2 ++ scripts/skillMods/expertise_stance.py | 8 ++++++++ .../objects/creature/CreatureObject.java | 2 +- src/services/combat/CombatService.java | 4 ++++ 42 files changed, 142 insertions(+), 95 deletions(-) create mode 100644 scripts/skillMods/expertise_evasion_chance.py create mode 100644 scripts/skillMods/expertise_focus.py diff --git a/scripts/buffs/fs_buff_ca_1.py b/scripts/buffs/fs_buff_ca_1.py index 92ce6405..5fb1239f 100644 --- a/scripts/buffs/fs_buff_ca_1.py +++ b/scripts/buffs/fs_buff_ca_1.py @@ -2,11 +2,11 @@ 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) + core.skillModService.addSkillMod(actor, 'expertise_focus', 1) return def removeBuff(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_stance', 1) + core.skillModService.deductSkillMod(actor, 'expertise_focus', 1) return \ No newline at end of file diff --git a/scripts/expertise/expertise_fs_general_alacrity_1.py b/scripts/expertise/expertise_fs_general_alacrity_1.py index e7bc1b47..b9f17633 100644 --- a/scripts/expertise/expertise_fs_general_alacrity_1.py +++ b/scripts/expertise/expertise_fs_general_alacrity_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_alacrity_1') - actor.addSkillMod('expertise_glancing_blow_all', 2) + core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_alacrity_1') - actor.removeSkillMod('expertise_glancing_blow_all', 2) + core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_alacrity_2.py b/scripts/expertise/expertise_fs_general_alacrity_2.py index 5c64bc75..c1a3f4b0 100644 --- a/scripts/expertise/expertise_fs_general_alacrity_2.py +++ b/scripts/expertise/expertise_fs_general_alacrity_2.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_alacrity_2') - actor.addSkillMod('expertise_glancing_blow_all', 2) + core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_alacrity_2') - actor.removeSkillMod('expertise_glancing_blow_all', 2) + core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_alacrity_3.py b/scripts/expertise/expertise_fs_general_alacrity_3.py index 5f903c17..bf182038 100644 --- a/scripts/expertise/expertise_fs_general_alacrity_3.py +++ b/scripts/expertise/expertise_fs_general_alacrity_3.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_alacrity_3') - actor.addSkillMod('expertise_glancing_blow_all', 2) + core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_alacrity_3') - actor.removeSkillMod('expertise_glancing_blow_all', 2) + core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_alacrity_4.py b/scripts/expertise/expertise_fs_general_alacrity_4.py index 6a9bd9fa..1c89b7dc 100644 --- a/scripts/expertise/expertise_fs_general_alacrity_4.py +++ b/scripts/expertise/expertise_fs_general_alacrity_4.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_alacrity_4') - actor.addSkillMod('expertise_glancing_blow_all', 2) + core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_all', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_alacrity_4') - actor.removeSkillMod('expertise_glancing_blow_all', 2) + core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_all', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_enhanced_agility_1.py b/scripts/expertise/expertise_fs_general_enhanced_agility_1.py index 1862ee94..1ed244d3 100644 --- a/scripts/expertise/expertise_fs_general_enhanced_agility_1.py +++ b/scripts/expertise/expertise_fs_general_enhanced_agility_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_enhanced_agility_1') - actor.addSkillMod('agility_modified', 25) + core.skillModService.addSkillMod(actor, 'agility_modified', 25) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_enhanced_agility_1') - actor.removeSkillMod('agility_modified', 25) + core.skillModService.deductSkillMod(actor, 'agility_modified', 25) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_enhanced_agility_2.py b/scripts/expertise/expertise_fs_general_enhanced_agility_2.py index e46bfcae..e9e90307 100644 --- a/scripts/expertise/expertise_fs_general_enhanced_agility_2.py +++ b/scripts/expertise/expertise_fs_general_enhanced_agility_2.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_enhanced_agility_2') - actor.addSkillMod('agility_modified', 25) + core.skillModService.addSkillMod(actor, 'agility_modified', 25) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_enhanced_agility_2') - actor.removeSkillMod('agility_modified', 25) + core.skillModService.deductSkillMod(actor, 'agility_modified', 25) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_enhanced_constitution_1.py b/scripts/expertise/expertise_fs_general_enhanced_constitution_1.py index e8de3227..9db9e638 100644 --- a/scripts/expertise/expertise_fs_general_enhanced_constitution_1.py +++ b/scripts/expertise/expertise_fs_general_enhanced_constitution_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_enhanced_constitution_1') - actor.addSkillMod('constitution_modified', 25) + core.skillModService.addSkillMod(actor, 'constitution_modified', 25) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_enhanced_constitution_1') - actor.removeSkillMod('constitution_modified', 25) + core.skillModService.deductSkillMod(actor, 'constitution_modified', 25) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_enhanced_constitution_2.py b/scripts/expertise/expertise_fs_general_enhanced_constitution_2.py index ffcee2f7..7dad3160 100644 --- a/scripts/expertise/expertise_fs_general_enhanced_constitution_2.py +++ b/scripts/expertise/expertise_fs_general_enhanced_constitution_2.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_enhanced_constitution_2') - actor.addSkillMod('constitution_modified', 25) + core.skillModService.addSkillMod(actor, 'constitution_modified', 25) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_enhanced_constitution_2') - actor.removeSkillMod('constitution_modified', 25) + core.skillModService.addSkillMod(actor, 'constitution_modified', 25) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_enhanced_stamina_1.py b/scripts/expertise/expertise_fs_general_enhanced_stamina_1.py index b55bec88..7c760888 100644 --- a/scripts/expertise/expertise_fs_general_enhanced_stamina_1.py +++ b/scripts/expertise/expertise_fs_general_enhanced_stamina_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_enhanced_stamina_1') - actor.addSkillMod('stamina_modified', 25) + core.skillModService.addSkillMod(actor, 'stamina_modified', 25) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_enhanced_stamina_1') - actor.removeSkillMod('stamina_modified', 25) + core.skillModService.deductSkillMod(actor, 'stamina_modified', 25) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_enhanced_stamina_2.py b/scripts/expertise/expertise_fs_general_enhanced_stamina_2.py index f98253d5..1dc31c3d 100644 --- a/scripts/expertise/expertise_fs_general_enhanced_stamina_2.py +++ b/scripts/expertise/expertise_fs_general_enhanced_stamina_2.py @@ -11,7 +11,8 @@ def addExpertisePoint(core, actor): return actor.addSkill('expertise_fs_general_enhanced_stamina_2') - actor.addSkillMod('stamina_modified', 25) + + core.skillModService.addSkillMod(actor, 'stamina_modified', 25) addAbilities(core, actor, player) @@ -29,8 +30,8 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_enhanced_stamina_2') - actor.removeSkillMod('stamina_modified', 25) - + core.skillModService.deductSkillMod(actor, 'stamina_modified', 25) + removeAbilities(core, actor, player) return diff --git a/scripts/expertise/expertise_fs_general_enhanced_strength_1.py b/scripts/expertise/expertise_fs_general_enhanced_strength_1.py index 7fd70eb8..e4419423 100644 --- a/scripts/expertise/expertise_fs_general_enhanced_strength_1.py +++ b/scripts/expertise/expertise_fs_general_enhanced_strength_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_enhanced_strength_1') - actor.addSkillMod('strength_modified', 25) + core.skillModService.addSkillMod(actor, 'strength_modified', 25) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_enhanced_strength_1') - actor.removeSkillMod('strength_modified', 25) + core.skillModService.deductSkillMod(actor, 'strength_modified', 25) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_enhanced_strength_2.py b/scripts/expertise/expertise_fs_general_enhanced_strength_2.py index 5609b700..b5193a5f 100644 --- a/scripts/expertise/expertise_fs_general_enhanced_strength_2.py +++ b/scripts/expertise/expertise_fs_general_enhanced_strength_2.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_enhanced_strength_2') - actor.addSkillMod('strength_modified', 25) + core.skillModService.addSkillMod(actor, 'strength_modified', 25) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_enhanced_strength_2') - actor.removeSkillMod('strength_modified', 25) + core.skillModService.deductSkillMod(actor, 'strength_modified', 25) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_fidelity_1.py b/scripts/expertise/expertise_fs_general_fidelity_1.py index e16b3a39..7e78aef6 100644 --- a/scripts/expertise/expertise_fs_general_fidelity_1.py +++ b/scripts/expertise/expertise_fs_general_fidelity_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_fidelity_1') - actor.addSkillMod('expertise_damage_melee', 4) + core.skillModService.addSkillMod(actor, 'expertise_damage_melee', 4) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_fidelity_1') - actor.removeSkillMod('expertise_damage_melee', 4) + core.skillModService.deductSkillMod(actor, 'expertise_damage_melee', 4) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_fidelity_2.py b/scripts/expertise/expertise_fs_general_fidelity_2.py index b529242d..db68b4f5 100644 --- a/scripts/expertise/expertise_fs_general_fidelity_2.py +++ b/scripts/expertise/expertise_fs_general_fidelity_2.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_fidelity_2') - actor.addSkillMod('expertise_damage_melee', 4) + core.skillModService.addSkillMod(actor, 'expertise_damage_melee', 4) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_fidelity_2') - actor.removeSkillMod('expertise_damage_melee', 4) + core.skillModService.deductSkillMod(actor, 'expertise_damage_melee', 4) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_incisiveness_1.py b/scripts/expertise/expertise_fs_general_incisiveness_1.py index 78afb069..9e171eca 100644 --- a/scripts/expertise/expertise_fs_general_incisiveness_1.py +++ b/scripts/expertise/expertise_fs_general_incisiveness_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_incisiveness_1') - actor.addSkillMod('expertise_critical_niche_all', 2) + core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_incisiveness_1') - actor.removeSkillMod('expertise_critical_niche_all', 2) + core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_incisiveness_2.py b/scripts/expertise/expertise_fs_general_incisiveness_2.py index 05f9afbf..97a54475 100644 --- a/scripts/expertise/expertise_fs_general_incisiveness_2.py +++ b/scripts/expertise/expertise_fs_general_incisiveness_2.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_incisiveness_2') - actor.addSkillMod('expertise_critical_niche_all', 3) + core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_incisiveness_2') - actor.removeSkillMod('expertise_critical_niche_all', 3) + core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_incisiveness_3.py b/scripts/expertise/expertise_fs_general_incisiveness_3.py index 8ee564ee..773b7bee 100644 --- a/scripts/expertise/expertise_fs_general_incisiveness_3.py +++ b/scripts/expertise/expertise_fs_general_incisiveness_3.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_incisiveness_3') - actor.addSkillMod('expertise_critical_niche_all', 3) + core.skillModService.addSkillMod(actor, 'expertise_critical_niche_all', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_incisiveness_3') - actor.removeSkillMod('expertise_critical_niche_all', 3) + core.skillModService.deductSkillMod(actor, 'expertise_critical_niche_all', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_premonition_1.py b/scripts/expertise/expertise_fs_general_premonition_1.py index 1d1ae63c..95553815 100644 --- a/scripts/expertise/expertise_fs_general_premonition_1.py +++ b/scripts/expertise/expertise_fs_general_premonition_1.py @@ -12,9 +12,9 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_premonition_1') - actor.addSkillMod('expertise_evasion_chance', 2) - actor.addSkillMod('expertise_evasion_value', 8) - + core.skillModService.addSkillMod(actor, 'expertise_evasion_chance', 2) + core.skillModService.addSkillMod(actor, 'expertise_evasion_value', 8) + addAbilities(core, actor, player) return @@ -31,8 +31,8 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_premonition_1') - actor.removeSkillMod('expertise_evasion_chance', 2) - actor.removeSkillMod('expertise_evasion_value', 8) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_chance', 2) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_value', 8) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_premonition_2.py b/scripts/expertise/expertise_fs_general_premonition_2.py index 28578c27..329f1496 100644 --- a/scripts/expertise/expertise_fs_general_premonition_2.py +++ b/scripts/expertise/expertise_fs_general_premonition_2.py @@ -12,8 +12,8 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_premonition_2') - actor.addSkillMod('expertise_evasion_chance', 2) - actor.addSkillMod('expertise_evasion_value', 8) + core.skillModService.addSkillMod(actor, 'expertise_evasion_chance', 2) + core.skillModService.addSkillMod(actor, 'expertise_evasion_value', 8) addAbilities(core, actor, player) @@ -31,8 +31,8 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_premonition_2') - actor.removeSkillMod('expertise_evasion_chance', 2) - actor.removeSkillMod('expertise_evasion_value', 8) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_chance', 2) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_value', 8) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_premonition_3.py b/scripts/expertise/expertise_fs_general_premonition_3.py index ac4aac07..7c1ae35e 100644 --- a/scripts/expertise/expertise_fs_general_premonition_3.py +++ b/scripts/expertise/expertise_fs_general_premonition_3.py @@ -12,8 +12,8 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_premonition_3') - actor.addSkillMod('expertise_evasion_chance', 2) - actor.addSkillMod('expertise_evasion_value', 8) + core.skillModService.addSkillMod(actor, 'expertise_evasion_chance', 2) + core.skillModService.addSkillMod(actor, 'expertise_evasion_value', 8) addAbilities(core, actor, player) @@ -31,8 +31,8 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_premonition_3') - actor.removeSkillMod('expertise_evasion_chance', 2) - actor.removeSkillMod('expertise_evasion_value', 8) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_chance', 2) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_value', 8) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_general_premonition_4.py b/scripts/expertise/expertise_fs_general_premonition_4.py index 21b22f54..ffc6fe53 100644 --- a/scripts/expertise/expertise_fs_general_premonition_4.py +++ b/scripts/expertise/expertise_fs_general_premonition_4.py @@ -12,8 +12,8 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_general_premonition_4') - actor.addSkillMod('expertise_evasion_chance', 2) - actor.addSkillMod('expertise_evasion_value', 8) + core.skillModService.addSkillMod(actor, 'expertise_evasion_chance', 2) + core.skillModService.addSkillMod(actor, 'expertise_evasion_value', 8) addAbilities(core, actor, player) @@ -31,8 +31,8 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_general_premonition_4') - actor.removeSkillMod('expertise_evasion_chance', 2) - actor.removeSkillMod('expertise_evasion_value', 8) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_chance', 2) + core.skillModService.deductSkillMod(actor, 'expertise_evasion_value', 8) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_brutality_1.py b/scripts/expertise/expertise_fs_path_brutality_1.py index 68602970..2bddedf4 100644 --- a/scripts/expertise/expertise_fs_path_brutality_1.py +++ b/scripts/expertise/expertise_fs_path_brutality_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_brutality_1') - actor.addSkillMod('expertise_focus_critical_buff_line', 1) + core.skillModService.addSkillMod(actor, 'expertise_focus_critical_buff_line', 1) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_brutality_1') - actor.removeSkillMod('expertise_focus_critical_buff_line', 1) + core.skillModService.deductSkillMod(actor, 'expertise_focus_critical_buff_line', 1) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_brutality_2.py b/scripts/expertise/expertise_fs_path_brutality_2.py index f93f423b..56aa4679 100644 --- a/scripts/expertise/expertise_fs_path_brutality_2.py +++ b/scripts/expertise/expertise_fs_path_brutality_2.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_brutality_2') - actor.addSkillMod('expertise_focus_critical_buff_line', 1) + core.skillModService.addSkillMod(actor, 'expertise_focus_critical_buff_line', 1) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_brutality_2') - actor.removeSkillMod('expertise_focus_critical_buff_line', 1) + core.skillModService.deductSkillMod(actor, 'expertise_focus_critical_buff_line', 1) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_brutality_3.py b/scripts/expertise/expertise_fs_path_brutality_3.py index 389093f0..ae385f2c 100644 --- a/scripts/expertise/expertise_fs_path_brutality_3.py +++ b/scripts/expertise/expertise_fs_path_brutality_3.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_brutality_3') - actor.addSkillMod('expertise_focus_critical_buff_line', 1) + core.skillModService.addSkillMod(actor, 'expertise_focus_critical_buff_line', 1) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_brutality_3') - actor.removeSkillMod('expertise_focus_critical_buff_line', 1) + core.skillModService.deductSkillMod(actor, 'expertise_focus_critical_buff_line', 1) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_brutality_4.py b/scripts/expertise/expertise_fs_path_brutality_4.py index 9e40e1e4..7170710f 100644 --- a/scripts/expertise/expertise_fs_path_brutality_4.py +++ b/scripts/expertise/expertise_fs_path_brutality_4.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_brutality_4') - actor.addSkillMod('expertise_focus_critical_buff_line', 1) + core.skillModService.addSkillMod(actor, 'expertise_focus_critical_buff_line', 1) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_brutality_4') - actor.removeSkillMod('expertise_focus_critical_buff_line', 1) + core.skillModService.deductSkillMod(actor, 'expertise_focus_critical_buff_line', 1) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_cautious_nature_1.py b/scripts/expertise/expertise_fs_path_cautious_nature_1.py index 006f4c2c..84c462c0 100644 --- a/scripts/expertise/expertise_fs_path_cautious_nature_1.py +++ b/scripts/expertise/expertise_fs_path_cautious_nature_1.py @@ -12,9 +12,9 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_cautious_nature_1') - actor.addSkillMod('expertise_stance_constitution', 10) - actor.addSkillMod('expertise_stance_parry', 1) - actor.addSkillMod('expertise_stance_evasion', 1) + core.skillModService.addSkillMod(actor, 'expertise_stance_constitution', 10) + core.skillModService.addSkillMod(actor, 'expertise_stance_parry', 1) + core.skillModService.addSkillMod(actor, 'expertise_stance_evasion', 1) addAbilities(core, actor, player) @@ -32,9 +32,9 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_cautious_nature_1') - actor.removeSkillMod('expertise_stance_constitution', 10) - actor.removeSkillMod('expertise_stance_parry', 1) - actor.removeSkillMod('expertise_stance_evasion', 1) + core.skillModService.deductSkillMod(actor, 'expertise_stance_constitution', 10) + core.skillModService.deductSkillMod(actor, 'expertise_stance_parry', 1) + core.skillModService.deductSkillMod(actor, 'expertise_stance_evasion', 1) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_cautious_nature_2.py b/scripts/expertise/expertise_fs_path_cautious_nature_2.py index e2abb040..42d67d98 100644 --- a/scripts/expertise/expertise_fs_path_cautious_nature_2.py +++ b/scripts/expertise/expertise_fs_path_cautious_nature_2.py @@ -12,9 +12,9 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_cautious_nature_2') - actor.addSkillMod('expertise_stance_constitution', 10) - actor.addSkillMod('expertise_stance_parry', 1) - actor.addSkillMod('expertise_stance_evasion', 1) + core.skillModService.addSkillMod(actor, 'expertise_stance_constitution', 10) + core.skillModService.addSkillMod(actor, 'expertise_stance_parry', 1) + core.skillModService.addSkillMod(actor, 'expertise_stance_evasion', 1) addAbilities(core, actor, player) @@ -32,9 +32,9 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_cautious_nature_2') - actor.removeSkillMod('expertise_stance_constitution', 10) - actor.removeSkillMod('expertise_stance_parry', 1) - actor.removeSkillMod('expertise_stance_evasion', 1) + core.skillModService.deductSkillMod(actor, 'expertise_stance_constitution', 10) + core.skillModService.deductSkillMod(actor, 'expertise_stance_parry', 1) + core.skillModService.deductSkillMod(actor, 'expertise_stance_evasion', 1) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_cautious_nature_3.py b/scripts/expertise/expertise_fs_path_cautious_nature_3.py index 7255557a..dfcc3c24 100644 --- a/scripts/expertise/expertise_fs_path_cautious_nature_3.py +++ b/scripts/expertise/expertise_fs_path_cautious_nature_3.py @@ -12,9 +12,9 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_cautious_nature_3') - actor.addSkillMod('expertise_stance_constitution', 10) - actor.addSkillMod('expertise_stance_parry', 1) - actor.addSkillMod('expertise_stance_evasion', 1) + core.skillModService.addSkillMod(actor, 'expertise_stance_constitution', 10) + core.skillModService.addSkillMod(actor, 'expertise_stance_parry', 1) + core.skillModService.addSkillMod(actor, 'expertise_stance_evasion', 1) addAbilities(core, actor, player) @@ -32,9 +32,9 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_cautious_nature_3') - actor.removeSkillMod('expertise_stance_constitution', 10) - actor.removeSkillMod('expertise_stance_parry', 1) - actor.removeSkillMod('expertise_stance_evasion', 1) + core.skillModService.deductSkillMod(actor, 'expertise_stance_constitution', 10) + core.skillModService.deductSkillMod(actor, 'expertise_stance_parry', 1) + core.skillModService.deductSkillMod(actor, 'expertise_stance_evasion', 1) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_cautious_nature_4.py b/scripts/expertise/expertise_fs_path_cautious_nature_4.py index 5c7b4e62..fa3a2980 100644 --- a/scripts/expertise/expertise_fs_path_cautious_nature_4.py +++ b/scripts/expertise/expertise_fs_path_cautious_nature_4.py @@ -12,9 +12,9 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_cautious_nature_4') - actor.addSkillMod('expertise_stance_constitution', 10) - actor.addSkillMod('expertise_stance_parry', 1) - actor.addSkillMod('expertise_stance_evasion', 1) + core.skillModService.addSkillMod(actor, 'expertise_stance_constitution', 10) + core.skillModService.addSkillMod(actor, 'expertise_stance_parry', 1) + core.skillModService.addSkillMod(actor, 'expertise_stance_evasion', 1) addAbilities(core, actor, player) @@ -32,9 +32,9 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_cautious_nature_4') - actor.removeSkillMod('expertise_stance_constitution', 10) - actor.removeSkillMod('expertise_stance_parry', 1) - actor.removeSkillMod('expertise_stance_evasion', 1) + core.skillModService.deductSkillMod(actor, 'expertise_stance_constitution', 10) + core.skillModService.deductSkillMod(actor, 'expertise_stance_parry', 1) + core.skillModService.deductSkillMod(actor, 'expertise_stance_evasion', 1) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_ruthless_precision_1.py b/scripts/expertise/expertise_fs_path_ruthless_precision_1.py index fc577d81..c90c209a 100644 --- a/scripts/expertise/expertise_fs_path_ruthless_precision_1.py +++ b/scripts/expertise/expertise_fs_path_ruthless_precision_1.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_ruthless_precision_1') - actor.addSkillMod('expertise_focus_damage_increase', 2) + core.skillModService.addSkillMod(actor, 'expertise_focus_damage_increase', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_ruthless_precision_1') - actor.removeSkillMod('expertise_focus_damage_increase', 2) + core.skillModService.deductSkillMod(actor, 'expertise_focus_damage_increase', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_ruthless_precision_2.py b/scripts/expertise/expertise_fs_path_ruthless_precision_2.py index 4275711a..87ad2d2d 100644 --- a/scripts/expertise/expertise_fs_path_ruthless_precision_2.py +++ b/scripts/expertise/expertise_fs_path_ruthless_precision_2.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_ruthless_precision_2') - actor.addSkillMod('expertise_focus_damage_increase', 2) + core.skillModService.addSkillMod(actor, 'expertise_focus_damage_increase', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_ruthless_precision_2') - actor.removeSkillMod('expertise_focus_damage_increase', 2) + core.skillModService.deductSkillMod(actor, 'expertise_focus_damage_increase', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_ruthless_precision_3.py b/scripts/expertise/expertise_fs_path_ruthless_precision_3.py index 0639dd2b..b802e602 100644 --- a/scripts/expertise/expertise_fs_path_ruthless_precision_3.py +++ b/scripts/expertise/expertise_fs_path_ruthless_precision_3.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_ruthless_precision_3') - actor.addSkillMod('expertise_focus_damage_increase', 2) + core.skillModService.addSkillMod(actor, 'expertise_focus_damage_increase', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_ruthless_precision_3') - actor.removeSkillMod('expertise_focus_damage_increase', 2) + core.skillModService.deductSkillMod(actor, 'expertise_focus_damage_increase', 2) removeAbilities(core, actor, player) diff --git a/scripts/expertise/expertise_fs_path_ruthless_precision_4.py b/scripts/expertise/expertise_fs_path_ruthless_precision_4.py index 7a46125c..f0f94fe5 100644 --- a/scripts/expertise/expertise_fs_path_ruthless_precision_4.py +++ b/scripts/expertise/expertise_fs_path_ruthless_precision_4.py @@ -12,7 +12,7 @@ def addExpertisePoint(core, actor): actor.addSkill('expertise_fs_path_ruthless_precision_4') - actor.addSkillMod('expertise_focus_damage_increase', 2) + core.skillModService.addSkillMod(actor, 'expertise_focus_damage_increase', 2) addAbilities(core, actor, player) @@ -30,7 +30,7 @@ def removeExpertisePoint(core, actor): actor.removeSkill('expertise_fs_path_ruthless_precision_4') - actor.removeSkillMod('expertise_focus_damage_increase', 2) + core.skillModService.deductSkillMod(actor, 'expertise_focus_damage_increase', 2) removeAbilities(core, actor, player) diff --git a/scripts/skillMods/expertise_critical_niche_all.py b/scripts/skillMods/expertise_critical_niche_all.py index ee7769e2..4f2871ac 100644 --- a/scripts/skillMods/expertise_critical_niche_all.py +++ b/scripts/skillMods/expertise_critical_niche_all.py @@ -2,9 +2,11 @@ import sys def add(core, actor, name, base): actor.addSkillMod(name, base) + core.skillModService.addSkillMod(actor, 'display_only_critical', 100 * (actor.getSkillModBase('expertise_critical_niche_all'))) return def deduct(core, actor, name, base): actor.deductSkillMod(name, base) + core.skillModService.deductSkillMod(actor, 'display_only_critical', 100 * (actor.getSkillModBase('expertise_critical_niche_all'))) return \ No newline at end of file diff --git a/scripts/skillMods/expertise_evasion_chance.py b/scripts/skillMods/expertise_evasion_chance.py new file mode 100644 index 00000000..44fc827c --- /dev/null +++ b/scripts/skillMods/expertise_evasion_chance.py @@ -0,0 +1,12 @@ +import sys + +def add(core, actor, name, base): + actor.addSkillMod(name, base) + core.skillModService.addSkillMod(actor, 'display_only_evasion', 100 * (actor.getSkillModBase('expertise_evasion_chance'))) + return + +def deduct(core, actor, name, base): + actor.deductSkillMod(name, base) + core.skillModService.deductSkillMod(actor, 'display_only_evasion', 100 * (actor.getSkillModBase('expertise_evasion_chance'))) + return + \ No newline at end of file diff --git a/scripts/skillMods/expertise_evasion_value.py b/scripts/skillMods/expertise_evasion_value.py index ee7769e2..fa2af1aa 100644 --- a/scripts/skillMods/expertise_evasion_value.py +++ b/scripts/skillMods/expertise_evasion_value.py @@ -2,9 +2,11 @@ import sys def add(core, actor, name, base): actor.addSkillMod(name, base) + core.skillModService.addSkillMod(actor, 'combat_evasion_value', (actor.getSkillModBase('expertise_evasion_value'))) return def deduct(core, actor, name, base): actor.deductSkillMod(name, base) + core.skillModService.deductSkillMod(actor, 'combat_evasion_value', (actor.getSkillModBase('expertise_evasion_value'))) return \ No newline at end of file diff --git a/scripts/skillMods/expertise_focus.py b/scripts/skillMods/expertise_focus.py new file mode 100644 index 00000000..0d10255e --- /dev/null +++ b/scripts/skillMods/expertise_focus.py @@ -0,0 +1,16 @@ +import sys + +def add(core, actor, name, base): + actor.addSkillMod(name, base) + core.skillModService.addSkillMod(actor, 'stamina_modified', (actor.getSkillModBase('expertise_stance_constitution'))) + core.skillModService.addSkillMod(actor, 'display_only_critical', 100 * (actor.getSkillModBase('expertise_focus_critical_buff_line'))) + core.skillModService.addSkillMod(actor, 'expertise_damage_melee', 1 * (actor.getSkillModBase('expertise_focus_damage_increase'))) + return + +def deduct(core, actor, name, base): + actor.deductSkillMod(name, base) + core.skillModService.deductSkillMod(actor, 'stamina_modified', (actor.getSkillModBase('expertise_stance_constitution'))) + core.skillModService.deductSkillMod(actor, 'display_only_critical', 100 * (actor.getSkillModBase('expertise_focus_critical_buff_line'))) + core.skillModService.deductSkillMod(actor, 'expertise_damage_melee', 1 * (actor.getSkillModBase('expertise_focus_damage_increase'))) + return + \ No newline at end of file diff --git a/scripts/skillMods/expertise_glancing_blow_all.py b/scripts/skillMods/expertise_glancing_blow_all.py index ee7769e2..3f89621b 100644 --- a/scripts/skillMods/expertise_glancing_blow_all.py +++ b/scripts/skillMods/expertise_glancing_blow_all.py @@ -2,9 +2,11 @@ import sys def add(core, actor, name, base): actor.addSkillMod(name, base) + core.skillModService.addSkillMod(actor, 'display_only_glancing_blow', 100 * (actor.getSkillModBase('expertise_glancing_blow_all'))) return def deduct(core, actor, name, base): actor.deductSkillMod(name, base) + core.skillModService.deductSkillMod(actor, 'display_only_glancing_blow', 100 * (actor.getSkillModBase('expertise_glancing_blow_all'))) return \ No newline at end of file diff --git a/scripts/skillMods/expertise_stance.py b/scripts/skillMods/expertise_stance.py index ee7769e2..9d6fa7c6 100644 --- a/scripts/skillMods/expertise_stance.py +++ b/scripts/skillMods/expertise_stance.py @@ -2,9 +2,17 @@ import sys def add(core, actor, name, base): actor.addSkillMod(name, base) + core.skillModService.addSkillMod(actor, 'constitution_modified', (actor.getSkillModBase('expertise_stance_constitution'))) + core.skillModService.addSkillMod(actor, 'display_only_parry', 100 * (actor.getSkillModBase('expertise_stance_parry'))) + core.skillModService.addSkillMod(actor, 'display_only_evasion', 100 *(actor.getSkillModBase('expertise_stance_evasion'))) + + return def deduct(core, actor, name, base): actor.deductSkillMod(name, base) + core.skillModService.deductSkillMod(actor, 'constitution_modified', (actor.getSkillModBase('expertise_stance_constitution'))) + core.skillModService.deductSkillMod(actor, 'display_only_parry', 100 * (actor.getSkillModBase('expertise_stance_parry'))) + core.skillModService.deductSkillMod(actor, 'display_only_evasion', 100 * (actor.getSkillModBase('expertise_stance_evasion'))) return \ No newline at end of file diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index b48ac433..b5863ba7 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -101,7 +101,7 @@ public class CreatureObject extends TangibleObject implements IPersistent { // CREO6 private byte combatFlag = 0; - private short level = 1; + private short level = 90; private int grantedHealth = 0; private String currentAnimation; private String moodAnimation; diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 3b5579ac..5d21e24f 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -566,6 +566,10 @@ public class CombatService implements INetworkDispatch { rawDamage *= (1 - (target.getSkillMod("combat_divide_damage_dealt").getBase() / 100)); } + if(attacker.getSkillMod("expertise_damage_melee") != null) { + rawDamage *= (1 + (attacker.getSkillMod("expertise_damage_melee").getBase() / 100)); + } + return rawDamage; }