Merge remote-tracking branch 'origin/master' into PlayerCities

This commit is contained in:
CharonInferar
2014-04-23 22:06:21 +02:00
52 changed files with 447 additions and 117 deletions
@@ -1,4 +1,12 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'deeds/structureDeed')
object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff')
#object.setLotRequirement(5)
object.setBMR(308)
return
def use(core, actor, object):
return
@@ -1,4 +1,12 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'deeds/structureDeed')
object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_naboo_deed.iff')
#object.setLotRequirement(5)
object.setBMR(308)
return
def use(core, actor, object):
return
@@ -5,7 +5,11 @@ 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)
<<<<<<< HEAD
#object.setBMR(100)
=======
object.setBMR(308)
>>>>>>> upstream/master
return
def use(core, actor, object):
@@ -1,4 +1,9 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'deeds/vehicleDeed')
return
def use(core, actor, object):
core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_landspeeder_av21.iff', 'object/intangible/vehicle/shared_landspeeder_av21_pcd.iff')
return