From 0f801210ba9b0236317b3a1a04462b9860f94402 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Sun, 10 Aug 2014 10:53:31 -0400 Subject: [PATCH 1/2] 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/2] 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();