--- deliantra/server/common/item.C	2010/04/03 03:13:47	1.78
+++ deliantra/server/common/item.C	2010/04/04 02:57:10	1.80
@@ -1185,6 +1185,178 @@
   return std::string (::describe_item (this, who));
 }
 
+static void
+describe_dump_object (dynbuf &buf, object *ob)
+{
+  char *txt = dump_object (ob);
+  for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
+  buf << "\n" << txt << "\n";
+
+  if (!ob->is_arch ())
+    describe_dump_object (buf, ob->arch);
+}
+
+std::string
+object::describe (object *who)
+{
+  dynbuf_text buf (1024, 1024);
+
+  buf.printf ("That is: %s.\r", long_desc (who).c_str ());
+
+  if (custom_name)
+    buf.printf ("You call it %s.\r", &custom_name);
+
+  switch (type)
+    {
+      case SPELLBOOK:
+        if (flag [FLAG_IDENTIFIED] && inv)
+          buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
+        break;
+
+      case BOOK:
+        if (msg)
+          buf << "Something is written in it.\r";
+        break;
+
+      case CONTAINER:
+        if (race)
+          {
+            if (weight_limit && stats.Str < 100)
+              buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
+                          &race, weight_limit / (10.0 * (100 - stats.Str)));
+            else
+              buf.printf ("It can hold only %s.\r", &race);
+          }
+        else if (weight_limit && stats.Str < 100)
+          buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
+        break;
+
+      case WAND:
+        if (flag [FLAG_IDENTIFIED])
+          buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
+        break;
+    }
+
+  if (material != MATERIAL_NULL && !msg)
+    buf << (nrof > 1 ? "They are made of " : "It is made of ")
+        << material->description
+        << ".\r";
+
+  if (who)
+    /* Where to wear this item */
+    for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
+      if (slot[i].info)
+        {
+          buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
+
+          if (slot[i].info < -1 && who->slot[i].info)
+            buf.printf ("(%d)", -slot[i].info);
+
+          buf << ".\r";
+        }
+
+  if (weight)
+    buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
+
+  if (flag [FLAG_STARTEQUIP])
+    buf << (nrof > 1 ? "They were" : "It was")
+        << " given by a god and will vanish when dropped.\r";
+
+  if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
+    {
+      buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
+
+      if (who->is_in_shop ())
+        {
+          if (flag [FLAG_UNPAID])
+            buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
+          else
+            buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
+        }
+    }
+
+  if (flag [FLAG_MONSTER])
+    buf << describe_monster (who);
+
+  /* Is this item buildable? */
+  if (flag [FLAG_IS_BUILDABLE])
+    buf << "This is a buildable item.\r";
+
+  /* Does the object have a message?  Don't show message for all object
+   * types - especially if the first entry is a match
+   */
+  if (msg)
+    {
+      if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
+        {
+          buf << '\r';
+
+          /* This is just a hack so when identifying the items, we print
+           * out the extra message
+           */
+          if (need_identify (this) && flag [FLAG_IDENTIFIED])
+            buf << "The object has a story:\r";
+
+          buf << msg << '\n';
+        }
+    }
+  else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
+           && (type == SPELLBOOK || type == ROD || type == WAND
+               || type == ROD || type == POTION || type == SCROLL))
+    // for spellbooks and other stuff that contains spells, print the spell message,
+    // unless the object has a custom message handled above.
+    buf << '\r' << inv->msg << '\n';
+
+  // try to display the duration for some potions and scrolls
+  // this includes change ability potions and group spells,
+  // but does not handle protection potions
+  if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
+      && (type == POTION || type == SCROLL))
+    {
+      object *spell = inv;
+
+      if (spell->subtype == SP_PARTY_SPELL)
+        spell = spell->other_arch;
+
+      if (spell->subtype == SP_CHANGE_ABILITY)
+        buf.printf ("\nH<The effect will last about %.10g seconds.>",
+                    TICK2TIME (change_ability_duration (spell, this)));
+    }
+
+  // some help text for skill tools
+  if (type == SKILL_TOOL)
+    buf << "\nH<This item is a skill tool: as long as you have this item applied "
+           "you can use the " << &skill << " skill as if you had learned it.>";
+
+  // Display a hint about inscribable items [empty books]
+  // This includes the amount of text they can hold.
+  if (type == INSCRIBABLE)
+    {
+      if (other_arch && other_arch->type == SCROLL)
+        buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
+      else
+        buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
+                    weight_limit);
+    }
+
+  buf << '\n';
+
+  // the dungeon master additionally gets a complete dump
+  if (who && who->flag [FLAG_WIZLOOK])
+    {
+      buf << "\nT<Object>\n";
+      describe_dump_object (buf, this);
+
+      if (inv)
+        {
+          buf << "\nT<Top Inventory>\n";
+          describe_dump_object (buf, inv);
+        }
+    }
+
+  return std::string (buf.linearise (), buf.size ());
+}
+
 void
 examine (object *op, object *tmp)
 {