diff --git a/include/objects.h b/include/objects.h index d489157dc..cc2a72bd6 100644 --- 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 6137d6aac..b9dde1656 100644 --- a/src/do.c +++ b/src/do.c @@ -761,7 +761,7 @@ engulfer_digests_food(struct obj *obj) corpse, glob, or meat 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 f292140da..7837da256 100644 --- 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 8b1c53536..c6f3f9a97 100644 --- 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 24434eced..d595e37ed 100644 --- 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 165b7b07d..97ddd7f2a 100644 --- 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 5e18c01a8..224b2d1b4 100644 --- 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];