From 81891f36498dfd82636d21f813dd44996e0f0c8e Mon Sep 17 00:00:00 2001
From: Freddiec <freddylikespotatos@gmail.com>
Date: Sun, 6 Jul 2014 14:21:13 -0500
Subject: [PATCH] [Refactored] Tantive Landspeeder

---
 .../vehicle/landspeeder_tantive4_pcd.py       | 12 +-----------
 .../mobile/vehicle/landspeeder_tantive4.py    | 17 +----------------
 .../vehicle_deed/landspeeder_tantive4_deed.py | 19 ++-----------------
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/scripts/object/intangible/vehicle/landspeeder_tantive4_pcd.py b/scripts/object/intangible/vehicle/landspeeder_tantive4_pcd.py
index ff8849f4..d7c3f4a1 100644
--- a/scripts/object/intangible/vehicle/landspeeder_tantive4_pcd.py
+++ b/scripts/object/intangible/vehicle/landspeeder_tantive4_pcd.py
@@ -1,15 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'vehicle_pcd')
-	return
-
-def use(core, actor, object):
-	if object and actor.getAttachment('activeVehicleID') == None:
-		tantive4 = core.objectService.createObject('object/mobile/vehicle/shared_landspeeder_tantive4.iff', 0, actor.getPlanet(), actor.getPosition(), actor.getOrientation())
-		
-		tantive4.setOwnerId(actor.getObjectID())
-		actor.setAttachment('activeVehicleID', tantive4.getObjectID())
-		
-		core.simulationService.add(tantive4, tantive4.getPosition().x, tantive4.getPosition().z, True)
+	object.setAttachment('radial_filename', 'datapad/vehicle_pcd')
 	return
\ No newline at end of file
diff --git a/scripts/object/mobile/vehicle/landspeeder_tantive4.py b/scripts/object/mobile/vehicle/landspeeder_tantive4.py
index 1e2994c6..73ca0680 100644
--- a/scripts/object/mobile/vehicle/landspeeder_tantive4.py
+++ b/scripts/object/mobile/vehicle/landspeeder_tantive4.py
@@ -1,20 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'vehicle')
-	return
-
-def use(core, actor, object):
-	vehicle = actor.getContainer()
-	
-	if vehicle:
-		if vehicle.getObjectID() == object.getObjectID():
-			vehicle.remove(actor)
-		else:
-			vehicle.add(actor)
-	
-	return
-import sys
-
-def setup(core, object):
+	object.setAttachment('radial_filename', 'creature/vehicle')
 	return
\ No newline at end of file
diff --git a/scripts/object/tangible/deed/vehicle_deed/landspeeder_tantive4_deed.py b/scripts/object/tangible/deed/vehicle_deed/landspeeder_tantive4_deed.py
index f031d37f..6b93484b 100644
--- a/scripts/object/tangible/deed/vehicle_deed/landspeeder_tantive4_deed.py
+++ b/scripts/object/tangible/deed/vehicle_deed/landspeeder_tantive4_deed.py
@@ -5,20 +5,5 @@ def setup(core, object):
 	return
 
 def use(core, actor, object):
-	datapad = actor.getSlottedObject('datapad')
-	pcd = core.objectService.createObject('object/intangible/vehicle/shared_landspeeder_tantive4_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_landspeeder_tantive4.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
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_tantive4.iff', 'object/intangible/vehicle/shared_landspeeder_tantive4_pcd.iff')
+	return
\ No newline at end of file