Merge remote-tracking branch 'upstream/master'

scripts/commands/dismount.py

@@ -4,13 +4,15 @@ def setup():
 	return
 
 def run(core, actor, target, commandString):
-	if actor.canMount(target) is False: return
-
-	if not actor.isMounted():
-		actor.setMounted(1)
-		target.initMount(actor)	
-	else:
-		target.unmount(actor)
+	if not target:
+		return
+	
+	if actor.getObjectID() != target.getOwnerId():
+		return
+	
+	
+	if core.mountService.isMounted(actor) is True:
+		core.mountService.dismount(actor, target)
 	
 	return
 

scripts/commands/mount.py

@@ -4,13 +4,13 @@ def setup():
     return
 
 def run(core, actor, target, commandString):
-	if actor.canMount(target) is False: return
-
-	if not actor.isMounted():
-		actor.setMounted(1)
-		target.initMount(actor)	
-	else:
-		target.unmount(actor)
-    
+	if not target:
+		return
+	
+	if actor.getObjectID() != target.getOwnerId():
+		return
+	
+	if core.mountService.isMounted(actor) is False:
+		core.mountService.mount(actor, target)
+	
 	return
-

scripts/object/building/player/player_house_generic_small_style_01.py

@@ -6,6 +6,6 @@ def setup(core, object):
 	object.setAttachment("structureSign", sign)
 	
 	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1)
-	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	#structureterminal.setAttachment('radial_filename', 'structure/structure_management_terminal')
 	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/creature/player/bothan_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/bothan_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/human_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/human_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/ithorian_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/ithorian_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/moncal_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/moncal_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/rodian_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/rodian_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/sullustan_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/sullustan_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/trandoshan_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/trandoshan_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/twilek_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/twilek_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/wookiee_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/wookiee_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/zabrak_female.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/creature/player/zabrak_male.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'player')
+	object.setAttachment('radial_filename', 'creature/player')
 	return

scripts/object/installation/generators/power_generator_fusion_style_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'generator')
+	object.setAttachment('radial_filename', 'structure/generator')
 	object.setHarvester_type(5)
 	object.setMaintenanceCost(30)
 	object.setGenerator(1)

scripts/object/installation/generators/power_generator_geothermal_style_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'generator')
+	object.setAttachment('radial_filename', 'structure/generator')
 	object.setHarvester_type(5)
 	object.setMaintenanceCost(30)
 	object.setGenerator(1)

scripts/object/installation/generators/power_generator_photo_bio_style_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'generator')
+	object.setAttachment('radial_filename', 'structure/generator')
 	object.setHarvester_type(5)
 	object.setMaintenanceCost(30)
 	object.setGenerator(1)

scripts/object/installation/generators/power_generator_solar_style_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'generator')
+	object.setAttachment('radial_filename', 'structure/generator')
 	object.setHarvester_type(5)
 	object.setMaintenanceCost(30)
 	object.setGenerator(1)

scripts/object/installation/generators/power_generator_wind_style_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'generator')
+	object.setAttachment('radial_filename', 'structure/generator')
 	object.setHarvester_type(5)
 	object.setMaintenanceCost(20)
 	object.setGenerator(1)

scripts/object/installation/mining_gas/mining_gas_harvester_style_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(3)
 	object.setPowerCost(25); 
 	object.setMaintenanceCost(16);

scripts/object/installation/mining_gas/mining_gas_harvester_style_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(3)
 	object.setPowerCost(60); 
 	object.setMaintenanceCost(60);

scripts/object/installation/mining_gas/mining_gas_harvester_style_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(3)
 	object.setPowerCost(75); 
 	object.setMaintenanceCost(90);

scripts/object/installation/mining_gas/mining_gas_harvester_style_4.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(3)
 	object.setPowerCost(100); 
 	object.setMaintenanceCost(120);

scripts/object/installation/mining_liquid/mining_liquid_harvester_style_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(1)
 	object.setPowerCost(25); 
 	object.setMaintenanceCost(16);

