--- db.c.old	Sun Jan 23 13:24:53 2000
+++ db.c.new	Tue Feb 13 20:39:21 2001
@@ -970,10 +970,10 @@
     exit(1);
   }
 
-  if (sscanf(line, " %d %d %d %dd%d+%d %dd%d+%d ",
+  if (sscanf(line, " %d %d %d %d:%d:%d %dd%d+%d ",
 	  t, t + 1, t + 2, t + 3, t + 4, t + 5, t + 6, t + 7, t + 8) != 9) {
     log("SYSERR: Format error in mob #%d, first line after S flag\n"
-	"...expecting line of form '# # # #d#+# #d#+#'", nr);
+	"...expecting line of form '# # # #:#:# #d#+#'", nr);
     exit(1);
   }
 
@@ -1054,7 +1054,7 @@
 
   num_arg = atoi(value);
 
-  CASE("BareHandAttack") {
+  CASE("UnarmedAttack") {
     RANGE(0, 99);
     mob_proto[i].mob_specials.attack_type = num_arg;
   }
@@ -1125,8 +1125,6 @@
 {
   char line[256];
 
-  parse_simple_mob(mob_f, i, nr);
-
   while (get_line(mob_f, line)) {
     if (!strcmp(line, "E"))	/* end of the enhanced section */
       return;
@@ -1146,7 +1144,7 @@
 {
   static int i = 0;
   int j, t[10];
-  char line[256], *tmpptr, letter;
+  char line[256], *tmpptr;
   char f1[128], f2[128];
 
   mob_index[i].vnum = nr;
@@ -1177,17 +1175,13 @@
   /* *** Numeric data *** */
   if (!get_line(mob_f, line)) {
     log("SYSERR: Format error after string section of mob #%d\n"
-	"...expecting line of form '# # # {S | E}', but file ended!", nr);
+	"...expecting line of form '# # #', but file ended!", nr);
     exit(1);
   }
 
-#ifdef CIRCLE_ACORN	/* Ugh. */
-  if (sscanf(line, "%s %s %d %s", f1, f2, t + 2, &letter) != 4) {
-#else
-  if (sscanf(line, "%s %s %d %c", f1, f2, t + 2, &letter) != 4) {
-#endif
+  if (sscanf(line, "%s %s %d", f1, f2, t + 2) != 3) {
     log("SYSERR: Format error after string section of mob #%d\n"
-	"...expecting line of form '# # # {S | E}'", nr);
+	"...expecting line of form '# # #'", nr);
     exit(1);
   }
   MOB_FLAGS(mob_proto + i) = asciiflag_conv(f1);
@@ -1195,18 +1189,8 @@
   AFF_FLAGS(mob_proto + i) = asciiflag_conv(f2);
   GET_ALIGNMENT(mob_proto + i) = t[2];
 
-  switch (UPPER(letter)) {
-  case 'S':	/* Simple monsters */
-    parse_simple_mob(mob_f, i, nr);
-    break;
-  case 'E':	/* Circle3 Enhanced monsters */
-    parse_enhanced_mob(mob_f, i, nr);
-    break;
-  /* add new mob types here.. */
-  default:
-    log("SYSERR: Unsupported mob type '%c' in mob #%d", letter, nr);
-    exit(1);
-  }
+  parse_simple_mob(mob_f, i, nr);
+  parse_enhanced_mob(mob_f, i, nr);
 
   mob_proto[i].aff_abils = mob_proto[i].real_abils;