From f394dd6e196f639938ce0ae782584d10aada79d4 Mon Sep 17 00:00:00 2001
From: Seefo <rezen1911@gmail.com>
Date: Tue, 6 May 2014 13:03:54 -0400
Subject: [PATCH] Fixed loot system message, added functions to TangibleObject
 to obtain different variants of the object's name

---
 scripts/commands/transferitemmisc.py           |  6 +-----
 .../objects/tangible/TangibleObject.java       | 18 ++++++++++++++++++
 src/services/housing/HousingService.java       |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/scripts/commands/transferitemmisc.py b/scripts/commands/transferitemmisc.py
index 16c98965..fb2995dd 100644
--- a/scripts/commands/transferitemmisc.py
+++ b/scripts/commands/transferitemmisc.py
@@ -24,11 +24,7 @@ def run(core, actor, target, commandString):
 			
         if target.isLootItem():
             target.setLootItem(0)
-            name=target.getCustomName()
-            if target.getCustomName() == None:
-                name='@' + target.getStfFilename() + ':' + target.getStfName() 
-  
-            actor.sendSystemMessage('You looted ' + name + ' from corpse.', 0)
+            actor.sendSystemMessage('You looted ' + target.getTrueName() + ' from corpse.', 0)
         
         if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer):
 			target.getContainer().transferTo(actor, container, target)
diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index d10499ec..9ed60956 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -512,6 +512,24 @@ public class TangibleObject extends SWGObject implements Serializable {
 		}
 	}
 	
+	// Returns the STF-based name
+	public String getProperName()
+	{
+		return  "@" + getStfFilename() + ":" + getStfName();
+	}
+	
+	// Returns the current, true name of the Object
+	public String getTrueName()
+	{
+		return getCustomName() != null ? getCustomName() : getProperName();
+	}
+	
+	// Returns the STF-based description
+	public String getProperDescription()
+	{
+		return "@" + getDetailFilename() + ":" + getDetailName();
+	}
+	
 	public List<LootGroup> getLootGroups() {
 		return lootGroups;
 	}
diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java
index 67642d31..3abb8b04 100644
--- a/src/services/housing/HousingService.java
+++ b/src/services/housing/HousingService.java
@@ -470,7 +470,7 @@ public class HousingService implements INetworkDispatch {
 		Vector<TangibleObject> itemList = building.getItemsList();
 
 		for (int i=0;i<itemList.size();i++){
-			String itemName = (itemList.get(i).getCustomName() != null) ? itemList.get(i).getCustomName() : "@" + itemList.get(i).getStfFilename() + ":" + itemList.get(i).getStfName();
+			String itemName = itemList.get(i).getTrueName();
 			window.addListBoxMenuItem(itemName, i);
 		}