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.28 by root, Sun Jun 24 04:09:28 2007 UTC vs.
Revision 1.45 by root, Thu Oct 15 22:50:41 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,2009 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 */
… …
30 30
31#include <global.h> 31#include <global.h>
32#include <book.h> 32#include <book.h>
33#include <living.h> 33#include <living.h>
34#include <spells.h> 34#include <spells.h>
35
36 35
37/* Define this if you want to archive book titles by contents. 36/* Define this if you want to archive book titles by contents.
38 * This option should enforce UNIQUE combinations of titles,authors and 37 * This option should enforce UNIQUE combinations of titles,authors and
39 * msg contents during and *between* game sessions. 38 * msg contents during and *between* game sessions.
40 * Note: a slight degeneracy exists since books are archived based on an integer 39 * Note: a slight degeneracy exists since books are archived based on an integer
… …
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, "readable-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, "readable-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, "readable-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, "readable-book-elegant-2"}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
… …
570 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */ 569 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */
571 570
572/* nstrtok() - simple routine to return the number of list 571/* nstrtok() - simple routine to return the number of list
573 * items in buf1 as separated by the value of buf2 572 * items in buf1 as separated by the value of buf2
574 */ 573 */
575 574static int
576int
577nstrtok (const char *buf1, const char *buf2) 575nstrtok (const char *buf1, const char *buf2)
578{ 576{
579 char *tbuf, sbuf[12], buf[MAX_BUF]; 577 char *tbuf, sbuf[12], buf[MAX_BUF];
580 int number = 0; 578 int number = 0;
581 579
… …
594 592
595/* strtoktolin() - takes a string in buf1 and separates it into 593/* strtoktolin() - takes a string in buf1 and separates it into
596 * a list of strings delimited by buf2. Then returns a comma 594 * a list of strings delimited by buf2. Then returns a comma
597 * separated string w/ decent punctuation. 595 * separated string w/ decent punctuation.
598 */ 596 */
599 597static char *
600char *
601strtoktolin (const char *buf1, const char *buf2) 598strtoktolin (const char *buf1, const char *buf2)
602{ 599{
603 int maxi, i = nstrtok (buf1, buf2); 600 int maxi, i = nstrtok (buf1, buf2);
604 char *tbuf, buf[MAX_BUF], sbuf[12]; 601 char *tbuf, buf[MAX_BUF], sbuf[12];
605 static char rbuf[BOOK_BUF]; 602 static char rbuf[BOOK_BUF];
… …
622 tbuf = strtok (NULL, sbuf); 619 tbuf = strtok (NULL, sbuf);
623 } 620 }
624 return (char *) rbuf; 621 return (char *) rbuf;
625} 622}
626 623
627int 624static int
628book_overflow (const char *buf1, const char *buf2, int booksize) 625book_overflow (const char *buf1, const char *buf2, int booksize)
629{ 626{
630
631 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */ 627 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */
632 || buf_overflow (buf1, buf2, booksize)) 628 || buf_overflow (buf1, buf2, booksize))
633 return 1; 629 return 1;
630
634 return 0; 631 return 0;
635
636
637} 632}
638 633
639/***************************************************************************** 634/*****************************************************************************
640 * 635 *
641 * Start of initialisation related functions. 636 * Start of initialisation related functions.
… …
818 else 813 else
819 t = t->next; 814 t = t->next;
820 815
821#ifdef ARCHIVE_DEBUG 816#ifdef ARCHIVE_DEBUG
822 if (t) 817 if (t)
823 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 818 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
824#endif 819#endif
825 820
826 return t; 821 return t;
827} 822}
828 823
… …
830 * handled directly in change_book_name(). Names are based on text 825 * handled directly in change_book_name(). Names are based on text
831 * msgtype 826 * msgtype
832 * this sets book book->name based on msgtype given. What name 827 * this sets book book->name based on msgtype given. What name
833 * is given is based on various criteria 828 * is given is based on various criteria
834 */ 829 */
835
836static void 830static void
837new_text_name (object *book, int msgtype) 831new_text_name (object *book, int msgtype)
838{ 832{
839 int nbr; 833 int nbr;
840 char name[MAX_BUF]; 834 char name[MAX_BUF];
… …
933 */ 927 */
934 928
935static int 929static int
936unique_book (const object *book, int msgtype) 930unique_book (const object *book, int msgtype)
937{ 931{
938 title *test;
939
940 if (!booklist) 932 if (!booklist)
941 return 1; /* No archival entries! Must be unique! */ 933 return 1; /* No archival entries! Must be unique! */
942 934
943 /* Go through the booklist. If the author and name match, not unique so 935 /* Go through the booklist. If the author and name match, not unique so
944 * return 0. 936 * return 0.
945 */ 937 */
946 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 938 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)) 939 if (test->name == book->name && book->title == test->authour)
949 return 0; 940 return 0;
950 } 941
951 return 1; 942 return 1;
952} 943}
953 944
954/* add_book_to_list() */ 945/* add_book_to_list() */
955 946
… …
979 970
980 /* We have stuff we need to write now */ 971 /* We have stuff we need to write now */
981 need_to_write_bookarchive = 1; 972 need_to_write_bookarchive = 1;
982 973
983#ifdef ARCHIVE_DEBUG 974#ifdef ARCHIVE_DEBUG
984 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 975 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
985#endif 976#endif
986 977
987} 978}
988 979
989 980
… …
995 * levels and architypes. -b.t. 986 * levels and architypes. -b.t.
996 */ 987 */
997 988
998#define MAX_TITLE_CHECK 20 989#define MAX_TITLE_CHECK 20
999 990
1000void 991static void
1001change_book (object *book, int msgtype) 992change_book (object *book, int msgtype)
1002{ 993{
1003 int nbr = sizeof (book_descrpt) / sizeof (char *); 994 int nbr = sizeof (book_descrpt) / sizeof (char *);
1004 995
1005 switch (book->type) 996 switch (book->type)
1006 { 997 {
1007 case BOOK: 998 case BOOK:
1008 { 999 {
1009 titlelist *tl = get_titlelist (msgtype); 1000 titlelist *tl = get_titlelist (msgtype);
1010 title *t = NULL; 1001 title *t = NULL;
1011 int tries = 0; 1002 int tries = 0;
1012 1003
1013 /* look to see if our msg already been archived. If so, alter 1004 /* 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, 1005 * 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 1006 * then we archive the new title/name/msg combo if there is
1016 * room on the titlelist. 1007 * room on the titlelist.
1017 */ 1008 */
1018 1009
1019 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1010 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1020 { 1011 {
1021 object *tmpbook;
1022
1023 /* alter book properties */ 1012 /* alter book properties */
1024 if ((tmpbook = get_archetype (t->archname)) != NULL) 1013 if (object *tmpbook = get_archetype (t->archname))
1014 {
1015 tmpbook->msg = book->msg;
1016 tmpbook->copy_to (book);
1017 tmpbook->destroy ();
1018 }
1019
1020 book->title = t->authour;
1021 book->name = t->name;
1022 book->level = t->level;
1023 }
1024 /* Don't have any default title, so lets make up a new one */
1025 else
1026 {
1027 int numb, maxnames = max_titles[msgtype];
1028 const char *old_title;
1029 const char *old_name;
1030
1031 old_title = book->title;
1032 old_name = book->name;
1033
1034 /* some pre-generated books have title already set (from
1035 * maps), also don't bother looking for unique title if
1036 * we already used up all the available names! */
1037
1038 if (!tl)
1039 {
1040 LOG (llevError, "change_book_name(): can't find title list\n");
1041 numb = 0;
1042 }
1043 else
1044 numb = tl->number;
1045
1046 if (numb == maxnames)
1047 {
1048#ifdef ARCHIVE_DEBUG
1049 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1050#endif
1051 }
1052 /* shouldnt change map-maker books */
1053 else if (!book->title)
1054 do
1025 { 1055 {
1026 tmpbook->msg = book->msg; 1056 /* random book name */
1027 tmpbook->copy_to (book); 1057 new_text_name (book, msgtype);
1028 tmpbook->destroy (); 1058 add_author (book, msgtype); /* random author */
1059 tries++;
1029 } 1060 }
1061 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1030 1062
1031 book->title = t->authour; 1063 /* Now deal with 2 cases.
1032 book->name = t->name; 1064 * 1)If no space for a new title exists lets just restore
1033 book->level = t->level; 1065 * the old book properties. Remember, if the book had
1066 * matchd an older entry on the titlelist, we shouldnt
1067 * have called this routine in the first place!
1068 * 2) If we got a unique title, we need to add it to
1069 * the list.
1034 } 1070 */
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 1071
1042 old_title = book->title; 1072 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1043 old_name = book->name; 1073 { /* 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 1074#ifdef ARCHIVE_DEBUG
1060 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1075 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1061#endif 1076#endif
1062 break; 1077 /* restore old book properties here */
1063 } 1078 book->title = old_title;
1064 /* shouldnt change map-maker books */ 1079
1065 else if (!book->title) 1080 if (rndm (4))
1066 do
1067 { 1081 {
1068 /* random book name */ 1082 /* Lets give the book a description to individualize it some */
1069 new_text_name (book, msgtype); 1083 char new_name[MAX_BUF];
1070 add_author (book, msgtype); /* random author */ 1084
1071 tries++; 1085 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1086
1087 book->name = new_name;
1072 } 1088 }
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 1089 else
1102 { 1090 {
1103 book->name = old_name; 1091 book->name = old_name;
1104 } 1092 }
1105 } 1093 }
1106 else if (book->title && strlen (book->msg) > 5) 1094 else if (book->title && strlen (book->msg) > 5)
1107 { /* archive if long msg texts */ 1095 { /* archive if long msg texts */
1108 add_book_to_list (book, msgtype); 1096 add_book_to_list (book, msgtype);
1109 } 1097 }
1110 } 1098 }
1111 break; 1099 break;
1112 } 1100 }
1113 1101
1114 default: 1102 default:
1115 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1103 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1116 return; 1104 return;
1117 } 1105 }
1118} 1106}
1119 1107
1120/***************************************************************************** 1108/*****************************************************************************
1121 * 1109 *
… …
1132 * list of all monsters in the current game. If level is non-zero, 1120 * list of all monsters in the current game. If level is non-zero,
1133 * then only monsters greater than that level will be returned. 1121 * then only monsters greater than that level will be returned.
1134 * Changed 971225 to be greater than equal to level passed. Also 1122 * Changed 971225 to be greater than equal to level passed. Also
1135 * made choosing by level more random. 1123 * made choosing by level more random.
1136 */ 1124 */
1137
1138object * 1125object *
1139get_random_mon (int level) 1126get_random_mon (int level)
1140{ 1127{
1141 objectlink *mon = first_mon_info; 1128 objectlink *mon = first_mon_info;
1142 int i = 0, monnr; 1129 int i = 0, monnr;
… …
1146 return (object *) NULL; 1133 return (object *) NULL;
1147 1134
1148 if (!level) 1135 if (!level)
1149 { 1136 {
1150 /* lets get a random monster from the mon_info linked list */ 1137 /* lets get a random monster from the mon_info linked list */
1151 monnr = RANDOM () % nrofmon; 1138 monnr = rndm (nrofmon);
1152 1139
1153 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1140 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1154 if (i++ == monnr) 1141 if (i++ == monnr)
1155 break; 1142 break;
1156 1143
… …
1183 { 1170 {
1184 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1171 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1185 return NULL; 1172 return NULL;
1186 } 1173 }
1187 1174
1188 monnr = RANDOM () % i; 1175 monnr = rndm (i);
1189 for (mon = first_mon_info; mon; mon = mon->next) 1176 for (mon = first_mon_info; mon; mon = mon->next)
1190 if (mon->ob->level >= level && monnr-- == 0) 1177 if (mon->ob->level >= level && monnr-- == 0)
1191 return mon->ob; 1178 return mon->ob;
1192 1179
1193 if (!mon) 1180 if (!mon)
… …
1200 1187
1201/* 1188/*
1202 * Returns a description of the monster. This really needs to be 1189 * Returns a description of the monster. This really needs to be
1203 * redone, as describe_item really gives a pretty internal description. 1190 * redone, as describe_item really gives a pretty internal description.
1204 */ 1191 */
1205 1192static const char *
1206char *
1207mon_desc (const object *mon) 1193mon_desc (const object *mon)
1208{ 1194{
1209 static char retbuf[HUGE_BUF]; 1195 static dynbuf_text buf; buf.clear ();
1210 1196
1211 sprintf (retbuf, " *** %s ***\n", &mon->name); 1197 buf.printf ("B<< %s >>\r", &mon->name);
1212 strcat (retbuf, describe_item (mon, NULL)); 1198 buf << describe_item (mon, 0);
1213 1199
1214 return retbuf; 1200 return buf;
1215} 1201}
1216 1202
1217 1203
1218/* This function returns the next monsters after 'tmp'. If no match is 1204/* This function returns the next monsters after 'tmp'. If no match is
1219 * found, it returns NULL (changed 0.94.3 to do this, since the 1205 * found, it returns NULL (changed 0.94.3 to do this, since the
1220 * calling function (mon_info_msg) seems to expect that. 1206 * calling function (mon_info_msg) seems to expect that.
1221 */ 1207 */
1222 1208static object *
1223object *
1224get_next_mon (object *tmp) 1209get_next_mon (object *tmp)
1225{ 1210{
1226 objectlink *mon; 1211 objectlink *mon;
1227 1212
1228 for (mon = first_mon_info; mon; mon = mon->next) 1213 for (mon = first_mon_info; mon; mon = mon->next)
… …
1237 else 1222 else
1238 return first_mon_info->ob; 1223 return first_mon_info->ob;
1239 1224
1240} 1225}
1241 1226
1242
1243
1244/* mon_info_msg() - generate a message detailing the properties 1227/* mon_info_msg() - generate a message detailing the properties
1245 * of a randomly selected monster. 1228 * of a randomly selected monster.
1246 */ 1229 */
1247 1230static const char *
1248char *
1249mon_info_msg (int level, int booksize) 1231mon_info_msg (int level, int booksize)
1250{ 1232{
1251 static char retbuf[BOOK_BUF]; 1233 static dynbuf_text buf; buf.clear ();
1252 char tmpbuf[HUGE_BUF];
1253 object *tmp;
1254 1234
1255 /*preamble */ 1235 /*preamble */
1256 strcpy (retbuf, "This beastiary contains:"); 1236 buf << "This beastiary contains:\n";
1257 1237
1258 /* lets print info on as many monsters as will fit in our 1238 /* lets print info on as many monsters as will fit in our
1259 * document. 1239 * document.
1260 * 8-96 Had to change this a bit, otherwise there would 1240 * 8-96 Had to change this a bit, otherwise there would
1261 * have been an impossibly large number of combinations 1241 * have been an impossibly large number of combinations
1262 * of text! (and flood out the available number of titles 1242 * of text! (and flood out the available number of titles
1263 * in the archive in a snap!) -b.t. 1243 * in the archive in a snap!) -b.t.
1264 */ 1244 */
1265 tmp = get_random_mon (level * 3); 1245 object *tmp = get_random_mon (level * 3);
1266 while (tmp) 1246 while (tmp && buf.size () < BOOK_BUF)
1267 { 1247 {
1268 /* monster description */ 1248 /* monster description */
1269 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1249 buf.printf ("\n%s\n", mon_desc (tmp));
1270
1271 if (!book_overflow (retbuf, tmpbuf, booksize))
1272 strcat (retbuf, tmpbuf);
1273 else
1274 break;
1275 1250
1276 /* Note that the value this returns is not based on level */ 1251 /* Note that the value this returns is not based on level */
1277 tmp = get_next_mon (tmp); 1252 tmp = get_next_mon (tmp);
1278 } 1253 }
1279 1254
1280#ifdef BOOK_MSG_DEBUG
1281 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1282 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1283#endif
1284
1285 return retbuf; 1255 return buf;
1286} 1256}
1287 1257
1288 1258
1289/***************************************************************************** 1259/*****************************************************************************
1290 * Artifact msg generation code. 1260 * Artifact msg generation code.
1291 ****************************************************************************/ 1261 ****************************************************************************/
1292 1262
1293/* artifact_msg() - generate a message detailing the properties 1263/* artifact_msg() - generate a message detailing the properties
1294 * of 1-6 artifacts drawn sequentially from the artifact list. 1264 * of 1-6 artifacts drawn sequentially from the artifact list.
1295 */ 1265 */
1296const char * 1266static const char *
1297artifact_msg (int level, int booksize) 1267artifact_msg (int level, int booksize)
1298{ 1268{
1299 artifactlist *al = NULL; 1269 artifactlist *al = NULL;
1300 artifact *art; 1270 artifact *art;
1301 int chance, i, type, index; 1271 int chance, i, type, index;
1302 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1272 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1303 const char *ch; 1273 const char *ch;
1304 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1274 char name[MAX_BUF];
1305 static char retbuf[BOOK_BUF];
1306 object *tmp = NULL; 1275 object *tmp = NULL;
1276
1277 static dynbuf_text buf; buf.clear ();
1307 1278
1308 /* values greater than 5 create msg buffers that are too big! */ 1279 /* values greater than 5 create msg buffers that are too big! */
1309 if (book_entries > 5) 1280 if (book_entries > 5)
1310 book_entries = 5; 1281 book_entries = 5;
1311 1282
… …
1315 * for that type exists! 1286 * for that type exists!
1316 */ 1287 */
1317 i = 0; 1288 i = 0;
1318 do 1289 do
1319 { 1290 {
1320 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1291 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1321 type = art_name_array[index].type; 1292 type = art_name_array[index].type;
1322 al = find_artifactlist (type); 1293 al = find_artifactlist (type);
1323 i++; 1294 i++;
1324 } 1295 }
1325 while ((al == NULL) && (i < 10)); 1296 while ((al == NULL) && (i < 10));
… …
1328 return "None"; 1299 return "None";
1329 1300
1330 /* There is no reason to start on the artifact list at the begining. Lets 1301 /* There is no reason to start on the artifact list at the begining. Lets
1331 * take our starting position randomly... */ 1302 * take our starting position randomly... */
1332 art = al->items; 1303 art = al->items;
1333 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1304 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1334 { 1305 {
1335 if (art == NULL) 1306 if (!art)
1336 art = al->items; /* hmm, out of stuff, loop back around */ 1307 art = al->items; /* hmm, out of stuff, loop back around */
1308
1337 art = art->next; 1309 art = art->next;
1338 } 1310 }
1339 1311
1340 /* the base 'generic' name for our artifact */ 1312 /* the base 'generic' name for our artifact */
1341 assign (name, art_name_array[index].name); 1313 assign (name, art_name_array[index].name);
1342 1314
1343 /* Ok, lets print out the contents */ 1315 /* Ok, lets print out the contents */
1344 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1316 buf.printf ("Herein %s detailed %s...\n",
1317 book_entries > 1 ? "are" : "is",
1318 book_entries > 1 ? "some artifacts" : "an artifact");
1345 1319
1346 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1320 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1347 * as long as we have space up to the allowed max # (book_entires) 1321 * as long as we have space up to the allowed max # (book_entires)
1348 */ 1322 */
1349 while (book_entries > 0) 1323 while (book_entries > 0 && buf.size () < BOOK_BUF)
1350 { 1324 {
1351 1325
1352 if (art == NULL) 1326 if (!art)
1353 art = al->items; 1327 art = al->items;
1354 1328
1355 /* separator of items */ 1329 buf << '\n';
1356 strcpy (buf, "--- \n");
1357 1330
1358 /* Name */ 1331 /* Name */
1359 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1332 if (art->allowed && art->allowed->name != shstr_All)
1360 { 1333 {
1361 linked_char *temp, *next = art->allowed; 1334 linked_char *temp, *next = art->allowed;
1362 1335
1363 do 1336 do
1364 { 1337 {
1365 temp = next; 1338 temp = next;
1366 next = next->next; 1339 next = next->next;
1367 } 1340 }
1368 while (next && !RANDOM () % 2); 1341 while (next && rndm (2));
1342
1369 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1343 buf.printf ("A B<< %s of %s >>", &temp->name, &art->item->name);
1370 } 1344 }
1371 else /* default name is used */ 1345 else /* default name is used */
1372 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1346 buf.printf ("The B<< %s of %s >>", name, &art->item->name);
1347
1348 buf << " is ";
1373 1349
1374 /* chance of finding */ 1350 /* chance of finding */
1375 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1351 chance = (int) (100 * ((float) art->chance / al->total_chance));
1376 if (chance >= 20) 1352 if (chance >= 20)
1377 sprintf (sbuf, "an uncommon"); 1353 buf << "an uncommon";
1378 else if (chance >= 10) 1354 else if (chance >= 10)
1379 sprintf (sbuf, "an unusual"); 1355 buf << "an unusual";
1380 else if (chance >= 5) 1356 else if (chance >= 5)
1381 sprintf (sbuf, "a rare"); 1357 buf << "a rare";
1382 else 1358 else
1383 sprintf (sbuf, "a very rare"); 1359 buf << "a very rare";
1384 sprintf (buf, "%s is %s\n", buf, sbuf);
1385 1360
1386 /* value of artifact */ 1361 /* value of artifact */
1387 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1362 buf << " item with a value that is " << art->item->value << " times normal.\n";
1388 1363
1389 /* include the message about the artifact, if exists, and book 1364 /* include the message about the artifact, if exists, and book
1390 * level is kinda high */ 1365 * level is kinda high */
1391 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1366 if (art->item->msg
1367 && rndm (4) + 1 < level)
1392 strcat (buf, art->item->msg); 1368 buf << art->item->msg;
1393 1369
1394 /* properties of the artifact */ 1370 /* properties of the artifact */
1395 tmp = object::create (); 1371 tmp = object::create ();
1396 add_abilities (tmp, art->item); 1372 add_abilities (tmp, art->item);
1397 tmp->type = type; 1373 tmp->type = type;
1398 SET_FLAG (tmp, FLAG_IDENTIFIED); 1374 SET_FLAG (tmp, FLAG_IDENTIFIED);
1399 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1375 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1400 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1376 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1377
1401 tmp->destroy (); 1378 tmp->destroy ();
1402 /* add the buf if it will fit */
1403 if (!book_overflow (retbuf, buf, booksize))
1404 strcat (retbuf, buf);
1405 else
1406 break;
1407 1379
1408 art = art->next; 1380 art = art->next;
1409 book_entries--; 1381 book_entries--;
1410 } 1382 }
1411 1383
1412#ifdef BOOK_MSG_DEBUG
1413 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
1414 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1415#endif
1416 return retbuf; 1384 return buf;
1417} 1385}
1418 1386
1419/***************************************************************************** 1387/*****************************************************************************
1420 * Spellpath message generation 1388 * Spellpath message generation
1421 *****************************************************************************/ 1389 *****************************************************************************/
1422 1390
1423/* spellpath_msg() - generate a message detailing the member 1391/* spellpath_msg() - generate a message detailing the member
1424 * incantations/prayers (and some of their properties) belonging to 1392 * incantations/prayers (and some of their properties) belonging to
1425 * a given spellpath. 1393 * a given spellpath.
1426 */ 1394 */
1427 1395static char *
1428char *
1429spellpath_msg (int level, int booksize) 1396spellpath_msg (int level, int booksize)
1430{ 1397{
1398 static dynbuf_text buf; buf.clear ();
1399
1431 static char retbuf[BOOK_BUF]; 1400 static char retbuf[BOOK_BUF];
1432 char tmpbuf[BOOK_BUF]; 1401 char tmpbuf[BOOK_BUF];
1433 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1402 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1434 int did_first_sp = 0;
1435 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1403 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1436 archetype *at; 1404 archetype *at;
1437 1405
1438 /* Preamble */ 1406 /* Preamble */
1439 sprintf (retbuf, "Herein are detailed the names of %s\n", prayers ? "prayers" : "incantations"); 1407 buf << "Herein are detailed the names of "
1408 << (prayers ? "prayers" : "incantations");
1440 1409
1441 if (path == -1) 1410 if (path == -1)
1442 strcat (retbuf, "having no known spell path.\n"); 1411 buf << " having no known spell path.\n";
1443 else 1412 else
1444 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1413 buf << " belonging to the path of B<< " << spellpathnames[path] << " >>:\n\n";
1414
1415 int seen = 0;
1445 1416
1446 for_all_archetypes (at) 1417 for_all_archetypes (at)
1447 {
1448 /* Determine if this is an appropriate spell. Must 1418 /* Determine if this is an appropriate spell. Must
1449 * be of matching path, must be of appropriate type (prayer 1419 * be of matching path, must be of appropriate type (prayer
1450 * or not), and must be within the valid level range. 1420 * or not), and must be within the valid level range.
1451 */ 1421 */
1452 if (at->type == SPELL && at->path_attuned & pnum && 1422 if (at->type == SPELL && at->path_attuned & pnum &&
1453 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8))) 1423 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1454 { 1424 {
1455 assign (tmpbuf, at->object::name); 1425 seen = 1;
1456 1426 buf << at->object::name << '\r';
1457 if (book_overflow (retbuf, tmpbuf, booksize))
1458 break;
1459 else
1460 {
1461 if (did_first_sp)
1462 strcat (retbuf, ",\n");
1463 did_first_sp = 1;
1464 strcat (retbuf, tmpbuf);
1465 }
1466 } 1427 }
1467 } 1428
1468 /* Geez, no spells were generated. */ 1429 /* Geez, no spells were generated. */
1469 if (!did_first_sp) 1430 if (!seen)
1470 {
1471 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1431 if (rndm (4)) /* usually, lets make a recursive call... */
1472 spellpath_msg (level, booksize); 1432 return spellpath_msg (level, booksize);
1473 else /* give up, cause knowing no spells exist for path is info too. */ 1433 else /* give up, cause knowing no spells exist for path is info too. */
1474 strcat (retbuf, "\n - no known spells exist -\n"); 1434 buf << "- no known spells exist.\n";
1475 } 1435
1476 else
1477 {
1478 strcat (retbuf, "\n");
1479 }
1480 return retbuf; 1436 return buf;
1481} 1437}
1482 1438
1483/* formula_msg() - generate a message detailing the properties 1439/* formula_msg() - generate a message detailing the properties
1484 * of a randomly selected alchemical formula. 1440 * of a randomly selected alchemical formula.
1485 */ 1441 */
1486void 1442static void
1487make_formula_book (object *book, int level) 1443make_formula_book (object *book, int level)
1488{ 1444{
1489 char retbuf[BOOK_BUF], title[MAX_BUF]; 1445 char retbuf[BOOK_BUF], title[MAX_BUF];
1490 recipelist *fl; 1446 recipelist *fl;
1491 recipe *formula = NULL; 1447 recipe *formula = NULL;
1492 int chance; 1448 int chance;
1493 1449
1494 /* the higher the book level, the more complex (ie number of 1450 /* the higher the book level, the more complex (ie number of
1495 * ingredients) the formula can be. 1451 * ingredients) the formula can be.
1496 */ 1452 */
1497 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1453 fl = get_formulalist (rndm (level) / 3 + 1);
1498 1454
1499 if (!fl) 1455 if (!fl)
1500 fl = get_formulalist (1); /* safety */ 1456 fl = get_formulalist (1); /* safety */
1501 1457
1502 if (fl->total_chance == 0) 1458 if (fl->total_chance == 0)
… …
1506 add_author (book, 4); 1462 add_author (book, 4);
1507 return; 1463 return;
1508 } 1464 }
1509 1465
1510 /* get a random formula, weighted by its bookchance */ 1466 /* get a random formula, weighted by its bookchance */
1511 chance = RANDOM () % fl->total_chance; 1467 chance = rndm (fl->total_chance);
1512 for (formula = fl->items; formula != NULL; formula = formula->next) 1468 for (formula = fl->items; formula; formula = formula->next)
1513 { 1469 {
1514 chance -= formula->chance; 1470 chance -= formula->chance;
1515 if (chance <= 0) 1471 if (chance <= 0)
1516 break; 1472 break;
1517 } 1473 }
… …
1527 { 1483 {
1528 /* looks like a formula was found. Base the amount 1484 /* looks like a formula was found. Base the amount
1529 * of information on the booklevel and the spellevel 1485 * of information on the booklevel and the spellevel
1530 * of the formula. */ 1486 * of the formula. */
1531 1487
1532 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1488 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1533 archetype *at; 1489 archetype *at;
1534 1490
1535 /* preamble */ 1491 /* preamble */
1536 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1492 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1537 1493
… …
1539 op_name = at->object::name; 1495 op_name = at->object::name;
1540 else 1496 else
1541 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1497 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1542 1498
1543 /* item name */ 1499 /* item name */
1544 if (strcmp (formula->title, "NONE")) 1500 if (formula->title != shstr_NONE)
1545 { 1501 {
1546 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title); 1502 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1547 /* This results in things like pile of philo. sulfur. 1503 /* This results in things like pile of philo. sulfur.
1548 * while philo. sulfur may look better, without this, 1504 * while philo. sulfur may look better, without this,
1549 * you get things like 'the wise' because its missing the 1505 * you get things like 'the wise' because its missing the
1550 * water of section. 1506 * water of section.
1551 */ 1507 */
1552 sprintf (title, "%s: %s of %s", 1508 sprintf (title, "%s: %s of %s",
1553 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1509 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1554 } 1510 }
1555 else 1511 else
1556 { 1512 {
1557 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1513 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1558 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1514 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1559 if (at->title) 1515 if (at->title)
1560 { 1516 {
1561 strcat (retbuf, " "); 1517 strcat (retbuf, " ");
1562 strcat (retbuf, at->title); 1518 strcat (retbuf, at->title);
1563 strcat (title, " "); 1519 strcat (title, " ");
1564 strcat (title, at->title); 1520 strcat (title, at->title);
1565 } 1521 }
1566 } 1522 }
1523
1567 /* Lets name the book something meaningful ! */ 1524 /* Lets name the book something meaningful ! */
1568 book->name = title; 1525 book->name = title;
1569 book->title = NULL; 1526 book->title = NULL;
1570 1527
1571 /* ingredients to make it */ 1528 /* ingredients to make it */
… …
1592 1549
1593 book->msg = retbuf; 1550 book->msg = retbuf;
1594 } 1551 }
1595} 1552}
1596 1553
1554#define DESCRIBE_PATH(retbuf, variable, name) \
1555 if(variable) { \
1556 int i,j=0; \
1557 strcat(retbuf,"(" name ": "); \
1558 for(i=0; i<NRSPELLPATHS; i++) \
1559 if(variable & (1<<i)) { \
1560 if (j) \
1561 strcat(retbuf,", "); \
1562 else \
1563 j = 1; \
1564 strcat(retbuf, spellpathnames[i]); \
1565 } \
1566 strcat(retbuf,")"); \
1567 }
1568
1597/* god_info_msg() - generate a message detailing the properties 1569/* god_info_msg() - generate a message detailing the properties
1598 * of a random god. Used by the book hack. b.t. 1570 * of a random god. Used by the book hack. b.t.
1599 */ 1571 */
1600const char * 1572static const char *
1601god_info_msg (int level, int booksize) 1573god_info_msg (int level, int booksize)
1602{ 1574{
1603 static char retbuf[BOOK_BUF]; 1575 static char retbuf[BOOK_BUF];
1604 const char *name = NULL; 1576 const char *name = NULL;
1605 char buf[BOOK_BUF]; 1577 char buf[BOOK_BUF];
… …
1629 1601
1630 /* Information about the god is random, and based on the level of the 1602 /* Information about the god is random, and based on the level of the
1631 * 'book'. Probably there is a more intellegent way to implement 1603 * 'book'. Probably there is a more intellegent way to implement
1632 * this ... 1604 * this ...
1633 */ 1605 */
1634
1635 while (level > 0) 1606 while (level > 0)
1636 { 1607 {
1637 sprintf (buf, " "); 1608 sprintf (buf, " ");
1638 if (level == 2 && RANDOM () % 2) 1609 if (level == 2 && rndm (2))
1639 { /* enemy god */ 1610 { /* enemy god */
1640 const char *enemy = god->title; 1611 const char *enemy = god->title;
1641 1612
1642 if (enemy) 1613 if (enemy)
1643 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1614 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1644 } 1615 }
1645 1616
1646 if (level == 3 && RANDOM () % 2) 1617 if (level == 3 && rndm (2))
1647 { /* enemy race, what the god's holy word effects */ 1618 { /* enemy race, what the god's holy word effects */
1648 const char *enemy = god->slaying; 1619 const char *enemy = god->slaying;
1649 1620
1650 if (enemy && !(god->path_denied & PATH_TURNING)) 1621 if (enemy && !(god->path_denied & PATH_TURNING))
1651 if ((i = nstrtok (enemy, ",")) > 0) 1622 if ((i = nstrtok (enemy, ",")) > 0)
… …
1660 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1631 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1661 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1632 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1662 } 1633 }
1663 } 1634 }
1664 1635
1665 if (level == 4 && RANDOM () % 2) 1636 if (level == 4 && rndm (2))
1666 { /* Priest of god gets these protect,vulnerable... */ 1637 { /* Priest of god gets these protect,vulnerable... */
1667 char tmpbuf[MAX_BUF]; 1638 char tmpbuf[MAX_BUF];
1668 1639
1669 if (const char *cp = describe_resistance (god, 1)) 1640 if (const char *cp = describe_resistance (god, 1))
1670 { /* This god does have protections */ 1641 { /* This god does have protections */
… …
1676 } 1647 }
1677 else 1648 else
1678 sprintf (buf, " "); 1649 sprintf (buf, " ");
1679 } 1650 }
1680 1651
1681 if (level == 5 && RANDOM () % 2) 1652 if (level == 5 && rndm (2))
1682 { /* aligned race, summoning */ 1653 { /* aligned race, summoning */
1683 const char *race = god->race; /* aligned race */ 1654 const char *race = god->race; /* aligned race */
1684 1655
1685 if (race && !(god->path_denied & PATH_SUMMON)) 1656 if (race && !(god->path_denied & PATH_SUMMON))
1686 if ((i = nstrtok (race, ",")) > 0) 1657 if ((i = nstrtok (race, ",")) > 0)
… …
1694 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1665 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1695 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1666 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1696 } 1667 }
1697 } 1668 }
1698 1669
1699 if (level == 6 && RANDOM () % 2) 1670 if (level == 6 && rndm (2))
1700 { /* blessing,curse properties of the god */ 1671 { /* blessing,curse properties of the god */
1701 char tmpbuf[MAX_BUF]; 1672 char tmpbuf[MAX_BUF];
1702 1673
1703 if (const char *cp = describe_resistance (god, 1)) 1674 if (const char *cp = describe_resistance (god, 1))
1704 { /* This god does have protections */ 1675 { /* This god does have protections */
… …
1711 else 1682 else
1712 sprintf (buf, " "); 1683 sprintf (buf, " ");
1713 1684
1714 } 1685 }
1715 1686
1716 if (level == 8 && RANDOM () % 2) 1687 if (level == 8 && rndm (2))
1717 { /* immunity, holy possession */ 1688 { /* immunity, holy possession */
1718 int has_effect = 0, tmpvar; 1689 int has_effect = 0, tmpvar;
1719 char tmpbuf[MAX_BUF]; 1690 char tmpbuf[MAX_BUF];
1720 1691
1721 sprintf (tmpbuf, "\n"); 1692 sprintf (tmpbuf, "\n");
… …
1739 } 1710 }
1740 else 1711 else
1741 sprintf (buf, " "); 1712 sprintf (buf, " ");
1742 } 1713 }
1743 1714
1744 if (level == 12 && RANDOM () % 2) 1715 if (level == 12 && rndm (2))
1745 { /* spell paths */ 1716 { /* spell paths */
1746 int has_effect = 0, tmpvar; 1717 int has_effect = 0, tmpvar;
1747 char tmpbuf[MAX_BUF]; 1718 char tmpbuf[MAX_BUF];
1748 1719
1749 sprintf (tmpbuf, "\n"); 1720 sprintf (tmpbuf, "\n");
… …
1793 { /* we got no information beyond the preamble! */ 1764 { /* we got no information beyond the preamble! */
1794 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1765 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1795 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1766 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1796 } 1767 }
1797#ifdef BOOK_MSG_DEBUG 1768#ifdef BOOK_MSG_DEBUG
1798 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf)); 1769 LOG (llevDebug, "\n god_info_msg() created string: %d\n", strlen (retbuf));
1799 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1770 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1800#endif 1771#endif
1801 return retbuf; 1772 return retbuf;
1802} 1773}
1803 1774
1804/* tailor_readable_ob()- The main routine. This chooses a random 1775/* tailor_readable_ob()- The main routine. This chooses a random
… …
1819 */ 1790 */
1820void 1791void
1821tailor_readable_ob (object *book, int msg_type) 1792tailor_readable_ob (object *book, int msg_type)
1822{ 1793{
1823 char msgbuf[BOOK_BUF]; 1794 char msgbuf[BOOK_BUF];
1824 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1795 int level = book->level ? rndm (book->level) + 1 : 1;
1825 int book_buf_size; 1796 int book_buf_size;
1826 1797
1827 /* safety */ 1798 /* safety */
1828 if (book->type != BOOK) 1799 if (book->type != BOOK)
1829 return; 1800 return;
… …
1843 * 2) make sure there is an entry in max_titles[] array. 1814 * 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() 1815 * 3) make sure there are entries for your case in new_text_title()
1845 * and add_authour(). 1816 * and add_authour().
1846 * 4) you may want separate authour/book name arrays in read.h 1817 * 4) you may want separate authour/book name arrays in read.h
1847 */ 1818 */
1848
1849 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1819 msg_type = msg_type > 0 ? msg_type : rndm (8);
1850 switch (msg_type) 1820 switch (msg_type*0+2)//D
1851 { 1821 {
1852 case 1: /* monster attrib */ 1822 case 1: /* monster attrib */
1853 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1823 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1854 break; 1824 break;
1855 case 2: /* artifact attrib */ 1825 case 2: /* artifact attrib */
… …
1878 { 1848 {
1879 book->msg = msgbuf; 1849 book->msg = msgbuf;
1880 /* lets give the "book" a new name, which may be a compound word */ 1850 /* lets give the "book" a new name, which may be a compound word */
1881 change_book (book, msg_type); 1851 change_book (book, msg_type);
1882 } 1852 }
1883
1884} 1853}
1885 1854
1886 1855
1887/***************************************************************************** 1856/*****************************************************************************
1888 * 1857 *
… …
1983get_readable_message_type (object *readable) 1952get_readable_message_type (object *readable)
1984{ 1953{
1985 uint8 subtype = readable->subtype; 1954 uint8 subtype = readable->subtype;
1986 1955
1987 if (subtype > last_readable_subtype) 1956 if (subtype > last_readable_subtype)
1988 return &(readable_message_types[0]); 1957 return &readable_message_types[0];
1958
1989 return &(readable_message_types[subtype]); 1959 return &readable_message_types[subtype];
1990} 1960}

Diff Legend

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