scripts/object/installation/mining_liquid/mining_liquid_harvester_style_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(1)
 	object.setPowerCost(60); 
 	object.setMaintenanceCost(60);

scripts/object/installation/mining_liquid/mining_liquid_harvester_style_3.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(1)
 	object.setPowerCost(75); 
 	object.setMaintenanceCost(90);

scripts/object/installation/mining_liquid/mining_liquid_harvester_style_4.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(1)
 	object.setPowerCost(100); 
 	object.setMaintenanceCost(120);

scripts/object/installation/mining_liquid/mining_liquid_moisture_harvester.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(4)
 	object.setPowerCost(25); 
 	object.setMaintenanceCost(16);

scripts/object/installation/mining_liquid/mining_liquid_moisture_harvester_elite.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(4)
 	object.setPowerCost(100); 
 	object.setMaintenanceCost(120);

scripts/object/installation/mining_liquid/mining_liquid_moisture_harvester_heavy.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(4)
 	object.setPowerCost(75); 
 	object.setMaintenanceCost(90);

scripts/object/installation/mining_liquid/mining_liquid_moisture_harvester_medium.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(4)
 	object.setPowerCost(60); 
 	object.setMaintenanceCost(60);

scripts/object/installation/mining_ore/mining_ore_harvester_elite.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(0)
 	object.setPowerCost(100); 
 	object.setMaintenanceCost(120);

scripts/object/installation/mining_ore/mining_ore_harvester_heavy.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(0)
 	object.setPowerCost(75); 
 	object.setMaintenanceCost(90);

scripts/object/installation/mining_ore/mining_ore_harvester_style_1.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(0)
 	object.setPowerCost(25); 
 	object.setMaintenanceCost(16);

scripts/object/installation/mining_ore/mining_ore_harvester_style_2.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(0)
 	object.setPowerCost(60); 
 	object.setMaintenanceCost(60);

scripts/object/installation/mining_organic/mining_organic_flora_farm.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(2)
 	object.setPowerCost(25); 
 	object.setMaintenanceCost(16);

scripts/object/installation/mining_organic/mining_organic_flora_farm_elite.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(2)
 	object.setPowerCost(100); 
 	object.setMaintenanceCost(120);

scripts/object/installation/mining_organic/mining_organic_flora_farm_heavy.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(2)
 	object.setPowerCost(60); 
 	object.setMaintenanceCost(60);

scripts/object/installation/mining_organic/mining_organic_flora_farm_medium.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvester')
+	object.setAttachment('radial_filename', 'structure/harvester')
 	object.setHarvester_type(2)
 	object.setPowerCost(60); 
 	object.setMaintenanceCost(60);

scripts/object/intangible/vehicle/speederbike_swoop_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:
-		swoop = core.objectService.createObject('object/mobile/vehicle/shared_speederbike_swoop.iff', 0, actor.getPlanet(), actor.getPosition(), actor.getOrientation())
-		
-		swoop.setOwnerId(actor.getObjectID())
-		actor.setAttachment('activeVehicleID', swoop.getObjectID())
-		
-		core.simulationService.add(swoop, swoop.getPosition().x, swoop.getPosition().z, True)
+	object.setAttachment('radial_filename', 'datapad/vehicle_pcd')
 	return

scripts/object/mobile/respec_seller_f_1.py

@@ -2,6 +2,6 @@ import sys
 from resources.datatables import Options
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'conversation')
+	object.setAttachment('radial_filename', 'object/conversation')
 	object.setAttachment('conversationFile', 'respec')
 	return

scripts/object/mobile/vehicle/speederbike_swoop.py

@@ -1,16 +1,6 @@
 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)
-	
+	object.setAttachment('radial_filename', 'creature/vehicle')
+	object.setAttachment('passengers', 0)
 	return

