From be9650db6b9b082fd2df8ac400ba9d69e43d6bf0 Mon Sep 17 00:00:00 2001 From: Zing Date: Sun, 29 Jun 2014 20:47:13 -0700 Subject: [PATCH] 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);