Bugfix: Eth+EotO as a Monk+Orthos could cause too high vision radius

Myrmidons and several other monsters don't have proper pluralizations, so let's give 'em some.

dat/data.base

@@ -4654,8 +4654,10 @@ illurien of the myriad glimpses
 			Monster Manual V ]
 ilmater
 	Ilmater is the god of endurance, martyrdom, perseverence,
-	suffering, the oppressed, and the persecuted. His 
-	followers seek to ease the suffering of others, and were taught th.
+	suffering, the oppressed, and the persecuted. His followers
+	seek to ease the suffering of others, and were taught to halt
+	and relieve the suffering of others, and to take that suffering
+	upon themselves if they must.
 		[ Adapted from the Forgotten Realms wiki ]
 # takes "imp or minor demon" when specifying "i"
 imp

include/vision.h

@@ -76,7 +76,7 @@ extern char *viz_rmax;			/* max could see indices */
 /*
  *  Circle information
  */
-#define MAX_RADIUS 30	/* this is in points from the source */
+#define MAX_RADIUS 32	/* this is in points from the source */
 
 /* Use this macro to get a list of distances of the edges (see vision.c). */
 #define circle_ptr(z) (&circle_data[(int)circle_start[z]])

include/you.h

@@ -1005,7 +1005,7 @@ struct you {
 	long mutations[MUTATION_LISTSIZE];
 };	/* end of `struct you' */
 #define uclockwork ((Race_if(PM_CLOCKWORK_AUTOMATON) && !Upolyd) || (Upolyd && youmonst.data->mtyp == PM_CLOCKWORK_AUTOMATON))
-#define uandroid (((Race_if(PM_ANDROID) || Race_if(PM_PARASITIZED_ANDROID)) && !Upolyd) || (Upolyd && (youmonst.data->mtyp == PM_ANDROID || youmonst.data->mtyp == PM_GYNOID || youmonst.data->mtyp == PM_OPERATOR || youmonst.data->mtyp == PM_COMMANDER)))
+#define uandroid (is_android(youracedata))
 #define umechanoid (uclockwork || uandroid)
 //BAB
 #define BASE_ATTACK_BONUS(wep)	((Role_if(PM_BARBARIAN) || Role_if(PM_ANACHRONOUNBINDER) || Role_if(PM_CONVICT) || Role_if(PM_KNIGHT) || Role_if(PM_ANACHRONONAUT) || \

src/eat.c

