From bd8d74d28c16c880d126afe7d7e3b1b47e10ce73 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sun, 13 Apr 2014 23:41:47 +0200 Subject: [PATCH 01/13] Items - Added Dire Fate items --- .../item_bracelet_l_set_bh_utility_b_01_01.py | 19 +++++++++++++++++++ .../item_bracelet_r_set_bh_utility_b_01_01.py | 19 +++++++++++++++++++ .../item_necklace_set_bh_utility_b_01_01.py | 17 +++++++++++++++++ .../ring/item_band_set_bh_utility_b_01_01.py | 19 +++++++++++++++++++ .../ring/item_ring_set_bh_utility_b_01_01.py | 19 +++++++++++++++++++ 5 files changed, 93 insertions(+) create mode 100644 scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_utility_b_01_01.py create mode 100644 scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_utility_b_01_01.py create mode 100644 scripts/object/tangible/wearables/necklace/item_necklace_set_bh_utility_b_01_01.py create mode 100644 scripts/object/tangible/wearables/ring/item_band_set_bh_utility_b_01_01.py create mode 100644 scripts/object/tangible/wearables/ring/item_ring_set_bh_utility_b_01_01.py 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 new file mode 100644 index 00000000..ddd2ac6f --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_bh_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_bracelet_l_set_bh_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_bh_utility_b_01_01') + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_b') + 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 new file mode 100644 index 00000000..1d0aa2c9 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_bh_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_bracelet_r_set_bh_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_bh_utility_b_01_01') + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_utility_b_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_utility_b_01_01.py new file mode 100644 index 00000000..7426c06e --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_bh_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_bh_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_bh_utility_b_01_01') + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_b') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_bh_utility_b_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_bh_utility_b_01_01.py new file mode 100644 index 00000000..4ec469c0 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_bh_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_bh_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_bh_utility_b_01_01') + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_b') + 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 new file mode 100644 index 00000000..0d16a24a --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_bh_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_bh_utility_b_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_bh_utility_b_01_01') + object.setStringAttribute('class_required', 'Bounty Hunter') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare', 1) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc', 2) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_bh_utility_b_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3') + object.setAttachment('setBonus', 'set_bonus_bh_utility_b') + return \ No newline at end of file From 7472def68aad6f737bd7cc945c0d0ed2b996916f Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 14 Apr 2014 00:41:41 +0200 Subject: [PATCH 02/13] Items - Added Heroism items Also added a Flamethrower to the frog since we didn't have one. --- scripts/commands/co_hw_dot.py | 3 - .../item_bracelet_l_set_hero_01_01.py | 18 +++++ .../item_bracelet_r_set_hero_01_01.py | 18 +++++ .../necklace/item_necklace_set_hero_01_01.py | 16 ++++ .../ring/item_band_set_hero_01_01.py | 18 +++++ .../ring/item_ring_set_hero_01_01.py | 18 +++++ src/services/DevService.java | 79 ++++++++----------- 7 files changed, 120 insertions(+), 50 deletions(-) create mode 100644 scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_hero_01_01.py create mode 100644 scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_hero_01_01.py create mode 100644 scripts/object/tangible/wearables/necklace/item_necklace_set_hero_01_01.py create mode 100644 scripts/object/tangible/wearables/ring/item_band_set_hero_01_01.py create mode 100644 scripts/object/tangible/wearables/ring/item_ring_set_hero_01_01.py diff --git a/scripts/commands/co_hw_dot.py b/scripts/commands/co_hw_dot.py index 3ce9825c..ca43a28e 100644 --- a/scripts/commands/co_hw_dot.py +++ b/scripts/commands/co_hw_dot.py @@ -12,9 +12,6 @@ def run(core, actor, target, commandString): if not weapon: return - if not weapon.getWeaponType() == 12: - return - elementalType = weapon.getElementalType() commandName = '' 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 new file mode 100644 index 00000000..3326feb5 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_l_set_hero_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_bracelet_l_set_hero_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_l_set_hero_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_hero_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3') + object.setAttachment('setBonus', 'set_bonus_hero') + 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 new file mode 100644 index 00000000..81be4417 --- /dev/null +++ b/scripts/object/tangible/wearables/bracelet/item_bracelet_r_set_hero_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_bracelet_r_set_hero_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_bracelet_r_set_hero_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_hero_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3') + object.setAttachment('setBonus', 'set_bonus_hero') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_necklace_set_hero_01_01.py b/scripts/object/tangible/wearables/necklace/item_necklace_set_hero_01_01.py new file mode 100644 index 00000000..efb1bc12 --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_necklace_set_hero_01_01.py @@ -0,0 +1,16 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_necklace_set_hero_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_necklace_set_hero_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_hero_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3') + object.setAttachment('setBonus', 'set_bonus_hero') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_band_set_hero_01_01.py b/scripts/object/tangible/wearables/ring/item_band_set_hero_01_01.py new file mode 100644 index 00000000..73f173b9 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_band_set_hero_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_hero_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_band_set_hero_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_hero_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3') + object.setAttachment('setBonus', 'set_bonus_hero') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_ring_set_hero_01_01.py b/scripts/object/tangible/wearables/ring/item_ring_set_hero_01_01.py new file mode 100644 index 00000000..2a2d0124 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_ring_set_hero_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_hero_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_ring_set_hero_01_01') + object.setIntAttribute('required_combat_level', 85) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_1') + object.setStringAttribute('@set_bonus:piece_bonus_count_4', '@set_bonus:set_bonus_hero_2') + object.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3') + object.setAttachment('setBonus', 'set_bonus_hero') + return \ No newline at end of file diff --git a/src/services/DevService.java b/src/services/DevService.java index b8ef3c31..967a0beb 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -292,20 +292,35 @@ public class DevService implements INetworkDispatch { return; case 33: - WeaponObject heavy = (WeaponObject) core.objectService.createObject("object/weapon/ranged/heavy/shared_som_lava_cannon_generic.iff", planet); - heavy.setIntAttribute("required_combat_level", 90); + WeaponObject heavy1 = (WeaponObject) core.objectService.createObject("object/weapon/ranged/heavy/shared_som_lava_cannon_generic.iff", planet); + heavy1.setIntAttribute("required_combat_level", 90); - heavy.setStringAttribute("class_required", "Commando"); - heavy.setDamageType("kinetic"); - heavy.setMinDamage(700); - heavy.setMaxDamage(1400); - heavy.setMaxRange(64); - heavy.setAttackSpeed(1); - heavy.setElementalType("heat"); - heavy.setElementalDamage(200); - heavy.setWeaponType(12); + heavy1.setStringAttribute("class_required", "Commando"); + heavy1.setDamageType("energy"); + heavy1.setMinDamage(700); + heavy1.setMaxDamage(1400); + heavy1.setMaxRange(64); + heavy1.setAttackSpeed(1); + heavy1.setElementalType("heat"); + heavy1.setElementalDamage(200); + heavy1.setWeaponType(12); - inventory.add(heavy); + inventory.add(heavy1); + + WeaponObject heavy2 = (WeaponObject) core.objectService.createObject("object/weapon/ranged/heavy/shared_som_republic_flamer.iff", planet); + heavy2.setIntAttribute("required_combat_level", 88); + + heavy2.setStringAttribute("class_required", "Commando"); + heavy2.setDamageType("energy"); + heavy2.setMinDamage(148); + heavy2.setMaxDamage(295); + heavy2.setMaxRange(20); + heavy2.setAttackSpeed((float) 0.25); + heavy2.setElementalType("heat"); + heavy2.setElementalDamage(28); + heavy2.setWeaponType(13); + + inventory.add(heavy2); return; case 40: TangibleObject ring = (TangibleObject) core.objectService.createObject("object/tangible/wearables/ring/shared_ring_s01.iff", planet); @@ -322,45 +337,15 @@ public class DevService implements INetworkDispatch { inventory.add(backpack); return; case 42: - TangibleObject heroismBand = (TangibleObject) core.objectService.createObject("object/tangible/wearables/ring/shared_ring_s01.iff", planet); - heroismBand.setStfFilename("static_item_n"); - heroismBand.setStfName("item_band_set_hero_01_01"); - heroismBand.setStringAttribute("@set_bonus:piece_bonus_count_3", "@set_bonus:set_bonus_hero_1"); - heroismBand.setStringAttribute("@set_bonus:piece_bonus_count_4", "@set_bonus:set_bonus_hero_2"); - heroismBand.setStringAttribute("@set_bonus:piece_bonus_count_5", "@set_bonus:set_bonus_hero_3"); - heroismBand.setAttachment("setBonus", "set_bonus_hero"); + TangibleObject heroismBand = (TangibleObject) core.objectService.createObject("object/tangible/wearables/ring/shared_ring_s04.iff", planet, "item_band_set_hero_01_01"); - TangibleObject heroismRing = (TangibleObject) core.objectService.createObject("object/tangible/wearables/ring/shared_ring_s01.iff", planet); - heroismRing.setStfFilename("static_item_n"); - heroismRing.setStfName("item_ring_set_hero_01_01"); - heroismRing.setStringAttribute("@set_bonus:piece_bonus_count_3", "@set_bonus:set_bonus_hero_1"); - heroismRing.setStringAttribute("@set_bonus:piece_bonus_count_4", "@set_bonus:set_bonus_hero_2"); - heroismRing.setStringAttribute("@set_bonus:piece_bonus_count_5", "@set_bonus:set_bonus_hero_3"); - heroismRing.setAttachment("setBonus", "set_bonus_hero"); + TangibleObject heroismRing = (TangibleObject) core.objectService.createObject("object/tangible/wearables/ring/shared_ring_s02.iff", planet, "item_ring_set_hero_01_01"); - TangibleObject heroismNecklace = (TangibleObject) core.objectService.createObject("object/tangible/wearables/necklace/shared_necklace_s01.iff", planet); - heroismNecklace.setStfFilename("static_item_n"); - heroismNecklace.setStfName("item_necklace_set_hero_01_01"); - heroismNecklace.setStringAttribute("@set_bonus:piece_bonus_count_3", "@set_bonus:set_bonus_hero_1"); - heroismNecklace.setStringAttribute("@set_bonus:piece_bonus_count_4", "@set_bonus:set_bonus_hero_2"); - heroismNecklace.setStringAttribute("@set_bonus:piece_bonus_count_5", "@set_bonus:set_bonus_hero_3"); - heroismNecklace.setAttachment("setBonus", "set_bonus_hero"); + TangibleObject heroismNecklace = (TangibleObject) core.objectService.createObject("object/tangible/wearables/necklace/shared_necklace_s10.iff", planet, "item_necklace_set_hero_01_01"); - TangibleObject heroismBraceletRight = (TangibleObject) core.objectService.createObject("object/tangible/wearables/bracelet/shared_bracelet_s02_r.iff", planet); - heroismBraceletRight.setStfFilename("static_item_n"); - heroismBraceletRight.setStfName("item_bracelet_r_set_hero_01_01"); - heroismBraceletRight.setStringAttribute("@set_bonus:piece_bonus_count_3", "@set_bonus:set_bonus_hero_1"); - heroismBraceletRight.setStringAttribute("@set_bonus:piece_bonus_count_4", "@set_bonus:set_bonus_hero_2"); - heroismBraceletRight.setStringAttribute("@set_bonus:piece_bonus_count_5", "@set_bonus:set_bonus_hero_3"); - heroismBraceletRight.setAttachment("setBonus", "set_bonus_hero"); + TangibleObject heroismBraceletRight = (TangibleObject) core.objectService.createObject("object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff", planet, "item_bracelet_r_set_hero_01_01"); - TangibleObject heroismBraceletLeft = (TangibleObject) core.objectService.createObject("object/tangible/wearables/bracelet/shared_bracelet_s02_l.iff", planet); - heroismBraceletLeft.setStfFilename("static_item_n"); - heroismBraceletLeft.setStfName("item_bracelet_l_set_hero_01_01"); - heroismBraceletLeft.setStringAttribute("@set_bonus:piece_bonus_count_3", "@set_bonus:set_bonus_hero_1"); - heroismBraceletLeft.setStringAttribute("@set_bonus:piece_bonus_count_4", "@set_bonus:set_bonus_hero_2"); - heroismBraceletLeft.setStringAttribute("@set_bonus:piece_bonus_count_5", "@set_bonus:set_bonus_hero_3"); - heroismBraceletLeft.setAttachment("setBonus", "set_bonus_hero"); + TangibleObject heroismBraceletLeft = (TangibleObject) core.objectService.createObject("object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff", planet, "item_bracelet_l_set_hero_01_01"); inventory.add(heroismBand); inventory.add(heroismRing); From 254c8c6e87568c43a3abed30597a135120bdb258 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 14 Apr 2014 00:42:22 +0200 Subject: [PATCH 03/13] Misc - Added system messages to Heroism --- scripts/equipment/bonus_sets/set_bonus_hero.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/equipment/bonus_sets/set_bonus_hero.py b/scripts/equipment/bonus_sets/set_bonus_hero.py index 95fbabe4..0b1b27c6 100644 --- a/scripts/equipment/bonus_sets/set_bonus_hero.py +++ b/scripts/equipment/bonus_sets/set_bonus_hero.py @@ -18,10 +18,13 @@ def handleChange(core, creature, set): if wornItems == 3: core.buffService.addBuffToCreature(creature, "set_bonus_hero_1", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_hero_1_sys', 0) elif wornItems == 4: core.buffService.addBuffToCreature(creature, "set_bonus_hero_2", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_hero_2_sys', 0) elif wornItems == 5: core.buffService.addBuffToCreature(creature, "set_bonus_hero_3", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_hero_3_sys', 0) else: core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_hero_1") core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_hero_2") From b5ec10f7efad52fac6cb1c8757b35a3b057a37e2 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 14 Apr 2014 00:43:07 +0200 Subject: [PATCH 04/13] Misc - Added system messages to 2-piece Jedi Bonus --- scripts/equipment/bonus_sets/set_bonus_jedi_robe.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/equipment/bonus_sets/set_bonus_jedi_robe.py b/scripts/equipment/bonus_sets/set_bonus_jedi_robe.py index fd45204d..734e9c89 100644 --- a/scripts/equipment/bonus_sets/set_bonus_jedi_robe.py +++ b/scripts/equipment/bonus_sets/set_bonus_jedi_robe.py @@ -35,5 +35,6 @@ def handleChange(core, creature, set): if wornItems == 2: core.buffService.addBuffToCreature(creature, "set_bonus_jedi_robe_1", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_jedi_robe_1_sys', 0) else: core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_jedi_robe_1") \ No newline at end of file From 5ebdfcb1678ac318c00d23886fadfd9bdfdafe7e Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 14 Apr 2014 00:43:28 +0200 Subject: [PATCH 05/13] Misc - Added system messages to Dire Fate --- scripts/equipment/bonus_sets/set_bonus_bh_utility_b.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/equipment/bonus_sets/set_bonus_bh_utility_b.py b/scripts/equipment/bonus_sets/set_bonus_bh_utility_b.py index 5f9e272d..ed612f4e 100644 --- a/scripts/equipment/bonus_sets/set_bonus_bh_utility_b.py +++ b/scripts/equipment/bonus_sets/set_bonus_bh_utility_b.py @@ -18,10 +18,13 @@ def handleChange(core, creature, set): if wornItems == 3: core.buffService.addBuffToCreature(creature, "set_bonus_bh_utility_b_1", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_bh_utility_b_1_sys', 0) elif wornItems == 4: core.buffService.addBuffToCreature(creature, "set_bonus_bh_utility_b_2", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_bh_utility_b_2_sys', 0) elif wornItems == 5: core.buffService.addBuffToCreature(creature, "set_bonus_bh_utility_b_3", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_bh_utility_b_3_sys', 0) else: core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_bh_utility_b_1") core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_bh_utility_b_2") From 1d4b530b2adf6870f83a924e3a41d1312925c8de Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 14 Apr 2014 01:23:13 +0200 Subject: [PATCH 06/13] Weapons - Updated starter weapons --- .../weapon/melee/polearm/weapon_polearm_02_03.py | 13 +++++++------ .../ranged/carbine/weapon_npe_carbine_bh_03_01.py | 14 +++++++------- .../ranged/carbine/weapon_npe_carbine_spy_03_01.py | 14 +++++++------- .../carbine/weapon_npe_commando_carbine_03_01.py | 14 +++++++------- .../ranged/pistol/item_npe_officer_sidearm.py | 12 ++++++------ .../pistol/item_npe_smuggler_han_solo_gun.py | 12 ++++++------ .../ranged/pistol/weapon_npe_medic_pistol_03_01.py | 12 ++++++------ 7 files changed, 46 insertions(+), 45 deletions(-) diff --git a/scripts/object/weapon/melee/polearm/weapon_polearm_02_03.py b/scripts/object/weapon/melee/polearm/weapon_polearm_02_03.py index c8e1804c..a730dfbb 100644 --- a/scripts/object/weapon/melee/polearm/weapon_polearm_02_03.py +++ b/scripts/object/weapon/melee/polearm/weapon_polearm_02_03.py @@ -6,10 +6,11 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('weapon_polearm_02_03') object.setIntAttribute('required_combat_level', 1) - object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 1) - object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Kinetic') - object.setStringAttribute('cat_wpn_damage.damage', '43-75') - object.setStringAttribute('cat_wpn_damage.wpn_range', '0-5m') - object.setStringAttribute('cat_wpn_damage.wpn_category', 'Polearm') - object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond()) + object.setAttackSpeed(1); + object.setMaxRange(5); + object.setDamageType("kinetic"); + object.setMinDamage(43); + object.setMaxDamage(75); + object.setWeaponType(7); + return return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py b/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py index 21afc76b..600a05a8 100644 --- a/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py +++ b/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py @@ -6,11 +6,11 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('weapon_npe_carbine_bh_03_01') object.setStringAttribute('class_required', 'Bounty Hunter') - object.setIntAttribute('required_combat_level', 1) - object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.6) - object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy') - object.setStringAttribute('cat_wpn_damage.damage', '17-43') - object.setStringAttribute('cat_wpn_damage.wpn_range', '0-35m') - object.setStringAttribute('cat_wpn_damage.wpn_category', 'Carbine') - object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond()) + object.setIntAttribute('required_combat_level', 1) + object.setAttackSpeed(0.6); + object.setMaxRange(35); + object.setDamageType("energy"); + object.setMinDamage(17); + object.setMaxDamage(43); + object.setWeaponType(1); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py b/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py index 53149824..bb153176 100644 --- a/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py +++ b/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py @@ -6,11 +6,11 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('weapon_npe_carbine_spy_03_01') object.setStringAttribute('class_required', 'Spy') - object.setIntAttribute('required_combat_level', 1) - object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.6) - object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy') - object.setStringAttribute('cat_wpn_damage.damage', '17-43') - object.setStringAttribute('cat_wpn_damage.wpn_range', '0-35m') - object.setStringAttribute('cat_wpn_damage.wpn_category', 'Carbine') - object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond()) + object.setIntAttribute('required_combat_level', 1) + object.setAttackSpeed(0.6); + object.setMaxRange(35); + object.setDamageType("energy"); + object.setMinDamage(17); + object.setMaxDamage(43); + object.setWeaponType(1); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py b/scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py index 681e8699..e707e4f4 100644 --- a/scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py +++ b/scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py @@ -6,11 +6,11 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('weapon_npe_commando_carbine_03_01') object.setStringAttribute('class_required', 'Commando') - object.setIntAttribute('required_combat_level', 1) - object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.6) - object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy') - object.setStringAttribute('cat_wpn_damage.damage', '20-40') - object.setStringAttribute('cat_wpn_damage.wpn_range', '0-35m') - object.setStringAttribute('cat_wpn_damage.wpn_category', 'Carbine') - object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond()) + object.setIntAttribute('required_combat_level', 1) + object.setAttackSpeed(0.6); + object.setMaxRange(35); + object.setDamageType("energy"); + object.setMinDamage(20); + object.setMaxDamage(40); + object.setWeaponType(1); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py b/scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py index 3600d8b4..b1c7fa0f 100644 --- a/scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py +++ b/scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py @@ -7,10 +7,10 @@ def setup(core, object): object.setDetailName('item_npe_officer_sidearm') object.setStringAttribute('class_required', 'Officer') object.setIntAttribute('required_combat_level', 1) - object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.4) - object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy') - object.setStringAttribute('cat_wpn_damage.damage', '15-25') - object.setStringAttribute('cat_wpn_damage.wpn_range', '0-35m') - object.setStringAttribute('cat_wpn_damage.wpn_category', 'Pistol') - object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond()) + object.setAttackSpeed(0.4); + object.setMaxRange(35); + object.setDamageType("energy"); + object.setMinDamage(15); + object.setMaxDamage(25); + object.setWeaponType(2); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py b/scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py index 4f615807..baef2e0b 100644 --- a/scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py +++ b/scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py @@ -7,10 +7,10 @@ def setup(core, object): object.setDetailName('item_npe_smuggler_han_solo_gun') object.setStringAttribute('class_required', 'Smuggler') object.setIntAttribute('required_combat_level', 1) - object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.4) - object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy') - object.setStringAttribute('cat_wpn_damage.damage', '13-27') - object.setStringAttribute('cat_wpn_damage.wpn_range', '0-35m') - object.setStringAttribute('cat_wpn_damage.wpn_category', 'Pistol') - object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond()) + object.setAttackSpeed(0.4); + object.setMaxRange(35); + object.setDamageType("energy"); + object.setMinDamage(13); + object.setMaxDamage(27); + object.setWeaponType(2); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py b/scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py index 4a68c9af..56169960 100644 --- a/scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py +++ b/scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py @@ -7,10 +7,10 @@ def setup(core, object): object.setDetailName('weapon_npe_medic_pistol_03_01') object.setStringAttribute('class_required', 'Medic') object.setIntAttribute('required_combat_level', 1) - object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.4) - object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy') - object.setStringAttribute('cat_wpn_damage.damage', '13-27') - object.setStringAttribute('cat_wpn_damage.wpn_range', '0-35m') - object.setStringAttribute('cat_wpn_damage.wpn_category', 'Pistol') - object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond()) + object.setAttackSpeed(0.4); + object.setMaxRange(35); + object.setDamageType("energy"); + object.setMinDamage(13); + object.setMaxDamage(27); + object.setWeaponType(2); return \ No newline at end of file From 48f6768299a87826c1982a01afafb07bfe8db936 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 14 Apr 2014 01:27:13 +0200 Subject: [PATCH 07/13] Items - Created scripts for Smuggler starter clothing The items lack the proper colour but the rest is fine. --- .../wearables/boots/item_smuggler_boots_02_01.py | 10 ++++++++++ .../wearables/pants/item_smuggler_pants_02_01.py | 10 ++++++++++ .../wearables/shirt/item_smuggler_shirt_02_01.py | 10 ++++++++++ .../wearables/vest/item_smuggler_vest_02_01.py | 10 ++++++++++ 4 files changed, 40 insertions(+) create mode 100644 scripts/object/tangible/wearables/boots/item_smuggler_boots_02_01.py create mode 100644 scripts/object/tangible/wearables/pants/item_smuggler_pants_02_01.py create mode 100644 scripts/object/tangible/wearables/shirt/item_smuggler_shirt_02_01.py create mode 100644 scripts/object/tangible/wearables/vest/item_smuggler_vest_02_01.py diff --git a/scripts/object/tangible/wearables/boots/item_smuggler_boots_02_01.py b/scripts/object/tangible/wearables/boots/item_smuggler_boots_02_01.py new file mode 100644 index 00000000..e589fa8e --- /dev/null +++ b/scripts/object/tangible/wearables/boots/item_smuggler_boots_02_01.py @@ -0,0 +1,10 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_smuggler_boots_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_smuggler_boots_02_01') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) + object.setStringAttribute('class_required', 'Smuggler') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/pants/item_smuggler_pants_02_01.py b/scripts/object/tangible/wearables/pants/item_smuggler_pants_02_01.py new file mode 100644 index 00000000..12b3bd30 --- /dev/null +++ b/scripts/object/tangible/wearables/pants/item_smuggler_pants_02_01.py @@ -0,0 +1,10 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_smuggler_pants_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_smuggler_pants_02_01') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) + object.setStringAttribute('class_required', 'Smuggler') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/shirt/item_smuggler_shirt_02_01.py b/scripts/object/tangible/wearables/shirt/item_smuggler_shirt_02_01.py new file mode 100644 index 00000000..c331d0b1 --- /dev/null +++ b/scripts/object/tangible/wearables/shirt/item_smuggler_shirt_02_01.py @@ -0,0 +1,10 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_smuggler_shirt_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_smuggler_shirt_02_01') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) + object.setStringAttribute('class_required', 'Smuggler') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/vest/item_smuggler_vest_02_01.py b/scripts/object/tangible/wearables/vest/item_smuggler_vest_02_01.py new file mode 100644 index 00000000..35c0cd30 --- /dev/null +++ b/scripts/object/tangible/wearables/vest/item_smuggler_vest_02_01.py @@ -0,0 +1,10 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_smuggler_vest_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_smuggler_vest_02_01') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) + object.setStringAttribute('class_required', 'Smuggler') + return \ No newline at end of file From 4546672c6783ed3c961b2a237ca647d518fb9bcf Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 14 Apr 2014 01:27:30 +0200 Subject: [PATCH 08/13] Items - Created scripts for Spy starter clothing --- .../tangible/wearables/boots/item_spy_boots_02_01.py | 10 ++++++++++ .../tangible/wearables/gloves/item_spy_gloves_02_01.py | 10 ++++++++++ .../tangible/wearables/pants/item_spy_pants_02_01.py | 10 ++++++++++ .../tangible/wearables/shirt/item_spy_shirt_02_01.py | 10 ++++++++++ 4 files changed, 40 insertions(+) create mode 100644 scripts/object/tangible/wearables/boots/item_spy_boots_02_01.py create mode 100644 scripts/object/tangible/wearables/gloves/item_spy_gloves_02_01.py create mode 100644 scripts/object/tangible/wearables/pants/item_spy_pants_02_01.py create mode 100644 scripts/object/tangible/wearables/shirt/item_spy_shirt_02_01.py diff --git a/scripts/object/tangible/wearables/boots/item_spy_boots_02_01.py b/scripts/object/tangible/wearables/boots/item_spy_boots_02_01.py new file mode 100644 index 00000000..caa1f917 --- /dev/null +++ b/scripts/object/tangible/wearables/boots/item_spy_boots_02_01.py @@ -0,0 +1,10 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_spy_boots_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_spy_boots_02_01') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) + object.setStringAttribute('class_required', 'Spy') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/gloves/item_spy_gloves_02_01.py b/scripts/object/tangible/wearables/gloves/item_spy_gloves_02_01.py new file mode 100644 index 00000000..f5f06373 --- /dev/null +++ b/scripts/object/tangible/wearables/gloves/item_spy_gloves_02_01.py @@ -0,0 +1,10 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_spy_gloves_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_spy_gloves_02_01') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) + object.setStringAttribute('class_required', 'Spy') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/pants/item_spy_pants_02_01.py b/scripts/object/tangible/wearables/pants/item_spy_pants_02_01.py new file mode 100644 index 00000000..a1021bf4 --- /dev/null +++ b/scripts/object/tangible/wearables/pants/item_spy_pants_02_01.py @@ -0,0 +1,10 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_spy_pants_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_spy_pants_02_01') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) + object.setStringAttribute('class_required', 'Spy') + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/shirt/item_spy_shirt_02_01.py b/scripts/object/tangible/wearables/shirt/item_spy_shirt_02_01.py new file mode 100644 index 00000000..8bda143e --- /dev/null +++ b/scripts/object/tangible/wearables/shirt/item_spy_shirt_02_01.py @@ -0,0 +1,10 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_spy_shirt_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_spy_shirt_02_01') + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) + object.setStringAttribute('class_required', 'Spy') + return \ No newline at end of file From 906db29a282903844006df9f700393e9a4fcfb57 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 14 Apr 2014 01:59:33 +0200 Subject: [PATCH 09/13] Misc - Added Hoth armor setbonus --- .../set_bonus_imperial_snow_armor.py | 45 +++++++++++++++++++ .../bonus_sets/set_bonus_rebel_snow_armor.py | 45 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 scripts/equipment/bonus_sets/set_bonus_imperial_snow_armor.py create mode 100644 scripts/equipment/bonus_sets/set_bonus_rebel_snow_armor.py diff --git a/scripts/equipment/bonus_sets/set_bonus_imperial_snow_armor.py b/scripts/equipment/bonus_sets/set_bonus_imperial_snow_armor.py new file mode 100644 index 00000000..fc245ba4 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_imperial_snow_armor.py @@ -0,0 +1,45 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_imperial_snow_armor") + + bonusSet.addRequiredItem("backpack_snowtrooper") + bonusSet.addRequiredItem("armor_snowtrooper_belt") + bonusSet.addRequiredItem("armor_snowtrooper_bicep_l") + bonusSet.addRequiredItem("armor_snowtrooper_bicep_r") + bonusSet.addRequiredItem("armor_snowtrooper_boots") + bonusSet.addRequiredItem("armor_snowtrooper_bracer_l") + bonusSet.addRequiredItem("armor_snowtrooper_bracer_r") + bonusSet.addRequiredItem("armor_snowtrooper_chest_plate") + bonusSet.addRequiredItem("armor_snowtrooper_gloves") + bonusSet.addRequiredItem("armor_snowtrooper_helmet") + bonusSet.addRequiredItem("armor_snowtrooper_leggings") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_imperial_snow_armor_3", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_imperial_snow_armor_3_sys', 0) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_imperial_snow_armor_5", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_imperial_snow_armor_5_sys', 0) + elif wornItems == 7: + core.buffService.addBuffToCreature(creature, "set_bonus_imperial_snow_armor_7", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_imperial_snow_armor_7_sys', 0) + elif wornItems == 9: + core.buffService.addBuffToCreature(creature, "set_bonus_imperial_snow_armor_9", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_imperial_snow_armor_9_sys', 0) + elif wornItems == 11: + core.buffService.addBuffToCreature(creature, "set_bonus_imperial_snow_armor_11", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_imperial_snow_armor_11_sys', 0) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_imperial_snow_armor_3") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_imperial_snow_armor_5") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_imperial_snow_armor_7") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_imperial_snow_armor_9") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_imperial_snow_armor_11") \ No newline at end of file diff --git a/scripts/equipment/bonus_sets/set_bonus_rebel_snow_armor.py b/scripts/equipment/bonus_sets/set_bonus_rebel_snow_armor.py new file mode 100644 index 00000000..bea743e8 --- /dev/null +++ b/scripts/equipment/bonus_sets/set_bonus_rebel_snow_armor.py @@ -0,0 +1,45 @@ +import sys +from services.equipment import BonusSetTemplate +from java.util import Vector + +def addBonusSet(core): + bonusSet = BonusSetTemplate("set_bonus_rebel_snow_armor") + + bonusSet.addRequiredItem("armor_rebel_snow_backpack") + bonusSet.addRequiredItem("armor_rebel_snow_belt") + bonusSet.addRequiredItem("armor_rebel_snow_boots") + bonusSet.addRequiredItem("armor_rebel_snow_chest_plate") + bonusSet.addRequiredItem("armor_rebel_snow_gloves") + bonusSet.addRequiredItem("armor_rebel_snow_helmet") + bonusSet.addRequiredItem("armor_rebel_snow_bicep_l") + bonusSet.addRequiredItem("armor_rebel_snow_bicep_r") + bonusSet.addRequiredItem("armor_rebel_snow_bracer_l") + bonusSet.addRequiredItem("armor_rebel_snow_bracer_r") + bonusSet.addRequiredItem("armor_rebel_snow_leggings") + + core.equipmentService.addBonusSetTemplate(bonusSet) + +def handleChange(core, creature, set): + wornItems = set.getWornTemplateCount(creature) + + if wornItems == 3: + core.buffService.addBuffToCreature(creature, "set_bonus_rebel_snow_armor_3", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_rebel_snow_armor_3_sys', 0) + elif wornItems == 5: + core.buffService.addBuffToCreature(creature, "set_bonus_rebel_snow_armor_5", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_imperial_snow_armor_5_sys', 0) + elif wornItems == 7: + core.buffService.addBuffToCreature(creature, "set_bonus_rebel_snow_armor_7", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_rebel_snow_armor_7_sys', 0) + elif wornItems == 9: + core.buffService.addBuffToCreature(creature, "set_bonus_rebel_snow_armor_9", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_rebel_snow_armor_9_sys', 0) + elif wornItems == 11: + core.buffService.addBuffToCreature(creature, "set_bonus_rebel_snow_armor_11", creature) + creature.sendSystemMessage('@set_bonus:set_bonus_rebel_snow_armor_11_sys', 0) + else: + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_rebel_snow_armor_3") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_rebel_snow_armor_5") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_rebel_snow_armor_7") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_rebel_snow_armor_9") + core.buffService.removeBuffFromCreatureByName(creature, "set_bonus_rebel_snow_armor_11") \ No newline at end of file From 6898380330b3aeec4bded70a35870b7493e3c91b Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Tue, 15 Apr 2014 01:19:30 +0200 Subject: [PATCH 10/13] Weapons - getDamageType() now returns a cleaner string --- src/resources/objects/weapon/WeaponObject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/resources/objects/weapon/WeaponObject.java index 392c206a..2cbb2d75 100644 --- a/src/resources/objects/weapon/WeaponObject.java +++ b/src/resources/objects/weapon/WeaponObject.java @@ -124,7 +124,7 @@ public class WeaponObject extends TangibleObject { } public String getDamageType() { - return getStringAttribute("cat_wpn_damage.wpn_damage_type"); + return getStringAttribute("cat_wpn_damage.wpn_damage_type").replace("@obj_attr_n:armor_eff_", ""); } public void setDamageType(String damageType) { From a385b87e3b6f85cd528cf6d68cfde29618f0c4ad Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Tue, 15 Apr 2014 02:35:30 +0200 Subject: [PATCH 11/13] Weapons - Fixed #446 --- src/resources/objects/weapon/WeaponObject.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/resources/objects/weapon/WeaponObject.java index 2cbb2d75..1ff97a03 100644 --- a/src/resources/objects/weapon/WeaponObject.java +++ b/src/resources/objects/weapon/WeaponObject.java @@ -174,6 +174,7 @@ public class WeaponObject extends TangibleObject { else setIntAttribute("cat_wpn_damage.wpn_attack_speed", (int) attackSpeed); + setIntAttribute("cat_wpn_damage.dps", getDamagePerSecond()); } public WeaponMessageBuilder getMessageBuilder() { From d3215407f39cd29e4282b2a2543d8803b17c905a Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Tue, 15 Apr 2014 17:38:28 +0200 Subject: [PATCH 12/13] Weapons - Created datatable of WeaponTypes --- src/resources/datatables/WeaponType.java | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/resources/datatables/WeaponType.java diff --git a/src/resources/datatables/WeaponType.java b/src/resources/datatables/WeaponType.java new file mode 100644 index 00000000..0dab788a --- /dev/null +++ b/src/resources/datatables/WeaponType.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * 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 WeaponType { + + public static int RIFLE = 0; + public static int CARBINE = 1; + public static int PISTOL = 2; + public static int ONEHANDEDMELEE = 4; + public static int TWOHANDEDMELEE = 5; + public static int UNARMED = 6; + public static int POLEARMMELEE = 7; + public static int THROWN = 8; + public static int ONEHANDEDSABER = 9; + public static int TWOHANDEDSABER = 10; + public static int POLEARMSABER = 11; + public static int HEAVYWEAPON = 12; + public static int FLAMETHROWER = 13; + +} From d1a0a3714b62ec5923caed12222467a5187e73ea Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Wed, 16 Apr 2014 16:47:10 +0200 Subject: [PATCH 13/13] Revert "Added Katarn Armor to frog" This reverts commit 8abfe0df41efb5411d2ff949d89009e03fa2cd48. --- src/services/DevService.java | 78 ------------------------------------ 1 file changed, 78 deletions(-) diff --git a/src/services/DevService.java b/src/services/DevService.java index 35d4a377..93b8bf30 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -119,7 +119,6 @@ public class DevService implements INetworkDispatch { suiOptions.put((long) 70, "Bone"); suiOptions.put((long) 71, "Ithorian Defender"); suiOptions.put((long) 72, "Kashyyykian Black Mountain"); - suiOptions.put((long) 73, "Neutral Katarn Armor"); break; case 8: // [Items] Reconnaissance Armor suiOptions.put((long) 80, "Marauder"); @@ -778,83 +777,6 @@ public class DevService implements INetworkDispatch { inventory.add(moun_leggings); inventory.add(moun_chest); - - - return; - case 73: // Neutral Katarn Armor - SWGObject nka_bicep_r = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bicep_r.iff", planet); - nka_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 5664); - nka_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5664); - nka_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5664); - nka_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5664); - nka_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5664); - nka_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5664); - - SWGObject nka_bicep_l = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bicep_l.iff", planet); - nka_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 5664); - nka_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5664); - nka_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5664); - nka_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5664); - nka_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5664); - nka_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5664); - - SWGObject nka_bracer_r = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bracer_r.iff", planet); - nka_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 5664); - nka_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5664); - nka_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5664); - nka_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5664); - nka_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5664); - nka_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5664); - - SWGObject nka_bracer_l = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bracer_l.iff", planet); - nka_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 5664); - nka_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5664); - nka_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5664); - nka_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5664); - nka_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5664); - nka_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5664); - - SWGObject nka_leggings = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_leggings.iff", planet); - nka_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 5664); - nka_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5664); - nka_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5664); - nka_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5664); - nka_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5664); - nka_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5664); - - SWGObject nka_helmet = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_helmet.iff", planet); - nka_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 5664); - nka_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5664); - nka_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5664); - nka_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5664); - nka_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5664); - nka_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5664); - - SWGObject nka_chest = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_chest_plate.iff", planet); - nka_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 5664); - nka_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5664); - nka_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5664); - nka_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5664); - nka_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5664); - nka_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5664); - - SWGObject nka_belt = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_belt.iff", planet); - SWGObject nka_boots = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_boots.iff", planet); - SWGObject nka_gloves = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_gloves.iff", planet); - - - - inventory.add(nka_bicep_r); - inventory.add(nka_bicep_l); - inventory.add(nka_bracer_r); - inventory.add(nka_bracer_l); - inventory.add(nka_leggings); - inventory.add(nka_helmet); - inventory.add(nka_chest); - inventory.add(nka_belt); - inventory.add(nka_boots); - inventory.add(nka_gloves); - return; case 80: // Marauder Armor