diff --git a/ngengine_public.jar b/ngengine_public.jar index 8dbc2777..a78a6cba 100644 Binary files a/ngengine_public.jar and b/ngengine_public.jar differ 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/houses/player_house_corellia_large_style_01.py b/scripts/houses/player_house_corellia_large_style_01.py new file mode 100644 index 00000000..a151207a --- /dev/null +++ b/scripts/houses/player_house_corellia_large_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_corellia_house_large_deed.iff", "object/building/player/shared_player_house_corellia_large_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_large_style_02.py b/scripts/houses/player_house_corellia_large_style_02.py new file mode 100644 index 00000000..fd73c69c --- /dev/null +++ b/scripts/houses/player_house_corellia_large_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_corellia_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_medium_style_01.py b/scripts/houses/player_house_corellia_medium_style_01.py new file mode 100644 index 00000000..c28a5bef --- /dev/null +++ b/scripts/houses/player_house_corellia_medium_style_01.py @@ -0,0 +1,13 @@ +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_corellia_house_medium_deed.iff", "object/building/player/shared_player_house_corellia_medium_style_01.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_corellia_medium_style_02.py b/scripts/houses/player_house_corellia_medium_style_02.py new file mode 100644 index 00000000..4628723f --- /dev/null +++ b/scripts/houses/player_house_corellia_medium_style_02.py @@ -0,0 +1,13 @@ +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_corellia_house_medium_style_02_deed.iff", "object/building/player/shared_player_house_corellia_medium_style_02.iff", 2) + + houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3)) + houseTemplate.addPlaceablePlanet("corellia") + houseTemplate.addPlaceablePlanet("talus") + houseTemplate.setDefaultItemLimit(200) + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_large_style_01.py b/scripts/houses/player_house_generic_large_style_01.py new file mode 100644 index 00000000..d23df308 --- /dev/null +++ b/scripts/houses/player_house_generic_large_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/player_house_deed/shared_generic_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.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(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_large_style_02.py b/scripts/houses/player_house_generic_large_style_02.py new file mode 100644 index 00000000..250509bf --- /dev/null +++ b/scripts/houses/player_house_generic_large_style_02.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/player_house_deed/shared_generic_house_large_deed.iff", "object/building/player/shared_player_house_generic_large_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(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_large_window_s01.py b/scripts/houses/player_house_generic_large_window_s01.py new file mode 100644 index 00000000..f4be6080 --- /dev/null +++ b/scripts/houses/player_house_generic_large_window_s01.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/player_house_deed/shared_generic_house_large_window_s01_deed.iff", "object/building/player/shared_player_house_generic_large_window_s01.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(500) + + core.housingService.addHousingTemplate(houseTemplate) + return \ No newline at end of file diff --git a/scripts/houses/player_house_generic_large_window_s02.py b/scripts/houses/player_house_generic_large_window_s02.py new file mode 100644 index 00000000..704742e5 --- /dev/null +++ b/scripts/houses/player_house_generic_large_window_s02.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/player_house_deed/shared_generic_house_large_window_s02_deed.iff", "object/building/player/shared_player_house_generic_large_window_s02.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(500) + + 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/building/player/player_house_corellia_large_style_01.py b/scripts/object/building/player/player_house_corellia_large_style_01.py index ccad8904..128a3e4b 100644 --- a/scripts/object/building/player/player_house_corellia_large_style_01.py +++ b/scripts/object/building/player/player_house_corellia_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', 6, 3, 13.4, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 14.9, 4.5, 3.5, 0.707108, -0.707108, 3) + #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_house_corellia_large_style_02.py b/scripts/object/building/player/player_house_corellia_large_style_02.py index ccad8904..257e2444 100644 --- a/scripts/object/building/player/player_house_corellia_large_style_02.py +++ b/scripts/object/building/player/player_house_corellia_large_style_02.py @@ -1,4 +1,12 @@ import sys + 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', -10.5, 0.7, 4.5, 0.707108, -0.707108, 1) + #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_house_corellia_medium_style_01.py b/scripts/object/building/player/player_house_corellia_medium_style_01.py index ccad8904..26bf70af 100644 --- a/scripts/object/building/player/player_house_corellia_medium_style_01.py +++ b/scripts/object/building/player/player_house_corellia_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', 5.3, 2.26, 7.7, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 10.6, 0.5, 3.5, 0.707108, -0.707108, 1) + #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_house_corellia_medium_style_02.py b/scripts/object/building/player/player_house_corellia_medium_style_02.py index ccad8904..26bf70af 100644 --- a/scripts/object/building/player/player_house_corellia_medium_style_02.py +++ b/scripts/object/building/player/player_house_corellia_medium_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', 5.3, 2.26, 7.7, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 10.6, 0.5, 3.5, 0.707108, -0.707108, 1) + #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_house_generic_large_style_01.py b/scripts/object/building/player/player_house_generic_large_style_01.py index ccad8904..128a3e4b 100644 --- a/scripts/object/building/player/player_house_generic_large_style_01.py +++ b/scripts/object/building/player/player_house_generic_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', 6, 3, 13.4, -1, 0, -1) + print(sign) + object.setAttachment("structureSign", sign) + + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 14.9, 4.5, 3.5, 0.707108, -0.707108, 3) + #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_house_generic_large_style_02.py b/scripts/object/building/player/player_house_generic_large_style_02.py index ccad8904..257e2444 100644 --- a/scripts/object/building/player/player_house_generic_large_style_02.py +++ b/scripts/object/building/player/player_house_generic_large_style_02.py @@ -1,4 +1,12 @@ import sys + 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', -10.5, 0.7, 4.5, 0.707108, -0.707108, 1) + #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_house_generic_large_window_s01.py b/scripts/object/building/player/player_house_generic_large_window_s01.py index ccad8904..cda43b48 100644 --- a/scripts/object/building/player/player_house_generic_large_window_s01.py +++ b/scripts/object/building/player/player_house_generic_large_window_s01.py @@ -1,4 +1,11 @@ import sys 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', -10.5, 0.7, 4.5, 0.707108, -0.707108, 1) + #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_house_generic_large_window_s02.py b/scripts/object/building/player/player_house_generic_large_window_s02.py index ccad8904..fb7db369 100644 --- a/scripts/object/building/player/player_house_generic_large_window_s02.py +++ b/scripts/object/building/player/player_house_generic_large_window_s02.py @@ -1,4 +1,14 @@ 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', Point3D(float(10.4), float(3), float(-11)), Quaternion(float(0), float(0), float(0), float(0)), -1) + print(sign) + object.setAttachment("structureSign", sign) + + #structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -8.5, 0.7, 8.5, 0.707108, -0.707108, 1) + structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(8.6), float(0.5), float(2.5)), Quaternion(float(0), float(0), float(1), float(0)),1) + #structureterminal.setAttachment('radial_filename', '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 ccad8904..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,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 \ No newline at end of file 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 ccad8904..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,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_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_corellia_house_large_style_02_deed.iff') + object.setLotRequirement(5) + object.setBMR(26) + 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_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_deed.py index ccad8904..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,4 +1,12 @@ import sys def setup(core, object): + 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) + object.setBMR(18) + 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_medium_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_medium_style_02_deed.py index ccad8904..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,4 +1,12 @@ import sys def setup(core, object): + 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) + object.setBMR(18) + 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_small_deed.py b/scripts/object/tangible/deed/player_house_deed/corellia_house_small_deed.py index a49b0675..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return def use(core, actor, object): 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 000b6dcf..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return def use(core, actor, object): 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 9819f244..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return def use(core, actor, object): 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 f35ca172..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return def use(core, actor, object): 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 ccad8904..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,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_generic_large_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_deed.iff') + object.setLotRequirement(5) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file 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 ccad8904..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,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_generic_large_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_style_02_deed.iff') + object.setLotRequirement(2) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file 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 ccad8904..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,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_generic_large_style_01.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_window_s01_deed.iff') + object.setLotRequirement(2) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file 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 ccad8904..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,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_generic_large_style_02.iff') + object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_large_window_s02_deed.iff') + object.setLotRequirement(2) + object.setBMR(26) + return + +def use(core, actor, object): return \ No newline at end of file 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 c9086425..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(18) return def use(core, actor, object): 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 3413392c..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(18) return def use(core, actor, object): 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 ff8fe8db..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return def use(core, actor, object): 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 51a196dc..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,9 +1,9 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return \ No newline at end of file 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 0f343705..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,9 +1,9 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return 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 a154519e..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,9 +1,9 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return 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 2c1ce04d..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return def use(core, actor, object): 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 c68826cb..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,11 +1,11 @@ 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(1) - object.setBMR(15) + object.setLotRequirement(2) + object.setBMR(8) return def use(core, actor, object): diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index c059c589..b376cf1f 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -15,7 +15,7 @@ def addPlanetSpawns(core, planet): junkdealer = stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3525), float(4), float(-4804), float(0.70), float(0.71)) junkdealer.setOptionsBitmask(264) junkdealer.setCustomName('a Junk Dealer') - junkdealer.setAttachment('radial_filename', 'conversation'); + junkdealer.setAttachment('radial_filename', 'object/conversation'); junkdealer.setAttachment('conversationFile','junk_dealer') return diff --git a/src/services/DevService.java b/src/services/DevService.java index 97b5e107..1a7f453d 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -1226,49 +1226,7 @@ public class DevService implements INetworkDispatch { deed.setAttributes(); inventory.add(deed); - templateString="object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_deed.iff"; - deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); - deed.setBMR(15); - deed.setAttributes(); - inventory.add(deed); - - templateString="object/tangible/deed/player_house_deed/shared_generic_house_small_floor_02_deed.iff"; - deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); - deed.setBMR(15); - deed.setAttributes(); - inventory.add(deed); - - templateString="object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_floor_02_deed.iff"; - deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); - deed.setBMR(15); - deed.setAttributes(); - inventory.add(deed); - - - templateString="object/tangible/deed/player_house_deed/shared_corellia_house_small_deed.iff"; - deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); - deed.setBMR(15); - deed.setAttributes(); - inventory.add(deed); - - templateString="object/tangible/deed/player_house_deed/shared_corellia_house_small_floor_02_deed.iff"; - deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); - deed.setBMR(15); - deed.setAttributes(); - inventory.add(deed); - - templateString="object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_deed.iff"; - deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); - deed.setBMR(15); - deed.setAttributes(); - inventory.add(deed); - - templateString="object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_floor_02_deed.iff"; - deed = (Player_House_Deed)core.objectService.createObject(templateString, planet); - deed.setBMR(15); - deed.setAttributes(); - inventory.add(deed); - + break; case 125: TangibleObject genericCraftingTool = (TangibleObject) core.objectService.createObject("object/tangible/crafting/station/shared_generic_tool.iff", planet); genericCraftingTool.setCustomName("Generic Crafting Tool"); diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java index 01610e70..fa759d8b 100644 --- a/src/services/command/CommandService.java +++ b/src/services/command/CommandService.java @@ -295,7 +295,16 @@ public class CommandService implements INetworkDispatch { } } - processCommand(actor, target, command, actionCounter, commandArgs); + if(command instanceof CombatCommand) { + try { + processCommand(actor, target, (BaseSWGCommand) command.clone(), actionCounter, commandArgs); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + } + else + processCommand(actor, target, command, actionCounter, commandArgs); + return true; } 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; }