From 235521556776d35dcb6f7164880ba7f9fe1070c2 Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 21 Apr 2014 22:45:58 +0200 Subject: [PATCH] Added more Houses, reed description Added Guildhalls Started preliminary City hall for testing Altered Objectservice to work with guild and city deeds Altered SUI Service to support the new folderstructure for structures and harvesters Fixed Structureterminal Radial --- .../player_cityhall_tatooine_style_01.py | 15 +++++++++++++++ .../player_guildhall_corellia_style_01.py | 14 ++++++++++++++ .../player_guildhall_generic_style_01.py | 19 +++++++++++++++++++ .../houses/player_guildhall_naboo_style_01.py | 15 +++++++++++++++ .../player_guildhall_tatooine_style_01.py | 15 +++++++++++++++ .../player_guildhall_tatooine_style_02.py | 15 +++++++++++++++ .../building/player/city/cityhall_tatooine.py | 10 ++++++++++ .../player_guildhall_corellia_style_01.py | 9 +++++++++ .../player_guildhall_generic_style_01.py | 9 +++++++++ .../player/player_guildhall_naboo_style_01.py | 9 +++++++++ .../player_guildhall_tatooine_style_01.py | 9 +++++++++ .../player_guildhall_tatooine_style_02.py | 9 +++++++++ .../deed/city_deed/cityhall_tatooine_deed.py | 8 ++++++++ .../deed/guild_deed/corellia_guild_deed.py | 8 ++++++++ .../deed/guild_deed/generic_guild_deed.py | 8 ++++++++ .../deed/guild_deed/naboo_guild_deed.py | 8 ++++++++ .../deed/guild_deed/tatooine_guild_deed.py | 8 ++++++++ .../tatooine_guild_style_02_deed.py | 8 ++++++++ .../corellia_house_large_deed.py | 2 +- .../corellia_house_large_style_02_deed.py | 2 +- .../corellia_house_medium_deed.py | 2 +- .../corellia_house_medium_style_02_deed.py | 2 +- .../corellia_house_small_deed.py | 2 +- .../corellia_house_small_floor_02_deed.py | 2 +- .../corellia_house_small_style_02_deed.py | 2 +- ...llia_house_small_style_02_floor_02_deed.py | 2 +- .../generic_house_large_deed.py | 2 +- .../generic_house_large_style_02_deed.py | 2 +- .../generic_house_large_window_s01_deed.py | 2 +- .../generic_house_large_window_s02_deed.py | 2 +- .../generic_house_medium_deed.py | 2 +- .../generic_house_medium_style_02_deed.py | 2 +- .../generic_house_medium_windowed_deed.py | 2 +- .../generic_house_medium_windowed_s02_deed.py | 2 +- .../generic_house_small_deed.py | 2 +- .../generic_house_small_floor_02_deed.py | 2 +- .../generic_house_small_style_02_deed.py | 2 +- ...eric_house_small_style_02_floor_02_deed.py | 2 +- .../generic_house_small_window_deed.py | 2 +- ...eneric_house_small_window_style_03_deed.py | 2 +- src/services/object/ObjectService.java | 2 +- src/services/sui/SUIService.java | 6 +++--- 42 files changed, 222 insertions(+), 26 deletions(-) create mode 100644 scripts/houses/player_cityhall_tatooine_style_01.py create mode 100644 scripts/houses/player_guildhall_corellia_style_01.py create mode 100644 scripts/houses/player_guildhall_generic_style_01.py create mode 100644 scripts/houses/player_guildhall_naboo_style_01.py create mode 100644 scripts/houses/player_guildhall_tatooine_style_01.py create mode 100644 scripts/houses/player_guildhall_tatooine_style_02.py diff --git a/scripts/houses/player_cityhall_tatooine_style_01.py b/scripts/houses/player_cityhall_tatooine_style_01.py new file mode 100644 index 00000000..21517f8d --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/houses/player_guildhall_corellia_style_01.py b/scripts/houses/player_guildhall_corellia_style_01.py new file mode 100644 index 00000000..3873b166 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/houses/player_guildhall_generic_style_01.py b/scripts/houses/player_guildhall_generic_style_01.py new file mode 100644 index 00000000..99ca93f3 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/houses/player_guildhall_naboo_style_01.py b/scripts/houses/player_guildhall_naboo_style_01.py new file mode 100644 index 00000000..c1d3daac --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/houses/player_guildhall_tatooine_style_01.py b/scripts/houses/player_guildhall_tatooine_style_01.py new file mode 100644 index 00000000..9e106925 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/houses/player_guildhall_tatooine_style_02.py b/scripts/houses/player_guildhall_tatooine_style_02.py new file mode 100644 index 00000000..d574bedf --- /dev/null +++ b/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 \ 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 ccad8904..abcc4690 100644 --- a/scripts/object/building/player/city/cityhall_tatooine.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_corellia_style_01.py b/scripts/object/building/player/player_guildhall_corellia_style_01.py index ccad8904..8e623ae0 100644 --- a/scripts/object/building/player/player_guildhall_corellia_style_01.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_generic_style_01.py b/scripts/object/building/player/player_guildhall_generic_style_01.py index ccad8904..8e623ae0 100644 --- a/scripts/object/building/player/player_guildhall_generic_style_01.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_naboo_style_01.py b/scripts/object/building/player/player_guildhall_naboo_style_01.py index ccad8904..8e623ae0 100644 --- a/scripts/object/building/player/player_guildhall_naboo_style_01.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_tatooine_style_01.py b/scripts/object/building/player/player_guildhall_tatooine_style_01.py index ccad8904..8e623ae0 100644 --- a/scripts/object/building/player/player_guildhall_tatooine_style_01.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/building/player/player_guildhall_tatooine_style_02.py b/scripts/object/building/player/player_guildhall_tatooine_style_02.py index ccad8904..53903ad4 100644 --- a/scripts/object/building/player/player_guildhall_tatooine_style_02.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py b/scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py index ccad8904..84cd09e2 100644 --- a/scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/corellia_guild_deed.py b/scripts/object/tangible/deed/guild_deed/corellia_guild_deed.py index ccad8904..4551ea56 100644 --- a/scripts/object/tangible/deed/guild_deed/corellia_guild_deed.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/generic_guild_deed.py b/scripts/object/tangible/deed/guild_deed/generic_guild_deed.py index ccad8904..e7bc0a46 100644 --- a/scripts/object/tangible/deed/guild_deed/generic_guild_deed.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/naboo_guild_deed.py b/scripts/object/tangible/deed/guild_deed/naboo_guild_deed.py index ccad8904..773614bf 100644 --- a/scripts/object/tangible/deed/guild_deed/naboo_guild_deed.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/tatooine_guild_deed.py b/scripts/object/tangible/deed/guild_deed/tatooine_guild_deed.py index ccad8904..fe254f2c 100644 --- a/scripts/object/tangible/deed/guild_deed/tatooine_guild_deed.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/deed/guild_deed/tatooine_guild_style_02_deed.py b/scripts/object/tangible/deed/guild_deed/tatooine_guild_style_02_deed.py index ccad8904..8560e4bb 100644 --- a/scripts/object/tangible/deed/guild_deed/tatooine_guild_style_02_deed.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_large_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_large_deed.py index 4c6b5f7a..7110ddc2 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_large_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_large_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_large_style_02_deed.py index 31c85bc2..fd316e06 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_large_style_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_deed.py index abb3267a..0794bf6a 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_deed.py index 22fafb0d..ff561136 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_deed.py index 3126f09e..412cb41f 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_floor_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_floor_02_deed.py index dedd3e1d..d7c943c8 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_floor_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_deed.py index 11215bf5..5d4d2b6a 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_floor_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_floor_02_deed.py index 6dac8f5a..af5a8c82 100644 --- a/scripts/object/tangible/deed/player_house_deed/corellia_house_small_style_02_floor_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_large_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_large_deed.py index 81b13196..8762d716 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_large_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_large_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_large_style_02_deed.py index ddd06a5f..33ac2fb5 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_large_style_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s01_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s01_deed.py index b1ed8c85..5c5fe535 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s01_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s02_deed.py index 07011e8d..8ad15d4e 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_large_window_s02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_deed.py index e8c4e843..98fbe311 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_style_02_deed.py index 9bf93cd1..f8941dc1 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_style_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_deed.py index e72ea70c..28949069 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_s02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_s02_deed.py index 070b22da..b784b441 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_medium_windowed_s02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py index 14386964..15cdd156 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_floor_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_floor_02_deed.py index 8955b933..830af4dc 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_floor_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_deed.py index e65829b5..54ae2ecb 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_floor_02_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_floor_02_deed.py index b244e930..4ca8c73e 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_style_02_floor_02_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_deed.py index 65c1d3d5..5bad5b8e 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_deed.py +++ b/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) diff --git a/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_style_03_deed.py b/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_style_03_deed.py index 6344c692..3666b630 100644 --- a/scripts/object/tangible/deed/player_house_deed/generic_house_small_window_style_03_deed.py +++ b/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) diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index c571bd5d..358ad44a 100644 --- a/src/services/object/ObjectService.java +++ b/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); diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java index f404adce..546fc3d2 100644 --- a/src/services/sui/SUIService.java +++ b/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; }