rename "huge chunk of meat" to "enormous meatball"

Pull request #607 by Vivit-R proposed renaming "huge chunk of meat"
to "giant meatball" to better reflect the similarity to meatball.
But an object name that contains a monster name prefix requires extra
work in the wishing code.  I considered "huge meatball" which retains
more of the original name but decided to go with "enormous meatball"
becaues it seems more evocative.

Supersedes #607
Closes #607

diff --git a/include/objects.h b/include/objects.h
index d489157dcf93a36fcd0951a6d5b93072d8085a95..cc2a72bd6a1e0f1f6debdd0c943cf9ae0cd22be8 100644 (file)
--- a/include/objects.h
+++ b/include/objects.h
@@ -973,8 +973,9 @@ FOOD("meatball",              0,  1,  1, 0, FLESH,   5, CLR_BROWN,
                                                         MEATBALL),
 FOOD("meat stick",            0,  1,  1, 0, FLESH,   5, CLR_BROWN,
                                                         MEAT_STICK),
-FOOD("huge chunk of meat",    0, 20,400, 0, FLESH,2000, CLR_BROWN,
-                                                        HUGE_CHUNK_OF_MEAT),
+/* formerly "huge chunk of meat" */
+FOOD("enormous meatball",     0, 20,400, 0, FLESH,2000, CLR_BROWN,
+                                                        ENORMOUS_MEATBALL),
 /* special case because it's not mergable */
 OBJECT(OBJ("meat ring", NoDes),
        BITS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FLESH),

diff --git a/src/do.c b/src/do.c
index 6137d6aac463322cb16c3b804b3c85dc803dc3f0..b9dde1656db30a0c40a3899efe49eafa0eb00b85 100644 (file)
--- a/src/do.c
+++ b/src/do.c
@@ -761,7 +761,7 @@ engulfer_digests_food(struct obj *obj)
        corpse, glob, or meat <item> but not other types of food */
     if (digests(u.ustuck->data)
         && (obj->otyp == CORPSE || obj->globby
-            || obj->otyp == MEATBALL || obj->otyp == HUGE_CHUNK_OF_MEAT
+            || obj->otyp == MEATBALL || obj->otyp == ENORMOUS_MEATBALL
             || obj->otyp == MEAT_RING || obj->otyp == MEAT_STICK)) {
         boolean could_petrify = FALSE,
                 could_poly = FALSE, could_slime = FALSE,

diff --git a/src/dog.c b/src/dog.c
index f292140daf48a33f6935628448ea93ef90c4557f..7837da256381a6badb2e2f937c56361c055a9556 100644 (file)
--- a/src/dog.c
+++ b/src/dog.c
@@ -954,7 +954,7 @@ dogfood(struct monst *mon, struct obj *obj)
         case MEATBALL:
         case MEAT_RING:
         case MEAT_STICK:
-        case HUGE_CHUNK_OF_MEAT:
+        case ENORMOUS_MEATBALL:
             return carni ? DOGFOOD : MANFOOD;
         case EGG:
             return carni ? CADAVER : MANFOOD;

diff --git a/src/eat.c b/src/eat.c
index 8b1c535360013358b73ecf48470081b63e1613f2..c6f3f9a9760c351d14a11350633bb61165cf9add 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -2014,7 +2014,7 @@ fprefx(struct obj *otmp)
         goto give_feedback;
     case MEATBALL:
     case MEAT_STICK:
-    case HUGE_CHUNK_OF_MEAT:
+    case ENORMOUS_MEATBALL:
     case MEAT_RING:
         goto give_feedback;
     case CLOVE_OF_GARLIC:

diff --git a/src/mthrowu.c b/src/mthrowu.c
index 24434eced268137d81eac22de996a98e38173844..d595e37edb28c187c04614eca31b0634e1ec27c7 100644 (file)
--- a/src/mthrowu.c
+++ b/src/mthrowu.c
@@ -1276,7 +1276,7 @@ hits_bars(
                 hits = TRUE;
             else
                 hits = (obj_type == MEAT_STICK
-                        || obj_type == HUGE_CHUNK_OF_MEAT);
+                        || obj_type == ENORMOUS_MEATBALL);
             break;
         case SPBOOK_CLASS:
         case WAND_CLASS:

diff --git a/src/objnam.c b/src/objnam.c
index 165b7b07d399e99f6e298bdb6b4a02e897e4ee94..97ddd7f2a7566768b63057a5b1d925c22236e8e5 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -3084,6 +3084,8 @@ static const struct alt_spellings {
     { "lembas", LEMBAS_WAFER },
     { "cookie", FORTUNE_COOKIE },
     { "pie", CREAM_PIE },
+    { "huge meatball", ENORMOUS_MEATBALL }, /* likely conflated name */
+    { "huge chunk of meat", ENORMOUS_MEATBALL }, /* original name */
     { "marker", MAGIC_MARKER },
     { "hook", GRAPPLING_HOOK },
     { "grappling iron", GRAPPLING_HOOK },
@@ -3174,7 +3176,7 @@ rnd_otyp_by_namedesc(
                type ooze/pudding/slime don't match glob of same since that
                ought to match "corpse/egg/figurine of type" too but won't */
             || (check_of
-                && i != BELL_OF_OPENING && i != HUGE_CHUNK_OF_MEAT
+                && i != BELL_OF_OPENING
                 && (i < minglob || i > maxglob)
                 && (of = strstri(zn, " of ")) != 0
                 && wishymatch(name, of + 4, FALSE)) /* partial name */

diff --git a/src/zap.c b/src/zap.c
index 5e18c01a82fda6acb5d7a6d5d83b18e6d1c763b4..224b2d1b4f4e0f1da6bc73142ac01e906a450d75 100644 (file)
--- a/src/zap.c
+++ b/src/zap.c
@@ -1873,7 +1873,7 @@ stone_to_flesh_obj(struct obj *obj)
     case ROCK_CLASS: /* boulders and statues */
     case TOOL_CLASS: /* figurines */
         if (obj->otyp == BOULDER) {
-            obj = poly_obj(obj, HUGE_CHUNK_OF_MEAT);
+            obj = poly_obj(obj, ENORMOUS_MEATBALL);
             smell = TRUE;
         } else if (obj->otyp == STATUE || obj->otyp == FIGURINE) {
             ptr = &mons[obj->corpsenm];