Updated World (thanks Parna) and other text files for release. --Rumble

src/act.offensive.c

@@ -298,6 +298,10 @@ ACMD(do_bash)
     send_to_char(ch, "This mob is protected.\r\n");
     return;
   }
+
+  if (MOB_FLAGGED(vict, MOB_NOBASH))
+    percent = 101;
+
   percent = rand_number(1, 101);	/* 101% is a complete failure */
   prob = GET_SKILL(ch, SKILL_BASH);
 

src/constants.c

@@ -24,7 +24,7 @@
  * @todo cpp_extern isn't needed here (or anywhere) as the extern reserved word
  * works correctly with C compilers (at least in my Experience)
  * Jeremy Osborne 1/28/2008 */
-cpp_extern const char *tbamud_version = "tbaMUD 3.60";
+cpp_extern const char *tbamud_version = "tbaMUD 3.61";
 
 /* strings corresponding to ordinals/bitvectors in structs.h */
 /* (Note: strings for class definitions in class.c instead of here) */
@@ -187,8 +187,9 @@ const char *action_bits[] = {
   "NO_CHARM",
   "NO_SUMMN",
   "NO_SLEEP",
-  "NO_KILL",
+  "NO_BASH",
   "NO_BLIND",
+  "NO_KILL",
   "DEAD",    /* You should never see this. */
   "\n"
 };

src/structs.h

@@ -19,7 +19,7 @@
  * on an older version. You are supposed to compare this with the macro
  * TBAMUD_VERSION() in utils.h.
  * It is read as Major/Minor/Patchlevel - MMmmPP */
-#define _TBAMUD    0x030600
+#define _TBAMUD    0x030610
 
 /** If you want equipment to be automatically equipped to the same place
  * it was when players rented, set the define below to 1 because
@@ -214,11 +214,12 @@
 #define MOB_NOCHARM        13   /**< Mob can't be charmed */
 #define MOB_NOSUMMON       14   /**< Mob can't be summoned */
 #define MOB_NOSLEEP        15   /**< Mob can't be slept */
-#define MOB_NOKILL         16   /**< Mob can't be bashed (e.g. trees) */
+#define MOB_NOBASH         16   /**< Mob can't be bashed (e.g. trees) */
 #define MOB_NOBLIND        17   /**< Mob can't be blinded */
-#define MOB_NOTDEADYET     18   /**< (R) Mob being extracted */
-/** Total number of Mob Flags; it should be 1 less than MOB_NOT_DEADYET */
-#define NUM_MOB_FLAGS      18 
+#define MOB_NOKILL         18   /**< Mob can't be attacked */
+#define MOB_NOTDEADYET     19   /**< (R) Mob being extracted */
+
+#define NUM_MOB_FLAGS      19 
 
 /* Preference flags: used by char_data.player_specials.pref */
 #define PRF_BRIEF         0   /**< Room descs won't normally be shown */