diff --git a/ngengine_public.jar b/ngengine_public.jar index 8dbc2777..a78a6cba 100644 Binary files a/ngengine_public.jar and b/ngengine_public.jar differ diff --git a/scripts/buffs/set_bonus_bh_dps_1.py b/scripts/buffs/set_bonus_bh_dps_1.py deleted file mode 100644 index 6055bf9f..00000000 --- a/scripts/buffs/set_bonus_bh_dps_1.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_dm', 5) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_dm', 5) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_dps_2.py b/scripts/buffs/set_bonus_bh_dps_2.py deleted file mode 100644 index 5f0aa83c..00000000 --- a/scripts/buffs/set_bonus_bh_dps_2.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_dm', 5) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_bh_return_fire' , 5) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_dm', 5) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_bh_return_fire' , 5) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_dps_3.py b/scripts/buffs/set_bonus_bh_dps_3.py deleted file mode 100644 index 4d48df3e..00000000 --- a/scripts/buffs/set_bonus_bh_dps_3.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_dm', 10) - core.skillModService.addSkillMod(actor, 'expertise_action_line_dm_crit', 10) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_bh_return_fire' , 10) - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_dm' , 10) - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_bh_return_fire' , 750) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_dm', 10) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_dm_crit', 10) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_bh_return_fire' , 10) - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_dm' , 10) - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_bh_return_fire' , 750) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_a_1.py b/scripts/buffs/set_bonus_bh_utility_a_1.py deleted file mode 100644 index 3035fdd8..00000000 --- a/scripts/buffs/set_bonus_bh_utility_a_1.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 15) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 15) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_a_2.py b/scripts/buffs/set_bonus_bh_utility_a_2.py deleted file mode 100644 index 3035fdd8..00000000 --- a/scripts/buffs/set_bonus_bh_utility_a_2.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 15) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 15) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_a_3.py b/scripts/buffs/set_bonus_bh_utility_a_3.py deleted file mode 100644 index 6a3ed086..00000000 --- a/scripts/buffs/set_bonus_bh_utility_a_3.py +++ /dev/null @@ -1,13 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 30) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_bh_flawless_strike', 30) - return - \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_b_1.py b/scripts/buffs/set_bonus_bh_utility_b_1.py deleted file mode 100644 index 9115f6d4..00000000 --- a/scripts/buffs/set_bonus_bh_utility_b_1.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'fast_attack_line_dm_cc', 5) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'fast_attack_line_dm_cc', 5) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_b_2.py b/scripts/buffs/set_bonus_bh_utility_b_2.py deleted file mode 100644 index b641c6a6..00000000 --- a/scripts/buffs/set_bonus_bh_utility_b_2.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'fast_attack_line_dm_cc', 10) - core.skillModService.addSkillMod(actor, 'bh_dire_root', 20) - core.skillModService.addSkillMod(actor, 'bh_dire_snare', 20) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'fast_attack_line_dm_cc', 10) - core.skillModService.deductSkillMod(actor, 'bh_dire_root', 20) - core.skillModService.deductSkillMod(actor, 'bh_dire_snare', 20) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_bh_utility_b_3.py b/scripts/buffs/set_bonus_bh_utility_b_3.py deleted file mode 100644 index b4b4154f..00000000 --- a/scripts/buffs/set_bonus_bh_utility_b_3.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'fast_attack_line_dm_cc', 35) - core.skillModService.addSkillMod(actor, 'bh_dire_root', 45) - core.skillModService.addSkillMod(actor, 'bh_dire_snare', 45) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'fast_attack_line_dm_cc', 35) - core.skillModService.deductSkillMod(actor, 'bh_dire_root', 45) - core.skillModService.deductSkillMod(actor, 'bh_dire_snare', 45) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_hero_1.py b/scripts/buffs/set_bonus_hero_1.py deleted file mode 100644 index c589b0f4..00000000 --- a/scripts/buffs/set_bonus_hero_1.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'stamina_modified', 60) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'stamina_modified', 60) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_hero_2.py b/scripts/buffs/set_bonus_hero_2.py deleted file mode 100644 index 630b0e30..00000000 --- a/scripts/buffs/set_bonus_hero_2.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'stamina_modified', 90) - core.skillModService.addSkillMod(actor, 'agility_modified', 90) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'stamina_modified', 90) - core.skillModService.deductSkillMod(actor, 'agility_modified', 90) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_hero_3.py b/scripts/buffs/set_bonus_hero_3.py deleted file mode 100644 index d2755af3..00000000 --- a/scripts/buffs/set_bonus_hero_3.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'stamina_modified', 150) - core.skillModService.addSkillMod(actor, 'agility_modified', 150) - core.skillModService.addSkillMod(actor, 'constitution_modified', 150) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'stamina_modified', 150) - core.skillModService.deductSkillMod(actor, 'agility_modified', 150) - core.skillModService.deductSkillMod(actor, 'constitution_modified', 150) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_dps_1.py b/scripts/buffs/set_bonus_medic_dps_1.py deleted file mode 100644 index 178d4c76..00000000 --- a/scripts/buffs/set_bonus_medic_dps_1.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_dm', 5) - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_burst', 5) - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_smash', 5) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_dm', 5) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_burst', 5) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_smash', 5) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_dps_2.py b/scripts/buffs/set_bonus_medic_dps_2.py deleted file mode 100644 index 36833f96..00000000 --- a/scripts/buffs/set_bonus_medic_dps_2.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_dm', 10) - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_burst', 10) - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_smash', 10) - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_dm', 5) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_enhance', 900) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_dm', 10) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_burst', 10) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_smash', 10) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_dm', 5) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_enhance', 900) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_dps_3.py b/scripts/buffs/set_bonus_medic_dps_3.py deleted file mode 100644 index f9082b73..00000000 --- a/scripts/buffs/set_bonus_medic_dps_3.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_dm', 15) - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_burst', 20) - core.skillModService.addSkillMod(actor, 'expertise_action_line_me_smash', 20) - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_dm', 15) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_enhance', 1800) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_dm', 15) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_burst', 20) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_me_smash', 20) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_dm', 15) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_enhance', 1800) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_utility_a_1.py b/scripts/buffs/set_bonus_medic_utility_a_1.py deleted file mode 100644 index a04d1d33..00000000 --- a/scripts/buffs/set_bonus_medic_utility_a_1.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_heal', 5) - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_revive', 5) - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_evasion', 10) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_heal', 5) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_revive', 5) - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_evasion', 10) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_utility_a_2.py b/scripts/buffs/set_bonus_medic_utility_a_2.py deleted file mode 100644 index 3fd9f063..00000000 --- a/scripts/buffs/set_bonus_medic_utility_a_2.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_heal', 5) - core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_heal', 10) - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_revive', 10) - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_evasion', 20) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_heal', 5) - core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_heal', 10) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_revive', 10) - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_evasion', 20) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_utility_a_3.py b/scripts/buffs/set_bonus_medic_utility_a_3.py deleted file mode 100644 index 11bad3ba..00000000 --- a/scripts/buffs/set_bonus_medic_utility_a_3.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_heal', 10) - core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_heal', 15) - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_revive', 15) - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_evasion', 30) - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_stasis_self', 2) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_heal', 10) - core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_heal', 15) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_revive', 15) - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_evasion', 30) - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_stasis_self', 2) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_utility_b_1.py b/scripts/buffs/set_bonus_medic_utility_b_1.py deleted file mode 100644 index 1ec0be40..00000000 --- a/scripts/buffs/set_bonus_medic_utility_b_1.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_dot', 10) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 1) - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_debuff', 5) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_dot', 10) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 1) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_debuff', 5) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_utility_b_2.py b/scripts/buffs/set_bonus_medic_utility_b_2.py deleted file mode 100644 index b6d95b63..00000000 --- a/scripts/buffs/set_bonus_medic_utility_b_2.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_dot', 20) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 3) - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_debuff', 10) - core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_debuff', 10) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_dot', 20) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 3) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_debuff', 10) - core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_debuff', 10) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_medic_utility_b_3.py b/scripts/buffs/set_bonus_medic_utility_b_3.py deleted file mode 100644 index 4a5af114..00000000 --- a/scripts/buffs/set_bonus_medic_utility_b_3.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_me_dot', 30) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 5) - core.skillModService.addSkillMod(actor, 'fast_attack_line_me_debuff', 15) - core.skillModService.addSkillMod(actor, 'expertise_freeshot_me_debuff', 15) - core.skillModService.addSkillMod(actor, 'me_doom_chance', 20) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_me_dot', 30) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_me_debuff', 5) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_me_debuff', 15) - core.skillModService.deductSkillMod(actor, 'expertise_freeshot_me_debuff', 15) - core.skillModService.deductSkillMod(actor, 'me_doom_chance', 20) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_dps_1.py b/scripts/buffs/set_bonus_spy_dps_1.py deleted file mode 100644 index a375544a..00000000 --- a/scripts/buffs/set_bonus_spy_dps_1.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dm', 10) - core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_dm', 5) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dm', 10) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_dm', 5) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_dps_2.py b/scripts/buffs/set_bonus_spy_dps_2.py deleted file mode 100644 index 25132b6d..00000000 --- a/scripts/buffs/set_bonus_spy_dps_2.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dm', 15) - core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_dm', 10) - core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dot', 15) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dm', 15) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_dm', 10) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dot', 15) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_dps_3.py b/scripts/buffs/set_bonus_spy_dps_3.py deleted file mode 100644 index 9fdedc7e..00000000 --- a/scripts/buffs/set_bonus_spy_dps_3.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dm', 20) - core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_dm', 15) - core.skillModService.addSkillMod(actor, 'expertise_freeshot_sp_dm', 20) - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_sp_dm', 20) - core.skillModService.addSkillMod(actor, 'expertise_action_line_sp_dot', 25) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dm', 20) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_dm', 15) - core.skillModService.deductSkillMod(actor, 'expertise_freeshot_sp_dm', 20) - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_sp_dm', 20) - core.skillModService.deductSkillMod(actor, 'expertise_action_line_sp_dot', 25) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_utility_a_1.py b/scripts/buffs/set_bonus_spy_utility_a_1.py deleted file mode 100644 index dab7ff64..00000000 --- a/scripts/buffs/set_bonus_spy_utility_a_1.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 20) - core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_smoke', 5) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 20) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_smoke', 5) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_utility_a_2.py b/scripts/buffs/set_bonus_spy_utility_a_2.py deleted file mode 100644 index a1892f96..00000000 --- a/scripts/buffs/set_bonus_spy_utility_a_2.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 40) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_sp_preparation', 5) - core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_smoke', 15) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 40) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_sp_preparation', 5) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_smoke', 15) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_utility_a_3.py b/scripts/buffs/set_bonus_spy_utility_a_3.py deleted file mode 100644 index 22e3a920..00000000 --- a/scripts/buffs/set_bonus_spy_utility_a_3.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 60) - core.skillModService.addSkillMod(actor, 'expertise_buff_duration_line_sp_preparation', 10) - core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_smoke', 20) - core.skillModService.addSkillMod(actor, 'fast_attack_line_sp_perfect', 15) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_cooldown_line_sp_preparation', 60) - core.skillModService.deductSkillMod(actor, 'expertise_buff_duration_line_sp_preparation', 10) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_smoke', 20) - core.skillModService.deductSkillMod(actor, 'fast_attack_line_sp_perfect', 15) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_utility_b_1.py b/scripts/buffs/set_bonus_spy_utility_b_1.py deleted file mode 100644 index 74851b44..00000000 --- a/scripts/buffs/set_bonus_spy_utility_b_1.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 1) - core.skillModService.addSkillMod(actor, 'expertise_action_all', 5) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 1) - core.skillModService.deductSkillMod(actor, 'expertise_action_all', 5) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_utility_b_2.py b/scripts/buffs/set_bonus_spy_utility_b_2.py deleted file mode 100644 index c2f90380..00000000 --- a/scripts/buffs/set_bonus_spy_utility_b_2.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 2) - core.skillModService.addSkillMod(actor, 'expertise_action_all', 10) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 2) - core.skillModService.deductSkillMod(actor, 'expertise_action_all', 10) - return \ No newline at end of file diff --git a/scripts/buffs/set_bonus_spy_utility_b_3.py b/scripts/buffs/set_bonus_spy_utility_b_3.py deleted file mode 100644 index 41d58c47..00000000 --- a/scripts/buffs/set_bonus_spy_utility_b_3.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -def setup(core, actor, buff): - return - -def add(core, actor, buff): - core.skillModService.addSkillMod(actor, 'expertise_strikethrough_chance', 3) - core.skillModService.addSkillMod(actor, 'expertise_action_all', 15) - core.skillModService.addSkillMod(actor, 'expertise_avoidance_overpower', 5) - core.skillModService.addSkillMod(actor, 'movement_resist_snare', 100) - core.skillModService.addSkillMod(actor, 'movement_resist_root', 100) - return - -def remove(core, actor, buff): - core.skillModService.deductSkillMod(actor, 'expertise_strikethrough_chance', 3) - core.skillModService.deductSkillMod(actor, 'expertise_action_all', 15) - core.skillModService.deductSkillMod(actor, 'expertise_avoidance_overpower', 5) - core.skillModService.deductSkillMod(actor, 'movement_resist_snare', 100) - core.skillModService.deductSkillMod(actor, 'movement_resist_root', 100) - return \ No newline at end of file diff --git a/scripts/buffs/sp_burst_shadows_py b/scripts/buffs/sp_burst_shadows.py similarity index 100% rename from scripts/buffs/sp_burst_shadows_py rename to scripts/buffs/sp_burst_shadows.py diff --git a/scripts/commands/spatialchatinternal.py b/scripts/commands/spatialchatinternal.py index 451f6318..3a588dac 100644 --- a/scripts/commands/spatialchatinternal.py +++ b/scripts/commands/spatialchatinternal.py @@ -9,6 +9,7 @@ def run(core, actor, target, commandString): chatMsg = parsedMsg[5] chatType = int(parsedMsg[1]) moodId = int(parsedMsg[2]) - chatService.handleSpatialChat(actor, target, chatMsg, chatType, moodId) + languageId = int(parsedMsg[4]) + chatService.spatialChat(actor, target, chatMsg, chatType, moodId, languageId, None) return \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_co_dps.py b/scripts/equipment/bonus_sets/set_bonus_co_dps.py new file mode 100644 index 00000000..50588030 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_co_dps.py @@ -0,0 +1,28 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_co_dps") + + bonusSet.addRequiredItem("item_band_set_co_dps_01_01") + bonusSet.addRequiredItem("item_ring_set_co_dps_01_01") + bonusSet.addRequiredItem("item_necklace_set_co_dps_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_co_dps_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_co_dps_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_co_dps_1", creature) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_co_dps_2", creature) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_co_dps_3", creature) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_dps_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_dps_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_dps_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_co_utility_a.py b/scripts/equipment/bonus_sets/set_bonus_co_utility_a.py new file mode 100644 index 00000000..28d058d1 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_co_utility_a.py @@ -0,0 +1,28 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_co_utility_a") + + bonusSet.addRequiredItem("item_band_set_co_utility_a_01_01") + bonusSet.addRequiredItem("item_ring_set_co_utility_a_01_01") + bonusSet.addRequiredItem("item_necklace_set_co_utility_a_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_co_utility_a_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_co_utility_a_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_co_utility_a_1", creature) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_co_utility_a_2", creature) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_co_utility_a_3", creature) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_utility_a_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_utility_a_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_utility_a_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_co_utility_b.py b/scripts/equipment/bonus_sets/set_bonus_co_utility_b.py new file mode 100644 index 00000000..cfd278af --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_co_utility_b.py @@ -0,0 +1,31 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_co_utility_b") + + bonusSet.addRequiredItem("item_band_set_co_utility_b_01_01") + bonusSet.addRequiredItem("item_ring_set_co_utility_b_01_01") + bonusSet.addRequiredItem("item_necklace_set_co_utility_b_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_co_utility_b_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_co_utility_b_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_co_utility_b_1", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_co_utility_b_1_sys', 0) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_co_utility_b_2", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_co_utility_b_2_sys', 0) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_co_utility_b_3", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_co_utility_b_3_sys', 0) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_utility_b_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_utility_b_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_co_utility_b_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_jedi_dps.py b/scripts/equipment/bonus_sets/set_bonus_jedi_dps.py new file mode 100644 index 00000000..3a08c9e9 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_jedi_dps.py @@ -0,0 +1,28 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_jedi_dps") + + bonusSet.addRequiredItem("item_band_set_jedi_dps_01_01") + bonusSet.addRequiredItem("item_ring_set_jedi_dps_01_01") + bonusSet.addRequiredItem("item_necklace_set_jedi_dps_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_jedi_dps_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_jedi_dps_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_dps_1", creature) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_dps_2", creature) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_dps_3", creature) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_dps_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_dps_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_dps_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_jedi_utility_a.py b/scripts/equipment/bonus_sets/set_bonus_jedi_utility_a.py new file mode 100644 index 00000000..52ebf5ce --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_jedi_utility_a.py @@ -0,0 +1,28 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_jedi_utility_a") + + bonusSet.addRequiredItem("item_band_set_jedi_utility_a_01_01") + bonusSet.addRequiredItem("item_ring_set_jedi_utility_a_01_01") + bonusSet.addRequiredItem("item_necklace_set_jedi_utility_a_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_jedi_utility_a_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_jedi_utility_a_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_utility_a_1", creature) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_utility_a_2", creature) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_utility_a_3", creature) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_utility_a_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_utility_a_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_utility_a_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_jedi_utility_b.py b/scripts/equipment/bonus_sets/set_bonus_jedi_utility_b.py new file mode 100644 index 00000000..c05cdde0 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_jedi_utility_b.py @@ -0,0 +1,31 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_jedi_utility_b") + + bonusSet.addRequiredItem("item_band_set_jedi_utility_b_01_01") + bonusSet.addRequiredItem("item_ring_set_jedi_utility_b_01_01") + bonusSet.addRequiredItem("item_necklace_set_jedi_utility_b_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_jedi_utility_b_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_jedi_utility_b_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_utility_b_1", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_jedi_utility_b_1_sys', 0) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_utility_b_2", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_jedi_utility_b_2_sys', 0) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_jedi_utility_b_3", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_jedi_utility_b_3_sys', 0) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_utility_b_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_utility_b_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_utility_b_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_medic_utility_b.py b/scripts/equipment/bonus_sets/set_bonus_medic_utility_b.py index cc02a043..ced4b40f 100644 --- a/scripts/equipment/bonus_sets/set_bonus_medic_utility_b.py +++ b/scripts/equipment/bonus_sets/set_bonus_medic_utility_b.py @@ -1,3 +1,4 @@ + import sys from services.equipment import BonusSetTemplate from java.util import Vector diff --git a/scripts/equipment/bonus_sets/set_bonus_officer_dps.py b/scripts/equipment/bonus_sets/set_bonus_officer_dps.py new file mode 100644 index 00000000..26d8f62a --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_officer_dps.py @@ -0,0 +1,28 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_officer_dps") + + bonusSet.addRequiredItem("item_band_set_officer_dps_01_01") + bonusSet.addRequiredItem("item_ring_set_officer_dps_01_01") + bonusSet.addRequiredItem("item_necklace_set_officer_dps_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_officer_dps_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_officer_dps_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_dps_1", creature) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_dps_2", creature) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_dps_3", creature) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_dps_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_dps_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_dps_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_officer_utility_a.py b/scripts/equipment/bonus_sets/set_bonus_officer_utility_a.py new file mode 100644 index 00000000..7e9a33d7 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_officer_utility_a.py @@ -0,0 +1,28 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_officer_utility_a") + + bonusSet.addRequiredItem("item_band_set_officer_utility_a_01_01") + bonusSet.addRequiredItem("item_ring_set_officer_utility_a_01_01") + bonusSet.addRequiredItem("item_necklace_set_officer_utility_a_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_officer_utility_a_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_officer_utility_a_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_utility_a_1", creature) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_utility_a_2", creature) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_utility_a_3", creature) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_utility_a_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_utility_a_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_utility_a_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_officer_utility_b.py b/scripts/equipment/bonus_sets/set_bonus_officer_utility_b.py new file mode 100644 index 00000000..f5308740 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_officer_utility_b.py @@ -0,0 +1,31 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_officer_utility_b") + + bonusSet.addRequiredItem("item_band_set_officer_utility_b_01_01") + bonusSet.addRequiredItem("item_ring_set_officer_utility_b_01_01") + bonusSet.addRequiredItem("item_necklace_set_officer_utility_b_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_officer_utility_b_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_officer_utility_b_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_utility_b_1", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_officer_utility_b_1_sys', 0) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_utility_b_2", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_officer_utility_b_2_sys', 0) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_officer_utility_b_3", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_officer_utility_b_3_sys', 0) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_utility_b_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_utility_b_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_officer_utility_b_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_smuggler_dps.py b/scripts/equipment/bonus_sets/set_bonus_smuggler_dps.py new file mode 100644 index 00000000..99ac8ecf --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_smuggler_dps.py @@ -0,0 +1,28 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_smuggler_dps") + + bonusSet.addRequiredItem("item_band_set_smuggler_dps_01_01") + bonusSet.addRequiredItem("item_ring_set_smuggler_dps_01_01") + bonusSet.addRequiredItem("item_necklace_set_smuggler_dps_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_smuggler_dps_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_smuggler_dps_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_dps_1", creature) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_dps_2", creature) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_dps_3", creature) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_dps_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_dps_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_dps_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_smuggler_utility_a.py b/scripts/equipment/bonus_sets/set_bonus_smuggler_utility_a.py new file mode 100644 index 00000000..9b3d928f --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_smuggler_utility_a.py @@ -0,0 +1,28 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_smuggler_utility_a") + + bonusSet.addRequiredItem("item_band_set_smuggler_utility_a_01_01") + bonusSet.addRequiredItem("item_ring_set_smuggler_utility_a_01_01") + bonusSet.addRequiredItem("item_necklace_set_smuggler_utility_a_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_smuggler_utility_a_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_smuggler_utility_a_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_utility_a_1", creature) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_utility_a_2", creature) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_utility_a_3", creature) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_utility_a_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_utility_a_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_utility_a_3") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_smuggler_utility_b.py b/scripts/equipment/bonus_sets/set_bonus_smuggler_utility_b.py new file mode 100644 index 00000000..58a33c69 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_smuggler_utility_b.py @@ -0,0 +1,31 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_smuggler_utility_b") + + bonusSet.addRequiredItem("item_band_set_smuggler_utility_b_01_01") + bonusSet.addRequiredItem("item_ring_set_smuggler_utility_b_01_01") + bonusSet.addRequiredItem("item_necklace_set_smuggler_utility_b_01_01") + bonusSet.addRequiredItem("item_bracelet_r_set_smuggler_utility_b_01_01") + bonusSet.addRequiredItem("item_bracelet_l_set_smuggler_utility_b_01_01") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_utility_b_1", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_smuggler_utility_b_1_sys', 0) + elif wornItems == 4: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_utility_b_2", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_smuggler_utility_b_2_sys', 0) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_smuggler_utility_b_3", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_smuggler_utility_b_3_sys', 0) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_utility_b_1") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_utility_b_2") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_smuggler_utility_b_3") \ No newline at end of file diff --git a/scripts/houses/player_cityhall_corellia_style_01.py b/scripts/houses/player_cityhall_corellia_style_01.py new file mode 100644 index 00000000..7b9e070b --- /dev/null +++ b/scripts/houses/player_cityhall_corellia_style_01.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff", "object/building/player/city/shared_cityhall_corellia.iff", 0) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(400) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_cityhall_naboo_style_01.py b/scripts/houses/player_cityhall_naboo_style_01.py new file mode 100644 index 00000000..0e9a8335 --- /dev/null +++ b/scripts/houses/player_cityhall_naboo_style_01.py @@ -0,0 +1,15 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_naboo_deed.iff", "object/building/player/city/shared_cityhall_naboo.iff", 0) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(400) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_cityhall_tatooine_style_01.py b/scripts/houses/player_cityhall_tatooine_style_01.py new file mode 100644 index 00000000..14062dcd --- /dev/null +++ b/scripts/houses/player_cityhall_tatooine_style_01.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): +<<<<<<< HEAD + houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff", "object/building/player/city/shared_cityhall_tatooine.iff", 5) +======= + houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff", "object/building/player/city/shared_cityhall_tatooine.iff", 0) +>>>>>>> upstream/master + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(400) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_guildhall_corellia_style_01.py b/scripts/houses/player_guildhall_corellia_style_01.py new file mode 100644 index 00000000..10d1f5b0 --- /dev/null +++ b/scripts/houses/player_guildhall_corellia_style_01.py @@ -0,0 +1,18 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_corellia_guild_deed.iff", "object/building/player/shared_player_guildhall_corellia_style_01.iff", 5) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(400) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_guildhall_generic_style_01.py b/scripts/houses/player_guildhall_generic_style_01.py new file mode 100644 index 00000000..1c06433a --- /dev/null +++ b/scripts/houses/player_guildhall_generic_style_01.py @@ -0,0 +1,23 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_generic_guild_deed.iff", "object/building/player/shared_player_guildhall_generic_style_01.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(400) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_guildhall_naboo_style_01.py b/scripts/houses/player_guildhall_naboo_style_01.py new file mode 100644 index 00000000..56dfaa08 --- /dev/null +++ b/scripts/houses/player_guildhall_naboo_style_01.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_naboo_guild_deed.iff", "object/building/player/shared_player_guildhall_naboo_style_01.iff", 5) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.setDefaultItemLimit(400) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_guildhall_tatooine_style_01.py b/scripts/houses/player_guildhall_tatooine_style_01.py new file mode 100644 index 00000000..3acfc845 --- /dev/null +++ b/scripts/houses/player_guildhall_tatooine_style_01.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_tatooine_guild_deed.iff", "object/building/player/shared_player_guildhall_tatooine_style_01.iff", 5) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(400) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_guildhall_tatooine_style_02.py b/scripts/houses/player_guildhall_tatooine_style_02.py new file mode 100644 index 00000000..b3ab5a2a --- /dev/null +++ b/scripts/houses/player_guildhall_tatooine_style_02.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_tatooine_guild_style_02_deed.iff", "object/building/player/shared_player_guildhall_tatooine_style_02.iff", 5) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(4), float(12.7))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(400) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_large_style_01.py b/scripts/houses/player_house_corellia_large_style_01.py new file mode 100644 index 00000000..5994a5de --- /dev/null +++ b/scripts/houses/player_house_corellia_large_style_01.py @@ -0,0 +1,18 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_large_deed.iff", "object/building/player/shared_player_house_corellia_large_style_01.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_large_style_02.py b/scripts/houses/player_house_corellia_large_style_02.py new file mode 100644 index 00000000..6684c97d --- /dev/null +++ b/scripts/houses/player_house_corellia_large_style_02.py @@ -0,0 +1,18 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_medium_style_01.py b/scripts/houses/player_house_corellia_medium_style_01.py new file mode 100644 index 00000000..dbf62efd --- /dev/null +++ b/scripts/houses/player_house_corellia_medium_style_01.py @@ -0,0 +1,17 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_medium_deed.iff", "object/building/player/shared_player_house_corellia_medium_style_01.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addPlaceablePlanet("corellia") +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3),float(2.26),float(7.7))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_medium_style_02.py b/scripts/houses/player_house_corellia_medium_style_02.py new file mode 100644 index 00000000..1141d775 --- /dev/null +++ b/scripts/houses/player_house_corellia_medium_style_02.py @@ -0,0 +1,17 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_medium_style_02_deed.iff", "object/building/player/shared_player_house_corellia_medium_style_02.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3), float(2.26), float(7.7))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_small_style_01.py b/scripts/houses/player_house_corellia_small_style_01.py new file mode 100644 index 00000000..acae7c15 --- /dev/null +++ b/scripts/houses/player_house_corellia_small_style_01.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_deed.iff", "object/building/player/shared_player_house_corellia_small_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2))) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_small_style_01_floorplan_02.py b/scripts/houses/player_house_corellia_small_style_01_floorplan_02.py new file mode 100644 index 00000000..5781e8eb --- /dev/null +++ b/scripts/houses/player_house_corellia_small_style_01_floorplan_02.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_floor_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_01_floorplan_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2))) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_small_style_02.py b/scripts/houses/player_house_corellia_small_style_02.py new file mode 100644 index 00000000..1e55a1ed --- /dev/null +++ b/scripts/houses/player_house_corellia_small_style_02.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35))) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_small_style_02_floorplan_02.py b/scripts/houses/player_house_corellia_small_style_02_floorplan_02.py new file mode 100644 index 00000000..6e7feff8 --- /dev/null +++ b/scripts/houses/player_house_corellia_small_style_02_floorplan_02.py @@ -0,0 +1,14 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_floor_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_02_floorplan_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35))) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_large_style_01.py b/scripts/houses/player_house_generic_large_style_01.py new file mode 100644 index 00000000..da0eb4bc --- /dev/null +++ b/scripts/houses/player_house_generic_large_style_01.py @@ -0,0 +1,23 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_large_style_02.py b/scripts/houses/player_house_generic_large_style_02.py new file mode 100644 index 00000000..8ec1f3fa --- /dev/null +++ b/scripts/houses/player_house_generic_large_style_02.py @@ -0,0 +1,23 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_deed.iff", "object/building/player/shared_player_house_generic_large_style_01.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_large_window_s01.py b/scripts/houses/player_house_generic_large_window_s01.py new file mode 100644 index 00000000..39120d60 --- /dev/null +++ b/scripts/houses/player_house_generic_large_window_s01.py @@ -0,0 +1,23 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_window_s01_deed.iff", "object/building/player/shared_player_house_generic_large_window_s01.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.7), float(3), float(9.1))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_large_window_s02.py b/scripts/houses/player_house_generic_large_window_s02.py new file mode 100644 index 00000000..f2d2c26c --- /dev/null +++ b/scripts/houses/player_house_generic_large_window_s02.py @@ -0,0 +1,23 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_window_s02_deed.iff", "object/building/player/shared_player_house_generic_large_window_s02.iff", 2) + +<<<<<<< HEAD + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) +======= + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(10.4), float(3), float(-11))) +>>>>>>> upstream/master + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_medium_style_01.py b/scripts/houses/player_house_generic_medium_style_01.py new file mode 100644 index 00000000..e8473868 --- /dev/null +++ b/scripts/houses/player_house_generic_medium_style_01.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_deed.iff", "object/building/player/shared_player_house_generic_medium_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3),float(2.26),float(7.7))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_medium_style_02.py b/scripts/houses/player_house_generic_medium_style_02.py new file mode 100644 index 00000000..7bd2db7b --- /dev/null +++ b/scripts/houses/player_house_generic_medium_style_02.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_style_02_deed.iff", "object/building/player/shared_player_house_generic_medium_style_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3), float(2.26), float(7.7))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_medium_windowed.py b/scripts/houses/player_house_generic_medium_windowed.py new file mode 100644 index 00000000..e10c4b17 --- /dev/null +++ b/scripts/houses/player_house_generic_medium_windowed.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_deed.iff", "object/building/player/shared_player_house_generic_medium_windowed.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(2.26), float(7.8))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_medium_windowed_s02.py b/scripts/houses/player_house_generic_medium_windowed_s02.py new file mode 100644 index 00000000..9c69e156 --- /dev/null +++ b/scripts/houses/player_house_generic_medium_windowed_s02.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_s02_deed.iff", "object/building/player/shared_player_house_generic_medium_windowed_s02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(2.26), float(7.8))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_small_style_01.py b/scripts/houses/player_house_generic_small_style_01.py index 3b1f0a4c..778d50da 100644 --- a/scripts/houses/player_house_generic_small_style_01.py +++ b/scripts/houses/player_house_generic_small_style_01.py @@ -5,7 +5,7 @@ from engine.resources.scene import Point3D def setup(core): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff", "object/building/player/shared_player_house_generic_small_style_01.iff", 2) - houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2))) houseTemplate.addPlaceablePlanet("tatooine") houseTemplate.addPlaceablePlanet("corellia") houseTemplate.addPlaceablePlanet("naboo") diff --git a/scripts/houses/player_house_generic_small_style_01_floorplan_02.py b/scripts/houses/player_house_generic_small_style_01_floorplan_02.py new file mode 100644 index 00000000..e20ec536 --- /dev/null +++ b/scripts/houses/player_house_generic_small_style_01_floorplan_02.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_floor_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_01_floorplan_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_small_style_02.py b/scripts/houses/player_house_generic_small_style_02.py index 4df4319c..87121425 100644 --- a/scripts/houses/player_house_generic_small_style_02.py +++ b/scripts/houses/player_house_generic_small_style_02.py @@ -5,7 +5,7 @@ from engine.resources.scene import Point3D def setup(core): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_02.iff", 2) - houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35))) houseTemplate.addPlaceablePlanet("tatooine") houseTemplate.addPlaceablePlanet("corellia") houseTemplate.addPlaceablePlanet("naboo") diff --git a/scripts/houses/player_house_generic_small_style_02_floorplan_02.py b/scripts/houses/player_house_generic_small_style_02_floorplan_02.py new file mode 100644 index 00000000..72ef35ac --- /dev/null +++ b/scripts/houses/player_house_generic_small_style_02_floorplan_02.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_floor_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_02_floorplan_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_small_window_style_03.py b/scripts/houses/player_house_generic_small_window_style_03.py new file mode 100644 index 00000000..260c2476 --- /dev/null +++ b/scripts/houses/player_house_generic_small_window_style_03.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_window_style_03_deed.iff", "object/building/player/shared_player_house_generic_small_window_style_03.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-6.6), float(2.36), float(6.3))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_small_windowed.py b/scripts/houses/player_house_generic_small_windowed.py new file mode 100644 index 00000000..4f2293ab --- /dev/null +++ b/scripts/houses/player_house_generic_small_windowed.py @@ -0,0 +1,19 @@ +import sys +from services.housing import HouseTemplate +from engine.resources.scene import Point3D + +def setup(core): + houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_window_deed.iff", "object/building/player/shared_player_house_generic_small_windowed.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2))) + houseTemplate.addPlaceablePlanet("tatooine") + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("naboo") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.addPlaceablePlanet("rori") + houseTemplate.addPlaceablePlanet("dantooine") + houseTemplate.addPlaceablePlanet("lok") + houseTemplate.setDefaultItemLimit(200) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/corellia/durni.py b/scripts/mobiles/corellia/durni.py new file mode 100644 index 00000000..a0dcfeed --- /dev/null +++ b/scripts/mobiles/corellia/durni.py @@ -0,0 +1,16 @@ +import sys +from services.spawn import MobileTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + templates = Vector() + templates.add('object/mobile/shared_durni.iff') + mobileTemplate.setCreatureName('durni') + mobileTemplate.setTemplates(templates) + mobileTemplate.setLevel(4) + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + core.spawnService.addMobileTemplate('durni', mobileTemplate) + \ No newline at end of file diff --git a/scripts/mobiles/naboo/fambaa.py b/scripts/mobiles/naboo/fambaa.py new file mode 100644 index 00000000..63011f10 --- /dev/null +++ b/scripts/mobiles/naboo/fambaa.py @@ -0,0 +1,16 @@ +import sys +from services.spawn import MobileTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + templates = Vector() + templates.add('object/mobile/shared_fambaa.iff') + mobileTemplate.setCreatureName('fambaa') + mobileTemplate.setTemplates(templates) + mobileTemplate.setLevel(23) + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + core.spawnService.addMobileTemplate('fambaa', mobileTemplate) + \ No newline at end of file diff --git a/scripts/mobiles/naboo/kaadu.py b/scripts/mobiles/naboo/kaadu.py new file mode 100644 index 00000000..d4e27c91 --- /dev/null +++ b/scripts/mobiles/naboo/kaadu.py @@ -0,0 +1,15 @@ +import sys +from services.spawn import MobileTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + templates = Vector() + templates.add('object/mobile/shared_kaadu_hue.iff') + mobileTemplate.setCreatureName('kaadu') + mobileTemplate.setTemplates(templates) + mobileTemplate.setLevel(14) + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + core.spawnService.addMobileTemplate('kaadu', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/tatooine/bantha.py b/scripts/mobiles/tatooine/bantha.py new file mode 100644 index 00000000..4d5ee1e7 --- /dev/null +++ b/scripts/mobiles/tatooine/bantha.py @@ -0,0 +1,15 @@ +import sys +from services.spawn import MobileTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + templates = Vector() + templates.add('object/mobile/shared_bantha_hue.iff') + mobileTemplate.setCreatureName('bantha') + mobileTemplate.setTemplates(templates) + mobileTemplate.setLevel(14) + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + core.spawnService.addMobileTemplate('bantha', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/tatooine/dewback.py b/scripts/mobiles/tatooine/dewback.py new file mode 100644 index 00000000..f2c2bb79 --- /dev/null +++ b/scripts/mobiles/tatooine/dewback.py @@ -0,0 +1,16 @@ +import sys +from services.spawn import MobileTemplate +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + templates = Vector() + templates.add('object/mobile/shared_dewback.iff') + mobileTemplate.setCreatureName('dewback') + mobileTemplate.setTemplates(templates) + mobileTemplate.setLevel(17) + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + core.spawnService.addMobileTemplate('dewback', mobileTemplate) + \ No newline at end of file diff --git a/scripts/mobiles/tatooine/kreetle.py b/scripts/mobiles/tatooine/kreetle.py index ec037bd4..376add57 100644 --- a/scripts/mobiles/tatooine/kreetle.py +++ b/scripts/mobiles/tatooine/kreetle.py @@ -8,6 +8,8 @@ def addTemplate(core): templates.add('object/mobile/shared_kreetle.iff') mobileTemplate.setCreatureName('kreetle') mobileTemplate.setTemplates(templates) + mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackSpeed(5) mobileTemplate.setLevel(5) attacks = Vector() mobileTemplate.setDefaultAttack('creatureMeleeAttack') diff --git a/scripts/mobiles/tatooine/womprat.py b/scripts/mobiles/tatooine/womprat.py index 836d9922..3cca26c1 100644 --- a/scripts/mobiles/tatooine/womprat.py +++ b/scripts/mobiles/tatooine/womprat.py @@ -8,6 +8,8 @@ def addTemplate(core): templates.add('object/mobile/shared_womp_rat.iff') mobileTemplate.setCreatureName('womprat') mobileTemplate.setTemplates(templates) + mobileTemplate.setAttackRange(5) + mobileTemplate.setAttackSpeed(5) mobileTemplate.setLevel(5) attacks = Vector() mobileTemplate.setDefaultAttack('creatureMeleeAttack') diff --git a/scripts/object/building/player/city/cityhall_corellia.py b/scripts/object/building/player/city/cityhall_corellia.py index ccad8904..161f75e3 100644 --- a/scripts/object/building/player/city/cityhall_corellia.py +++ b/scripts/object/building/player/city/cityhall_corellia.py @@ -1,4 +1,20 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) + + cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5) + #cityterminal.setAttachment('housing_parentstruct', object) + + city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3) + #cityterminal.setAttachment('housing_parentstruct', object) + return \ No newline at end of file diff --git a/scripts/object/building/player/city/cityhall_naboo.py b/scripts/object/building/player/city/cityhall_naboo.py index ccad8904..161f75e3 100644 --- a/scripts/object/building/player/city/cityhall_naboo.py +++ b/scripts/object/building/player/city/cityhall_naboo.py @@ -1,4 +1,20 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) + + cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5) + #cityterminal.setAttachment('housing_parentstruct', object) + + city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3) + #cityterminal.setAttachment('housing_parentstruct', object) + return \ No newline at end of file diff --git a/scripts/object/building/player/city/cityhall_tatooine.py b/scripts/object/building/player/city/cityhall_tatooine.py index ccad8904..8a80fb93 100644 --- a/scripts/object/building/player/city/cityhall_tatooine.py +++ b/scripts/object/building/player/city/cityhall_tatooine.py @@ -1,4 +1,29 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): +<<<<<<< HEAD + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(1.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) + + cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(0), float(2.6), float(0)), Quaternion(float(1), float(1), float(1), float(0)),3) +======= + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) + + cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5) + #cityterminal.setAttachment('housing_parentstruct', object) + + city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3) +>>>>>>> upstream/master + #cityterminal.setAttachment('housing_parentstruct', object) + return \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_corellia_style_01.py b/scripts/object/building/player/player_guildhall_corellia_style_01.py index ccad8904..8e623ae0 100644 --- a/scripts/object/building/player/player_guildhall_corellia_style_01.py +++ b/scripts/object/building/player/player_guildhall_corellia_style_01.py @@ -1,4 +1,13 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 6,3, 18.4, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(2.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_generic_style_01.py b/scripts/object/building/player/player_guildhall_generic_style_01.py index ccad8904..8e623ae0 100644 --- a/scripts/object/building/player/player_guildhall_generic_style_01.py +++ b/scripts/object/building/player/player_guildhall_generic_style_01.py @@ -1,4 +1,13 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 6,3, 18.4, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(2.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_naboo_style_01.py b/scripts/object/building/player/player_guildhall_naboo_style_01.py index ccad8904..8e623ae0 100644 --- a/scripts/object/building/player/player_guildhall_naboo_style_01.py +++ b/scripts/object/building/player/player_guildhall_naboo_style_01.py @@ -1,4 +1,13 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 6,3, 18.4, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(2.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_tatooine_style_01.py b/scripts/object/building/player/player_guildhall_tatooine_style_01.py index ccad8904..8e623ae0 100644 --- a/scripts/object/building/player/player_guildhall_tatooine_style_01.py +++ b/scripts/object/building/player/player_guildhall_tatooine_style_01.py @@ -1,4 +1,13 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 6,3, 18.4, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(2.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_tatooine_style_02.py b/scripts/object/building/player/player_guildhall_tatooine_style_02.py index ccad8904..53903ad4 100644 --- a/scripts/object/building/player/player_guildhall_tatooine_style_02.py +++ b/scripts/object/building/player/player_guildhall_tatooine_style_02.py @@ -1,4 +1,13 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 5.5,4, 12.7, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(4.0), float(2.2), float(9)), Quaternion(float(0), float(0), float(0), float(0)),1) + #structureterminal.setAttachment('radial_filename', 'structure/structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_corellia_large_style_01.py b/scripts/object/building/player/player_house_corellia_large_style_01.py index ccad8904..128a3e4b 100644 --- a/scripts/object/building/player/player_house_corellia_large_style_01.py +++ b/scripts/object/building/player/player_house_corellia_large_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 6, 3, 13.4, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 14.9, 4.5, 3.5, 0.707108, -0.707108, 3) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_corellia_large_style_02.py b/scripts/object/building/player/player_house_corellia_large_style_02.py index ccad8904..257e2444 100644 --- a/scripts/object/building/player/player_house_corellia_large_style_02.py +++ b/scripts/object/building/player/player_house_corellia_large_style_02.py @@ -1,4 +1,12 @@ import sys + def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -10.5, 0.7, 4.5, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_corellia_medium_style_01.py b/scripts/object/building/player/player_house_corellia_medium_style_01.py index ccad8904..26bf70af 100644 --- a/scripts/object/building/player/player_house_corellia_medium_style_01.py +++ b/scripts/object/building/player/player_house_corellia_medium_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 5.3, 2.26, 7.7, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 10.6, 0.5, 3.5, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_corellia_medium_style_02.py b/scripts/object/building/player/player_house_corellia_medium_style_02.py index ccad8904..26bf70af 100644 --- a/scripts/object/building/player/player_house_corellia_medium_style_02.py +++ b/scripts/object/building/player/player_house_corellia_medium_style_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 5.3, 2.26, 7.7, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 10.6, 0.5, 3.5, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_corellia_small_style_01.py b/scripts/object/building/player/player_house_corellia_small_style_01.py index ccad8904..6e0ae61d 100644 --- a/scripts/object/building/player/player_house_corellia_small_style_01.py +++ b/scripts/object/building/player/player_house_corellia_small_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -7.39, 2.36, 2, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_corellia_small_style_01_floorplan_02.py b/scripts/object/building/player/player_house_corellia_small_style_01_floorplan_02.py index ccad8904..6e0ae61d 100644 --- a/scripts/object/building/player/player_house_corellia_small_style_01_floorplan_02.py +++ b/scripts/object/building/player/player_house_corellia_small_style_01_floorplan_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -7.39, 2.36, 2, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_corellia_small_style_02.py b/scripts/object/building/player/player_house_corellia_small_style_02.py index ccad8904..d301f713 100644 --- a/scripts/object/building/player/player_house_corellia_small_style_02.py +++ b/scripts/object/building/player/player_house_corellia_small_style_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.9, 2.86, 8.35, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 6.5, 0.5, -3.8, 0.707108, -0.707108, 3) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_corellia_small_style_02_floorplan_02.py b/scripts/object/building/player/player_house_corellia_small_style_02_floorplan_02.py index ccad8904..faba7813 100644 --- a/scripts/object/building/player/player_house_corellia_small_style_02_floorplan_02.py +++ b/scripts/object/building/player/player_house_corellia_small_style_02_floorplan_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.9, 2.86, 8.35, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 6.5, 0.5, -3.8, 0.707108, -0.707108, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_large_style_01.py b/scripts/object/building/player/player_house_generic_large_style_01.py index ccad8904..128a3e4b 100644 --- a/scripts/object/building/player/player_house_generic_large_style_01.py +++ b/scripts/object/building/player/player_house_generic_large_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 6, 3, 13.4, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 14.9, 4.5, 3.5, 0.707108, -0.707108, 3) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_large_style_02.py b/scripts/object/building/player/player_house_generic_large_style_02.py index ccad8904..257e2444 100644 --- a/scripts/object/building/player/player_house_generic_large_style_02.py +++ b/scripts/object/building/player/player_house_generic_large_style_02.py @@ -1,4 +1,12 @@ import sys + def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -10.5, 0.7, 4.5, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_large_window_s01.py b/scripts/object/building/player/player_house_generic_large_window_s01.py index ccad8904..cda43b48 100644 --- a/scripts/object/building/player/player_house_generic_large_window_s01.py +++ b/scripts/object/building/player/player_house_generic_large_window_s01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -10.5, 0.7, 4.5, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_large_window_s02.py b/scripts/object/building/player/player_house_generic_large_window_s02.py index ccad8904..fb7db369 100644 --- a/scripts/object/building/player/player_house_generic_large_window_s02.py +++ b/scripts/object/building/player/player_house_generic_large_window_s02.py @@ -1,4 +1,14 @@ import sys +from engine.resources.scene import Point3D +from engine.resources.scene import Quaternion def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', Point3D(float(10.4), float(3), float(-11)), Quaternion(float(0), float(0), float(0), float(0)), -1) + print(sign) + object.setAttachment("structureSign", sign) + + #structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -8.5, 0.7, 8.5, 0.707108, -0.707108, 1) + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(8.6), float(0.5), float(2.5)), Quaternion(float(0), float(0), float(1), float(0)),1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal'). + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_medium_style_01.py b/scripts/object/building/player/player_house_generic_medium_style_01.py index ccad8904..26bf70af 100644 --- a/scripts/object/building/player/player_house_generic_medium_style_01.py +++ b/scripts/object/building/player/player_house_generic_medium_style_01.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 5.3, 2.26, 7.7, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 10.6, 0.5, 3.5, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_medium_style_02.py b/scripts/object/building/player/player_house_generic_medium_style_02.py index ccad8904..26bf70af 100644 --- a/scripts/object/building/player/player_house_generic_medium_style_02.py +++ b/scripts/object/building/player/player_house_generic_medium_style_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 5.3, 2.26, 7.7, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 10.6, 0.5, 3.5, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_medium_windowed.py b/scripts/object/building/player/player_house_generic_medium_windowed.py index ccad8904..175f5b8e 100644 --- a/scripts/object/building/player/player_house_generic_medium_windowed.py +++ b/scripts/object/building/player/player_house_generic_medium_windowed.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 5.5, 2.26, 7.8, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 10.7, 0.5, 3.5, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_medium_windowed_s02.py b/scripts/object/building/player/player_house_generic_medium_windowed_s02.py index ccad8904..35ddb590 100644 --- a/scripts/object/building/player/player_house_generic_medium_windowed_s02.py +++ b/scripts/object/building/player/player_house_generic_medium_windowed_s02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 5.5, 2.26, 7.8, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 10.7, 0.5, 2.8, 0.707108, -0.707108, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_small_style_01.py b/scripts/object/building/player/player_house_generic_small_style_01.py index aa9723bd..6e0ae61d 100644 --- a/scripts/object/building/player/player_house_generic_small_style_01.py +++ b/scripts/object/building/player/player_house_generic_small_style_01.py @@ -6,6 +6,6 @@ def setup(core, object): object.setAttachment("structureSign", sign) structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1) - #structureterminal.setAttachment('radial_filename', 'structure/structure_management_terminal') + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_small_style_01_floorplan_02.py b/scripts/object/building/player/player_house_generic_small_style_01_floorplan_02.py index ccad8904..6e0ae61d 100644 --- a/scripts/object/building/player/player_house_generic_small_style_01_floorplan_02.py +++ b/scripts/object/building/player/player_house_generic_small_style_01_floorplan_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -7.39, 2.36, 2, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_small_style_02_floorplan_02.py b/scripts/object/building/player/player_house_generic_small_style_02_floorplan_02.py index ccad8904..faba7813 100644 --- a/scripts/object/building/player/player_house_generic_small_style_02_floorplan_02.py +++ b/scripts/object/building/player/player_house_generic_small_style_02_floorplan_02.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.9, 2.86, 8.35, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 6.5, 0.5, -3.8, 0.707108, -0.707108, 2) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_small_window_style_03.py b/scripts/object/building/player/player_house_generic_small_window_style_03.py index ccad8904..06b43e10 100644 --- a/scripts/object/building/player/player_house_generic_small_window_style_03.py +++ b/scripts/object/building/player/player_house_generic_small_window_style_03.py @@ -1,4 +1,12 @@ import sys + def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -6.6, 2.36, 6.3, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 7, 0.74, -1.81, 0.707107, -0.707107, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_generic_small_windowed.py b/scripts/object/building/player/player_house_generic_small_windowed.py index ccad8904..6e0ae61d 100644 --- a/scripts/object/building/player/player_house_generic_small_windowed.py +++ b/scripts/object/building/player/player_house_generic_small_windowed.py @@ -1,4 +1,11 @@ import sys def setup(core, object): + sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -7.39, 2.36, 2, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1) + #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') + structureterminal.setAttachment('housing_parentstruct', object) return \ No newline at end of file diff --git a/scripts/object/mobile/vehicle/landspeeder_av21.py b/scripts/object/mobile/vehicle/landspeeder_av21.py index ccad8904..0f6896cd 100644 --- a/scripts/object/mobile/vehicle/landspeeder_av21.py +++ b/scripts/object/mobile/vehicle/landspeeder_av21.py @@ -1,4 +1,6 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'creature/vehicle') + object.setAttachment('passengers', 0) return \ No newline at end of file diff --git a/scripts/object/tangible/deed/city_deed/cityhall_corellia_deed.py b/scripts/object/tangible/deed/city_deed/cityhall_corellia_deed.py index ccad8904..d76c4b31 100644 --- a/scripts/object/tangible/deed/city_deed/cityhall_corellia_deed.py +++ b/scripts/object/tangible/deed/city_deed/cityhall_corellia_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/shared_construction_structure.iff') + object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff') + #object.setLotRequirement(5) + object.setBMR(308) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/city_deed/cityhall_naboo_deed.py b/scripts/object/tangible/deed/city_deed/cityhall_naboo_deed.py index ccad8904..51249c92 100644 --- a/scripts/object/tangible/deed/city_deed/cityhall_naboo_deed.py +++ b/scripts/object/tangible/deed/city_deed/cityhall_naboo_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/shared_construction_structure.iff') + object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_naboo_deed.iff') + #object.setLotRequirement(5) + object.setBMR(308) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py b/scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py index ccad8904..5a21a53b 100644 --- a/scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py +++ b/scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py @@ -1,4 +1,16 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/shared_construction_structure.iff') + object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff') + #object.setLotRequirement(5) +<<<<<<< HEAD + #object.setBMR(100) +======= + object.setBMR(308) +>>>>>>> upstream/master + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/corellia_guild_deed.py b/scripts/object/tangible/deed/guild_deed/corellia_guild_deed.py index ccad8904..4551ea56 100644 --- a/scripts/object/tangible/deed/guild_deed/corellia_guild_deed.py +++ b/scripts/object/tangible/deed/guild_deed/corellia_guild_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_corellia_style_01.iff') + object.setStructureTemplate('object/tangible/deed/guild_deed/shared_corellia_guild_deed.iff') + object.setLotRequirement(5) + object.setBMR(100) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/generic_guild_deed.py b/scripts/object/tangible/deed/guild_deed/generic_guild_deed.py index ccad8904..e7bc0a46 100644 --- a/scripts/object/tangible/deed/guild_deed/generic_guild_deed.py +++ b/scripts/object/tangible/deed/guild_deed/generic_guild_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_corellia_style_01.iff') + object.setStructureTemplate('object/tangible/deed/guild_deed/shared_generic_guild_deed.iff') + object.setLotRequirement(5) + object.setBMR(100) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/naboo_guild_deed.py b/scripts/object/tangible/deed/guild_deed/naboo_guild_deed.py index ccad8904..773614bf 100644 --- a/scripts/object/tangible/deed/guild_deed/naboo_guild_deed.py +++ b/scripts/object/tangible/deed/guild_deed/naboo_guild_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_naboo_style_01.iff') + object.setStructureTemplate('object/tangible/deed/guild_deed/shared_naboo_guild_deed.iff') + object.setLotRequirement(5) + object.setBMR(100) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/tatooine_guild_deed.py b/scripts/object/tangible/deed/guild_deed/tatooine_guild_deed.py index ccad8904..fe254f2c 100644 --- a/scripts/object/tangible/deed/guild_deed/tatooine_guild_deed.py +++ b/scripts/object/tangible/deed/guild_deed/tatooine_guild_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_tatooine_style_01.iff') + object.setStructureTemplate('object/tangible/deed/guild_deed/shared_tatooine_guild_deed.iff') + object.setLotRequirement(5) + object.setBMR(100) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/tatooine_guild_style_02_deed.py b/scripts/object/tangible/deed/guild_deed/tatooine_guild_style_02_deed.py index ccad8904..8560e4bb 100644 --- a/scripts/object/tangible/deed/guild_deed/tatooine_guild_style_02_deed.py +++ b/scripts/object/tangible/deed/guild_deed/tatooine_guild_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_tatooine_style_02.iff') + object.setStructureTemplate('object/tangible/deed/guild_deed/shared_tatooine_guild_style_02_deed.iff') + object.setLotRequirement(5) + object.setBMR(100) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_large_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_large_deed.py index ccad8904..7110ddc2 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_large_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/corellia_house_large_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_large_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_large_deed.iff') + object.setLotRequirement(5) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_large_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_large_style_02_deed.py index ccad8904..fd316e06 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_large_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/corellia_house_large_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_large_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_large_style_02_deed.iff') + object.setLotRequirement(5) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_deed.py index ccad8904..0794bf6a 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_player_house_corellia_medium_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_medium_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_deed.py index ccad8904..ff561136 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_player_house_corellia_medium_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_medium_style_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_deed.py index ccad8904..412cb41f 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_small_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_small_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_floor_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_floor_02_deed.py index ccad8904..d7c943c8 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_floor_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_floor_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_small_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_small_floor_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_deed.py index ccad8904..5d4d2b6a 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_small_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_floor_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_floor_02_deed.py index ccad8904..af5a8c82 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_floor_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_floor_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_small_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_floor_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_large_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_large_deed.py index ccad8904..8762d716 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_large_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_large_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_large_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_deed.iff') + object.setLotRequirement(5) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_large_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_large_style_02_deed.py index ccad8904..33ac2fb5 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_large_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_large_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_large_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_style_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s01_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s01_deed.py index ccad8904..5c5fe535 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s01_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s01_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_large_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_window_s01_deed.iff') + object.setLotRequirement(2) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s02_deed.py index ccad8904..8ad15d4e 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_large_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_window_s02_deed.iff') + object.setLotRequirement(2) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_deed.py index ccad8904..98fbe311 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_medium_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_medium_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_style_02_deed.py index ccad8904..f8941dc1 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_style_02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_medium_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_medium_style_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_deed.py index ccad8904..28949069 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_medium_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_s02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_s02_deed.py index ccad8904..b784b441 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_s02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_s02_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_medium_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_s02_deed.iff') + object.setLotRequirement(2) + object.setBMR(18) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py index f59934aa..15cdd156 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py @@ -2,10 +2,10 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_small_style_01.iff') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_small_style_01.iff') object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff') - object.setLotRequirement(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_floor_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_floor_02_deed.py index ccad8904..830af4dc 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_floor_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_small_floor_02_deed.py @@ -1,4 +1,9 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_small_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_floor_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_deed.py index ccad8904..54ae2ecb 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_deed.py @@ -1,4 +1,9 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_small_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_floor_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_floor_02_deed.py index ccad8904..4ca8c73e 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_floor_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_floor_02_deed.py @@ -1,4 +1,9 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_small_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_floor_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_deed.py index ccad8904..5bad5b8e 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_small_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_window_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_style_03_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_style_03_deed.py index ccad8904..3666b630 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_style_03_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_style_03_deed.py @@ -1,4 +1,12 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/structureDeed') + object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_generic_small_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_window_style_03_deed.iff') + object.setLotRequirement(2) + object.setBMR(8) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/vehicle_deed/landspeeder_av21_deed.py b/scripts/object/tangible/deed/vehicle_deed/landspeeder_av21_deed.py index ccad8904..a5677b55 100644 --- a/scripts/object/tangible/deed/vehicle_deed/landspeeder_av21_deed.py +++ b/scripts/object/tangible/deed/vehicle_deed/landspeeder_av21_deed.py @@ -1,4 +1,9 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/vehicleDeed') + return + +def use(core, actor, object): + core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_av21.iff', 'object/intangible/vehicle/shared_landspeeder_av21_pcd.iff') return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_dps_01_01.py new file mode 100644 index 00000000..343e99a4 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_bh_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_bh_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3) + object.setAttachment('setBonus', 'set_bonus_bh_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_utility_a_01_01.py new file mode 100644 index 00000000..71fae11c --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_utility_a_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_bh_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_bh_utility_a_01_01') + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 50) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_utility_b_01_01.py index ddd2ac6f..e8f8a7f1 100644 --- a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_utility_b_01_01.py +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_utility_b_01_01.py @@ -1,8 +1,6 @@ import sys def setup(core, object): - object.setAttachment('radial_filename', 'ring/unity') - object.setAttachment('objType', 'ring') object.setStfFilename('static_item_n') object.setStfName('item_bracelet_l_set_bh_utility_b_01_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_dps_01_01.py new file mode 100644 index 00000000..865e7b8c --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_dps_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_commando_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_commando_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_co_grenade', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_co_grenade', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_co_grenade', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_dps_3) + object.setAttachment('setBonus', 'set_bonus_commando_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_utility_a_01_01.py new file mode 100644 index 00000000..ea92c4c0 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_utility_a_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_commando_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_commando_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 20) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_block_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:combat_block_value', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_utility_b_01_01.py new file mode 100644 index 00000000..e08558c2 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_commando_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_commando_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_commando_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 15) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_devastation_bonus', 5) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_ent_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_ent_01_01.py new file mode 100644 index 00000000..e52b43b6 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_ent_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_ent_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_ent_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Entertainer') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_ent_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_ent_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_ent_3') + object.setAttachment('setBonus', 'set_bonus_ent') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_hero_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_hero_01_01.py index 3326feb5..1a728832 100644 --- a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_hero_01_01.py +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_hero_01_01.py @@ -1,8 +1,6 @@ import sys def setup(core, object): - object.setAttachment('radial_filename', 'ring/unity') - object.setAttachment('objType', 'ring') object.setStfFilename('static_item_n') object.setStfName('item_bracelet_l_set_hero_01_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_dps_01_01.py new file mode 100644 index 00000000..924df8fa --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_jedi_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_jedi_dps_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_sweep', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_dm', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_sweep', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_jedi_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_jedi_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_jedi_dps_3') + object.setAttachment('setBonus', 'set_bonus_jedi_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_utility_a_01_01.py new file mode 100644 index 00000000..96000158 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_jedi_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_jedi_utility_a_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_cc_crit', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_ae_dm_cc', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_cc_crit', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_ae_dm_cc', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_a_3') + object.setAttachment('setBonus', 'set_jedi_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_utility_b_01_01.py new file mode 100644 index 00000000..62f71073 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_jedi_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_jedi_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_jedi_utility_b_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_glancing_blow_all', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_critical_hit_reduction', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_b_3') + object.setAttachment('setBonus', 'set_jedi_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_dps_01_01.py new file mode 100644 index 00000000..829a3a86 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_medic_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_medic_dps_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_burst', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_smash', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_me_enhance', 360) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_medic_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_medic_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_medic_dps_3') + object.setAttachment('setBonus', 'set_bonus_medic_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_utility_a_01_01.py new file mode 100644 index 00000000..6407d2b8 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_medic_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_medic_utility_a_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_evasion', 6) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_heal', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_heal', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_revive', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_a_3') + object.setAttachment('setBonus', 'set_medic_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_utility_b_01_01.py new file mode 100644 index 00000000..6e87fa2f --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_medic_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_medic_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_medic_utility_b_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_debuff', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_debuff', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_b_3') + object.setAttachment('setBonus', 'set_medic_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_dps_01_01.py new file mode 100644 index 00000000..aefea5a2 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_officer_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_officer_dps_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_paint', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_paint', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_sure', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_dps_3') + object.setAttachment('setBonus', 'set_bonus_officer_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_utility_a_01_01.py new file mode 100644 index 00000000..9240fd5d --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_utility_a_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_officer_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_officer_utility_a_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:cooldown_percent_of_group_buff', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_of_heal', 1) + # object.setIntAttribute('cat_skill_mod_bonus.@stat_n:XXX', 1) Rallypoint Duration Increase / couldnt find the effect yet + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_group_buff', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_purge', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_utility_b_01_01.py new file mode 100644 index 00000000..a958daba --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_officer_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_officer_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_officer_utility_b_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_aoe', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_aoe', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_dps_01_01.py new file mode 100644 index 00000000..dec2691f --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_smuggler_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_smuggler_dps_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sm_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_smuggler_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_smuggler_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_smuggler_dps_3') + object.setAttachment('setBonus', 'set_bonus_smuggler_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_utility_a_01_01.py new file mode 100644 index 00000000..f02cc54d --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_smuggler_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_smuggler_utility_a_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 7) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm_cc', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm_cc', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_a_3') + object.setAttachment('setBonus', 'set_smuggler_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_utility_b_01_01.py new file mode 100644 index 00000000..610fc4df --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_smuggler_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_smuggler_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_smuggler_utility_b_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_false_hope', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_b_3') + object.setAttachment('setBonus', 'set_smuggler_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_dps_01_01.py new file mode 100644 index 00000000..3a21b24f --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_spy_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_spy_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sp_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_dps_3') + object.setAttachment('setBonus', 'set_bonus_spy_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_utility_a_01_01.py new file mode 100644 index 00000000..cf9b8380 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_utility_a_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_spy_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_spy_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_utility_b_01_01.py new file mode 100644 index 00000000..145ca895 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_spy_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_l_set_spy_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_spy_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_dps_01_01.py new file mode 100644 index 00000000..08a7a2d6 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_bh_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_bh_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3) + object.setAttachment('setBonus', 'set_bonus_bh_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_utility_a_01_01.py new file mode 100644 index 00000000..b44a772a --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_utility_a_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_bh_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_bh_utility_a_01_01') + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 50) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_utility_b_01_01.py index 1d0aa2c9..9ea3acf4 100644 --- a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_utility_b_01_01.py +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_utility_b_01_01.py @@ -1,8 +1,6 @@ import sys def setup(core, object): - object.setAttachment('radial_filename', 'ring/unity') - object.setAttachment('objType', 'ring') object.setStfFilename('static_item_n') object.setStfName('item_bracelet_r_set_bh_utility_b_01_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_dps_01_01.py new file mode 100644 index 00000000..7d8383e4 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_dps_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_commando_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_commando_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_co_grenade', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_co_grenade', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_co_grenade', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_dps_3) + object.setAttachment('setBonus', 'set_bonus_commando_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_utility_a_01_01.py new file mode 100644 index 00000000..73afd03f --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_utility_a_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_commando_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_commando_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 20) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_block_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:combat_block_value', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_utility_b_01_01.py new file mode 100644 index 00000000..8a69bb24 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_commando_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_commando_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_commando_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 15) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_devastation_bonus', 5) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_ent_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_ent_01_01.py new file mode 100644 index 00000000..11b9a215 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_ent_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_ent_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_ent_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Entertainer') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_ent_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_ent_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_ent_3') + object.setAttachment('setBonus', 'set_bonus_ent') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_hero_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_hero_01_01.py index 81be4417..5a370ad7 100644 --- a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_hero_01_01.py +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_hero_01_01.py @@ -1,8 +1,6 @@ import sys def setup(core, object): - object.setAttachment('radial_filename', 'ring/unity') - object.setAttachment('objType', 'ring') object.setStfFilename('static_item_n') object.setStfName('item_bracelet_r_set_hero_01_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_dps_01_01.py new file mode 100644 index 00000000..8cae3f65 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_jedi_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_jedi_dps_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_sweep', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_dm', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_sweep', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_jedi_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_jedi_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_jedi_dps_3') + object.setAttachment('setBonus', 'set_bonus_jedi_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_utility_a_01_01.py new file mode 100644 index 00000000..9dda97ca --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_jedi_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_jedi_utility_a_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_cc_crit', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_ae_dm_cc', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_cc_crit', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_ae_dm_cc', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_a_3') + object.setAttachment('setBonus', 'set_jedi_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_utility_b_01_01.py new file mode 100644 index 00000000..db66599a --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_jedi_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_jedi_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_jedi_utility_b_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_glancing_blow_all', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_critical_hit_reduction', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_b_3') + object.setAttachment('setBonus', 'set_jedi_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_dps_01_01.py new file mode 100644 index 00000000..7a77ab9b --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_medic_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_medic_dps_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_burst', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_smash', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_me_enhance', 360) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_medic_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_medic_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_medic_dps_3') + object.setAttachment('setBonus', 'set_bonus_medic_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_utility_a_01_01.py new file mode 100644 index 00000000..9b293184 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_medic_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_medic_utility_a_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_evasion', 6) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_heal', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_heal', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_revive', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_a_3') + object.setAttachment('setBonus', 'set_medic_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_utility_b_01_01.py new file mode 100644 index 00000000..40149c33 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_medic_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_medic_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_medic_utility_b_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_debuff', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_debuff', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_b_3') + object.setAttachment('setBonus', 'set_medic_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_dps_01_01.py new file mode 100644 index 00000000..21e5d96b --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_officer_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_officer_dps_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_paint', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_paint', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_sure', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_dps_3') + object.setAttachment('setBonus', 'set_bonus_officer_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_utility_a_01_01.py new file mode 100644 index 00000000..7b95ebd9 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_utility_a_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_officer_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_officer_utility_a_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:cooldown_percent_of_group_buff', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_of_heal', 1) + # object.setIntAttribute('cat_skill_mod_bonus.@stat_n:XXX', 1) Rallypoint Duration Increase / couldnt find the effect yet + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_group_buff', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_purge', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_utility_b_01_01.py new file mode 100644 index 00000000..bb55fb6c --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_officer_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_officer_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_officer_utility_b_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_aoe', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_aoe', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_dps_01_01.py new file mode 100644 index 00000000..d2e2ca9e --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_smuggler_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_smuggler_dps_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sm_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_smuggler_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_smuggler_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_smuggler_dps_3') + object.setAttachment('setBonus', 'set_bonus_smuggler_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_utility_a_01_01.py new file mode 100644 index 00000000..17f32009 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_smuggler_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_smuggler_utility_a_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 7) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm_cc', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm_cc', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_a_3') + object.setAttachment('setBonus', 'set_smuggler_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_utility_b_01_01.py new file mode 100644 index 00000000..e07a84d5 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_smuggler_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_smuggler_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_smuggler_utility_b_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_false_hope', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_b_3') + object.setAttachment('setBonus', 'set_smuggler_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_dps_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_dps_01_01.py new file mode 100644 index 00000000..a1400617 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_spy_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_spy_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sp_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_dps_3') + object.setAttachment('setBonus', 'set_bonus_spy_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_utility_a_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_utility_a_01_01.py new file mode 100644 index 00000000..490bfeab --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_utility_a_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_spy_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_spy_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_utility_b_01_01.py b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_utility_b_01_01.py new file mode 100644 index 00000000..1f08b3c0 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_spy_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_bracelet_r_set_spy_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_spy_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_dps_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_dps_01_01.py new file mode 100644 index 00000000..32a45e54 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_bh_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_bh_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3) + object.setAttachment('setBonus', 'set_bonus_bh_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_utility_a_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_utility_a_01_01.py new file mode 100644 index 00000000..dbadc7c6 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_utility_a_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_bh_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_bh_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 50) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_dps_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_dps_01_01.py new file mode 100644 index 00000000..1b0ddc6b --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_dps_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_commando_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_commando_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_co_grenade', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_co_grenade', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_co_grenade', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_dps_3) + object.setAttachment('setBonus', 'set_bonus_commando_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_utility_a_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_utility_a_01_01.py new file mode 100644 index 00000000..4ceb7c9d --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_utility_a_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_commando_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_commando_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 20) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_block_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:combat_block_value', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_utility_b_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_utility_b_01_01.py new file mode 100644 index 00000000..e66ace6b --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_commando_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_commando_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_commando_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 15) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_devastation_bonus', 5) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_ent_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_ent_01_01.py new file mode 100644 index 00000000..bac4ae58 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_ent_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_ent_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_ent_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Entertainer') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_ent_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_ent_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_ent_3') + object.setAttachment('setBonus', 'set_bonus_ent') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_dps_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_dps_01_01.py new file mode 100644 index 00000000..c4633a07 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_jedi_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_jedi_dps_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_sweep', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_dm', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_sweep', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_jedi_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_jedi_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_jedi_dps_3') + object.setAttachment('setBonus', 'set_bonus_jedi_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_utility_a_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_utility_a_01_01.py new file mode 100644 index 00000000..5f3dedba --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_jedi_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_jedi_utility_a_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_cc_crit', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_ae_dm_cc', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_cc_crit', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_ae_dm_cc', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_a_3') + object.setAttachment('setBonus', 'set_jedi_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_utility_b_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_utility_b_01_01.py new file mode 100644 index 00000000..70b69a4a --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_jedi_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_jedi_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_jedi_utility_b_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_glancing_blow_all', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_critical_hit_reduction', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_b_3') + object.setAttachment('setBonus', 'set_jedi_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_dps_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_dps_01_01.py new file mode 100644 index 00000000..3a68cd61 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_medic_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_medic_dps_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_burst', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_smash', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_me_enhance', 360) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_medic_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_medic_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_medic_dps_3') + object.setAttachment('setBonus', 'set_bonus_medic_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_utility_a_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_utility_a_01_01.py new file mode 100644 index 00000000..95b05680 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_medic_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_medic_utility_a_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_evasion', 6) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_heal', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_heal', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_revive', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_a_3') + object.setAttachment('setBonus', 'set_medic_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_utility_b_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_utility_b_01_01.py new file mode 100644 index 00000000..ca854c4a --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_medic_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_medic_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_medic_utility_b_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_debuff', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_debuff', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_b_3') + object.setAttachment('setBonus', 'set_medic_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_dps_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_dps_01_01.py new file mode 100644 index 00000000..dfc931a7 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_officer_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_officer_dps_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_paint', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_paint', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_sure', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_dps_3') + object.setAttachment('setBonus', 'set_bonus_officer_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_utility_a_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_utility_a_01_01.py new file mode 100644 index 00000000..90c155f0 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_utility_a_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_officer_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_officer_utility_a_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:cooldown_percent_of_group_buff', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_of_heal', 1) + # object.setIntAttribute('cat_skill_mod_bonus.@stat_n:XXX', 1) Rallypoint Duration Increase / couldnt find the effect yet + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_group_buff', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_purge', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_utility_b_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_utility_b_01_01.py new file mode 100644 index 00000000..b75eac31 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_officer_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_officer_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_officer_utility_b_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_aoe', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_aoe', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_dps_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_dps_01_01.py new file mode 100644 index 00000000..fdfb2c15 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_dps_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_smuggler_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_smuggler_dps_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sm_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_smuggler_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_smuggler_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_smuggler_dps_3') + object.setAttachment('setBonus', 'set_bonus_smuggler_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_utility_a_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_utility_a_01_01.py new file mode 100644 index 00000000..2e7a85d0 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_smuggler_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_smuggler_utility_a_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 7) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm_cc', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm_cc', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_a_3') + object.setAttachment('setBonus', 'set_smuggler_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_utility_b_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_utility_b_01_01.py new file mode 100644 index 00000000..bda69a67 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_smuggler_utility_b_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_smuggler_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_smuggler_utility_b_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_false_hope', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_b_3') + object.setAttachment('setBonus', 'set_smuggler_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_dps_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_dps_01_01.py new file mode 100644 index 00000000..2cda8727 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_spy_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_spy_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sp_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_dps_3') + object.setAttachment('setBonus', 'set_bonus_spy_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_utility_a_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_utility_a_01_01.py new file mode 100644 index 00000000..af9be68a --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_utility_a_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_spy_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_spy_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_utility_b_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_utility_b_01_01.py new file mode 100644 index 00000000..8345b02a --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_spy_utility_b_01_01.py @@ -0,0 +1,17 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_spy_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_spy_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_bh_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_bh_dps_01_01.py new file mode 100644 index 00000000..90d0db77 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_bh_dps_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_bh_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_bh_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3) + object.setAttachment('setBonus', 'set_bonus_bh_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_bh_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_bh_utility_a_01_01.py new file mode 100644 index 00000000..ff5fc10c --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_bh_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_bh_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_bh_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 50) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_commando_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_commando_dps_01_01.py new file mode 100644 index 00000000..e0b35da0 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_commando_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_commando_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_commando_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_co_grenade', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_co_grenade', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_co_grenade', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_dps_3) + object.setAttachment('setBonus', 'set_bonus_commando_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_commando_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_commando_utility_a_01_01.py new file mode 100644 index 00000000..b43926e7 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_commando_utility_a_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_commando_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_commando_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 20) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_block_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:combat_block_value', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_commando_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_commando_utility_b_01_01.py new file mode 100644 index 00000000..5620019d --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_commando_utility_b_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_commando_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_commando_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 15) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_devastation_bonus', 5) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_ent_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_ent_01_01.py new file mode 100644 index 00000000..0aa88bec --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_ent_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_ent_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_ent_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Entertainer') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_ent_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_ent_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_ent_3') + object.setAttachment('setBonus', 'set_bonus_ent') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_jedi_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_jedi_dps_01_01.py new file mode 100644 index 00000000..1986def1 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_jedi_dps_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_jedi_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_jedi_dps_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_sweep', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_dm', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_sweep', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_jedi_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_jedi_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_jedi_dps_3') + object.setAttachment('setBonus', 'set_bonus_jedi_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_jedi_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_jedi_utility_a_01_01.py new file mode 100644 index 00000000..295383ef --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_jedi_utility_a_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_jedi_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_jedi_utility_a_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_cc_crit', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_ae_dm_cc', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_cc_crit', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_ae_dm_cc', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_a_3') + object.setAttachment('setBonus', 'set_jedi_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_jedi_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_jedi_utility_b_01_01.py new file mode 100644 index 00000000..9aae6cd1 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_jedi_utility_b_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_jedi_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_jedi_utility_b_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_glancing_blow_all', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_critical_hit_reduction', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_b_3') + object.setAttachment('setBonus', 'set_jedi_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_medic_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_medic_dps_01_01.py new file mode 100644 index 00000000..6323b57e --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_medic_dps_01_01.py @@ -0,0 +1,21 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_medic_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_medic_dps_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_burst', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_smash', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_me_enhance', 360) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_medic_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_medic_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_medic_dps_3') + object.setAttachment('setBonus', 'set_bonus_medic_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_medic_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_medic_utility_a_01_01.py new file mode 100644 index 00000000..1dcbdafa --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_medic_utility_a_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_medic_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_medic_utility_a_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_evasion', 6) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_heal', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_heal', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_revive', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_a_3') + object.setAttachment('setBonus', 'set_medic_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_medic_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_medic_utility_b_01_01.py new file mode 100644 index 00000000..26be442a --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_medic_utility_b_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_medic_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_medic_utility_b_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_debuff', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_debuff', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_b_3') + object.setAttachment('setBonus', 'set_medic_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_officer_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_officer_dps_01_01.py new file mode 100644 index 00000000..a622cec9 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_officer_dps_01_01.py @@ -0,0 +1,21 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_officer_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_officer_dps_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_paint', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_paint', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_sure', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_dps_3') + object.setAttachment('setBonus', 'set_bonus_officer_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_officer_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_officer_utility_a_01_01.py new file mode 100644 index 00000000..05e7c4a5 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_officer_utility_a_01_01.py @@ -0,0 +1,21 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_officer_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_officer_utility_a_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:cooldown_percent_of_group_buff', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_of_heal', 1) + # object.setIntAttribute('cat_skill_mod_bonus.@stat_n:XXX', 1) Rallypoint Duration Increase / couldnt find the effect yet + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_group_buff', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_purge', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_officer_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_officer_utility_b_01_01.py new file mode 100644 index 00000000..d7c050b7 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_officer_utility_b_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_officer_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_officer_utility_b_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_aoe', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_aoe', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_smuggler_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_smuggler_dps_01_01.py new file mode 100644 index 00000000..03ad7556 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_smuggler_dps_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_smuggler_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_smuggler_dps_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sm_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_smuggler_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_smuggler_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_smuggler_dps_3') + object.setAttachment('setBonus', 'set_bonus_smuggler_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_smuggler_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_smuggler_utility_a_01_01.py new file mode 100644 index 00000000..62fbde63 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_smuggler_utility_a_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_smuggler_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_smuggler_utility_a_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 7) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm_cc', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm_cc', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_a_3') + object.setAttachment('setBonus', 'set_smuggler_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_smuggler_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_smuggler_utility_b_01_01.py new file mode 100644 index 00000000..6a9fc806 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_smuggler_utility_b_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_smuggler_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_smuggler_utility_b_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_false_hope', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_b_3') + object.setAttachment('setBonus', 'set_smuggler_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_spy_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_spy_dps_01_01.py new file mode 100644 index 00000000..7bb6861f --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_spy_dps_01_01.py @@ -0,0 +1,21 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_spy_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_spy_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sp_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_dps_3') + object.setAttachment('setBonus', 'set_bonus_spy_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_spy_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_spy_utility_a_01_01.py new file mode 100644 index 00000000..aa7306d4 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_spy_utility_a_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_spy_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_spy_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_spy_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_spy_utility_b_01_01.py new file mode 100644 index 00000000..e37dc6cf --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_spy_utility_b_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_band_set_spy_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_spy_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_bh_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_bh_dps_01_01.py new file mode 100644 index 00000000..9bb5bc01 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_bh_dps_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_bh_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_bh_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3) + object.setAttachment('setBonus', 'set_bonus_bh_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_bh_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_bh_utility_a_01_01.py new file mode 100644 index 00000000..7c69c061 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_bh_utility_a_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_bh_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_bh_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 50) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_bh_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_bh_utility_b_01_01.py index 0d16a24a..4f1511b9 100644 --- a/scripts/object/tangible/wearables/ring/item_ring_set_bh_utility_b_01_01.py +++ b/scripts/object/tangible/wearables/ring/item_ring_set_bh_utility_b_01_01.py @@ -1,6 +1,8 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') object.setAttachment('radial_filename', 'ring/unity') object.setAttachment('objType', 'ring') object.setStfFilename('static_item_n') diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_commando_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_commando_dps_01_01.py new file mode 100644 index 00000000..cffd2d14 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_commando_dps_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_commando_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_commando_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_co_grenade', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_co_grenade', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_co_grenade', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_dps_3) + object.setAttachment('setBonus', 'set_bonus_commando_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_commando_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_commando_utility_a_01_01.py new file mode 100644 index 00000000..26d83059 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_commando_utility_a_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_commando_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_commando_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 20) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_block_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:combat_block_value', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_commando_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_commando_utility_b_01_01.py new file mode 100644 index 00000000..82e3a076 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_commando_utility_b_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_commando_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_commando_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Commando') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 15) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_devastation_bonus', 5) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_commando_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_commando_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_commando_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_commando_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_ent_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_ent_01_01.py new file mode 100644 index 00000000..723903a0 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_ent_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_ent_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_ent_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Entertainer') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_ent_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_ent_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_ent_3') + object.setAttachment('setBonus', 'set_bonus_ent') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_jedi_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_jedi_dps_01_01.py new file mode 100644 index 00000000..4bf14f5f --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_jedi_dps_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_jedi_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_jedi_dps_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_sweep', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_dm', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_sweep', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_jedi_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_jedi_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_jedi_dps_3') + object.setAttachment('setBonus', 'set_bonus_jedi_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_jedi_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_jedi_utility_a_01_01.py new file mode 100644 index 00000000..651141da --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_jedi_utility_a_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_jedi_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_jedi_utility_a_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_cc_crit', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_fs_ae_dm_cc', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_cc_crit', 3) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_fs_ae_dm_cc', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_a_3') + object.setAttachment('setBonus', 'set_jedi_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_jedi_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_jedi_utility_b_01_01.py new file mode 100644 index 00000000..a6b3d8ec --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_jedi_utility_b_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_jedi_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_jedi_utility_b_01_01') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_glancing_blow_all', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_critical_hit_reduction', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_jedi_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_jedi_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_jedi_utility_b_3') + object.setAttachment('setBonus', 'set_jedi_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_medic_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_medic_dps_01_01.py new file mode 100644 index 00000000..1209fcee --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_medic_dps_01_01.py @@ -0,0 +1,21 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_medic_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_medic_dps_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_burst', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_me_smash', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_me_enhance', 360) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_dm', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_medic_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_medic_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_medic_dps_3') + object.setAttachment('setBonus', 'set_bonus_medic_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_medic_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_medic_utility_a_01_01.py new file mode 100644 index 00000000..bd270056 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_medic_utility_a_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_medic_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_medic_utility_a_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_evasion', 6) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_heal', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_heal', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_revive', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_a_3') + object.setAttachment('setBonus', 'set_medic_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_medic_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_medic_utility_b_01_01.py new file mode 100644 index 00000000..339a68b4 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_medic_utility_b_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_medic_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_medic_utility_b_01_01') + object.setStringAttribute('class_required', 'Medic') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_me_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_me_debuff', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_me_debuff', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_medic_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_medic_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_medic_utility_b_3') + object.setAttachment('setBonus', 'set_medic_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_officer_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_officer_dps_01_01.py new file mode 100644 index 00000000..2355f9cf --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_officer_dps_01_01.py @@ -0,0 +1,21 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_officer_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_officer_dps_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_paint', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_paint', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_sure', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_sure', 1) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_dps_3') + object.setAttachment('setBonus', 'set_bonus_officer_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_officer_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_officer_utility_a_01_01.py new file mode 100644 index 00000000..79fbeff8 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_officer_utility_a_01_01.py @@ -0,0 +1,21 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_officer_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_officer_utility_a_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:cooldown_percent_of_group_buff', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_of_heal', 1) + # object.setIntAttribute('cat_skill_mod_bonus.@stat_n:XXX', 1) Rallypoint Duration Increase / couldnt find the effect yet + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_group_buff', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_of_purge', 3) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_officer_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_officer_utility_b_01_01.py new file mode 100644 index 00000000..4e8ee197 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_officer_utility_b_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_officer_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_officer_utility_b_01_01') + object.setStringAttribute('class_required', 'Officer') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_of_aoe', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_of_aoe', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_officer_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_officer_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_officer_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_officer_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_dps_01_01.py new file mode 100644 index 00000000..90e4dd89 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_dps_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_smuggler_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_smuggler_dps_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sm_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_smuggler_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_smuggler_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_smuggler_dps_3') + object.setAttachment('setBonus', 'set_bonus_smuggler_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_utility_a_01_01.py new file mode 100644 index 00000000..6b961659 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_utility_a_01_01.py @@ -0,0 +1,20 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_smuggler_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_smuggler_utility_a_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 7) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_dm_cc', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sm_dm_cc', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_a_3') + object.setAttachment('setBonus', 'set_smuggler_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_utility_b_01_01.py new file mode 100644 index 00000000..6b74bc35 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_smuggler_utility_b_01_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_smuggler_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_smuggler_utility_b_01_01') + object.setStringAttribute('class_required', 'Smuggler') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sm_false_hope', 2) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_smuggler_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_smuggler_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_smuggler_utility_b_3') + object.setAttachment('setBonus', 'set_smuggler_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_spy_dps_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_spy_dps_01_01.py new file mode 100644 index 00000000..3563aed7 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_spy_dps_01_01.py @@ -0,0 +1,21 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_spy_dps_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_spy_dps_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dm', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_sp_dot', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_freeshot_sp_dm', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_sp_dm', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_dps_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_dps_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_dps_3') + object.setAttachment('setBonus', 'set_bonus_spy_dps') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_spy_utility_a_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_spy_utility_a_01_01.py new file mode 100644 index 00000000..e57da3f8 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_spy_utility_a_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_spy_utility_a_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_spy_utility_a_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_a_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_a_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_a_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_a') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_spy_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_spy_utility_b_01_01.py new file mode 100644 index 00000000..3903a677 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_spy_utility_b_01_01.py @@ -0,0 +1,19 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'ring/unity') + object.setAttachment('objType', 'ring') + object.setStfFilename('static_item_n') + object.setStfName('item_ring_set_spy_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_spy_utility_b_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setStringAttribute('class_required', 'Spy') + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_strikethrough_chance', 2) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_all', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 50) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_spy_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_spy_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_spy_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_spy_utility_b') + return \ No newline at end of file diff --git a/scripts/radial/creature/vehicle.py b/scripts/radial/creature/vehicle.py index be1e7319..5106c8ee 100644 --- a/scripts/radial/creature/vehicle.py +++ b/scripts/radial/creature/vehicle.py @@ -6,8 +6,7 @@ def createRadial(core, owner, target, radials): radials.add(RadialOptions(0, 7, 1, '')) if core.mountService.canMount(owner, target): - radials.add(RadialOptions(1, 40, 3, '@pet/pet_menu:menu_enter_exit')) - radials.add(RadialOptions(0, 21, 1, '')) + radials.add(RadialOptions(0, 40, 3, '@pet/pet_menu:menu_enter_exit')) if target.getOwnerId() == owner.getObjectID(): radials.add(RadialOptions(0, 60, 3, '@pet/pet_menu:menu_store')) if core.mountService.canRepair(owner, target): @@ -18,14 +17,14 @@ def handleSelection(core, owner, target, option): mntSvc = core.mountService if target: - if option == 21: - if mntSvc.isMounted(actor): - mntSvc.mount(actor, target) + if option == 40: + if mntSvc.isMounted(owner): + mntSvc.dismount(owner, target) else: - mntSvc.unmount(actor, target) + mntSvc.mount(owner, target) elif option == 60: - mntSvc.store(actor, target) + mntSvc.store(owner, target) elif option == 114: - mntSvc.repair(actor, target) + mntSvc.repair(owner, target) return diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index c059c589..b376cf1f 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -15,7 +15,7 @@ def addPlanetSpawns(core, planet): junkdealer = stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3525), float(4), float(-4804), float(0.70), float(0.71)) junkdealer.setOptionsBitmask(264) junkdealer.setCustomName('a Junk Dealer') - junkdealer.setAttachment('radial_filename', 'conversation'); + junkdealer.setAttachment('radial_filename', 'object/conversation'); junkdealer.setAttachment('conversationFile','junk_dealer') return diff --git a/src/protocol/swg/objectControllerObjects/CombatSpam.java b/src/protocol/swg/objectControllerObjects/CombatSpam.java index fbf836de..26d64b9a 100644 --- a/src/protocol/swg/objectControllerObjects/CombatSpam.java +++ b/src/protocol/swg/objectControllerObjects/CombatSpam.java @@ -26,7 +26,7 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; import protocol.swg.ObjControllerMessage; -import services.combat.CombatService.HitType; +import resources.datatables.HitType; public class CombatSpam extends ObjControllerObject{ diff --git a/src/protocol/swg/objectControllerObjects/SpatialChat.java b/src/protocol/swg/objectControllerObjects/SpatialChat.java index 1d2ac34e..bf86de8f 100644 --- a/src/protocol/swg/objectControllerObjects/SpatialChat.java +++ b/src/protocol/swg/objectControllerObjects/SpatialChat.java @@ -26,12 +26,12 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; import protocol.swg.ObjControllerMessage; +import resources.common.OutOfBand; @SuppressWarnings("unused") - public class SpatialChat extends ObjControllerObject { - private long audienceId; + private long destinationId; private long sourceId; private long targetId; private String chatMessage; @@ -40,15 +40,19 @@ public class SpatialChat extends ObjControllerObject { private short balloonType = 1; private short chatType; private short moodId; + private byte languageId = 1; + private OutOfBand outOfBand; - public SpatialChat(long sourceId, long targetId, String chatMessage, short chatType, short moodId) { + public SpatialChat(long destinationId, long sourceId, long targetId, String chatMessage, short chatType, short moodId, int languageId, OutOfBand outOfBand) { try { - this.audienceId = sourceId; + this.destinationId = destinationId; this.sourceId = sourceId; this.targetId = targetId; this.chatMessage = chatMessage; this.chatType = chatType; this.moodId = moodId; + this.languageId = (byte) languageId; + this.outOfBand = ((outOfBand == null) ? new OutOfBand() : outOfBand); /*String[] chatMessageParse = chatMessage.split(" ", 6); @@ -62,19 +66,20 @@ public class SpatialChat extends ObjControllerObject { } } - public void setDestinationId(long audienceId) { - this.audienceId = audienceId; + public void setDestinationId(long destinationId) { + this.destinationId = destinationId; } - + public void deserialize(IoBuffer data) { } public IoBuffer serialize() { - IoBuffer result = IoBuffer.allocate(55 + chatMessage.length() * 2).order(ByteOrder.LITTLE_ENDIAN); - + outOfBand.setHeaderBytes(2); + IoBuffer outOfBandBuffer = outOfBand.serialize(); + IoBuffer result = IoBuffer.allocate(51 + (chatMessage.length() * 2) + outOfBandBuffer.array().length).order(ByteOrder.LITTLE_ENDIAN); result.putInt(ObjControllerMessage.SPACIAL_CHAT); - result.putLong(audienceId); + result.putLong(destinationId); result.putInt(0); result.putLong(sourceId); result.putLong(targetId); @@ -83,11 +88,9 @@ public class SpatialChat extends ObjControllerObject { result.putShort((short) 0x32); result.putShort(chatType); result.putShort(moodId); - result.put((byte) 1); - + result.put(languageId); result.putInt(0); - result.putInt(0); - + result.put(outOfBandBuffer.array()); return result.flip(); } diff --git a/src/resources/datatables/HitType.java b/src/resources/datatables/HitType.java new file mode 100644 index 00000000..a0736a2e --- /dev/null +++ b/src/resources/datatables/HitType.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package resources.datatables; + +public class HitType { + public static final byte MISS = 0; + public static final byte DODGE = 1; + public static final byte PARRY = 2; + public static final byte STRIKETHROUGH = 3; + public static final byte CRITICAL = 4; + public static final byte PUNISHING = 5; + public static final byte HIT = 6; + public static final byte BLOCK = 7; + public static final byte EVASION = 8; + public static final byte GLANCE = 9; +} diff --git a/src/resources/datatables/Posture.java b/src/resources/datatables/Posture.java index f319ea46..d64cba45 100644 --- a/src/resources/datatables/Posture.java +++ b/src/resources/datatables/Posture.java @@ -1,3 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ package resources.datatables; public class Posture { diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java index a1a8eba8..bcbc3b21 100644 --- a/src/resources/objects/player/PlayerObject.java +++ b/src/resources/objects/player/PlayerObject.java @@ -878,7 +878,8 @@ public class PlayerObject extends IntangibleObject { } public void removeChannel(int roomId) { - chatChannels.remove(roomId); + if (chatChannels.contains(roomId)) + chatChannels.remove(roomId); } public boolean isMemberOfChannel(int roomId) { diff --git a/src/resources/objects/resource/GalacticResource.java b/src/resources/objects/resource/GalacticResource.java index 643e1444..9f23a171 100644 --- a/src/resources/objects/resource/GalacticResource.java +++ b/src/resources/objects/resource/GalacticResource.java @@ -152,7 +152,7 @@ public class GalacticResource extends SWGObject implements IPersistent { this.name = name; this.fileName = fileName; this.category = category; - this.type = type; + //this.type = type; long range = 1234567L; Random r = new Random(); this.id = (long)(r.nextDouble()*range); diff --git a/src/services/DevService.java b/src/services/DevService.java index bae0eb8f..cbf5e36d 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -1211,11 +1211,10 @@ public class DevService implements INetworkDispatch { deed1.setBER(15); deed1.setAttributes(); inventory.add(deed1); - - break; + return; case 112: core.resourceService.spawnSpecificResourceContainer("Radioactive", player, 100000); - break; + return; case 120: // SWGObject houseDeed = core.objectService.createObject("object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff", planet); // inventory.add(houseDeed); @@ -1224,14 +1223,14 @@ public class DevService implements INetworkDispatch { Player_House_Deed deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); deed.setBMR(15); deed.setAttributes(); +<<<<<<< HEAD inventory.add(deed); - templateString="object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_deed.iff"; - deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); - deed.setBMR(15); - deed.setAttributes(); - inventory.add(deed); - + break; +======= + inventory.add(deed); + return; +>>>>>>> upstream/master case 125: TangibleObject genericCraftingTool = (TangibleObject) core.objectService.createObject("object/tangible/crafting/station/shared_generic_tool.iff", planet); genericCraftingTool.setCustomName("Generic Crafting Tool"); @@ -1239,7 +1238,9 @@ public class DevService implements INetworkDispatch { return; case 130: TangibleObject swoopDeed = (TangibleObject) core.objectService.createObject("object/tangible/deed/vehicle_deed/shared_speederbike_swoop_deed.iff", planet); + TangibleObject av21deed = (TangibleObject) core.objectService.createObject("object/tangible/deed/vehicle_deed/shared_landspeeder_av21_deed.iff", planet); inventory.add(swoopDeed); + inventory.add(av21deed); return; } } diff --git a/src/services/EquipmentService.java b/src/services/EquipmentService.java index 380dae39..b0532168 100644 --- a/src/services/EquipmentService.java +++ b/src/services/EquipmentService.java @@ -82,8 +82,19 @@ public class EquipmentService implements INetworkDispatch { } if (item.getStringAttribute("class_required") != null) { + String classRequired = item.getStringAttribute("class_required"); String profession = ((PlayerObject) actor.getSlottedObject("ghost")).getProfession(); - if (item.getStringAttribute("class_required").contentEquals(core.playerService.getFormalProfessionName(profession)) || item.getStringAttribute("class_required").contentEquals("None")) + + if (classRequired.contains(",")) { + String[] classes = classRequired.split(","); + + for (int i = 0; i < classes.length; i++) { + if (classes[i].contains(core.playerService.getFormalProfessionName(profession))) { + return true; + } + } + } + if (classRequired.contentEquals(core.playerService.getFormalProfessionName(profession)) || classRequired.contentEquals("None")) result = true; else return false; diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index 68f07722..ea075dc5 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -449,6 +449,7 @@ public class PlayerService implements INetworkDispatch { } + @SuppressWarnings("unchecked") public void sendCloningWindow(CreatureObject creature, final boolean pvpDeath) { //if(creature.getPosture() != 14) @@ -603,7 +604,7 @@ public class PlayerService implements INetworkDispatch { //core.equipmentService.unequip(creature, equipment); //} - for (Buff buff : creature.getBuffList()) { + for (Buff buff : creature.getBuffList().get().toArray(new Buff[] { })) { if (buff.isRemoveOnRespec()) { core.buffService.removeBuffFromCreature(creature, buff); } diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index 5142564e..0b941eb6 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -222,7 +222,7 @@ public class SimulationService implements INetworkDispatch { object.setIsInQuadtree(true); boolean success = quadTrees.get(object.getPlanet().getName()).put(x, y, object); if(success) { - Vector childObjects = (Vector) object.getAttachment("childObjects"); + @SuppressWarnings("unchecked") Vector childObjects = (Vector) object.getAttachment("childObjects"); if(childObjects != null) { addChildObjects(object, childObjects); object.setAttachment("childObjects", null); @@ -372,7 +372,7 @@ public class SimulationService implements INetworkDispatch { List newAwareObjects = get(object.getPlanet(), newPos.x, newPos.z, 512); ArrayList oldAwareObjects = new ArrayList(object.getAwareObjects()); - Collection updateAwareObjects = CollectionUtils.intersection(oldAwareObjects, newAwareObjects); + @SuppressWarnings("unchecked") Collection updateAwareObjects = CollectionUtils.intersection(oldAwareObjects, newAwareObjects); object.notifyObservers(utm, false); for(int i = 0; i < oldAwareObjects.size(); i++) { @@ -565,7 +565,7 @@ public class SimulationService implements INetworkDispatch { List newAwareObjects = get(object.getPlanet(), newPosition.x, newPosition.z, 512); ArrayList oldAwareObjects = new ArrayList(object.getAwareObjects()); - Collection updateAwareObjects = CollectionUtils.intersection(oldAwareObjects, newAwareObjects); + @SuppressWarnings("unchecked") Collection updateAwareObjects = CollectionUtils.intersection(oldAwareObjects, newAwareObjects); object.notifyObservers(utm, false); for(int i = 0; i < oldAwareObjects.size(); i++) { diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index fbdf4cf6..cc620d77 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -37,6 +37,8 @@ import org.apache.mina.core.session.IoSession; import com.sleepycat.je.Transaction; import com.sleepycat.persist.EntityCursor; +import engine.clientdata.ClientFileManager; +import engine.clientdata.visitors.DatatableVisitor; import engine.clients.Client; import engine.resources.config.Config; import engine.resources.config.DefaultConfig; @@ -107,49 +109,49 @@ public class ChatService implements INetworkDispatch { } - public void handleSpatialChat(SWGObject speaker, SWGObject target, String chatMessage, short chatType, short moodId) { - + /* + * This gets used by NPCs as well (random shouts, mustafar miners, etc). + */ + public void spatialChat(SWGObject speaker, SWGObject target, String chatMessage, short chatType, short moodId, int languageId, OutOfBand outOfBand) { long targetId; - if(target == null) + if (target == null) { targetId = 0; - else + } else { targetId = target.getObjectID(); + } - //System.out.println(chatMessage); - //System.out.println(chatType); - //System.out.println(moodId); - - SpatialChat spatialChat = new SpatialChat(speaker.getObjectID(), targetId, chatMessage, chatType, moodId); - ObjControllerMessage objControllerMessage = new ObjControllerMessage(0x0B, spatialChat); + ObjControllerMessage objControllerMessage = new ObjControllerMessage(0x0B, new SpatialChat(speaker.getObjectId(), speaker.getObjectID(), targetId, chatMessage, chatType, moodId, languageId, outOfBand)); Client speakerClient = speaker.getClient(); - if(speakerClient == null || speakerClient.getSession() == null) + if (speakerClient == null || speakerClient.getSession() == null) { return; - + } + speakerClient.getSession().write(objControllerMessage.serialize()); - if(speaker.getObservers().isEmpty()) + if (speaker.getObservers().isEmpty()) { return; + } HashSet observers = new HashSet(speaker.getObservers()); Point3D position = speaker.getPosition(); - for(Client client : observers) { + for (Client client : observers) { float distance = client.getParent().getPosition().getDistance2D(position); - if(client != null && client.getSession() != null && distance <= 80) { - - if(((PlayerObject)client.getParent().getSlottedObject("ghost")).getIgnoreList().contains(speaker.getCustomName().toLowerCase().split(" ")[0])) + if (client != null && client.getSession() != null && distance <= 80) { + if (((PlayerObject) client.getParent().getSlottedObject("ghost")).getIgnoreList().contains(speaker.getCustomName().toLowerCase().split(" ")[0])) { continue; + } - spatialChat.setDestinationId(client.getParent().getObjectID()); - ObjControllerMessage objControllerMessage2 = new ObjControllerMessage(0x0B, spatialChat); - client.getSession().write(objControllerMessage2.serialize()); + String message = chatMessage; + SpatialChat spatialChat = new SpatialChat(client.getParent().getObjectId(), speaker.getObjectID(), targetId, message, chatType, moodId, languageId, outOfBand); + objControllerMessage = new ObjControllerMessage(0x0B, spatialChat); + client.getSession().write(objControllerMessage.serialize()); } } - } public void handleEmote(SWGObject speaker, SWGObject target, short emoteId) { @@ -968,6 +970,8 @@ public class ChatService implements INetworkDispatch { roomPlayer.getClient().getSession().write(leaveRoom.serialize()); } }); + + ((PlayerObject) player.getSlottedObject("ghost")).removeChannel(roomId); } public void sendChatRoomMessage(CreatureObject sender, int roomId, int msgId, String message) { @@ -1001,4 +1005,38 @@ public class ChatService implements INetworkDispatch { public ConcurrentHashMap getChatRooms() { return chatRooms; } + + /* + * Language interpretation. + * Converts messages into a language if the receiver can't comprehend it + */ + public String interpret(String message, int languageId, CreatureObject receiver) { + try { + DatatableVisitor visitor = ClientFileManager.loadFile("datatables/game_language/game_language.iff", DatatableVisitor.class); + + if (visitor.getObject(0, 0) == null) { + return message; + } + + String comprehendSkillMod = (String) visitor.getObject(languageId, 1); + + if (receiver.getSkillModBase(comprehendSkillMod) > 0) { + return message; + } + + for (int l = 3; l < 29; l++) { + String letter = ((String) visitor.getObject(0, l)); + String replacement = ((String) visitor.getObject(languageId, l)); + + if (replacement.length() > 0) { + message = message.replace(letter, replacement); + } + } + } catch (InstantiationException | IllegalAccessException e) { + e.printStackTrace(); + } + + return message; + } + } diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 8e85c53e..1a265c8c 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -65,6 +65,7 @@ import engine.resources.objects.SWGObject; import engine.resources.scene.Point3D; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; +import resources.datatables.HitType; public class CombatService implements INetworkDispatch { @@ -750,6 +751,12 @@ public class CombatService implements INetworkDispatch { float glanceChance = (float) target.getSkillModBase("display_only_glancing_blow") / 10000; + if(weapon.isRanged()) + glanceChance += target.getSkillModBase("expertise_glancing_blow_ranged"); + + if(weapon.isMelee()) + glanceChance += target.getSkillModBase("expertise_glancing_blow_melee"); + r = random.nextFloat(); if(r <= glanceChance) return HitType.GLANCE; @@ -1359,33 +1366,5 @@ public class CombatService implements INetworkDispatch { defenderList.stream().forEach(attacker -> defender.removeDefender(attacker)); } } - - public enum HitType{; - - public static final byte MISS = 0; - public static final byte DODGE = 1; - public static final byte PARRY = 2; - public static final byte STRIKETHROUGH = 3; - public static final byte CRITICAL = 4; - public static final byte PUNISHING = 5; - public static final byte HIT = 6; - public static final byte BLOCK = 7; - public static final byte EVASION = 8; - public static final byte GLANCE = 9; - - } - - public enum ElementalType {; - - public static final int KINETIC = 1; - public static final int ENERGY = 2; - public static final int BLAST = 4; - public static final int STUN = 8; - public static final int HEAT = 32; - public static final int COLD = 64; - public static final int ACID = 128; - public static final int ELECTRICITY = 256; - - } } diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java index 01610e70..fa759d8b 100644 --- a/src/services/command/CommandService.java +++ b/src/services/command/CommandService.java @@ -295,7 +295,16 @@ public class CommandService implements INetworkDispatch { } } - processCommand(actor, target, command, actionCounter, commandArgs); + if(command instanceof CombatCommand) { + try { + processCommand(actor, target, (BaseSWGCommand) command.clone(), actionCounter, commandArgs); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + } + else + processCommand(actor, target, command, actionCounter, commandArgs); + return true; } diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index eb06f324..358ad44a 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -334,7 +334,7 @@ public class ObjectService implements INetworkDispatch { object = new Harvester_Deed(objectID, planet, Template, position, orientation); - } else if(Template.startsWith("object/tangible/deed/player_house_deed")) { + } else if(Template.startsWith("object/tangible/deed/player_house_deed") || Template.startsWith("object/tangible/deed/guild_deed") || Template.startsWith("object/tangible/deed/city_deed")) { object = new Player_House_Deed(objectID, planet, Template, position, orientation); @@ -1042,6 +1042,7 @@ public class ObjectService implements INetworkDispatch { * @param position The position as an offset to the parent object. * @param orientation The orientation as an offset to the parent object. */ + @SuppressWarnings("unchecked") public SWGObject createChildObject(SWGObject parent, String template, Point3D position, Quaternion orientation, int cellNumber) { if(cellNumber == -1) { @@ -1276,13 +1277,13 @@ public class ObjectService implements INetworkDispatch { return count.get(); } - public void persistObject(IPersistent object, Class keyClass, Class valueClass, ObjectDatabase odb) { + public void persistObject(IPersistent object, Class keyClass, Class valueClass, ObjectDatabase odb) { object.createTransaction(odb.getEnvironment()); core.getAuctionODB().put(object, keyClass, valueClass, object.getTransaction()); object.getTransaction().commitSync(); } - public void deletePersistentObject(IPersistent object, Class keyClass, Class valueClass, ObjectDatabase odb, Object key) { + public void deletePersistentObject(IPersistent object, Class keyClass, Class valueClass, ObjectDatabase odb, Object key) { object.createTransaction(odb.getEnvironment()); core.getAuctionODB().delete(key, keyClass, valueClass, object.getTransaction()); object.getTransaction().commitSync(); diff --git a/src/services/pet/MountService.java b/src/services/pet/MountService.java index 59f49f63..2c0b636d 100644 --- a/src/services/pet/MountService.java +++ b/src/services/pet/MountService.java @@ -32,10 +32,13 @@ import resources.common.OutOfBand; import resources.datatables.DisplayType; import resources.datatables.Options; import resources.datatables.Posture; +import resources.datatables.State; import resources.datatables.StateStatus; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; +import engine.clientdata.ClientFileManager; +import engine.clientdata.visitors.DatatableVisitor; import engine.resources.container.Traverser; import engine.resources.objects.SWGObject; import engine.resources.service.INetworkDispatch; @@ -156,11 +159,6 @@ public class MountService implements INetworkDispatch { return; } - if (actor.isInStealth()) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:no_mount_stealth"), DisplayType.Broadcast); - return; - } - if (pcd.getStringAttribute("required_faction") != null && pcd.getStringAttribute("required_faction").length() > 0) { if (!actor.getFaction().equals(pcd.getStringAttribute("required_faction"))) { actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:officer_faction"), DisplayType.Broadcast); @@ -182,6 +180,8 @@ public class MountService implements INetworkDispatch { return; } + mount.setAttachment("pcdAppearanceFilename", pcd.getTemplateData().getAttribute("appearanceFilename")); + mount.setFaction(actor.getFaction()); mount.setFactionStatus(actor.getFactionStatus()); @@ -259,8 +259,6 @@ public class MountService implements INetworkDispatch { }); player.setCallingCompanion(false); - - System.out.println("Got to end"); } private void callMount(CreatureObject actor, SWGObject pcd, PlayerObject player, CreatureObject mount) { @@ -397,32 +395,53 @@ public class MountService implements INetworkDispatch { public void mount(CreatureObject rider, CreatureObject mount) { // FIXME like above, movement skillmod should be used instead of creo4 vars and never be 0, otherwise it thinks we are always rooted //if (rider.getSkillModBase("movement") == 0) { - //rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_mount_rooted"), DisplayType.Broadcast); - //return; + //rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_mount_rooted"), DisplayType.Broadcast); + //return; //} - if (mount.getOption(Options.DISABLED)) { + // Check if mount may be mounted + if (rider == null) + { + return; + } + if (mount == null) + { + return; + } + if (!mount.getOption(Options.MOUNT)) + { + return; + } + if (mount.getOption(Options.DISABLED)) + { rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_mount_veh_disabled"), DisplayType.Broadcast); return; } - - if (!mount.getOption(Options.MOUNT)) { + if (rider.isInStealth()) + { + rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:no_mount_stealth"), DisplayType.Broadcast); return; } - - if (!canMount(rider, mount)) { + if (!canMount(rider, mount)) + { rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_mount"), DisplayType.Broadcast); return; } + // Put rider into mount mount._add(rider); - mount.setStateBitmask(mount.getStateBitmask() | 0x10000000); - //mount.setState(State.MountedCreature, true); + + // Set mount states and stuff + mount.setStateBitmask(mount.getStateBitmask() | State.MountedCreature); + mount.setState(State.MountedCreature, true); + mount.setPosture(Posture.DrivingVehicle); + + // Set rider states and stuff + rider.setStateBitmask(rider.getStateBitmask() | State.RidingMount); + rider.setState(StateStatus.RidingMount, true); + + // Notify observers and update quadtree mount.notifyObservers(new UpdateContainmentMessage(rider.getObjectID(), mount.getObjectID(), 4), true); - //rider.setState(State.RidingMount, true); - rider.setStateBitmask(rider.getStateBitmask() | 0x8000000); - //rider.setPosture((mount.getTemplate().contains("vehicle")) ? Posture.DrivingVehicle : Posture.RidingCreature); - rider.setPosture((byte) 11); core.simulationService.remove(rider, rider.getWorldPosition().x, rider.getWorldPosition().z, false); } @@ -505,24 +524,44 @@ public class MountService implements INetworkDispatch { return false; } - if (mount.getSlottedObject("rider") != rider) { - return false; + if(mount.getSlottedObject("rider") == rider) return true; + + if(mount.getAttachment("passenger") == null) return false; + + for(int i = 1; i < (int) mount.getAttachment("passenger"); i++) + { + if (mount.getSlottedObject("rider" + i) != rider) return true; } - return true; + return false; } public boolean isMounted(SWGObject actor, CreatureObject mount) { return actor.getContainer() == mount; } + public int getPassengerCount(CreatureObject mount) + { + mount.setAttachment("passengers", 0); + + mount.viewChildren(mount, false, false, new Traverser() + { + public void process(SWGObject passenger) + { + if (passenger instanceof CreatureObject) mount.setAttachment("passengers", (int) mount.getAttachment("passengers") + 1); + } + }); + + return (int)mount.getAttachment("passengers"); + } + public boolean canMount(CreatureObject rider, CreatureObject mount) { if (mount == null) { return false; } if (!mount.getOption(Options.MOUNT)) { - return false; + // return false; } if (isMounted(rider)) { @@ -543,7 +582,7 @@ public class MountService implements INetworkDispatch { int passengers = 0; if (mount.getAttachment("passengers") != null){ - passengers = (Integer) mount.getAttachment("passengers"); + passengers = getPassengerCount(mount); } int passengerSlot = 0; @@ -556,7 +595,7 @@ public class MountService implements INetworkDispatch { } if (passengerSlot == 0) { - return false; + // return false; } CreatureObject owner = (CreatureObject) NGECore.getInstance().objectService.getObject(mount.getOwnerId()); @@ -573,56 +612,79 @@ public class MountService implements INetworkDispatch { return false; } + try + { + DatatableVisitor visitor = ClientFileManager.loadFile("datatables/mount/saddle_appearance_map.iff", DatatableVisitor.class); + for(int i = 0; i < visitor.getRowCount(); i++) + { + if(visitor.getObject(i, 2).equals(mount.getAttachment("pcdAppearanceFilename"))) // saddle_appearance_name + { + if(passengers < (int) visitor.getObject(i, 1)) return true; // saddle_capacity + break; + } + } + } + catch (Exception e) { e.printStackTrace(); } + + if(passengers > 0) return false; + return true; } public void dismount(CreatureObject rider, CreatureObject mount) { - if (rider == null || mount == null) { + + // Check if mount is currently mounted + if (rider == null || mount == null) + { + return; + } + if (!isMounted(rider)) + { + return; + } + if (!mount.getOption(Options.MOUNT)) + { return; } - if (!isMounted(rider)) { - return; - } + // Dismount all passengers - if (!mount.getOption(Options.MOUNT)) { - return; - } - - if (rider.getObjectID() == mount.getOwnerId()) { + if (rider.getObjectID() == mount.getOwnerId()) + { CreatureObject owner = rider; - - mount.viewChildren(owner, false, false, new Traverser() { - - public void process(SWGObject passenger) { - if (passenger != owner) { - mount._remove(passenger); - mount.notifyObservers(new UpdateContainmentMessage(passenger.getObjectID(), 0, -1), false); - - if (passenger instanceof CreatureObject) { - ((CreatureObject) passenger).setState(StateStatus.RidingMount, false); - ((CreatureObject) passenger).setPosture(Posture.Upright); - } - - core.simulationService.add(passenger, mount.getWorldPosition().x, mount.getWorldPosition().z, false); - core.simulationService.teleport(passenger, mount.getWorldPosition(), mount.getOrientation(), 0); - } + mount.viewChildren(owner, false, false, new Traverser() + { + public void process(SWGObject passenger) + { + if (passenger != owner) dismount(rider, mount); } }); } + // Remove rider from mount mount._remove(rider); - mount.notifyObservers(new UpdateContainmentMessage(rider.getObjectID(), 0, -1), false); - - if (rider.getObjectID() == mount.getOwnerId()) { - mount.setState(StateStatus.MountedCreature, false); + + // Set mount states and stuff + if (rider.getObjectID() == mount.getOwnerId()) + { + mount.setStateBitmask(0); + mount.setState(State.MountedCreature, false); } - core.simulationService.add(rider, mount.getWorldPosition().x, mount.getWorldPosition().z, false); + // Set rider states and stuff + rider.setStateBitmask(0); + rider.setState(StateStatus.RidingMount, false); + rider.setPosture((byte) 0); + + // Update observers and quadtree + mount.notifyObservers(new UpdateContainmentMessage(rider.getObjectID(), 0, -1), true); core.simulationService.teleport(rider, mount.getWorldPosition(), mount.getOrientation(), 0); + core.simulationService.add(rider, mount.getWorldPosition().x, mount.getWorldPosition().z, false); - if (!mount.getTemplate().contains("vehicle") && rider.getObjectID() == mount.getOwnerId()) { + // Store mount if it's a creature + if (!mount.getTemplate().contains("vehicle") && rider.getObjectID() == mount.getOwnerId()) + { store(rider, mount); } } @@ -658,7 +720,7 @@ public class MountService implements INetworkDispatch { return; } - if (owner.getTefTime() > 0){ + if (owner.getTefTime() > 0) { owner.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:prose_cant_store_yet", owner.getTefTime()), DisplayType.Broadcast); return; } @@ -689,39 +751,37 @@ public class MountService implements INetworkDispatch { } public void storeAll(CreatureObject actor) { - while (getCompanion(actor) != null) { - store(actor, getCompanion(actor)); - } - - /* if (actor == null) { return; } - SWGObject datapad = actor.getSlottedObject("datapad"); - - if (datapad == null) { - return; - } - - datapad.viewChildren(actor, false, false, new Traverser() { + while (getCompanion(actor) != null) { + SWGObject mount = getCompanion(actor); - public void process(SWGObject pcd) { - if (pcd.getAttachment("companionId") != null) { - if (pcd.getSlottedObject("inventory") != null) { - LongAdder adder = new LongAdder(); - pcd.getSlottedObject("inventory").viewChildren(actor, false, false, (obj) -> adder.increment()); - - if (adder.intValue() == 0) { - long companionId = (pcd.getAttachment("companionId") == null) ? 0L : (Long) pcd.getAttachment("companionId"); - store(actor, (CreatureObject) core.objectService.getObject(companionId)); + SWGObject datapad = actor.getSlottedObject("datapad"); + + if (datapad == null) { + return; + } + + datapad.viewChildren(actor, false, false, new Traverser() { + + public void process(SWGObject pcd) { + if (pcd.getAttachment("companionId") != null && mount.getObjectID() == ((Long) pcd.getAttachment("companionId"))) { + if (pcd.getSlottedObject("inventory") != null) { + LongAdder adder = new LongAdder(); + pcd.getSlottedObject("inventory").viewChildren(actor, false, false, (obj) -> adder.increment()); + + if (adder.intValue() == 0) { + core.simulationService.remove(mount, mount.getWorldPosition().x, mount.getWorldPosition().z, true); + pcd.getSlottedObject("inventory").add(mount); + } } } } - } - - }); - */ + + }); + } } public void destroy(CreatureObject destroyer, SWGObject pcd) { diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java index f404adce..546fc3d2 100644 --- a/src/services/sui/SUIService.java +++ b/src/services/sui/SUIService.java @@ -100,7 +100,7 @@ public class SUIService implements INetworkDispatch { if (! admins.contains(owner.getCustomName()) && hoppers.contains(owner.getCustomName())){ // authorized for hopper // change radialOptions to hopper access - core.scriptService.callScript("scripts/radial/", "harvesterHopper", "createRadial", core, owner, target, request.getRadialOptions()); + core.scriptService.callScript("scripts/radial/", "structure/harvesterHopper", "createRadial", core, owner, target, request.getRadialOptions()); sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); return; } @@ -124,9 +124,9 @@ public class SUIService implements INetworkDispatch { if(target.getGrandparent() != null && target.getGrandparent().getAttachment("structureAdmins") != null) { - if(core.housingService.getPermissions(owner, target.getContainer()) && !getRadialFilename(target).equals("structure_management_terminal")) + if(core.housingService.getPermissions(owner, target.getContainer()) && !getRadialFilename(target).equals("structure/structure_management_terminal")) { - core.scriptService.callScript("scripts/radial/", "moveable", "createRadial", core, owner, target, request.getRadialOptions()); + core.scriptService.callScript("scripts/radial/", "structure/moveable", "createRadial", core, owner, target, request.getRadialOptions()); sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); return; }