Merge pull request #508 from tacef/master

Fixed Cityhall deeds
This commit is contained in:
Waverunner
2014-04-23 15:43:51 -04:00
36 changed files with 38 additions and 35 deletions
@@ -3,7 +3,7 @@ from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff", "object/building/player/city/shared_cityhall_corellia.iff", 5)
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff", "object/building/player/city/shared_cityhall_corellia.iff", 0)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addPlaceablePlanet("corellia")
@@ -3,7 +3,7 @@ from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_naboo_deed.iff", "object/building/player/city/shared_cityhall_naboo.iff", 5)
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_naboo_deed.iff", "object/building/player/city/shared_cityhall_naboo.iff", 0)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addPlaceablePlanet("naboo")
@@ -3,7 +3,7 @@ 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 = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff", "object/building/player/city/shared_cityhall_tatooine.iff", 0)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addPlaceablePlanet("tatooine")
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(400)
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
houseTemplate.addPlaceablePlanet("naboo")
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(4), float(12.7)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(500)
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(500)
@@ -5,8 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3),float(2.26),float(7.7)))
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3), float(2.26), float(7.7)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_deed.iff", "object/building/player/shared_player_house_corellia_small_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_floor_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_01_floorplan_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_floor_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_02_floorplan_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.7), float(3), float(9.1)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ 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.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(10.4), float(3), float(-11)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_deed.iff", "object/building/player/shared_player_house_generic_medium_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3),float(2.26),float(7.7)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_style_02_deed.iff", "object/building/player/shared_player_house_generic_medium_style_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3), float(2.26), float(7.7)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_deed.iff", "object/building/player/shared_player_house_generic_medium_windowed.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(2.26), float(7.8)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_s02_deed.iff", "object/building/player/shared_player_house_generic_medium_windowed_s02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(2.26), float(7.8)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff", "object/building/player/shared_player_house_generic_small_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_floor_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_01_floorplan_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_floor_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_02_floorplan_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_window_style_03_deed.iff", "object/building/player/shared_player_house_generic_small_window_style_03.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-6.6), float(2.36), float(6.3)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
@@ -5,7 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_window_deed.iff", "object/building/player/shared_player_house_generic_small_windowed.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
+2
View File
@@ -8,6 +8,8 @@ def addTemplate(core):
templates.add('object/mobile/shared_kreetle.iff')
mobileTemplate.setCreatureName('kreetle')
mobileTemplate.setTemplates(templates)
mobileTemplate.setAttackRange(5)
mobileTemplate.setAttackSpeed(5)
mobileTemplate.setLevel(5)
attacks = Vector()
mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+2
View File
@@ -8,6 +8,8 @@ def addTemplate(core):
templates.add('object/mobile/shared_womp_rat.iff')
mobileTemplate.setCreatureName('womprat')
mobileTemplate.setTemplates(templates)
mobileTemplate.setAttackRange(5)
mobileTemplate.setAttackSpeed(5)
mobileTemplate.setLevel(5)
attacks = Vector()
mobileTemplate.setDefaultAttack('creatureMeleeAttack')
@@ -11,7 +11,7 @@ def setup(core, object):
#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(18), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5)
cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5)
#cityterminal.setAttachment('housing_parentstruct', object)
city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3)
@@ -5,7 +5,7 @@ def setup(core, object):
object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff')
#object.setLotRequirement(5)
#object.setBMR(100)
object.setBMR(308)
return
def use(core, actor, object):
@@ -5,7 +5,7 @@ def setup(core, object):
object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_naboo_deed.iff')
#object.setLotRequirement(5)
#object.setBMR(100)
object.setBMR(308)
return
def use(core, actor, object):
@@ -5,7 +5,7 @@ def setup(core, object):
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)
object.setBMR(308)
return
def use(core, actor, object):