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.27 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.39 by root, Wed Dec 31 17:35:37 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 *)),
… …
933 */ 932 */
934 933
935static int 934static int
936unique_book (const object *book, int msgtype) 935unique_book (const object *book, int msgtype)
937{ 936{
938 title *test;
939
940 if (!booklist) 937 if (!booklist)
941 return 1; /* No archival entries! Must be unique! */ 938 return 1; /* No archival entries! Must be unique! */
942 939
943 /* Go through the booklist. If the author and name match, not unique so 940 /* Go through the booklist. If the author and name match, not unique so
944 * return 0. 941 * return 0.
945 */ 942 */
946 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 943 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
947 {
948 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 944 if (test->name == book->name && book->title == test->authour)
949 return 0; 945 return 0;
950 } 946
951 return 1; 947 return 1;
952} 948}
953 949
954/* add_book_to_list() */ 950/* add_book_to_list() */
955 951
… …
1002{ 998{
1003 int nbr = sizeof (book_descrpt) / sizeof (char *); 999 int nbr = sizeof (book_descrpt) / sizeof (char *);
1004 1000
1005 switch (book->type) 1001 switch (book->type)
1006 { 1002 {
1007 case BOOK: 1003 case BOOK:
1008 { 1004 {
1009 titlelist *tl = get_titlelist (msgtype); 1005 titlelist *tl = get_titlelist (msgtype);
1010 title *t = NULL; 1006 title *t = NULL;
1011 int tries = 0; 1007 int tries = 0;
1012 1008
1013 /* look to see if our msg already been archived. If so, alter 1009 /* look to see if our msg already been archived. If so, alter
1014 * the book to match the archival text. If we fail to match, 1010 * the book to match the archival text. If we fail to match,
1015 * then we archive the new title/name/msg combo if there is 1011 * then we archive the new title/name/msg combo if there is
1016 * room on the titlelist. 1012 * room on the titlelist.
1017 */ 1013 */
1018 1014
1019 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1015 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1020 { 1016 {
1021 object *tmpbook;
1022
1023 /* alter book properties */ 1017 /* alter book properties */
1024 if ((tmpbook = get_archetype (t->archname)) != NULL) 1018 if (object *tmpbook = get_archetype (t->archname))
1019 {
1020 tmpbook->msg = book->msg;
1021 tmpbook->copy_to (book);
1022 tmpbook->destroy ();
1023 }
1024
1025 book->title = t->authour;
1026 book->name = t->name;
1027 book->level = t->level;
1028 }
1029 /* Don't have any default title, so lets make up a new one */
1030 else
1031 {
1032 int numb, maxnames = max_titles[msgtype];
1033 const char *old_title;
1034 const char *old_name;
1035
1036 old_title = book->title;
1037 old_name = book->name;
1038
1039 /* some pre-generated books have title already set (from
1040 * maps), also don't bother looking for unique title if
1041 * we already used up all the available names! */
1042
1043 if (!tl)
1044 {
1045 LOG (llevError, "change_book_name(): can't find title list\n");
1046 numb = 0;
1047 }
1048 else
1049 numb = tl->number;
1050
1051 if (numb == maxnames)
1052 {
1053#ifdef ARCHIVE_DEBUG
1054 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1055#endif
1056 break;
1057 }
1058 /* shouldnt change map-maker books */
1059 else if (!book->title)
1060 do
1025 { 1061 {
1026 tmpbook->msg = book->msg; 1062 /* random book name */
1027 tmpbook->copy_to (book); 1063 new_text_name (book, msgtype);
1028 tmpbook->destroy (); 1064 add_author (book, msgtype); /* random author */
1065 tries++;
1029 } 1066 }
1067 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1030 1068
1031 book->title = t->authour; 1069 /* Now deal with 2 cases.
1032 book->name = t->name; 1070 * 1)If no space for a new title exists lets just restore
1033 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.
1034 } 1076 */
1035 /* Don't have any default title, so lets make up a new one */
1036 else
1037 {
1038 int numb, maxnames = max_titles[msgtype];
1039 const char *old_title;
1040 const char *old_name;
1041 1077
1042 old_title = book->title; 1078 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1043 old_name = book->name; 1079 { /* got to check maxnames again */
1044
1045 /* some pre-generated books have title already set (from
1046 * maps), also don't bother looking for unique title if
1047 * we already used up all the available names! */
1048
1049 if (!tl)
1050 {
1051 LOG (llevError, "change_book_name(): can't find title list\n");
1052 numb = 0;
1053 }
1054 else
1055 numb = tl->number;
1056
1057 if (numb == maxnames)
1058 {
1059#ifdef ARCHIVE_DEBUG 1080#ifdef ARCHIVE_DEBUG
1060 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);
1061#endif 1082#endif
1062 break; 1083 /* restore old book properties here */
1063 } 1084 book->title = old_title;
1064 /* shouldnt change map-maker books */ 1085
1065 else if (!book->title) 1086 if (rndm (4))
1066 do
1067 { 1087 {
1068 /* random book name */ 1088 /* Lets give the book a description to individualize it some */
1069 new_text_name (book, msgtype); 1089 char new_name[MAX_BUF];
1070 add_author (book, msgtype); /* random author */ 1090
1071 tries++; 1091 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1092
1093 book->name = new_name;
1072 } 1094 }
1073 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1074
1075 /* Now deal with 2 cases.
1076 * 1)If no space for a new title exists lets just restore
1077 * the old book properties. Remember, if the book had
1078 * matchd an older entry on the titlelist, we shouldnt
1079 * have called this routine in the first place!
1080 * 2) If we got a unique title, we need to add it to
1081 * the list.
1082 */
1083
1084 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1085 { /* got to check maxnames again */
1086#ifdef ARCHIVE_DEBUG
1087 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1088#endif
1089 /* restore old book properties here */
1090 book->title = old_title;
1091
1092 if (RANDOM () % 4)
1093 {
1094 /* Lets give the book a description to individualize it some */
1095 char new_name[MAX_BUF];
1096
1097 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1098
1099 book->name = new_name;
1100 }
1101 else 1095 else
1102 { 1096 {
1103 book->name = old_name; 1097 book->name = old_name;
1104 } 1098 }
1105 } 1099 }
1106 else if (book->title && strlen (book->msg) > 5) 1100 else if (book->title && strlen (book->msg) > 5)
1107 { /* archive if long msg texts */ 1101 { /* archive if long msg texts */
1108 add_book_to_list (book, msgtype); 1102 add_book_to_list (book, msgtype);
1109 } 1103 }
1110 } 1104 }
1111 break; 1105 break;
1112 } 1106 }
1113 1107
1114 default: 1108 default:
1115 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1109 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1116 return; 1110 return;
1117 } 1111 }
1118} 1112}
1119 1113
1120/***************************************************************************** 1114/*****************************************************************************
1121 * 1115 *
… …
1146 return (object *) NULL; 1140 return (object *) NULL;
1147 1141
1148 if (!level) 1142 if (!level)
1149 { 1143 {
1150 /* lets get a random monster from the mon_info linked list */ 1144 /* lets get a random monster from the mon_info linked list */
1151 monnr = RANDOM () % nrofmon; 1145 monnr = rndm (nrofmon);
1152 1146
1153 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1147 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1154 if (i++ == monnr) 1148 if (i++ == monnr)
1155 break; 1149 break;
1156 1150
… …
1183 { 1177 {
1184 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);
1185 return NULL; 1179 return NULL;
1186 } 1180 }
1187 1181
1188 monnr = RANDOM () % i; 1182 monnr = rndm (i);
1189 for (mon = first_mon_info; mon; mon = mon->next) 1183 for (mon = first_mon_info; mon; mon = mon->next)
1190 if (mon->ob->level >= level && monnr-- == 0) 1184 if (mon->ob->level >= level && monnr-- == 0)
1191 return mon->ob; 1185 return mon->ob;
1192 1186
1193 if (!mon) 1187 if (!mon)
… …
1297artifact_msg (int level, int booksize) 1291artifact_msg (int level, int booksize)
1298{ 1292{
1299 artifactlist *al = NULL; 1293 artifactlist *al = NULL;
1300 artifact *art; 1294 artifact *art;
1301 int chance, i, type, index; 1295 int chance, i, type, index;
1302 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;
1303 const char *ch; 1297 const char *ch;
1304 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1298 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1305 static char retbuf[BOOK_BUF]; 1299 static char retbuf[BOOK_BUF];
1306 object *tmp = NULL; 1300 object *tmp = NULL;
1307 1301
… …
1315 * for that type exists! 1309 * for that type exists!
1316 */ 1310 */
1317 i = 0; 1311 i = 0;
1318 do 1312 do
1319 { 1313 {
1320 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1314 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1321 type = art_name_array[index].type; 1315 type = art_name_array[index].type;
1322 al = find_artifactlist (type); 1316 al = find_artifactlist (type);
1323 i++; 1317 i++;
1324 } 1318 }
1325 while ((al == NULL) && (i < 10)); 1319 while ((al == NULL) && (i < 10));
… …
1328 return "None"; 1322 return "None";
1329 1323
1330 /* 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
1331 * take our starting position randomly... */ 1325 * take our starting position randomly... */
1332 art = al->items; 1326 art = al->items;
1333 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1327 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1334 { 1328 {
1335 if (art == NULL) 1329 if (!art)
1336 art = al->items; /* hmm, out of stuff, loop back around */ 1330 art = al->items; /* hmm, out of stuff, loop back around */
1331
1337 art = art->next; 1332 art = art->next;
1338 } 1333 }
1339 1334
1340 /* the base 'generic' name for our artifact */ 1335 /* the base 'generic' name for our artifact */
1341 assign (name, art_name_array[index].name); 1336 assign (name, art_name_array[index].name);
… …
1363 do 1358 do
1364 { 1359 {
1365 temp = next; 1360 temp = next;
1366 next = next->next; 1361 next = next->next;
1367 } 1362 }
1368 while (next && !RANDOM () % 2); 1363 while (next && rndm (2));
1369 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);
1370 } 1365 }
1371 else /* default name is used */ 1366 else /* default name is used */
1372 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);
1373 1368
… …
1386 /* value of artifact */ 1381 /* value of artifact */
1387 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);
1388 1383
1389 /* include the message about the artifact, if exists, and book 1384 /* include the message about the artifact, if exists, and book
1390 * level is kinda high */ 1385 * level is kinda high */
1391 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))
1392 strcat (buf, art->item->msg); 1389 strcat (buf, art->item->msg);
1393 1390
1394 /* properties of the artifact */ 1391 /* properties of the artifact */
1395 tmp = object::create (); 1392 tmp = object::create ();
1396 add_abilities (tmp, art->item); 1393 add_abilities (tmp, art->item);
… …
1428char * 1425char *
1429spellpath_msg (int level, int booksize) 1426spellpath_msg (int level, int booksize)
1430{ 1427{
1431 static char retbuf[BOOK_BUF]; 1428 static char retbuf[BOOK_BUF];
1432 char tmpbuf[BOOK_BUF]; 1429 char tmpbuf[BOOK_BUF];
1433 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1430 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1434 int did_first_sp = 0; 1431 int did_first_sp = 0;
1435 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1432 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1436 archetype *at; 1433 archetype *at;
1437 1434
1438 /* Preamble */ 1435 /* Preamble */
… …
1466 } 1463 }
1467 } 1464 }
1468 /* Geez, no spells were generated. */ 1465 /* Geez, no spells were generated. */
1469 if (!did_first_sp) 1466 if (!did_first_sp)
1470 { 1467 {
1471 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1468 if (rndm (4)) /* usually, lets make a recursive call... */
1472 spellpath_msg (level, booksize); 1469 spellpath_msg (level, booksize);
1473 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. */
1474 strcat (retbuf, "\n - no known spells exist -\n"); 1471 strcat (retbuf, "\n - no known spells exist -\n");
1475 } 1472 }
1476 else 1473 else
… …
1492 int chance; 1489 int chance;
1493 1490
1494 /* the higher the book level, the more complex (ie number of 1491 /* the higher the book level, the more complex (ie number of
1495 * ingredients) the formula can be. 1492 * ingredients) the formula can be.
1496 */ 1493 */
1497 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1494 fl = get_formulalist (rndm (level) / 3 + 1);
1498 1495
1499 if (!fl) 1496 if (!fl)
1500 fl = get_formulalist (1); /* safety */ 1497 fl = get_formulalist (1); /* safety */
1501 1498
1502 if (fl->total_chance == 0) 1499 if (fl->total_chance == 0)
… …
1506 add_author (book, 4); 1503 add_author (book, 4);
1507 return; 1504 return;
1508 } 1505 }
1509 1506
1510 /* get a random formula, weighted by its bookchance */ 1507 /* get a random formula, weighted by its bookchance */
1511 chance = RANDOM () % fl->total_chance; 1508 chance = rndm (fl->total_chance);
1512 for (formula = fl->items; formula != NULL; formula = formula->next) 1509 for (formula = fl->items; formula; formula = formula->next)
1513 { 1510 {
1514 chance -= formula->chance; 1511 chance -= formula->chance;
1515 if (chance <= 0) 1512 if (chance <= 0)
1516 break; 1513 break;
1517 } 1514 }
… …
1527 { 1524 {
1528 /* looks like a formula was found. Base the amount 1525 /* looks like a formula was found. Base the amount
1529 * of information on the booklevel and the spellevel 1526 * of information on the booklevel and the spellevel
1530 * of the formula. */ 1527 * of the formula. */
1531 1528
1532 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1529 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1533 archetype *at; 1530 archetype *at;
1534 1531
1535 /* preamble */ 1532 /* preamble */
1536 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");
1537 1534
… …
1548 * while philo. sulfur may look better, without this, 1545 * while philo. sulfur may look better, without this,
1549 * you get things like 'the wise' because its missing the 1546 * you get things like 'the wise' because its missing the
1550 * water of section. 1547 * water of section.
1551 */ 1548 */
1552 sprintf (title, "%s: %s of %s", 1549 sprintf (title, "%s: %s of %s",
1553 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1550 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1554 } 1551 }
1555 else 1552 else
1556 { 1553 {
1557 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1554 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1558 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1555 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1559 if (at->title) 1556 if (at->title)
1560 { 1557 {
1561 strcat (retbuf, " "); 1558 strcat (retbuf, " ");
1562 strcat (retbuf, at->title); 1559 strcat (retbuf, at->title);
1563 strcat (title, " "); 1560 strcat (title, " ");
… …
1592 1589
1593 book->msg = retbuf; 1590 book->msg = retbuf;
1594 } 1591 }
1595} 1592}
1596 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 }
1608
1597/* god_info_msg() - generate a message detailing the properties 1609/* god_info_msg() - generate a message detailing the properties
1598 * of a random god. Used by the book hack. b.t. 1610 * of a random god. Used by the book hack. b.t.
1599 */ 1611 */
1600const char * 1612const char *
1601god_info_msg (int level, int booksize) 1613god_info_msg (int level, int booksize)
… …
1629 1641
1630 /* 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
1631 * 'book'. Probably there is a more intellegent way to implement 1643 * 'book'. Probably there is a more intellegent way to implement
1632 * this ... 1644 * this ...
1633 */ 1645 */
1634
1635 while (level > 0) 1646 while (level > 0)
1636 { 1647 {
1637 sprintf (buf, " "); 1648 sprintf (buf, " ");
1638 if (level == 2 && RANDOM () % 2) 1649 if (level == 2 && rndm (2))
1639 { /* enemy god */ 1650 { /* enemy god */
1640 const char *enemy = god->title; 1651 const char *enemy = god->title;
1641 1652
1642 if (enemy) 1653 if (enemy)
1643 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1654 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1644 } 1655 }
1645 1656
1646 if (level == 3 && RANDOM () % 2) 1657 if (level == 3 && rndm (2))
1647 { /* enemy race, what the god's holy word effects */ 1658 { /* enemy race, what the god's holy word effects */
1648 const char *enemy = god->slaying; 1659 const char *enemy = god->slaying;
1649 1660
1650 if (enemy && !(god->path_denied & PATH_TURNING)) 1661 if (enemy && !(god->path_denied & PATH_TURNING))
1651 if ((i = nstrtok (enemy, ",")) > 0) 1662 if ((i = nstrtok (enemy, ",")) > 0)
… …
1660 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1671 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1661 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1672 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1662 } 1673 }
1663 } 1674 }
1664 1675
1665 if (level == 4 && RANDOM () % 2) 1676 if (level == 4 && rndm (2))
1666 { /* Priest of god gets these protect,vulnerable... */ 1677 { /* Priest of god gets these protect,vulnerable... */
1667 char tmpbuf[MAX_BUF]; 1678 char tmpbuf[MAX_BUF];
1668 1679
1669 if (const char *cp = describe_resistance (god, 1)) 1680 if (const char *cp = describe_resistance (god, 1))
1670 { /* This god does have protections */ 1681 { /* This god does have protections */
… …
1676 } 1687 }
1677 else 1688 else
1678 sprintf (buf, " "); 1689 sprintf (buf, " ");
1679 } 1690 }
1680 1691
1681 if (level == 5 && RANDOM () % 2) 1692 if (level == 5 && rndm (2))
1682 { /* aligned race, summoning */ 1693 { /* aligned race, summoning */
1683 const char *race = god->race; /* aligned race */ 1694 const char *race = god->race; /* aligned race */
1684 1695
1685 if (race && !(god->path_denied & PATH_SUMMON)) 1696 if (race && !(god->path_denied & PATH_SUMMON))
1686 if ((i = nstrtok (race, ",")) > 0) 1697 if ((i = nstrtok (race, ",")) > 0)
… …
1694 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1705 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1695 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1706 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1696 } 1707 }
1697 } 1708 }
1698 1709
1699 if (level == 6 && RANDOM () % 2) 1710 if (level == 6 && rndm (2))
1700 { /* blessing,curse properties of the god */ 1711 { /* blessing,curse properties of the god */
1701 char tmpbuf[MAX_BUF]; 1712 char tmpbuf[MAX_BUF];
1702 1713
1703 if (const char *cp = describe_resistance (god, 1)) 1714 if (const char *cp = describe_resistance (god, 1))
1704 { /* This god does have protections */ 1715 { /* This god does have protections */
… …
1711 else 1722 else
1712 sprintf (buf, " "); 1723 sprintf (buf, " ");
1713 1724
1714 } 1725 }
1715 1726
1716 if (level == 8 && RANDOM () % 2) 1727 if (level == 8 && rndm (2))
1717 { /* immunity, holy possession */ 1728 { /* immunity, holy possession */
1718 int has_effect = 0, tmpvar; 1729 int has_effect = 0, tmpvar;
1719 char tmpbuf[MAX_BUF]; 1730 char tmpbuf[MAX_BUF];
1720 1731
1721 sprintf (tmpbuf, "\n"); 1732 sprintf (tmpbuf, "\n");
… …
1739 } 1750 }
1740 else 1751 else
1741 sprintf (buf, " "); 1752 sprintf (buf, " ");
1742 } 1753 }
1743 1754
1744 if (level == 12 && RANDOM () % 2) 1755 if (level == 12 && rndm (2))
1745 { /* spell paths */ 1756 { /* spell paths */
1746 int has_effect = 0, tmpvar; 1757 int has_effect = 0, tmpvar;
1747 char tmpbuf[MAX_BUF]; 1758 char tmpbuf[MAX_BUF];
1748 1759
1749 sprintf (tmpbuf, "\n"); 1760 sprintf (tmpbuf, "\n");
… …
1819 */ 1830 */
1820void 1831void
1821tailor_readable_ob (object *book, int msg_type) 1832tailor_readable_ob (object *book, int msg_type)
1822{ 1833{
1823 char msgbuf[BOOK_BUF]; 1834 char msgbuf[BOOK_BUF];
1824 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1835 int level = book->level ? rndm (book->level) + 1 : 1;
1825 int book_buf_size; 1836 int book_buf_size;
1826 1837
1827 /* safety */ 1838 /* safety */
1828 if (book->type != BOOK) 1839 if (book->type != BOOK)
1829 return; 1840 return;
… …
1843 * 2) make sure there is an entry in max_titles[] array. 1854 * 2) make sure there is an entry in max_titles[] array.
1844 * 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()
1845 * and add_authour(). 1856 * and add_authour().
1846 * 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
1847 */ 1858 */
1848
1849 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1859 msg_type = msg_type > 0 ? msg_type : rndm (8);
1850 switch (msg_type) 1860 switch (msg_type)
1851 { 1861 {
1852 case 1: /* monster attrib */ 1862 case 1: /* monster attrib */
1853 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1863 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1854 break; 1864 break;
… …
1878 { 1888 {
1879 book->msg = msgbuf; 1889 book->msg = msgbuf;
1880 /* 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 */
1881 change_book (book, msg_type); 1891 change_book (book, msg_type);
1882 } 1892 }
1883
1884} 1893}
1885 1894
1886 1895
1887/***************************************************************************** 1896/*****************************************************************************
1888 * 1897 *
… …
1983get_readable_message_type (object *readable) 1992get_readable_message_type (object *readable)
1984{ 1993{
1985 uint8 subtype = readable->subtype; 1994 uint8 subtype = readable->subtype;
1986 1995
1987 if (subtype > last_readable_subtype) 1996 if (subtype > last_readable_subtype)
1988 return &(readable_message_types[0]); 1997 return &readable_message_types[0];
1998
1989 return &(readable_message_types[subtype]); 1999 return &readable_message_types[subtype];
1990} 2000}

Diff Legend

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