U319 - lotu juice

Valid fruit names like lotus would result in funny fruit juice names, eg
"lotu juice".  Looking at a long list of words ending in "us", the ones one
might reasonbly use for a fruit name were all singular, as were almost all
of the unreasonable words.  Changed the logic to prefer to leave "us" words
alone, except for 2 monster types that might be entered with "s" at the end.
Tengus is not correct, according to makeplural, but I put that in to be nice.

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 8963d41c42e1cf1dbb8e24de727152b01b353465..4ac8aedfba39969fdcac0fc3fa017ae9e146baf8 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -9,6 +9,7 @@ missing opthelp for use_inverse
 Never say "It moves only reluctantly"
 expert fireball/cone of cold could not target a monster seen only with
        infravision or ESP
+display "lotus juice", not "lotu juice" for the fruit juice name
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/objnam.c b/src/objnam.c
index c3dfadc4883870de6ce2fa26d95155971f26979b..cb34b45c1f532ae6c4deecb955370b01240a22b7 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -1524,6 +1524,11 @@ const char *oldstr;
                            !BSTRCMP(bp, p-6, "scales"))
                                return bp;
 
+               } else if (!BSTRCMP(bp, p-2, "us")) { /* lotus, fungus... */
+                       if (BSTRCMP(bp, p-6, "tengus") && /* but not these... */
+                           BSTRCMP(bp, p-7, "hezrous"))
+                               return bp;
+                       
                } else if (!BSTRCMP(bp, p-5, "boots") ||
                           !BSTRCMP(bp, p-9, "gauntlets") ||
                           !BSTRCMP(bp, p-6, "tricks") ||
@@ -1532,13 +1537,10 @@ const char *oldstr;
                           !BSTRCMP(bp, p-4, "ness") ||
                           !BSTRCMP(bp, p-14, "shape changers") ||
                           !BSTRCMP(bp, p-15, "detect monsters") ||
-                          !BSTRCMPI(bp, p-11, "Aesculapius") || /* staff */
-                          !BSTRCMP(bp, p-10, "eucalyptus") ||
 #ifdef WIZARD
                           !BSTRCMP(bp, p-9, "iron bars") ||
 #endif
-                          !BSTRCMP(bp, p-5, "aklys") ||
-                          !BSTRCMP(bp, p-6, "fungus"))
+                          !BSTRCMP(bp, p-5, "aklys"))
                                return bp;
        mins:
                p[-1] = '\0';