Merge remote-tracking branch 'origin/master' into PlayerCities

scripts/object/building/player/city/cityhall_corellia.py

@@ -1,4 +1,20 @@
 import sys
+from engine.resources.scene import Point3D
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
+	
+	cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5)
+	#cityterminal.setAttachment('housing_parentstruct', object)
+	
+	city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3)
+	#cityterminal.setAttachment('housing_parentstruct', object)
+	
 	return

scripts/object/building/player/city/cityhall_naboo.py

@@ -1,4 +1,20 @@
 import sys
+from engine.resources.scene import Point3D
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
+	
+	cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5)
+	#cityterminal.setAttachment('housing_parentstruct', object)
+	
+	city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3)
+	#cityterminal.setAttachment('housing_parentstruct', object)
+	
 	return

scripts/object/building/player/city/cityhall_tatooine.py

@@ -3,12 +3,27 @@ from engine.resources.scene import Point3D
 from engine.resources.scene import Quaternion
 
 def setup(core, object):
+<<<<<<< HEAD
 	
 	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(1.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7)
 	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
 	structureterminal.setAttachment('housing_parentstruct', object)
 	
 	cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(0), float(2.6), float(0)), Quaternion(float(1), float(1), float(1), float(0)),3)
+=======
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(-12.2), float(1.5), float(-4.2)), Quaternion(float(0), float(0), float(0), float(0)),4)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
+	
+	cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5)
+	#cityterminal.setAttachment('housing_parentstruct', object)
+	
+	city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3)
+>>>>>>> upstream/master
 	#cityterminal.setAttachment('housing_parentstruct', object)
 	cityterminal.setAttachment('radial_filename', 'terminal/city_maintenance_terminal')
 	

scripts/object/mobile/vehicle/landspeeder_av21.py

@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'creature/vehicle')
+	object.setAttachment('passengers', 0)
 	return

scripts/object/tangible/deed/city_deed/cityhall_corellia_deed.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
+	object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff')
+	#object.setLotRequirement(5)
+	object.setBMR(308)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/city_deed/cityhall_naboo_deed.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
+	object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_naboo_deed.iff')
+	#object.setLotRequirement(5)
+	object.setBMR(308)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py

@@ -5,7 +5,11 @@ def setup(core, object):
 	object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
 	object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff')
 	#object.setLotRequirement(5)
+<<<<<<< HEAD
 	#object.setBMR(100)
+=======
+	object.setBMR(308)
+>>>>>>> upstream/master
 	return
 
 def use(core, actor, object):

scripts/object/tangible/deed/vehicle_deed/landspeeder_av21_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_landspeeder_av21.iff', 'object/intangible/vehicle/shared_landspeeder_av21_pcd.iff')
 	return