Allow for bathing goddess in love(); give better message for a lover

that isn't present and for certain choices of lover.  From OpenBSD.

1 files changed, 24 insertions, 13 deletions

diff --git a/battlestar/com5.c b/battlestar/com5.c
index b8f32a79..8be78a8c 100644
--- a/battlestar/com5.c
+++ b/battlestar/com5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com5.c,v 1.14 2000/09/21 09:48:10 jsm Exp $	*/
+/*	$NetBSD: com5.c,v 1.15 2000/09/23 19:51:02 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.14 2000/09/21 09:48:10 jsm Exp $");
+__RCSID("$NetBSD: com5.c,v 1.15 2000/09/23 19:51:02 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -100,8 +100,10 @@ love()
 	int     n;
 
 	while (wordtype[++wordnumber] != NOUNS && wordnumber <= wordcount);
-	if (wordtype[wordnumber] == NOUNS && testbit(location[position].objects, wordvalue[wordnumber])) {
-		if (wordvalue[wordnumber] == NORMGOD && !loved) {
+	if (wordtype[wordnumber] == NOUNS) {
+		if ((testbit(location[position].objects, BATHGOD) ||
+		    testbit(location[position].objects, NORMGOD)) &&
+		    wordvalue[wordnumber] == NORMGOD && !loved) {
 			if (godready >= 2) {
 				puts("She cuddles up to you, and her mouth starts to work:\n'That was my sister's amulet.  The lovely goddess, Purl, was she.  The Empire\ncaptured her just after the Darkness came.  My other sister, Vert, was killed\nby the Dark Lord himself.  He took her amulet and warped its power.\nYour quest was foretold by my father before he died, but to get the Dark Lord's\namulet you must use cunning and skill.  I will leave you my amulet,");
 				puts("which you may use as you wish.  As for me, I am the last goddess of the\nwaters.  My father was the Island King, and the rule is rightfully mine.'\n\nShe pulls the throne out into a large bed.");
@@ -120,21 +122,30 @@ love()
 					setbit(location[position].objects, MEDALION);
 				loved = 1;
 				ourtime += 10;
+				printf("Loved.\n");
 				zzz();
 			} else {
 				puts("You wish!");
 				return;
 			}
 		}
-		if (wordvalue[wordnumber] == NATIVE) {
-			puts("The girl is easy prey.  She peels off her sarong and indulges you.");
-			power++;
-			pleasure += 5;
-			printf("Girl:\n");
-			ourtime += 10;
-			zzz();
-		}
-		printf("Loved.\n");
+		if (testbit(location[position].objects, wordvalue[wordnumber])) {
+			if (wordvalue[wordnumber] == NATIVE) {
+				puts("The girl is easy prey.  She peels off her sarong and indulges you.");
+				power++;
+				pleasure += 5;
+				printf("Girl:\n");
+				ourtime += 10;
+				printf("Loved.\n");
+				zzz();
+			}
+			if (wordvalue[wordnumber] == MAN ||
+			    wordvalue[wordnumber] == BODY ||
+			    wordvalue[wordnumber] == ELF ||
+			    wordvalue[wordnumber] == TIMER)
+				puts("Kinky!");
+		} else
+			puts("Where's your lover?");
 	} else
 		puts("It doesn't seem to work.");
 }