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.26 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.42 by sf-marcmagus, Thu Oct 15 16:00:37 2009 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 it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * 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 Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
26 * to allow randomly occuring messages in non-magical texts. 26 * to allow randomly occuring messages in non-magical texts.
27 */ 27 */
… …
435 * Be careful to keep the order. If you add readable subtype, add them 435 * 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 436 * at the bottom of the list. Never delete a subtype because index is used as
437 * subtype paramater in arch files! 437 * subtype paramater in arch files!
438 */ 438 */
439static readable_message_type readable_message_types[] = { 439static readable_message_type readable_message_types[] = {
440 /*subtype 0 */ {0, 0}, 440 /*subtype 0 */ {0, 0, "info"},
441 /* book messages subtypes */ 441 /* book messages subtypes */
442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1}, 442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1, "readable-book-clasp-1"},
443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2}, 443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2, "readable-book-clasp-2"},
444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1, "readable-book-elegant-1"},
445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2}, 445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1}, 446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1, "readable-book-quarto-1"},
447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2}, 447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2, "readable-book-quarto-2"},
448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER}, 448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER, "readable-book-spell-evocation"},
449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER}, 449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER, "readable-book-spell-praying"},
450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO}, 450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO, "readable-book-spell-pyromancy"},
451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER}, 451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER, "readable-book-spell-sorcery"},
452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER}, 452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER, "readable-book-spell-summoning"},
453 /* card messages subtypes */ 453 /* card messages subtypes */
454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1}, 454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1, "readable-card-simple-1"},
455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2}, 455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2, "readable-card-simple-2"},
456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3}, 456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3, "readable-card-simple-3"},
457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1}, 457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1, "readable-card-elegant-1"},
458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2}, 458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2, "readable-card-elegant-2"},
459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3}, 459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3, "readable-card-elegant-3"},
460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1}, 460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1, "readable-card-strange-1"},
461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2}, 461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2, "readable-card-strange-2"},
462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3}, 462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3, "readable-card-strange-3"},
463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1}, 463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1, "readable-card-money-1"},
464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2}, 464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2, "readable-card-money-2"},
465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3}, 465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3, "readable-card-money-3"},
466 466
467 /* Paper messages subtypes */ 467 /* Paper messages subtypes */
468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1}, 468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1, "readable-paper-note-1"},
469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2}, 469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2, "readable-paper-note-2"},
470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3}, 470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3, "readable-paper-note-3"},
471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1}, 471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1, "readable-paper-letter-old-1"},
472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2}, 472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2, "readable-paper-letter-old-2"},
473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1}, 473 {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}, 474 /*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}, 475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1, "readable-paper-envelope-1"},
476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2}, 476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2, "readable-paper-envelope-2"},
477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1}, 477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1, "readable-paper-scroll-old-1"},
478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2}, 478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2, "readable-paper-scroll-old-2"},
479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1}, 479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1, "readable-paper-scroll-new-1"},
480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2}, 480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2, "readable-paper-scroll-new-2"},
481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC}, 481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC, "readable-paper-scroll-magic"},
482 482
483 /* road signs messages subtypes */ 483 /* road signs messages subtypes */
484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC}, 484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC, "readable-sign-basic"},
485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT}, 485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT, "readable-sign-dir-left"},
486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT}, 486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT, "readable-sign-dir-right"},
487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH}, 487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH, "readable-sign-dir-both"},
488 488
489 /* stones and monument messages */ 489 /* stones and monument messages */
490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1}, 490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1, "readable-monument-stone-1"},
491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2}, 491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2, "readable-monument-stone-2"},
492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3}, 492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3, "readable-monument-stone-3"},
493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1}, 493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1, "readable-monument-statue-1"},
494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2}, 494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2, "readable-monument-statue-2"},
495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3}, 495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3, "readable-monument-statue-3"},
496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1}, 496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1, "readable-monument-gravestone-1"},
497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2}, 497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2, "readable-monument-gravestone-2"},
498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3}, 498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1}, 499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2}, 500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3} 501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
502}; 502};
503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
504 504
505static int max_titles[6] = { 505static int max_titles[6] = {
506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
… …
748 if (did_init_mon_info) 748 if (did_init_mon_info)
749 return; 749 return;
750 750
751 did_init_mon_info = 1; 751 did_init_mon_info = 1;
752 752
753 753 for_all_archetypes (at)
754 for (at = first_archetype; at != NULL; at = at->next)
755 { 754 {
756 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 755 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE)))
757 { 756 {
758 objectlink *mon = new objectlink; 757 objectlink *mon = new objectlink;
759 758
760 mon->ob = &at->clone; 759 mon->ob = at;
761 mon->next = first_mon_info; 760 mon->next = first_mon_info;
762 first_mon_info = mon; 761 first_mon_info = mon;
763 nrofmon++; 762 nrofmon++;
764 } 763 }
765 } 764 }
… …
819 else 818 else
820 t = t->next; 819 t = t->next;
821 820
822#ifdef ARCHIVE_DEBUG 821#ifdef ARCHIVE_DEBUG
823 if (t) 822 if (t)
824 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 823 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
825#endif 824#endif
826 825
827 return t; 826 return t;
828} 827}
829 828
… …
934 */ 933 */
935 934
936static int 935static int
937unique_book (const object *book, int msgtype) 936unique_book (const object *book, int msgtype)
938{ 937{
939 title *test;
940
941 if (!booklist) 938 if (!booklist)
942 return 1; /* No archival entries! Must be unique! */ 939 return 1; /* No archival entries! Must be unique! */
943 940
944 /* Go through the booklist. If the author and name match, not unique so 941 /* Go through the booklist. If the author and name match, not unique so
945 * return 0. 942 * return 0.
946 */ 943 */
947 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 944 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
948 {
949 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 945 if (test->name == book->name && book->title == test->authour)
950 return 0; 946 return 0;
951 } 947
952 return 1; 948 return 1;
953} 949}
954 950
955/* add_book_to_list() */ 951/* add_book_to_list() */
956 952
… …
980 976
981 /* We have stuff we need to write now */ 977 /* We have stuff we need to write now */
982 need_to_write_bookarchive = 1; 978 need_to_write_bookarchive = 1;
983 979
984#ifdef ARCHIVE_DEBUG 980#ifdef ARCHIVE_DEBUG
985 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 981 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
986#endif 982#endif
987 983
988} 984}
989 985
990 986
… …
1003{ 999{
1004 int nbr = sizeof (book_descrpt) / sizeof (char *); 1000 int nbr = sizeof (book_descrpt) / sizeof (char *);
1005 1001
1006 switch (book->type) 1002 switch (book->type)
1007 { 1003 {
1008 case BOOK: 1004 case BOOK:
1009 { 1005 {
1010 titlelist *tl = get_titlelist (msgtype); 1006 titlelist *tl = get_titlelist (msgtype);
1011 title *t = NULL; 1007 title *t = NULL;
1012 int tries = 0; 1008 int tries = 0;
1013 1009
1014 /* look to see if our msg already been archived. If so, alter 1010 /* 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, 1011 * 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 1012 * then we archive the new title/name/msg combo if there is
1017 * room on the titlelist. 1013 * room on the titlelist.
1018 */ 1014 */
1019 1015
1020 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1016 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1021 { 1017 {
1022 object *tmpbook;
1023
1024 /* alter book properties */ 1018 /* alter book properties */
1025 if ((tmpbook = get_archetype (t->archname)) != NULL) 1019 if (object *tmpbook = get_archetype (t->archname))
1020 {
1021 tmpbook->msg = book->msg;
1022 tmpbook->copy_to (book);
1023 tmpbook->destroy ();
1024 }
1025
1026 book->title = t->authour;
1027 book->name = t->name;
1028 book->level = t->level;
1029 }
1030 /* Don't have any default title, so lets make up a new one */
1031 else
1032 {
1033 int numb, maxnames = max_titles[msgtype];
1034 const char *old_title;
1035 const char *old_name;
1036
1037 old_title = book->title;
1038 old_name = book->name;
1039
1040 /* some pre-generated books have title already set (from
1041 * maps), also don't bother looking for unique title if
1042 * we already used up all the available names! */
1043
1044 if (!tl)
1045 {
1046 LOG (llevError, "change_book_name(): can't find title list\n");
1047 numb = 0;
1048 }
1049 else
1050 numb = tl->number;
1051
1052 if (numb == maxnames)
1053 {
1054#ifdef ARCHIVE_DEBUG
1055 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1056#endif
1057 }
1058 /* shouldnt change map-maker books */
1059 else if (!book->title)
1060 do
1026 { 1061 {
1027 tmpbook->msg = book->msg; 1062 /* random book name */
1028 tmpbook->copy_to (book); 1063 new_text_name (book, msgtype);
1029 tmpbook->destroy (); 1064 add_author (book, msgtype); /* random author */
1065 tries++;
1030 } 1066 }
1067 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1031 1068
1032 book->title = t->authour; 1069 /* Now deal with 2 cases.
1033 book->name = t->name; 1070 * 1)If no space for a new title exists lets just restore
1034 book->level = t->level; 1071 * the old book properties. Remember, if the book had
1072 * matchd an older entry on the titlelist, we shouldnt
1073 * have called this routine in the first place!
1074 * 2) If we got a unique title, we need to add it to
1075 * the list.
1035 } 1076 */
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 1077
1043 old_title = book->title; 1078 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1044 old_name = book->name; 1079 { /* 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 1080#ifdef ARCHIVE_DEBUG
1061 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1081 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1062#endif 1082#endif
1063 break; 1083 /* restore old book properties here */
1064 } 1084 book->title = old_title;
1065 /* shouldnt change map-maker books */ 1085
1066 else if (!book->title) 1086 if (rndm (4))
1067 do
1068 { 1087 {
1069 /* random book name */ 1088 /* Lets give the book a description to individualize it some */
1070 new_text_name (book, msgtype); 1089 char new_name[MAX_BUF];
1071 add_author (book, msgtype); /* random author */ 1090
1072 tries++; 1091 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1092
1093 book->name = new_name;
1073 } 1094 }
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 1095 else
1103 { 1096 {
1104 book->name = old_name; 1097 book->name = old_name;
1105 } 1098 }
1106 } 1099 }
1107 else if (book->title && strlen (book->msg) > 5) 1100 else if (book->title && strlen (book->msg) > 5)
1108 { /* archive if long msg texts */ 1101 { /* archive if long msg texts */
1109 add_book_to_list (book, msgtype); 1102 add_book_to_list (book, msgtype);
1110 } 1103 }
1111 } 1104 }
1112 break; 1105 break;
1113 } 1106 }
1114 1107
1115 default: 1108 default:
1116 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1109 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1117 return; 1110 return;
1118 } 1111 }
1119} 1112}
1120 1113
1121/***************************************************************************** 1114/*****************************************************************************
1122 * 1115 *
… …
1147 return (object *) NULL; 1140 return (object *) NULL;
1148 1141
1149 if (!level) 1142 if (!level)
1150 { 1143 {
1151 /* lets get a random monster from the mon_info linked list */ 1144 /* lets get a random monster from the mon_info linked list */
1152 monnr = RANDOM () % nrofmon; 1145 monnr = rndm (nrofmon);
1153 1146
1154 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1147 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1155 if (i++ == monnr) 1148 if (i++ == monnr)
1156 break; 1149 break;
1157 1150
… …
1184 { 1177 {
1185 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1178 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1186 return NULL; 1179 return NULL;
1187 } 1180 }
1188 1181
1189 monnr = RANDOM () % i; 1182 monnr = rndm (i);
1190 for (mon = first_mon_info; mon; mon = mon->next) 1183 for (mon = first_mon_info; mon; mon = mon->next)
1191 if (mon->ob->level >= level && monnr-- == 0) 1184 if (mon->ob->level >= level && monnr-- == 0)
1192 return mon->ob; 1185 return mon->ob;
1193 1186
1194 if (!mon) 1187 if (!mon)
… …
1277 /* Note that the value this returns is not based on level */ 1270 /* Note that the value this returns is not based on level */
1278 tmp = get_next_mon (tmp); 1271 tmp = get_next_mon (tmp);
1279 } 1272 }
1280 1273
1281#ifdef BOOK_MSG_DEBUG 1274#ifdef BOOK_MSG_DEBUG
1282 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf)); 1275 LOG (llevDebug, "\n mon_info_msg() created string: %d\n", strlen (retbuf));
1283 fprintf (logfile, " MADE THIS:\n%s\n", retbuf); 1276 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1284#endif 1277#endif
1285 1278
1286 return retbuf; 1279 return retbuf;
1287} 1280}
1288 1281
… …
1298artifact_msg (int level, int booksize) 1291artifact_msg (int level, int booksize)
1299{ 1292{
1300 artifactlist *al = NULL; 1293 artifactlist *al = NULL;
1301 artifact *art; 1294 artifact *art;
1302 int chance, i, type, index; 1295 int chance, i, type, index;
1303 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1296 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1304 const char *ch; 1297 const char *ch;
1305 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1298 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1306 static char retbuf[BOOK_BUF]; 1299 static char retbuf[BOOK_BUF];
1307 object *tmp = NULL; 1300 object *tmp = NULL;
1308 1301
… …
1316 * for that type exists! 1309 * for that type exists!
1317 */ 1310 */
1318 i = 0; 1311 i = 0;
1319 do 1312 do
1320 { 1313 {
1321 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1314 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1322 type = art_name_array[index].type; 1315 type = art_name_array[index].type;
1323 al = find_artifactlist (type); 1316 al = find_artifactlist (type);
1324 i++; 1317 i++;
1325 } 1318 }
1326 while ((al == NULL) && (i < 10)); 1319 while ((al == NULL) && (i < 10));
… …
1329 return "None"; 1322 return "None";
1330 1323
1331 /* There is no reason to start on the artifact list at the begining. Lets 1324 /* There is no reason to start on the artifact list at the begining. Lets
1332 * take our starting position randomly... */ 1325 * take our starting position randomly... */
1333 art = al->items; 1326 art = al->items;
1334 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1327 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1335 { 1328 {
1336 if (art == NULL) 1329 if (!art)
1337 art = al->items; /* hmm, out of stuff, loop back around */ 1330 art = al->items; /* hmm, out of stuff, loop back around */
1331
1338 art = art->next; 1332 art = art->next;
1339 } 1333 }
1340 1334
1341 /* the base 'generic' name for our artifact */ 1335 /* the base 'generic' name for our artifact */
1342 assign (name, art_name_array[index].name); 1336 assign (name, art_name_array[index].name);
… …
1355 1349
1356 /* separator of items */ 1350 /* separator of items */
1357 strcpy (buf, "--- \n"); 1351 strcpy (buf, "--- \n");
1358 1352
1359 /* Name */ 1353 /* Name */
1360 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1354 if (art->allowed && art->allowed->name != shstr_All)
1361 { 1355 {
1362 linked_char *temp, *next = art->allowed; 1356 linked_char *temp, *next = art->allowed;
1363 1357
1364 do 1358 do
1365 { 1359 {
1366 temp = next; 1360 temp = next;
1367 next = next->next; 1361 next = next->next;
1368 } 1362 }
1369 while (next && !RANDOM () % 2); 1363 while (next && rndm (2));
1370 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1364 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name);
1371 } 1365 }
1372 else /* default name is used */ 1366 else /* default name is used */
1373 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1367 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name);
1374 1368
… …
1387 /* value of artifact */ 1381 /* value of artifact */
1388 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1382 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value);
1389 1383
1390 /* include the message about the artifact, if exists, and book 1384 /* include the message about the artifact, if exists, and book
1391 * level is kinda high */ 1385 * level is kinda high */
1392 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1386 if (art->item->msg
1387 && rndm (4) + 1 < level
1388 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1393 strcat (buf, art->item->msg); 1389 strcat (buf, art->item->msg);
1394 1390
1395 /* properties of the artifact */ 1391 /* properties of the artifact */
1396 tmp = object::create (); 1392 tmp = object::create ();
1397 add_abilities (tmp, art->item); 1393 add_abilities (tmp, art->item);
… …
1409 art = art->next; 1405 art = art->next;
1410 book_entries--; 1406 book_entries--;
1411 } 1407 }
1412 1408
1413#ifdef BOOK_MSG_DEBUG 1409#ifdef BOOK_MSG_DEBUG
1414 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf)); 1410 LOG (llevDebug, "artifact_msg() created string: %d\n", strlen (retbuf));
1415 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1411 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1416#endif 1412#endif
1417 return retbuf; 1413 return retbuf;
1418} 1414}
1419 1415
1420/***************************************************************************** 1416/*****************************************************************************
… …
1429char * 1425char *
1430spellpath_msg (int level, int booksize) 1426spellpath_msg (int level, int booksize)
1431{ 1427{
1432 static char retbuf[BOOK_BUF]; 1428 static char retbuf[BOOK_BUF];
1433 char tmpbuf[BOOK_BUF]; 1429 char tmpbuf[BOOK_BUF];
1434 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1430 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1435 int did_first_sp = 0; 1431 int did_first_sp = 0;
1436 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1432 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1437 archetype *at; 1433 archetype *at;
1438 1434
1439 /* Preamble */ 1435 /* Preamble */
… …
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 {
… …
1467 } 1463 }
1468 } 1464 }
1469 /* Geez, no spells were generated. */ 1465 /* Geez, no spells were generated. */
1470 if (!did_first_sp) 1466 if (!did_first_sp)
1471 { 1467 {
1472 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1468 if (rndm (4)) /* usually, lets make a recursive call... */
1473 spellpath_msg (level, booksize); 1469 spellpath_msg (level, booksize);
1474 else /* give up, cause knowing no spells exist for path is info too. */ 1470 else /* give up, cause knowing no spells exist for path is info too. */
1475 strcat (retbuf, "\n - no known spells exist -\n"); 1471 strcat (retbuf, "\n - no known spells exist -\n");
1476 } 1472 }
1477 else 1473 else
1478 { 1474 {
1479 strcat (retbuf, "\n"); 1475 strcat (retbuf, "\n");
1480 } 1476 }
1477
1478#ifdef BOOK_MSG_DEBUG
1479 LOG (llevDebug, "spellpath_msg() created string: %d\n", strlen (retbuf));
1480 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1481#endif
1481 return retbuf; 1482 return retbuf;
1482} 1483}
1483 1484
1484/* formula_msg() - generate a message detailing the properties 1485/* formula_msg() - generate a message detailing the properties
1485 * of a randomly selected alchemical formula. 1486 * of a randomly selected alchemical formula.
… …
1493 int chance; 1494 int chance;
1494 1495
1495 /* the higher the book level, the more complex (ie number of 1496 /* the higher the book level, the more complex (ie number of
1496 * ingredients) the formula can be. 1497 * ingredients) the formula can be.
1497 */ 1498 */
1498 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1499 fl = get_formulalist (rndm (level) / 3 + 1);
1499 1500
1500 if (!fl) 1501 if (!fl)
1501 fl = get_formulalist (1); /* safety */ 1502 fl = get_formulalist (1); /* safety */
1502 1503
1503 if (fl->total_chance == 0) 1504 if (fl->total_chance == 0)
… …
1507 add_author (book, 4); 1508 add_author (book, 4);
1508 return; 1509 return;
1509 } 1510 }
1510 1511
1511 /* get a random formula, weighted by its bookchance */ 1512 /* get a random formula, weighted by its bookchance */
1512 chance = RANDOM () % fl->total_chance; 1513 chance = rndm (fl->total_chance);
1513 for (formula = fl->items; formula != NULL; formula = formula->next) 1514 for (formula = fl->items; formula; formula = formula->next)
1514 { 1515 {
1515 chance -= formula->chance; 1516 chance -= formula->chance;
1516 if (chance <= 0) 1517 if (chance <= 0)
1517 break; 1518 break;
1518 } 1519 }
… …
1528 { 1529 {
1529 /* looks like a formula was found. Base the amount 1530 /* looks like a formula was found. Base the amount
1530 * of information on the booklevel and the spellevel 1531 * of information on the booklevel and the spellevel
1531 * of the formula. */ 1532 * of the formula. */
1532 1533
1533 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1534 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1534 archetype *at; 1535 archetype *at;
1535 1536
1536 /* preamble */ 1537 /* preamble */
1537 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1538 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1538 1539
1539 if ((at = archetype::find (op_name)) != (archetype *) NULL) 1540 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1540 op_name = at->clone.name; 1541 op_name = at->object::name;
1541 else 1542 else
1542 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1543 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1543 1544
1544 /* item name */ 1545 /* item name */
1545 if (strcmp (formula->title, "NONE")) 1546 if (formula->title != shstr_NONE)
1546 { 1547 {
1547 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title); 1548 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1548 /* This results in things like pile of philo. sulfur. 1549 /* This results in things like pile of philo. sulfur.
1549 * while philo. sulfur may look better, without this, 1550 * while philo. sulfur may look better, without this,
1550 * you get things like 'the wise' because its missing the 1551 * you get things like 'the wise' because its missing the
1551 * water of section. 1552 * water of section.
1552 */ 1553 */
1553 sprintf (title, "%s: %s of %s", 1554 sprintf (title, "%s: %s of %s",
1554 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1555 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1555 } 1556 }
1556 else 1557 else
1557 { 1558 {
1558 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1559 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1559 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1560 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1560 if (at->clone.title) 1561 if (at->title)
1561 { 1562 {
1562 strcat (retbuf, " "); 1563 strcat (retbuf, " ");
1563 strcat (retbuf, at->clone.title); 1564 strcat (retbuf, at->title);
1564 strcat (title, " "); 1565 strcat (title, " ");
1565 strcat (title, at->clone.title); 1566 strcat (title, at->title);
1566 } 1567 }
1567 } 1568 }
1569
1568 /* Lets name the book something meaningful ! */ 1570 /* Lets name the book something meaningful ! */
1569 book->name = title; 1571 book->name = title;
1570 book->title = NULL; 1572 book->title = NULL;
1571 1573
1572 /* ingredients to make it */ 1574 /* ingredients to make it */
… …
1576 archetype *at; 1578 archetype *at;
1577 1579
1578 at = archetype::find (formula->cauldron); 1580 at = archetype::find (formula->cauldron);
1579 1581
1580 sprintf (retbuf + strlen (retbuf), 1582 sprintf (retbuf + strlen (retbuf),
1581 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1583 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place");
1582 1584
1583 for (next = formula->ingred; next != NULL; next = next->next) 1585 for (next = formula->ingred; next != NULL; next = next->next)
1584 { 1586 {
1585 strcat (retbuf, next->name); 1587 strcat (retbuf, next->name);
1586 strcat (retbuf, "\n"); 1588 strcat (retbuf, "\n");
… …
1592 strcat (retbuf, "\n"); 1594 strcat (retbuf, "\n");
1593 1595
1594 book->msg = retbuf; 1596 book->msg = retbuf;
1595 } 1597 }
1596} 1598}
1599
1600#define DESCRIBE_PATH(retbuf, variable, name) \
1601 if(variable) { \
1602 int i,j=0; \
1603 strcat(retbuf,"(" name ": "); \
1604 for(i=0; i<NRSPELLPATHS; i++) \
1605 if(variable & (1<<i)) { \
1606 if (j) \
1607 strcat(retbuf,", "); \
1608 else \
1609 j = 1; \
1610 strcat(retbuf, spellpathnames[i]); \
1611 } \
1612 strcat(retbuf,")"); \
1613 }
1597 1614
1598/* god_info_msg() - generate a message detailing the properties 1615/* god_info_msg() - generate a message detailing the properties
1599 * of a random god. Used by the book hack. b.t. 1616 * of a random god. Used by the book hack. b.t.
1600 */ 1617 */
1601const char * 1618const char *
… …
1630 1647
1631 /* Information about the god is random, and based on the level of the 1648 /* Information about the god is random, and based on the level of the
1632 * 'book'. Probably there is a more intellegent way to implement 1649 * 'book'. Probably there is a more intellegent way to implement
1633 * this ... 1650 * this ...
1634 */ 1651 */
1635
1636 while (level > 0) 1652 while (level > 0)
1637 { 1653 {
1638 sprintf (buf, " "); 1654 sprintf (buf, " ");
1639 if (level == 2 && RANDOM () % 2) 1655 if (level == 2 && rndm (2))
1640 { /* enemy god */ 1656 { /* enemy god */
1641 const char *enemy = god->title; 1657 const char *enemy = god->title;
1642 1658
1643 if (enemy) 1659 if (enemy)
1644 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1660 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1645 } 1661 }
1646 1662
1647 if (level == 3 && RANDOM () % 2) 1663 if (level == 3 && rndm (2))
1648 { /* enemy race, what the god's holy word effects */ 1664 { /* enemy race, what the god's holy word effects */
1649 const char *enemy = god->slaying; 1665 const char *enemy = god->slaying;
1650 1666
1651 if (enemy && !(god->path_denied & PATH_TURNING)) 1667 if (enemy && !(god->path_denied & PATH_TURNING))
1652 if ((i = nstrtok (enemy, ",")) > 0) 1668 if ((i = nstrtok (enemy, ",")) > 0)
… …
1661 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1677 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1662 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1678 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1663 } 1679 }
1664 } 1680 }
1665 1681
1666 if (level == 4 && RANDOM () % 2) 1682 if (level == 4 && rndm (2))
1667 { /* Priest of god gets these protect,vulnerable... */ 1683 { /* Priest of god gets these protect,vulnerable... */
1668 char tmpbuf[MAX_BUF]; 1684 char tmpbuf[MAX_BUF];
1669 1685
1670 if (const char *cp = describe_resistance (god, 1)) 1686 if (const char *cp = describe_resistance (god, 1))
1671 { /* This god does have protections */ 1687 { /* This god does have protections */
… …
1677 } 1693 }
1678 else 1694 else
1679 sprintf (buf, " "); 1695 sprintf (buf, " ");
1680 } 1696 }
1681 1697
1682 if (level == 5 && RANDOM () % 2) 1698 if (level == 5 && rndm (2))
1683 { /* aligned race, summoning */ 1699 { /* aligned race, summoning */
1684 const char *race = god->race; /* aligned race */ 1700 const char *race = god->race; /* aligned race */
1685 1701
1686 if (race && !(god->path_denied & PATH_SUMMON)) 1702 if (race && !(god->path_denied & PATH_SUMMON))
1687 if ((i = nstrtok (race, ",")) > 0) 1703 if ((i = nstrtok (race, ",")) > 0)
… …
1695 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1711 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1696 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1712 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1697 } 1713 }
1698 } 1714 }
1699 1715
1700 if (level == 6 && RANDOM () % 2) 1716 if (level == 6 && rndm (2))
1701 { /* blessing,curse properties of the god */ 1717 { /* blessing,curse properties of the god */
1702 char tmpbuf[MAX_BUF]; 1718 char tmpbuf[MAX_BUF];
1703 1719
1704 if (const char *cp = describe_resistance (god, 1)) 1720 if (const char *cp = describe_resistance (god, 1))
1705 { /* This god does have protections */ 1721 { /* This god does have protections */
… …
1712 else 1728 else
1713 sprintf (buf, " "); 1729 sprintf (buf, " ");
1714 1730
1715 } 1731 }
1716 1732
1717 if (level == 8 && RANDOM () % 2) 1733 if (level == 8 && rndm (2))
1718 { /* immunity, holy possession */ 1734 { /* immunity, holy possession */
1719 int has_effect = 0, tmpvar; 1735 int has_effect = 0, tmpvar;
1720 char tmpbuf[MAX_BUF]; 1736 char tmpbuf[MAX_BUF];
1721 1737
1722 sprintf (tmpbuf, "\n"); 1738 sprintf (tmpbuf, "\n");
… …
1740 } 1756 }
1741 else 1757 else
1742 sprintf (buf, " "); 1758 sprintf (buf, " ");
1743 } 1759 }
1744 1760
1745 if (level == 12 && RANDOM () % 2) 1761 if (level == 12 && rndm (2))
1746 { /* spell paths */ 1762 { /* spell paths */
1747 int has_effect = 0, tmpvar; 1763 int has_effect = 0, tmpvar;
1748 char tmpbuf[MAX_BUF]; 1764 char tmpbuf[MAX_BUF];
1749 1765
1750 sprintf (tmpbuf, "\n"); 1766 sprintf (tmpbuf, "\n");
… …
1794 { /* we got no information beyond the preamble! */ 1810 { /* we got no information beyond the preamble! */
1795 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1811 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1796 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1812 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1797 } 1813 }
1798#ifdef BOOK_MSG_DEBUG 1814#ifdef BOOK_MSG_DEBUG
1799 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf)); 1815 LOG (llevDebug, "\n god_info_msg() created string: %d\n", strlen (retbuf));
1800 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1816 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1801#endif 1817#endif
1802 return retbuf; 1818 return retbuf;
1803} 1819}
1804 1820
1805/* tailor_readable_ob()- The main routine. This chooses a random 1821/* tailor_readable_ob()- The main routine. This chooses a random
… …
1820 */ 1836 */
1821void 1837void
1822tailor_readable_ob (object *book, int msg_type) 1838tailor_readable_ob (object *book, int msg_type)
1823{ 1839{
1824 char msgbuf[BOOK_BUF]; 1840 char msgbuf[BOOK_BUF];
1825 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1841 int level = book->level ? rndm (book->level) + 1 : 1;
1826 int book_buf_size; 1842 int book_buf_size;
1827 1843
1828 /* safety */ 1844 /* safety */
1829 if (book->type != BOOK) 1845 if (book->type != BOOK)
1830 return; 1846 return;
… …
1844 * 2) make sure there is an entry in max_titles[] array. 1860 * 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() 1861 * 3) make sure there are entries for your case in new_text_title()
1846 * and add_authour(). 1862 * and add_authour().
1847 * 4) you may want separate authour/book name arrays in read.h 1863 * 4) you may want separate authour/book name arrays in read.h
1848 */ 1864 */
1849
1850 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1865 msg_type = msg_type > 0 ? msg_type : rndm (8);
1851 switch (msg_type) 1866 switch (msg_type)
1852 { 1867 {
1853 case 1: /* monster attrib */ 1868 case 1: /* monster attrib */
1854 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1869 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1855 break; 1870 break;
… …
1879 { 1894 {
1880 book->msg = msgbuf; 1895 book->msg = msgbuf;
1881 /* lets give the "book" a new name, which may be a compound word */ 1896 /* lets give the "book" a new name, which may be a compound word */
1882 change_book (book, msg_type); 1897 change_book (book, msg_type);
1883 } 1898 }
1884
1885} 1899}
1886 1900
1887 1901
1888/***************************************************************************** 1902/*****************************************************************************
1889 * 1903 *
… …
1984get_readable_message_type (object *readable) 1998get_readable_message_type (object *readable)
1985{ 1999{
1986 uint8 subtype = readable->subtype; 2000 uint8 subtype = readable->subtype;
1987 2001
1988 if (subtype > last_readable_subtype) 2002 if (subtype > last_readable_subtype)
1989 return &(readable_message_types[0]); 2003 return &readable_message_types[0];
2004
1990 return &(readable_message_types[subtype]); 2005 return &readable_message_types[subtype];
1991} 2006}

Diff Legend

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