Merge pull request #874 from zingzing175/master

Junk loot color naming and small template fix for Re ing.

scripts/loot/lootItems/junk/droid_battery_black_green.py

@@ -4,11 +4,15 @@ def itemTemplate():
 
 def customItemName():
 
-	return 'Droid Battery (Black/Green)'
+	return 'Droid Battery'
 
 def stackable():
 
 	return 1
+
+def reverse_engineering_name():
+
+	return 'Black/Green'
 	
 def junkDealerPrice():
 

scripts/loot/lootItems/junk/droid_battery_purple_green.py

@@ -4,7 +4,7 @@ def itemTemplate():
 
 def customItemName():
 
-	return 'Droid Battery (Purple/Green)'
+	return 'Droid Battery'
 	
 def lootDescriptor():
 
@@ -21,6 +21,10 @@ def customizationValues():
 def stackable():
 
 	return 1
+
+def reverse_engineering_name():
+
+	return 'Purple/Green'
 	
 def junkDealerPrice():
 

scripts/loot/lootItems/junk/droid_battery_teal.py

@@ -4,7 +4,7 @@ def itemTemplate():
 
 def customItemName():
 
-	return 'Droid Battery (Teal)'
+	return 'Droid Battery'
 	
 def lootDescriptor():
 
@@ -21,6 +21,10 @@ def customizationValues():
 def stackable():
 
 	return 1
+
+def reverse_engineering_name():
+
+	return 'Teal'
 	
 def junkDealerPrice():
 

scripts/loot/lootItems/junk/droid_motor_red.py

@@ -4,7 +4,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Droid Motor (Red)'
+	return 'Droid Motor'
 	
 def lootDescriptor():
 
@@ -22,6 +22,10 @@ def stackable():
 
 	return 1
 	
+def reverse_engineering_name():
+
+	return 'Red'
+	
 def junkDealerPrice():
 
 	return 28

scripts/loot/lootItems/junk/droid_motor_yellow.py

@@ -4,7 +4,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Droid Motor (yellow)'
+	return 'Droid Motor'
 	
 def lootDescriptor():
 
@@ -22,6 +22,10 @@ def stackable():
 
 	return 1
 	
+def reverse_engineering_name():
+
+	return 'Yellow'
+	
 def junkDealerPrice():
 
 	return 28

scripts/loot/lootItems/junk/wiring_black.py

@@ -5,7 +5,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Wiring (Black)'
+	return 'Wiring'
 
 def lootDescriptor():
 

scripts/loot/lootItems/junk/wiring_blue.py

@@ -5,12 +5,16 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Wiring (Blue)'
+	return 'Wiring'
 	
 def stackable():
 
 	return 1
 	
+def reverse_engineering_name():
+
+	return 'Blue'
+	
 def junkDealerPrice():
 
 	return 12

scripts/loot/lootItems/junk/wiring_green.py

@@ -4,7 +4,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Wiring (Green)'
+	return 'Wiring'
 
 def lootDescriptor():
 

scripts/loot/lootItems/junk/wiring_orange.py

@@ -4,7 +4,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Wiring (Orange)'
+	return 'Wiring'
 
 def lootDescriptor():
 

scripts/loot/lootItems/junk/wiring_purple.py

@@ -5,7 +5,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Wiring (Purple)'
+	return 'Wiring'
 
 def lootDescriptor():
 

scripts/loot/lootItems/junk/wiring_red_yellow.py

@@ -5,7 +5,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Wiring (Red/Yellow)'
+	return 'Wiring'
 
 def lootDescriptor():
 

scripts/loot/lootItems/junk/wiring_teal.py

@@ -5,7 +5,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Wiring (Teal)'
+	return 'Wiring'
 
 def lootDescriptor():
 

scripts/loot/lootItems/junk/wiring_white.py

@@ -5,7 +5,7 @@ def itemTemplate():
 	
 def customItemName():
 
-	return 'Wiring (White)'
+	return 'Wiring'
 
 def lootDescriptor():
 

src/services/reverseengineering/ReverseEngineeringService.java

@@ -3284,7 +3284,7 @@ public class ReverseEngineeringService implements INetworkDispatch {
 				// Assuming munition
 				String SEALabel = "socket_gem_armor";
 				String SEADescription = "socket_gem";
-				String SEATemplate = "object/tangible/gem/shared_clothing.iff";
+				String SEATemplate = "object/tangible/gem/shared_armor.iff";
 								
 				if (profession.equals("trader_0a")){
 					SEALabel = "socket_gem_clothing";
@@ -3294,7 +3294,7 @@ public class ReverseEngineeringService implements INetworkDispatch {
 				if (profession.equals("trader_0d")){
 					SEALabel = "socket_gem_weapon";
 					SEADescription = "socket_gem";
-					SEATemplate = "object/tangible/gem/shared_clothing.iff";
+					SEATemplate = "object/tangible/gem/shared_weapon.iff";
 				}
 			
 				core.objectService.destroyObject(bit1.getObjectID());
@@ -3405,7 +3405,7 @@ public class ReverseEngineeringService implements INetworkDispatch {
 				// Assuming munition
 				String SEALabel = "socket_gem_armor";
 				String SEADescription = "socket_gem";
-				String SEATemplate = "object/tangible/gem/shared_clothing.iff";
+				String SEATemplate = "object/tangible/gem/shared_armor.iff";
 				
 				if (profession.equals("trader_0c")){ // QA
 					if (! SEASTFName.equals("socket_gem_armor"))
@@ -3424,7 +3424,7 @@ public class ReverseEngineeringService implements INetworkDispatch {
 						return; // Wrong SEA type inserted
 					SEALabel = "socket_gem_weapon";
 					SEADescription = "socket_gem";
-					SEATemplate = "object/tangible/gem/shared_clothing.iff";
+					SEATemplate = "object/tangible/gem/shared_weapon.iff";
 				}
 				
 				// SEA --- this item can have max 3 modifiers; it is not possible to stack the same kind of modifier in one SEA.