Merge pull request #533 from tacef/master

Continued Work on Playerhouse deed

scripts/houses/player_house_sandcrawler.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/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff", "object/building/player/shared_player_house_sandcrawler.iff", 3)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-8.75), float(3.86), float(1)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(350)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_tatooine_large_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/player_house_deed/shared_tatooine_house_large_deed.iff", "object/building/player/shared_player_house_tatooine_large_style_01.iff", 5)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-3), float(3), float(15.8)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.setDefaultItemLimit(500)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_tatooine_medium_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/player_house_deed/shared_tatooine_house_medium_deed.iff", "object/building/player/shared_player_house_tatooine_medium_style_01.iff", 2)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(4.3),float(2.26),float(12.5))) 
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.setDefaultItemLimit(200)
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_tatooine_small_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/player_house_deed/shared_tatooine_house_small_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_01.iff", 2)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(7.9)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.setDefaultItemLimit(200)
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_tatooine_small_style_02.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/player_house_deed/shared_tatooine_house_small_style_02_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_02.iff", 2)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.setDefaultItemLimit(200)
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_tatooine_small_window_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/player_house_deed/shared_tatooine_house_small_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_01.iff", 2)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(7.9)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.setDefaultItemLimit(200)
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/object/building/player/player_house_sandcrawler.py

@@ -1,4 +1,12 @@
 import sys
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -8.75, 3.86, 1, 0.5, 0.5, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 6, 3.5, 0.7, 0.707108, -0.707108, 1)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_tatooine_large_style_01.py

@@ -1,4 +1,11 @@
 import sys
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -3, 3, 15.8, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 9, 0.5, 12, 1, 0, 2)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_tatooine_medium_style_01.py

@@ -1,4 +1,11 @@
 import sys
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 4.3, 2.26, 12.5, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 4, 0.5, 6.5, 1, 0, 2)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_tatooine_small_style_01.py

@@ -1,4 +1,11 @@
 import sys
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.7, 3, 7.9, 1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -6, 0.7, 6.2, 1, 0, 2)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_tatooine_small_style_02.py

@@ -1,4 +1,11 @@
 import sys
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 4, 3, 7.6, 1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -6, 0.7, 6.2, 1, 0, 2)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_tatooine_small_window_style_01.py

@@ -1,4 +1,11 @@
 import sys
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -1.7, 3, 7.9, 1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -6, 0.7, 6.2, 1, 0, 2)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/tangible/deed/player_house_deed/tatooine_house_large_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_house_corellia_large_style_01.iff')
+	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_large_deed.iff')
+	object.setLotRequirement(5)
+	object.setBMR(26)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_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_house_tatooine_medium_style_01.iff')
+	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_medium_deed.iff')
+	object.setLotRequirement(2)
+	object.setBMR(18)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/player_house_deed/tatooine_house_small_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_house_tatooine_small_style_01.iff')
+	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff')
+	object.setLotRequirement(2)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/player_house_deed/tatooine_house_small_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_tatooine_house_small_style_02_deed.iff')
+	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff')
+	object.setLotRequirement(2)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/player_house_deed/tatooine_house_window_small_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_house_tatooine_small_style_01.iff')
+	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_window_small_deed.iff')
+	object.setLotRequirement(2)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.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/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff')
+	object.setLotRequirement(5)
+	object.setBMR(26)
+	return
+
+def use(core, actor, object):
 	return

src/services/object/ObjectService.java

@@ -245,7 +245,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") || Template.startsWith("object/tangible/deed/guild_deed") || Template.startsWith("object/tangible/deed/city_deed") || Template.startsWith("object/tangible/tcg")) {
+		} else if(Template.startsWith("object/tangible/deed/player_house_deed") || Template.startsWith("object/tangible/deed/guild_deed") || Template.startsWith("object/tangible/deed/city_deed") || Template.startsWith("object/tangible/tcg/series3/shared_structure_deed_sith_meditation_room_deed.iff") || Template.startsWith("object/tangible/tcg/series5/shared_structure_deed_player_house_atat.iff") || Template.startsWith("object/tangible/tcg/series5/shared_structure_deed_player_house_hangar.iff") || Template.startsWith("object/tangible/tcg/series3/shared_structure_deed_jedi_meditation_room_deed.iff") || Template.startsWith("object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff")) {
 			
 			object = new Player_House_Deed(objectID, planet, Template, position, orientation);