From 0f801210ba9b0236317b3a1a04462b9860f94402 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Sun, 10 Aug 2014 10:53:31 -0400 Subject: [PATCH 1/3] Added bounty droids to CBT --- scripts/character_builder_terminal.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 41d0f827..43771be2 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -318,6 +318,7 @@ def miscHandler(owner): window.addListBoxMenuItem('Belt of Master Bodo Baas', 2) window.addListBoxMenuItem('Starter Equipment Box', 3) window.addListBoxMenuItem('GCW Banners', 4) + window.addListBoxMenuItem('Bounty Droids', 5) core.suiService.openSUIWindow(window); @@ -341,7 +342,10 @@ def miscHandlerCallback(owner, window, eventType, returnList): return if returnList.get(0)=='4': GCWBanners(owner, inventory) - return + return + if returnList.get(0)=='5': + bountyDroids(owner, inventory) + return return @@ -715,4 +719,13 @@ def GCWBanners(owner, inventory): gcwBanner2.setDetailName('item_pvp_captain_battle_banner_imperial_reward_04_01') inventory.add(gcwBanner2) return - \ No newline at end of file + +def bountyDroids(owner, inventory): + seekers = core.objectService.createObject('object/tangible/mission/shared_mission_bounty_droid_seeker.iff', owner.getPlanet()) + seekers.setUses(20) + inventory.add(seekers) + + probe = core.objectService.createObject('object/tangible/mission/shared_mission_bounty_droid_probot.iff', owner.getPlanet()) + probe.setUses(20) + inventory.add(probe) + return \ No newline at end of file From 92057107b0d2ec2a808e850505d3993e06f639b3 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Sun, 10 Aug 2014 17:57:13 +0200 Subject: [PATCH 2/3] Respawn fix - Disabled respawn for static NPCs for now --- src/services/object/ObjectService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 08ff36fa..9bd27972 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -605,9 +605,10 @@ public class ObjectService implements INetworkDispatch { @Override public void run() { try { - CreatureObject newObject = NGECore.getInstance().spawnService.spawnCreature(Template, 0, planet.getName(), cellId, spawnPosition.x, spawnPosition.y, spawnPosition.z, orientation.w, orientation.x, orientation.y, orientation.z, level); - AIActor newAIActor = (AIActor)newObject.getAttachment("AI"); - newAIActor.cloneActor(((AIActor) object.getAttachment("AI"))); + // Commented for now until found where the respawn is always set to 60 for any NPC +// CreatureObject newObject = NGECore.getInstance().spawnService.spawnCreature(Template, 0, planet.getName(), cellId, spawnPosition.x, spawnPosition.y, spawnPosition.z, orientation.w, orientation.x, orientation.y, orientation.z, level); +// AIActor newAIActor = (AIActor)newObject.getAttachment("AI"); +// newAIActor.cloneActor(((AIActor) object.getAttachment("AI"))); //object.setAttachment("AI", null); } catch (Exception e) { e.printStackTrace(); From 1c351d723e20b321b9656cf9ed57375ea7626bdd Mon Sep 17 00:00:00 2001 From: tacef Date: Sun, 10 Aug 2014 18:03:44 +0200 Subject: [PATCH 3/3] Fixed Typo's in Standard Issued box and trader shirt --- scripts/object/tangible/npe/npe_uniform_box.py | 2 +- .../tangible/wearables/shirt/item_trader_shirt_02_01.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/object/tangible/npe/npe_uniform_box.py b/scripts/object/tangible/npe/npe_uniform_box.py index a4957986..248ae485 100644 --- a/scripts/object/tangible/npe/npe_uniform_box.py +++ b/scripts/object/tangible/npe/npe_uniform_box.py @@ -79,7 +79,7 @@ def use(core, actor, object): pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_medic_pants_02_01') shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s27.iff', actor.getPlanet(), 'item_medic_shirt_02_01') vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s05.iff', actor.getPlanet(), 'item_medic_vest_02_01') - items.add(shoes) + items.add(boots) items.add(pants) items.add(shirt) items.add(vest) diff --git a/scripts/object/tangible/wearables/shirt/item_trader_shirt_02_01.py b/scripts/object/tangible/wearables/shirt/item_trader_shirt_02_01.py index b7a24faf..f0e8d1ad 100644 --- a/scripts/object/tangible/wearables/shirt/item_trader_shirt_02_01.py +++ b/scripts/object/tangible/wearables/shirt/item_trader_shirt_02_01.py @@ -2,9 +2,9 @@ import sys def setup(core, object): object.setStfFilename('static_item_n') - object.setStfName('item_medic_shirt_02_01') + object.setStfName('item_trader_shirt_02_01') object.setDetailFilename('static_item_d') - object.setDetailName('item_medic_shirt_02_01') + object.setDetailName('item_trader_shirt_02_01') object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3) - object.setStringAttribute('class_required', 'Medic') + object.setStringAttribute('class_required', 'Trader') return \ No newline at end of file