Wording, punctuation and line length improvements. Also adjust test

for killing nonsensical things to fix crash with "kill door".  From
OpenBSD.

7 files changed, 26 insertions, 26 deletions

diff --git a/battlestar/com2.c b/battlestar/com2.c
index f2536ff3..96748eba 100644
--- a/battlestar/com2.c
+++ b/battlestar/com2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com2.c,v 1.8 1999/07/14 17:42:13 hubertf Exp $	*/
+/*	$NetBSD: com2.c,v 1.9 2000/09/10 10:51:16 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com2.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com2.c,v 1.8 1999/07/14 17:42:13 hubertf Exp $");
+__RCSID("$NetBSD: com2.c,v 1.9 2000/09/10 10:51:16 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -239,8 +239,8 @@ murder()
 			break;
 
 		default:
-			if (wordtype[wordnumber] != NOUNS)
-				puts("Kill what?");
+			if (wordtype[wordnumber] != OBJECT)
+				puts("You can't kill that!");
 			else
 				printf("You can't kill the %s!\n",
 				    objsht[wordvalue[wordnumber]]);
diff --git a/battlestar/com3.c b/battlestar/com3.c
index d508d5e2..774239a5 100644
--- a/battlestar/com3.c
+++ b/battlestar/com3.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com3.c,v 1.7 1998/08/24 00:19:25 hubertf Exp $	*/
+/*	$NetBSD: com3.c,v 1.8 2000/09/10 10:51:17 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com3.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com3.c,v 1.7 1998/08/24 00:19:25 hubertf Exp $");
+__RCSID("$NetBSD: com3.c,v 1.8 2000/09/10 10:51:17 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -286,7 +286,7 @@ shoot()
 					clearbit(location[position].objects, TIMER);
 					setbit(location[position].objects, DEADTIME);
 				} else
-					puts("What old timer?");
+					puts("What old-timer?");
 				break;
 			case MAN:
 				if (testbit(location[position].objects, MAN)) {
diff --git a/battlestar/com4.c b/battlestar/com4.c
index addce416..387eb6d2 100644
--- a/battlestar/com4.c
+++ b/battlestar/com4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com4.c,v 1.8 1999/09/18 19:38:46 jsm Exp $	*/
+/*	$NetBSD: com4.c,v 1.9 2000/09/10 10:51:17 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com4.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com4.c,v 1.8 1999/09/18 19:38:46 jsm Exp $");
+__RCSID("$NetBSD: com4.c,v 1.9 2000/09/10 10:51:17 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -143,9 +143,9 @@ take(from)
 			if (testbit(location[position].objects, AMULET)) {
 				puts("The amulet is warm to the touch, and its beauty catches your breath.");
 				puts("A mist falls over your eyes, but then it is gone.  Sounds seem clearer");
-				puts("and sharper but far away as if in a dream.  The sound of purling water reaches");
-				puts("you from afar.  The mist falls again, and your heart leaps in horror.  The gold");
-				puts("freezes your hands and fathomless darkness engulfs your soul.");
+				puts("and sharper but far away as if in a dream.  The sound of purling water");
+				puts("reaches you from afar.  The mist falls again, and your heart leaps in horror.");
+				puts("The gold freezes your hands and fathomless darkness engulfs your soul.");
 			}
 			wordtype[wordnumber--] = OBJECT;
 			return (take(from));
@@ -171,7 +171,7 @@ take(from)
 				puts("Water droplets like liquid silver bedew her golden skin, but when they part");
 				puts("from her, they fall as teardrops.  She wraps a single cloth around her and");
 				puts("ties it at the waist.  Around her neck hangs a golden amulet.");
-				puts("She bids you to follow her.");
+				puts("She bids you to follow her, and walks away.");
 				pleasure++;
 				followgod = ourtime;
 				clearbit(location[position].objects, BATHGOD);
diff --git a/battlestar/com5.c b/battlestar/com5.c
index 71f8af70..24afa00b 100644
--- a/battlestar/com5.c
+++ b/battlestar/com5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com5.c,v 1.11 2000/09/08 17:25:31 jsm Exp $	*/
+/*	$NetBSD: com5.c,v 1.12 2000/09/10 10:51:17 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com5.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com5.c,v 1.11 2000/09/08 17:25:31 jsm Exp $");
+__RCSID("$NetBSD: com5.c,v 1.12 2000/09/10 10:51:17 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -70,7 +70,7 @@ kiss()
 			}
 			break;
 		case NATIVE:
-			puts("The lips are warm and her body robust.  She pulls you down to the ground.");
+			puts("Her lips are warm and her body robust.  She pulls you down to the ground.");
 			break;
 		case TIMER:
 			puts("The old man blushes.");
diff --git a/battlestar/com6.c b/battlestar/com6.c
index 027249d2..5bd9ebdc 100644
--- a/battlestar/com6.c
+++ b/battlestar/com6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com6.c,v 1.15 1999/09/14 18:08:46 jsm Exp $	*/
+/*	$NetBSD: com6.c,v 1.16 2000/09/10 10:51:17 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com6.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com6.c,v 1.15 1999/09/14 18:08:46 jsm Exp $");
+__RCSID("$NetBSD: com6.c,v 1.16 2000/09/10 10:51:17 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -212,7 +212,7 @@ ride()
 {
 	if (testbit(location[position].objects, HORSE)) {
 		puts("You climb onto the stallion and kick it in the guts.  The stupid steed launches");
-		puts("forward through bush and fern.  You are thrown and the horse gallups off.");
+		puts("forward through bush and fern.  You are thrown and the horse gallops off.");
 		clearbit(location[position].objects, HORSE);
 		while (!(position = rnd(NUMOFROOMS + 1)) || !OUTSIDE || !beenthere[position] || location[position].flyhere);
 		setbit(location[position].objects, HORSE);
diff --git a/battlestar/com7.c b/battlestar/com7.c
index 31b4c57e..043de03c 100644
--- a/battlestar/com7.c
+++ b/battlestar/com7.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com7.c,v 1.7 2000/07/23 23:57:23 mycroft Exp $	*/
+/*	$NetBSD: com7.c,v 1.8 2000/09/10 10:51:17 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com7.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com7.c,v 1.7 2000/07/23 23:57:23 mycroft Exp $");
+__RCSID("$NetBSD: com7.c,v 1.8 2000/09/10 10:51:17 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -244,7 +244,7 @@ fighton:
 		break;
 
 	default:
-		puts("You don't have a chance, he is too quick.");
+		puts("You don't have a chance; he is too quick.");
 		break;
 
 	}
@@ -258,7 +258,7 @@ fighton:
 		return (0);
 	}
 	puts("He attacks...");
-	/* some embellisments */
+	/* Some embellishments. */
 	hurt = rnd(NUMOFINJURIES) - (testbit(inven, SHIELD) != 0) - (testbit(wear, MAIL) != 0) - (testbit(wear, HELM) != 0);
 	hurt += (testbit(wear, AMULET) != 0) + (testbit(wear, MEDALION) != 0) + (testbit(wear, TALISMAN) != 0);
 	hurt = hurt < 0 ? 0 : hurt;
diff --git a/battlestar/cypher.c b/battlestar/cypher.c
index f2dfc1e8..51330f18 100644
--- a/battlestar/cypher.c
+++ b/battlestar/cypher.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cypher.c,v 1.12 2000/09/08 17:25:32 jsm Exp $	*/
+/*	$NetBSD: cypher.c,v 1.13 2000/09/10 10:51:17 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cypher.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: cypher.c,v 1.12 2000/09/08 17:25:32 jsm Exp $");
+__RCSID("$NetBSD: cypher.c,v 1.13 2000/09/10 10:51:17 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -370,7 +370,7 @@ cypher()
 			break;
 
 		case SAVE:
-			printf("\nSave file name (default %s) ",
+			printf("\nSave file name (default %s): ",
 			       DEFAULT_SAVE_FILE);
 			filename = fgetln(stdin, &filename_len);
 			if (filename_len == 0