Merge pull request #19 from drskinner/COV-0060

COV-0060: add object nolongdesc flag

src/act_info.c

@@ -303,8 +303,14 @@ char *format_obj_to_char(OBJ_DATA * obj, CHAR_DATA * ch, bool fShort)
     mudstrlcat(buf, "(Hidden) ", MAX_STRING_LENGTH);
   if (IS_OBJ_STAT(obj, ITEM_BURIED))
     mudstrlcat(buf, "(Buried) ", MAX_STRING_LENGTH);
-  if (IS_IMMORTAL(ch) && IS_OBJ_STAT(obj, ITEM_PROTOTYPE))
-    mudstrlcat(buf, "(PROTO) ", MAX_STRING_LENGTH);
+
+  if (IS_IMMORTAL(ch)) {
+    if (IS_OBJ_STAT(obj, ITEM_PROTOTYPE))
+      mudstrlcat(buf, "(PROTO) ", MAX_STRING_LENGTH);
+    if (IS_OBJ_STAT(obj, ITEM_NOLONGDESC))
+      mudstrlcat(buf, "(No Long) ", MAX_STRING_LENGTH);
+  }
+
   if ((IS_AFFECTED(ch, AFF_DETECTTRAPS) || xIS_SET(ch->act, PLR_HOLYLIGHT)) && is_trapped(obj))
     mudstrlcat(buf, "(Trap) ", MAX_STRING_LENGTH);
 
@@ -544,8 +550,12 @@ void show_list_to_char(OBJ_DATA * list, CHAR_DATA * ch, bool fShort, bool fShowN
       nShow++;
       --tmp;
     }
-    if (obj->wear_loc == WEAR_NONE
-        && can_see_obj(ch, obj) && (obj->item_type != ITEM_TRAP || IS_AFFECTED(ch, AFF_DETECTTRAPS)))
+
+    if ((obj->wear_loc == WEAR_NONE)
+        && (can_see_obj(ch, obj))
+        && (obj->item_type != ITEM_TRAP || IS_AFFECTED(ch, AFF_DETECTTRAPS))
+        && (!IS_OBJ_STAT(obj, ITEM_NOLONGDESC) || IS_BUILDER(ch))
+       )
     {
       pstrShow = format_obj_to_char(obj, ch, fShort);
       fCombine = FALSE;

src/build.c

@@ -73,7 +73,7 @@ const char *const r_flags[] = {
 };
 
 const char *const o_flags[] = {
-  "glow", "hum", "dark", "loyal", "evil", "invis", "magic", "nodrop", "bless",
+  "glow", "hum", "dark", "nolongdesc", "evil", "invis", "magic", "nodrop", "bless",
   "antigood", "antievil", "antineutral", "noremove", "inventory",
   "antimage", "antithief", "antiwarrior", "anticleric", "organic", "metal",
   "donation", "clanobject", "clancorpse", "antivampire", "antidruid",

src/handler.c

@@ -3788,8 +3788,8 @@ const char *extra_bit_name(EXT_BV * extra_flags)
     mudstrlcat(buf, " hum", 512);
   if (xIS_SET(*extra_flags, ITEM_DARK))
     mudstrlcat(buf, " dark", 512);
-  if (xIS_SET(*extra_flags, ITEM_LOYAL))
-    mudstrlcat(buf, " loyal", 512);
+  if (xIS_SET(*extra_flags, ITEM_NOLONGDESC))
+    mudstrlcat(buf, " nolongdesc", 512);
   if (xIS_SET(*extra_flags, ITEM_EVIL))
     mudstrlcat(buf, " evil", 512);
   if (xIS_SET(*extra_flags, ITEM_INVIS))

src/mud.h

@@ -1699,7 +1699,7 @@ typedef enum
  */
 typedef enum
 {
-  ITEM_GLOW, ITEM_HUM, ITEM_DARK, ITEM_LOYAL, ITEM_EVIL, ITEM_INVIS, ITEM_MAGIC,
+  ITEM_GLOW, ITEM_HUM, ITEM_DARK, ITEM_NOLONGDESC, ITEM_EVIL, ITEM_INVIS, ITEM_MAGIC,
   ITEM_NODROP, ITEM_BLESS, ITEM_ANTI_GOOD, ITEM_ANTI_EVIL, ITEM_ANTI_NEUTRAL,
   ITEM_NOREMOVE, ITEM_INVENTORY, ITEM_ANTI_MAGE, ITEM_ANTI_THIEF,
   ITEM_ANTI_WARRIOR, ITEM_ANTI_CLERIC, ITEM_ORGANIC, ITEM_METAL, ITEM_DONATION,
@@ -3286,6 +3286,7 @@ void ext_toggle_bits args((EXT_BV * var, EXT_BV * bits));
  */
 #define IS_NPC(ch)              (xIS_SET((ch)->act, ACT_IS_NPC))
 #define IS_IMMORTAL(ch)         (get_trust((ch)) >= LEVEL_IMMORTAL)
+#define IS_BUILDER(ch)          (get_trust((ch)) >= LEVEL_CREATOR)
 #define IS_HERO(ch)             (get_trust((ch)) >= LEVEL_HERO)
 #define IS_AFFECTED(ch, sn)     (xIS_SET((ch)->affected_by, (sn)))
 #define HAS_BODYPART(ch, part)  ((ch)->xflags == 0 || IS_SET((ch)->xflags, (part)))

src/skills.c

@@ -3742,7 +3742,6 @@ void do_feed(CHAR_DATA* ch, const char* argument)
 /*
  * Disarm a creature.
  * Caller must check for successful attack.
- * Check for loyalty flag (weapon disarms to inventory) for pkillers -Blodkai
  */
 void disarm(CHAR_DATA * ch, CHAR_DATA * victim)
 {
@@ -3791,7 +3790,7 @@ void disarm(CHAR_DATA * ch, CHAR_DATA * victim)
     obj->action_desc = STRALLOC(buf);
   }
 
-  if (IS_NPC(victim) || (IS_OBJ_STAT(obj, ITEM_LOYAL) && IS_PKILL(victim) && !IS_NPC(ch)))
+  if (IS_NPC(victim) || (IS_PKILL(victim) && !IS_NPC(ch)))
   {
     obj_to_char(obj, victim);
     STRFREE(obj->action_desc);  /* Rather do this kludgy stuff than try to test all circumstances */