scripts/object/tangible/deed/harvester_deed/harvester_flora_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
 	object.setStructureTemplate('object/installation/mining_organic/shared_mining_organic_flora_farm.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_flora_deed_elite.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_organic/shared_mining_organic_flora_farm_elite.iff')
 	object.setLotRequirement(3)

scripts/object/tangible/deed/harvester_deed/harvester_flora_deed_heavy.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_organic/shared_mining_organic_flora_farm_heavy.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_flora_deed_medium.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
 	object.setStructureTemplate('object/installation/mining_organic/shared_mining_organic_flora_farm_medium.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_gas_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
 	object.setStructureTemplate('object/installation/mining_gas/shared_mining_gas_harvester_style_1.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_gas_deed_elite.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_gas/shared_mining_gas_harvester_style_4.iff')
 	object.setLotRequirement(3)

scripts/object/tangible/deed/harvester_deed/harvester_gas_deed_heavy.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_gas/shared_mining_gas_harvester_style_3.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_gas_deed_medium.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
 	object.setStructureTemplate('object/installation/mining_gas/shared_mining_gas_harvester_style_2.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_liquid_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
 	object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_harvester_style_1.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_liquid_deed_elite.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_harvester_style_4.iff')
 	object.setLotRequirement(3)

scripts/object/tangible/deed/harvester_deed/harvester_liquid_deed_heavy.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_harvester_style_3.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_liquid_deed_medium.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
 	object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_harvester_style_2.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_moisture_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
 	object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_moisture_harvester.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_moisture_deed_elite.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_moisture_harvester_elite.iff')	
 	object.setLotRequirement(3)

scripts/object/tangible/deed/harvester_deed/harvester_moisture_deed_heavy.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_moisture_harvester_heavy.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_moisture_deed_medium.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
 	object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_moisture_harvester_medium.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_ore_deed_elite.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_ore/shared_mining_ore_harvester_elite.iff')
 	object.setLotRequirement(3)

scripts/object/tangible/deed/harvester_deed/harvester_ore_heavy_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
 	object.setStructureTemplate('object/installation/mining_ore/shared_mining_ore_harvester_heavy.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_ore_s1_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
 	object.setStructureTemplate('object/installation/mining_ore/shared_mining_ore_harvester_style_1.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/harvester_deed/harvester_ore_s2_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'harvesterDeed')
+	object.setAttachment('radial_filename', 'deeds/harvesterDeed')
 	object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
 	object.setStructureTemplate('object/installation/mining_ore/shared_mining_ore_harvester_style_2.iff')
 	object.setLotRequirement(1)

scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'structureDeed')
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
 	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_small_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff')
 	object.setLotRequirement(1)

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

@@ -1,24 +1,9 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'vehicleDeed')
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
 	return
 
 def use(core, actor, object):
-	datapad = actor.getSlottedObject('datapad')
-	pcd = core.objectService.createObject('object/intangible/vehicle/shared_speederbike_swoop_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_speederbike_swoop.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())
-	
+	core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_speederbike_swoop.iff', 'object/intangible/vehicle/shared_speederbike_swoop_pcd.iff')
 	return

scripts/object/tangible/holiday/life_day/main_lifeday_tree.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'main_lifeday_tree')
+	object.setAttachment('radial_filename', 'holidays/lifeday/main_lifeday_tree')
 	return

scripts/object/tangible/item/rare_loot_chest_1.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'lootchest')
+	object.setAttachment('radial_filename', 'item/lootchest')
 	return

scripts/object/tangible/item/rare_loot_chest_2.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'lootchest')
+	object.setAttachment('radial_filename', 'item/lootchest')
 	return

scripts/object/tangible/item/rare_loot_chest_3.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'lootchest')
+	object.setAttachment('radial_filename', 'item/lootchest')
 	return

scripts/object/tangible/loot/creature_loot/collections/item_lifeday_gift_other_01_01.py

