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.38 by root, Sat Dec 27 02:31:19 2008 UTC vs.
Revision 1.45 by root, Thu Oct 15 22:50:41 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * 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)
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 (rndm (4)) 1080 if (rndm (4))
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;
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 ("B<< %s >>\r", &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 ? rndm (3) + rndm (3) + 2 : rndm (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];
1302 static char retbuf[BOOK_BUF];
1303 object *tmp = NULL; 1275 object *tmp = NULL;
1276
1277 static dynbuf_text buf; buf.clear ();
1304 1278
1305 /* values greater than 5 create msg buffers that are too big! */ 1279 /* values greater than 5 create msg buffers that are too big! */
1306 if (book_entries > 5) 1280 if (book_entries > 5)
1307 book_entries = 5; 1281 book_entries = 5;
1308 1282
1337 1311
1338 /* the base 'generic' name for our artifact */ 1312 /* the base 'generic' name for our artifact */
1339 assign (name, art_name_array[index].name); 1313 assign (name, art_name_array[index].name);
1340 1314
1341 /* Ok, lets print out the contents */ 1315 /* Ok, lets print out the contents */
1342 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");
1343 1319
1344 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1320 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1345 * 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)
1346 */ 1322 */
1347 while (book_entries > 0) 1323 while (book_entries > 0 && buf.size () < BOOK_BUF)
1348 { 1324 {
1349 1325
1350 if (art == NULL) 1326 if (!art)
1351 art = al->items; 1327 art = al->items;
1352 1328
1353 /* separator of items */ 1329 buf << '\n';
1354 strcpy (buf, "--- \n");
1355 1330
1356 /* Name */ 1331 /* Name */
1357 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1332 if (art->allowed && art->allowed->name != shstr_All)
1358 { 1333 {
1359 linked_char *temp, *next = art->allowed; 1334 linked_char *temp, *next = art->allowed;
1360 1335
1361 do 1336 do
1362 { 1337 {
1363 temp = next; 1338 temp = next;
1364 next = next->next; 1339 next = next->next;
1365 } 1340 }
1366 while (next && rndm (2)); 1341 while (next && rndm (2));
1342
1367 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);
1368 } 1344 }
1369 else /* default name is used */ 1345 else /* default name is used */
1370 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 ";
1371 1349
1372 /* chance of finding */ 1350 /* chance of finding */
1373 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1351 chance = (int) (100 * ((float) art->chance / al->total_chance));
1374 if (chance >= 20) 1352 if (chance >= 20)
1375 sprintf (sbuf, "an uncommon"); 1353 buf << "an uncommon";
1376 else if (chance >= 10) 1354 else if (chance >= 10)
1377 sprintf (sbuf, "an unusual"); 1355 buf << "an unusual";
1378 else if (chance >= 5) 1356 else if (chance >= 5)
1379 sprintf (sbuf, "a rare"); 1357 buf << "a rare";
1380 else 1358 else
1381 sprintf (sbuf, "a very rare"); 1359 buf << "a very rare";
1382 sprintf (buf, "%s is %s\n", buf, sbuf);
1383 1360
1384 /* value of artifact */ 1361 /* value of artifact */
1385 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";
1386 1363
1387 /* include the message about the artifact, if exists, and book 1364 /* include the message about the artifact, if exists, and book
1388 * level is kinda high */ 1365 * level is kinda high */
1389 if (art->item->msg 1366 if (art->item->msg
1390 && rndm (4) + 1 < level 1367 && rndm (4) + 1 < level)
1391 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
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 = rndm (NRSPELLPATHS), prayers = rndm (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 (rndm (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;
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
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 */
1610 } 1567 }
1611 1568
1612/* god_info_msg() - generate a message detailing the properties 1569/* god_info_msg() - generate a message detailing the properties
1613 * of a random god. Used by the book hack. b.t. 1570 * of a random god. Used by the book hack. b.t.
1614 */ 1571 */
1615const char * 1572static const char *
1616god_info_msg (int level, int booksize) 1573god_info_msg (int level, int booksize)
1617{ 1574{
1618 static char retbuf[BOOK_BUF]; 1575 static char retbuf[BOOK_BUF];
1619 const char *name = NULL; 1576 const char *name = NULL;
1620 char buf[BOOK_BUF]; 1577 char buf[BOOK_BUF];
1807 { /* we got no information beyond the preamble! */ 1764 { /* we got no information beyond the preamble! */
1808 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1765 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1809 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1766 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1810 } 1767 }
1811#ifdef BOOK_MSG_DEBUG 1768#ifdef BOOK_MSG_DEBUG
1812 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));
1813 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1770 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1814#endif 1771#endif
1815 return retbuf; 1772 return retbuf;
1816} 1773}
1817 1774
1818/* tailor_readable_ob()- The main routine. This chooses a random 1775/* tailor_readable_ob()- The main routine. This chooses a random
1858 * 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()
1859 * and add_authour(). 1816 * and add_authour().
1860 * 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
1861 */ 1818 */
1862 msg_type = msg_type > 0 ? msg_type : rndm (8); 1819 msg_type = msg_type > 0 ? msg_type : rndm (8);
1863 switch (msg_type) 1820 switch (msg_type*0+2)//D
1864 { 1821 {
1865 case 1: /* monster attrib */ 1822 case 1: /* monster attrib */
1866 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1823 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1867 break; 1824 break;
1868 case 2: /* artifact attrib */ 1825 case 2: /* artifact attrib */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines