From e2fae16d2287ccb3009624e64b388ec5f1598f68 Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 24 May 2020 11:09:43 -0700 Subject: [PATCH] minor object identification wording tweak When everything is identified and you read a scroll of identify, you get |You have already identified all of your possessions. That's unchanged. Same situation, except learning scroll of identify at the time and you've just been told "this is a scroll of identify": old |You have already identified all the rest of your possessions. new |You have already identified the rest of your possessions. --- src/invent.c | 6 +++--- src/read.c | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/invent.c b/src/invent.c index 4e8c20419..0e0ccec8f 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 invent.c $NHDT-Date: 1589491665 2020/05/14 21:27:45 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.298 $ */ +/* NetHack 3.7 invent.c $NHDT-Date: 1590343765 2020/05/24 18:09:25 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.299 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Derek S. Ray, 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2402,8 +2402,8 @@ boolean learning_id; /* true if we just read unknown identify scroll */ int n, unid_cnt = count_unidentified(g.invent); if (!unid_cnt) { - You("have already identified all %sof your possessions.", - learning_id ? "the rest " : ""); + You("have already identified %s of your possessions.", + !learning_id ? "all" : "the rest"); } else if (!id_limit || id_limit >= unid_cnt) { /* identify everything */ /* TODO: use fully_identify_obj and cornline/menu/whatever here */ diff --git a/src/read.c b/src/read.c index d8062d569..353f9bac2 100644 --- a/src/read.c +++ b/src/read.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 read.c $NHDT-Date: 1583688568 2020/03/08 17:29:28 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.190 $ */ +/* NetHack 3.6 read.c $NHDT-Date: 1590343774 2020/05/24 18:09:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.197 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1166,9 +1166,10 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */ if (shop_h2o) costly_alteration(obj, COST_UNCURS); uncurse(obj); - /* if the object was known to be cursed and is now known not to be, - make the scroll known; it's trivial to identify anyway by comparing - inventory before and after */ + /* if the object was known to be cursed and is now + known not to be, make the scroll known; it's + trivial to identify anyway by comparing inventory + before and after */ if (obj->bknown && otyp == SCR_REMOVE_CURSE) { learnscrolltyp(SCR_REMOVE_CURSE); }