@@ -6,5 +6,5 @@ def setup(core, object):
 	object.setCustomName('Life Day Gift Box For A Friend')
 	object.setIntAttribute('volume', 1)
 	object.setIntAttribute('tier', 2)
-	object.setAttachment('radial_filename', 'lifeday_gift')
+	object.setAttachment('radial_filename', 'holidays/lifeday/lifeday_gift')
 	return

scripts/object/tangible/loot/creature_loot/collections/item_lifeday_gift_self_01_01.py

@@ -7,5 +7,5 @@ def setup(core, object):
 	object.setIntAttribute('volume', 1)
 	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('tier', 2)
-	object.setAttachment('radial_filename', 'lifeday_gift')
+	object.setAttachment('radial_filename', 'holidays/lifeday/lifeday_gift')
 	return

scripts/object/tangible/loot/generic_usable/stim_syringe_generic.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'usable')
+	object.setAttachment('radial_filename', 'object/usable')
 	return

scripts/object/tangible/quest/heroic/heroic_exar_kun_entrance.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'exar_kun_brazier')
+	object.setAttachment('radial_filename', 'instances/exar_kun/exar_kun_brazier')
 	return
 
 def use(core, actor, object):

scripts/object/tangible/survey_tool/survey_tool_all.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_gas.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_geo_thermal.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_inorganic.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_liquid.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_lumber.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_mineral.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_moisture.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_organic.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_solar.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/survey_tool/survey_tool_wind.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'survey_tool')
+	object.setAttachment('radial_filename', 'item/survey_tool')
 	return

scripts/object/tangible/terminal/terminal_character_builder.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'usable')
+	object.setAttachment('radial_filename', 'object/usable')
 	return
 
 def use(core, owner, target):

scripts/object/tangible/terminal/terminal_player_structure.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'structure_management_terminal')
+	object.setAttachment('radial_filename', 'structure/structure_management_terminal')
 	return

scripts/object/tangible/terminal/terminal_player_structure_new.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'structure_management_terminal')
+	object.setAttachment('radial_filename', 'structure/structure_management_terminal')
 	return

scripts/object/tangible/terminal/terminal_player_structure_nosnap.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'structure_management_terminal')
+	object.setAttachment('radial_filename', 'structure/structure_management_terminal')
 	return

scripts/object/tangible/terminal/terminal_player_structure_nosnap_mini.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'structure_management_terminal')
+	object.setAttachment('radial_filename', 'structure/structure_management_terminal')
 	return

scripts/object/tangible/travel/travel_ticket/base/base_travel_ticket.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'travel_ticket')
+	object.setAttachment('radial_filename', 'item/travel_ticket')
 	return

scripts/radial/creature/vehicle.py

@@ -0,0 +1,31 @@
+from resources.common import RadialOptions
+import sys
+
+def createRadial(core, owner, target, radials):
+	master = core.objectService.getObject(target.getOwnerId())
+	
+	radials.add(RadialOptions(0, 7, 1, ''))
+	if core.mountService.canMount(owner, target):
+		radials.add(RadialOptions(1, 40, 3, '@pet/pet_menu:menu_enter_exit'))
+	radials.add(RadialOptions(0, 21, 1, ''))
+	if target.getOwnerId() == owner.getObjectID():
+		radials.add(RadialOptions(0, 60, 3, '@pet/pet_menu:menu_store'))
+	if core.mountService.canRepair(owner, target):
+		radials.add(RadialOptions(0, 114, 3, '@pet/pet_menu:menu_repair_vehicle'))
+	return
+
+def handleSelection(core, owner, target, option):
+	mntSvc = core.mountService
+	
+	if target:
+		if option == 21:
+			if mntSvc.isMounted(actor):
+				mntSvc.mount(actor, target)
+			else:
+				mntSvc.unmount(actor, target)
+		elif option == 60:
+			mntSvc.store(actor, target)
+		elif option == 114:
+			mntSvc.repair(actor, target)
+	return
+