Merge pull request #495 from tacef/master

Added more Houses, reed description

scripts/houses/player_cityhall_tatooine_style_01.py

@@ -0,0 +1,15 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff", "object/building/player/city/shared_cityhall_tatooine.iff", 5)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(400)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_guildhall_corellia_style_01.py

@@ -0,0 +1,14 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_corellia_guild_deed.iff", "object/building/player/shared_player_guildhall_corellia_style_01.iff", 5)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.setDefaultItemLimit(400)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_guildhall_generic_style_01.py

@@ -0,0 +1,19 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_generic_guild_deed.iff", "object/building/player/shared_player_guildhall_generic_style_01.iff", 2)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(400)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_guildhall_naboo_style_01.py

@@ -0,0 +1,15 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_naboo_guild_deed.iff", "object/building/player/shared_player_guildhall_naboo_style_01.iff", 5)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.setDefaultItemLimit(400)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_guildhall_tatooine_style_01.py

@@ -0,0 +1,15 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_tatooine_guild_deed.iff", "object/building/player/shared_player_guildhall_tatooine_style_01.iff", 5)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(400)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_guildhall_tatooine_style_02.py

@@ -0,0 +1,15 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_tatooine_guild_style_02_deed.iff", "object/building/player/shared_player_guildhall_tatooine_style_02.iff", 5)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(400)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

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

@@ -1,4 +1,14 @@
 import sys
+from engine.resources.scene import Point3D
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	
+	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)
+	#cityterminal.setAttachment('housing_parentstruct', object)
+	
 	return

scripts/object/building/player/player_guildhall_corellia_style_01.py

@@ -1,4 +1,13 @@
 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', 6,3, 18.4, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(2.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)
 	return

scripts/object/building/player/player_guildhall_generic_style_01.py

@@ -1,4 +1,13 @@
 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', 6,3, 18.4, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(2.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)
 	return

scripts/object/building/player/player_guildhall_naboo_style_01.py

@@ -1,4 +1,13 @@
 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', 6,3, 18.4, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(2.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)
 	return

scripts/object/building/player/player_guildhall_tatooine_style_01.py

@@ -1,4 +1,13 @@
 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', 6,3, 18.4, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(2.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)
 	return

scripts/object/building/player/player_guildhall_tatooine_style_02.py

@@ -1,4 +1,13 @@
 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', 5.5,4, 12.7, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(4.0), float(2.2), float(9)), Quaternion(float(0), float(0), float(0), float(0)),1)
+	#structureterminal.setAttachment('radial_filename', 'structure/structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/tangible/deed/city_deed/cityhall_tatooine_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_tatooine_deed.iff')
+	#object.setLotRequirement(5)
+	#object.setBMR(100)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/guild_deed/corellia_guild_deed.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_corellia_style_01.iff')
+	object.setStructureTemplate('object/tangible/deed/guild_deed/shared_corellia_guild_deed.iff')
+	object.setLotRequirement(5)
+	object.setBMR(100)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/guild_deed/generic_guild_deed.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_corellia_style_01.iff')
+	object.setStructureTemplate('object/tangible/deed/guild_deed/shared_generic_guild_deed.iff')
+	object.setLotRequirement(5)
+	object.setBMR(100)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/guild_deed/naboo_guild_deed.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_naboo_style_01.iff')
+	object.setStructureTemplate('object/tangible/deed/guild_deed/shared_naboo_guild_deed.iff')
+	object.setLotRequirement(5)
+	object.setBMR(100)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/guild_deed/tatooine_guild_deed.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_tatooine_style_01.iff')
+	object.setStructureTemplate('object/tangible/deed/guild_deed/shared_tatooine_guild_deed.iff')
+	object.setLotRequirement(5)
+	object.setBMR(100)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/guild_deed/tatooine_guild_style_02_deed.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_guildhall_tatooine_style_02.iff')
+	object.setStructureTemplate('object/tangible/deed/guild_deed/shared_tatooine_guild_style_02_deed.iff')
+	object.setLotRequirement(5)
+	object.setBMR(100)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/player_house_deed/corellia_house_large_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_large_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_large_deed.iff')
 	object.setLotRequirement(5)

scripts/object/tangible/deed/player_house_deed/corellia_house_large_style_02_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_large_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_large_style_02_deed.iff')
 	object.setLotRequirement(5)

scripts/object/tangible/deed/player_house_deed/corellia_house_medium_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_player_house_corellia_medium_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_medium_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_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_player_house_corellia_medium_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_medium_style_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/corellia_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_corellia_house_small_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/corellia_house_small_floor_02_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_corellia_house_small_floor_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_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_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_floor_02_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_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_floor_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_large_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_generic_large_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_deed.iff')
 	object.setLotRequirement(5)

scripts/object/tangible/deed/player_house_deed/generic_house_large_style_02_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_generic_large_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_style_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s01_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_generic_large_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_window_s01_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s02_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_generic_large_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_window_s02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_medium_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_generic_medium_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_medium_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_medium_style_02_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_generic_medium_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_medium_style_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_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_generic_medium_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_s02_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_generic_medium_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_s02_deed.iff')
 	object.setLotRequirement(2)

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_generic_small_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_small_floor_02_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_generic_small_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_floor_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_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_generic_small_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_floor_02_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_generic_small_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_floor_02_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_small_window_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_generic_small_style_01.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_window_deed.iff')
 	object.setLotRequirement(2)

scripts/object/tangible/deed/player_house_deed/generic_house_small_window_style_03_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_generic_small_style_02.iff')
 	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_window_style_03_deed.iff')
 	object.setLotRequirement(2)

src/services/object/ObjectService.java

@@ -334,7 +334,7 @@ public class ObjectService implements INetworkDispatch {
 			
 			object = new Harvester_Deed(objectID, planet, Template, position, orientation);
 			
-		} else if(Template.startsWith("object/tangible/deed/player_house_deed")) {
+		} else if(Template.startsWith("object/tangible/deed/player_house_deed") || Template.startsWith("object/tangible/deed/guild_deed") || Template.startsWith("object/tangible/deed/city_deed")) {
 			
 			object = new Player_House_Deed(objectID, planet, Template, position, orientation);
 			

src/services/sui/SUIService.java

@@ -100,7 +100,7 @@ public class SUIService implements INetworkDispatch {
 					if (! admins.contains(owner.getCustomName()) && hoppers.contains(owner.getCustomName())){
 						 // authorized for hopper
 						// change radialOptions to hopper access
-						core.scriptService.callScript("scripts/radial/", "harvesterHopper", "createRadial", core, owner, target, request.getRadialOptions());
+						core.scriptService.callScript("scripts/radial/", "structure/harvesterHopper", "createRadial", core, owner, target, request.getRadialOptions());
 						sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount());
 						return;
 					}
@@ -124,9 +124,9 @@ public class SUIService implements INetworkDispatch {
 				
 				if(target.getGrandparent() != null && target.getGrandparent().getAttachment("structureAdmins") != null)
 				{
-					if(core.housingService.getPermissions(owner, target.getContainer()) && !getRadialFilename(target).equals("structure_management_terminal"))
+					if(core.housingService.getPermissions(owner, target.getContainer()) && !getRadialFilename(target).equals("structure/structure_management_terminal"))
 					{
-						core.scriptService.callScript("scripts/radial/", "moveable", "createRadial", core, owner, target, request.getRadialOptions());
+						core.scriptService.callScript("scripts/radial/", "structure/moveable", "createRadial", core, owner, target, request.getRadialOptions());
 						sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount());
 						return;
 					}