diff --git a/dat/data.base b/dat/data.base index 1bf2f55c9..f09fabf97 100644 --- a/dat/data.base +++ b/dat/data.base @@ -2660,9 +2660,6 @@ newt [ Macbeth, by William Shakespeare ] ninja-to A Japanese broadsword. -nori - Thin dry sheets of seaweed used in Japanese cooking. It is mainly - used to wrap sushi and as garnish for other cold presentations. *norn The Norns were the three Norse Fates, or the goddesses of fate. Female giants, they brought the wonderful Golden Age to an end. diff --git a/doc/fixes34.0 b/doc/fixes34.0 index c95f50c76..6015622c1 100644 --- a/doc/fixes34.0 +++ b/doc/fixes34.0 @@ -452,6 +452,7 @@ iron bars should affect wall corner wallification potion of polymorph shouldn't be identified if object being dipped into it ends up as the same type of object after polymorphing don't slap against the floor while riding and eating bad food +got rid of "nori" (since it doesn't really translate "kelp frond" accurately) Platform- and/or Interface-Specific Fixes diff --git a/src/objnam.c b/src/objnam.c index f4e8b39b0..52f9aed7e 100644 --- a/src/objnam.c +++ b/src/objnam.c @@ -47,7 +47,6 @@ STATIC_OVL struct Jitem Japanese_items[] = { { HELMET, "kabuto" }, { LEATHER_GLOVES, "yugake" }, { FOOD_RATION, "gunyoki" }, - { KELP_FROND, "nori" }, { POT_BOOZE, "sake" }, {0, "" } }; @@ -1209,8 +1208,7 @@ const char *oldstr; (len >= 3 && !strcmp(spot-2, " ya")) || (len >= 4 && (!strcmp(spot-3, "fish") || !strcmp(spot-3, "tuna") || - !strcmp(spot-3, "deer") || !strcmp(spot-3, "yaki") || - !strcmp(spot-3, "nori"))) || + !strcmp(spot-3, "deer") || !strcmp(spot-3, "yaki"))) || (len >= 5 && (!strcmp(spot-4, "sheep") || !strcmp(spot-4, "ninja") || !strcmp(spot-4, "ronin") ||