ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/readable.C
(Generate patch)

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.25 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.37 by root, Mon Sep 29 10:32:50 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* This file contains code relevant to the BOOKS hack -- designed 24/* This file contains code relevant to the BOOKS hack -- designed
26 * to allow randomly occuring messages in non-magical texts. 25 * to allow randomly occuring messages in non-magical texts.
27 */ 26 */
… …
435 * Be careful to keep the order. If you add readable subtype, add them 434 * Be careful to keep the order. If you add readable subtype, add them
436 * at the bottom of the list. Never delete a subtype because index is used as 435 * at the bottom of the list. Never delete a subtype because index is used as
437 * subtype paramater in arch files! 436 * subtype paramater in arch files!
438 */ 437 */
439static readable_message_type readable_message_types[] = { 438static readable_message_type readable_message_types[] = {
440 /*subtype 0 */ {0, 0}, 439 /*subtype 0 */ {0, 0, "info"},
441 /* book messages subtypes */ 440 /* book messages subtypes */
442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1}, 441 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1, "readable-book-clasp-1"},
443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2}, 442 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2, "readable-book-clasp-2"},
444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1}, 443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1, "readable-book-elegant-1"},
445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1}, 445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1, "readable-book-quarto-1"},
447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2}, 446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2, "readable-book-quarto-2"},
448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER}, 447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER, "readable-book-spell-evocation"},
449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER}, 448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER, "readable-book-spell-praying"},
450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO}, 449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO, "readable-book-spell-pyromancy"},
451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER}, 450 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER, "readable-book-spell-sorcery"},
452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER}, 451 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER, "readable-book-spell-summoning"},
453 /* card messages subtypes */ 452 /* card messages subtypes */
454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1}, 453 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1, "readable-card-simple-1"},
455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2}, 454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2, "readable-card-simple-2"},
456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3}, 455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3, "readable-card-simple-3"},
457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1}, 456 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1, "readable-card-elegant-1"},
458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2}, 457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2, "readable-card-elegant-2"},
459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3}, 458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3, "readable-card-elegant-3"},
460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1}, 459 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1, "readable-card-strange-1"},
461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2}, 460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2, "readable-card-strange-2"},
462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3}, 461 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3, "readable-card-strange-3"},
463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1}, 462 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1, "readable-card-money-1"},
464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2}, 463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2, "readable-card-money-2"},
465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3}, 464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3, "readable-card-money-3"},
466 465
467 /* Paper messages subtypes */ 466 /* Paper messages subtypes */
468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1}, 467 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1, "readable-paper-note-1"},
469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2}, 468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2, "readable-paper-note-2"},
470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3}, 469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3, "readable-paper-note-3"},
471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1}, 470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1, "readable-paper-letter-old-1"},
472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2}, 471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2, "readable-paper-letter-old-2"},
473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1}, 472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1, "readable-paper-letter-new-1"},
474 /*subtype 30 */ {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_2}, 473 /*subtype 30 */ {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_2, "readable-paper-letter-new-2"},
475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1}, 474 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1, "readable-paper-envelope-1"},
476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2}, 475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2, "readable-paper-envelope-2"},
477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1}, 476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1, "readable-paper-scroll-old-1"},
478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2}, 477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2, "readable-paper-scroll-old-2"},
479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1}, 478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1, "readable-paper-scroll-new-1"},
480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2}, 479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2, "readable-paper-scroll-new-2"},
481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC}, 480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC, "readable-paper-scroll-magic"},
482 481
483 /* road signs messages subtypes */ 482 /* road signs messages subtypes */
484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC}, 483 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC, "readable-sign-basic"},
485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT}, 484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT, "readable-sign-dir-left"},
486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT}, 485 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT, "readable-sign-dir-right"},
487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH}, 486 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH, "readable-sign-dir-both"},
488 487
489 /* stones and monument messages */ 488 /* stones and monument messages */
490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1}, 489 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1, "readable-monument-stone-1"},
491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2}, 490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2, "readable-monument-stone-2"},
492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3}, 491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3, "readable-monument-stone-3"},
493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1}, 492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1, "readable-monument-statue-1"},
494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2}, 493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2, "readable-monument-statue-2"},
495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3}, 494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3, "readable-monument-statue-3"},
496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1}, 495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1, "readable-monument-gravestone-1"},
497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2}, 496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2, "readable-monument-gravestone-2"},
498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3}, 497 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1}, 498 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2}, 499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3} 500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
502}; 501};
503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 502int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
504 503
505static int max_titles[6] = { 504static int max_titles[6] = {
506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 505 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
… …
748 if (did_init_mon_info) 747 if (did_init_mon_info)
749 return; 748 return;
750 749
751 did_init_mon_info = 1; 750 did_init_mon_info = 1;
752 751
753 752 for_all_archetypes (at)
754 for (at = first_archetype; at != NULL; at = at->next)
755 { 753 {
756 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 754 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE)))
757 { 755 {
758 objectlink *mon = new objectlink; 756 objectlink *mon = new objectlink;
759 757
760 mon->ob = &at->clone; 758 mon->ob = at;
761 mon->next = first_mon_info; 759 mon->next = first_mon_info;
762 first_mon_info = mon; 760 first_mon_info = mon;
763 nrofmon++; 761 nrofmon++;
764 } 762 }
765 } 763 }
… …
969 t = get_empty_book (); 967 t = get_empty_book ();
970 t->name = book->name; 968 t->name = book->name;
971 t->authour = book->title; 969 t->authour = book->title;
972 t->size = strlen (book->msg); 970 t->size = strlen (book->msg);
973 t->msg_index = strtoint (book->msg); 971 t->msg_index = strtoint (book->msg);
974 t->archname = book->arch->name; 972 t->archname = book->arch->archname;
975 t->level = book->level; 973 t->level = book->level;
976 974
977 t->next = tl->first_book; 975 t->next = tl->first_book;
978 tl->first_book = t; 976 tl->first_book = t;
979 tl->number++; 977 tl->number++;
… …
1003{ 1001{
1004 int nbr = sizeof (book_descrpt) / sizeof (char *); 1002 int nbr = sizeof (book_descrpt) / sizeof (char *);
1005 1003
1006 switch (book->type) 1004 switch (book->type)
1007 { 1005 {
1008 case BOOK: 1006 case BOOK:
1009 { 1007 {
1010 titlelist *tl = get_titlelist (msgtype); 1008 titlelist *tl = get_titlelist (msgtype);
1011 title *t = NULL; 1009 title *t = NULL;
1012 int tries = 0; 1010 int tries = 0;
1013 1011
1014 /* look to see if our msg already been archived. If so, alter 1012 /* look to see if our msg already been archived. If so, alter
1015 * the book to match the archival text. If we fail to match, 1013 * the book to match the archival text. If we fail to match,
1016 * then we archive the new title/name/msg combo if there is 1014 * then we archive the new title/name/msg combo if there is
1017 * room on the titlelist. 1015 * room on the titlelist.
1018 */ 1016 */
1019 1017
1020 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1018 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1021 { 1019 {
1022 object *tmpbook;
1023
1024 /* alter book properties */ 1020 /* alter book properties */
1025 if ((tmpbook = get_archetype (t->archname)) != NULL) 1021 if (object *tmpbook = get_archetype (t->archname))
1022 {
1023 tmpbook->msg = book->msg;
1024 tmpbook->copy_to (book);
1025 tmpbook->destroy ();
1026 }
1027
1028 book->title = t->authour;
1029 book->name = t->name;
1030 book->level = t->level;
1031 }
1032 /* Don't have any default title, so lets make up a new one */
1033 else
1034 {
1035 int numb, maxnames = max_titles[msgtype];
1036 const char *old_title;
1037 const char *old_name;
1038
1039 old_title = book->title;
1040 old_name = book->name;
1041
1042 /* some pre-generated books have title already set (from
1043 * maps), also don't bother looking for unique title if
1044 * we already used up all the available names! */
1045
1046 if (!tl)
1047 {
1048 LOG (llevError, "change_book_name(): can't find title list\n");
1049 numb = 0;
1050 }
1051 else
1052 numb = tl->number;
1053
1054 if (numb == maxnames)
1055 {
1056#ifdef ARCHIVE_DEBUG
1057 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1058#endif
1059 break;
1060 }
1061 /* shouldnt change map-maker books */
1062 else if (!book->title)
1063 do
1026 { 1064 {
1027 tmpbook->msg = book->msg; 1065 /* random book name */
1028 tmpbook->copy_to (book); 1066 new_text_name (book, msgtype);
1029 tmpbook->destroy (); 1067 add_author (book, msgtype); /* random author */
1068 tries++;
1030 } 1069 }
1070 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1031 1071
1032 book->title = t->authour; 1072 /* Now deal with 2 cases.
1033 book->name = t->name; 1073 * 1)If no space for a new title exists lets just restore
1034 book->level = t->level; 1074 * the old book properties. Remember, if the book had
1075 * matchd an older entry on the titlelist, we shouldnt
1076 * have called this routine in the first place!
1077 * 2) If we got a unique title, we need to add it to
1078 * the list.
1035 } 1079 */
1036 /* Don't have any default title, so lets make up a new one */
1037 else
1038 {
1039 int numb, maxnames = max_titles[msgtype];
1040 const char *old_title;
1041 const char *old_name;
1042 1080
1043 old_title = book->title; 1081 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1044 old_name = book->name; 1082 { /* got to check maxnames again */
1045
1046 /* some pre-generated books have title already set (from
1047 * maps), also don't bother looking for unique title if
1048 * we already used up all the available names! */
1049
1050 if (!tl)
1051 {
1052 LOG (llevError, "change_book_name(): can't find title list\n");
1053 numb = 0;
1054 }
1055 else
1056 numb = tl->number;
1057
1058 if (numb == maxnames)
1059 {
1060#ifdef ARCHIVE_DEBUG 1083#ifdef ARCHIVE_DEBUG
1061 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1084 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1062#endif 1085#endif
1063 break; 1086 /* restore old book properties here */
1064 } 1087 book->title = old_title;
1065 /* shouldnt change map-maker books */ 1088
1066 else if (!book->title) 1089 if (RANDOM () % 4)
1067 do
1068 { 1090 {
1069 /* random book name */ 1091 /* Lets give the book a description to individualize it some */
1070 new_text_name (book, msgtype); 1092 char new_name[MAX_BUF];
1071 add_author (book, msgtype); /* random author */ 1093
1072 tries++; 1094 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1095
1096 book->name = new_name;
1073 } 1097 }
1074 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1075
1076 /* Now deal with 2 cases.
1077 * 1)If no space for a new title exists lets just restore
1078 * the old book properties. Remember, if the book had
1079 * matchd an older entry on the titlelist, we shouldnt
1080 * have called this routine in the first place!
1081 * 2) If we got a unique title, we need to add it to
1082 * the list.
1083 */
1084
1085 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1086 { /* got to check maxnames again */
1087#ifdef ARCHIVE_DEBUG
1088 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1089#endif
1090 /* restore old book properties here */
1091 book->title = old_title;
1092
1093 if (RANDOM () % 4)
1094 {
1095 /* Lets give the book a description to individualize it some */
1096 char new_name[MAX_BUF];
1097
1098 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1099
1100 book->name = new_name;
1101 }
1102 else 1098 else
1103 { 1099 {
1104 book->name = old_name; 1100 book->name = old_name;
1105 } 1101 }
1106 } 1102 }
1107 else if (book->title && strlen (book->msg) > 5) 1103 else if (book->title && strlen (book->msg) > 5)
1108 { /* archive if long msg texts */ 1104 { /* archive if long msg texts */
1109 add_book_to_list (book, msgtype); 1105 add_book_to_list (book, msgtype);
1110 } 1106 }
1111 } 1107 }
1112 break; 1108 break;
1113 } 1109 }
1114 1110
1115 default: 1111 default:
1116 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1112 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1117 return; 1113 return;
1118 } 1114 }
1119} 1115}
1120 1116
1121/***************************************************************************** 1117/*****************************************************************************
1122 * 1118 *
… …
1442 if (path == -1) 1438 if (path == -1)
1443 strcat (retbuf, "having no known spell path.\n"); 1439 strcat (retbuf, "having no known spell path.\n");
1444 else 1440 else
1445 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1441 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]);
1446 1442
1447 for (at = first_archetype; at != NULL; at = at->next) 1443 for_all_archetypes (at)
1448 { 1444 {
1449 /* Determine if this is an appropriate spell. Must 1445 /* Determine if this is an appropriate spell. Must
1450 * be of matching path, must be of appropriate type (prayer 1446 * be of matching path, must be of appropriate type (prayer
1451 * or not), and must be within the valid level range. 1447 * or not), and must be within the valid level range.
1452 */ 1448 */
1453 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1449 if (at->type == SPELL && at->path_attuned & pnum &&
1454 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1450 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1455 { 1451 {
1456 assign (tmpbuf, at->clone.name); 1452 assign (tmpbuf, at->object::name);
1457 1453
1458 if (book_overflow (retbuf, tmpbuf, booksize)) 1454 if (book_overflow (retbuf, tmpbuf, booksize))
1459 break; 1455 break;
1460 else 1456 else
1461 { 1457 {
… …
1535 1531
1536 /* preamble */ 1532 /* preamble */
1537 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1533 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1538 1534
1539 if ((at = archetype::find (op_name)) != (archetype *) NULL) 1535 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1540 op_name = at->clone.name; 1536 op_name = at->object::name;
1541 else 1537 else
1542 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1538 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1543 1539
1544 /* item name */ 1540 /* item name */
1545 if (strcmp (formula->title, "NONE")) 1541 if (strcmp (formula->title, "NONE"))
… …
1555 } 1551 }
1556 else 1552 else
1557 { 1553 {
1558 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1554 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1559 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1555 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name);
1560 if (at->clone.title) 1556 if (at->title)
1561 { 1557 {
1562 strcat (retbuf, " "); 1558 strcat (retbuf, " ");
1563 strcat (retbuf, at->clone.title); 1559 strcat (retbuf, at->title);
1564 strcat (title, " "); 1560 strcat (title, " ");
1565 strcat (title, at->clone.title); 1561 strcat (title, at->title);
1566 } 1562 }
1567 } 1563 }
1568 /* Lets name the book something meaningful ! */ 1564 /* Lets name the book something meaningful ! */
1569 book->name = title; 1565 book->name = title;
1570 book->title = NULL; 1566 book->title = NULL;
… …
1576 archetype *at; 1572 archetype *at;
1577 1573
1578 at = archetype::find (formula->cauldron); 1574 at = archetype::find (formula->cauldron);
1579 1575
1580 sprintf (retbuf + strlen (retbuf), 1576 sprintf (retbuf + strlen (retbuf),
1581 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1577 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place");
1582 1578
1583 for (next = formula->ingred; next != NULL; next = next->next) 1579 for (next = formula->ingred; next != NULL; next = next->next)
1584 { 1580 {
1585 strcat (retbuf, next->name); 1581 strcat (retbuf, next->name);
1586 strcat (retbuf, "\n"); 1582 strcat (retbuf, "\n");
… …
1592 strcat (retbuf, "\n"); 1588 strcat (retbuf, "\n");
1593 1589
1594 book->msg = retbuf; 1590 book->msg = retbuf;
1595 } 1591 }
1596} 1592}
1593
1594#define DESCRIBE_PATH(retbuf, variable, name) \
1595 if(variable) { \
1596 int i,j=0; \
1597 strcat(retbuf,"(" name ": "); \
1598 for(i=0; i<NRSPELLPATHS; i++) \
1599 if(variable & (1<<i)) { \
1600 if (j) \
1601 strcat(retbuf,", "); \
1602 else \
1603 j = 1; \
1604 strcat(retbuf, spellpathnames[i]); \
1605 } \
1606 strcat(retbuf,")"); \
1607 }
1597 1608
1598/* god_info_msg() - generate a message detailing the properties 1609/* god_info_msg() - generate a message detailing the properties
1599 * of a random god. Used by the book hack. b.t. 1610 * of a random god. Used by the book hack. b.t.
1600 */ 1611 */
1601const char * 1612const char *
… …
1630 1641
1631 /* Information about the god is random, and based on the level of the 1642 /* Information about the god is random, and based on the level of the
1632 * 'book'. Probably there is a more intellegent way to implement 1643 * 'book'. Probably there is a more intellegent way to implement
1633 * this ... 1644 * this ...
1634 */ 1645 */
1635
1636 while (level > 0) 1646 while (level > 0)
1637 { 1647 {
1638 sprintf (buf, " "); 1648 sprintf (buf, " ");
1639 if (level == 2 && RANDOM () % 2) 1649 if (level == 2 && RANDOM () % 2)
1640 { /* enemy god */ 1650 { /* enemy god */
… …
1844 * 2) make sure there is an entry in max_titles[] array. 1854 * 2) make sure there is an entry in max_titles[] array.
1845 * 3) make sure there are entries for your case in new_text_title() 1855 * 3) make sure there are entries for your case in new_text_title()
1846 * and add_authour(). 1856 * and add_authour().
1847 * 4) you may want separate authour/book name arrays in read.h 1857 * 4) you may want separate authour/book name arrays in read.h
1848 */ 1858 */
1849
1850 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1859 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 8);
1851 switch (msg_type) 1860 switch (msg_type)
1852 { 1861 {
1853 case 1: /* monster attrib */ 1862 case 1: /* monster attrib */
1854 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1863 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1855 break; 1864 break;
… …
1879 { 1888 {
1880 book->msg = msgbuf; 1889 book->msg = msgbuf;
1881 /* lets give the "book" a new name, which may be a compound word */ 1890 /* lets give the "book" a new name, which may be a compound word */
1882 change_book (book, msg_type); 1891 change_book (book, msg_type);
1883 } 1892 }
1884
1885} 1893}
1886 1894
1887 1895
1888/***************************************************************************** 1896/*****************************************************************************
1889 * 1897 *
… …
1984get_readable_message_type (object *readable) 1992get_readable_message_type (object *readable)
1985{ 1993{
1986 uint8 subtype = readable->subtype; 1994 uint8 subtype = readable->subtype;
1987 1995
1988 if (subtype > last_readable_subtype) 1996 if (subtype > last_readable_subtype)
1989 return &(readable_message_types[0]); 1997 return &readable_message_types[0];
1998
1990 return &(readable_message_types[subtype]); 1999 return &readable_message_types[subtype];
1991} 2000}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines