From f33429871f923cc1bb7427fbf3b83530348ee966 Mon Sep 17 00:00:00 2001 From: tacef Date: Tue, 22 Apr 2014 12:45:31 +0200 Subject: [PATCH 1/2] Finished Cityhall's Cityhalls finished and placeable with all terminals. --- .../houses/player_cityhall_corellia_style_01.py | 15 +++++++++++++++ scripts/houses/player_cityhall_naboo_style_01.py | 15 +++++++++++++++ .../building/player/city/cityhall_corellia.py | 16 ++++++++++++++++ .../building/player/city/cityhall_naboo.py | 16 ++++++++++++++++ .../building/player/city/cityhall_tatooine.py | 10 ++++++++-- .../deed/city_deed/cityhall_corellia_deed.py | 8 ++++++++ .../deed/city_deed/cityhall_naboo_deed.py | 8 ++++++++ 7 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 scripts/houses/player_cityhall_corellia_style_01.py create mode 100644 scripts/houses/player_cityhall_naboo_style_01.py diff --git a/scripts/houses/player_cityhall_corellia_style_01.py b/scripts/houses/player_cityhall_corellia_style_01.py new file mode 100644 index 00000000..3ab29590 --- /dev/null +++ b/scripts/houses/player_cityhall_corellia_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_corellia_deed.iff", "object/building/player/city/shared_cityhall_corellia.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 \ No newline at end of file diff --git a/scripts/houses/player_cityhall_naboo_style_01.py b/scripts/houses/player_cityhall_naboo_style_01.py new file mode 100644 index 00000000..109b8374 --- /dev/null +++ b/scripts/houses/player_cityhall_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/city_deed/shared_cityhall_naboo_deed.iff", "object/building/player/city/shared_cityhall_naboo.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 \ No newline at end of file diff --git a/scripts/object/building/player/city/cityhall_corellia.py b/scripts/object/building/player/city/cityhall_corellia.py index ccad8904..161f75e3 100644 --- a/scripts/object/building/player/city/cityhall_corellia.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/building/player/city/cityhall_naboo.py b/scripts/object/building/player/city/cityhall_naboo.py index ccad8904..161f75e3 100644 --- a/scripts/object/building/player/city/cityhall_naboo.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/building/player/city/cityhall_tatooine.py b/scripts/object/building/player/city/cityhall_tatooine.py index abcc4690..4a5b5e92 100644 --- a/scripts/object/building/player/city/cityhall_tatooine.py +++ b/scripts/object/building/player/city/cityhall_tatooine.py @@ -3,12 +3,18 @@ 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(18.9), float(1.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7) + 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(0), float(2.6), float(0)), Quaternion(float(1), float(1), float(1), float(0)),3) + cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(18), 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 \ No newline at end of file diff --git a/scripts/object/tangible/deed/city_deed/cityhall_corellia_deed.py b/scripts/object/tangible/deed/city_deed/cityhall_corellia_deed.py index ccad8904..fa9b29de 100644 --- a/scripts/object/tangible/deed/city_deed/cityhall_corellia_deed.py +++ b/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(100) + return + +def use(core, actor, object): return \ No newline at end of file diff --git a/scripts/object/tangible/deed/city_deed/cityhall_naboo_deed.py b/scripts/object/tangible/deed/city_deed/cityhall_naboo_deed.py index ccad8904..1b0adc1a 100644 --- a/scripts/object/tangible/deed/city_deed/cityhall_naboo_deed.py +++ b/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(100) + return + +def use(core, actor, object): return \ No newline at end of file From 5d716b89ade335a296e9c77bb066aa84059981b3 Mon Sep 17 00:00:00 2001 From: tacef Date: Tue, 22 Apr 2014 12:47:54 +0200 Subject: [PATCH 2/2] Fixed Typo in Corellia Cityhall --- scripts/houses/player_cityhall_corellia_style_01.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/houses/player_cityhall_corellia_style_01.py b/scripts/houses/player_cityhall_corellia_style_01.py index 3ab29590..910ecd97 100644 --- a/scripts/houses/player_cityhall_corellia_style_01.py +++ b/scripts/houses/player_cityhall_corellia_style_01.py @@ -6,9 +6,8 @@ def setup(core): houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff", "object/building/player/city/shared_cityhall_corellia.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.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") houseTemplate.setDefaultItemLimit(400) core.housingService.addHousingTemplate(houseTemplate)