From 990554d0bf9f18e0f97f17875c01ef62c09c24b4 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Tue, 3 Jun 2014 20:08:39 +0100
Subject: [PATCH 01/23] Fixed arrayOutOfBounds error with bounties

---
 src/services/PlayerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index a6f9d8b5..11a81f58 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -1345,7 +1345,7 @@ public class PlayerService implements INetworkDispatch {
 
 			@Override
 			public void process(SWGObject owner, int eventType, Vector<String> returnList) {
-				if (eventType == 0 && returnList.get(0) != null) {
+				if (eventType == 0 && returnList.size() > 0 && returnList.get(0) != null) {
 					int bounty = Integer.parseInt(returnList.get(0));
 					int totalFunds = victim.getBankCredits() + victim.getCashCredits();
 					

From 32fa35711397afcb2eae31bbd121ddc8c8a8efe9 Mon Sep 17 00:00:00 2001
From: Mesagoppinmypants <pressinger.gene66@gmail.com>
Date: Tue, 3 Jun 2014 19:17:37 -0400
Subject: [PATCH 02/23] Added the Medic Roadmap Reward Script

---
 scripts/roadmap/medic_1a.py | 93 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/scripts/roadmap/medic_1a.py b/scripts/roadmap/medic_1a.py
index e6f67dfb..dd0ffb66 100644
--- a/scripts/roadmap/medic_1a.py
+++ b/scripts/roadmap/medic_1a.py
@@ -25,4 +25,95 @@ def getAction():
 	return 75
 
 def getRewards(name):
-	return	
\ No newline at end of file
+	if name == 'item_medic_backpack_01_02':
+		return "object/tangible/wearables/backpack/shared_backpack_s02.iff"
+	
+	if name == 'armor_medic_roadmap_bicep_l_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bicep_l.iff"
+		
+	if name == 'armor_medic_roadmap_bicep_r_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bicep_r.iff"
+		
+	if name == 'armor_medic_roadmap_bracer_l_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bracer_l.iff"
+		
+	if name == 'armor_medic_roadmap_bracer_r_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bracer_r.iff"	
+		
+	if name == 'armor_medic_roadmap_boots_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_boots.iff"	
+		
+	if name == 'armor_medic_roadmap_chest_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_chest_plate.iff"			
+
+	if name == 'armor_medic_roadmap_gloves_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_gloves.iff"
+		
+	if name == 'armor_medic_roadmap_helmet_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_helmet.iff"				
+		
+	if name == 'armor_medic_roadmap_leggings_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_leggings.iff"
+		
+	if name == 'armor_wookiee_roadmap_chest_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_chestplate.iff"
+		
+	if name == 'armor_wookiee_roadmap_leggings_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_leggings.iff"
+		
+	if name == 'armor_wookiee_roadmap_bicep_l_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bicep_l.iff"	
+	
+	if name == 'armor_wookiee_roadmap_bicep_r_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bicep_r.iff"		
+		
+	if name == 'armor_wookiee_roadmap_bracer_l_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bracer_l.iff"			
+		
+	if name == 'armor_wookiee_roadmap_bracer_r_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bracer_r.iff"
+
+	if name == 'armor_ithorian_roadmap_chest_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_chest_plate.iff"		
+		
+	if name == 'armor_ithorian_roadmap_leggings_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_leggings.iff"			
+
+	if name == 'armor_ithorian_roadmap_helmet_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_helmet.iff"		
+
+	if name == 'armor_ithorian_roadmap_bicep_l_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bicep_l.iff"				
+		
+	if name == 'armor_ithorian_roadmap_bicep_r_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bicep_r.iff"				
+		
+	if name == 'armor_ithorian_roadmap_bracer_l_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bracer_l.iff"			
+
+	if name == 'armor_ithorian_roadmap_bracer_r_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bracer_r.iff"			
+
+	if name == 'armor_ithorian_roadmap_boots_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_boots.iff"		
+
+	if name == 'armor_ithorian_roadmap_gloves_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_gloves.iff"				
+		
+	if name == 'weapon_carbine_me_roadmap_01_02':
+		return "object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff"
+		
+	if name == 'item_medic_ring_01_02':
+		return "object/tangible/wearables/ring/shared_ring_s02.iff"	
+		
+	if name == 'weapon_rifle_me_roadmap_01_02':
+		return "object/weapon/ranged/carbine/shared_carbine_laser.iff"		
+		
+	if name == 'item_medic_pendant_01_02':
+		return "object/tangible/wearables/necklace/shared_necklace_s02.iff"				
+		
+	if name == 'item_medic_clicky_01_02':
+		return "object/tangible/loot/generic_usable/shared_survey_pad_adv_generic.iff"			
+
+	if name == 'item_roadmap_belt_medic_01_02':
+		return "object/tangible/wearables/armor/zam/shared_armor_zam_wesell_belt.iff"

From de3f6474e1417ab02c791f1e67d8c40a5b72c95c Mon Sep 17 00:00:00 2001
From: Mesagoppinmypants <pressinger.gene66@gmail.com>
Date: Tue, 3 Jun 2014 19:30:36 -0400
Subject: [PATCH 03/23] Added the Smuggler Roadmap Reward Script

---
 scripts/roadmap/smuggler_1a.py | 93 +++++++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/scripts/roadmap/smuggler_1a.py b/scripts/roadmap/smuggler_1a.py
index 2b41cce4..44a2d32c 100644
--- a/scripts/roadmap/smuggler_1a.py
+++ b/scripts/roadmap/smuggler_1a.py
@@ -25,4 +25,95 @@ def getAction():
 	return 75
 
 def getRewards(name):
-	return	
\ No newline at end of file
+	if name == 'item_smuggler_backpack_01_02':
+		return "object/tangible/wearables/backpack/shared_backpack_s02.iff"
+	
+	if name == 'armor_smuggler_roadmap_bicep_l_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bicep_l.iff"
+
+	if name == 'armor_smuggler_roadmap_bicep_r_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bicep_r.iff"
+
+	if name == 'armor_smuggler_roadmap_bracer_l_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bracer_l.iff"
+
+	if name == 'armor_smuggler_roadmap_bracer_r_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bracer_r.iff"	
+
+	if name == 'armor_smuggler_roadmap_boots_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_boots.iff"	
+
+	if name == 'armor_smuggler_roadmap_chest_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_chest_plate.iff"			
+
+	if name == 'armor_smuggler_roadmap_gloves_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_gloves.iff"
+
+	if name == 'armor_smuggler_roadmap_helmet_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_helmet.iff"				
+
+	if name == 'armor_smuggler_roadmap_leggings_02_01':
+		return "object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_leggings.iff"
+
+	if name == 'armor_wookiee_roadmap_chest_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_chestplate.iff"
+
+	if name == 'armor_wookiee_roadmap_leggings_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_leggings.iff"
+
+	if name == 'armor_wookiee_roadmap_bicep_l_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bicep_l.iff"	
+
+	if name == 'armor_wookiee_roadmap_bicep_r_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bicep_r.iff"		
+
+	if name == 'armor_wookiee_roadmap_bracer_l_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bracer_l.iff"			
+
+	if name == 'armor_wookiee_roadmap_bracer_r_02_03':
+		return "object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bracer_r.iff"
+
+	if name == 'armor_ithorian_roadmap_chest_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_chest_plate.iff"		
+
+	if name == 'armor_ithorian_roadmap_leggings_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_leggings.iff"			
+
+	if name == 'armor_ithorian_roadmap_helmet_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_helmet.iff"		
+
+	if name == 'armor_ithorian_roadmap_bicep_l_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bicep_l.iff"				
+
+	if name == 'armor_ithorian_roadmap_bicep_r_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bicep_r.iff"				
+
+	if name == 'armor_ithorian_roadmap_bracer_l_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bracer_l.iff"			
+
+	if name == 'armor_ithorian_roadmap_bracer_r_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bracer_r.iff"			
+
+	if name == 'armor_ithorian_roadmap_boots_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_boots.iff"		
+
+	if name == 'armor_ithorian_roadmap_gloves_02_03':
+		return "object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_gloves.iff"				
+
+	if name == 'weapon_pistol_sm_roadmap_01_02':
+		return "object/weapon/ranged/pistol/shared_pistol_striker.iff"
+
+	if name == 'item_smuggler_ring_01_02':
+		return "object/tangible/wearables/ring/shared_ring_s02.iff"
+
+	if name == 'weapon_carbine_sm_roadmap_01_02':
+		return "object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff"		
+
+	if name == 'item_smuggler_pendant_01_02':
+		return "object/tangible/wearables/necklace/shared_necklace_s02.iff"				
+
+	if name == 'item_smuggler_clicky_01_02':
+		return "object/tangible/loot/generic_usable/shared_survey_pad_adv_generic.iff"			
+
+	if name == 'item_roadmap_belt_smuggler_01_02':
+		return "object/tangible/wearables/armor/zam/shared_armor_zam_wesell_belt.iff"	

From f7bc60626d8898512554f7dcf7925f5d86ee9ce8 Mon Sep 17 00:00:00 2001
From: Mesagoppinmypants <pressinger.gene66@gmail.com>
Date: Tue, 3 Jun 2014 19:34:00 -0400
Subject: [PATCH 04/23] Added Medic Clicky

---
 .../loot/generic_usable/item_medic_clicky_01_02.py       | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 scripts/object/tangible/loot/generic_usable/item_medic_clicky_01_02.py

diff --git a/scripts/object/tangible/loot/generic_usable/item_medic_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_medic_clicky_01_02.py
new file mode 100644
index 00000000..a9a7e24b
--- /dev/null
+++ b/scripts/object/tangible/loot/generic_usable/item_medic_clicky_01_02.py
@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, object):
+	object.setStfFilename('static_item_n')
+	object.setStfName('item_medic_clicky_01_02')
+	object.setDetailFilename('static_item_d')
+	object.setDetailName('item_medic_clicky_01_02')
+	object.setStringAttribute('class_required', 'Medic')
+	return

From 44c13723a23909a8f5b4db042b229cae02810842 Mon Sep 17 00:00:00 2001
From: Mesagoppinmypants <pressinger.gene66@gmail.com>
Date: Tue, 3 Jun 2014 19:35:10 -0400
Subject: [PATCH 05/23] Added Smuggler Clicky

---
 .../loot/generic_usable/item_smuggler_clicky_01_02.py    | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 scripts/object/tangible/loot/generic_usable/item_smuggler_clicky_01_02.py

diff --git a/scripts/object/tangible/loot/generic_usable/item_smuggler_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_smuggler_clicky_01_02.py
new file mode 100644
index 00000000..65b88834
--- /dev/null
+++ b/scripts/object/tangible/loot/generic_usable/item_smuggler_clicky_01_02.py
@@ -0,0 +1,9 @@
+import sys
+
+def setup(core, object):
+	object.setStfFilename('static_item_n')
+	object.setStfName('item_smuggler_clicky_01_02')
+	object.setDetailFilename('static_item_d')
+	object.setDetailName('item_smuggler_clicky_01_02')
+	object.setStringAttribute('class_required', 'Smuggler')
+	return

From c37c3ed990855d75248812f52c3d0619652f63d1 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 00:56:44 +0100
Subject: [PATCH 06/23] Caught exception in lootService temporarily

---
 src/services/LootService.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/services/LootService.java b/src/services/LootService.java
index a95a3d54..98b4520e 100644
--- a/src/services/LootService.java
+++ b/src/services/LootService.java
@@ -190,13 +190,17 @@ public class LootService implements INetworkDispatch {
 	    // set info above corpse
 	    //System.out.println("lootedObject instanceof CreatureObject " + (lootedObject instanceof CreatureObject));
 	    if (lootedObject instanceof CreatureObject){
-		    float y = 0.5F; // 1.3356977F
-		    float qz= 1.06535322E9F;
-		    Point3D effectorPosition = new Point3D(0,y,0);
-			Quaternion effectorOrientation = new Quaternion(0,0,0,qz);
-		    PlayClientEffectObjectTransformMessage lmsg = new PlayClientEffectObjectTransformMessage("appearance/pt_loot_disc.prt",lootedObject.getObjectID(),"lootMe",effectorPosition,effectorOrientation);
-		    requester.getClient().getSession().write(lmsg.serialize());
-		    tools.CharonPacketUtils.printAnalysis(lmsg.serialize());  
+	    	try {
+			    float y = 0.5F; // 1.3356977F
+			    float qz= 1.06535322E9F;
+			    Point3D effectorPosition = new Point3D(0,y,0);
+				Quaternion effectorOrientation = new Quaternion(0,0,0,qz);
+			    PlayClientEffectObjectTransformMessage lmsg = new PlayClientEffectObjectTransformMessage("appearance/pt_loot_disc.prt",lootedObject.getObjectID(),"lootMe",effectorPosition,effectorOrientation);
+			    requester.getClient().getSession().write(lmsg.serialize());
+			    tools.CharonPacketUtils.printAnalysis(lmsg.serialize());
+	    	} catch (Exception e) {
+	    		e.printStackTrace();
+	    	}
 	    }
 	    
 	    // handle errors

From e0bdbe3f2344407dc24e8b1601dbd96e72091a6b Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 01:00:28 +0100
Subject: [PATCH 07/23] Minor movement changes for vehicles

---
 src/services/SimulationService.java | 60 ++++++++++-------------------
 1 file changed, 21 insertions(+), 39 deletions(-)

diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index 040a905c..f93defd4 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -341,9 +341,9 @@ public class SimulationService implements INetworkDispatch {
 				
 				CreatureObject creature = (CreatureObject) client.getParent();
 				
-				CreatureObject object = (CreatureObject) client.getParent();
+				CreatureObject object = creature;
 				
-				if (core.mountService.isMounted(object)) {
+				if (core.mountService.isMounted(creature) && creature.getObjectID() == ((CreatureObject) creature.getContainer()).getOwnerId()) {
 					object = (CreatureObject) object.getContainer();
 				}
 				
@@ -371,59 +371,41 @@ public class SimulationService implements INetworkDispatch {
 					add(object, newPos.x, newPos.z);
 				} 
 				
-				
-
-				
 				//object.setParentId(0);
 				//object.setParent(null);
 			//	System.out.println("Parsed Height: " + core.terrainService.getHeight(object.getPlanetId(), dataTransform.getXPosition(), dataTransform.getZPosition())
 				//		 + " should be: " + dataTransform.getYPosition());
 				UpdateTransformMessage utm = new UpdateTransformMessage(object.getObjectID(), dataTransform.getTransformedX(), dataTransform.getTransformedY(), dataTransform.getTransformedZ(), dataTransform.getMovementCounter(), (byte) dataTransform.getMovementAngle(), dataTransform.getSpeed());
-	
-				List<SWGObject> newAwareObjects = get(object.getPlanet(), newPos.x, newPos.z, 512);
-				ArrayList<SWGObject> oldAwareObjects = new ArrayList<SWGObject>(object.getAwareObjects());
-				@SuppressWarnings("unchecked") Collection<SWGObject> updateAwareObjects = CollectionUtils.intersection(oldAwareObjects, newAwareObjects);
 				object.notifyObservers(utm, false);
-
+				
+				List<SWGObject> newAwareObjects = get(creature.getPlanet(), newPos.x, newPos.z, 512);
+				ArrayList<SWGObject> oldAwareObjects = new ArrayList<SWGObject>(creature.getAwareObjects());
+				@SuppressWarnings("unchecked") Collection<SWGObject> updateAwareObjects = CollectionUtils.intersection(oldAwareObjects, newAwareObjects);
+				
 				for(int i = 0; i < oldAwareObjects.size(); i++) {
 					SWGObject obj = oldAwareObjects.get(i);
-					if(!updateAwareObjects.contains(obj) && obj != object && obj.getWorldPosition().getDistance2D(newPos) > 200 && obj.isInQuadtree() /*&& obj.getParentId() == 0*/) {
+					if(!updateAwareObjects.contains(obj) && obj != creature && obj.getWorldPosition().getDistance2D(newPos) > 200 && obj.isInQuadtree() /*&& obj.getParentId() == 0*/) {
 						if(obj.getAttachment("bigSpawnRange") != null && obj.getWorldPosition().getDistance2D(newPos) < 512)
 							continue;
-						object.makeUnaware(obj);
+						creature.makeUnaware(obj);
 						if(obj.getClient() != null)
-							obj.makeUnaware(object);
-					} else if(obj != object && obj.getWorldPosition().getDistance2D(newPos) > 200 && obj.isInQuadtree() && obj.getAttachment("bigSpawnRange") == null) {
-						object.makeUnaware(obj);
+							obj.makeUnaware(creature);
+					} else if(obj != creature && obj.getWorldPosition().getDistance2D(newPos) > 200 && obj.isInQuadtree() && obj.getAttachment("bigSpawnRange") == null) {
+						creature.makeUnaware(obj);
 						if(obj.getClient() != null)
-							obj.makeUnaware(object);
+							obj.makeUnaware(creature);
 					}
 				}
+				
 				for(int i = 0; i < newAwareObjects.size(); i++) {
 					SWGObject obj = newAwareObjects.get(i);
 					//System.out.println(obj.getTemplate());
-					if(!updateAwareObjects.contains(obj) && obj != object && !object.getAwareObjects().contains(obj) &&  obj.getContainer() != object && obj.isInQuadtree()) {						
+					if(!updateAwareObjects.contains(obj) && obj != creature && !creature.getAwareObjects().contains(obj) &&  obj.getContainer() != creature && obj.isInQuadtree()) {						
 						if(obj.getAttachment("bigSpawnRange") == null && obj.getWorldPosition().getDistance2D(newPos) > 200)
 							continue;						
-						//object.makeAware(obj);
-						
-						if (object.getOption(Options.MOUNT)){
-							CreatureObject owner = (CreatureObject) core.objectService.getObject(object.getOwnerId());
-							owner.makeAware(obj);
-						}
-						else {
-							object.makeAware(obj);
-						}
-						
-						if(obj.getClient() != null){
-							if (object.getOption(Options.MOUNT)){
-								CreatureObject owner = (CreatureObject) core.objectService.getObject(object.getOwnerId());
-								obj.makeAware(owner);
-							}
-							else {
-								obj.makeAware(object);
-							}
-						}
+						creature.makeAware(obj);
+						if(obj.getClient() != null)
+							obj.makeAware(creature);
 					}
 				}
 				
@@ -434,8 +416,7 @@ public class SimulationService implements INetworkDispatch {
 				object.getEventBus().publish(event);
 				
 			}
-				
-				
+			
 		});
 		
 		objControllerOpcodes.put(ObjControllerOpcodes.DATA_TRANSFORM_WITH_PARENT, new INetworkRemoteEvent() {
@@ -485,7 +466,7 @@ public class SimulationService implements INetworkDispatch {
 					if(object.getContainer() != null)
 						object.getContainer()._remove(object);
 					if (object.getClient().isGM() && parent != null && parent instanceof CellObject && parent.getContainer() != null)
-						object.sendSystemMessage("BuildingId Hex: " + Long.toHexString(parent.getContainer().getObjectID()) + " CellNumber: " + ((CellObject) parent).getCellNumber(), DisplayType.Broadcast);
+						object.sendSystemMessage("BuildingId - Dec: " + parent.getContainer().getObjectID() + " Hex: " + Long.toHexString(parent.getContainer().getObjectID()) + " CellNumber: " + ((CellObject) parent).getCellNumber(), DisplayType.Broadcast);
 					parent._add(object);
 				}
 				object.setPosition(newPos);
@@ -767,6 +748,7 @@ public class SimulationService implements INetworkDispatch {
         return new Point3D(x, y, z);
 
 	}
+	
 	/*
 	 * Moved this to ConnectionService which will disconnect them
 	 * from the server if they don't send packets for 5 minutes or more

From d3c263b08d6d28a6c1a7b3a64f5033e791cb3497 Mon Sep 17 00:00:00 2001
From: Bronco69 <petertigges1977@googlemail.com>
Date: Wed, 4 Jun 2014 02:44:11 +0200
Subject: [PATCH 08/23] SkillMod "healing health" added

skillMod working now. same as "healing action"
now Officer "Last Stand" works perfect and grants health + action on
death of officer => not for group yet
---
 scripts/skillMods/healing_health.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/skillMods/healing_health.py b/scripts/skillMods/healing_health.py
index b5c5e291..a5613e79 100644
--- a/scripts/skillMods/healing_health.py
+++ b/scripts/skillMods/healing_health.py
@@ -1,6 +1,7 @@
 import sys
 
 def add(core, actor, skillMod, value):
+	actor.setHealth(actor.getHealth() + skillMod.getBase())
 	return
 
 def deduct(core, actor, skillMod, value):

From 2c044a23389c484334daeb1efa8a44ade9f1355c Mon Sep 17 00:00:00 2001
From: Zing <jeremy@zingstecharchive.com>
Date: Tue, 3 Jun 2014 20:31:01 -0700
Subject: [PATCH 09/23] (Added) Correct Templates for RLS Paintings. (some need
 custom STF info assigned)

---
 .../lootItems/exceptionallootchest/advertisement_rodian.py    | 2 +-
 .../loot/lootItems/exceptionallootchest/dusk_in_kachirho.py   | 2 +-
 scripts/loot/lootItems/exceptionallootchest/fighter.py        | 2 +-
 .../exceptionallootchest/poster_block_turret_schematic.py     | 2 +-
 scripts/loot/lootItems/exceptionallootchest/war_phoenix.py    | 2 +-
 .../loot/lootItems/legendarylootchest/mercenaries_despair.py  | 4 +++-
 .../loot/lootItems/legendarylootchest/mercenaries_lament.py   | 4 +++-
 scripts/loot/lootItems/legendarylootchest/rare_painting.py    | 2 +-
 scripts/loot/lootItems/rarelootchest/bothan_beauty.py         | 2 +-
 scripts/loot/lootItems/rarelootchest/bothan_buff.py           | 2 +-
 scripts/loot/lootItems/rarelootchest/cast_wing_in_flight.py   | 2 +-
 scripts/loot/lootItems/rarelootchest/corellian_seaside.py     | 2 +-
 scripts/loot/lootItems/rarelootchest/droid_in_contrast.py     | 2 +-
 scripts/loot/lootItems/rarelootchest/emperors_eyes.py         | 2 +-
 scripts/loot/lootItems/rarelootchest/family_bonds.py          | 2 +-
 scripts/loot/lootItems/rarelootchest/feared.py                | 2 +-
 scripts/loot/lootItems/rarelootchest/fighter_study.py         | 2 +-
 scripts/loot/lootItems/rarelootchest/fighters_courage.py      | 2 +-
 scripts/loot/lootItems/rarelootchest/hutt_greed.py            | 2 +-
 scripts/loot/lootItems/rarelootchest/imperial_oppression.py   | 2 +-
 scripts/loot/lootItems/rarelootchest/life_day_proud_wookie.py | 2 +-
 .../loot/lootItems/rarelootchest/life_day_red_robed_wookie.py | 2 +-
 scripts/loot/lootItems/rarelootchest/no_division.py           | 2 +-
 scripts/loot/lootItems/rarelootchest/pilgrimage.py            | 2 +-
 .../lootItems/rarelootchest/poster_of_a_ship_schematic.py     | 2 +-
 .../lootItems/rarelootchest/poster_of_a_turret_schematic.py   | 2 +-
 .../lootItems/rarelootchest/poster_of_food_preparation.py     | 3 ++-
 scripts/loot/lootItems/rarelootchest/tatooine_dune_speeder.py | 2 +-
 scripts/loot/lootItems/rarelootchest/triumph.py               | 2 +-
 scripts/loot/lootItems/rarelootchest/victory.py               | 2 +-
 scripts/loot/lootItems/rarelootchest/warriors honor.py        | 2 +-
 scripts/object/tangible/event_perk/lifeday_painting.py        | 4 +++-
 .../furniture/decorative/30th_anniversary_painting_01.py      | 4 +++-
 .../furniture/decorative/event_lifeday05_painting_01.py       | 4 +++-
 .../furniture/decorative/event_lifeday05_painting_02.py       | 4 +++-
 .../furniture/decorative/event_lifeday05_painting_03.py       | 4 +++-
 .../furniture/decorative/event_lifeday07_painting_01.py       | 4 +++-
 .../furniture/decorative/imperial_community_painting_2008.py  | 4 +++-
 .../tangible/furniture/decorative/pub29_corellia_painting.py  | 4 +++-
 .../tangible/furniture/decorative/pub29_mustafar_painting.py  | 4 +++-
 .../tangible/furniture/decorative/pub29_ryatt_painting.py     | 4 +++-
 .../furniture/decorative/rebel_community_painting_2008.py     | 4 +++-
 .../tangible/furniture/lifeday/lifeday_painting_2010_s01.py   | 4 +++-
 .../tangible/furniture/lifeday/lifeday_painting_2010_s02.py   | 4 +++-
 .../tangible/furniture/lifeday/lifeday_painting_2010_s03.py   | 4 +++-
 .../tangible/furniture/lifeday/lifeday_painting_2010_s04.py   | 4 +++-
 .../object/tangible/furniture/lifeday/lifeday_painting_s01.py | 4 +++-
 .../object/tangible/furniture/lifeday/lifeday_painting_s02.py | 4 +++-
 scripts/object/tangible/painting/bestine_quest_painting.py    | 4 +++-
 scripts/object/tangible/painting/painting_agrilat_s01.py      | 4 +++-
 scripts/object/tangible/painting/painting_armor_blueprint.py  | 4 +++-
 .../tangible/painting/painting_bestine_blueleaf_temple.py     | 4 +++-
 scripts/object/tangible/painting/painting_bestine_blumbush.py | 4 +++-
 scripts/object/tangible/painting/painting_bestine_boffa.py    | 4 +++-
 .../tangible/painting/painting_bestine_golden_flower_01.py    | 4 +++-
 .../tangible/painting/painting_bestine_golden_flower_02.py    | 4 +++-
 .../tangible/painting/painting_bestine_golden_flower_03.py    | 4 +++-
 scripts/object/tangible/painting/painting_bestine_house.py    | 4 +++-
 .../tangible/painting/painting_bestine_krayt_skeleton.py      | 4 +++-
 .../object/tangible/painting/painting_bestine_lucky_despot.py | 4 +++-
 .../object/tangible/painting/painting_bestine_mattberry.py    | 4 +++-
 .../tangible/painting/painting_bestine_moncal_eye_01.py       | 4 +++-
 .../tangible/painting/painting_bestine_moncal_eye_02.py       | 4 +++-
 .../tangible/painting/painting_bestine_rainbow_berry_bush.py  | 4 +++-
 .../object/tangible/painting/painting_bestine_raventhorn.py   | 4 +++-
 scripts/object/tangible/painting/painting_bestine_ronka.py    | 4 +++-
 .../object/tangible/painting/painting_bioengineer_orange.py   | 4 +++-
 scripts/object/tangible/painting/painting_bothan_f.py         | 4 +++-
 scripts/object/tangible/painting/painting_bothan_m.py         | 4 +++-
 scripts/object/tangible/painting/painting_bw_stormtrooper.py  | 4 +++-
 scripts/object/tangible/painting/painting_cargoport.py        | 4 +++-
 scripts/object/tangible/painting/painting_chp5.py             | 4 +++-
 scripts/object/tangible/painting/painting_clone_trooper_01.py | 4 +++-
 scripts/object/tangible/painting/painting_corl_01.py          | 4 +++-
 scripts/object/tangible/painting/painting_corl_02.py          | 4 +++-
 scripts/object/tangible/painting/painting_dance_party.py      | 4 +++-
 scripts/object/tangible/painting/painting_double_helix.py     | 4 +++-
 scripts/object/tangible/painting/painting_droid_bright.py     | 4 +++-
 scripts/object/tangible/painting/painting_endor_style_01.py   | 4 +++-
 .../tangible/painting/painting_fighter_pilot_human_01.py      | 4 +++-
 scripts/object/tangible/painting/painting_food_baking_s01.py  | 4 +++-
 scripts/object/tangible/painting/painting_food_baking_s02.py  | 4 +++-
 scripts/object/tangible/painting/painting_freedom.py          | 4 +++-
 scripts/object/tangible/painting/painting_grievous_01.py      | 4 +++-
 scripts/object/tangible/painting/painting_han_wanted.py       | 4 +++-
 .../tangible/painting/painting_heroic_exar_kun_ultra_rare.py  | 4 +++-
 .../tangible/painting/painting_house_cleanup_imperial.py      | 4 +++-
 .../object/tangible/painting/painting_house_cleanup_rebel.py  | 4 +++-
 scripts/object/tangible/painting/painting_human_f.py          | 4 +++-
 scripts/object/tangible/painting/painting_kite_plant.py       | 4 +++-
 scripts/object/tangible/painting/painting_leia_wanted.py      | 4 +++-
 .../object/tangible/painting/painting_loot_heroic_exar_kun.py | 4 +++-
 scripts/object/tangible/painting/painting_luke_wanted.py      | 4 +++-
 scripts/object/tangible/painting/painting_nebula_flower.py    | 4 +++-
 .../tangible/painting/painting_outbreak_biohazard_01.py       | 4 +++-
 .../tangible/painting/painting_outbreak_biohazard_02.py       | 4 +++-
 .../tangible/painting/painting_outbreak_biohazard_03.py       | 4 +++-
 scripts/object/tangible/painting/painting_palowick_ad_s01.py  | 4 +++-
 scripts/object/tangible/painting/painting_palowick_ad_s02.py  | 4 +++-
 scripts/object/tangible/painting/painting_palowick_ad_s03.py  | 4 +++-
 scripts/object/tangible/painting/painting_palowick_ad_s04.py  | 4 +++-
 scripts/object/tangible/painting/painting_planet_s01.py       | 4 +++-
 .../object/tangible/painting/painting_pvp_reward_imperial.py  | 4 +++-
 scripts/object/tangible/painting/painting_pvp_reward_rebel.py | 4 +++-
 scripts/object/tangible/painting/painting_rodian_f.py         | 4 +++-
 scripts/object/tangible/painting/painting_rodian_f_ad_01.py   | 4 +++-
 scripts/object/tangible/painting/painting_rodian_m.py         | 4 +++-
 scripts/object/tangible/painting/painting_schematic_droid.py  | 4 +++-
 .../tangible/painting/painting_schematic_transport_ship.py    | 4 +++-
 scripts/object/tangible/painting/painting_schematic_weapon.py | 4 +++-
 .../object/tangible/painting/painting_schematic_weapon_s03.py | 4 +++-
 scripts/object/tangible/painting/painting_skyscraper.py       | 4 +++-
 scripts/object/tangible/painting/painting_smoking_ad.py       | 4 +++-
 scripts/object/tangible/painting/painting_starmap.py          | 4 +++-
 scripts/object/tangible/painting/painting_tato_s03.py         | 4 +++-
 scripts/object/tangible/painting/painting_tato_s04.py         | 4 +++-
 scripts/object/tangible/painting/painting_teras_kasi.py       | 4 +++-
 scripts/object/tangible/painting/painting_teras_kasi_2.py     | 4 +++-
 scripts/object/tangible/painting/painting_trandoshan_m.py     | 4 +++-
 scripts/object/tangible/painting/painting_trandoshan_m_01.py  | 4 +++-
 scripts/object/tangible/painting/painting_tree.py             | 4 +++-
 scripts/object/tangible/painting/painting_trees_s01.py        | 4 +++-
 scripts/object/tangible/painting/painting_vader_victory.py    | 4 +++-
 scripts/object/tangible/painting/painting_valley_view.py      | 4 +++-
 scripts/object/tangible/painting/painting_victorious_reign.py | 4 +++-
 scripts/object/tangible/painting/painting_waterfall.py        | 4 +++-
 scripts/object/tangible/painting/painting_wod_ns_01.py        | 4 +++-
 scripts/object/tangible/painting/painting_wod_ns_02.py        | 4 +++-
 scripts/object/tangible/painting/painting_wod_outcast.py      | 4 +++-
 scripts/object/tangible/painting/painting_wod_scene_01.py     | 4 +++-
 scripts/object/tangible/painting/painting_wod_scene_02.py     | 4 +++-
 scripts/object/tangible/painting/painting_wod_scene_03.py     | 4 +++-
 scripts/object/tangible/painting/painting_wod_scene_04.py     | 4 +++-
 scripts/object/tangible/painting/painting_wod_sm_01.py        | 4 +++-
 scripts/object/tangible/painting/painting_wod_sm_02.py        | 4 +++-
 scripts/object/tangible/painting/painting_wookiee_f.py        | 4 +++-
 scripts/object/tangible/painting/painting_wookiee_m.py        | 4 +++-
 scripts/object/tangible/painting/painting_zabrak_f.py         | 4 +++-
 scripts/object/tangible/painting/painting_zabrak_m.py         | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_01.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_02.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_03.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_04.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_05.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_06.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_07.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_08.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_09.py        | 4 +++-
 .../veteran_reward/one_year_anniversary/painting_10.py        | 4 +++-
 149 files changed, 390 insertions(+), 149 deletions(-)

diff --git a/scripts/loot/lootItems/exceptionallootchest/advertisement_rodian.py b/scripts/loot/lootItems/exceptionallootchest/advertisement_rodian.py
index 75858734..919ad561 100644
--- a/scripts/loot/lootItems/exceptionallootchest/advertisement_rodian.py
+++ b/scripts/loot/lootItems/exceptionallootchest/advertisement_rodian.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting/rodian_f_ad_01.iff']
diff --git a/scripts/loot/lootItems/exceptionallootchest/dusk_in_kachirho.py b/scripts/loot/lootItems/exceptionallootchest/dusk_in_kachirho.py
index 75858734..577bde9b 100644
--- a/scripts/loot/lootItems/exceptionallootchest/dusk_in_kachirho.py
+++ b/scripts/loot/lootItems/exceptionallootchest/dusk_in_kachirho.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/veteran_reward/one_year_anniversary/shared_painting_10.iff']
diff --git a/scripts/loot/lootItems/exceptionallootchest/fighter.py b/scripts/loot/lootItems/exceptionallootchest/fighter.py
index 75858734..b30a875a 100644
--- a/scripts/loot/lootItems/exceptionallootchest/fighter.py
+++ b/scripts/loot/lootItems/exceptionallootchest/fighter.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_rodian_m.iff']
diff --git a/scripts/loot/lootItems/exceptionallootchest/poster_block_turret_schematic.py b/scripts/loot/lootItems/exceptionallootchest/poster_block_turret_schematic.py
index 75858734..140bfe20 100644
--- a/scripts/loot/lootItems/exceptionallootchest/poster_block_turret_schematic.py
+++ b/scripts/loot/lootItems/exceptionallootchest/poster_block_turret_schematic.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_schematic_weapon_s03.iff']
diff --git a/scripts/loot/lootItems/exceptionallootchest/war_phoenix.py b/scripts/loot/lootItems/exceptionallootchest/war_phoenix.py
index 75858734..74e2a65c 100644
--- a/scripts/loot/lootItems/exceptionallootchest/war_phoenix.py
+++ b/scripts/loot/lootItems/exceptionallootchest/war_phoenix.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_house_cleanup_rebel.iff']
diff --git a/scripts/loot/lootItems/legendarylootchest/mercenaries_despair.py b/scripts/loot/lootItems/legendarylootchest/mercenaries_despair.py
index 75858734..e58c34e1 100644
--- a/scripts/loot/lootItems/legendarylootchest/mercenaries_despair.py
+++ b/scripts/loot/lootItems/legendarylootchest/mercenaries_despair.py
@@ -1,4 +1,6 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_zabrak_f.iff']
+	
+	#Needs correct STF naming
diff --git a/scripts/loot/lootItems/legendarylootchest/mercenaries_lament.py b/scripts/loot/lootItems/legendarylootchest/mercenaries_lament.py
index 75858734..19779403 100644
--- a/scripts/loot/lootItems/legendarylootchest/mercenaries_lament.py
+++ b/scripts/loot/lootItems/legendarylootchest/mercenaries_lament.py
@@ -1,4 +1,6 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_zabrak_m.iff']
+	
+	#Needs correct STF naming
\ No newline at end of file
diff --git a/scripts/loot/lootItems/legendarylootchest/rare_painting.py b/scripts/loot/lootItems/legendarylootchest/rare_painting.py
index 75858734..25acee8a 100644
--- a/scripts/loot/lootItems/legendarylootchest/rare_painting.py
+++ b/scripts/loot/lootItems/legendarylootchest/rare_painting.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_bestine_quest_painting.iff']
diff --git a/scripts/loot/lootItems/rarelootchest/bothan_beauty.py b/scripts/loot/lootItems/rarelootchest/bothan_beauty.py
index 75858734..5815f08e 100644
--- a/scripts/loot/lootItems/rarelootchest/bothan_beauty.py
+++ b/scripts/loot/lootItems/rarelootchest/bothan_beauty.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_bothan_f.iff']
diff --git a/scripts/loot/lootItems/rarelootchest/bothan_buff.py b/scripts/loot/lootItems/rarelootchest/bothan_buff.py
index 75858734..5440f81e 100644
--- a/scripts/loot/lootItems/rarelootchest/bothan_buff.py
+++ b/scripts/loot/lootItems/rarelootchest/bothan_buff.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_bothan_m.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/cast_wing_in_flight.py b/scripts/loot/lootItems/rarelootchest/cast_wing_in_flight.py
index 75858734..ea714d38 100644
--- a/scripts/loot/lootItems/rarelootchest/cast_wing_in_flight.py
+++ b/scripts/loot/lootItems/rarelootchest/cast_wing_in_flight.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/veteran_reward/one_year_anniversary/shared_painting_01.iff']
diff --git a/scripts/loot/lootItems/rarelootchest/corellian_seaside.py b/scripts/loot/lootItems/rarelootchest/corellian_seaside.py
index 75858734..d0e95232 100644
--- a/scripts/loot/lootItems/rarelootchest/corellian_seaside.py
+++ b/scripts/loot/lootItems/rarelootchest/corellian_seaside.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_corl_02.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/droid_in_contrast.py b/scripts/loot/lootItems/rarelootchest/droid_in_contrast.py
index 75858734..4aa8ca91 100644
--- a/scripts/loot/lootItems/rarelootchest/droid_in_contrast.py
+++ b/scripts/loot/lootItems/rarelootchest/droid_in_contrast.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_droid_bright.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/emperors_eyes.py b/scripts/loot/lootItems/rarelootchest/emperors_eyes.py
index 75858734..c3e9ef7d 100644
--- a/scripts/loot/lootItems/rarelootchest/emperors_eyes.py
+++ b/scripts/loot/lootItems/rarelootchest/emperors_eyes.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/veteran_reward/one_year_anniversary/shared_painting_09.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/family_bonds.py b/scripts/loot/lootItems/rarelootchest/family_bonds.py
index 75858734..660133c5 100644
--- a/scripts/loot/lootItems/rarelootchest/family_bonds.py
+++ b/scripts/loot/lootItems/rarelootchest/family_bonds.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/event_perk/shared_lifeday_painting.iff']
diff --git a/scripts/loot/lootItems/rarelootchest/feared.py b/scripts/loot/lootItems/rarelootchest/feared.py
index 75858734..c6302766 100644
--- a/scripts/loot/lootItems/rarelootchest/feared.py
+++ b/scripts/loot/lootItems/rarelootchest/feared.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_rodian_f.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/fighter_study.py b/scripts/loot/lootItems/rarelootchest/fighter_study.py
index 75858734..9da55486 100644
--- a/scripts/loot/lootItems/rarelootchest/fighter_study.py
+++ b/scripts/loot/lootItems/rarelootchest/fighter_study.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/veteran_reward/one_year_anniversary/shared_painting_05.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/fighters_courage.py b/scripts/loot/lootItems/rarelootchest/fighters_courage.py
index 75858734..646f78fc 100644
--- a/scripts/loot/lootItems/rarelootchest/fighters_courage.py
+++ b/scripts/loot/lootItems/rarelootchest/fighters_courage.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+return ['object/tangible/painting/shared_painting_trandoshan_m_01.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/hutt_greed.py b/scripts/loot/lootItems/rarelootchest/hutt_greed.py
index 75858734..59f420ae 100644
--- a/scripts/loot/lootItems/rarelootchest/hutt_greed.py
+++ b/scripts/loot/lootItems/rarelootchest/hutt_greed.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/veteran_reward/one_year_anniversary/shared_painting_06.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/imperial_oppression.py b/scripts/loot/lootItems/rarelootchest/imperial_oppression.py
index 75858734..137fd83a 100644
--- a/scripts/loot/lootItems/rarelootchest/imperial_oppression.py
+++ b/scripts/loot/lootItems/rarelootchest/imperial_oppression.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/veteran_reward/one_year_anniversary/shared_painting_08.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/life_day_proud_wookie.py b/scripts/loot/lootItems/rarelootchest/life_day_proud_wookie.py
index d6bdaef5..a06d4da7 100644
--- a/scripts/loot/lootItems/rarelootchest/life_day_proud_wookie.py
+++ b/scripts/loot/lootItems/rarelootchest/life_day_proud_wookie.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday07_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/furniture/lifeday/shared_lifeday_painting_03.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/life_day_red_robed_wookie.py b/scripts/loot/lootItems/rarelootchest/life_day_red_robed_wookie.py
index d6bdaef5..240ff07b 100644
--- a/scripts/loot/lootItems/rarelootchest/life_day_red_robed_wookie.py
+++ b/scripts/loot/lootItems/rarelootchest/life_day_red_robed_wookie.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday07_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/furniture/lifeday/shared_lifeday_painting_s01.iff']
diff --git a/scripts/loot/lootItems/rarelootchest/no_division.py b/scripts/loot/lootItems/rarelootchest/no_division.py
index 75858734..14f78f28 100644
--- a/scripts/loot/lootItems/rarelootchest/no_division.py
+++ b/scripts/loot/lootItems/rarelootchest/no_division.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_bw_stormtrooper.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/pilgrimage.py b/scripts/loot/lootItems/rarelootchest/pilgrimage.py
index 75858734..b2360137 100644
--- a/scripts/loot/lootItems/rarelootchest/pilgrimage.py
+++ b/scripts/loot/lootItems/rarelootchest/pilgrimage.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff']
diff --git a/scripts/loot/lootItems/rarelootchest/poster_of_a_ship_schematic.py b/scripts/loot/lootItems/rarelootchest/poster_of_a_ship_schematic.py
index 75858734..3cb0b161 100644
--- a/scripts/loot/lootItems/rarelootchest/poster_of_a_ship_schematic.py
+++ b/scripts/loot/lootItems/rarelootchest/poster_of_a_ship_schematic.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+return ['object/tangible/painting/shared_painting_schematic_transport_ship.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/poster_of_a_turret_schematic.py b/scripts/loot/lootItems/rarelootchest/poster_of_a_turret_schematic.py
index 75858734..fe51f7bb 100644
--- a/scripts/loot/lootItems/rarelootchest/poster_of_a_turret_schematic.py
+++ b/scripts/loot/lootItems/rarelootchest/poster_of_a_turret_schematic.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_schematic_weapon.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/poster_of_food_preparation.py b/scripts/loot/lootItems/rarelootchest/poster_of_food_preparation.py
index 75858734..413ec8cc 100644
--- a/scripts/loot/lootItems/rarelootchest/poster_of_food_preparation.py
+++ b/scripts/loot/lootItems/rarelootchest/poster_of_food_preparation.py
@@ -1,4 +1,5 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_food_baking_s01.iff']
+	#return ['object/tangible/painting/shared_painting_food_baking_s02.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/tatooine_dune_speeder.py b/scripts/loot/lootItems/rarelootchest/tatooine_dune_speeder.py
index 75858734..c98b61bd 100644
--- a/scripts/loot/lootItems/rarelootchest/tatooine_dune_speeder.py
+++ b/scripts/loot/lootItems/rarelootchest/tatooine_dune_speeder.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/veteran_reward/one_year_anniversary/shared_painting_03.iff']
\ No newline at end of file
diff --git a/scripts/loot/lootItems/rarelootchest/triumph.py b/scripts/loot/lootItems/rarelootchest/triumph.py
index 75858734..fad44d4e 100644
--- a/scripts/loot/lootItems/rarelootchest/triumph.py
+++ b/scripts/loot/lootItems/rarelootchest/triumph.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_03.iff']
diff --git a/scripts/loot/lootItems/rarelootchest/victory.py b/scripts/loot/lootItems/rarelootchest/victory.py
index 75858734..48a181cc 100644
--- a/scripts/loot/lootItems/rarelootchest/victory.py
+++ b/scripts/loot/lootItems/rarelootchest/victory.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_vader_victory.iff']
diff --git a/scripts/loot/lootItems/rarelootchest/warriors honor.py b/scripts/loot/lootItems/rarelootchest/warriors honor.py
index 75858734..1f9874c2 100644
--- a/scripts/loot/lootItems/rarelootchest/warriors honor.py	
+++ b/scripts/loot/lootItems/rarelootchest/warriors honor.py	
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['object/tangible/furniture/decorative/shared_event_lifeday05_painting_01.iff'] # needs correct iff still
+	return ['object/tangible/painting/shared_painting_trandoshan_m.iff']
\ No newline at end of file
diff --git a/scripts/object/tangible/event_perk/lifeday_painting.py b/scripts/object/tangible/event_perk/lifeday_painting.py
index ccad8904..5f0dee13 100644
--- a/scripts/object/tangible/event_perk/lifeday_painting.py
+++ b/scripts/object/tangible/event_perk/lifeday_painting.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Family Bonds
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/30th_anniversary_painting_01.py b/scripts/object/tangible/furniture/decorative/30th_anniversary_painting_01.py
index ccad8904..e125d99d 100644
--- a/scripts/object/tangible/furniture/decorative/30th_anniversary_painting_01.py
+++ b/scripts/object/tangible/furniture/decorative/30th_anniversary_painting_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#30th Anniversary Bash
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_01.py b/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_01.py
index ccad8904..c424cded 100644
--- a/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_01.py
+++ b/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Pilgramige
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_02.py b/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_02.py
index ccad8904..201a21dc 100644
--- a/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_02.py
+++ b/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Memories Past
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_03.py b/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_03.py
index ccad8904..ba95aa3f 100644
--- a/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_03.py
+++ b/scripts/object/tangible/furniture/decorative/event_lifeday05_painting_03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Triumph
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/event_lifeday07_painting_01.py b/scripts/object/tangible/furniture/decorative/event_lifeday07_painting_01.py
index ccad8904..9bdba6fa 100644
--- a/scripts/object/tangible/furniture/decorative/event_lifeday07_painting_01.py
+++ b/scripts/object/tangible/furniture/decorative/event_lifeday07_painting_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No name, Yoda Wookiee
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/imperial_community_painting_2008.py b/scripts/object/tangible/furniture/decorative/imperial_community_painting_2008.py
index ccad8904..527db59b 100644
--- a/scripts/object/tangible/furniture/decorative/imperial_community_painting_2008.py
+++ b/scripts/object/tangible/furniture/decorative/imperial_community_painting_2008.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#United in our Cause
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/pub29_corellia_painting.py b/scripts/object/tangible/furniture/decorative/pub29_corellia_painting.py
index ccad8904..2a16ecb0 100644
--- a/scripts/object/tangible/furniture/decorative/pub29_corellia_painting.py
+++ b/scripts/object/tangible/furniture/decorative/pub29_corellia_painting.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Mystic Corellia
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/pub29_mustafar_painting.py b/scripts/object/tangible/furniture/decorative/pub29_mustafar_painting.py
index ccad8904..873bc07e 100644
--- a/scripts/object/tangible/furniture/decorative/pub29_mustafar_painting.py
+++ b/scripts/object/tangible/furniture/decorative/pub29_mustafar_painting.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#It Came From Mustafar
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/pub29_ryatt_painting.py b/scripts/object/tangible/furniture/decorative/pub29_ryatt_painting.py
index ccad8904..ad20ddcc 100644
--- a/scripts/object/tangible/furniture/decorative/pub29_ryatt_painting.py
+++ b/scripts/object/tangible/furniture/decorative/pub29_ryatt_painting.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Survive the Ryatt Trail
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/decorative/rebel_community_painting_2008.py b/scripts/object/tangible/furniture/decorative/rebel_community_painting_2008.py
index ccad8904..104d57f1 100644
--- a/scripts/object/tangible/furniture/decorative/rebel_community_painting_2008.py
+++ b/scripts/object/tangible/furniture/decorative/rebel_community_painting_2008.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#The March to Restuss
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s01.py b/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s01.py
index ccad8904..343b1b69 100644
--- a/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s01.py
+++ b/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#courage
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s02.py b/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s02.py
index ccad8904..dac3bf8f 100644
--- a/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s02.py
+++ b/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Morality
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s03.py b/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s03.py
index ccad8904..b3542866 100644
--- a/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s03.py
+++ b/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Loyalty
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s04.py b/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s04.py
index ccad8904..1319171d 100644
--- a/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s04.py
+++ b/scripts/object/tangible/furniture/lifeday/lifeday_painting_2010_s04.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Compassion
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/lifeday/lifeday_painting_s01.py b/scripts/object/tangible/furniture/lifeday/lifeday_painting_s01.py
index ccad8904..c089819f 100644
--- a/scripts/object/tangible/furniture/lifeday/lifeday_painting_s01.py
+++ b/scripts/object/tangible/furniture/lifeday/lifeday_painting_s01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Lifeday Painting (Red Robe)
\ No newline at end of file
diff --git a/scripts/object/tangible/furniture/lifeday/lifeday_painting_s02.py b/scripts/object/tangible/furniture/lifeday/lifeday_painting_s02.py
index ccad8904..72a1a7ef 100644
--- a/scripts/object/tangible/furniture/lifeday/lifeday_painting_s02.py
+++ b/scripts/object/tangible/furniture/lifeday/lifeday_painting_s02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Red Robe Family
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/bestine_quest_painting.py b/scripts/object/tangible/painting/bestine_quest_painting.py
index ccad8904..0cc5dde7 100644
--- a/scripts/object/tangible/painting/bestine_quest_painting.py
+++ b/scripts/object/tangible/painting/bestine_quest_painting.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#rare painting (Dath Prison)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_agrilat_s01.py b/scripts/object/tangible/painting/painting_agrilat_s01.py
index ccad8904..15216761 100644
--- a/scripts/object/tangible/painting/painting_agrilat_s01.py
+++ b/scripts/object/tangible/painting/painting_agrilat_s01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Landscape of the Agrilat Swamp
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_armor_blueprint.py b/scripts/object/tangible/painting/painting_armor_blueprint.py
index ccad8904..3a03b8f4 100644
--- a/scripts/object/tangible/painting/painting_armor_blueprint.py
+++ b/scripts/object/tangible/painting/painting_armor_blueprint.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#RIS-one Sheet
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_blueleaf_temple.py b/scripts/object/tangible/painting/painting_bestine_blueleaf_temple.py
index ccad8904..2656a516 100644
--- a/scripts/object/tangible/painting/painting_bestine_blueleaf_temple.py
+++ b/scripts/object/tangible/painting/painting_bestine_blueleaf_temple.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of the Blue Leaf Temple
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_blumbush.py b/scripts/object/tangible/painting/painting_bestine_blumbush.py
index ccad8904..07b60db5 100644
--- a/scripts/object/tangible/painting/painting_bestine_blumbush.py
+++ b/scripts/object/tangible/painting/painting_bestine_blumbush.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Blumbush
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_boffa.py b/scripts/object/tangible/painting/painting_bestine_boffa.py
index ccad8904..f7c9da0d 100644
--- a/scripts/object/tangible/painting/painting_bestine_boffa.py
+++ b/scripts/object/tangible/painting/painting_bestine_boffa.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Boffa Plant
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_golden_flower_01.py b/scripts/object/tangible/painting/painting_bestine_golden_flower_01.py
index ccad8904..d434b0cc 100644
--- a/scripts/object/tangible/painting/painting_bestine_golden_flower_01.py
+++ b/scripts/object/tangible/painting/painting_bestine_golden_flower_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Abstract Painting of Golden Petals 1
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_golden_flower_02.py b/scripts/object/tangible/painting/painting_bestine_golden_flower_02.py
index ccad8904..4e6014c1 100644
--- a/scripts/object/tangible/painting/painting_bestine_golden_flower_02.py
+++ b/scripts/object/tangible/painting/painting_bestine_golden_flower_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Abstract Painting of Golden Petals 2
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_golden_flower_03.py b/scripts/object/tangible/painting/painting_bestine_golden_flower_03.py
index ccad8904..3cfb6fb7 100644
--- a/scripts/object/tangible/painting/painting_bestine_golden_flower_03.py
+++ b/scripts/object/tangible/painting/painting_bestine_golden_flower_03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Abstract Painting of Golden Petals 3
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_house.py b/scripts/object/tangible/painting/painting_bestine_house.py
index ccad8904..78d4a484 100644
--- a/scripts/object/tangible/painting/painting_bestine_house.py
+++ b/scripts/object/tangible/painting/painting_bestine_house.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Residential House
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_krayt_skeleton.py b/scripts/object/tangible/painting/painting_bestine_krayt_skeleton.py
index ccad8904..a766be30 100644
--- a/scripts/object/tangible/painting/painting_bestine_krayt_skeleton.py
+++ b/scripts/object/tangible/painting/painting_bestine_krayt_skeleton.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Krayt Dragon Skeleton
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_lucky_despot.py b/scripts/object/tangible/painting/painting_bestine_lucky_despot.py
index ccad8904..826cf6ba 100644
--- a/scripts/object/tangible/painting/painting_bestine_lucky_despot.py
+++ b/scripts/object/tangible/painting/painting_bestine_lucky_despot.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of the Lucky Despot Wreckage
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_mattberry.py b/scripts/object/tangible/painting/painting_bestine_mattberry.py
index ccad8904..3263118d 100644
--- a/scripts/object/tangible/painting/painting_bestine_mattberry.py
+++ b/scripts/object/tangible/painting/painting_bestine_mattberry.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Mattberry Plant
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_moncal_eye_01.py b/scripts/object/tangible/painting/painting_bestine_moncal_eye_01.py
index ccad8904..57e13209 100644
--- a/scripts/object/tangible/painting/painting_bestine_moncal_eye_01.py
+++ b/scripts/object/tangible/painting/painting_bestine_moncal_eye_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Moncal eye 1
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_moncal_eye_02.py b/scripts/object/tangible/painting/painting_bestine_moncal_eye_02.py
index ccad8904..bfff1499 100644
--- a/scripts/object/tangible/painting/painting_bestine_moncal_eye_02.py
+++ b/scripts/object/tangible/painting/painting_bestine_moncal_eye_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a moncal eye 2
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_rainbow_berry_bush.py b/scripts/object/tangible/painting/painting_bestine_rainbow_berry_bush.py
index ccad8904..d832a864 100644
--- a/scripts/object/tangible/painting/painting_bestine_rainbow_berry_bush.py
+++ b/scripts/object/tangible/painting/painting_bestine_rainbow_berry_bush.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Ranbow Berry Bush
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_raventhorn.py b/scripts/object/tangible/painting/painting_bestine_raventhorn.py
index ccad8904..f9cd757f 100644
--- a/scripts/object/tangible/painting/painting_bestine_raventhorn.py
+++ b/scripts/object/tangible/painting/painting_bestine_raventhorn.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Raventhorn Plant
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bestine_ronka.py b/scripts/object/tangible/painting/painting_bestine_ronka.py
index ccad8904..45c9bf5e 100644
--- a/scripts/object/tangible/painting/painting_bestine_ronka.py
+++ b/scripts/object/tangible/painting/painting_bestine_ronka.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of a Ronka Plant
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bioengineer_orange.py b/scripts/object/tangible/painting/painting_bioengineer_orange.py
index ccad8904..2835c34b 100644
--- a/scripts/object/tangible/painting/painting_bioengineer_orange.py
+++ b/scripts/object/tangible/painting/painting_bioengineer_orange.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Bio-Engineer Poster
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bothan_f.py b/scripts/object/tangible/painting/painting_bothan_f.py
index ccad8904..da748f3c 100644
--- a/scripts/object/tangible/painting/painting_bothan_f.py
+++ b/scripts/object/tangible/painting/painting_bothan_f.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Bothan Beauty
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bothan_m.py b/scripts/object/tangible/painting/painting_bothan_m.py
index ccad8904..f73400e8 100644
--- a/scripts/object/tangible/painting/painting_bothan_m.py
+++ b/scripts/object/tangible/painting/painting_bothan_m.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Bothan Buff
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_bw_stormtrooper.py b/scripts/object/tangible/painting/painting_bw_stormtrooper.py
index ccad8904..66324644 100644
--- a/scripts/object/tangible/painting/painting_bw_stormtrooper.py
+++ b/scripts/object/tangible/painting/painting_bw_stormtrooper.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No Division
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_cargoport.py b/scripts/object/tangible/painting/painting_cargoport.py
index ccad8904..29430a79 100644
--- a/scripts/object/tangible/painting/painting_cargoport.py
+++ b/scripts/object/tangible/painting/painting_cargoport.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Cargoport Blueprint
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_chp5.py b/scripts/object/tangible/painting/painting_chp5.py
index ccad8904..25ca8ace 100644
--- a/scripts/object/tangible/painting/painting_chp5.py
+++ b/scripts/object/tangible/painting/painting_chp5.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	# A painting (Around the Campfire)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_clone_trooper_01.py b/scripts/object/tangible/painting/painting_clone_trooper_01.py
index ccad8904..53b8f5e5 100644
--- a/scripts/object/tangible/painting/painting_clone_trooper_01.py
+++ b/scripts/object/tangible/painting/painting_clone_trooper_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Clone Wars Painting
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_corl_01.py b/scripts/object/tangible/painting/painting_corl_01.py
index ccad8904..c6bad819 100644
--- a/scripts/object/tangible/painting/painting_corl_01.py
+++ b/scripts/object/tangible/painting/painting_corl_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No name Corellia Fields
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_corl_02.py b/scripts/object/tangible/painting/painting_corl_02.py
index ccad8904..26bddda6 100644
--- a/scripts/object/tangible/painting/painting_corl_02.py
+++ b/scripts/object/tangible/painting/painting_corl_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No name Corellia Beach
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_dance_party.py b/scripts/object/tangible/painting/painting_dance_party.py
index ccad8904..12016a86 100644
--- a/scripts/object/tangible/painting/painting_dance_party.py
+++ b/scripts/object/tangible/painting/painting_dance_party.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Party Poster / Dance Party
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_double_helix.py b/scripts/object/tangible/painting/painting_double_helix.py
index ccad8904..cca6b071 100644
--- a/scripts/object/tangible/painting/painting_double_helix.py
+++ b/scripts/object/tangible/painting/painting_double_helix.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Double Helix
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_droid_bright.py b/scripts/object/tangible/painting/painting_droid_bright.py
index ccad8904..04e8bc64 100644
--- a/scripts/object/tangible/painting/painting_droid_bright.py
+++ b/scripts/object/tangible/painting/painting_droid_bright.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Droid in Contrast
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_endor_style_01.py b/scripts/object/tangible/painting/painting_endor_style_01.py
index ccad8904..038c4d3f 100644
--- a/scripts/object/tangible/painting/painting_endor_style_01.py
+++ b/scripts/object/tangible/painting/painting_endor_style_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting (Endor Landscape)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_fighter_pilot_human_01.py b/scripts/object/tangible/painting/painting_fighter_pilot_human_01.py
index ccad8904..f2ddba2c 100644
--- a/scripts/object/tangible/painting/painting_fighter_pilot_human_01.py
+++ b/scripts/object/tangible/painting/painting_fighter_pilot_human_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Star Pilot
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_food_baking_s01.py b/scripts/object/tangible/painting/painting_food_baking_s01.py
index ccad8904..704b3a4f 100644
--- a/scripts/object/tangible/painting/painting_food_baking_s01.py
+++ b/scripts/object/tangible/painting/painting_food_baking_s01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Poster of Food Preperation
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_food_baking_s02.py b/scripts/object/tangible/painting/painting_food_baking_s02.py
index ccad8904..704b3a4f 100644
--- a/scripts/object/tangible/painting/painting_food_baking_s02.py
+++ b/scripts/object/tangible/painting/painting_food_baking_s02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Poster of Food Preperation
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_freedom.py b/scripts/object/tangible/painting/painting_freedom.py
index ccad8904..2bcfc31c 100644
--- a/scripts/object/tangible/painting/painting_freedom.py
+++ b/scripts/object/tangible/painting/painting_freedom.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	# Freedom (Glorious Scrifice)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_grievous_01.py b/scripts/object/tangible/painting/painting_grievous_01.py
index ccad8904..53b8f5e5 100644
--- a/scripts/object/tangible/painting/painting_grievous_01.py
+++ b/scripts/object/tangible/painting/painting_grievous_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Clone Wars Painting
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_han_wanted.py b/scripts/object/tangible/painting/painting_han_wanted.py
index ccad8904..fbee5cde 100644
--- a/scripts/object/tangible/painting/painting_han_wanted.py
+++ b/scripts/object/tangible/painting/painting_han_wanted.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Han Solo Wanted Poster
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_heroic_exar_kun_ultra_rare.py b/scripts/object/tangible/painting/painting_heroic_exar_kun_ultra_rare.py
index ccad8904..c1b12e4a 100644
--- a/scripts/object/tangible/painting/painting_heroic_exar_kun_ultra_rare.py
+++ b/scripts/object/tangible/painting/painting_heroic_exar_kun_ultra_rare.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Exar Kun Mural
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_house_cleanup_imperial.py b/scripts/object/tangible/painting/painting_house_cleanup_imperial.py
index ccad8904..9b068b30 100644
--- a/scripts/object/tangible/painting/painting_house_cleanup_imperial.py
+++ b/scripts/object/tangible/painting/painting_house_cleanup_imperial.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Birth of a Death Star
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_house_cleanup_rebel.py b/scripts/object/tangible/painting/painting_house_cleanup_rebel.py
index ccad8904..0662a93a 100644
--- a/scripts/object/tangible/painting/painting_house_cleanup_rebel.py
+++ b/scripts/object/tangible/painting/painting_house_cleanup_rebel.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#The War Pheonix
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_human_f.py b/scripts/object/tangible/painting/painting_human_f.py
index ccad8904..b4e398ba 100644
--- a/scripts/object/tangible/painting/painting_human_f.py
+++ b/scripts/object/tangible/painting/painting_human_f.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Despair's Lady
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_kite_plant.py b/scripts/object/tangible/painting/painting_kite_plant.py
index ccad8904..292481ec 100644
--- a/scripts/object/tangible/painting/painting_kite_plant.py
+++ b/scripts/object/tangible/painting/painting_kite_plant.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Still-Life Kite Plant
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_leia_wanted.py b/scripts/object/tangible/painting/painting_leia_wanted.py
index ccad8904..2999ebc9 100644
--- a/scripts/object/tangible/painting/painting_leia_wanted.py
+++ b/scripts/object/tangible/painting/painting_leia_wanted.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Leia Wanted Poster
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_loot_heroic_exar_kun.py b/scripts/object/tangible/painting/painting_loot_heroic_exar_kun.py
index ccad8904..75ee42fb 100644
--- a/scripts/object/tangible/painting/painting_loot_heroic_exar_kun.py
+++ b/scripts/object/tangible/painting/painting_loot_heroic_exar_kun.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#An Exar Kun Fresco
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_luke_wanted.py b/scripts/object/tangible/painting/painting_luke_wanted.py
index ccad8904..b08d64c1 100644
--- a/scripts/object/tangible/painting/painting_luke_wanted.py
+++ b/scripts/object/tangible/painting/painting_luke_wanted.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Luke Wanted Poster
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_nebula_flower.py b/scripts/object/tangible/painting/painting_nebula_flower.py
index ccad8904..25efc1c1 100644
--- a/scripts/object/tangible/painting/painting_nebula_flower.py
+++ b/scripts/object/tangible/painting/painting_nebula_flower.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#painting of the Blue Leaf Temple (Flower)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_outbreak_biohazard_01.py b/scripts/object/tangible/painting/painting_outbreak_biohazard_01.py
index ccad8904..0221f0d4 100644
--- a/scripts/object/tangible/painting/painting_outbreak_biohazard_01.py
+++ b/scripts/object/tangible/painting/painting_outbreak_biohazard_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Caution
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_outbreak_biohazard_02.py b/scripts/object/tangible/painting/painting_outbreak_biohazard_02.py
index ccad8904..88b386ce 100644
--- a/scripts/object/tangible/painting/painting_outbreak_biohazard_02.py
+++ b/scripts/object/tangible/painting/painting_outbreak_biohazard_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No name Biohazard Sign
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_outbreak_biohazard_03.py b/scripts/object/tangible/painting/painting_outbreak_biohazard_03.py
index ccad8904..d883ae49 100644
--- a/scripts/object/tangible/painting/painting_outbreak_biohazard_03.py
+++ b/scripts/object/tangible/painting/painting_outbreak_biohazard_03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Biohazard
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_palowick_ad_s01.py b/scripts/object/tangible/painting/painting_palowick_ad_s01.py
index ccad8904..2e3f2658 100644
--- a/scripts/object/tangible/painting/painting_palowick_ad_s01.py
+++ b/scripts/object/tangible/painting/painting_palowick_ad_s01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Advertisement (laying down in the sun)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_palowick_ad_s02.py b/scripts/object/tangible/painting/painting_palowick_ad_s02.py
index ccad8904..822108e5 100644
--- a/scripts/object/tangible/painting/painting_palowick_ad_s02.py
+++ b/scripts/object/tangible/painting/painting_palowick_ad_s02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+		#Advertisement (laying down in the sun)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_palowick_ad_s03.py b/scripts/object/tangible/painting/painting_palowick_ad_s03.py
index ccad8904..822108e5 100644
--- a/scripts/object/tangible/painting/painting_palowick_ad_s03.py
+++ b/scripts/object/tangible/painting/painting_palowick_ad_s03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+		#Advertisement (laying down in the sun)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_palowick_ad_s04.py b/scripts/object/tangible/painting/painting_palowick_ad_s04.py
index ccad8904..822108e5 100644
--- a/scripts/object/tangible/painting/painting_palowick_ad_s04.py
+++ b/scripts/object/tangible/painting/painting_palowick_ad_s04.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+		#Advertisement (laying down in the sun)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_planet_s01.py b/scripts/object/tangible/painting/painting_planet_s01.py
index ccad8904..e894505e 100644
--- a/scripts/object/tangible/painting/painting_planet_s01.py
+++ b/scripts/object/tangible/painting/painting_planet_s01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Space Painting Sunrise
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_pvp_reward_imperial.py b/scripts/object/tangible/painting/painting_pvp_reward_imperial.py
index ccad8904..1914d9c0 100644
--- a/scripts/object/tangible/painting/painting_pvp_reward_imperial.py
+++ b/scripts/object/tangible/painting/painting_pvp_reward_imperial.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No name (Palpatine and Star Destroyers)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_pvp_reward_rebel.py b/scripts/object/tangible/painting/painting_pvp_reward_rebel.py
index ccad8904..2113f9c2 100644
--- a/scripts/object/tangible/painting/painting_pvp_reward_rebel.py
+++ b/scripts/object/tangible/painting/painting_pvp_reward_rebel.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No name (Cruiser Escort)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_rodian_f.py b/scripts/object/tangible/painting/painting_rodian_f.py
index ccad8904..ca3f0dab 100644
--- a/scripts/object/tangible/painting/painting_rodian_f.py
+++ b/scripts/object/tangible/painting/painting_rodian_f.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Feared
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_rodian_f_ad_01.py b/scripts/object/tangible/painting/painting_rodian_f_ad_01.py
index ccad8904..e09fa82d 100644
--- a/scripts/object/tangible/painting/painting_rodian_f_ad_01.py
+++ b/scripts/object/tangible/painting/painting_rodian_f_ad_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Advertisement (Where the Fun's at.)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_rodian_m.py b/scripts/object/tangible/painting/painting_rodian_m.py
index ccad8904..c178074f 100644
--- a/scripts/object/tangible/painting/painting_rodian_m.py
+++ b/scripts/object/tangible/painting/painting_rodian_m.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Fighter
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_schematic_droid.py b/scripts/object/tangible/painting/painting_schematic_droid.py
index ccad8904..d1368619 100644
--- a/scripts/object/tangible/painting/painting_schematic_droid.py
+++ b/scripts/object/tangible/painting/painting_schematic_droid.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Poster of a Mouse Droid Schematic
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_schematic_transport_ship.py b/scripts/object/tangible/painting/painting_schematic_transport_ship.py
index ccad8904..9d3cb116 100644
--- a/scripts/object/tangible/painting/painting_schematic_transport_ship.py
+++ b/scripts/object/tangible/painting/painting_schematic_transport_ship.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Poster of a Ship Schematic
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_schematic_weapon.py b/scripts/object/tangible/painting/painting_schematic_weapon.py
index ccad8904..3993679b 100644
--- a/scripts/object/tangible/painting/painting_schematic_weapon.py
+++ b/scripts/object/tangible/painting/painting_schematic_weapon.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Poster of a Turret Schematic
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_schematic_weapon_s03.py b/scripts/object/tangible/painting/painting_schematic_weapon_s03.py
index ccad8904..397737fc 100644
--- a/scripts/object/tangible/painting/painting_schematic_weapon_s03.py
+++ b/scripts/object/tangible/painting/painting_schematic_weapon_s03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Poster of a Block Turret Schematic
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_skyscraper.py b/scripts/object/tangible/painting/painting_skyscraper.py
index ccad8904..fdc4b355 100644
--- a/scripts/object/tangible/painting/painting_skyscraper.py
+++ b/scripts/object/tangible/painting/painting_skyscraper.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Coronet Skyscraper Blueprint
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_smoking_ad.py b/scripts/object/tangible/painting/painting_smoking_ad.py
index ccad8904..76edcdc9 100644
--- a/scripts/object/tangible/painting/painting_smoking_ad.py
+++ b/scripts/object/tangible/painting/painting_smoking_ad.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Advertisement (appears to be unfinished)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_starmap.py b/scripts/object/tangible/painting/painting_starmap.py
index ccad8904..c92f09d9 100644
--- a/scripts/object/tangible/painting/painting_starmap.py
+++ b/scripts/object/tangible/painting/painting_starmap.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Starmap Painting
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_tato_s03.py b/scripts/object/tangible/painting/painting_tato_s03.py
index ccad8904..00d94519 100644
--- a/scripts/object/tangible/painting/painting_tato_s03.py
+++ b/scripts/object/tangible/painting/painting_tato_s03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Landscape-Tree
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_tato_s04.py b/scripts/object/tangible/painting/painting_tato_s04.py
index ccad8904..c8279d5b 100644
--- a/scripts/object/tangible/painting/painting_tato_s04.py
+++ b/scripts/object/tangible/painting/painting_tato_s04.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Travel Advertisement
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_teras_kasi.py b/scripts/object/tangible/painting/painting_teras_kasi.py
index ccad8904..f2824afd 100644
--- a/scripts/object/tangible/painting/painting_teras_kasi.py
+++ b/scripts/object/tangible/painting/painting_teras_kasi.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Spitting Rawl
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_teras_kasi_2.py b/scripts/object/tangible/painting/painting_teras_kasi_2.py
index ccad8904..b7fa7986 100644
--- a/scripts/object/tangible/painting/painting_teras_kasi_2.py
+++ b/scripts/object/tangible/painting/painting_teras_kasi_2.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Defensive Stance
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_trandoshan_m.py b/scripts/object/tangible/painting/painting_trandoshan_m.py
index ccad8904..6463ff4a 100644
--- a/scripts/object/tangible/painting/painting_trandoshan_m.py
+++ b/scripts/object/tangible/painting/painting_trandoshan_m.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Warriors Honor
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_trandoshan_m_01.py b/scripts/object/tangible/painting/painting_trandoshan_m_01.py
index ccad8904..69ecf5ec 100644
--- a/scripts/object/tangible/painting/painting_trandoshan_m_01.py
+++ b/scripts/object/tangible/painting/painting_trandoshan_m_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Fighters Courage
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_tree.py b/scripts/object/tangible/painting/painting_tree.py
index ccad8904..c79e437f 100644
--- a/scripts/object/tangible/painting/painting_tree.py
+++ b/scripts/object/tangible/painting/painting_tree.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#painting of the Blueleaf Temple (Big Tree)
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_trees_s01.py b/scripts/object/tangible/painting/painting_trees_s01.py
index ccad8904..3490135b 100644
--- a/scripts/object/tangible/painting/painting_trees_s01.py
+++ b/scripts/object/tangible/painting/painting_trees_s01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Life Day Kashyyyk Painting
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_vader_victory.py b/scripts/object/tangible/painting/painting_vader_victory.py
index ccad8904..d485eaa9 100644
--- a/scripts/object/tangible/painting/painting_vader_victory.py
+++ b/scripts/object/tangible/painting/painting_vader_victory.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#VICTORY
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_valley_view.py b/scripts/object/tangible/painting/painting_valley_view.py
index ccad8904..74f26426 100644
--- a/scripts/object/tangible/painting/painting_valley_view.py
+++ b/scripts/object/tangible/painting/painting_valley_view.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Valley View
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_victorious_reign.py b/scripts/object/tangible/painting/painting_victorious_reign.py
index ccad8904..52bc6525 100644
--- a/scripts/object/tangible/painting/painting_victorious_reign.py
+++ b/scripts/object/tangible/painting/painting_victorious_reign.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Victorious Reign
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_waterfall.py b/scripts/object/tangible/painting/painting_waterfall.py
index ccad8904..06913aff 100644
--- a/scripts/object/tangible/painting/painting_waterfall.py
+++ b/scripts/object/tangible/painting/painting_waterfall.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Waterfall
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_ns_01.py b/scripts/object/tangible/painting/painting_wod_ns_01.py
index ccad8904..229cd9f7 100644
--- a/scripts/object/tangible/painting/painting_wod_ns_01.py
+++ b/scripts/object/tangible/painting/painting_wod_ns_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No name, Fire Pit
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_ns_02.py b/scripts/object/tangible/painting/painting_wod_ns_02.py
index ccad8904..888768e2 100644
--- a/scripts/object/tangible/painting/painting_wod_ns_02.py
+++ b/scripts/object/tangible/painting/painting_wod_ns_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#No name, NS Close-Up
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_outcast.py b/scripts/object/tangible/painting/painting_wod_outcast.py
index ccad8904..e550f02c 100644
--- a/scripts/object/tangible/painting/painting_wod_outcast.py
+++ b/scripts/object/tangible/painting/painting_wod_outcast.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Outcast
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_scene_01.py b/scripts/object/tangible/painting/painting_wod_scene_01.py
index ccad8904..f412873a 100644
--- a/scripts/object/tangible/painting/painting_wod_scene_01.py
+++ b/scripts/object/tangible/painting/painting_wod_scene_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#no name, Swamp
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_scene_02.py b/scripts/object/tangible/painting/painting_wod_scene_02.py
index ccad8904..c0665552 100644
--- a/scripts/object/tangible/painting/painting_wod_scene_02.py
+++ b/scripts/object/tangible/painting/painting_wod_scene_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#no name, Trees
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_scene_03.py b/scripts/object/tangible/painting/painting_wod_scene_03.py
index ccad8904..013a0b4b 100644
--- a/scripts/object/tangible/painting/painting_wod_scene_03.py
+++ b/scripts/object/tangible/painting/painting_wod_scene_03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#no name, House Entrance
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_scene_04.py b/scripts/object/tangible/painting/painting_wod_scene_04.py
index ccad8904..b7d37c0d 100644
--- a/scripts/object/tangible/painting/painting_wod_scene_04.py
+++ b/scripts/object/tangible/painting/painting_wod_scene_04.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#no name, Rock Formation
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_sm_01.py b/scripts/object/tangible/painting/painting_wod_sm_01.py
index ccad8904..8efd8df2 100644
--- a/scripts/object/tangible/painting/painting_wod_sm_01.py
+++ b/scripts/object/tangible/painting/painting_wod_sm_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Singing Mountain Clan Tapestry
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wod_sm_02.py b/scripts/object/tangible/painting/painting_wod_sm_02.py
index ccad8904..c3c749e8 100644
--- a/scripts/object/tangible/painting/painting_wod_sm_02.py
+++ b/scripts/object/tangible/painting/painting_wod_sm_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Singing Mountain Clan Tapestry (closeup_
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wookiee_f.py b/scripts/object/tangible/painting/painting_wookiee_f.py
index ccad8904..b63f1322 100644
--- a/scripts/object/tangible/painting/painting_wookiee_f.py
+++ b/scripts/object/tangible/painting/painting_wookiee_f.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Life Day Matriarch
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_wookiee_m.py b/scripts/object/tangible/painting/painting_wookiee_m.py
index ccad8904..8d24228a 100644
--- a/scripts/object/tangible/painting/painting_wookiee_m.py
+++ b/scripts/object/tangible/painting/painting_wookiee_m.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Life Day Patriarch
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_zabrak_f.py b/scripts/object/tangible/painting/painting_zabrak_f.py
index ccad8904..4ce9f757 100644
--- a/scripts/object/tangible/painting/painting_zabrak_f.py
+++ b/scripts/object/tangible/painting/painting_zabrak_f.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Painting of Lady T'Iani
\ No newline at end of file
diff --git a/scripts/object/tangible/painting/painting_zabrak_m.py b/scripts/object/tangible/painting/painting_zabrak_m.py
index ccad8904..f991f709 100644
--- a/scripts/object/tangible/painting/painting_zabrak_m.py
+++ b/scripts/object/tangible/painting/painting_zabrak_m.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#painting of High Commander T'Inia
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_01.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_01.py
index ccad8904..341b98ac 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_01.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_01.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Cast Wing in Flight
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_02.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_02.py
index ccad8904..dc88ba68 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_02.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_02.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#decimator
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_03.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_03.py
index ccad8904..b37b2640 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_03.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_03.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Tatooine Dune Speeder
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_04.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_04.py
index ccad8904..5cf9ae7d 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_04.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_04.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Weapon of War
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_05.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_05.py
index ccad8904..df328c90 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_05.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_05.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Fighter Study
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_06.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_06.py
index ccad8904..d4569602 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_06.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_06.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Hutt Greed
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_07.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_07.py
index ccad8904..ba27db78 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_07.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_07.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Smugglers Run
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_08.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_08.py
index ccad8904..4c392aef 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_08.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_08.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Imperial Oppression
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_09.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_09.py
index ccad8904..206eadd9 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_09.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_09.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	Emporer's Eyes
\ No newline at end of file
diff --git a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_10.py b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_10.py
index ccad8904..4b4ed376 100644
--- a/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_10.py
+++ b/scripts/object/tangible/veteran_reward/one_year_anniversary/painting_10.py
@@ -1,4 +1,6 @@
 import sys
 
 def setup(core, object):
-	return
\ No newline at end of file
+	return
+	
+	#Dusk in Kachiro
\ No newline at end of file

From 482868310870768f26ccca63eb725e6b8d1731aa Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 05:38:48 +0100
Subject: [PATCH 10/23] Added locomotion tracking

---
 src/resources/datatables/Locomotion.java      |  50 ++++++++
 .../objects/creature/CreatureObject.java      |  76 ++++++++++--
 src/services/SimulationService.java           | 111 +++++++++++++++++-
 src/services/command/BaseSWGCommand.java      |  30 ++---
 4 files changed, 234 insertions(+), 33 deletions(-)
 create mode 100644 src/resources/datatables/Locomotion.java

diff --git a/src/resources/datatables/Locomotion.java b/src/resources/datatables/Locomotion.java
new file mode 100644
index 00000000..eceec58d
--- /dev/null
+++ b/src/resources/datatables/Locomotion.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2013 <Project SWG>
+ * 
+ * This File is part of NGECore2.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
+ * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
+ ******************************************************************************/
+package resources.datatables;
+
+public class Locomotion {
+	
+	public static final byte Invalid = -1;
+	public static final byte Standing = 0;
+	public static final byte Sneaking = 1;
+	public static final byte Walking = 2;
+	public static final byte Running = 3;
+	public static final byte Kneeling = 4;
+	public static final byte CrouchSneaking = 5;
+	public static final byte CrouchWalking = 6;
+	public static final byte Prone = 7;
+	public static final byte Crawling = 8;
+	public static final byte ClimbingStationary = 9;
+	public static final byte Climbing = 10;
+	public static final byte Hovering = 11; //
+	public static final byte Flying = 12;
+	public static final byte LyingDown = 13;
+	public static final byte Sitting = 14;
+	public static final byte SkillAnimating = 15;
+	public static final byte DrivingVehicle = 16;
+	public static final byte RidingCreature = 17;
+	public static final byte KnockedDown = 18;
+	public static final byte Incapacitated = 19;
+	public static final byte Dead = 20;
+	public static final byte Blocking = 21;
+	
+}
diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index 316045c5..40e15fc4 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -185,6 +185,8 @@ public class CreatureObject extends TangibleObject implements Serializable {
 	@NotPersistent
 	private transient SWGObject useTarget;
 	
+	private byte locomotion = 0;
+	
 	public CreatureObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
 		super(objectID, planet, position, orientation, Template);
 		messageBuilder = new CreatureMessageBuilder(this);
@@ -381,20 +383,80 @@ public class CreatureObject extends TangibleObject implements Serializable {
 
 	public void setPosture(byte posture) {
 		synchronized(objectMutex) {
-			if (this.posture == 0x09) {
+			switch (posture) {
+				case resources.datatables.Posture.Invalid:
+					locomotion = -1;
+					break;
+				case resources.datatables.Posture.Upright:
+					locomotion = 0;
+					break;
+				case resources.datatables.Posture.Crouched:
+					locomotion = 4;
+					break;
+				case resources.datatables.Posture.Prone:
+					locomotion = 7;
+					break;
+				case resources.datatables.Posture.Sneaking:
+					locomotion = 1;
+					break;
+				case resources.datatables.Posture.Blocking:
+					locomotion = 21;
+					break;
+				case resources.datatables.Posture.Climbing:
+					locomotion = 9;
+					break;
+				case resources.datatables.Posture.Flying:
+					locomotion = 12;
+					break;
+				case resources.datatables.Posture.LyingDown:
+					locomotion = 13;
+					break;
+				case resources.datatables.Posture.Sitting:
+					locomotion = 14;
+					break;
+				case resources.datatables.Posture.SkillAnimating:
+					locomotion = 15;
+					break;
+				case resources.datatables.Posture.DrivingVehicle:
+					locomotion = 16;
+					break;
+				case resources.datatables.Posture.RidingCreature:
+					locomotion = 17;
+					break;
+				case resources.datatables.Posture.KnockedDown:
+					locomotion = 18;
+					break;
+				case resources.datatables.Posture.Incapacitated:
+					locomotion = 19;
+					break;
+				case resources.datatables.Posture.Dead:
+					locomotion = 20;
+					break;
+			}
+		}
+		
+		synchronized(objectMutex) {
+			if (this.posture == resources.datatables.Posture.SkillAnimating) {
 				stopPerformance();
 			}
-			if(this.posture == posture)
+			
+			if (this.posture == posture) {
 				return;
+			}
+			
 			this.posture = posture;
 		}
-
-		Posture postureUpdate = new Posture(getObjectID(), posture);
-		ObjControllerMessage objController = new ObjControllerMessage(0x1B, postureUpdate);
 		
 		notifyObservers(messageBuilder.buildPostureDelta(posture), true);
-		notifyObservers(objController, true);
-		
+		notifyObservers(new ObjControllerMessage(0x1B, new Posture(getObjectID(), posture)), true);
+	}
+	
+	public byte getLocomotion() {
+		return locomotion;
+	}
+	
+	public void setLocomotion(byte locomotion) {
+		this.locomotion = locomotion;
 	}
 	
 	public void startPerformance() {
diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index f93defd4..6cc01567 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -85,6 +85,7 @@ import resources.objects.tangible.TangibleObject;
 import resources.common.*;
 import resources.common.collidables.AbstractCollidable;
 import resources.datatables.DisplayType;
+import resources.datatables.Locomotion;
 import resources.datatables.Options;
 import resources.datatables.PlayerFlags;
 import resources.datatables.Posture;
@@ -366,10 +367,61 @@ public class SimulationService implements INetworkDispatch {
 					object.setMovementCounter(dataTransform.getMovementCounter());
 					creature.setMovementCounter(dataTransform.getMovementCounter());
 				}
+				
+				synchronized(creature.getMutex()) {
+					if (dataTransform.getSpeed() > 0.0f) {
+						switch (creature.getLocomotion()) {
+							case Locomotion.Prone:
+								creature.setLocomotion(Locomotion.Crawling);
+								break;
+							case Locomotion.ClimbingStationary:
+								creature.setLocomotion(Locomotion.Climbing);
+								break;
+							case Locomotion.Standing:
+							case Locomotion.Running:
+							case Locomotion.Walking:
+								if (dataTransform.getSpeed() >= (creature.getRunSpeed() * (creature.getSpeedMultiplierBase() + creature.getSpeedMultiplierMod()))) {
+									creature.setLocomotion(Locomotion.Running);
+								} else {
+									creature.setLocomotion(Locomotion.Walking);
+								}
+								
+								break;
+							case Locomotion.Sneaking:
+							case Locomotion.CrouchSneaking:
+							case Locomotion.CrouchWalking:
+								if (dataTransform.getSpeed() >= (creature.getRunSpeed() * (creature.getSpeedMultiplierBase() + creature.getSpeedMultiplierMod()))) {
+									creature.setLocomotion(Locomotion.CrouchSneaking);
+								} else {
+									creature.setLocomotion(Locomotion.CrouchWalking);
+								}
+								
+								break;
+						}
+					} else {
+						switch (creature.getLocomotion()) {
+							case Locomotion.Crawling:
+								creature.setLocomotion(Locomotion.Prone);
+								break;
+							case Locomotion.Climbing:
+								creature.setLocomotion(Locomotion.ClimbingStationary);
+								break;
+							case Locomotion.Running:
+							case Locomotion.Walking:
+								creature.setLocomotion(Locomotion.Standing);
+								break;
+							case Locomotion.CrouchSneaking:
+							case Locomotion.CrouchWalking:
+								creature.setLocomotion(Locomotion.Sneaking);
+								break;
+						}
+					}
+				}
+				
 				if(object.getContainer() != null) {
 					object.getContainer()._remove(object);
 					add(object, newPos.x, newPos.z);
-				} 
+				}
 				
 				//object.setParentId(0);
 				//object.setParent(null);
@@ -457,9 +509,8 @@ public class SimulationService implements INetworkDispatch {
 					return;
 				Point3D oldPos = object.getPosition();
 				Quaternion newOrientation = new Quaternion(dataTransform.getWOrientation(), dataTransform.getXOrientation(), dataTransform.getYOrientation(), dataTransform.getZOrientation());
-
+				
 				UpdateTransformWithParentMessage utm = new UpdateTransformWithParentMessage(object.getObjectID(), dataTransform.getCellId(), dataTransform.getTransformedX(), dataTransform.getTransformedY(), dataTransform.getTransformedZ(), dataTransform.getMovementCounter(), (byte) dataTransform.getMovementAngle(), dataTransform.getSpeed());
-
 				
 				if(object.getContainer() != parent) {
 					remove(object, oldPos.x, oldPos.z);
@@ -476,10 +527,58 @@ public class SimulationService implements INetworkDispatch {
 				
 				checkForCollidables(object);
 				object.setAttachment("lastValidPosition", object.getPosition());
-
+				
+				synchronized(object.getMutex()) {
+					if (dataTransform.getSpeed() > 0.0f) {
+						switch (object.getLocomotion()) {
+							case Locomotion.Prone:
+								object.setLocomotion(Locomotion.Crawling);
+								break;
+							case Locomotion.ClimbingStationary:
+								object.setLocomotion(Locomotion.Climbing);
+								break;
+							case Locomotion.Standing:
+							case Locomotion.Running:
+							case Locomotion.Walking:
+								if (dataTransform.getSpeed() >= (object.getRunSpeed() * (object.getSpeedMultiplierBase() + object.getSpeedMultiplierMod()))) {
+									object.setLocomotion(Locomotion.Running);
+								} else {
+									object.setLocomotion(Locomotion.Walking);
+								}
+								
+								break;
+							case Locomotion.Sneaking:
+							case Locomotion.CrouchSneaking:
+							case Locomotion.CrouchWalking:
+								if (dataTransform.getSpeed() >= (object.getRunSpeed() * (object.getSpeedMultiplierBase() + object.getSpeedMultiplierMod()))) {
+									object.setLocomotion(Locomotion.CrouchSneaking);
+								} else {
+									object.setLocomotion(Locomotion.CrouchWalking);
+								}
+								
+								break;
+						}
+					} else {
+						switch (object.getLocomotion()) {
+							case Locomotion.Crawling:
+								object.setLocomotion(Locomotion.Prone);
+								break;
+							case Locomotion.Climbing:
+								object.setLocomotion(Locomotion.ClimbingStationary);
+								break;
+							case Locomotion.Running:
+							case Locomotion.Walking:
+								object.setLocomotion(Locomotion.Standing);
+								break;
+							case Locomotion.CrouchSneaking:
+							case Locomotion.CrouchWalking:
+								object.setLocomotion(Locomotion.Sneaking);
+								break;
+						}
+					}
+				}
 			}
-				
-				
+			
 		});
 		
 		swgOpcodes.put(Opcodes.ClientOpenContainerMessage, new INetworkRemoteEvent() {
diff --git a/src/services/command/BaseSWGCommand.java b/src/services/command/BaseSWGCommand.java
index 8ea09061..5025939d 100644
--- a/src/services/command/BaseSWGCommand.java
+++ b/src/services/command/BaseSWGCommand.java
@@ -50,8 +50,7 @@ public class BaseSWGCommand implements Cloneable {
 	private float cooldown;
 	private float executeTime;
 	private float warmupTime;
-	//private Long[] invalidLocomotions; // Not tracked anywhere
-	private Byte[] invalidPostures;
+	private Byte[] invalidLocomotions;
 	private Long[] invalidStates;
 	
 	public BaseSWGCommand(String commandName) {
@@ -67,8 +66,8 @@ public class BaseSWGCommand implements Cloneable {
 			"command_table", "command_table_ground", "command_table_space" };
 			
 			for (int n = 0; n < tableArray.length; n++) {
+				List<Byte> invalidLocomotions = new ArrayList<Byte>();
 				List<Long> invalidStates = new ArrayList<Long>();
-				List<Byte> invalidPostures = new ArrayList<Byte>();
 				
 				DatatableVisitor visitor2 = ClientFileManager.loadFile("datatables/command/" + tableArray[n] + ".iff", DatatableVisitor.class);
 				
@@ -79,20 +78,11 @@ public class BaseSWGCommand implements Cloneable {
 							
 							characterAbility = (String) visitor2.getObject(i, 7);
 							
-							if (!((Boolean) visitor2.getObject(i, 8-sub))) invalidPostures.add((byte) 0);
-							if (!((Boolean) visitor2.getObject(i, 9-sub))) invalidPostures.add((byte) 3);
-							if (!((Boolean) visitor2.getObject(i, 15-sub))) invalidPostures.add((byte) 2);
-							if (!((Boolean) visitor2.getObject(i, 18-sub))) invalidPostures.add((byte) 5);
-							if (!((Boolean) visitor2.getObject(i, 20-sub))) invalidPostures.add((byte) 6);
-							if (!((Boolean) visitor2.getObject(i, 21-sub))) invalidPostures.add((byte) 7);
-							if (!((Boolean) visitor2.getObject(i, 22-sub))) invalidPostures.add((byte) 8);
-							if (!((Boolean) visitor2.getObject(i, 23-sub))) invalidPostures.add((byte) 9);
-							if (!((Boolean) visitor2.getObject(i, 24-sub))) invalidPostures.add((byte) 10);
-							if (!((Boolean) visitor2.getObject(i, 25-sub))) invalidPostures.add((byte) 11);
-							if (!((Boolean) visitor2.getObject(i, 26-sub))) invalidPostures.add((byte) 12);
-							if (!((Boolean) visitor2.getObject(i, 27-sub))) invalidPostures.add((byte) 13);
-							if (!((Boolean) visitor2.getObject(i, 28-sub))) invalidPostures.add((byte) 14);
-							if (!((Boolean) visitor2.getObject(i, 29-sub))) invalidPostures.add((byte) 4);
+							for (int l = (8 - sub); l <= (29 - sub); l++) {
+								if (!((Boolean) visitor2.getObject(i, l))) {
+									invalidLocomotions.add((byte) (l - (8 - sub)));
+								}
+							}
 							
 							if (tableArray[n].startsWith("client_") || tableArray[n].startsWith("command_table_")) {
 								sub += 1;
@@ -164,7 +154,7 @@ public class BaseSWGCommand implements Cloneable {
 							executeTime = (Float) visitor2.getObject(i, 87-sub);
 							cooldown = (Float) visitor2.getObject(i, 88-sub);
 							
-							this.invalidPostures = invalidPostures.toArray(new Byte[] { });
+							this.invalidLocomotions = invalidLocomotions.toArray(new Byte[] { });
 							this.invalidStates = invalidStates.toArray(new Long[] { });
 							
 							foundCommand = true;
@@ -230,8 +220,8 @@ public class BaseSWGCommand implements Cloneable {
 		this.characterAbility = characterAbility;
 	}
 	
-	public Byte[] getInvalidPostures() {
-		return invalidPostures;
+	public Byte[] getInvalidLocomotions() {
+		return invalidLocomotions;
 	}
 	
 	public Long[] getInvalidStates() {

From a53d2d64d45a314ed34cf7163350ed252fd51647 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 05:42:13 +0100
Subject: [PATCH 11/23] Added locomotion state checking to commands

---
 src/services/command/CommandService.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index 9435a0ea..b7359d8f 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -105,14 +105,12 @@ public class CommandService implements INetworkDispatch  {
 			}
 		}
 		
-		// This SHOULD be invalid locomotions but we don't track these currently.
-		// Postures are the best we can do.
-		for (byte posture : command.getInvalidPostures()) {
-			if (actor.getPosture() == posture) {
-				//return false;
+		for (byte locomotion : command.getInvalidLocomotions()) {
+			if (actor.getLocomotion() == locomotion) {
+				return false;
 			}
 		}
-
+		
 		switch (command.getTargetType()) {
 			case 0: // Target Not Used For This Command
 				break;

From a4cc8b2884bae1f3f0e5349e2b2c886fdb2e4c98 Mon Sep 17 00:00:00 2001
From: Zing <jeremy@zingstecharchive.com>
Date: Tue, 3 Jun 2014 22:08:22 -0700
Subject: [PATCH 12/23] (Added) Correct Mustafarian Injector Template for RLS.
 Set details in server template so it can be used for mustafar quest as well

---
 .../loot/lootItems/rarelootchest/mustafarian_injector.py | 2 +-
 .../tangible/loot/mustafar/old_republic_tech_02.py       | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/loot/lootItems/rarelootchest/mustafarian_injector.py b/scripts/loot/lootItems/rarelootchest/mustafarian_injector.py
index 5eb85000..0fa3f8b7 100644
--- a/scripts/loot/lootItems/rarelootchest/mustafarian_injector.py
+++ b/scripts/loot/lootItems/rarelootchest/mustafarian_injector.py
@@ -1,4 +1,4 @@
 
 def itemTemplate():
 
-	return ['bject/tangible/gcw/crafting_quest/shared_gcw_bacta_injectors.iff'] # this is wrong needs correct iff still
+	return ['object/tangible/loot/mustafar/shared_old_republic_tech_02.iff']
diff --git a/scripts/object/tangible/loot/mustafar/old_republic_tech_02.py b/scripts/object/tangible/loot/mustafar/old_republic_tech_02.py
index ccad8904..753fa78b 100644
--- a/scripts/object/tangible/loot/mustafar/old_republic_tech_02.py
+++ b/scripts/object/tangible/loot/mustafar/old_republic_tech_02.py
@@ -1,4 +1,13 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'object/usable')
+	object.setStfFilename('static_item_n')
+	object.setStfName('item_tow_proc_generic_03_01')
+	object.setDetailFilename('static_item_d')
+	object.setDetailName('item_tow_proc_generic_03_01')
+	return
+	
+def use(core, actor, object):
+	core.buffService.addBuffToCreature(actor, 'towPoisonResistAbsorb_3', actor)
 	return
\ No newline at end of file

From 2972d98ea589f57823945e657adefe874e2fea02 Mon Sep 17 00:00:00 2001
From: Zing <jeremy@zingstecharchive.com>
Date: Tue, 3 Jun 2014 23:08:08 -0700
Subject: [PATCH 13/23] Cleaned up more loot

Added correct template for AT-ST reward. Removed armor stats from pieces
that should not have them. Set Jedi Relics to use the correct template.
(also clothing and armor loot should have random stat's for RE'ing
also.)
---
 scripts/loot/lootItems/armor/bone/bone_armor_boots.py |  9 +--------
 .../loot/lootItems/armor/bone/bone_armor_gloves.py    |  9 +--------
 .../loot/lootItems/armor/chitin/chitin_armor_boots.py |  9 +--------
 .../lootItems/armor/chitin/chitin_armor_gloves.py     |  9 +--------
 .../armor/composite/composite_armor_boots.py          |  9 +--------
 .../armor/composite/composite_armor_gloves.py         |  9 +--------
 .../ithorian_defender_armor_boots.py                  |  9 +--------
 .../ithorian_defender_armor_gloves.py                 |  9 +--------
 .../ithorian_guardian_armor_boots.py                  |  9 +--------
 .../ithorian_guardian_armor_gloves.py                 |  9 +--------
 .../ithorian_sentinel_armor_boots.py                  |  9 +--------
 .../ithorian_sentinel_armor_gloves.py                 |  9 +--------
 .../lootItems/armor/marauder/marauder_armor_boots.py  |  9 +--------
 .../lootItems/armor/marauder/marauder_armor_gloves.py |  9 +--------
 .../loot/lootItems/armor/padded/padded_armor_boots.py |  9 +--------
 .../lootItems/armor/padded/padded_armor_gloves.py     |  9 +--------
 .../loot/lootItems/armor/tantel/tantel_armor_boots.py |  9 +--------
 .../lootItems/armor/tantel/tantel_armor_gloves.py     |  9 +--------
 .../lootItems/armor/ubese/ubese_armor_bandolier.py    |  7 -------
 .../loot/lootItems/armor/ubese/ubese_armor_boots.py   |  9 +--------
 .../loot/lootItems/armor/ubese/ubese_armor_gloves.py  | 11 ++---------
 .../loot/lootItems/armor/ubese/ubese_armor_shirt.py   |  9 +--------
 .../lootItems/rarelootchest/at_st_pilots_helmet.py    |  4 +---
 scripts/loot/lootItems/relics/jedi_relic_1.py         |  4 ++--
 scripts/loot/lootItems/relics/jedi_relic_2.py         |  2 +-
 25 files changed, 26 insertions(+), 182 deletions(-)

diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_boots.py b/scripts/loot/lootItems/armor/bone/bone_armor_boots.py
index d2debb33..da526052 100644
--- a/scripts/loot/lootItems/armor/bone/bone_armor_boots.py
+++ b/scripts/loot/lootItems/armor/bone/bone_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py b/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py
index c888e788..a4730f12 100644
--- a/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py
index 4163c447..127dd61d 100644
--- a/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py
+++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py
index 0fec0496..30701432 100644
--- a/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/composite/composite_armor_boots.py b/scripts/loot/lootItems/armor/composite/composite_armor_boots.py
index f996bfa7..9ae88c3a 100644
--- a/scripts/loot/lootItems/armor/composite/composite_armor_boots.py
+++ b/scripts/loot/lootItems/armor/composite/composite_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py b/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py
index acd4a1cf..91d2be4c 100644
--- a/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py
index 6c6c1ca4..bccf5133 100644
--- a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py
+++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py
index 5d1f4535..0804e505 100644
--- a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py
index 3b27d829..fe01888d 100644
--- a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py
+++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py
index 002612cb..2b413665 100644
--- a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py
index e961438f..8e14d51b 100644
--- a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py
+++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py
index 439d857e..5dce5bc1 100644
--- a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py
index 4fff799b..ad6e208c 100644
--- a/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py
+++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py
index 79bf35b1..abb7b2a4 100644
--- a/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_boots.py b/scripts/loot/lootItems/armor/padded/padded_armor_boots.py
index a1767be7..407c80a0 100644
--- a/scripts/loot/lootItems/armor/padded/padded_armor_boots.py
+++ b/scripts/loot/lootItems/armor/padded/padded_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return [] 
diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py b/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py
index 72001ed2..bf324908 100644
--- a/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return [] 
diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py
index 7920a987..3f4374f5 100644
--- a/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py
+++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py
index 555b5ab1..4bfcb2ca 100644
--- a/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py
index 17fcecd9..40c275b0 100644
--- a/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py
+++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
 	return stats 
diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py
index 9720add5..eb3b46d6 100644
--- a/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py
+++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py
@@ -20,12 +20,5 @@ def customizationValues():
 	return []
 
 def itemStats():
-
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
 	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py
index 38d47564..3a4063c9 100644
--- a/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py
+++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py
@@ -5,7 +5,7 @@ def itemTemplate():
 
 def customItemName():
 
-	return 'Ubese Armor Gloves'
+	return 'test'
 	
 def customItemStackCount():
 
@@ -21,11 +21,4 @@ def customizationValues():
 
 def itemStats():
 
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
-	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py
index 0ad493a1..edbe2572 100644
--- a/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py
+++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py
@@ -21,11 +21,4 @@ def customizationValues():
 
 def itemStats():
 
-	stats = ['armor_efficiency_kinetic','5000','6800']
-	stats += ['armor_efficiency_energy','3000','4800']
-	stats += ['special_protection_heat','4000','5800']
-	stats += ['special_protection_cold','4000','5800']
-	stats += ['special_protection_acid','4000','5800']
-	stats += ['special_protection_electricity','4000','5800']
-	
-	return stats 
+	return []
diff --git a/scripts/loot/lootItems/rarelootchest/at_st_pilots_helmet.py b/scripts/loot/lootItems/rarelootchest/at_st_pilots_helmet.py
index 5f2421f7..511decc6 100644
--- a/scripts/loot/lootItems/rarelootchest/at_st_pilots_helmet.py
+++ b/scripts/loot/lootItems/rarelootchest/at_st_pilots_helmet.py
@@ -1,9 +1,7 @@
 
 def itemTemplate():
 
-	return ['object/tangible/wearables/helmet/shared_helmet_atat.iff'] # iff not exact, tre files suck
+	return ['object/tangible/mission/quest_item/shared_bren_kingal_q4_needed.iff']
 
 #def customItemName():
-#
-#	return 'Adjusted CDEF Rifle'
 	
diff --git a/scripts/loot/lootItems/relics/jedi_relic_1.py b/scripts/loot/lootItems/relics/jedi_relic_1.py
index 04e3b978..90ee35e4 100644
--- a/scripts/loot/lootItems/relics/jedi_relic_1.py
+++ b/scripts/loot/lootItems/relics/jedi_relic_1.py
@@ -1,11 +1,11 @@
 
 def itemTemplate():
 
-	return ['object/tangible/loot/generic_usable/shared_jedi_relic_01_generic.iff']
+	return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff']
 
 def customItemName():
 
-	return 'A Jedi Relic'
+	return '@string/en/static_item_n:col_lightsaber_1h_01_03'
 	
 def usedInCollection():
 
diff --git a/scripts/loot/lootItems/relics/jedi_relic_2.py b/scripts/loot/lootItems/relics/jedi_relic_2.py
index a7dccedc..df3bf107 100644
--- a/scripts/loot/lootItems/relics/jedi_relic_2.py
+++ b/scripts/loot/lootItems/relics/jedi_relic_2.py
@@ -1,7 +1,7 @@
 
 def itemTemplate():
 
-	return ['object/tangible/loot/generic_usable/shared_jedi_relic_01_generic.iff']
+	return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff']
 
 def customItemName():
 

From 803fbba36a18efac09302090343647cf63ff8aeb Mon Sep 17 00:00:00 2001
From: Zing <jeremy@zingstecharchive.com>
Date: Tue, 3 Jun 2014 23:32:32 -0700
Subject: [PATCH 14/23] small fix

---
 scripts/loot/lootItems/relics/jedi_relic_1.py | 4 ----
 scripts/loot/lootItems/relics/jedi_relic_2.py | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/scripts/loot/lootItems/relics/jedi_relic_1.py b/scripts/loot/lootItems/relics/jedi_relic_1.py
index 90ee35e4..321819e2 100644
--- a/scripts/loot/lootItems/relics/jedi_relic_1.py
+++ b/scripts/loot/lootItems/relics/jedi_relic_1.py
@@ -2,10 +2,6 @@
 def itemTemplate():
 
 	return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff']
-
-def customItemName():
-
-	return '@string/en/static_item_n:col_lightsaber_1h_01_03'
 	
 def usedInCollection():
 
diff --git a/scripts/loot/lootItems/relics/jedi_relic_2.py b/scripts/loot/lootItems/relics/jedi_relic_2.py
index df3bf107..1460ae13 100644
--- a/scripts/loot/lootItems/relics/jedi_relic_2.py
+++ b/scripts/loot/lootItems/relics/jedi_relic_2.py
@@ -3,7 +3,4 @@ def itemTemplate():
 
 	return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff']
 
-def customItemName():
-
-	return 'A Jedi Relic'
 

From 9ae3ef1a98b5c0f2d08fb3efd88b1a9348885b4a Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 13:00:28 +0100
Subject: [PATCH 15/23] Possible fix for XP for NPCs

---
 src/services/ai/AIService.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/services/ai/AIService.java b/src/services/ai/AIService.java
index 117d057a..1e684fbc 100644
--- a/src/services/ai/AIService.java
+++ b/src/services/ai/AIService.java
@@ -62,21 +62,21 @@ public class AIService {
 		
 		Map<CreatureObject, Integer> damageMap = actor.getDamageMap();
 		CreatureObject creature = actor.getCreature();
-		int baseXP = getBaseXP(creature);
+		int baseXp = getBaseXP(creature);
 		for(Entry<CreatureObject, Integer> e : damageMap.entrySet()) {
 			
 			CreatureObject player = e.getKey();
 			PlayerObject ghost = (PlayerObject) player.getSlottedObject("ghost");
 			if(ghost == null)
 				continue;
-			int damage = e.getValue();
+			int damageDealt = e.getValue();
 			
 			short level = (player.getGroupId() == 0) ? player.getLevel() : ((GroupObject) core.objectService.getObject(player.getGroupId())).getGroupLevel();
 			int levelDifference = ((creature.getLevel() >= level) ? 0 : (level - creature.getLevel()));
-			float damagePercent = damage / creature.getMaxHealth();
-			int finalXP = (int) (damagePercent * baseXP);
-			finalXP -= ((levelDifference > 20) ? (finalXP - 1) : (((levelDifference * 5) / 100) * finalXP));	
-			core.playerService.giveExperience(player, finalXP);
+			int damagePercent = ((damageDealt / creature.getMaxHealth()) * 100);
+			int finalXp = (((damagePercent / 100) * baseXp) + (creature.getMaxHealth() / 12));
+			finalXp -= ((levelDifference > 20) ? (finalXp - 1) : (((levelDifference * 5) / 100) * finalXp));	
+			core.playerService.giveExperience(player, finalXp);
 		}
 		
 	}

From 346746c25dbb65a6cc570f750208f52bbd91c0fb Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 14:16:20 +0100
Subject: [PATCH 16/23] Fixed #794

---
 src/services/PlayerService.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index 11a81f58..e12bfa2b 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -893,8 +893,10 @@ public class PlayerService implements INetworkDispatch {
 			
 			creature.getClient().getSession().write((new ClientMfdStatusUpdateMessage((float) ((level >= 90) ? 90 : (level + 1)), "/GroundHUD.MFDStatus.vsp.role.targetLevel")).serialize());
 			creature.setLevel((short) level);
-			if (level == 90)
+			
+			if (level == 90) {
 				core.scriptService.callScript("scripts/collections/", "profession_master", player.getProfession(), core, creature);
+			}
 			
 			creature.showFlyText(OutOfBand.ProsePackage("@cbt_spam:skill_up"), 2.5f, new RGB(154, 205, 50), 0, true);
 			creature.playEffectObject("clienteffect/skill_granted.cef", "");
@@ -962,7 +964,10 @@ public class PlayerService implements INetworkDispatch {
 							creature.playEffectObject("clienteffect/level_granted.cef", "");
 							creature.getClient().getSession().write((new ClientMfdStatusUpdateMessage((float) ((creature.getLevel() == 90) ? 90 : (creature.getLevel() + 1)), "/GroundHUD.MFDStatus.vsp.role.targetLevel")).serialize());
 							creature.setLevel(((Integer) experienceTable.getObject(i, 0)).shortValue());
-							core.scriptService.callScript("scripts/collections/", "master_" + player.getProfession(), "addMasterBadge", core, creature);
+							
+							if (creature.getLevel() == 90) {
+								core.scriptService.callScript("scripts/collections/", "profession_master", player.getProfession(), core, creature);
+							}
 							
 							// 3. Add the relevant health/action and expertise points.
 							float luck = (((((float) (core.scriptService.getMethod("scripts/roadmap/", player.getProfession(), "getLuck").__call__().asInt()) + (core.scriptService.getMethod("scripts/roadmap/", creature.getStfName(), "getLuck").__call__().asInt())) / ((float) 90)) * ((float) creature.getLevel())) - ((float) creature.getSkillModBase("luck")));

From 0f24fdef5a81f93966765073f79b7e9c44970fa3 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 14:20:18 +0100
Subject: [PATCH 17/23] Fixed #796

---
 scripts/radial/npc/mobile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/radial/npc/mobile.py b/scripts/radial/npc/mobile.py
index decba1d8..e1f43616 100644
--- a/scripts/radial/npc/mobile.py
+++ b/scripts/radial/npc/mobile.py
@@ -3,14 +3,14 @@ import sys
 
 def createRadial(core, owner, target, radials):
 	radials.clear()	
-	if target.getAttachment('AI') and core.resourceService.canMilk(owner, target):
+	if target.getAttachment('AI') and core.resourceService and core.resourceService.canMilk(owner, target):
 		radials.add(RadialOptions(0, 167, 3, '@pet/pet_menu:milk_me'))
 		
 	return
 	
 def handleSelection(core, owner, target, option):
 
-	if option == 167 and target.getAttachment('AI') and core.resourceService.canMilk(owner, target):
+	if option == 167 and target.getAttachment('AI') and core.resourceService and core.resourceService.canMilk(owner, target):
 		core.resourceService.doMilk(owner, target)
 	return
 	
\ No newline at end of file

From 7443272e29613de035315264516570c3e4e477d4 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 14:56:19 +0100
Subject: [PATCH 18/23] Refactored abilities, skillSvc sends less traffic

---
 .../creature/CreatureMessageBuilder.java      | 53 +---------------
 .../objects/creature/CreatureObject.java      | 61 ++++++-------------
 src/services/SkillService.java                |  9 ++-
 3 files changed, 28 insertions(+), 95 deletions(-)

diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java
index 8c8edbf9..b8f2113b 100644
--- a/src/resources/objects/creature/CreatureMessageBuilder.java
+++ b/src/resources/objects/creature/CreatureMessageBuilder.java
@@ -191,20 +191,7 @@ public class CreatureMessageBuilder extends TangibleMessageBuilder {
 		
 		buffer.putInt(0);	// MissionCritical objects todo later
 		buffer.putInt(0);
-
-		if(creature.getAbilities().isEmpty()) {
-			buffer.putInt(0);	
-			buffer.putInt(creature.getAbilitiesUpdateCounter());
-		} else {
-			buffer.putInt(creature.getAbilities().size());	
-			buffer.putInt(creature.getAbilitiesUpdateCounter());
-
-			for(String ability : creature.getAbilities().get()) {
-				buffer.put((byte) 0);
-				buffer.put(getAsciiString(ability));
-				buffer.putInt(1);
-			}
-		}
+		buffer.put(creature.getAbilities().getBytes());
 		buffer.putInt(creature.getXpBarValue());	// xp bar value
 		int size = buffer.position();
 		buffer = bufferPool.allocate(size, false).put(buffer.array(), 0, size);
@@ -912,44 +899,6 @@ public class CreatureMessageBuilder extends TangibleMessageBuilder {
 
 	}
 	
-	public IoBuffer buildAddAbilityDelta(String name) {
-		
-		CreatureObject creature = (CreatureObject) object;
-		
-		IoBuffer buffer = bufferPool.allocate(15 + name.length(), false).order(ByteOrder.LITTLE_ENDIAN);
-		buffer.putInt(1);
-		buffer.putInt(creature.getAbilitiesUpdateCounter());
-		buffer.put((byte) 0);
-		buffer.put(getAsciiString(name));
-		buffer.putInt(1);
-		
-		int size = buffer.position();
-		buffer.flip();
-		buffer = createDelta("CREO", (byte) 4, (short) 1, (short) 0x0E, buffer, size + 4);
-		
-		return buffer;
-
-	}
-	
-	public IoBuffer buildRemoveAbilityDelta(String name) {
-		
-		CreatureObject creature = (CreatureObject) object;
-		
-		IoBuffer buffer = bufferPool.allocate(15 + name.length(), false).order(ByteOrder.LITTLE_ENDIAN);
-		buffer.putInt(1);
-		buffer.putInt(creature.getAbilitiesUpdateCounter());
-		buffer.put((byte) 1);
-		buffer.put(getAsciiString(name));
-		buffer.putInt(1);
-		
-		int size = buffer.position();
-		buffer.flip();
-		buffer = createDelta("CREO", (byte) 4, (short) 1, (short) 0x0E, buffer, size + 4);
-		
-		return buffer;
-
-	}
-	
 	public IoBuffer buildResetHAMListDelta() {
 		
 		CreatureObject creature = (CreatureObject) object;
diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index 40e15fc4..583d4fcf 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -95,8 +95,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
 	private float turnRadius = 1;
 	private float walkSpeed = (float) 1.549;
 	private float waterModPercent = (float) 0.75;
-	private SWGList<String> abilities;
-	private int abilitiesUpdateCounter = 0;
+	private SWGMap<String, Integer> abilities;
 	private int xpBarValue = 0;
 	
 	private SWGMap<Long, Long> missionCriticalObjects;
@@ -193,7 +192,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
 		loadTemplateData();
 		skills = new ArrayList<String>();
 		skillMods = new SWGMap<String, SkillMod>(this, 4, 3, true);
-		abilities = new SWGList<String>(this, 4, 14, true);
+		abilities = new SWGMap<String, Integer>(this, 4, 14, true);
 		missionCriticalObjects = new SWGMap<Long, Long>(this, 4, 13, false);
 		equipmentList = new SWGList<Long>(this, 6, 23, false);
 		buffList = new SWGList<Buff>(this, 6, 26, false);
@@ -786,60 +785,29 @@ public class CreatureObject extends TangibleObject implements Serializable {
 			this.waterModPercent = waterModPercent;
 		}
 	}
-
-	public SWGList<String> getAbilities() {
+	
+	public SWGMap<String, Integer> getAbilities() {
 		return abilities;
 	}
 	
 	public boolean hasAbility(String name) {
-		for (String ability : abilities) {
-			if (ability.equals(name)) {
-				return true;
-			}
-		}
-		
-		return false;
+		return abilities.containsKey(name);
 	}
-
-	public int getAbilitiesUpdateCounter() {
-		synchronized(objectMutex) {
-			return abilitiesUpdateCounter;
-		}
-	}
-
-	public void setAbilitiesUpdateCounter(int abilitiesUpdateCounter) {
-		synchronized(objectMutex) {
-			this.abilitiesUpdateCounter = abilitiesUpdateCounter;
-		}
-	}
-	
 	
 	public void addAbility(String abilityName) {
-		
-		if(abilities.contains(abilityName))
+		if (abilities.containsKey(abilityName)) {
 			return;
-		
-		abilities.add(abilityName);
-		
-		if(getClient() != null) {
-			setAbilitiesUpdateCounter((short) (getAbilitiesUpdateCounter() + 1));
-			getClient().getSession().write(messageBuilder.buildAddAbilityDelta(abilityName));
 		}
-
+		
+		abilities.put(abilityName, 1);
 	}
 	
 	public void removeAbility(String abilityName) {
-		
-		if(!abilities.contains(abilityName))
+		if (!abilities.containsKey(abilityName)) {
 			return;
-		
-		abilities.remove(abilityName);
-		
-		if(getClient() != null) {
-			setAbilitiesUpdateCounter((short) (getAbilitiesUpdateCounter() + 1));
-			getClient().getSession().write(messageBuilder.buildRemoveAbilityDelta(abilityName));
 		}
 		
+		abilities.remove(abilityName);
 	}
 	
 	public SWGMap<Long, Long> getMissionCriticalObjects() {
@@ -1862,6 +1830,15 @@ public class CreatureObject extends TangibleObject implements Serializable {
 							getClient().getSession().write(buffer);
 						}
 						
+						break;
+					}
+					case 14: { 
+						buffer = messageBuilder.createDelta("CREO", (byte) 4, (short) 1, (byte) 14, buffer, buffer.array().length + 4);
+						
+						if (getClient() != null && getClient().getSession() != null) {
+							getClient().getSession().write(buffer);
+						}
+						
 						break;
 					}
 				}
diff --git a/src/services/SkillService.java b/src/services/SkillService.java
index 6396581f..fcd3ec36 100644
--- a/src/services/SkillService.java
+++ b/src/services/SkillService.java
@@ -25,6 +25,7 @@ import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
@@ -163,10 +164,16 @@ public class SkillService implements INetworkDispatch {
 								}
 							}
 						} else {
+							Map<String, Integer> abilitiesMap = new TreeMap<String, Integer>();
+							
 							for (String ability : abilities) {
-								creature.addAbility(ability);
+								if (!creature.hasAbility(ability)) {
+									abilitiesMap.put(ability, 1);
+								}
 							}
 							
+							creature.getAbilities().putAll(abilitiesMap);
+							
 							for (String expertiseName : creature.getSkills()) {
 								if (expertiseName.startsWith("expertise")) {
 									if (FileUtilities.doesFileExist("scripts/expertise/" + expertiseName + ".py")) {

From 39dd9c01887821e793e4b38fbf67e8d6424d2c31 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 15:15:18 +0100
Subject: [PATCH 19/23] Fixed some warnings

---
 .../CommoditiesItemTypeListResponse.java                     | 1 -
 src/services/GroupService.java                               | 1 -
 src/services/GuildService.java                               | 3 ---
 src/services/LootService.java                                | 5 -----
 src/services/spawn/MobileTemplate.java                       | 1 -
 5 files changed, 11 deletions(-)

diff --git a/src/protocol/swg/auctionManagerClientListener/CommoditiesItemTypeListResponse.java b/src/protocol/swg/auctionManagerClientListener/CommoditiesItemTypeListResponse.java
index cbf52fe3..a49dfa93 100644
--- a/src/protocol/swg/auctionManagerClientListener/CommoditiesItemTypeListResponse.java
+++ b/src/protocol/swg/auctionManagerClientListener/CommoditiesItemTypeListResponse.java
@@ -33,7 +33,6 @@ import main.NGECore;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.buffer.SimpleBufferAllocator;
 
-import engine.resources.objects.SWGObject;
 import protocol.swg.SWGMessage;
 import services.bazaar.AuctionItem;
 
diff --git a/src/services/GroupService.java b/src/services/GroupService.java
index d427cec1..9517e42a 100644
--- a/src/services/GroupService.java
+++ b/src/services/GroupService.java
@@ -27,7 +27,6 @@ import java.util.Map;
 
 import resources.buffs.Buff;
 import resources.common.OutOfBand;
-import resources.common.ProsePackage;
 import resources.objects.creature.CreatureObject;
 import resources.objects.group.GroupObject;
 import services.chat.ChatRoom;
diff --git a/src/services/GuildService.java b/src/services/GuildService.java
index dfa0a23f..95e34fe9 100644
--- a/src/services/GuildService.java
+++ b/src/services/GuildService.java
@@ -50,13 +50,10 @@ import services.sui.SUIWindow;
 import services.sui.SUIWindow.SUICallback;
 import services.sui.SUIWindow.Trigger;
 import main.NGECore;
-import engine.clientdata.ClientFileManager;
 import engine.clientdata.StfTable;
-import engine.clientdata.visitors.DatatableVisitor;
 import engine.resources.objects.SWGObject;
 import engine.resources.service.INetworkDispatch;
 import engine.resources.service.INetworkRemoteEvent;
-import engine.resources.common.CRC;
 import engine.resources.common.Stf;
 
 public class GuildService implements INetworkDispatch {
diff --git a/src/services/LootService.java b/src/services/LootService.java
index 98b4520e..3f9afc69 100644
--- a/src/services/LootService.java
+++ b/src/services/LootService.java
@@ -40,7 +40,6 @@ import java.util.Random;
 import java.util.Vector;
 import java.util.concurrent.atomic.AtomicInteger;
 import protocol.swg.PlayClientEffectObjectTransformMessage;
-import protocol.swg.SceneCreateObjectByCrc;
 import resources.objects.craft.DraftSchematic;
 import resources.common.OutOfBand;
 import resources.datatables.DisplayType;
@@ -57,10 +56,6 @@ import services.sui.SUIWindow;
 import services.sui.SUIWindow.SUICallback;
 import services.sui.SUIWindow.Trigger;
 import main.NGECore;
-import engine.clientdata.ClientFileManager;
-import engine.clientdata.visitors.SlotArrangementVisitor;
-import engine.resources.container.AllPermissions;
-import engine.resources.common.Stf;
 import engine.resources.container.CreatureContainerPermissions;
 import engine.resources.container.Traverser;
 import engine.resources.objects.SWGObject;
diff --git a/src/services/spawn/MobileTemplate.java b/src/services/spawn/MobileTemplate.java
index 9cc539da..169c08b7 100644
--- a/src/services/spawn/MobileTemplate.java
+++ b/src/services/spawn/MobileTemplate.java
@@ -27,7 +27,6 @@ import java.util.Vector;
 
 import resources.datatables.Options;
 import resources.datatables.PvpStatus;
-import resources.datatables.Factions;
 import resources.datatables.FactionStatus;
 import resources.loot.LootGroup;
 

From df69ee077839cb649c8109f7abbb719cc70eb748 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 15:39:49 +0100
Subject: [PATCH 20/23] Fixed #799

---
 src/services/GroupService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/services/GroupService.java b/src/services/GroupService.java
index 9517e42a..bcdc2d02 100644
--- a/src/services/GroupService.java
+++ b/src/services/GroupService.java
@@ -172,6 +172,11 @@ public class GroupService implements INetworkDispatch {
 		
 		if(group != null && group.getMemberList().size() < 8) {
 			
+			invited.setInviteCounter(invited.getInviteCounter() + 1);
+			invited.setInviteSenderId(0);
+			invited.setInviteSenderName("");
+			invited.updateGroupInviteInfo();
+			
 			group.addMember(invited);
 			invited.makeAware(group);
 			invited.setGroupId(group.getObjectID());	

From 053ad0ef99ef081efb72cd0ddc55e5217624235f Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 4 Jun 2014 15:57:06 +0100
Subject: [PATCH 21/23] Added debug message to lootservice

---
 src/services/LootService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/services/LootService.java b/src/services/LootService.java
index 3f9afc69..d7bee564 100644
--- a/src/services/LootService.java
+++ b/src/services/LootService.java
@@ -224,6 +224,9 @@ public class LootService implements INetworkDispatch {
     		// RLS chest effect
 	    	if (droppedItem.getAttachment("LootItemName").toString().contains("Loot Chest")){
 	    		requester.playEffectObject("clienteffect/level_granted.cef", "");
+	    		if (requester.getClient().isGM()) {
+	    			requester.sendSystemMessage("GM Message: Played leveling effect due to RLC dropping.", DisplayType.Broadcast);
+	    		}
 	    	}
     	}
     	

From fba0f119d2a29824a2ef610a330c941fbe47046c Mon Sep 17 00:00:00 2001
From: tacef <neuwirth.christoph@gmx.net>
Date: Wed, 4 Jun 2014 17:28:50 +0200
Subject: [PATCH 22/23] Fixed wrong cell in Shinnbunker

---
 scripts/static_spawns/tatooine/mos_eisley_shinn_bunker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/static_spawns/tatooine/mos_eisley_shinn_bunker.py b/scripts/static_spawns/tatooine/mos_eisley_shinn_bunker.py
index 603a619b..4add2ca5 100644
--- a/scripts/static_spawns/tatooine/mos_eisley_shinn_bunker.py
+++ b/scripts/static_spawns/tatooine/mos_eisley_shinn_bunker.py
@@ -41,7 +41,7 @@ def addPlanetSpawns(core, planet):
 	shinn_guard_o2 = stcSvc.spawnObject('shinn_guard', 'tatooine', long(0), float(3423), float(7), float(-5461), float(0), float(0), float(0), float(0), 30)	
 													
 	# Shinn Guards in Bunker
-	shinn_guard = stcSvc.spawnObject('shinn_guard', 'tatooine', building.getCellByCellName("hall1"), float(-3.3), float(0.3), float(3.6), float(0), float(0), float(0), float(0), 30)
+	shinn_guard = stcSvc.spawnObject('shinn_guard', 'tatooine', building.getCellByCellNumber(long(1)), float(-3.3), float(0.3), float(3.6), float(0), float(0), float(0), float(0), 30)
 	shinn_guard1 = stcSvc.spawnObject('shinn_guard', 'tatooine', building.getCellByCellNumber(long(3)), float(2.9), float(0.3), float(-4.0), float(0), float(0), float(0), float(0), 30)
 	shinn_guard2 = stcSvc.spawnObject('shinn_guard', 'tatooine', building.getCellByCellNumber(long(4)), float(3.8), float(-3.3), float(4.8), float(0), float(0), float(0), float(0), 30)
 	shinn_guard3 = stcSvc.spawnObject('shinn_guard', 'tatooine', building.getCellByCellNumber(long(5)), float(-4.4), float(-10.3), float(-6.1), float(0), float(0), float(0), float(0), 30)

From 6d6b8ee24fd25ba656b734f09024c0b399b82da8 Mon Sep 17 00:00:00 2001
From: CharonInferar <CharonInferar@aol.de>
Date: Wed, 4 Jun 2014 18:04:44 +0200
Subject: [PATCH 23/23] Loot scripts can now contain STF-Filename parameters

def STFparams():

return
['static_item_n','item_junk_imitation_pearl_01_02','static_item_d','item_junk_imitation_pearl_01_02']
---
 src/services/LootService.java | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/services/LootService.java b/src/services/LootService.java
index d7bee564..e2100b00 100644
--- a/src/services/LootService.java
+++ b/src/services/LootService.java
@@ -612,6 +612,7 @@ public class LootService implements INetworkDispatch {
 		Vector<Integer> customizationValues = null;
 		Vector<String> itemStats = null;
 		Vector<String> itemSkillMods = null;
+		Vector<String> STFparams = null;
 				
 		if(core.scriptService.getMethod(itemPath,"","itemTemplate")==null){
 			String errorMessage = "Loot item  '" + itemName + "'  has no template function assigned in its script. Please contact Charon about this issue.";
@@ -666,8 +667,12 @@ public class LootService implements INetworkDispatch {
 		if(core.scriptService.getMethod(itemPath,"","junkType")!=null)
 			junkType =  (byte)core.scriptService.fetchInteger(itemPath,"junkType");
 		
+		if(core.scriptService.getMethod(itemPath,"","STFparams")!=null)
+			STFparams = (Vector<String>)core.scriptService.fetchStringVector(itemPath,"STFparams");
+		
 			
 		System.out.println("itemTemplate " + itemTemplate);
+
 		
 		TangibleObject droppedItem = createDroppedItem(itemTemplate,lootRollSession.getSessionPlanet());
 		
@@ -713,6 +718,10 @@ public class LootService implements INetworkDispatch {
     		handleSkillMods(droppedItem, itemSkillMods);
     	}
     	
+    	if (STFparams!=null){
+    		setSTFParams(droppedItem, STFparams);
+    	}
+    	
     	
     	
 //    	if (customizationValues!=null)
@@ -741,6 +750,21 @@ public class LootService implements INetworkDispatch {
 		lootRollSession.addDroppedItem(droppedItem);
 	}	
 	
+	private void setSTFParams(TangibleObject droppedItem, Vector<String>STFparams){
+		if (STFparams.size()!=4)
+			return;
+		String filename1 = "static_item_n";
+		String filename2 = "static_item_d";
+		filename1 = STFparams.get(0);
+		filename2 = STFparams.get(2);
+		String stfName = STFparams.get(1);
+		String detailName = STFparams.get(3);
+		droppedItem.setStfFilename(filename1);
+		droppedItem.setStfName(stfName);
+		droppedItem.setDetailFilename(filename2);
+		droppedItem.setDetailName(detailName);
+	}
+	
 	private void handleCustomDropName(TangibleObject droppedItem,String customName) {
 //		String customItemName = droppedItem.getCustomName();
 //		if (customName.charAt(0) == '@' || customName.contains("_n:")) {
@@ -1023,6 +1047,7 @@ public class LootService implements INetworkDispatch {
 		String lootDescriptor = "";
 		Vector<String> itemStats = null;
 		Vector<String> itemSkillMods = null;
+		Vector<String> STFparams = null;
 				
 		if(core.scriptService.getMethod(itemPath,"","itemTemplate")==null){
 			String errorMessage = "Loot item  '" + itemName + "'  has no template function assigned in its script. Please contact Charon about this issue.";
@@ -1085,6 +1110,9 @@ public class LootService implements INetworkDispatch {
 		if(core.scriptService.getMethod(itemPath,"","junkType")!=null)
 			junkType =  (byte)core.scriptService.fetchInteger(itemPath,"junkType");
 		
+		if(core.scriptService.getMethod(itemPath,"","STFparams")!=null)
+			STFparams = (Vector<String>)core.scriptService.fetchStringVector(itemPath,"STFparams");
+		
 			
 		System.out.println("itemTemplate " + itemTemplate);
 		
@@ -1131,6 +1159,10 @@ public class LootService implements INetworkDispatch {
 	    	if (itemSkillMods!=null){
 	    		handleSkillMods(droppedItem, itemSkillMods);
 	    	}
+	    	
+	    	if (STFparams!=null){
+	    		setSTFParams(droppedItem, STFparams);
+	    	}
 	    	 	
 	    	setCustomization(droppedItem, itemName); // for now