From e48749eae1b354cc9176b10f88f7ac3944fd813f Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sun, 29 Jun 2014 20:41:09 +0200 Subject: [PATCH 1/6] Added Deed for Jetpack --- scripts/object/tangible/deed/vehicle_deed/jetpack_deed.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/object/tangible/deed/vehicle_deed/jetpack_deed.py b/scripts/object/tangible/deed/vehicle_deed/jetpack_deed.py index ccad8904..d042fbeb 100644 --- a/scripts/object/tangible/deed/vehicle_deed/jetpack_deed.py +++ b/scripts/object/tangible/deed/vehicle_deed/jetpack_deed.py @@ -1,4 +1,9 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'deeds/vehicleDeed') + return + +def use(core, actor, object): + core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_jetpack.iff', 'object/intangible/vehicle/shared_jetpack_pcd.iff') return \ No newline at end of file From f69f1b4c9b0dba71a8fba7f1e946c792e40ec581 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sun, 29 Jun 2014 20:45:34 +0200 Subject: [PATCH 2/6] Fixed Deed for BARC Speeder --- .../deed/vehicle_deed/barc_speeder_deed.py | 36 ++----------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/scripts/object/tangible/deed/vehicle_deed/barc_speeder_deed.py b/scripts/object/tangible/deed/vehicle_deed/barc_speeder_deed.py index 17638f96..5bd711f9 100644 --- a/scripts/object/tangible/deed/vehicle_deed/barc_speeder_deed.py +++ b/scripts/object/tangible/deed/vehicle_deed/barc_speeder_deed.py @@ -5,36 +5,6 @@ def setup(core, object): return def use(core, actor, object): - if object.getStfName() == ('barc_speeder'): - datapad = actor.getSlottedObject('datapad') - pcd = core.objectService.createObject('object/intangible/vehicle/shared_barc_speeder_pcd.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y) - - if datapad and pcd: - - datapad.add(pcd) - core.objectService.destroyObject(object) - - vehicleId = actor.getAttachment('activeVehicleID') - - if vehicleId == None: - vehicle = core.objectService.createObject('object/mobile/vehicle/shared_barc_speeder.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y) - vehicle.setOwnerId(actor.getObjectID()) - core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True) - actor.setAttachment('activeVehicleID', vehicle.getObjectID()) - elif object.getStfName() == ('item_deed_barc_rebel_06_01'): - datapad = actor.getSlottedObject('datapad') - pcd = core.objectService.createObject('object/intangible/vehicle/shared_barc_speeder_rebel_pcd.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y) - - if datapad and pcd: - - datapad.add(pcd) - core.objectService.destroyObject(object) - - vehicleId = actor.getAttachment('activeVehicleID') - - if vehicleId == None: - vehicle = core.objectService.createObject('object/mobile/vehicle/shared_barc_speeder_rebel.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y) - vehicle.setOwnerId(actor.getObjectID()) - core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True) - actor.setAttachment('activeVehicleID', vehicle.getObjectID()) - return \ No newline at end of file + core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_barc_speeder.iff', 'object/intangible/vehicle/shared_barc_speeder_pcd.iff') + return + \ No newline at end of file From 6f12467a7516750fd19e6c64b5ffd142b3922a1e Mon Sep 17 00:00:00 2001 From: Waverunner Date: Sun, 29 Jun 2014 14:47:45 -0400 Subject: [PATCH 3/6] Fixed null error when sending mail to an offline player --- src/services/chat/ChatService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index df40f785..15f9c1dd 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -289,8 +289,11 @@ public class ChatService implements INetworkDispatch { return; } - SWGObject recipient = getObjectByFirstName(packet.getRecipient()); - + SWGObject recipient = core.objectService.getObjectByFirstName(packet.getRecipient()); + + if (recipient == null) + return; + PlayerObject recipientGhost = (PlayerObject) recipient.getSlottedObject("ghost"); if (recipientGhost.getIgnoreList().contains(sender.getCustomName().toLowerCase())) From c49df6fec380fcacc4850255f6c6c6960b14ef6a Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sun, 29 Jun 2014 21:23:18 +0200 Subject: [PATCH 4/6] Added Deed for Merr-Sonn JT12 Jetpack --- .../tcg/series3/deed_tcg_merr_sonn_jt12_jetpack.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/object/tangible/tcg/series3/deed_tcg_merr_sonn_jt12_jetpack.py b/scripts/object/tangible/tcg/series3/deed_tcg_merr_sonn_jt12_jetpack.py index ccad8904..480d6918 100644 --- a/scripts/object/tangible/tcg/series3/deed_tcg_merr_sonn_jt12_jetpack.py +++ b/scripts/object/tangible/tcg/series3/deed_tcg_merr_sonn_jt12_jetpack.py @@ -1,4 +1,10 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setAttachment('radial_filename', 'deeds/vehicleDeed') + return + +def use(core, actor, object): + core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_tcg_merr_sonn_jt12_jetpack.iff', 'object/intangible/vehicle/shared_tcg_merr_sonn_jt12_jetpack_pcd.iff') + return + \ No newline at end of file From 5d3b6167f1666da63b466f386131c798e016a6d0 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sun, 29 Jun 2014 22:24:01 +0200 Subject: [PATCH 5/6] Added Deed for Flashspeeder --- .../tangible/deed/vehicle_deed/speederbike_flash_deed.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/object/tangible/deed/vehicle_deed/speederbike_flash_deed.py b/scripts/object/tangible/deed/vehicle_deed/speederbike_flash_deed.py index ccad8904..9760160e 100644 --- a/scripts/object/tangible/deed/vehicle_deed/speederbike_flash_deed.py +++ b/scripts/object/tangible/deed/vehicle_deed/speederbike_flash_deed.py @@ -1,4 +1,10 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setAttachment('radial_filename', 'deeds/vehicleDeed') + return + +def use(core, actor, object): + core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_speederbike_flash.iff', 'object/intangible/vehicle/shared_speederbike_flash_pcd.iff') + return + \ No newline at end of file From 0025e2787cf2208cef18887861b31793584ef1d1 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sun, 29 Jun 2014 23:58:50 +0200 Subject: [PATCH 6/6] Changed Kneel command script Now uses the Posture datatable --- scripts/commands/kneel.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/commands/kneel.py b/scripts/commands/kneel.py index 77bec3ee..3d238983 100644 --- a/scripts/commands/kneel.py +++ b/scripts/commands/kneel.py @@ -1,15 +1,17 @@ import sys +from resources.datatables import Posture def setup(): return def run(core, actor, target, commandString): - if actor.getPosture() == 13 or actor.getPosture() == 14: + if actor.getPosture() == Posture.Incapacitated or actor.getPosture() == Posture.Dead: return - actor.setPosture(1) + actor.setPosture(Posture.Crouched) actor.setSpeedMultiplierBase(0) actor.setTurnRadius(0) + return \ No newline at end of file