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
This commit is contained in:
PatR
2022-09-27 13:32:51 -07:00
parent a9436f1311
commit 8509951291
7 changed files with 11 additions and 8 deletions
+3 -2
View File
@@ -973,8 +973,9 @@ FOOD("meatball", 0, 1, 1, 0, FLESH, 5, CLR_BROWN,
MEATBALL), MEATBALL),
FOOD("meat stick", 0, 1, 1, 0, FLESH, 5, CLR_BROWN, FOOD("meat stick", 0, 1, 1, 0, FLESH, 5, CLR_BROWN,
MEAT_STICK), MEAT_STICK),
FOOD("huge chunk of meat", 0, 20,400, 0, FLESH,2000, CLR_BROWN, /* formerly "huge chunk of meat" */
HUGE_CHUNK_OF_MEAT), FOOD("enormous meatball", 0, 20,400, 0, FLESH,2000, CLR_BROWN,
ENORMOUS_MEATBALL),
/* special case because it's not mergable */ /* special case because it's not mergable */
OBJECT(OBJ("meat ring", NoDes), OBJECT(OBJ("meat ring", NoDes),
BITS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FLESH), BITS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FLESH),
+1 -1
View File
@@ -761,7 +761,7 @@ engulfer_digests_food(struct obj *obj)
corpse, glob, or meat <item> but not other types of food */ corpse, glob, or meat <item> but not other types of food */
if (digests(u.ustuck->data) if (digests(u.ustuck->data)
&& (obj->otyp == CORPSE || obj->globby && (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)) { || obj->otyp == MEAT_RING || obj->otyp == MEAT_STICK)) {
boolean could_petrify = FALSE, boolean could_petrify = FALSE,
could_poly = FALSE, could_slime = FALSE, could_poly = FALSE, could_slime = FALSE,
+1 -1
View File
@@ -954,7 +954,7 @@ dogfood(struct monst *mon, struct obj *obj)
case MEATBALL: case MEATBALL:
case MEAT_RING: case MEAT_RING:
case MEAT_STICK: case MEAT_STICK:
case HUGE_CHUNK_OF_MEAT: case ENORMOUS_MEATBALL:
return carni ? DOGFOOD : MANFOOD; return carni ? DOGFOOD : MANFOOD;
case EGG: case EGG:
return carni ? CADAVER : MANFOOD; return carni ? CADAVER : MANFOOD;
+1 -1
View File
@@ -2014,7 +2014,7 @@ fprefx(struct obj *otmp)
goto give_feedback; goto give_feedback;
case MEATBALL: case MEATBALL:
case MEAT_STICK: case MEAT_STICK:
case HUGE_CHUNK_OF_MEAT: case ENORMOUS_MEATBALL:
case MEAT_RING: case MEAT_RING:
goto give_feedback; goto give_feedback;
case CLOVE_OF_GARLIC: case CLOVE_OF_GARLIC:
+1 -1
View File
@@ -1276,7 +1276,7 @@ hits_bars(
hits = TRUE; hits = TRUE;
else else
hits = (obj_type == MEAT_STICK hits = (obj_type == MEAT_STICK
|| obj_type == HUGE_CHUNK_OF_MEAT); || obj_type == ENORMOUS_MEATBALL);
break; break;
case SPBOOK_CLASS: case SPBOOK_CLASS:
case WAND_CLASS: case WAND_CLASS:
+3 -1
View File
@@ -3084,6 +3084,8 @@ static const struct alt_spellings {
{ "lembas", LEMBAS_WAFER }, { "lembas", LEMBAS_WAFER },
{ "cookie", FORTUNE_COOKIE }, { "cookie", FORTUNE_COOKIE },
{ "pie", CREAM_PIE }, { "pie", CREAM_PIE },
{ "huge meatball", ENORMOUS_MEATBALL }, /* likely conflated name */
{ "huge chunk of meat", ENORMOUS_MEATBALL }, /* original name */
{ "marker", MAGIC_MARKER }, { "marker", MAGIC_MARKER },
{ "hook", GRAPPLING_HOOK }, { "hook", GRAPPLING_HOOK },
{ "grappling iron", 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 type ooze/pudding/slime don't match glob of same since that
ought to match "corpse/egg/figurine of type" too but won't */ ought to match "corpse/egg/figurine of type" too but won't */
|| (check_of || (check_of
&& i != BELL_OF_OPENING && i != HUGE_CHUNK_OF_MEAT && i != BELL_OF_OPENING
&& (i < minglob || i > maxglob) && (i < minglob || i > maxglob)
&& (of = strstri(zn, " of ")) != 0 && (of = strstri(zn, " of ")) != 0
&& wishymatch(name, of + 4, FALSE)) /* partial name */ && wishymatch(name, of + 4, FALSE)) /* partial name */
+1 -1
View File
@@ -1873,7 +1873,7 @@ stone_to_flesh_obj(struct obj *obj)
case ROCK_CLASS: /* boulders and statues */ case ROCK_CLASS: /* boulders and statues */
case TOOL_CLASS: /* figurines */ case TOOL_CLASS: /* figurines */
if (obj->otyp == BOULDER) { if (obj->otyp == BOULDER) {
obj = poly_obj(obj, HUGE_CHUNK_OF_MEAT); obj = poly_obj(obj, ENORMOUS_MEATBALL);
smell = TRUE; smell = TRUE;
} else if (obj->otyp == STATUE || obj->otyp == FIGURINE) { } else if (obj->otyp == STATUE || obj->otyp == FIGURINE) {
ptr = &mons[obj->corpsenm]; ptr = &mons[obj->corpsenm];