--- deliantra/server/include/object.h	2007/03/11 02:12:44	1.103
+++ deliantra/server/include/object.h	2007/04/24 00:42:02	1.111
@@ -31,6 +31,7 @@
 #include "shstr.h"
 
 typedef int tag_t;
+
 #define NUM_BODY_LOCATIONS      12
 #define BODY_ARMS               1
 
@@ -123,7 +124,6 @@
   arch_ptr ACC (RW, arch);	/* Pointer to archetype */
   arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
 
-  int ACC (RW, face);	/* Face with colors */
   float ACC (RW, speed);	/* The overall speed of this object */
   float ACC (RW, speed_left);	/* How much speed is left to spend this round */
   uint32 ACC (RW, nrof);	/* How many of the objects */
@@ -162,6 +162,7 @@
   uint32 ACC (RW, tooltype);	/* type of tool or build facility */
   sint8 ACC (RW, body_info[NUM_BODY_LOCATIONS]);	/* body info as loaded from the file */
   sint8 ACC (RW, body_used[NUM_BODY_LOCATIONS]);	/* Calculated value based on items equipped */
+  faceidx ACC (RW, face);	/* Face with colors */
   living ACC (RO, stats);	/* Str, Con, Dex, etc */
   /* See the pod/objects.pod for more info about body locations */
 
@@ -200,7 +201,6 @@
   /* Following are values used by any object */
   /* this objects turns into or what this object creates */
   treasurelist *ACC (RW, randomitems);	/* Items to be generated */
-  key_value *key_values;	/* Fields not explictly known by the loader. */
   flags_t flag;                 /* various flags */
 #if FOR_PERL
   bool ACC (RW, flag[NUM_FLAGS]);
@@ -240,12 +240,14 @@
   object *ACC (RW, more);	/* Pointer to the rest of a large body of objects */
   object *head;			/* Points to the main object of a large body */ // NO ACC, perl semantics are different
   client_container *seen_by;    // seen by which player/container currently?
+  key_value *key_values;	/* Fields not explictly known by the loader. */
 
   bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
   static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
   bool write (object_freezer &f);
 
   MTH static object *create ();
+  object &operator =(const object &src);
   MTH void copy_to (object *dst);
   MTH object *clone (); // create + copy_to
   void do_destroy ();
@@ -362,6 +364,19 @@
     return head ? head : this;
   }
 
+  MTH std::string long_desc        (object *who = 0);
+  MTH std::string describe_monster (object *who = 0);
+  MTH std::string describe_item    (object *who = 0);
+  MTH std::string describe         (object *who = 0);
+
+  // If this object has no extra parts but should have them,
+  // add them, effectively expanding heads into multipart
+  // objects. This method only works on objects not inserted
+  // anywhere.
+  MTH void expand_tail ();
+
+  MTH void create_treasure (treasurelist *tl, int flags = 0);
+
   // insert object at same map position as 'where'
   // handles both inventory and map "positions"
   MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
@@ -484,6 +499,7 @@
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
   static archetype *read (object_thawer &f);
+  static archetype *get  (const char *name); // find or create
   static archetype *find (const char *name);
 
   void hash_add (); // add to hashtable
@@ -495,6 +511,7 @@
   struct archetype *ACC (RW, more);    		/* Next part of a linked object */
   object ACC (RO, clone);	       		/* An object from which to do ->copy_to () */
   uint32 ACC (RW, editable);	       		/* editable flags (mainly for editor) */
+  bool ACC (RW, linked);                        // linked into list of heads
   sint8 ACC (RW, tail_x), ACC (RW, tail_y);	/* Where the lower right most portion of the object is
 						 * in comparison to the head.
 						 */
@@ -543,7 +560,6 @@
 #define INS_MAP_LOAD            0x0020
 
 #define ARCH_SINGULARITY        "singularity"
-#define ARCH_SINGULARITY_LEN    11
 #define ARCH_DETECT_MAGIC       "detect_magic"
 #define ARCH_DEPLETION          "depletion"
 #define ARCH_SYMPTOM            "symptom"