Skip to content

Commit

Permalink
rename "huge chunk of meat" to "enormous meatball"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
PatR committed Sep 27, 2022
1 parent a9436f1 commit 8509951
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
5 changes: 3 additions & 2 deletions include/objects.h
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion src/do.c
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/dog.c
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/eat.c
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/mthrowu.c
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion src/objnam.c
Expand Up @@ -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 },
Expand Down Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion src/zap.c
Expand Up @@ -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];
Expand Down

0 comments on commit 8509951

Please sign in to comment.