diff --git a/scripts/commands/placestructure.py b/scripts/commands/placestructure.py index 30b239a0..fa7bc65a 100644 --- a/scripts/commands/placestructure.py +++ b/scripts/commands/placestructure.py @@ -12,7 +12,7 @@ def run(core, actor, target, commandString): if deed == actor: deed = actor.getUseTarget() - if deed.getTemplate().startswith('object/tangible/deed/harvester_deed') is True: + if deed.getTemplate().startswith('object/tangible/deed/harvester_deed') is True or deed.getTemplate().startswith('object/tangible/deed/generator_deed') is True: core.harvesterService.handlePlaceStructureCommand(actor, target, commandString) return diff --git a/scripts/houses/player_house_naboo_large_style_01.py b/scripts/houses/player_house_naboo_large_style_01.py index afaf05dd..a75ee9c9 100644 --- a/scripts/houses/player_house_naboo_large_style_01.py +++ b/scripts/houses/player_house_naboo_large_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_large_deed.iff", "object/building/player/shared_player_house_naboo_large_style_01.iff", 5) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7), float(3), float(-15.5))) @@ -10,6 +10,7 @@ def setup(core): houseTemplate.addPlaceablePlanet("rori") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(500) + houseTemplate.setBaseMaintenanceRate(8) - core.housingService.addHousingTemplate(houseTemplate) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_naboo_medium_style_01.py b/scripts/houses/player_house_naboo_medium_style_01.py index fd16fd70..c5cf6211 100644 --- a/scripts/houses/player_house_naboo_medium_style_01.py +++ b/scripts/houses/player_house_naboo_medium_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_medium_deed.iff", "object/building/player/shared_player_house_naboo_medium_style_01.iff", 2) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-2.2),float(3),float(-11.5))) @@ -10,5 +10,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("rori") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(18) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_naboo_small_style_01.py b/scripts/houses/player_house_naboo_small_style_01.py index eb092bce..7fdd3716 100644 --- a/scripts/houses/player_house_naboo_small_style_01.py +++ b/scripts/houses/player_house_naboo_small_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_deed.iff", "object/building/player/shared_player_house_naboo_small_style_01.iff", 2) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2))) @@ -10,5 +10,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("rori") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(18) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_naboo_small_style_02.py b/scripts/houses/player_house_naboo_small_style_02.py index f5f35f0f..05f46d81 100644 --- a/scripts/houses/player_house_naboo_small_style_02.py +++ b/scripts/houses/player_house_naboo_small_style_02.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_style_02_deed.iff", "object/building/player/shared_player_house_naboo_small_style_02.iff", 1) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(8.4),float(3),float(7.2))) @@ -10,5 +10,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("rori") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(100) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(18) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_naboo_small_window_style_01.py b/scripts/houses/player_house_naboo_small_window_style_01.py index 7ffa7dec..375af434 100644 --- a/scripts/houses/player_house_naboo_small_window_style_01.py +++ b/scripts/houses/player_house_naboo_small_window_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_window_deed.iff", "object/building/player/shared_player_house_naboo_small_window_style_01.iff", 2) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2))) @@ -10,5 +10,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("rori") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(18) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_sandcrawler.py b/scripts/houses/player_house_sandcrawler.py index c14d2b8c..3d33b10f 100644 --- a/scripts/houses/player_house_sandcrawler.py +++ b/scripts/houses/player_house_sandcrawler.py @@ -2,8 +2,8 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): - houseTemplate = HouseTemplate("object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff", "object/building/player/shared_player_house_sandcrawler.iff", 3) +def setup(housingTemplates): + houseTemplate = HouseTemplate("object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff", "object/building/player/shared_player_house_sandcrawler.iff", 5) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-8.75), float(3.86), float(1))) houseTemplate.addPlaceablePlanet("tatooine") @@ -14,6 +14,7 @@ def setup(core): houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.addPlaceablePlanet("lok") houseTemplate.setDefaultItemLimit(350) + houseTemplate.setBaseMaintenanceRate(26) - core.housingService.addHousingTemplate(houseTemplate) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_large_style_01.py b/scripts/houses/player_house_tatooine_large_style_01.py index 3085eb20..37a9b894 100644 --- a/scripts/houses/player_house_tatooine_large_style_01.py +++ b/scripts/houses/player_house_tatooine_large_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_large_deed.iff", "object/building/player/shared_player_house_tatooine_large_style_01.iff", 5) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-3), float(3), float(15.8))) @@ -10,6 +10,7 @@ def setup(core): houseTemplate.addPlaceablePlanet("lok") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(500) + houseTemplate.setBaseMaintenanceRate(26) - core.housingService.addHousingTemplate(houseTemplate) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_medium_style_01.py b/scripts/houses/player_house_tatooine_medium_style_01.py index d173048d..959cbb7e 100644 --- a/scripts/houses/player_house_tatooine_medium_style_01.py +++ b/scripts/houses/player_house_tatooine_medium_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_medium_deed.iff", "object/building/player/shared_player_house_tatooine_medium_style_01.iff", 2) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(4.3),float(2.26),float(12.5))) @@ -10,5 +10,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("lok") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(18) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_small_style_01.py b/scripts/houses/player_house_tatooine_small_style_01.py index eff8a21d..1e2579c2 100644 --- a/scripts/houses/player_house_tatooine_small_style_01.py +++ b/scripts/houses/player_house_tatooine_small_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_01.iff", 2) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(7.9))) @@ -10,5 +10,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("lok") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(8) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_small_style_02.py b/scripts/houses/player_house_tatooine_small_style_02.py index e5484c22..8c953386 100644 --- a/scripts/houses/player_house_tatooine_small_style_02.py +++ b/scripts/houses/player_house_tatooine_small_style_02.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_style_02_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_02.iff", 2) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2))) @@ -10,5 +10,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("lok") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(8) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_tatooine_small_window_style_01.py b/scripts/houses/player_house_tatooine_small_window_style_01.py index eff8a21d..1e2579c2 100644 --- a/scripts/houses/player_house_tatooine_small_window_style_01.py +++ b/scripts/houses/player_house_tatooine_small_window_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_01.iff", 2) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(7.9))) @@ -10,5 +10,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("lok") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(8) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_house_tcg_8_bespin_house.py b/scripts/houses/player_house_tcg_8_bespin_house.py index c7ac7d0b..2f37c85a 100644 --- a/scripts/houses/player_house_tcg_8_bespin_house.py +++ b/scripts/houses/player_house_tcg_8_bespin_house.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_player_house_tcg_8_bespin_house_deed.iff", "object/building/player/shared_player_house_tcg_8_bespin_house.iff", 3) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(0), float(2.86), float(-3.5))) @@ -14,6 +14,7 @@ def setup(core): houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.addPlaceablePlanet("lok") houseTemplate.setDefaultItemLimit(350) + houseTemplate.setBaseMaintenanceRate(8) - core.housingService.addHousingTemplate(houseTemplate) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_merchant_tent_style_01.py b/scripts/houses/player_merchant_tent_style_01.py index 3eef6c91..684cbcb6 100644 --- a/scripts/houses/player_merchant_tent_style_01.py +++ b/scripts/houses/player_merchant_tent_style_01.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_01_deed.iff", "object/building/player/shared_player_merchant_tent_style_01.iff", 1) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5))) @@ -14,5 +14,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.addPlaceablePlanet("lok") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(8) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_merchant_tent_style_02.py b/scripts/houses/player_merchant_tent_style_02.py index 811c5a5e..96668f8d 100644 --- a/scripts/houses/player_merchant_tent_style_02.py +++ b/scripts/houses/player_merchant_tent_style_02.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_02_deed.iff", "object/building/player/shared_player_merchant_tent_style_02.iff", 1) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5))) @@ -14,5 +14,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.addPlaceablePlanet("lok") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(8) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_merchant_tent_style_03.py b/scripts/houses/player_merchant_tent_style_03.py index d908b947..abfa4196 100644 --- a/scripts/houses/player_merchant_tent_style_03.py +++ b/scripts/houses/player_merchant_tent_style_03.py @@ -2,7 +2,7 @@ import sys from services.housing import HouseTemplate from engine.resources.scene import Point3D -def setup(core): +def setup(housingTemplates): houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_03_deed.iff", "object/building/player/shared_player_merchant_tent_style_03.iff", 1) houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5))) @@ -14,5 +14,6 @@ def setup(core): houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.addPlaceablePlanet("lok") houseTemplate.setDefaultItemLimit(200) - core.housingService.addHousingTemplate(houseTemplate) + houseTemplate.setBaseMaintenanceRate(8) + housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_01_deed.py b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_01_deed.py index 39fa9d08..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_01_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_01_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_merchant_tent_style_01_deed.iff') - object.setLotRequirement(2) - object.setBMR(8) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_02_deed.py index 387a8928..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_02_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_merchant_tent_style_02_deed.iff') - object.setLotRequirement(2) - object.setBMR(8) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_03_deed.py b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_03_deed.py index 38c8003f..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_03_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/merchant_tent_style_03_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_merchant_tent_style_03_deed.iff') - object.setLotRequirement(2) - object.setBMR(8) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_large_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_large_deed.py index 0f0a6353..5483eb6d 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_large_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_large_deed.py @@ -2,12 +2,4 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_naboo_large_style_01.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_large_deed.iff') - object.setLotRequirement(2) - object.setBMR(8) - return - - - - + return \ No newline at end of file diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_medium_deed.py index 22d9b33e..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_medium_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_medium_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_naboo_medium_style_01.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_medium_deed.iff') - object.setLotRequirement(2) - object.setBMR(18) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_deed.py index edff2158..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_naboo_small_style_01.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_small_deed.iff') - object.setLotRequirement(2) - object.setBMR(18) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_style_02_deed.py index adeca170..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_style_02_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_naboo_small_style_02.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_small_style_02_deed.iff') - object.setLotRequirement(2) - object.setBMR(18) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_window_deed.py b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_window_deed.py index 8ebc7feb..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/naboo_house_small_window_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/naboo_house_small_window_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_player_house_naboo_small_window_style_01.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_naboo_house_small_window_deed.iff') - object.setLotRequirement(2) - object.setBMR(18) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.py b/scripts/object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.py index 937edeb4..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/player_house_tcg_8_bespin_house_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_player_house_tcg_8_bespin_house_deed.iff') - object.setLotRequirement(2) - object.setBMR(8) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_large_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_large_deed.py index 7110ddc2..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_large_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_large_deed.py @@ -2,10 +2,6 @@ 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): diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_deed.py index b9918233..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_medium_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_tatooine_medium_style_01.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_medium_deed.iff') - object.setLotRequirement(2) - object.setBMR(18) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_deed.py index dd23d101..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_tatooine_small_style_01.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff') - object.setLotRequirement(2) - object.setBMR(8) return def use(core, actor, object): diff --git a/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_style_02_deed.py b/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_style_02_deed.py index 31de820d..07ab9319 100644 --- a/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_style_02_deed.py +++ b/scripts/object/tangible/deed/player_house_deed/tatooine_house_small_style_02_deed.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/construction/shared_tatooine_house_small_style_02_deed.iff') - object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff') - object.setLotRequirement(2) - object.setBMR(8) return def use(core, actor, object): diff --git a/scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.py b/scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.py index 5a653b5c..07ab9319 100644 --- a/scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.py +++ b/scripts/object/tangible/saga_system/rewards/structure_deed_player_house_sandcrawler.py @@ -2,10 +2,6 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'deeds/structureDeed') - object.setConstructorTemplate('object/building/player/shared_construction_structure.iff') - object.setStructureTemplate('object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff') - object.setLotRequirement(5) - object.setBMR(26) return def use(core, actor, object): diff --git a/src/services/DevService.java b/src/services/DevService.java index a7cbf6c7..e2bd4390 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -40,8 +40,6 @@ import resources.datatables.WeaponType; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; -import resources.objects.tangible.Harvester_Deed; -import resources.objects.tangible.Player_House_Deed; import resources.objects.tangible.TangibleObject; import resources.objects.tool.SurveyTool; import resources.objects.weapon.WeaponObject; diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java index e35cd1a1..34bdb205 100644 --- a/src/services/housing/HousingService.java +++ b/src/services/housing/HousingService.java @@ -40,7 +40,6 @@ import protocol.swg.EnterStructurePlacementModeMessage; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; -import resources.objects.tangible.Player_House_Deed; import resources.objects.tangible.TangibleObject; import services.playercities.PlayerCity; import services.sui.SUIWindow; diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index c48881ef..8cfc50f4 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -115,8 +115,6 @@ import resources.objects.resource.GalacticResource; import resources.objects.resource.ResourceContainerObject; import resources.objects.resource.ResourceRoot; import resources.objects.staticobject.StaticObject; -import resources.objects.tangible.Harvester_Deed; -import resources.objects.tangible.Player_House_Deed; import resources.objects.tangible.TangibleObject; import resources.objects.tool.SurveyTool; import resources.objects.waypoint.WaypointObject; diff --git a/src/services/resources/HarvesterService.java b/src/services/resources/HarvesterService.java index 57b7cf82..151a6d67 100644 --- a/src/services/resources/HarvesterService.java +++ b/src/services/resources/HarvesterService.java @@ -61,7 +61,6 @@ import resources.objects.player.PlayerObject; import resources.objects.resource.GalacticResource; import resources.objects.resource.ResourceContainerObject; import resources.objects.resource.ResourceRoot; -import resources.objects.tangible.Harvester_Deed; import resources.objects.tangible.TangibleObject; import resources.objects.waypoint.WaypointObject; import services.chat.Mail;