Cleaned up transferitemarmor.

scripts/commands/transferitemarmor.py

@@ -2,51 +2,26 @@ import sys
 
 def setup():
 	return
-	
-def run(core, actor, target, commandString):
 
+def run(core, actor, target, commandString):
 	parsedMsg = commandString.split(' ', 3)
 	objService = core.objectService
 	containerID = long(parsedMsg[1])
 	container = objService.getObject(containerID)
 	
-	canEquip = core.equipmentService.canEquip(actor, target)
-		
 	if target and container and target.getContainer():
 		oldContainer = target.getContainer()
 		
 		if container == oldContainer:
 			print 'Error: New container is same as old container.'
-			return;	
-	
-	if canEquip[0] is False and container == actor:
-		actor.sendSystemMessage(canEquip[1], 0)
-		return
-						
-	replacedObject = None
-	slotName = None
-	replacedObjects = []	
-	slotNames = None
-
-	if actor == container:
-		slotNames = container.getSlotNamesForObject(target)
-		
-		for slotName in slotNames:
-			object = container.getSlottedObject(slotName)
-			
-			if not object in replacedObjects and not object == None:
-				replacedObjects.append(object)
-			
-			if object != None:
-				actor.transferTo(actor, oldContainer, object)	
+			return;
 	
 	if oldContainer == actor.getSlottedObject('appearance_inventory'):
-		actor.removeObjectFromAppearanceEquipList(target)
+		core.equipmentService.unequipAppearance(target)
 	
 	oldContainer.transferTo(actor, container, target)
 	
 	if container == actor.getSlottedObject('appearance_inventory'):
-		actor.addObjectToAppearanceEquipList(target)		
+		core.equipmentService.equipAppearance(target)		
 	
 	return
-