diff options
| -rw-r--r-- | crawl-ref/source/itemname.cc | 11 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 22 |
2 files changed, 19 insertions, 14 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index a7ac833bcf..25e1266d1a 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1517,9 +1517,14 @@ std::string item_def::name_aux( description_level_type desc, buff << (item_typ == BOOK_MANUAL ? "manual" : "book"); else if (!know_type) { - buff << book_secondary_string(this->special / 10) - << book_primary_string(this->special % 10) - << (item_typ == BOOK_MANUAL ? "manual" : "book"); + if (item_typ == BOOK_DESTRUCTION) + buff << "ancient heavily glowing book"; + else + { + buff << book_secondary_string(this->special / 10) + << book_primary_string(this->special % 10) + << (item_typ == BOOK_MANUAL ? "manual" : "book"); + } } else if (item_typ == BOOK_MANUAL) { diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index d26828f0f7..e75112dc9d 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3111,11 +3111,11 @@ bool trog_burn_books() god_acting gdact; - for ( stack_iterator si(you.pos()); si; ++si ) + for (stack_iterator si(you.pos()); si; ++si) { - if ( si->base_type == OBJ_BOOKS - && si->sub_type != BOOK_MANUAL - && si->sub_type != BOOK_DESTRUCTION ) + if (si->base_type == OBJ_BOOKS + && si->sub_type != BOOK_MANUAL + && si->sub_type != BOOK_DESTRUCTION) { mpr("Burning your own feet might not be such a smart idea!"); return (false); @@ -3137,17 +3137,17 @@ bool trog_burn_books() int count = 0; int rarity = 0; - for ( stack_iterator si(*ri); si; ++si ) + for (stack_iterator si(*ri); si; ++si) { - if ( si->base_type != OBJ_BOOKS - || si->sub_type == BOOK_MANUAL - || si->sub_type == BOOK_DESTRUCTION ) + if (si->base_type != OBJ_BOOKS + || si->sub_type == BOOK_MANUAL + || si->sub_type == BOOK_DESTRUCTION) { continue; } // Ignore {!D} inscribed books. - if (!check_warning_inscriptions( *si, OPER_DESTROY)) + if (!check_warning_inscriptions(*si, OPER_DESTROY)) { mpr("Won't ignite {!D} inscribed book."); continue; @@ -3188,13 +3188,13 @@ bool trog_burn_books() place_cloud( CLOUD_FIRE, ri->x, ri->y, durat, KC_YOU ); mpr(count == 1 ? "The book bursts into flames." - : "The books burst into flames.", MSGCH_GOD); + : "The books burst into flames.", MSGCH_GOD); } } if (!totalpiety) { - mpr("There are no books in sight to burn!"); + mpr("There are no spellbooks in sight to burn!"); return (false); } else |