diff --git a/src/services/AttributeService.java b/src/services/AttributeService.java index f5da7e71..97e52c1f 100644 --- a/src/services/AttributeService.java +++ b/src/services/AttributeService.java @@ -28,9 +28,9 @@ import java.util.TreeMap; import org.apache.mina.core.buffer.SimpleBufferAllocator; import main.NGECore; - import protocol.swg.AttributeListMessage; - +import resources.objects.creature.CreatureObject; +import engine.resources.common.Stf; import engine.resources.objects.SWGObject; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; @@ -65,6 +65,18 @@ public class AttributeService implements INetworkDispatch { if(requester.getClient() == null || requester.getClient().getSession() == null) return; + // Color collection used in attribute based on whether collection is complete or not + if(target.getAttachment("CollectionItemName") != null) + { + String collectionName = new Stf("@collection_n:" + (String) target.getAttachment("AddToCollection")).getStfValue().replace(":", " -"); + + if(core.collectionService.isComplete((CreatureObject) requester, (String) target.getAttachment("CollectionItemName"))) + { + target.getAttributes().put("@obj_attr_n:collection_name", "\\#FF0000 " + collectionName); + } + else target.getAttributes().put("@obj_attr_n:collection_name", "\\#00FF00 " + collectionName); + } + AttributeListMessage message = new AttributeListMessage(target, bufferPool); requester.getClient().getSession().write(message.serialize()); } diff --git a/src/services/LootService.java b/src/services/LootService.java index 35aec14e..60ae4a66 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -754,11 +754,12 @@ public class LootService implements INetworkDispatch { setSTFParams(droppedItem, STFparams); } - if (addToCollection!=null){ + if (addToCollection!=null) { droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection); //droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF "); //core.collectionService.addCollection(actor, "new_prof_officer_master") droppedItem.setAttachment("radial_filename", "item/collection/loot_collection"); + droppedItem.setAttachment("AddToCollection", addToCollection); //System.out.println("collection"); }