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.36 by root, Mon Sep 29 09:04:50 2008 UTC vs.
Revision 1.43 by root, Thu Oct 15 20:45:01 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
… …
29 30
30#include <global.h> 31#include <global.h>
31#include <book.h> 32#include <book.h>
32#include <living.h> 33#include <living.h>
33#include <spells.h> 34#include <spells.h>
34
35 35
36/* Define this if you want to archive book titles by contents. 36/* Define this if you want to archive book titles by contents.
37 * This option should enforce UNIQUE combinations of titles,authors and 37 * This option should enforce UNIQUE combinations of titles,authors and
38 * msg contents during and *between* game sessions. 38 * msg contents during and *between* game sessions.
39 * 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
… …
569 * (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. */
570 570
571/* nstrtok() - simple routine to return the number of list 571/* nstrtok() - simple routine to return the number of list
572 * items in buf1 as separated by the value of buf2 572 * items in buf1 as separated by the value of buf2
573 */ 573 */
574 574static int
575int
576nstrtok (const char *buf1, const char *buf2) 575nstrtok (const char *buf1, const char *buf2)
577{ 576{
578 char *tbuf, sbuf[12], buf[MAX_BUF]; 577 char *tbuf, sbuf[12], buf[MAX_BUF];
579 int number = 0; 578 int number = 0;
580 579
… …
593 592
594/* strtoktolin() - takes a string in buf1 and separates it into 593/* strtoktolin() - takes a string in buf1 and separates it into
595 * a list of strings delimited by buf2. Then returns a comma 594 * a list of strings delimited by buf2. Then returns a comma
596 * separated string w/ decent punctuation. 595 * separated string w/ decent punctuation.
597 */ 596 */
598 597static char *
599char *
600strtoktolin (const char *buf1, const char *buf2) 598strtoktolin (const char *buf1, const char *buf2)
601{ 599{
602 int maxi, i = nstrtok (buf1, buf2); 600 int maxi, i = nstrtok (buf1, buf2);
603 char *tbuf, buf[MAX_BUF], sbuf[12]; 601 char *tbuf, buf[MAX_BUF], sbuf[12];
604 static char rbuf[BOOK_BUF]; 602 static char rbuf[BOOK_BUF];
… …
621 tbuf = strtok (NULL, sbuf); 619 tbuf = strtok (NULL, sbuf);
622 } 620 }
623 return (char *) rbuf; 621 return (char *) rbuf;
624} 622}
625 623
626int 624static int
627book_overflow (const char *buf1, const char *buf2, int booksize) 625book_overflow (const char *buf1, const char *buf2, int booksize)
628{ 626{
629
630 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 */
631 || buf_overflow (buf1, buf2, booksize)) 628 || buf_overflow (buf1, buf2, booksize))
632 return 1; 629 return 1;
630
633 return 0; 631 return 0;
634
635
636} 632}
637 633
638/***************************************************************************** 634/*****************************************************************************
639 * 635 *
640 * Start of initialisation related functions. 636 * Start of initialisation related functions.
… …
817 else 813 else
818 t = t->next; 814 t = t->next;
819 815
820#ifdef ARCHIVE_DEBUG 816#ifdef ARCHIVE_DEBUG
821 if (t) 817 if (t)
822 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);
823#endif 819#endif
824 820
825 return t; 821 return t;
826} 822}
827 823
… …
829 * handled directly in change_book_name(). Names are based on text 825 * handled directly in change_book_name(). Names are based on text
830 * msgtype 826 * msgtype
831 * this sets book book->name based on msgtype given. What name 827 * this sets book book->name based on msgtype given. What name
832 * is given is based on various criteria 828 * is given is based on various criteria
833 */ 829 */
834
835static void 830static void
836new_text_name (object *book, int msgtype) 831new_text_name (object *book, int msgtype)
837{ 832{
838 int nbr; 833 int nbr;
839 char name[MAX_BUF]; 834 char name[MAX_BUF];
… …
932 */ 927 */
933 928
934static int 929static int
935unique_book (const object *book, int msgtype) 930unique_book (const object *book, int msgtype)
936{ 931{
937 title *test;
938
939 if (!booklist) 932 if (!booklist)
940 return 1; /* No archival entries! Must be unique! */ 933 return 1; /* No archival entries! Must be unique! */
941 934
942 /* 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
943 * return 0. 936 * return 0.
944 */ 937 */
945 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 938 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
946 {
947 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 939 if (test->name == book->name && book->title == test->authour)
948 return 0; 940 return 0;
949 } 941
950 return 1; 942 return 1;
951} 943}
952 944
953/* add_book_to_list() */ 945/* add_book_to_list() */
954 946
… …
978 970
979 /* We have stuff we need to write now */ 971 /* We have stuff we need to write now */
980 need_to_write_bookarchive = 1; 972 need_to_write_bookarchive = 1;
981 973
982#ifdef ARCHIVE_DEBUG 974#ifdef ARCHIVE_DEBUG
983 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);
984#endif 976#endif
985 977
986} 978}
987 979
988 980
… …
994 * levels and architypes. -b.t. 986 * levels and architypes. -b.t.
995 */ 987 */
996 988
997#define MAX_TITLE_CHECK 20 989#define MAX_TITLE_CHECK 20
998 990
999void 991static void
1000change_book (object *book, int msgtype) 992change_book (object *book, int msgtype)
1001{ 993{
1002 int nbr = sizeof (book_descrpt) / sizeof (char *); 994 int nbr = sizeof (book_descrpt) / sizeof (char *);
1003 995
1004 switch (book->type) 996 switch (book->type)
… …
1020 /* alter book properties */ 1012 /* alter book properties */
1021 if (object *tmpbook = get_archetype (t->archname)) 1013 if (object *tmpbook = get_archetype (t->archname))
1022 { 1014 {
1023 tmpbook->msg = book->msg; 1015 tmpbook->msg = book->msg;
1024 tmpbook->copy_to (book); 1016 tmpbook->copy_to (book);
1025 tmpbook->destroy (true); 1017 tmpbook->destroy ();
1026 } 1018 }
1027 1019
1028 book->title = t->authour; 1020 book->title = t->authour;
1029 book->name = t->name; 1021 book->name = t->name;
1030 book->level = t->level; 1022 book->level = t->level;
… …
1054 if (numb == maxnames) 1046 if (numb == maxnames)
1055 { 1047 {
1056#ifdef ARCHIVE_DEBUG 1048#ifdef ARCHIVE_DEBUG
1057 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1049 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1058#endif 1050#endif
1059 break;
1060 } 1051 }
1061 /* shouldnt change map-maker books */ 1052 /* shouldnt change map-maker books */
1062 else if (!book->title) 1053 else if (!book->title)
1063 do 1054 do
1064 { 1055 {
… …
1079 */ 1070 */
1080 1071
1081 if (tries == MAX_TITLE_CHECK || numb == maxnames) 1072 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1082 { /* got to check maxnames again */ 1073 { /* got to check maxnames again */
1083#ifdef ARCHIVE_DEBUG 1074#ifdef ARCHIVE_DEBUG
1084 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames); 1075 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1085#endif 1076#endif
1086 /* restore old book properties here */ 1077 /* restore old book properties here */
1087 book->title = old_title; 1078 book->title = old_title;
1088 1079
1089 if (RANDOM () % 4) 1080 if (rndm (4))
1090 { 1081 {
1091 /* Lets give the book a description to individualize it some */ 1082 /* Lets give the book a description to individualize it some */
1092 char new_name[MAX_BUF]; 1083 char new_name[MAX_BUF];
1093 1084
1094 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name); 1085 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
… …
1129 * 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,
1130 * then only monsters greater than that level will be returned. 1121 * then only monsters greater than that level will be returned.
1131 * Changed 971225 to be greater than equal to level passed. Also 1122 * Changed 971225 to be greater than equal to level passed. Also
1132 * made choosing by level more random. 1123 * made choosing by level more random.
1133 */ 1124 */
1134
1135object * 1125object *
1136get_random_mon (int level) 1126get_random_mon (int level)
1137{ 1127{
1138 objectlink *mon = first_mon_info; 1128 objectlink *mon = first_mon_info;
1139 int i = 0, monnr; 1129 int i = 0, monnr;
… …
1143 return (object *) NULL; 1133 return (object *) NULL;
1144 1134
1145 if (!level) 1135 if (!level)
1146 { 1136 {
1147 /* lets get a random monster from the mon_info linked list */ 1137 /* lets get a random monster from the mon_info linked list */
1148 monnr = RANDOM () % nrofmon; 1138 monnr = rndm (nrofmon);
1149 1139
1150 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1140 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1151 if (i++ == monnr) 1141 if (i++ == monnr)
1152 break; 1142 break;
1153 1143
… …
1180 { 1170 {
1181 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);
1182 return NULL; 1172 return NULL;
1183 } 1173 }
1184 1174
1185 monnr = RANDOM () % i; 1175 monnr = rndm (i);
1186 for (mon = first_mon_info; mon; mon = mon->next) 1176 for (mon = first_mon_info; mon; mon = mon->next)
1187 if (mon->ob->level >= level && monnr-- == 0) 1177 if (mon->ob->level >= level && monnr-- == 0)
1188 return mon->ob; 1178 return mon->ob;
1189 1179
1190 if (!mon) 1180 if (!mon)
… …
1197 1187
1198/* 1188/*
1199 * Returns a description of the monster. This really needs to be 1189 * Returns a description of the monster. This really needs to be
1200 * redone, as describe_item really gives a pretty internal description. 1190 * redone, as describe_item really gives a pretty internal description.
1201 */ 1191 */
1202 1192static const char *
1203char *
1204mon_desc (const object *mon) 1193mon_desc (const object *mon)
1205{ 1194{
1206 static char retbuf[HUGE_BUF]; 1195 static dynbuf_text buf; buf.clear ();
1207 1196
1208 sprintf (retbuf, " *** %s ***\n", &mon->name); 1197 buf.printf (" *** %s ***\n", &mon->name);
1209 strcat (retbuf, describe_item (mon, NULL)); 1198 buf << describe_item (mon, 0);
1210 1199
1211 return retbuf; 1200 return buf;
1212} 1201}
1213 1202
1214 1203
1215/* 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
1216 * 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
1217 * calling function (mon_info_msg) seems to expect that. 1206 * calling function (mon_info_msg) seems to expect that.
1218 */ 1207 */
1219 1208static object *
1220object *
1221get_next_mon (object *tmp) 1209get_next_mon (object *tmp)
1222{ 1210{
1223 objectlink *mon; 1211 objectlink *mon;
1224 1212
1225 for (mon = first_mon_info; mon; mon = mon->next) 1213 for (mon = first_mon_info; mon; mon = mon->next)
… …
1234 else 1222 else
1235 return first_mon_info->ob; 1223 return first_mon_info->ob;
1236 1224
1237} 1225}
1238 1226
1239
1240
1241/* mon_info_msg() - generate a message detailing the properties 1227/* mon_info_msg() - generate a message detailing the properties
1242 * of a randomly selected monster. 1228 * of a randomly selected monster.
1243 */ 1229 */
1244 1230static const char *
1245char *
1246mon_info_msg (int level, int booksize) 1231mon_info_msg (int level, int booksize)
1247{ 1232{
1248 static char retbuf[BOOK_BUF]; 1233 static dynbuf_text buf; buf.clear ();
1249 char tmpbuf[HUGE_BUF];
1250 object *tmp;
1251 1234
1252 /*preamble */ 1235 /*preamble */
1253 strcpy (retbuf, "This beastiary contains:"); 1236 buf << "This beastiary contains:\n";
1254 1237
1255 /* 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
1256 * document. 1239 * document.
1257 * 8-96 Had to change this a bit, otherwise there would 1240 * 8-96 Had to change this a bit, otherwise there would
1258 * have been an impossibly large number of combinations 1241 * have been an impossibly large number of combinations
1259 * of text! (and flood out the available number of titles 1242 * of text! (and flood out the available number of titles
1260 * in the archive in a snap!) -b.t. 1243 * in the archive in a snap!) -b.t.
1261 */ 1244 */
1262 tmp = get_random_mon (level * 3); 1245 object *tmp = get_random_mon (level * 3);
1263 while (tmp) 1246 while (tmp && buf.size () < BOOK_BUF)
1264 { 1247 {
1265 /* monster description */ 1248 /* monster description */
1266 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1249 buf.printf ("\n%s\n", mon_desc (tmp));
1267
1268 if (!book_overflow (retbuf, tmpbuf, booksize))
1269 strcat (retbuf, tmpbuf);
1270 else
1271 break;
1272 1250
1273 /* Note that the value this returns is not based on level */ 1251 /* Note that the value this returns is not based on level */
1274 tmp = get_next_mon (tmp); 1252 tmp = get_next_mon (tmp);
1275 } 1253 }
1276 1254
1277#ifdef BOOK_MSG_DEBUG
1278 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1279 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1280#endif
1281
1282 return retbuf; 1255 return buf;
1283} 1256}
1284 1257
1285 1258
1286/***************************************************************************** 1259/*****************************************************************************
1287 * Artifact msg generation code. 1260 * Artifact msg generation code.
1288 ****************************************************************************/ 1261 ****************************************************************************/
1289 1262
1290/* artifact_msg() - generate a message detailing the properties 1263/* artifact_msg() - generate a message detailing the properties
1291 * of 1-6 artifacts drawn sequentially from the artifact list. 1264 * of 1-6 artifacts drawn sequentially from the artifact list.
1292 */ 1265 */
1293const char * 1266static const char *
1294artifact_msg (int level, int booksize) 1267artifact_msg (int level, int booksize)
1295{ 1268{
1296 artifactlist *al = NULL; 1269 artifactlist *al = NULL;
1297 artifact *art; 1270 artifact *art;
1298 int chance, i, type, index; 1271 int chance, i, type, index;
1299 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;
1300 const char *ch; 1273 const char *ch;
1301 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1274 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1302 static char retbuf[BOOK_BUF]; 1275 static char retbuf[BOOK_BUF];
1303 object *tmp = NULL; 1276 object *tmp = NULL;
1304 1277
… …
1312 * for that type exists! 1285 * for that type exists!
1313 */ 1286 */
1314 i = 0; 1287 i = 0;
1315 do 1288 do
1316 { 1289 {
1317 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1290 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1318 type = art_name_array[index].type; 1291 type = art_name_array[index].type;
1319 al = find_artifactlist (type); 1292 al = find_artifactlist (type);
1320 i++; 1293 i++;
1321 } 1294 }
1322 while ((al == NULL) && (i < 10)); 1295 while ((al == NULL) && (i < 10));
… …
1325 return "None"; 1298 return "None";
1326 1299
1327 /* There is no reason to start on the artifact list at the begining. Lets 1300 /* There is no reason to start on the artifact list at the begining. Lets
1328 * take our starting position randomly... */ 1301 * take our starting position randomly... */
1329 art = al->items; 1302 art = al->items;
1330 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1303 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1331 { 1304 {
1332 if (art == NULL) 1305 if (!art)
1333 art = al->items; /* hmm, out of stuff, loop back around */ 1306 art = al->items; /* hmm, out of stuff, loop back around */
1307
1334 art = art->next; 1308 art = art->next;
1335 } 1309 }
1336 1310
1337 /* the base 'generic' name for our artifact */ 1311 /* the base 'generic' name for our artifact */
1338 assign (name, art_name_array[index].name); 1312 assign (name, art_name_array[index].name);
… …
1351 1325
1352 /* separator of items */ 1326 /* separator of items */
1353 strcpy (buf, "--- \n"); 1327 strcpy (buf, "--- \n");
1354 1328
1355 /* Name */ 1329 /* Name */
1356 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1330 if (art->allowed && art->allowed->name != shstr_All)
1357 { 1331 {
1358 linked_char *temp, *next = art->allowed; 1332 linked_char *temp, *next = art->allowed;
1359 1333
1360 do 1334 do
1361 { 1335 {
1362 temp = next; 1336 temp = next;
1363 next = next->next; 1337 next = next->next;
1364 } 1338 }
1365 while (next && !RANDOM () % 2); 1339 while (next && rndm (2));
1366 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1340 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name);
1367 } 1341 }
1368 else /* default name is used */ 1342 else /* default name is used */
1369 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1343 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name);
1370 1344
… …
1383 /* value of artifact */ 1357 /* value of artifact */
1384 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1358 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value);
1385 1359
1386 /* include the message about the artifact, if exists, and book 1360 /* include the message about the artifact, if exists, and book
1387 * level is kinda high */ 1361 * level is kinda high */
1388 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1362 if (art->item->msg
1363 && rndm (4) + 1 < level
1364 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1389 strcat (buf, art->item->msg); 1365 strcat (buf, art->item->msg);
1390 1366
1391 /* properties of the artifact */ 1367 /* properties of the artifact */
1392 tmp = object::create (); 1368 tmp = object::create ();
1393 add_abilities (tmp, art->item); 1369 add_abilities (tmp, art->item);
1394 tmp->type = type; 1370 tmp->type = type;
1395 SET_FLAG (tmp, FLAG_IDENTIFIED); 1371 SET_FLAG (tmp, FLAG_IDENTIFIED);
1396 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1372 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1)
1397 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1373 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch);
1398 tmp->destroy (true); 1374 tmp->destroy ();
1399 /* add the buf if it will fit */ 1375 /* add the buf if it will fit */
1400 if (!book_overflow (retbuf, buf, booksize)) 1376 if (!book_overflow (retbuf, buf, booksize))
1401 strcat (retbuf, buf); 1377 strcat (retbuf, buf);
1402 else 1378 else
1403 break; 1379 break;
… …
1405 art = art->next; 1381 art = art->next;
1406 book_entries--; 1382 book_entries--;
1407 } 1383 }
1408 1384
1409#ifdef BOOK_MSG_DEBUG 1385#ifdef BOOK_MSG_DEBUG
1410 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf)); 1386 LOG (llevDebug, "artifact_msg() created string: %d\n", strlen (retbuf));
1411 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1387 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1412#endif 1388#endif
1413 return retbuf; 1389 return retbuf;
1414} 1390}
1415 1391
1416/***************************************************************************** 1392/*****************************************************************************
… …
1419 1395
1420/* spellpath_msg() - generate a message detailing the member 1396/* spellpath_msg() - generate a message detailing the member
1421 * incantations/prayers (and some of their properties) belonging to 1397 * incantations/prayers (and some of their properties) belonging to
1422 * a given spellpath. 1398 * a given spellpath.
1423 */ 1399 */
1424 1400static char *
1425char *
1426spellpath_msg (int level, int booksize) 1401spellpath_msg (int level, int booksize)
1427{ 1402{
1428 static char retbuf[BOOK_BUF]; 1403 static char retbuf[BOOK_BUF];
1429 char tmpbuf[BOOK_BUF]; 1404 char tmpbuf[BOOK_BUF];
1430 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1405 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1431 int did_first_sp = 0; 1406 int did_first_sp = 0;
1432 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1407 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1433 archetype *at; 1408 archetype *at;
1434 1409
1435 /* Preamble */ 1410 /* Preamble */
… …
1463 } 1438 }
1464 } 1439 }
1465 /* Geez, no spells were generated. */ 1440 /* Geez, no spells were generated. */
1466 if (!did_first_sp) 1441 if (!did_first_sp)
1467 { 1442 {
1468 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1443 if (rndm (4)) /* usually, lets make a recursive call... */
1469 spellpath_msg (level, booksize); 1444 spellpath_msg (level, booksize);
1470 else /* give up, cause knowing no spells exist for path is info too. */ 1445 else /* give up, cause knowing no spells exist for path is info too. */
1471 strcat (retbuf, "\n - no known spells exist -\n"); 1446 strcat (retbuf, "\n - no known spells exist -\n");
1472 } 1447 }
1473 else 1448 else
1474 { 1449 {
1475 strcat (retbuf, "\n"); 1450 strcat (retbuf, "\n");
1476 } 1451 }
1452
1453#ifdef BOOK_MSG_DEBUG
1454 LOG (llevDebug, "spellpath_msg() created string: %d\n", strlen (retbuf));
1455 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1456#endif
1477 return retbuf; 1457 return retbuf;
1478} 1458}
1479 1459
1480/* formula_msg() - generate a message detailing the properties 1460/* formula_msg() - generate a message detailing the properties
1481 * of a randomly selected alchemical formula. 1461 * of a randomly selected alchemical formula.
1482 */ 1462 */
1483void 1463static void
1484make_formula_book (object *book, int level) 1464make_formula_book (object *book, int level)
1485{ 1465{
1486 char retbuf[BOOK_BUF], title[MAX_BUF]; 1466 char retbuf[BOOK_BUF], title[MAX_BUF];
1487 recipelist *fl; 1467 recipelist *fl;
1488 recipe *formula = NULL; 1468 recipe *formula = NULL;
1489 int chance; 1469 int chance;
1490 1470
1491 /* the higher the book level, the more complex (ie number of 1471 /* the higher the book level, the more complex (ie number of
1492 * ingredients) the formula can be. 1472 * ingredients) the formula can be.
1493 */ 1473 */
1494 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1474 fl = get_formulalist (rndm (level) / 3 + 1);
1495 1475
1496 if (!fl) 1476 if (!fl)
1497 fl = get_formulalist (1); /* safety */ 1477 fl = get_formulalist (1); /* safety */
1498 1478
1499 if (fl->total_chance == 0) 1479 if (fl->total_chance == 0)
… …
1503 add_author (book, 4); 1483 add_author (book, 4);
1504 return; 1484 return;
1505 } 1485 }
1506 1486
1507 /* get a random formula, weighted by its bookchance */ 1487 /* get a random formula, weighted by its bookchance */
1508 chance = RANDOM () % fl->total_chance; 1488 chance = rndm (fl->total_chance);
1509 for (formula = fl->items; formula != NULL; formula = formula->next) 1489 for (formula = fl->items; formula; formula = formula->next)
1510 { 1490 {
1511 chance -= formula->chance; 1491 chance -= formula->chance;
1512 if (chance <= 0) 1492 if (chance <= 0)
1513 break; 1493 break;
1514 } 1494 }
… …
1524 { 1504 {
1525 /* looks like a formula was found. Base the amount 1505 /* looks like a formula was found. Base the amount
1526 * of information on the booklevel and the spellevel 1506 * of information on the booklevel and the spellevel
1527 * of the formula. */ 1507 * of the formula. */
1528 1508
1529 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1509 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1530 archetype *at; 1510 archetype *at;
1531 1511
1532 /* preamble */ 1512 /* preamble */
1533 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1513 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1534 1514
… …
1536 op_name = at->object::name; 1516 op_name = at->object::name;
1537 else 1517 else
1538 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1518 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1539 1519
1540 /* item name */ 1520 /* item name */
1541 if (strcmp (formula->title, "NONE")) 1521 if (formula->title != shstr_NONE)
1542 { 1522 {
1543 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title); 1523 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1544 /* This results in things like pile of philo. sulfur. 1524 /* This results in things like pile of philo. sulfur.
1545 * while philo. sulfur may look better, without this, 1525 * while philo. sulfur may look better, without this,
1546 * you get things like 'the wise' because its missing the 1526 * you get things like 'the wise' because its missing the
1547 * water of section. 1527 * water of section.
1548 */ 1528 */
1549 sprintf (title, "%s: %s of %s", 1529 sprintf (title, "%s: %s of %s",
1550 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1530 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1551 } 1531 }
1552 else 1532 else
1553 { 1533 {
1554 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1534 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1555 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1535 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1556 if (at->title) 1536 if (at->title)
1557 { 1537 {
1558 strcat (retbuf, " "); 1538 strcat (retbuf, " ");
1559 strcat (retbuf, at->title); 1539 strcat (retbuf, at->title);
1560 strcat (title, " "); 1540 strcat (title, " ");
1561 strcat (title, at->title); 1541 strcat (title, at->title);
1562 } 1542 }
1563 } 1543 }
1544
1564 /* Lets name the book something meaningful ! */ 1545 /* Lets name the book something meaningful ! */
1565 book->name = title; 1546 book->name = title;
1566 book->title = NULL; 1547 book->title = NULL;
1567 1548
1568 /* ingredients to make it */ 1549 /* ingredients to make it */
… …
1607 } 1588 }
1608 1589
1609/* god_info_msg() - generate a message detailing the properties 1590/* god_info_msg() - generate a message detailing the properties
1610 * of a random god. Used by the book hack. b.t. 1591 * of a random god. Used by the book hack. b.t.
1611 */ 1592 */
1612const char * 1593static const char *
1613god_info_msg (int level, int booksize) 1594god_info_msg (int level, int booksize)
1614{ 1595{
1615 static char retbuf[BOOK_BUF]; 1596 static char retbuf[BOOK_BUF];
1616 const char *name = NULL; 1597 const char *name = NULL;
1617 char buf[BOOK_BUF]; 1598 char buf[BOOK_BUF];
… …
1644 * this ... 1625 * this ...
1645 */ 1626 */
1646 while (level > 0) 1627 while (level > 0)
1647 { 1628 {
1648 sprintf (buf, " "); 1629 sprintf (buf, " ");
1649 if (level == 2 && RANDOM () % 2) 1630 if (level == 2 && rndm (2))
1650 { /* enemy god */ 1631 { /* enemy god */
1651 const char *enemy = god->title; 1632 const char *enemy = god->title;
1652 1633
1653 if (enemy) 1634 if (enemy)
1654 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1635 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1655 } 1636 }
1656 1637
1657 if (level == 3 && RANDOM () % 2) 1638 if (level == 3 && rndm (2))
1658 { /* enemy race, what the god's holy word effects */ 1639 { /* enemy race, what the god's holy word effects */
1659 const char *enemy = god->slaying; 1640 const char *enemy = god->slaying;
1660 1641
1661 if (enemy && !(god->path_denied & PATH_TURNING)) 1642 if (enemy && !(god->path_denied & PATH_TURNING))
1662 if ((i = nstrtok (enemy, ",")) > 0) 1643 if ((i = nstrtok (enemy, ",")) > 0)
… …
1671 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1652 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1672 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1653 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1673 } 1654 }
1674 } 1655 }
1675 1656
1676 if (level == 4 && RANDOM () % 2) 1657 if (level == 4 && rndm (2))
1677 { /* Priest of god gets these protect,vulnerable... */ 1658 { /* Priest of god gets these protect,vulnerable... */
1678 char tmpbuf[MAX_BUF]; 1659 char tmpbuf[MAX_BUF];
1679 1660
1680 if (const char *cp = describe_resistance (god, 1)) 1661 if (const char *cp = describe_resistance (god, 1))
1681 { /* This god does have protections */ 1662 { /* This god does have protections */
… …
1687 } 1668 }
1688 else 1669 else
1689 sprintf (buf, " "); 1670 sprintf (buf, " ");
1690 } 1671 }
1691 1672
1692 if (level == 5 && RANDOM () % 2) 1673 if (level == 5 && rndm (2))
1693 { /* aligned race, summoning */ 1674 { /* aligned race, summoning */
1694 const char *race = god->race; /* aligned race */ 1675 const char *race = god->race; /* aligned race */
1695 1676
1696 if (race && !(god->path_denied & PATH_SUMMON)) 1677 if (race && !(god->path_denied & PATH_SUMMON))
1697 if ((i = nstrtok (race, ",")) > 0) 1678 if ((i = nstrtok (race, ",")) > 0)
… …
1705 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1686 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1706 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1687 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1707 } 1688 }
1708 } 1689 }
1709 1690
1710 if (level == 6 && RANDOM () % 2) 1691 if (level == 6 && rndm (2))
1711 { /* blessing,curse properties of the god */ 1692 { /* blessing,curse properties of the god */
1712 char tmpbuf[MAX_BUF]; 1693 char tmpbuf[MAX_BUF];
1713 1694
1714 if (const char *cp = describe_resistance (god, 1)) 1695 if (const char *cp = describe_resistance (god, 1))
1715 { /* This god does have protections */ 1696 { /* This god does have protections */
… …
1722 else 1703 else
1723 sprintf (buf, " "); 1704 sprintf (buf, " ");
1724 1705
1725 } 1706 }
1726 1707
1727 if (level == 8 && RANDOM () % 2) 1708 if (level == 8 && rndm (2))
1728 { /* immunity, holy possession */ 1709 { /* immunity, holy possession */
1729 int has_effect = 0, tmpvar; 1710 int has_effect = 0, tmpvar;
1730 char tmpbuf[MAX_BUF]; 1711 char tmpbuf[MAX_BUF];
1731 1712
1732 sprintf (tmpbuf, "\n"); 1713 sprintf (tmpbuf, "\n");
… …
1750 } 1731 }
1751 else 1732 else
1752 sprintf (buf, " "); 1733 sprintf (buf, " ");
1753 } 1734 }
1754 1735
1755 if (level == 12 && RANDOM () % 2) 1736 if (level == 12 && rndm (2))
1756 { /* spell paths */ 1737 { /* spell paths */
1757 int has_effect = 0, tmpvar; 1738 int has_effect = 0, tmpvar;
1758 char tmpbuf[MAX_BUF]; 1739 char tmpbuf[MAX_BUF];
1759 1740
1760 sprintf (tmpbuf, "\n"); 1741 sprintf (tmpbuf, "\n");
… …
1804 { /* we got no information beyond the preamble! */ 1785 { /* we got no information beyond the preamble! */
1805 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1786 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1806 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1787 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1807 } 1788 }
1808#ifdef BOOK_MSG_DEBUG 1789#ifdef BOOK_MSG_DEBUG
1809 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf)); 1790 LOG (llevDebug, "\n god_info_msg() created string: %d\n", strlen (retbuf));
1810 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1791 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1811#endif 1792#endif
1812 return retbuf; 1793 return retbuf;
1813} 1794}
1814 1795
1815/* tailor_readable_ob()- The main routine. This chooses a random 1796/* tailor_readable_ob()- The main routine. This chooses a random
… …
1830 */ 1811 */
1831void 1812void
1832tailor_readable_ob (object *book, int msg_type) 1813tailor_readable_ob (object *book, int msg_type)
1833{ 1814{
1834 char msgbuf[BOOK_BUF]; 1815 char msgbuf[BOOK_BUF];
1835 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1816 int level = book->level ? rndm (book->level) + 1 : 1;
1836 int book_buf_size; 1817 int book_buf_size;
1837 1818
1838 /* safety */ 1819 /* safety */
1839 if (book->type != BOOK) 1820 if (book->type != BOOK)
1840 return; 1821 return;
… …
1854 * 2) make sure there is an entry in max_titles[] array. 1835 * 2) make sure there is an entry in max_titles[] array.
1855 * 3) make sure there are entries for your case in new_text_title() 1836 * 3) make sure there are entries for your case in new_text_title()
1856 * and add_authour(). 1837 * and add_authour().
1857 * 4) you may want separate authour/book name arrays in read.h 1838 * 4) you may want separate authour/book name arrays in read.h
1858 */ 1839 */
1859 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 8); 1840 msg_type = msg_type > 0 ? msg_type : rndm (8);
1860 switch (msg_type) 1841 switch (msg_type)
1861 { 1842 {
1862 case 1: /* monster attrib */ 1843 case 1: /* monster attrib */
1863 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1844 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1864 break; 1845 break;

Diff Legend

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