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

Conflicts:
	src/main/NGECore.java
	src/services/DevService.java

scripts/commands/placestructure.py

@@ -0,0 +1,26 @@
+import sys
+
+def setup():
+	return
+	
+def run(core, actor, target, commandString):
+	cmdArgs = commandString.split(" ")
+	
+	deedId = long(cmdArgs[0])
+	deed = core.objectService.getObject(deedId)
+	
+	positionX = float(cmdArgs[1])
+	positionZ = float(cmdArgs[2])
+	#positionY = core.terrainService.getHeight(actor.getPlanetId(), positionX, positionZ) + 2
+	
+	rotation = float(cmdArgs[3])
+	
+	
+	#structureTemplate = deed.getAttachment("structureTemplate")
+	
+	core.housingService.placeStructure(actor, deed, positionX, positionZ, rotation)
+	
+	#building = core.objectService.createObject(structureTemplate, actor.getPlanet(), positionX, positionZ, positionY);
+	#core.simulationService.add(building, building.getPosition().x, building.getPosition().z);
+	
+	return

scripts/expertise/expertise_of_purge_1.py

@@ -1,9 +1,9 @@
 import sys
 
 def addAbilities(core, actor, player):
-	actor.addAbility("expertise_of_purge_1")
+	actor.addAbility("of_purge_1")
 	return
 
 def removeAbilities(core, actor, player):
-	actor.removeAbility("expertise_of_purge_1")
+	actor.removeAbility("of_purge_1")
 	return

scripts/houses/player_house_generic_small_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_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.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(200)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/object/building/player/player_house_generic_small_style_01.py

@@ -1,4 +1,9 @@
 import sys
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -7.39, 2.36, 2, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1)
 	return

scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'structureDeed');
+	return
+
+def use(core, actor, object):
 	return

scripts/radial/structureDeed.py

@@ -0,0 +1,11 @@
+from resources.common import RadialOptions
+import sys
+
+def createRadial(core, owner, target, radials):
+	return
+	
+def handleSelection(core, owner, target, option):
+	if option == 21 and target:
+		core.housingService.enterStructureMode(owner, target)
+	return
+