Merge remote-tracking branch 'upstream/master'

scripts/expertise/expertise_fs_path_saber_reflect_1.py

@@ -1,9 +1,9 @@
 import sys
 
 def addAbilities(core, actor, player):
-	actor.addAbility("fs_saber_reflect")
+	actor.addAbility("fs_saber_reflect_buff")
 	return
 
 def removeAbilities(core, actor, player):
-	actor.removeAbility("fs_saber_reflect")
+	actor.removeAbility("fs_saber_reflect_buff")
 	return

scripts/object/intangible/vehicle/barc_speeder_pcd.py

@@ -1,4 +1,15 @@
 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:
+		barc = core.objectService.createObject('object/mobile/vehicle/shared_barc_speeder.iff', 0, actor.getPlanet(), actor.getPosition(), actor.getOrientation())
+		
+		barc.setOwnerId(actor.getObjectID())
+		actor.setAttachment('activeVehicleID', barc.getObjectID())
+		
+		core.simulationService.add(barc, barc.getPosition().x, barc.getPosition().z, True)
 	return

scripts/object/intangible/vehicle/landspeeder_tantive4_pcd.py

@@ -1,4 +1,15 @@
 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)
 	return

scripts/object/mobile/vehicle/barc_speeder.py

@@ -1,4 +1,16 @@
 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

scripts/object/mobile/vehicle/landspeeder_tantive4.py

@@ -1,4 +1,20 @@
 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):
 	return

scripts/object/tangible/deed/vehicle_deed/barc_speeder_deed.py

@@ -1,4 +1,24 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'vehicleDeed')
+	return
+
+def use(core, actor, object):
+	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())
+	
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_tantive4_deed.py

@@ -1,4 +1,24 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'vehicleDeed')
+	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

scripts/radial/vehicle.py

@@ -23,7 +23,7 @@ def handleSelection(core, owner, target, option):
 				target.unmount(owner)
 			
 		if option == 60:
-			if owner.isMounted(): vehicleObject.unmount(owner)
+			if owner.isMounted(): target.unmount(owner)
 			core.objectService.destroyObject(target)
 			owner.setAttachment('activeVehicleID', None)
 	return

src/services/BuffService.java

@@ -88,6 +88,9 @@ public class BuffService implements INetworkDispatch {
 		}*/
 
 		Buff buff = buffMap.get(buffName);
+		
+		if(buff == null) return false;
+		
 		if(buff.isGroupBuff()) {
 			addGroupBuff(buffer, buffName, buffer);
 			return true;

src/services/SimulationService.java

@@ -763,7 +763,6 @@ public class SimulationService implements INetworkDispatch {
 				core.combatService.handleEndDuel(object, opponent, true);
 			}
 		}
-		System.out.print(object.getAttachment("activeVehicleID"));
 		
 		if(object.getAttachment("activeVehicleID") != null) 
 		{