From 85b8f0b1ed92e7e2d1c758ec1011f20d5c52eeb9 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Mon, 30 Jun 2014 01:42:22 +0200 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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