@@ -4623,7 +4623,7 @@ floorfood(	/* get food from floor or pack */
 		Sprintf(qbuf, "There is a bear trap here (%s); eat it?",
 			(u.utrap && u.utraptype == TT_BEARTRAP) ?
 				"holding you" : "armed");
-		if ((c = yn(qbuf)) == 'y') {
+		if ((c = yn_function(qbuf,ynqchars,'n')) == 'y') {
 		    u.utrap = u.utraptype = 0;
 		    deltrap(ttmp);
 		    return mksobj(BEARTRAP, NO_MKOBJ_FLAGS);
@@ -4640,7 +4640,7 @@ floorfood(	/* get food from floor or pack */
 		else
 		    Sprintf(qbuf, "There are %ld gold pieces here; eat them?",
 			    gold->quan);
-		if ((c = yn(qbuf)) == 'y') {
+		if ((c = yn_function(qbuf,ynqchars,'n')) == 'y') {
 		    return gold;
 		} else if (c == 'q') {
 		    return (struct obj *)0;
@@ -4658,7 +4658,7 @@ floorfood(	/* get food from floor or pack */
 				otense(otmp, "are"),
 				doname(otmp), verb,
 				(otmp->quan == 1L) ? "it" : "one");
-			if((c = yn(qbuf)) == 'y')
+			if((c = yn_function(qbuf,ynqchars,'n')) == 'y')
 				return(otmp);
 			else if(c == 'q')
 				return((struct obj *) 0);

src/mon.c

@@ -5330,7 +5330,7 @@ corpse_chance(
 				struct monst *mtmp, *mtmp2;
 				if(mon->mcan){
 					char buf[BUFSZ];
-					Sprintf(buf, "%s croaks out a horse shriek.", Monnam(mon)); //Monnam and mon_nam share a buffer and can't be used on the same line.
+					Snprintf(buf, BUFSZ, "%s croaks out a hoarse shriek.", Monnam(mon)); //Monnam and mon_nam share a buffer and can't be used on the same line.
 					pline("%s  It seems %s has a sore throat!", buf, mon_nam(mon));
 					return FALSE;
 				}

src/mondata.c

@@ -2832,6 +2832,11 @@ name_to_mon(const char *in_str)
 		{ "wererat (human)",	PM_HUMAN_WERERAT },
 		{ "werejackal (human)",	PM_HUMAN_WEREJACKAL },
 		{ "werewolf (human)",	PM_HUMAN_WEREWOLF },
+	    /* and now the dnh specific stuff */
+	    /* myrmidon monster names are from Greek, so use appropriate plurals */
+		{ "myrmidon lochies",	PM_MYRMIDON_LOCHIAS },
+		{ "myrmidon ypolochagoi",	PM_MYRMIDON_YPOLOCHAGOS },
+		{ "myrmidon lochagoi",	PM_MYRMIDON_LOCHAGOS },
 	    /* end of list */
 		{ 0, 0 }
 	};

src/vision.c

@@ -53,7 +53,9 @@ char circle_data[] = {
 /*405*/28,28,28,28,28,28,27,27,27,27,26,26,25,25,24,24,23,22,22,21,20,19,18,16,15,13,11,9,5,
 /*434*/29,29,29,29,29,29,28,28,28,28,27,27,26,26,25,25,24,24,23,22,21,20,19,18,17,15,13,11,9,5,
 /*464*/30,30,30,30,30,30,29,29,29,29,28,28,28,27,27,26,25,25,24,23,23,22,21,20,18,17,15,14,12,9,5,
-/*495*/ 31 /* should be MAX_RADIUS+1; used to terminate range loops -dlc */
+/*495*/31,31,31,31,31,31,30,30,30,30,29,29,29,28,28,27,27,26,25,25,24,23,22,21,20,19,17,16,14,12,9,5,
+/*527*/32,32,32,32,32,32,31,31,31,31,30,30,30,29,29,28,28,27,27,26,25,24,23,22,21,20,19,18,16,14,12,9,5,
+/*560*/ 33 /* should be MAX_RADIUS+1; used to terminate range loops -dlc */
 };
 
 /*
@@ -92,6 +94,8 @@ int circle_start[] = {
 /*28*/	405,
 /*29*/	434,
 /*30*/	464,
+/*31*/	495,
+/*32*/	527,
 };
 
 

util/make-circle-data.lisp

@@ -0,0 +1,34 @@
+;;;; SPDX-FileCopyrightText: 2024 Ron Nazarov
+;;;; SPDX-License-Identifier: NGPL OR GPL-2.0-or-later
+
+;;;; This is the script used to generate the circle_data[] array in vision.c.
+;;;; You do not need to run this unless you want to modify circle_data[].
+;;;; How to use:
+;;;; - Run with any Common Lisp implementation
+;;;; - Copy/paste the output into vision.c
+;;;; - Don't forget to also update MAX_RADIUS and circle_start[]
+
+(defun circle-limit-offset (max-radius current-radius)
+  (floor (sqrt (- (+ (expt max-radius 2) max-radius) (expt current-radius 2)))))
+
+(defun make-circle-data (max-radius)
+  (loop for max-radius from 1 to max-radius
+	collect (loop for current-radius from 0 to max-radius
+		      collect (circle-limit-offset max-radius current-radius))))
+
+(defun print-circle-data (data)
+  (let ((absolute-index 0)
+	(max-radius (length (car (last data)))))
+    (format t "char circle_data[] = {~%")
+    (loop for line in data
+	  do (loop for relative-index from 0
+		   for num in line
+		   do (if (= relative-index 0)
+			  (format t "/*~3d*/~2d," absolute-index num)
+			  (format t "~d," num))
+		      (incf absolute-index))
+	     (terpri))
+    (format t "/*~3d*/ ~d /* should be MAX_RADIUS+1; used to terminate range loops -dlc */~%};~%"
+	    absolute-index max-radius)))
+
+(print-circle-data (make-circle-data 32))