From 85b8f0b1ed92e7e2d1c758ec1011f20d5c52eeb9 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 01:42:22 +0200 Subject: [PATCH 01/15] Added Experimental Electrobinoculars --- .../item_consumable_detect_hidden_02_04.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py new file mode 100644 index 00000000..6b52f198 --- /dev/null +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'object/usable') + object.setStfFilename('static_item_n') + object.setStfName('item_consumable_detect_hidden_02_04') + object.setDetailFilename('static_item_d') + object.setDetailName('item_consumable_detect_hidden_02_04') + return \ No newline at end of file From 9e368e6b84ea9551c8dcd388ec32541ac7e3f4b6 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 01:42:34 +0200 Subject: [PATCH 02/15] Added Superior Electrobinoculars --- .../item_consumable_detect_hidden_02_03.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py new file mode 100644 index 00000000..cd4de72b --- /dev/null +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'object/usable') + object.setStfFilename('static_item_n') + object.setStfName('item_consumable_detect_hidden_02_03') + object.setDetailFilename('static_item_d') + object.setDetailName('item_consumable_detect_hidden_02_03') + return \ No newline at end of file From 1e5e997755f76cd9331a6b7a073d0e913702ad25 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 01:47:06 +0200 Subject: [PATCH 03/15] Added Advanced Electrobinoculars --- .../item_consumable_detect_hidden_02_02.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py new file mode 100644 index 00000000..467bb575 --- /dev/null +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'object/usable') + object.setStfFilename('static_item_n') + object.setStfName('item_consumable_detect_hidden_02_02') + object.setDetailFilename('static_item_d') + object.setDetailName('item_consumable_detect_hidden_02_02') + return \ No newline at end of file From ed509f46c658c65622be652a0d7796d8c0a8e398 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 01:55:47 +0200 Subject: [PATCH 04/15] Added Electrobinoculars --- .../item_consumable_detect_hidden_02_01.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py new file mode 100644 index 00000000..d21ff8b0 --- /dev/null +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'object/usable') + object.setStfFilename('static_item_n') + object.setStfName('item_consumable_detect_hidden_02_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_consumable_detect_hidden_02_01') + return \ No newline at end of file From de7571aa4f3d2f10598e5bfc3de0abc5021a7c77 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 04:02:44 +0200 Subject: [PATCH 05/15] Added buffs to factional electrobinoculars --- .../gcw/pvp_rank_rewards/pvp_rebel_battle_banner.py | 1 + .../generic_usable/item_consumable_detect_hidden_02_01.py | 5 +++++ .../generic_usable/item_consumable_detect_hidden_02_02.py | 5 +++++ .../generic_usable/item_consumable_detect_hidden_02_03.py | 5 +++++ .../generic_usable/item_consumable_detect_hidden_02_04.py | 7 ++++++- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/scripts/object/tangible/gcw/pvp_rank_rewards/pvp_rebel_battle_banner.py b/scripts/object/tangible/gcw/pvp_rank_rewards/pvp_rebel_battle_banner.py index ccad8904..1edf1ba9 100644 --- a/scripts/object/tangible/gcw/pvp_rank_rewards/pvp_rebel_battle_banner.py +++ b/scripts/object/tangible/gcw/pvp_rank_rewards/pvp_rebel_battle_banner.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setIntAttribute('no_trade', 1) return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py index d21ff8b0..66111d54 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py @@ -6,4 +6,9 @@ def setup(core, object): object.setStfName('item_consumable_detect_hidden_02_01') object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_01') + object.setIntAttribute('reuse_time', 5) + object.setIntAttribute('num_in_stack' 8) + object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable20') + return + return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py index 467bb575..aabd0b55 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py @@ -6,4 +6,9 @@ def setup(core, object): object.setStfName('item_consumable_detect_hidden_02_02') object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_02') + object.setIntAttribute('reuse_time', 5) + object.setIntAttribute('num_in_stack' 8) + object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable40') + return + return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py index cd4de72b..a9188a59 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py @@ -6,4 +6,9 @@ def setup(core, object): object.setStfName('item_consumable_detect_hidden_02_03') object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_03') + object.setIntAttribute('reuse_time', 5) + object.setIntAttribute('num_in_stack' 8) + object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable65') + return + return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py index 6b52f198..1814ad32 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py @@ -6,4 +6,9 @@ def setup(core, object): object.setStfName('item_consumable_detect_hidden_02_04') object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_04') - return \ No newline at end of file + object.setIntAttribute('reuse_time', 5) + object.setIntAttribute('num_in_stack' 8) + object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable100') + return + + \ No newline at end of file From a2e6b77624e1e2d107b55a2da1f7da434fa781d7 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 04:32:45 +0200 Subject: [PATCH 06/15] Added Exceptional Rebel DL-44 Pistol --- .../ranged/pistol/exceptional_pistol_rebel.py | 16 ---------------- ...pon_pistol_pvp_rebel_general_reward_06_01.py | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 scripts/object/weapon/ranged/pistol/exceptional_pistol_rebel.py create mode 100644 scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py diff --git a/scripts/object/weapon/ranged/pistol/exceptional_pistol_rebel.py b/scripts/object/weapon/ranged/pistol/exceptional_pistol_rebel.py deleted file mode 100644 index 647c61de..00000000 --- a/scripts/object/weapon/ranged/pistol/exceptional_pistol_rebel.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def exceptionalPistol(core, object, owner): - object = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44.iff', owner.getPlanet()) - object.setStringAttribute('required_skill', 'None') - object.setStringAttribute('faction_restriction', 'Rebel') - object.setAttackSpeed(0.4); - object.setCustomName('Exceptional Rebel DL44 Pistol'); - object.setMaxRange(35); - object.setDamageType("energy"); - object.setMinDamage(275); - object.setMaxDamage(518); - object.setWeaponType(2); - inventory = owner.getSlottedObject('inventory') - inventory.add(object) - return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py b/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py new file mode 100644 index 00000000..66c27d1d --- /dev/null +++ b/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py @@ -0,0 +1,17 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setStringAttribute('faction_restriction', 'Rebel') + object.setStfFilename('static_item_n') + object.setStfName('weapon_pistol_pvp_rebel_general_reward_06_01') + object.setDetailFilename('static_item_d') + object.setDetailName('weapon_pistol_pvp_rebel_general_reward_06_01') + object.setAttackSpeed(0.4); + object.setCustomName('Exceptional Rebel DL44 Pistol'); + object.setMaxRange(35); + object.setDamageType('energy'); + object.setMinDamage(275); + object.setMaxDamage(518); + object.setWeaponType(WeaponType.PISTOL); + return \ No newline at end of file From 6024ad324157d3b5b261e865312e4cfd0ae568b3 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 04:33:47 +0200 Subject: [PATCH 07/15] Changed GCW Rebel Rewards script Made a few changes that generally reduced the length of the script. A couple more improvements can be made, since there still are a couple lines of code that are repeating quite often. --- scripts/gcw_rewards_rebel.py | 322 +++++++---------------------------- 1 file changed, 57 insertions(+), 265 deletions(-) diff --git a/scripts/gcw_rewards_rebel.py b/scripts/gcw_rewards_rebel.py index 24920ad2..25a39969 100644 --- a/scripts/gcw_rewards_rebel.py +++ b/scripts/gcw_rewards_rebel.py @@ -9,222 +9,63 @@ from java.lang import Long from java.util import Map from java.util import TreeMap from resources.datatables import GcwRank +from resources.datatables import WeaponType import main.NGECore from services.gcw import GCWService import sys import math -def handleRebelItems1 (core, owner, target, option): +def handleRebelItems1 (core, owner): actor = owner.getSlottedObject('ghost') window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') - window.setProperty('Prompt.lblPrompt:Text', 'Items') - if actor.getCurrentRank() == GcwRank.PRIVATE: - window.addListBoxMenuItem('Private',0) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - if actor.getCurrentRank() == GcwRank.TROOPER: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); + if actor.getCurrentRank() >= GcwRank.PRIVATE: + window.addListBoxMenuItem('Private', 0) + + if actor.getCurrentRank() >= GcwRank.TROOPER: + window.addListBoxMenuItem('Trooper', 1) + + if actor.getCurrentRank() >= GcwRank.HIGHTROOPER: + window.addListBoxMenuItem('High Trooper', 2) + + if actor.getCurrentRank() >= GcwRank.SERGEANT: + window.addListBoxMenuItem('Sergeant', 3) + + if actor.getCurrentRank() >= GcwRank.SENIORSERGEANT: + window.addListBoxMenuItem('Senior Sergeant', 4) + + if actor.getCurrentRank() >= GcwRank.SERGEANTMAJOR: + window.addListBoxMenuItem('Sergeant Major', 5) - - if actor.getCurrentRank() == GcwRank.HIGHTROOPER: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); + if actor.getCurrentRank() >= GcwRank.LIEUTENANT: + window.addListBoxMenuItem('Lieutenant', 6) - - if actor.getCurrentRank() == GcwRank.SERGEANT: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); + if actor.getCurrentRank() >= GcwRank.CAPTAIN: + window.addListBoxMenuItem('Captain', 7) + if actor.getCurrentRank() >= GcwRank.MAJOR: + window.addListBoxMenuItem('Major', 8) - if actor.getCurrentRank() == GcwRank.SENIORSERGEANT: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - window.addListBoxMenuItem('Senior Sergeant',4) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); + if actor.getCurrentRank() >= GcwRank.COMMANDER: + window.addListBoxMenuItem('Commander', 9) + + if actor.getCurrentRank() >= GcwRank.COLONEL: + window.addListBoxMenuItem('Colonel', 10) + + if actor.getCurrentRank() >= GcwRank.GENERAL: + window.addListBoxMenuItem('General', 11) - - if actor.getCurrentRank() == GcwRank.SERGEANTMAJOR: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - window.addListBoxMenuItem('Senior Sergeant',4) - window.addListBoxMenuItem('Sergeant Major',5) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); - - - if actor.getCurrentRank() == GcwRank.LIEUTENANT: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - window.addListBoxMenuItem('Senior Sergeant',4) - window.addListBoxMenuItem('Sergeant Major',5) - window.addListBoxMenuItem('Lieutenant',6) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); - - - if actor.getCurrentRank() == GcwRank.CAPTAIN: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - window.addListBoxMenuItem('Senior Sergeant',4) - window.addListBoxMenuItem('Sergeant Major',5) - window.addListBoxMenuItem('Lieutenant',6) - window.addListBoxMenuItem('Captain',7) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); - - - if actor.getCurrentRank() == GcwRank.MAJOR: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - window.addListBoxMenuItem('Senior Sergeant',4) - window.addListBoxMenuItem('Sergeant Major',5) - window.addListBoxMenuItem('Lieutenant',6) - window.addListBoxMenuItem('Captain',7) - window.addListBoxMenuItem('Major',8) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); - - - if actor.getCurrentRank() == GcwRank.COMMANDER: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - window.addListBoxMenuItem('Senior Sergeant',4) - window.addListBoxMenuItem('Sergeant Major',5) - window.addListBoxMenuItem('Lieutenant',6) - window.addListBoxMenuItem('Captain',7) - window.addListBoxMenuItem('Major',8) - window.addListBoxMenuItem('Commander',9) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); - - - if actor.getCurrentRank() == GcwRank.COLONEL: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - window.addListBoxMenuItem('Senior Sergeant',4) - window.addListBoxMenuItem('Sergeant Major',5) - window.addListBoxMenuItem('Lieutenant',6) - window.addListBoxMenuItem('Captain',7) - window.addListBoxMenuItem('Major',8) - window.addListBoxMenuItem('Commander',9) - window.addListBoxMenuItem('Colonel',10) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); - - - if actor.getCurrentRank() == GcwRank.GENERAL: - window.addListBoxMenuItem('Private',0) - window.addListBoxMenuItem('Trooper',1) - window.addListBoxMenuItem('High Trooper',2) - window.addListBoxMenuItem('Sergeant',3) - window.addListBoxMenuItem('Senior Sergeant',4) - window.addListBoxMenuItem('Sergeant Major',5) - window.addListBoxMenuItem('Lieutenant',6) - window.addListBoxMenuItem('Captain',7) - window.addListBoxMenuItem('Major',8) - window.addListBoxMenuItem('Commander',9) - window.addListBoxMenuItem('Colonel',10) - window.addListBoxMenuItem('General',11) - window.setProperty('btnOk:visible', 'True') - window.setProperty('btnCancel:visible', 'True') - window.setProperty('btnOk:Text', '@ok') - window.setProperty('btnCancel:Text', '@cancel') - returnList = Vector() - returnList.add('List.lstList:SelectedRow') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setRebelBox1Callback) - core.suiService.openSUIWindow(window); - - + core.suiService.openSUIWindow(window); def setRebelBox1Callback(owner, window, eventType, returnList): if returnList.size()==0: @@ -976,12 +817,7 @@ def electrobinoculars(object, owner): if owner.getCashCredits() >= 15000: owner.setCashCredits(owner.getCashCredits() - 15000) core = main.NGECore.getInstance() - electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet()) - electrobinoculars.setAttachment('radial_filename', 'object/usable') - electrobinoculars.setStfFilename('static_item_n') - electrobinoculars.setStfName('item_consumable_detect_hidden_02_01') - electrobinoculars.setDetailFilename('static_item_d') - electrobinoculars.setDetailName('item_consumable_detect_hidden_02_01') + electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet(), 'item_consumable_detect_hidden_02_01') inventory = owner.getSlottedObject('inventory') inventory.add(electrobinoculars) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -991,12 +827,7 @@ def advancedElectrobinoculars(object, owner): if owner.getCashCredits() >= 22500: owner.setCashCredits(owner.getCashCredits() - 22500) core = main.NGECore.getInstance() - electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet()) - electrobinoculars.setAttachment('radial_filename', 'object/usable') - electrobinoculars.setStfFilename('static_item_n') - electrobinoculars.setStfName('item_consumable_detect_hidden_02_02') - electrobinoculars.setDetailFilename('static_item_d') - electrobinoculars.setDetailName('item_consumable_detect_hidden_02_02') + electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet(), 'item_consumable_detect_hidden_02_02') inventory = owner.getSlottedObject('inventory') inventory.add(electrobinoculars) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1006,12 +837,7 @@ def superiorElectrobinoculars(object, owner): if owner.getCashCredits() >= 30000: owner.setCashCredits(owner.getCashCredits() - 30000) core = main.NGECore.getInstance() - electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet()) - electrobinoculars.setAttachment('radial_filename', 'object/usable') - electrobinoculars.setStfFilename('static_item_n') - electrobinoculars.setStfName('item_consumable_detect_hidden_02_03') - electrobinoculars.setDetailFilename('static_item_d') - electrobinoculars.setDetailName('item_consumable_detect_hidden_02_03') + electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet(), 'item_consumable_detect_hidden_02_03') inventory = owner.getSlottedObject('inventory') inventory.add(electrobinoculars) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1021,12 +847,7 @@ def experimentalElectrobinoculars(object, owner): if owner.getCashCredits() >= 37500: owner.setCashCredits(owner.getCashCredits() - 37500) core = main.NGECore.getInstance() - electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s1_generic.iff', owner.getPlanet()) - electrobinoculars.setAttachment('radial_filename', 'object/usable') - electrobinoculars.setStfFilename('static_item_n') - electrobinoculars.setStfName('item_consumable_detect_hidden_02_04') - electrobinoculars.setDetailFilename('static_item_d') - electrobinoculars.setDetailName('item_consumable_detect_hidden_02_04') + electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s1_generic.iff', owner.getPlanet(), 'item_consumable_detect_hidden_02_04') inventory = owner.getSlottedObject('inventory') inventory.add(electrobinoculars) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1221,7 +1042,6 @@ def specOpsLeggings(object, owner): if owner.getCashCredits() >= 135000: owner.setCashCredits(owner.getCashCredits() - 135000) core = main.NGECore.getInstance() - print ('test1') leggings = core.objectService.createObject('object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_leggings.iff', owner.getPlanet()) inventory = owner.getSlottedObject('inventory') inventory.add(leggings) @@ -1342,16 +1162,7 @@ def crimsonPhoenixMedal(object, owner): if owner.getCashCredits() >= 240000: owner.setCashCredits(owner.getCashCredits() - 240000) core = main.NGECore.getInstance() - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_deepspace_rebel_f.iff', owner.getPlanet()) - necklace.setStfFilename('static_item_n') - necklace.setStfName('item_pvp_rebel_sergeant_major_medal_03_01') - necklace.setDetailFilename('static_item_d') - necklace.setDetailName('item_pvp_rebel_sergeant_major_medal_03_01') - necklace.setIntAttribute('no_trade', 1) - necklace.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 30) - necklace.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) - necklace.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 24) - necklace.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 24) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_deepspace_rebel_f.iff', owner.getPlanet(), 'item_pvp_rebel_sergeant_major_medal_03_01') inventory = owner.getSlottedObject('inventory') inventory.add(necklace) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1362,7 +1173,6 @@ def factionalBanner(object, owner): owner.setCashCredits(owner.getCashCredits() - 80000) core = main.NGECore.getInstance() banner = core.objectService.createObject('object/tangible/gcw/pvp_rank_rewards/shared_pvp_rebel_battle_banner.iff', owner.getPlanet()) - banner.setIntAttribute('no_trade', 1) inventory = owner.getSlottedObject('inventory') inventory.add(banner) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1372,16 +1182,7 @@ def colonelRing(object, owner): if owner.getCashCredits() >= 2800000: owner.setCashCredits(owner.getCashCredits() - 2800000) core = main.NGECore.getInstance() - ring = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s03.iff', owner.getPlanet()) - ring.setStfFilename('static_item_n') - ring.setStfName('item_pvp_rebel_colonel_signet_ring_05_01') - ring.setDetailFilename('static_item_d') - ring.setDetailName('item_pvp_rebel_colonel_signet_ring_05_01') - ring.setIntAttribute('no_trade', 1) - ring.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 24) - ring.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 60) - ring.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 24) - ring.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 24) + ring = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s03.iff', owner.getPlanet(), 'item_pvp_rebel_colonel_signet_ring_05_01') inventory = owner.getSlottedObject('inventory') inventory.add(ring) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1394,10 +1195,10 @@ def laserCarbine(object, owner): carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_laser.iff', owner.getPlanet()) carbine.setAttackSpeed(0.6) carbine.setMaxRange(50) - carbine.setDamageType("energy") + carbine.setDamageType('energy') carbine.setMinDamage(350) carbine.setMaxDamage(700) - carbine.setWeaponType(1) + carbine.setWeaponType(WeaponType.CARBINE) inventory = owner.getSlottedObject('inventory') inventory.add(carbine) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1410,10 +1211,10 @@ def scoutPistol(object, owner): pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', owner.getPlanet()) pistol.setAttackSpeed(0.4) pistol.setMaxRange(35); - pistol.setDamageType("kinetic"); + pistol.setDamageType('energy'); pistol.setMinDamage(80); pistol.setMaxDamage(130); - pistol.setWeaponType(2); + pistol.setWeaponType(WeaponType.PISTOL); inventory = owner.getSlottedObject('inventory') inventory.add(pistol) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1425,11 +1226,11 @@ def metalStaff(object, owner): core = main.NGECore.getInstance() staff = core.objectService.createObject('object/weapon/melee/polearm/shared_lance_staff_metal.iff', owner.getPlanet()) staff.setAttackSpeed(1.0); - staff.setMaxRange(35); - staff.setDamageType("kinetic"); + staff.setMaxRange(5); + staff.setDamageType('kinetic'); staff.setMinDamage(300); staff.setMaxDamage(400); - staff.setWeaponType(2); + staff.setWeaponType(WeaponType.POLEARMMELEE); inventory = owner.getSlottedObject('inventory') inventory.add(staff) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1439,16 +1240,7 @@ def windusGuile(object, owner): if owner.getCashCredits() >= 2000000: owner.setCashCredits(owner.getCashCredits() - 2000000) core = main.NGECore.getInstance() - windu = core.objectService.createObject('object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff', owner.getPlanet()) - windu.setCustomizationVariable('/private/index_color_1', 20) - windu.setStfFilename('static_item_n') - windu.setStfName('item_color_crystal_02_20') - windu.setDetailFilename('static_item_d') - windu.setDetailName('item_color_crystal_02_20') - windu.setIntAttribute('no_trade', 1) - windu.setStringAttribute('condition', '1000/1000') - windu.getAttributes().put("@obj_attr_n:color", "Windu's Guile") - windu.setAttachment('radial_filename', 'item/tunable') + windu = core.objectService.createObject('object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff', owner.getPlanet(), 'item_color_crystal_02_20') inventory = owner.getSlottedObject('inventory') inventory.add(windu) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1458,7 +1250,7 @@ def exceptionalPistol(object, owner): if owner.getCashCredits() >= 200000: owner.setCashCredits(owner.getCashCredits() - 200000) core = main.NGECore.getInstance() - core.scriptService.callScript("scripts/object/weapon/ranged/pistol/", "exceptional_pistol_rebel", "exceptionalPistol", core, object, owner); + core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44.iff', owner.getPlanet(), 'weapon_pistol_pvp_rebel_general_reward_06_01') elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): return From ad2091a9c3b866e24922ffe0ea952852af1813c1 Mon Sep 17 00:00:00 2001 From: Zing Date: Sun, 29 Jun 2014 19:53:19 -0700 Subject: [PATCH 08/15] Added Multiple Imperial rank reward scripts --- .../item_pvp_imperial_sergeant_major_medal_03_01.py | 12 ++++++++++++ .../item_pvp_imperial_colonel_signet_ring_05_01.py | 12 ++++++++++++ .../carbine/exceptional_e11_carbine_imperial.py | 13 +++++++++++++ .../carbine/imperial_sergeant_reward_carbine_e11.py | 13 +++++++++++++ .../pistol/imperial_segeant_reward_pistol_power5.py | 13 +++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 scripts/object/tangible/wearables/necklace/item_pvp_imperial_sergeant_major_medal_03_01.py create mode 100644 scripts/object/tangible/wearables/ring/item_pvp_imperial_colonel_signet_ring_05_01.py create mode 100644 scripts/object/weapon/ranged/carbine/exceptional_e11_carbine_imperial.py create mode 100644 scripts/object/weapon/ranged/carbine/imperial_sergeant_reward_carbine_e11.py create mode 100644 scripts/object/weapon/ranged/pistol/imperial_segeant_reward_pistol_power5.py diff --git a/scripts/object/tangible/wearables/necklace/item_pvp_imperial_sergeant_major_medal_03_01.py b/scripts/object/tangible/wearables/necklace/item_pvp_imperial_sergeant_major_medal_03_01.py new file mode 100644 index 00000000..b99f3c9c --- /dev/null +++ b/scripts/object/tangible/wearables/necklace/item_pvp_imperial_sergeant_major_medal_03_01.py @@ -0,0 +1,12 @@ +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_pvp_imperial_sergeant_major_medal_03_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_pvp_imperial_sergeant_major_medal_03_01') + object.setIntAttribute('no_trade', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 30) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 24) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 24) + return + \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_pvp_imperial_colonel_signet_ring_05_01.py b/scripts/object/tangible/wearables/ring/item_pvp_imperial_colonel_signet_ring_05_01.py new file mode 100644 index 00000000..df6386c3 --- /dev/null +++ b/scripts/object/tangible/wearables/ring/item_pvp_imperial_colonel_signet_ring_05_01.py @@ -0,0 +1,12 @@ +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_pvp_imperial_colonel_signet_ring_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_pvp_imperial_colonel_signet_ring_05_01') + object.setIntAttribute('no_trade', 1) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 24) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 60) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 24) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 24) + return + \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/exceptional_e11_carbine_imperial.py b/scripts/object/weapon/ranged/carbine/exceptional_e11_carbine_imperial.py new file mode 100644 index 00000000..67f080e0 --- /dev/null +++ b/scripts/object/weapon/ranged/carbine/exceptional_e11_carbine_imperial.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, object):: + object.setStringAttribute('required_skill', 'None') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setAttackSpeed(0.6); + object.setCustomName('Exceptional Imperial E-11 Carbine'); + object.setMaxRange(50); + object.setDamageType("energy"); + object.setMinDamage(310); + object.setMaxDamage(550); + object.setWeaponType(1); + return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/imperial_sergeant_reward_carbine_e11.py b/scripts/object/weapon/ranged/carbine/imperial_sergeant_reward_carbine_e11.py new file mode 100644 index 00000000..2c1d2cb9 --- /dev/null +++ b/scripts/object/weapon/ranged/carbine/imperial_sergeant_reward_carbine_e11.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, Object):: + object.setStringAttribute('required_skill', 'None') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setAttackSpeed(0.6); + object.setCustomName('Imperial E-11 Carbine'); + object.setMaxRange(50); + object.setDamageType("energy"); + object.setMinDamage(200); + object.setMaxDamage(350); + object.setWeaponType(1); + return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/imperial_segeant_reward_pistol_power5.py b/scripts/object/weapon/ranged/pistol/imperial_segeant_reward_pistol_power5.py new file mode 100644 index 00000000..e56e4ddb --- /dev/null +++ b/scripts/object/weapon/ranged/pistol/imperial_segeant_reward_pistol_power5.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, object):: + object.setStringAttribute('required_skill', 'None') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setAttackSpeed(0.4); + object.setCustomName('Imperial Power5 Pistol'); + object.setMaxRange(35); + object.setDamageType("energy"); + object.setMinDamage(90); + object.setMaxDamage(210); + object.setWeaponType(2); + return \ No newline at end of file From be9650db6b9b082fd2df8ac400ba9d69e43d6bf0 Mon Sep 17 00:00:00 2001 From: Zing Date: Sun, 29 Jun 2014 20:47:13 -0700 Subject: [PATCH 09/15] Fixed a few rebel rank reward items Rebel recruiter rewards can now be called by conversing with the recruiter again. Exceptional pistol is now deposited in inventory Binocular buff now adds to player Rebel Command Barc now generates correct vehicle --- scripts/conversation/reb_recruiter.py | 2 +- scripts/gcw_rewards_rebel.py | 11 ++++------- .../vehicle_deed/item_deed_barc_rebel_06_01.py | 15 +++++++++++++++ .../loot/generic_usable/binoculars_s1_generic.py | 6 ------ .../loot/generic_usable/binoculars_s2_generic.py | 10 ---------- .../item_consumable_detect_hidden_02_01.py | 4 +++- .../item_consumable_detect_hidden_02_02.py | 4 +++- .../item_consumable_detect_hidden_02_03.py | 4 +++- .../item_consumable_detect_hidden_02_04.py | 6 +++++- ...eapon_pistol_pvp_rebel_general_reward_06_01.py | 1 - 10 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 scripts/object/tangible/deed/vehicle_deed/item_deed_barc_rebel_06_01.py diff --git a/scripts/conversation/reb_recruiter.py b/scripts/conversation/reb_recruiter.py index 5c6ce3e7..8a8e2af0 100644 --- a/scripts/conversation/reb_recruiter.py +++ b/scripts/conversation/reb_recruiter.py @@ -126,7 +126,7 @@ def handleFirstScreen(core, actor, npc, selection): convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_rebel:s_332", percent, "TO", str(100 - percent))) return if selection == 2: - core.scriptService.callScript("scripts/", "gcw_rewards_rebel", "handleRebelItems1", core, actor, object, 0); + core.scriptService.callScript("scripts/", "gcw_rewards_rebel", "handleRebelItems1", core, actor); core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_rebel', 's_75') return return diff --git a/scripts/gcw_rewards_rebel.py b/scripts/gcw_rewards_rebel.py index 25a39969..5c86205e 100644 --- a/scripts/gcw_rewards_rebel.py +++ b/scripts/gcw_rewards_rebel.py @@ -917,12 +917,7 @@ def barcSpeeder(object, owner): if owner.getCashCredits() >= 2100000: owner.setCashCredits(owner.getCashCredits() - 2100000) core = main.NGECore.getInstance() - barc = core.objectService.createObject('object/tangible/deed/vehicle_deed/shared_barc_speeder_deed.iff', owner.getPlanet()) - barc.setStfFilename('static_item_n') - barc.setStfName('item_deed_barc_rebel_06_01') - barc.setDetailFilename('static_item_d') - barc.setDetailName('item_deed_barc_rebel_06_01') - barc.setIntAttribute('no_trade', 1) + barc = core.objectService.createObject('object/tangible/deed/vehicle_deed/shared_barc_speeder_deed.iff', owner.getPlanet(), 'item_deed_barc_rebel_06_01') inventory = owner.getSlottedObject('inventory') inventory.add(barc) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1250,7 +1245,9 @@ def exceptionalPistol(object, owner): if owner.getCashCredits() >= 200000: owner.setCashCredits(owner.getCashCredits() - 200000) core = main.NGECore.getInstance() - core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44.iff', owner.getPlanet(), 'weapon_pistol_pvp_rebel_general_reward_06_01') + pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44.iff', owner.getPlanet(), 'weapon_pistol_pvp_rebel_general_reward_06_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(pistol) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): return diff --git a/scripts/object/tangible/deed/vehicle_deed/item_deed_barc_rebel_06_01.py b/scripts/object/tangible/deed/vehicle_deed/item_deed_barc_rebel_06_01.py new file mode 100644 index 00000000..8b3a3713 --- /dev/null +++ b/scripts/object/tangible/deed/vehicle_deed/item_deed_barc_rebel_06_01.py @@ -0,0 +1,15 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'deeds/vehicleDeed') + object.setStfFilename('static_item_n') + object.setStfName('item_deed_barc_rebel_06_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_deed_barc_rebel_06_01') + object.setIntAttribute('no_trade', 1) + return + +def use(core, actor, object): + core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_barc_speeder_rebel.iff', 'object/intangible/vehicle/shared_barc_speeder_rebel_pcd.iff') + return + \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/binoculars_s1_generic.py b/scripts/object/tangible/loot/generic_usable/binoculars_s1_generic.py index 9124f885..ccad8904 100644 --- a/scripts/object/tangible/loot/generic_usable/binoculars_s1_generic.py +++ b/scripts/object/tangible/loot/generic_usable/binoculars_s1_generic.py @@ -1,10 +1,4 @@ import sys def setup(core, object): - object.setAttachment('radial_filename', 'object/usable') - return - -def use(core, actor, object): - if object.getStfName() == ('item_consumable_detect_hidden_02_04'): - core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable100', actor) return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/binoculars_s2_generic.py b/scripts/object/tangible/loot/generic_usable/binoculars_s2_generic.py index c3102575..ccad8904 100644 --- a/scripts/object/tangible/loot/generic_usable/binoculars_s2_generic.py +++ b/scripts/object/tangible/loot/generic_usable/binoculars_s2_generic.py @@ -1,14 +1,4 @@ import sys def setup(core, object): - object.setAttachment('radial_filename', 'object/usable') - return - -def use(core, actor, object): - if object.getStfName() == ('item_consumable_detect_hidden_02_01'): - core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable20', actor) - elif object.getStfName() == ('item_consumable_detect_hidden_02_02'): - core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable40', actor) - elif object.getStfName() == ('item_consumable_detect_hidden_02_03'): - core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable65', actor) return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py index 66111d54..0dad6dbc 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py @@ -7,8 +7,10 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_01') object.setIntAttribute('reuse_time', 5) - object.setIntAttribute('num_in_stack' 8) + object.setIntAttribute('num_in_stack', 8) object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable20') return +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable20', actor) return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py index aabd0b55..64a64c15 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py @@ -7,8 +7,10 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_02') object.setIntAttribute('reuse_time', 5) - object.setIntAttribute('num_in_stack' 8) + object.setIntAttribute('num_in_stack', 8) object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable40') return +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable40', actor) return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py index a9188a59..850a5731 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py @@ -7,8 +7,10 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_03') object.setIntAttribute('reuse_time', 5) - object.setIntAttribute('num_in_stack' 8) + object.setIntAttribute('num_in_stack', 8) object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable65') return +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable65', actor) return \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py index 1814ad32..41c2bfcb 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py @@ -7,8 +7,12 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_04') object.setIntAttribute('reuse_time', 5) - object.setIntAttribute('num_in_stack' 8) + object.setIntAttribute('num_in_stack', 8) object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable100') return +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable100', actor) + return + \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py b/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py index 66c27d1d..a68f47af 100644 --- a/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py +++ b/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py @@ -8,7 +8,6 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('weapon_pistol_pvp_rebel_general_reward_06_01') object.setAttackSpeed(0.4); - object.setCustomName('Exceptional Rebel DL44 Pistol'); object.setMaxRange(35); object.setDamageType('energy'); object.setMinDamage(275); From baa61a543f96d5720d07284bbaa5436f9e76c01b Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 14:25:11 +0200 Subject: [PATCH 10/15] Fixed several GCW reward weapons --- .../exceptional_e11_carbine_imperial.py | 18 +++++++++--------- .../imperial_sergeant_reward_carbine_e11.py | 18 +++++++++--------- .../imperial_segeant_reward_pistol_power5.py | 18 +++++++++--------- ...on_pistol_pvp_rebel_general_reward_06_01.py | 12 ++++++------ 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/scripts/object/weapon/ranged/carbine/exceptional_e11_carbine_imperial.py b/scripts/object/weapon/ranged/carbine/exceptional_e11_carbine_imperial.py index 67f080e0..655395ce 100644 --- a/scripts/object/weapon/ranged/carbine/exceptional_e11_carbine_imperial.py +++ b/scripts/object/weapon/ranged/carbine/exceptional_e11_carbine_imperial.py @@ -1,13 +1,13 @@ import sys +from resources.datatables import WeaponType -def setup(core, object):: - object.setStringAttribute('required_skill', 'None') +def setup(core, object): object.setStringAttribute('faction_restriction', 'Imperial') - object.setAttackSpeed(0.6); - object.setCustomName('Exceptional Imperial E-11 Carbine'); - object.setMaxRange(50); - object.setDamageType("energy"); - object.setMinDamage(310); - object.setMaxDamage(550); - object.setWeaponType(1); + object.setAttackSpeed(0.6) + object.setCustomName('Exceptional Imperial E-11 Carbine') + object.setMaxRange(50) + object.setDamageType('energy') + object.setMinDamage(310) + object.setMaxDamage(550) + object.setWeaponType(WeaponType.CARBINE) return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/imperial_sergeant_reward_carbine_e11.py b/scripts/object/weapon/ranged/carbine/imperial_sergeant_reward_carbine_e11.py index 2c1d2cb9..69ce568d 100644 --- a/scripts/object/weapon/ranged/carbine/imperial_sergeant_reward_carbine_e11.py +++ b/scripts/object/weapon/ranged/carbine/imperial_sergeant_reward_carbine_e11.py @@ -1,13 +1,13 @@ import sys +from resources.datatables import WeaponType -def setup(core, Object):: - object.setStringAttribute('required_skill', 'None') +def setup(core, object): object.setStringAttribute('faction_restriction', 'Imperial') - object.setAttackSpeed(0.6); - object.setCustomName('Imperial E-11 Carbine'); - object.setMaxRange(50); - object.setDamageType("energy"); - object.setMinDamage(200); - object.setMaxDamage(350); - object.setWeaponType(1); + object.setAttackSpeed(0.6) + object.setCustomName('Imperial E-11 Carbine') + object.setMaxRange(50) + object.setDamageType('energy') + object.setMinDamage(200) + object.setMaxDamage(350) + object.setWeaponType(WeaponType.CARBINE) return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/imperial_segeant_reward_pistol_power5.py b/scripts/object/weapon/ranged/pistol/imperial_segeant_reward_pistol_power5.py index e56e4ddb..5dfbea18 100644 --- a/scripts/object/weapon/ranged/pistol/imperial_segeant_reward_pistol_power5.py +++ b/scripts/object/weapon/ranged/pistol/imperial_segeant_reward_pistol_power5.py @@ -1,13 +1,13 @@ import sys +from resources.datatables import WeaponType -def setup(core, object):: - object.setStringAttribute('required_skill', 'None') +def setup(core, object): object.setStringAttribute('faction_restriction', 'Imperial') - object.setAttackSpeed(0.4); - object.setCustomName('Imperial Power5 Pistol'); - object.setMaxRange(35); - object.setDamageType("energy"); - object.setMinDamage(90); - object.setMaxDamage(210); - object.setWeaponType(2); + object.setAttackSpeed(0.4) + object.setCustomName('Imperial Power5 Pistol') + object.setMaxRange(35) + object.setDamageType('energy') + object.setMinDamage(90) + object.setMaxDamage(210) + object.setWeaponType(WeaponType.PISTOL) return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py b/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py index a68f47af..86fece0a 100644 --- a/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py +++ b/scripts/object/weapon/ranged/pistol/weapon_pistol_pvp_rebel_general_reward_06_01.py @@ -7,10 +7,10 @@ def setup(core, object): object.setStfName('weapon_pistol_pvp_rebel_general_reward_06_01') object.setDetailFilename('static_item_d') object.setDetailName('weapon_pistol_pvp_rebel_general_reward_06_01') - object.setAttackSpeed(0.4); - object.setMaxRange(35); - object.setDamageType('energy'); - object.setMinDamage(275); - object.setMaxDamage(518); - object.setWeaponType(WeaponType.PISTOL); + object.setAttackSpeed(0.4) + object.setMaxRange(35) + object.setDamageType('energy') + object.setMinDamage(275) + object.setMaxDamage(518) + object.setWeaponType(WeaponType.PISTOL) return \ No newline at end of file From 56edcdc95c4ad47a5c072b9be965b1918c73e976 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 16:25:08 +0200 Subject: [PATCH 11/15] Fixed factional electrobinoculars --- .../generic_usable/item_consumable_detect_hidden_02_01.py | 8 +++----- .../generic_usable/item_consumable_detect_hidden_02_02.py | 8 +++----- .../generic_usable/item_consumable_detect_hidden_02_03.py | 8 +++----- .../generic_usable/item_consumable_detect_hidden_02_04.py | 8 ++------ 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py index 0dad6dbc..4cb55547 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_01.py @@ -7,10 +7,8 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_01') object.setIntAttribute('reuse_time', 5) - object.setIntAttribute('num_in_stack', 8) + object.setUses(8) object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable20') + object.setAttachment('alternateBuffName', 'detectHiddenConsumable20') return - -def use(core, actor, object): - core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable20', actor) - return \ No newline at end of file + \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py index 64a64c15..e4bd5ded 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_02.py @@ -7,10 +7,8 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_02') object.setIntAttribute('reuse_time', 5) - object.setIntAttribute('num_in_stack', 8) + object.setUses(8) object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable40') + object.setAttachment('alternateBuffName', 'detectHiddenConsumable40') return - -def use(core, actor, object): - core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable40', actor) - return \ No newline at end of file + \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py index 850a5731..dbe9173e 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_03.py @@ -7,10 +7,8 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_03') object.setIntAttribute('reuse_time', 5) - object.setIntAttribute('num_in_stack', 8) + object.setUses(8) object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable65') + object.setAttachment('alternateBuffName', 'detectHiddenConsumable65') return - -def use(core, actor, object): - core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable65', actor) - return \ No newline at end of file + \ No newline at end of file diff --git a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py index 41c2bfcb..de881c2a 100644 --- a/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py +++ b/scripts/object/tangible/loot/generic_usable/item_consumable_detect_hidden_02_04.py @@ -7,12 +7,8 @@ def setup(core, object): object.setDetailFilename('static_item_d') object.setDetailName('item_consumable_detect_hidden_02_04') object.setIntAttribute('reuse_time', 5) - object.setIntAttribute('num_in_stack', 8) + object.setUses(8) object.setStringAttribute('proc_name', '@ui_buff:detecthiddenconsumable100') + object.setAttachment('alternateBuffName', 'detectHiddenConsumable100') return - -def use(core, actor, object): - core.buffService.addBuffToCreature(actor, 'detectHiddenConsumable100', actor) - return - \ No newline at end of file From 504a59b6871ca815938af557d45f7e9cdfe1cfdb Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 16:43:14 +0200 Subject: [PATCH 12/15] Changed Rebel GCW reward weapons to use templates --- scripts/gcw_rewards_rebel.py | 78 +++++++------------ .../melee/polearm/factional_metal_staff.py | 11 +++ .../ranged/carbine/factional_laser_carbine.py | 11 +++ .../ranged/pistol/factional_scout_pistol.py | 11 +++ 4 files changed, 63 insertions(+), 48 deletions(-) create mode 100644 scripts/object/weapon/melee/polearm/factional_metal_staff.py create mode 100644 scripts/object/weapon/ranged/carbine/factional_laser_carbine.py create mode 100644 scripts/object/weapon/ranged/pistol/factional_scout_pistol.py diff --git a/scripts/gcw_rewards_rebel.py b/scripts/gcw_rewards_rebel.py index 5c86205e..d0ac37cf 100644 --- a/scripts/gcw_rewards_rebel.py +++ b/scripts/gcw_rewards_rebel.py @@ -9,7 +9,6 @@ from java.lang import Long from java.util import Map from java.util import TreeMap from resources.datatables import GcwRank -from resources.datatables import WeaponType import main.NGECore from services.gcw import GCWService import sys @@ -18,7 +17,7 @@ import math def handleRebelItems1 (core, owner): actor = owner.getSlottedObject('ghost') - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.setProperty('btnOk:visible', 'True') @@ -65,7 +64,8 @@ def handleRebelItems1 (core, owner): if actor.getCurrentRank() >= GcwRank.GENERAL: window.addListBoxMenuItem('General', 11) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) + def setRebelBox1Callback(owner, window, eventType, returnList): if returnList.size()==0: @@ -114,7 +114,7 @@ def setRebelBox1Callback(owner, window, eventType, returnList): def privateHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') #window.addListBoxMenuItem('R2 Droid Schematic 165000',0) @@ -129,13 +129,13 @@ def privateHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, privateRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def trooperHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Tech Armoire 105000',0) @@ -153,13 +153,13 @@ def trooperHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, trooperRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def highTrooperHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Electrobinoculars 15000',0) @@ -173,13 +173,13 @@ def highTrooperHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, highTrooperRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def sergeantHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Laser Carbine 187500',0) @@ -192,13 +192,13 @@ def sergeantHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, sergeantRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def seniorSergeantHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Small Block Turret 120000',0) @@ -215,13 +215,13 @@ def seniorSergeantHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, seniorSergeantRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def sergeantMajorHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Medium Block Turret 150000', 0) @@ -238,13 +238,13 @@ def sergeantMajorHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, sergeantMajorRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def lieutenantHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Large Block Turret 210000',0) @@ -261,13 +261,13 @@ def lieutenantHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, lieutenantRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def captainHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Factional Banner 81600', 0) @@ -278,13 +278,13 @@ def captainHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, captainRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def majorHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Grey Spec Ops Armor Leggings 135000', 0) @@ -298,13 +298,13 @@ def majorHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, majorRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def commanderHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Grey Spec Ops Armor Left Bicep 120000', 0) @@ -321,13 +321,13 @@ def commanderHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, commanderRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def colonelHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Colonel Ring 2800000', 0) @@ -339,13 +339,13 @@ def colonelHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, colonelRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def generalHandler(owner): actor = owner.getSlottedObject('ghost') core = main.NGECore.getInstance() - window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0) window.setProperty('bg.caption.lblTitle:Text', 'Rebel Item Requisition') window.setProperty('Prompt.lblPrompt:Text', 'Items') window.addListBoxMenuItem('Windu\'s Guile 2000000', 0) @@ -361,7 +361,7 @@ def generalHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, generalRewards) - core.suiService.openSUIWindow(window); + core.suiService.openSUIWindow(window) return def privateRewards(owner, window, eventType, returnList): @@ -1187,13 +1187,7 @@ def laserCarbine(object, owner): if owner.getCashCredits() >= 187500: owner.setCashCredits(owner.getCashCredits() - 187500) core = main.NGECore.getInstance() - carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_laser.iff', owner.getPlanet()) - carbine.setAttackSpeed(0.6) - carbine.setMaxRange(50) - carbine.setDamageType('energy') - carbine.setMinDamage(350) - carbine.setMaxDamage(700) - carbine.setWeaponType(WeaponType.CARBINE) + carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_laser.iff', owner.getPlanet(), 'factional_laser_carbine') inventory = owner.getSlottedObject('inventory') inventory.add(carbine) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1203,13 +1197,7 @@ def scoutPistol(object, owner): if owner.getCashCredits() >= 40500: owner.setCashCredits(owner.getCashCredits() - 40500) core = main.NGECore.getInstance() - pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', owner.getPlanet()) - pistol.setAttackSpeed(0.4) - pistol.setMaxRange(35); - pistol.setDamageType('energy'); - pistol.setMinDamage(80); - pistol.setMaxDamage(130); - pistol.setWeaponType(WeaponType.PISTOL); + pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', owner.getPlanet(), 'factional_scout_pistol') inventory = owner.getSlottedObject('inventory') inventory.add(pistol) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): @@ -1219,13 +1207,7 @@ def metalStaff(object, owner): if owner.getCashCredits() >= 30000: owner.setCashCredits(owner.getCashCredits() - 30000) core = main.NGECore.getInstance() - staff = core.objectService.createObject('object/weapon/melee/polearm/shared_lance_staff_metal.iff', owner.getPlanet()) - staff.setAttackSpeed(1.0); - staff.setMaxRange(5); - staff.setDamageType('kinetic'); - staff.setMinDamage(300); - staff.setMaxDamage(400); - staff.setWeaponType(WeaponType.POLEARMMELEE); + staff = core.objectService.createObject('object/weapon/melee/polearm/shared_lance_staff_metal.iff', owner.getPlanet(), 'factional_metal_staff') inventory = owner.getSlottedObject('inventory') inventory.add(staff) elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): diff --git a/scripts/object/weapon/melee/polearm/factional_metal_staff.py b/scripts/object/weapon/melee/polearm/factional_metal_staff.py new file mode 100644 index 00000000..e54ac755 --- /dev/null +++ b/scripts/object/weapon/melee/polearm/factional_metal_staff.py @@ -0,0 +1,11 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setAttackSpeed(1.0) + object.setMaxRange(5) + object.setDamageType('kinetic') + object.setMinDamage(300) + object.setMaxDamage(400) + object.setWeaponType(WeaponType.POLEARMMELEE) + return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/factional_laser_carbine.py b/scripts/object/weapon/ranged/carbine/factional_laser_carbine.py new file mode 100644 index 00000000..833ae5dd --- /dev/null +++ b/scripts/object/weapon/ranged/carbine/factional_laser_carbine.py @@ -0,0 +1,11 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setAttackSpeed(0.6) + object.setMaxRange(50) + object.setDamageType('energy') + object.setMinDamage(350) + object.setMaxDamage(700) + object.setWeaponType(WeaponType.CARBINE) + return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/factional_scout_pistol.py b/scripts/object/weapon/ranged/pistol/factional_scout_pistol.py new file mode 100644 index 00000000..2fd8f2f1 --- /dev/null +++ b/scripts/object/weapon/ranged/pistol/factional_scout_pistol.py @@ -0,0 +1,11 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setAttackSpeed(0.4) + object.setMaxRange(35) + object.setDamageType('energy') + object.setMinDamage(80) + object.setMaxDamage(130) + object.setWeaponType(WeaponType.PISTOL) + return \ No newline at end of file From 6f7744845bf45ea377ee1eb8c5bbcad47978325f Mon Sep 17 00:00:00 2001 From: Zing Date: Mon, 30 Jun 2014 22:02:49 -0700 Subject: [PATCH 13/15] Added Imperial Rank reward setup Added Imperial Spec Ops Armor (need to find a way to FORCE primary color, it is only allowed to be white. Secondary color can be changed to black.) Added Imperial Command BARC Added Factional Weapons Added Painting Added Nova Necklace and Colonel Ring Changed Factional Recruiter script to allow Rewards. Added Imperial Comm Link (Does not call a pet) --- scripts/conversation/imp_recruiter.py | 9 +- scripts/gcw_rewards_imperial.py | 1451 +++++++++++++++++ .../item_deed_barc_imperial_06_01.py | 15 + ...utenant_comm_link_imperial_reward_04_01.py | 9 + .../painting/painting_pvp_reward_imperial.py | 6 +- ..._pvp_spec_ops_imperial_black_belt_05_01.py | 18 + ...p_spec_ops_imperial_black_bicep_l_05_01.py | 18 + ...p_spec_ops_imperial_black_bicep_r_05_01.py | 18 + ...pvp_spec_ops_imperial_black_boots_05_01.py | 18 + ..._spec_ops_imperial_black_bracer_l_05_01.py | 18 + ..._spec_ops_imperial_black_bracer_r_05_01.py | 18 + ...vp_spec_ops_imperial_black_gloves_05_01.py | 18 + ...vp_spec_ops_imperial_black_helmet_05_01.py | 18 + ..._spec_ops_imperial_black_leggings_05_01.py | 18 + ...or_stormtrooper_pvp_officer_chest_plate.py | 14 + ...pvp_imperial_sergeant_major_medal_03_01.py | 3 + .../weapon/melee/sword/factional_sword.py | 11 + .../ranged/carbine/factional_e11_carbine.py | 11 + ...weapon_carbine_pvp_general_reward_05_01.py | 13 + .../ranged/heavy/factional_rocket_launcher.py | 13 + .../ranged/pistol/factional_power_5_pistol.py | 11 + 21 files changed, 1720 insertions(+), 8 deletions(-) create mode 100644 scripts/gcw_rewards_imperial.py create mode 100644 scripts/object/tangible/deed/vehicle_deed/item_deed_barc_imperial_06_01.py create mode 100644 scripts/object/tangible/gcw/pvp_rank_rewards/item_pvp_lieutenant_comm_link_imperial_reward_04_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_helmet_05_01.py create mode 100644 scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_leggings_05_01.py create mode 100644 scripts/object/weapon/melee/sword/factional_sword.py create mode 100644 scripts/object/weapon/ranged/carbine/factional_e11_carbine.py create mode 100644 scripts/object/weapon/ranged/carbine/weapon_carbine_pvp_general_reward_05_01.py create mode 100644 scripts/object/weapon/ranged/heavy/factional_rocket_launcher.py create mode 100644 scripts/object/weapon/ranged/pistol/factional_power_5_pistol.py diff --git a/scripts/conversation/imp_recruiter.py b/scripts/conversation/imp_recruiter.py index 3b506483..1803a584 100644 --- a/scripts/conversation/imp_recruiter.py +++ b/scripts/conversation/imp_recruiter.py @@ -129,13 +129,8 @@ def handleFirstScreen(core, actor, npc, selection): return if selection == 2: - convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_90')) - - options = Vector() - options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_92'), 0)) - options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_96'), 1)) - convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen) - + core.scriptService.callScript("scripts/", "gcw_rewards_imperial", "handleImperialItems1", core, actor); + core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_90') return return elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.SpecialForces: diff --git a/scripts/gcw_rewards_imperial.py b/scripts/gcw_rewards_imperial.py new file mode 100644 index 00000000..f94cf77b --- /dev/null +++ b/scripts/gcw_rewards_imperial.py @@ -0,0 +1,1451 @@ +from resources.common import RadialOptions +from resources.common import OutOfBand +from protocol.swg import ResourceListForSurveyMessage +from services.sui.SUIService import MessageBoxType +from services.sui.SUIWindow import Trigger +from java.util import Vector +from java.lang import System +from java.lang import Long +from java.util import Map +from java.util import TreeMap +from resources.datatables import GcwRank +from resources.datatables import WeaponType +import main.NGECore +from services.gcw import GCWService +import sys +import math + + +def handleImperialItems1 (core, owner): + actor = owner.getSlottedObject('ghost') + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setImperialBox1Callback) + + if actor.getCurrentRank() >= GcwRank.PRIVATE: + window.addListBoxMenuItem('Private', 0) + + if actor.getCurrentRank() >= GcwRank.LANCECORPORAL: + window.addListBoxMenuItem('Lance Corporal', 1) + + if actor.getCurrentRank() >= GcwRank.CORPORAL: + window.addListBoxMenuItem('Corporal', 2) + + if actor.getCurrentRank() >= GcwRank.SERGEANT: + window.addListBoxMenuItem('Sergeant', 3) + + if actor.getCurrentRank() >= GcwRank.MASTERSERGEANT: + window.addListBoxMenuItem('Master Sergeant', 4) + + if actor.getCurrentRank() >= GcwRank.SERGEANTMAJOR: + window.addListBoxMenuItem('Sergeant Major', 5) + + if actor.getCurrentRank() >= GcwRank.LIEUTENANT: + window.addListBoxMenuItem('Lieutenant', 6) + + if actor.getCurrentRank() >= GcwRank.CAPTAIN: + window.addListBoxMenuItem('Captain', 7) + + if actor.getCurrentRank() >= GcwRank.MAJOR: + window.addListBoxMenuItem('Major', 8) + + if actor.getCurrentRank() >= GcwRank.LTCOLONEL: + window.addListBoxMenuItem('LT Colonel', 9) + + if actor.getCurrentRank() >= GcwRank.COLONEL: + window.addListBoxMenuItem('Colonel', 10) + + if actor.getCurrentRank() >= GcwRank.GENERAL: + window.addListBoxMenuItem('General', 11) + + core.suiService.openSUIWindow(window); +def setImperialBox1Callback(owner, window, eventType, returnList): + + if returnList.size()==0: + owner.sendSystemMessage('NULL', 0) + return + + if returnList.get(0)=='0': + privateHandler(owner) + return + if returnList.get(0)=='1': + lanceCorporalHandler(owner) + return + if returnList.get(0)=='2': + corporalHandler(owner) + return + if returnList.get(0)=='3': + sergeantHandler(owner) + return + if returnList.get(0)=='4': + masterSergeantHandler(owner) + return + if returnList.get(0)=='5': + sergeantMajorHandler(owner) + return + if returnList.get(0)=='6': + lieutenantHandler(owner) + return + if returnList.get(0)=='7': + captainHandler(owner) + return + if returnList.get(0)=='8': + majorHandler(owner) + return + if returnList.get(0)=='9': + ltColonelHandler(owner) + return + if returnList.get(0)=='10': + colonelHandler(owner) + return + if returnList.get(0)=='11': + generalHandler(owner) + return + + return + +def privateHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + #window.addListBoxMenuItem('R2 Droid Schematic 165000', 0) + #window.addListBoxMenuItem('R3 Droid Schematic 180000', 1) + #window.addListBoxMenuItem('R4 Droid Schematic 195000', 2) + #window.addListBoxMenuItem('DZ-70 Droid Schematic 225000', 3) + #window.addListBoxMenuItem('Proximity Caltrop Trap 3250' ,4) + #window.addListBoxMenuItem('Remote Caltrop Trap 4000', 5) + #window.addListBoxMenuItem('Proximity Flashbang Trap 3250', 6) + #window.addListBoxMenuItem('Remote Flashbang Trap 4000', 7) + #window.addListBoxMenuItem('Proximity HX2 Trap 3250', 8) + #window.addListBoxMenuItem('Remote HX2 Trap 4000', 9) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, privateRewards) + core.suiService.openSUIWindow(window); + return + +def lanceCorporalHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Tech Armoire 105000', 0) + window.addListBoxMenuItem('Tech Bookcase 105000', 1) + window.addListBoxMenuItem('Tech Cabinet 105000', 2) + window.addListBoxMenuItem('Tech Chest 75000', 3) + window.addListBoxMenuItem('Tech Couch 112500', 4) + window.addListBoxMenuItem('Tech Chair 75000', 5) + window.addListBoxMenuItem('Tech Coffee Table 75000', 6) + window.addListBoxMenuItem('Tech End Table 75000', 7) + window.addListBoxMenuItem('Data Terminal Slim 60000', 8) + window.addListBoxMenuItem('Data Terminal Standard 75000', 9) + window.addListBoxMenuItem('Data Terminal Bulky 90000', 10) + window.addListBoxMenuItem('Data Terminal Wall 105000', 11) + window.addListBoxMenuItem('Imperial Table 75000', 12) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, lanceCorporalRewards) + core.suiService.openSUIWindow(window); + return + +def corporalHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Electrobinoculars 15000', 0) + window.addListBoxMenuItem('Advanced Electrobinoculars 22500',1) + window.addListBoxMenuItem('Superior Electrobinoculars 30000', 2) + window.addListBoxMenuItem('Experimental Electrobinoculars 37500', 3) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, corporalRewards) + core.suiService.openSUIWindow(window); + return + +def sergeantHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Imperial Boots 37500', 0) + window.addListBoxMenuItem('Imperial Jacket 37500' ,1) + window.addListBoxMenuItem('Imperial Pants 37500', 2) + window.addListBoxMenuItem('Imperial Hat 37500', 3) + window.addListBoxMenuItem('Power5 Pistol 112500', 4) + window.addListBoxMenuItem('E-11 Carbine', 5) + window.addListBoxMenuItem('Sword 30000', 6) + window.addListBoxMenuItem('Rocket Launcher 150000', 7) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, sergeantRewards) + core.suiService.openSUIWindow(window); + return + +def masterSergeantHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Small Block Turret 120000',0) + window.addListBoxMenuItem('Small Dish Turret 120000',1) + window.addListBoxMenuItem('Small Tower Turret 120000',2) + window.addListBoxMenuItem('Painting Might of the Empire 375000',3) + #window.addListBoxMenuItem('DRX-55 Mine 12000',4) + #window.addListBoxMenuItem('SR-88 Cyro Mine 12000',5) + #window.addListBoxMenuItem('XG Mine 12000',6) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, masterSergeantRewards) + core.suiService.openSUIWindow(window); + return + +def sergeantMajorHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Medium Block Turret 150000', 0) + window.addListBoxMenuItem('Medium Tower Turret 150000', 1) + window.addListBoxMenuItem('HQ Forward Outpost 525000', 2) + window.addListBoxMenuItem('HQ Field Hospital 1050000', 3) + window.addListBoxMenuItem('SF HQ Forward Outpost 750000' ,4) + window.addListBoxMenuItem('SF HQ Field Hospital 1500000', 5) + window.addListBoxMenuItem('Nova Star Medal of the Empire 80000', 6) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, sergeantMajorRewards) + core.suiService.openSUIWindow(window); + return + +def lieutenantHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Large Block Turret 210000',0) + window.addListBoxMenuItem('Large Dish Turret 210000',1) + window.addListBoxMenuItem('Large Tower Turret 210000',2) + window.addListBoxMenuItem('HQ Tactical Center 1875000', 3) + window.addListBoxMenuItem('HQ Field Hospital 3600000',4) + window.addListBoxMenuItem('SF HQ Tactical Center 2325000',5) + window.addListBoxMenuItem('SF HQ Detachment Headquarters 4500000',6) + window.addListBoxMenuItem('Factional Comm link 200000', 7) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, lieutenantRewards) + core.suiService.openSUIWindow(window); + return + +def captainHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Factional Banner 81600', 0) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, captainRewards) + core.suiService.openSUIWindow(window); + return + +def majorHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Black Spec Ops Armor Leggings 46636', 0) + window.addListBoxMenuItem('Black Spec Ops Armor Belt 38863', 1) + window.addListBoxMenuItem('Black Spec Ops Armor Boots 41454', 2) + window.addListBoxMenuItem('Technical Readout of an Imperial Spec Ops Armor Dye Kit 12954', 3) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, majorRewards) + core.suiService.openSUIWindow(window); + return + +def ltColonelHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Black Spec Ops Armor Left Bicep 120000', 0) + window.addListBoxMenuItem('Black Spec Ops Armor Right Bicep 120000', 1) + window.addListBoxMenuItem('Black Spec Ops Armor Left Bracer 120000', 2) + window.addListBoxMenuItem('Black Spec Ops Armor Right Bracer 120000', 3) + window.addListBoxMenuItem('Black Spec Ops Armor Gloves 120000', 4) + window.addListBoxMenuItem('Black Spec Ops Armor Helmet 150000', 5) + window.addListBoxMenuItem('Black Spec Ops Armor Torso 225000', 6) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, ltColonelRewards) + core.suiService.openSUIWindow(window); + return + +def colonelHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Colonel Signet Ring of the Empire 142500', 0) + window.addListBoxMenuItem('BARC Command Vehicle 1050000', 1) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, colonelRewards) + core.suiService.openSUIWindow(window); + return + +def generalHandler(owner): + actor = owner.getSlottedObject('ghost') + core = main.NGECore.getInstance() + window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0); + window.setProperty('bg.caption.lblTitle:Text', 'Imperial Item Requisition') + window.setProperty('Prompt.lblPrompt:Text', 'Items') + window.addListBoxMenuItem('Windu\'s Guile 2000000', 0) + window.addListBoxMenuItem('Exceptional Imperial E-11 Carbine 200000', 1) + window.addListBoxMenuItem('The Legendary Starlight Carbine 200000', 2) + window.addListBoxMenuItem('The Legendary Crimson Nova Pistol 200000', 3) + window.addListBoxMenuItem('The Legendary Vortex Rifle 200000', 4) + window.addListBoxMenuItem('The Legendary Reaper Cannon 200000', 5) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, generalRewards) + core.suiService.openSUIWindow(window); + return + +def privateRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + r2DroidSchematic(object, owner) + return + + if returnList.get(0)=='1': + r3DroidSchematic(object, owner) + return + + if returnList.get(0)=='2': + r4DroidSchematic(object, owner) + return + + if returnList.get(0)=='3': + r5DroidSchematic(object, owner) + return + + if returnList.get(0)=='4': + dz70DroidSchematic(object, owner) + return + + if returnList.get(0)=='5': + proximityCaltrop(object, owner) + return + + if returnList.get(0)=='6': + remoteCaltrop(object, owner) + return + + if returnList.get(0)=='7': + proximityFlashbang(object, owner) + return + + if returnList.get(0)=='8': + remoteFlashbang(object, owner) + return + + if returnList.get(0)=='9': + proximityHX2(object, owner) + return + + if returnList.get(0)=='10': + remoteHX2(object, owner) + return + +def lanceCorporalRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + techArmoire(object, owner) + return + + if returnList.get(0)=='1': + techBookcase(object, owner) + return + + if returnList.get(0)=='2': + techCabinet(object, owner) + return + + if returnList.get(0)=='3': + techChest(object, owner) + return + + if returnList.get(0)=='4': + techCouch(object, owner) + return + + if returnList.get(0)=='5': + techChair(object, owner) + return + + if returnList.get(0)=='6': + techCoffeeTable(object, owner) + return + + if returnList.get(0)=='7': + techEndTable(object, owner) + return + + if returnList.get(0)=='8': + dataTerminalSlim(object, owner) + return + + if returnList.get(0)=='9': + dataTerminalStandard(object, owner) + return + + if returnList.get(0)=='10': + dataTerminalBulky(object, owner) + return + + if returnList.get(0)=='11': + dataTerminalWall(object, owner) + return + + if returnList.get(0)=='12': + imperialTable(object, owner) + return + +def corporalRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + electrobinoculars(object, owner) + return + + if returnList.get(0)=='1': + advancedElectrobinoculars(object, owner) + return + + if returnList.get(0)=='2': + superiorElectrobinoculars(object, owner) + return + + if returnList.get(0)=='3': + experimentalElectrobinoculars(object, owner) + return + +def sergeantRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + imperialBoots(object, owner) + return + + if returnList.get(0)=='1': + imperialJacket(object, owner) + return + + if returnList.get(0)=='2': + imperialPants(object, owner) + return + + if returnList.get(0)=='3': + imperialHat(object, owner) + return + + if returnList.get(0)=='4': + power5Pistol(object, owner) + return + + if returnList.get(0)=='5': + e11Carbine(object, owner) + return + + if returnList.get(0)=='6': + sword(object, owner) + return + + if returnList.get(0)=='7': + rocketLauncher(object, owner) + return + +def masterSergeantRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + smallBlockTurret(object, owner) + return + + if returnList.get(0)=='1': + smallDishTurret(object, owner) + return + + if returnList.get(0)=='2': + smallTowerTurret(object, owner) + return + + if returnList.get(0)=='3': + paintingMightEmpire(object, owner) + return + +def sergeantMajorRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + mediumBlockTurret(object, owner) + return + + if returnList.get(0)=='1': + mediumTowerTurret(object, owner) + return + + if returnList.get(0)=='2': + hqForwardOutpost(object, owner) + return + + if returnList.get(0)=='3': + hqFieldHospital(object, owner) + return + + if returnList.get(0)=='4': + sfhqForwardOutpost(object, owner) + return + + if returnList.get(0)=='5': + sfhqFieldHospital(object, owner) + return + + if returnList.get(0)=='6': + novaStarMedal(object, owner) + return + +def lieutenantRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + largeBlockTurret(object, owner) + return + + if returnList.get(0)=='1': + largeDishTurret(object, owner) + return + + if returnList.get(0)=='2': + largeTowerTurret(object, owner) + return + + if returnList.get(0)=='3': + hqTacticalCenter(object, owner) + return + + if returnList.get(0)=='4': + hqFieldHospital(object, owner) + return + + if returnList.get(0)=='5': + sfhqTacticalCenter(object, owner) + return + + if returnList.get(0)=='6': + sfhqDetachmentHeadquarters(object, owner) + return + + if returnList.get(0)=='7': + factionalCommlink(object, owner) + return + +def captainRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + factionalBanner(object, owner) + return + +def majorRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + specOpsLeggings(object, owner) + return + + if returnList.get(0)=='1': + specOpsBelt(object, owner) + return + + if returnList.get(0)=='2': + specOpsBoots(object, owner) + return + + if returnList.get(0)=='3': + specOpsDyeKit(object, owner) + return + +def ltColonelRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + specOpsLeftBicep(object, owner) + return + + if returnList.get(0)=='1': + specOpsRightBicep(object, owner) + return + + if returnList.get(0)=='2': + specOpsLeftBracer(object, owner) + return + + if returnList.get(0)=='3': + specOpsRightBracer(object, owner) + return + + if returnList.get(0)=='4': + specOpsGloves(object, owner) + return + + if returnList.get(0)=='5': + specOpsHelmet(object, owner) + return + + if returnList.get(0)=='6': + specOpsChestPlate(object, owner) + return + +def colonelRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + return + + if returnList.get(0)=='0': + colonelRing(object, owner) + return + + if returnList.get(0)=='1': + barcSpeeder(object, owner) + return + + +def generalRewards(owner, window, eventType, returnList): + + if returnList.size()==0: + owner.sendSystemMessage('NULL', 0) + return + + if returnList.get(0)=='0': + windusGuile(object, owner) + return + + if returnList.get(0)=='1': + exceptionalCarbine(object, owner) + return + + if returnList.get(0)=='2': + starlightCarbine(object, owner) + return + + if returnList.get(0)=='3': + crimsonNova(object, owner) + return + + if returnList.get(0)=='4': + vortexRifle(object, owner) + return + if returnList.get(0)=='5': + reaperCannon(object, owner) + return + +def r2DroidSchematic(object, owner): + if owner.getCashCredits() >= 165000: + owner.setCashCredits(owner.getCashCredits() - 165000) + core = main.NGECore.getInstance() + r2 = core.objectService.createObject('object/draft_schematic/droid/shared_droid_r2.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(r2) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def r3DroidSchematic(object, owner): + if owner.getCashCredits() >= 180000: + owner.setCashCredits(owner.getCashCredits() - 180000) + core = main.NGECore.getInstance() + r3 = core.objectService.createObject('object/draft_schematic/droid/shared_droid_r3.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(r3) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def r4DroidSchematic(object, owner): + if owner.getCashCredits() >= 195000: + owner.setCashCredits(owner.getCashCredits() - 195000) + core = main.NGECore.getInstance() + r4 = core.objectService.createObject('object/draft_schematic/droid/shared_droid_r4.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(r4) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def r5DroidSchematic(object, owner): + if owner.getCashCredits() >= 210000: + owner.setCashCredits(owner.getCashCredits() - 210000) + core = main.NGECore.getInstance() + r5 = core.objectService.createObject('object/draft_schematic/droid/shared_droid_r5.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(r5) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def dz70DroidSchematic(object, owner): + if owner.getCashCredits() >= 16500: + owner.setCashCredits(owner.getCashCredits() - 16500) + core = main.NGECore.getInstance() + sergical = core.objectService.createObject('object/draft_schematic/droid/shared_droid_dz70.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(sergical) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + + +def techArmoire(object, owner): + if owner.getCashCredits() >= 105000: + owner.setCashCredits(owner.getCashCredits() - 105000) + core = main.NGECore.getInstance() + armoire = core.objectService.createObject('object/tangible/furniture/technical/shared_armoire_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(armoire) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def techBookcase(object, owner): + if owner.getCashCredits() >= 105000: + owner.setCashCredits(owner.getCashCredits() - 105000) + core = main.NGECore.getInstance() + bookcase = core.objectService.createObject('object/tangible/furniture/technical/shared_bookcase_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(bookcase) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def techCabinet(object, owner): + if owner.getCashCredits() >= 105000: + owner.setCashCredits(owner.getCashCredits() - 105000) + core = main.NGECore.getInstance() + cabinet = core.objectService.createObject('object/tangible/furniture/technical/shared_cabinet_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(cabinet) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def techChest(object, owner): + if owner.getCashCredits() >= 75000: + owner.setCashCredits(owner.getCashCredits() - 75000) + core = main.NGECore.getInstance() + chest = core.objectService.createObject('object/tangible/furniture/technical/shared_chest_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(chest) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def techCouch(object, owner): + if owner.getCashCredits() >= 112500: + owner.setCashCredits(owner.getCashCredits() - 112500) + core = main.NGECore.getInstance() + couch = core.objectService.createObject('object/tangible/furniture/technical/shared_couch_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(couch) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def techChair(object, owner): + if owner.getCashCredits() >= 75000: + owner.setCashCredits(owner.getCashCredits() - 75000) + core = main.NGECore.getInstance() + chair = core.objectService.createObject('object/tangible/furniture/technical/shared_bookcase_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(chair) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def techCoffeeTable(object, owner): + if owner.getCashCredits() >= 75000: + owner.setCashCredits(owner.getCashCredits() - 75000) + core = main.NGECore.getInstance() + coffeetable = core.objectService.createObject('object/tangible/furniture/technical/shared_coffee_table_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(coffeetable) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def techEndTable(object, owner): + if owner.getCashCredits() >= 75000: + owner.setCashCredits(owner.getCashCredits() - 75000) + core = main.NGECore.getInstance() + endtable = core.objectService.createObject('object/tangible/furniture/technical/shared_end_table_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(endtable) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def dataTerminalSlim(object, owner): + if owner.getCashCredits() >= 60000: + owner.setCashCredits(owner.getCashCredits() - 60000) + core = main.NGECore.getInstance() + terminal = core.objectService.createObject('object/tangible/furniture/imperial/shared_data_terminal_s1.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(terminal) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def dataTerminalStandard(object, owner): + if owner.getCashCredits() >= 75000: + owner.setCashCredits(owner.getCashCredits() - 75000) + core = main.NGECore.getInstance() + terminal = core.objectService.createObject('object/tangible/furniture/imperial/shared_data_terminal_s2.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(terminal) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def dataTerminalBulky(object, owner): + if owner.getCashCredits() >= 90000: + owner.setCashCredits(owner.getCashCredits() - 90000) + core = main.NGECore.getInstance() + terminal = core.objectService.createObject('object/tangible/furniture/imperial/shared_data_terminal_s3.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(terminal) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def dataTerminalWall(object, owner): + if owner.getCashCredits() >= 105000: + owner.setCashCredits(owner.getCashCredits() - 105000) + core = main.NGECore.getInstance() + terminal = core.objectService.createObject('object/tangible/furniture/imperial/shared_data_terminal_s4.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(terminal) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def imperialTable(object, owner): + if owner.getCashCredits() >= 75000: + owner.setCashCredits(owner.getCashCredits() - 75000) + core = main.NGECore.getInstance() + table = core.objectService.createObject('object/tangible/furniture/imperial/shared_table_s1.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(table) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def electrobinoculars(object, owner): + if owner.getCashCredits() >= 15000: + owner.setCashCredits(owner.getCashCredits() - 15000) + core = main.NGECore.getInstance() + electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet(), 'item_consumable_detect_hidden_02_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(electrobinoculars) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def advancedElectrobinoculars(object, owner): + if owner.getCashCredits() >= 22500: + owner.setCashCredits(owner.getCashCredits() - 22500) + core = main.NGECore.getInstance() + electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet(), 'item_consumable_detect_hidden_02_02') + inventory = owner.getSlottedObject('inventory') + inventory.add(electrobinoculars) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def superiorElectrobinoculars(object, owner): + if owner.getCashCredits() >= 30000: + owner.setCashCredits(owner.getCashCredits() - 30000) + core = main.NGECore.getInstance() + electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s2_generic.iff', owner.getPlanet(), 'item_consumable_detect_hidden_02_03') + inventory = owner.getSlottedObject('inventory') + inventory.add(electrobinoculars) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def experimentalElectrobinoculars(object, owner): + if owner.getCashCredits() >= 37500: + owner.setCashCredits(owner.getCashCredits() - 37500) + core = main.NGECore.getInstance() + electrobinoculars = core.objectService.createObject('object/tangible/loot/generic_usable/shared_binoculars_s1_generic.iff', owner.getPlanet(), 'item_consumable_detect_hidden_02_04') + inventory = owner.getSlottedObject('inventory') + inventory.add(electrobinoculars) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def imperialBoots(object, owner): + if owner.getCashCredits() >= 37500: + owner.setCashCredits(owner.getCashCredits() - 37500) + core = main.NGECore.getInstance() + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s14.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(boots) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def imperialJacket(object, owner): + if owner.getCashCredits() >= 37500: + owner.setCashCredits(owner.getCashCredits() - 37500) + core = main.NGECore.getInstance() + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s03.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(jacket) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def imperialPants(object, owner): + if owner.getCashCredits() >= 37500: + owner.setCashCredits(owner.getCashCredits() - 37500) + core = main.NGECore.getInstance() + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(pants) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def imperialHat(object, owner): + if owner.getCashCredits() >= 37500: + owner.setCashCredits(owner.getCashCredits() - 37500) + core = main.NGECore.getInstance() + hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_imp_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(hat) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def power5Pistol(object, owner): + if owner.getCashCredits() >= 112500: + owner.setCashCredits(owner.getCashCredits() - 112500) + core = main.NGECore.getInstance() + pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_power5.iff', owner.getPlanet(), 'factional_power_5_pistol') + inventory = owner.getSlottedObject('inventory') + inventory.add(pistol) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def e11Carbine(object, owner): + if owner.getCashCredits() >= 82500: + owner.setCashCredits(owner.getCashCredits() - 82500) + core = main.NGECore.getInstance() + carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_e11.iff', owner.getPlanet(), 'factional_e11_carbine') + inventory = owner.getSlottedObject('inventory') + inventory.add(carbine) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def sword(object, owner): + if owner.getCashCredits() >= 30000: + owner.setCashCredits(owner.getCashCredits() - 30000) + core = main.NGECore.getInstance() + sword = core.objectService.createObject('object/weapon/melee/sword/shared_sword_s01.iff', owner.getPlanet(), 'factional_sword') + inventory = owner.getSlottedObject('inventory') + inventory.add(carbine) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def rocketLauncher(object, owner): + if owner.getCashCredits() >= 150000: + owner.setCashCredits(owner.getCashCredits() - 150000) + core = main.NGECore.getInstance() + launcher = core.objectService.createObject('object/weapon/ranged/heavy/shared_heavy_rocket_launcher.iff', owner.getPlanet(), 'factional_rocket_launcher') + inventory = owner.getSlottedObject('inventory') + inventory.add(launcher) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + + + +def smallBlockTurret(object, owner): + if owner.getCashCredits() >= 120000: + owner.setCashCredits(owner.getCashCredits() - 120000) + core = main.NGECore.getInstance() + turret = core.objectService.createObject('object/tangible/deed/faction_perk/turret/shared_block_sm_deed.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(turret) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def smallDishTurret(object, owner): + if owner.getCashCredits() >= 120000: + owner.setCashCredits(owner.getCashCredits() - 120000) + core = main.NGECore.getInstance() + turret = core.objectService.createObject('object/tangible/deed/faction_perk/turret/shared_dish_sm_deed.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(turret) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def smallTowerTurret(object, owner): + if owner.getCashCredits() >= 120000: + owner.setCashCredits(owner.getCashCredits() - 120000) + core = main.NGECore.getInstance() + turret = core.objectService.createObject('object/tangible/deed/faction_perk/turret/shared_tower_sm_deed.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(turret) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def drx55Mine(object, owner): + if owner.getCashCredits() >= 12000: + owner.setCashCredits(owner.getCashCredits() - 12000) + core = main.NGECore.getInstance() + mine = core.objectService.createObject('object/weapon/mine/shared_wp_mine_drx55.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(mine) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def sr88CryoMine(object, owner): + if owner.getCashCredits() >= 12000: + owner.setCashCredits(owner.getCashCredits() - 12000) + core = main.NGECore.getInstance() + mine = core.objectService.createObject('object/weapon/mine/shared_wp_mine_anti_vehicle.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(mine) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def xgMine(object, owner): + if owner.getCashCredits() >= 12000: + owner.setCashCredits(owner.getCashCredits() - 12000) + core = main.NGECore.getInstance() + mine = core.objectService.createObject('object/weapon/mine/shared_wp_mine_xg.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(mine) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def barcSpeeder(object, owner): + if owner.getCashCredits() >= 1050000: + owner.setCashCredits(owner.getCashCredits() - 1050000) + core = main.NGECore.getInstance() + barc = core.objectService.createObject('object/tangible/deed/vehicle_deed/shared_barc_speeder_deed.iff', owner.getPlanet(), 'item_deed_barc_imperial_06_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(barc) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def mediumBlockTurret(object, owner): + if owner.getCashCredits() >= 150000: + owner.setCashCredits(owner.getCashCredits() - 150000) + core = main.NGECore.getInstance() + turret = core.objectService.createObject('object/tangible/deed/faction_perk/turret/shared_block_med_deed.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(turret) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def mediumTowerTurret(object, owner): + if owner.getCashCredits() >= 150000: + owner.setCashCredits(owner.getCashCredits() - 150000) + core = main.NGECore.getInstance() + turret = core.objectService.createObject('object/tangible/deed/faction_perk/turret/shared_tower_med_deed.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(turret) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def hqForwardOutpost(object, owner): + if owner.getCashCredits() >= 525000: + owner.setCashCredits(owner.getCashCredits() - 525000) + core = main.NGECore.getInstance() + hq = core.objectService.createObject('object/tangible/deed/faction_perk/hq/shared_hq_s01.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(hq) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def hqFieldHospital(object, owner): + if owner.getCashCredits() >= 1050000: + owner.setCashCredits(owner.getCashCredits() - 4500000) + core = main.NGECore.getInstance() + hq = core.objectService.createObject('object/tangible/deed/faction_perk/hq/shared_hq_s02.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(hq) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def sfhqForwardOutpost(object, owner): + if owner.getCashCredits() >= 750000: + owner.setCashCredits(owner.getCashCredits() - 750000) + core = main.NGECore.getInstance() + hq = core.objectService.createObject('object/tangible/deed/faction_perk/hq/shared_hq_s01_pvp.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(hq) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def hqTacticalCenter(object, owner): + if owner.getCashCredits() >= 1875000: + owner.setCashCredits(owner.getCashCredits() - 1875000) + core = main.NGECore.getInstance() + hq = core.objectService.createObject('object/tangible/deed/faction_perk/hq/shared_hq_s03.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(hq) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def sfhqTacticalCenter(object, owner): + if owner.getCashCredits() >= 2325000: + owner.setCashCredits(owner.getCashCredits() - 2325000) + core = main.NGECore.getInstance() + hq = core.objectService.createObject('object/tangible/deed/faction_perk/hq/shared_hq_s03_pvp.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(hq) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def sfhqDetachmentHeadquarters(object, owner): + if owner.getCashCredits() >= 4500000: + owner.setCashCredits(owner.getCashCredits() - 4500000) + core = main.NGECore.getInstance() + hq = core.objectService.createObject('object/tangible/deed/faction_perk/hq/shared_hq_s04_pvp.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(hq) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def largeBlockTurret(object, owner): + if owner.getCashCredits() >= 210000: + owner.setCashCredits(owner.getCashCredits() - 210000) + core = main.NGECore.getInstance() + turret = core.objectService.createObject('object/tangible/deed/faction_perk/turret/shared_block_lg_deed.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(turret) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def largeDishTurret(object, owner): + if owner.getCashCredits() >= 210000: + owner.setCashCredits(owner.getCashCredits() - 210000) + core = main.NGECore.getInstance() + turret = core.objectService.createObject('object/tangible/deed/faction_perk/turret/shared_dish_lg_deed.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(turret) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def largeTowerTurret(object, owner): + if owner.getCashCredits() >= 210000: + owner.setCashCredits(owner.getCashCredits() - 210000) + core = main.NGECore.getInstance() + turret = core.objectService.createObject('object/tangible/deed/faction_perk/turret/shared_tower_lg_deed.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(turret) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsLeggings(object, owner): + if owner.getCashCredits() >= 46636: + owner.setCashCredits(owner.getCashCredits() - 46636) + core = main.NGECore.getInstance() + leggings = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_leggings.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_leggings_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(leggings) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsBelt(object, owner): + if owner.getCashCredits() >= 38863: + owner.setCashCredits(owner.getCashCredits() - 38863) + core = main.NGECore.getInstance() + belt = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_utility_belt.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_belt_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(belt) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsBoots(object, owner): + if owner.getCashCredits() >= 41454: + owner.setCashCredits(owner.getCashCredits() - 41454) + core = main.NGECore.getInstance() + boots = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_boots.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_boots_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(boots) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsLeftBicep(object, owner): + if owner.getCashCredits() >= 120000: + owner.setCashCredits(owner.getCashCredits() - 120000) + core = main.NGECore.getInstance() + bicepl = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_bicep_l.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_bicep_l_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(bicepl) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsRightBicep(object, owner): + if owner.getCashCredits() >= 120000: + owner.setCashCredits(owner.getCashCredits() - 120000) + core = main.NGECore.getInstance() + bicepr = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_bicep_r.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_bicep_r_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(bicepr) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsLeftBracer(object, owner): + if owner.getCashCredits() >= 120000: + owner.setCashCredits(owner.getCashCredits() - 120000) + core = main.NGECore.getInstance() + bracerl = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_bracer_l.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_bracer_l_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(bracerl) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsRightBracer(object, owner): + if owner.getCashCredits() >= 120000: + owner.setCashCredits(owner.getCashCredits() - 120000) + core = main.NGECore.getInstance() + bracerr = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_bracer_r.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_bracer_r_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(bracerr) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsGloves(object, owner): + if owner.getCashCredits() >= 120000: + owner.setCashCredits(owner.getCashCredits() - 120000) + core = main.NGECore.getInstance() + gloves = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_gloves.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_gloves_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(gloves) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsHelmet(object, owner): + if owner.getCashCredits() >= 150000: + owner.setCashCredits(owner.getCashCredits() - 150000) + core = main.NGECore.getInstance() + helmet = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_helmet.iff', owner.getPlanet(), 'armor_pvp_spec_ops_imperial_black_helmet_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(helmet) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsChestPlate(object, owner): + if owner.getCashCredits() >= 225000: + owner.setCashCredits(owner.getCashCredits() - 225000) + core = main.NGECore.getInstance() + chest = core.objectService.createObject('object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_pvp_officer_chest_plate.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(chest) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def specOpsDyeKit(object, owner): + if owner.getCashCredits() >= 12954: + owner.setCashCredits(owner.getCashCredits() - 12954) + core = main.NGECore.getInstance() + dyekit = core.objectService.createObject('object/tangible/item/shared_pvp_spec_ops_imperial_dye_kit.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(dyekit) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def paintingMightEmpire(object, owner): + if owner.getCashCredits() >= 375000: + owner.setCashCredits(owner.getCashCredits() - 375000) + core = main.NGECore.getInstance() + painting = core.objectService.createObject('object/tangible/painting/shared_painting_pvp_reward_imperial.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(painting) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def novaStarMedal(object, owner): + if owner.getCashCredits() >= 80000: + owner.setCashCredits(owner.getCashCredits() - 80000) + core = main.NGECore.getInstance() + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_deepspace_empire_f.iff', owner.getPlanet(), 'item_pvp_imperial_sergeant_major_medal_03_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(necklace) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def factionalCommlink(object, owner): + if owner.getCashCredits() >= 200000: + owner.setCashCredits(owner.getCashCredits() - 200000) + core = main.NGECore.getInstance() + commlink = core.objectService.createObject('object/tangible/gcw/pvp_rank_rewards/shared_comm_link.iff', owner.getPlanet(), 'item_pvp_lieutenant_comm_link_imperial_reward_04_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(commlink) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def factionalBanner(object, owner): + if owner.getCashCredits() >= 80000: + owner.setCashCredits(owner.getCashCredits() - 80000) + core = main.NGECore.getInstance() + banner = core.objectService.createObject('object/tangible/gcw/pvp_rank_rewards/shared_pvp_imperial_battle_banner.iff', owner.getPlanet()) + inventory = owner.getSlottedObject('inventory') + inventory.add(banner) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def colonelRing(object, owner): + if owner.getCashCredits() >= 142500: + owner.setCashCredits(owner.getCashCredits() - 142500) + core = main.NGECore.getInstance() + ring = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s03.iff', owner.getPlanet(), 'item_pvp_imperial_colonel_signet_ring_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(ring) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + + + +def windusGuile(object, owner): + if owner.getCashCredits() >= 2000000: + owner.setCashCredits(owner.getCashCredits() - 2000000) + core = main.NGECore.getInstance() + windu = core.objectService.createObject('object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff', owner.getPlanet(), 'item_color_crystal_02_20') + inventory = owner.getSlottedObject('inventory') + inventory.add(windu) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def exceptionalCarbine(object, owner): + if owner.getCashCredits() >= 200000: + owner.setCashCredits(owner.getCashCredits() - 200000) + core = main.NGECore.getInstance() + carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_e11.iff', owner.getPlanet(), 'weapon_carbine_pvp_general_reward_05_01') + inventory = owner.getSlottedObject('inventory') + inventory.add(carbine) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def starlightCarbine(object, owner): + if owner.getCashCredits() >= 200000: + owner.setCashCredits(owner.getCashCredits() - 200000) + core = main.NGECore.getInstance() + carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_pvp.iff', owner.getPlanet()) + carbine.setStringAttribute('faction_restriction', 'Imperial') + inventory = owner.getSlottedObject('inventory') + inventory.add(carbine) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def crimsonNova(object, owner): + if owner.getCashCredits() >= 200000: + owner.setCashCredits(owner.getCashCredits() - 200000) + core = main.NGECore.getInstance() + nova = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_pvp.iff', owner.getPlanet()) + nova.setStringAttribute('faction_restriction', 'Imperial') + inventory = owner.getSlottedObject('inventory') + inventory.add(nova) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def vortexRifle(object, owner): + if owner.getCashCredits() >= 200000: + owner.setCashCredits(owner.getCashCredits() - 200000) + core = main.NGECore.getInstance() + rifle = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_pvp.iff', owner.getPlanet()) + rifle.setStringAttribute('faction_restriction', 'Imperial') + inventory = owner.getSlottedObject('inventory') + inventory.add(rifle) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return + +def reaperCannon(object, owner): + if owner.getCashCredits() >= 200000: + owner.setCashCredits(owner.getCashCredits() - 200000) + core = main.NGECore.getInstance() + cannon = core.objectService.createObject('object/weapon/ranged/heavy/shared_heavy_pvp.iff', owner.getPlanet()) + cannon.setStringAttribute('faction_restriction', 'Imperial') + inventory = owner.getSlottedObject('inventory') + inventory.add(cannon) + elif owner.sendSystemMessage('You do not have enough credits to purchase this item.', 0): + return \ No newline at end of file diff --git a/scripts/object/tangible/deed/vehicle_deed/item_deed_barc_imperial_06_01.py b/scripts/object/tangible/deed/vehicle_deed/item_deed_barc_imperial_06_01.py new file mode 100644 index 00000000..a7d3432b --- /dev/null +++ b/scripts/object/tangible/deed/vehicle_deed/item_deed_barc_imperial_06_01.py @@ -0,0 +1,15 @@ +import sys + +def setup(core, object): + object.setAttachment('radial_filename', 'deeds/vehicleDeed') + object.setStfFilename('static_item_n') + object.setStfName('item_deed_barc_imperial_06_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_deed_barc_imperial_06_01') + object.setIntAttribute('no_trade', 1) + return + +def use(core, actor, object): + core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_barc_speeder_imperial.iff', 'object/intangible/vehicle/shared_barc_speeder_imperial_pcd.iff') + return + \ No newline at end of file diff --git a/scripts/object/tangible/gcw/pvp_rank_rewards/item_pvp_lieutenant_comm_link_imperial_reward_04_01.py b/scripts/object/tangible/gcw/pvp_rank_rewards/item_pvp_lieutenant_comm_link_imperial_reward_04_01.py new file mode 100644 index 00000000..271eeb94 --- /dev/null +++ b/scripts/object/tangible/gcw/pvp_rank_rewards/item_pvp_lieutenant_comm_link_imperial_reward_04_01.py @@ -0,0 +1,9 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_pvp_lieutenant_comm_link_imperial_reward_04_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_pvp_lieutenant_comm_link_imperial_reward_04_01') + + return \ No newline at end of file diff --git a/scripts/object/tangible/painting/painting_pvp_reward_imperial.py b/scripts/object/tangible/painting/painting_pvp_reward_imperial.py index 1914d9c0..88c32389 100644 --- a/scripts/object/tangible/painting/painting_pvp_reward_imperial.py +++ b/scripts/object/tangible/painting/painting_pvp_reward_imperial.py @@ -1,6 +1,10 @@ import sys def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_pvp_imperial_painting_03_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_pvp_imperial_painting_03_01') return - #No name (Palpatine and Star Destroyers) \ No newline at end of file + #Might of the Empire \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py new file mode 100644 index 00000000..a3961224 --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_belt_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_belt_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py new file mode 100644 index 00000000..35457e52 --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_bicep_l_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_bicep_l_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py new file mode 100644 index 00000000..5e4090ff --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_bicep_r_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_bicep_r_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py new file mode 100644 index 00000000..71062b0f --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_boots_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_boots_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py new file mode 100644 index 00000000..b961e244 --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_bracer_l_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_bracer_l_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py new file mode 100644 index 00000000..85b15e13 --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_bracer_r_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_bracer_r_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py new file mode 100644 index 00000000..681fe707 --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_gloves_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_gloves_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_helmet_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_helmet_05_01.py new file mode 100644 index 00000000..5566f5f5 --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_helmet_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_helmet_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_helmet_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_leggings_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_leggings_05_01.py new file mode 100644 index 00000000..21cb662b --- /dev/null +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_leggings_05_01.py @@ -0,0 +1,18 @@ +import sys + +def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_leggings_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_leggings_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) + return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_stormtrooper_pvp_officer_chest_plate.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_stormtrooper_pvp_officer_chest_plate.py index ccad8904..25a4d368 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_stormtrooper_pvp_officer_chest_plate.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_stormtrooper_pvp_officer_chest_plate.py @@ -1,4 +1,18 @@ import sys def setup(core, object): + object.setCustomizationVariable('/private/index_color_1', 15); + object.setCustomizationVariable('/private/index_color_2', 15); + object.setStfFilename('static_item_n') + object.setStfName('armor_pvp_spec_ops_imperial_black_chest_plate_orange_pad_05_01') + object.setDetailFilename('static_item_d') + object.setDetailName('armor_pvp_spec_ops_imperial_black_chest_plate_orange_pad_05_01') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') + object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) + object.setIntAttribute('cat_armor_standard_protection.energy', 4608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) + object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/necklace/item_pvp_imperial_sergeant_major_medal_03_01.py b/scripts/object/tangible/wearables/necklace/item_pvp_imperial_sergeant_major_medal_03_01.py index b99f3c9c..44565fc0 100644 --- a/scripts/object/tangible/wearables/necklace/item_pvp_imperial_sergeant_major_medal_03_01.py +++ b/scripts/object/tangible/wearables/necklace/item_pvp_imperial_sergeant_major_medal_03_01.py @@ -1,3 +1,6 @@ +import sys + + def setup(core, object): object.setStfFilename('static_item_n') object.setStfName('item_pvp_imperial_sergeant_major_medal_03_01') diff --git a/scripts/object/weapon/melee/sword/factional_sword.py b/scripts/object/weapon/melee/sword/factional_sword.py new file mode 100644 index 00000000..1420b4c8 --- /dev/null +++ b/scripts/object/weapon/melee/sword/factional_sword.py @@ -0,0 +1,11 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setAttackSpeed(1.0) + object.setMaxRange(5) + object.setDamageType('kinetic') + object.setMinDamage(300) + object.setMaxDamage(400) + object.setWeaponType(WeaponType.ONEHANDEDMELEE) + return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/factional_e11_carbine.py b/scripts/object/weapon/ranged/carbine/factional_e11_carbine.py new file mode 100644 index 00000000..833ae5dd --- /dev/null +++ b/scripts/object/weapon/ranged/carbine/factional_e11_carbine.py @@ -0,0 +1,11 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setAttackSpeed(0.6) + object.setMaxRange(50) + object.setDamageType('energy') + object.setMinDamage(350) + object.setMaxDamage(700) + object.setWeaponType(WeaponType.CARBINE) + return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/weapon_carbine_pvp_general_reward_05_01.py b/scripts/object/weapon/ranged/carbine/weapon_carbine_pvp_general_reward_05_01.py new file mode 100644 index 00000000..e2abfc0f --- /dev/null +++ b/scripts/object/weapon/ranged/carbine/weapon_carbine_pvp_general_reward_05_01.py @@ -0,0 +1,13 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setStringAttribute('required_skill', 'None') + object.setStringAttribute('faction_restriction', 'Imperial') + object.setAttackSpeed(0.6); + object.setMaxRange(50); + object.setDamageType("energy"); + object.setMinDamage(310); + object.setMaxDamage(550); + object.setWeaponType(WeaponType.CARBINE); + return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/heavy/factional_rocket_launcher.py b/scripts/object/weapon/ranged/heavy/factional_rocket_launcher.py new file mode 100644 index 00000000..e6e66dec --- /dev/null +++ b/scripts/object/weapon/ranged/heavy/factional_rocket_launcher.py @@ -0,0 +1,13 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setAttackSpeed(1) + object.setMaxRange(64) + object.setDamageType('energy') + object.setMinDamage(400) + object.setMaxDamage(775) + object.setWeaponType(WeaponType.HEAVYWEAPON) + object.setStringAttribute('wpn_elemental_type', 'heat') + object.setStringAttribute('wpn_elemental_value', '70') + return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/factional_power_5_pistol.py b/scripts/object/weapon/ranged/pistol/factional_power_5_pistol.py new file mode 100644 index 00000000..2fd8f2f1 --- /dev/null +++ b/scripts/object/weapon/ranged/pistol/factional_power_5_pistol.py @@ -0,0 +1,11 @@ +import sys +from resources.datatables import WeaponType + +def setup(core, object): + object.setAttackSpeed(0.4) + object.setMaxRange(35) + object.setDamageType('energy') + object.setMinDamage(80) + object.setMaxDamage(130) + object.setWeaponType(WeaponType.PISTOL) + return \ No newline at end of file From 79944e09a950cb1df6184b491cccb2129385e521 Mon Sep 17 00:00:00 2001 From: Zing Date: Mon, 30 Jun 2014 23:09:44 -0700 Subject: [PATCH 14/15] Fixed Tirtiary color on Imperial Spec Ops Armor. Added Tirtiary option to recolorable radial. --- .../armor_pvp_spec_ops_imperial_black_belt_05_01.py | 1 + .../armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py | 1 + .../armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py | 1 + .../armor_pvp_spec_ops_imperial_black_boots_05_01.py | 1 + .../armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py | 1 + .../armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py | 1 + .../armor_pvp_spec_ops_imperial_black_gloves_05_01.py | 1 + .../armor_pvp_spec_ops_imperial_black_helmet_05_01.py | 1 + .../armor_pvp_spec_ops_imperial_black_leggings_05_01.py | 1 + scripts/radial/item/recolorable.py | 3 +++ 10 files changed, 12 insertions(+) diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py index a3961224..2fe0f47a 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_belt_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py index 35457e52..0fc14ba5 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_l_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_bicep_l_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py index 5e4090ff..925e7386 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bicep_r_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_bicep_r_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py index 71062b0f..4facba04 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_boots_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py index b961e244..e0e28e01 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_l_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_bracer_l_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py index 85b15e13..9b4cca31 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_bracer_r_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_bracer_r_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py index 681fe707..6a09e147 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_gloves_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_helmet_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_helmet_05_01.py index 5566f5f5..50505d89 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_helmet_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_helmet_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_helmet_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_leggings_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_leggings_05_01.py index 21cb662b..7dd77943 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_leggings_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_leggings_05_01.py @@ -3,6 +3,7 @@ import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', 15); object.setCustomizationVariable('/private/index_color_2', 15); + object.setCustomizationVariable('/private/index_color_3', 2); object.setStfFilename('static_item_n') object.setStfName('armor_pvp_spec_ops_imperial_black_leggings_05_01') object.setDetailFilename('static_item_d') diff --git a/scripts/radial/item/recolorable.py b/scripts/radial/item/recolorable.py index bd13e64b..0690521e 100644 --- a/scripts/radial/item/recolorable.py +++ b/scripts/radial/item/recolorable.py @@ -4,6 +4,7 @@ import sys def createRadial(core, owner, target, radials): radials.add(RadialOptions(0, 98, 0, 'Modify primary color')) radials.add(RadialOptions(0, 99, 0, 'Modify secondary color')) + radials.add(RadialOptions(0, 100, 0, 'Modify tirtiary color')) return def handleSelection(core, owner, target, option): @@ -11,5 +12,7 @@ def handleSelection(core, owner, target, option): core.suiService.sendColorPicker(owner, target, '/private/index_color_1') if option == 99 and target: core.suiService.sendColorPicker(owner, target, '/private/index_color_2') + if option == 100 and target: + core.suiService.sendColorPicker(owner, target, '/private/index_color_3') return \ No newline at end of file From 724a6a6c5fdb6396cc0ce43f91f720bfab65eaaa Mon Sep 17 00:00:00 2001 From: Zing Date: Wed, 2 Jul 2014 18:05:48 -0700 Subject: [PATCH 15/15] Modified Removed Factional Comm-link until pet AI is ready. --- scripts/gcw_rewards_imperial.py | 2 +- scripts/gcw_rewards_rebel.py | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/gcw_rewards_imperial.py b/scripts/gcw_rewards_imperial.py index f94cf77b..a475d9db 100644 --- a/scripts/gcw_rewards_imperial.py +++ b/scripts/gcw_rewards_imperial.py @@ -269,7 +269,7 @@ def lieutenantHandler(owner): window.addListBoxMenuItem('HQ Field Hospital 3600000',4) window.addListBoxMenuItem('SF HQ Tactical Center 2325000',5) window.addListBoxMenuItem('SF HQ Detachment Headquarters 4500000',6) - window.addListBoxMenuItem('Factional Comm link 200000', 7) + #window.addListBoxMenuItem('Factional Comm link 200000', 7) window.setProperty('btnOk:visible', 'True') window.setProperty('btnCancel:visible', 'True') window.setProperty('btnOk:Text', '@ok') diff --git a/scripts/gcw_rewards_rebel.py b/scripts/gcw_rewards_rebel.py index d0ac37cf..e9e099ec 100644 --- a/scripts/gcw_rewards_rebel.py +++ b/scripts/gcw_rewards_rebel.py @@ -204,10 +204,10 @@ def seniorSergeantHandler(owner): window.addListBoxMenuItem('Small Block Turret 120000',0) window.addListBoxMenuItem('Small Dish Turret 120000',1) window.addListBoxMenuItem('Small Tower Turret 120000',2) - #window.addListBoxMenuItem('DRX-55 Mine 12000',3) - #window.addListBoxMenuItem('SR-88 Cyro Mine 12000',4) - #window.addListBoxMenuItem('XG Mine 12000',5) - window.addListBoxMenuItem('Painting We will never surrender 375000',6) + window.addListBoxMenuItem('Painting We will never surrender 375000',3) + #window.addListBoxMenuItem('DRX-55 Mine 12000',4) + #window.addListBoxMenuItem('SR-88 Cyro Mine 12000',5) + #window.addListBoxMenuItem('XG Mine 12000',6) window.setProperty('btnOk:visible', 'True') window.setProperty('btnCancel:visible', 'True') window.setProperty('btnOk:Text', '@ok') @@ -486,20 +486,22 @@ def seniorSergeantRewards(owner, window, eventType, returnList): return if returnList.get(0)=='3': + paintingNeverSurrender(object, owner) + return + + if returnList.get(0)=='4': drx55Mine(object, owner) return - if returnList.get(0)=='4': + if returnList.get(0)=='5': sr88CryoMine(object, owner) return - if returnList.get(0)=='5': + if returnList.get(0)=='6': xgMine(object, owner) return - if returnList.get(0)=='6': - paintingNeverSurrender(object, owner) - return + def sergeantMajorRewards(owner, window, eventType, returnList):