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.42 by sf-marcmagus, Thu Oct 15 16:00:37 2009 UTC vs.
Revision 1.46 by root, Thu Oct 15 23:02:28 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
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
… …
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.
… …
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];
… …
992 * levels and architypes. -b.t. 986 * levels and architypes. -b.t.
993 */ 987 */
994 988
995#define MAX_TITLE_CHECK 20 989#define MAX_TITLE_CHECK 20
996 990
997void 991static void
998change_book (object *book, int msgtype) 992change_book (object *book, int msgtype)
999{ 993{
1000 int nbr = sizeof (book_descrpt) / sizeof (char *); 994 int nbr = sizeof (book_descrpt) / sizeof (char *);
1001 995
1002 switch (book->type) 996 switch (book->type)
… …
1126 * 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,
1127 * then only monsters greater than that level will be returned. 1121 * then only monsters greater than that level will be returned.
1128 * Changed 971225 to be greater than equal to level passed. Also 1122 * Changed 971225 to be greater than equal to level passed. Also
1129 * made choosing by level more random. 1123 * made choosing by level more random.
1130 */ 1124 */
1131
1132object * 1125object *
1133get_random_mon (int level) 1126get_random_mon (int level)
1134{ 1127{
1135 objectlink *mon = first_mon_info; 1128 objectlink *mon = first_mon_info;
1136 int i = 0, monnr; 1129 int i = 0, monnr;
… …
1194 1187
1195/* 1188/*
1196 * Returns a description of the monster. This really needs to be 1189 * Returns a description of the monster. This really needs to be
1197 * redone, as describe_item really gives a pretty internal description. 1190 * redone, as describe_item really gives a pretty internal description.
1198 */ 1191 */
1199 1192static const char *
1200char *
1201mon_desc (const object *mon) 1193mon_desc (const object *mon)
1202{ 1194{
1203 static char retbuf[HUGE_BUF]; 1195 static dynbuf_text buf; buf.clear ();
1204 1196
1205 sprintf (retbuf, " *** %s ***\n", &mon->name); 1197 buf.printf ("B<< %s >>\r", &mon->name);
1206 strcat (retbuf, describe_item (mon, NULL)); 1198 buf << describe_item (mon, 0);
1207 1199
1208 return retbuf; 1200 return buf;
1209} 1201}
1210 1202
1211 1203
1212/* 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
1213 * 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
1214 * calling function (mon_info_msg) seems to expect that. 1206 * calling function (mon_info_msg) seems to expect that.
1215 */ 1207 */
1216 1208static object *
1217object *
1218get_next_mon (object *tmp) 1209get_next_mon (object *tmp)
1219{ 1210{
1220 objectlink *mon; 1211 objectlink *mon;
1221 1212
1222 for (mon = first_mon_info; mon; mon = mon->next) 1213 for (mon = first_mon_info; mon; mon = mon->next)
… …
1231 else 1222 else
1232 return first_mon_info->ob; 1223 return first_mon_info->ob;
1233 1224
1234} 1225}
1235 1226
1236
1237
1238/* mon_info_msg() - generate a message detailing the properties 1227/* mon_info_msg() - generate a message detailing the properties
1239 * of a randomly selected monster. 1228 * of a randomly selected monster.
1240 */ 1229 */
1241 1230static const char *
1242char *
1243mon_info_msg (int level, int booksize) 1231mon_info_msg (int level, int booksize)
1244{ 1232{
1245 static char retbuf[BOOK_BUF]; 1233 static dynbuf_text buf; buf.clear ();
1246 char tmpbuf[HUGE_BUF];
1247 object *tmp;
1248 1234
1249 /*preamble */ 1235 /*preamble */
1250 strcpy (retbuf, "This beastiary contains:"); 1236 buf << "This beastiary contains:\n";
1251 1237
1252 /* 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
1253 * document. 1239 * document.
1254 * 8-96 Had to change this a bit, otherwise there would 1240 * 8-96 Had to change this a bit, otherwise there would
1255 * have been an impossibly large number of combinations 1241 * have been an impossibly large number of combinations
1256 * of text! (and flood out the available number of titles 1242 * of text! (and flood out the available number of titles
1257 * in the archive in a snap!) -b.t. 1243 * in the archive in a snap!) -b.t.
1258 */ 1244 */
1259 tmp = get_random_mon (level * 3); 1245 object *tmp = get_random_mon (level * 3);
1260 while (tmp) 1246 while (tmp && buf.size () < BOOK_BUF)
1261 { 1247 {
1262 /* monster description */ 1248 /* monster description */
1263 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1249 buf.printf ("\n%s\n", mon_desc (tmp));
1264
1265 if (!book_overflow (retbuf, tmpbuf, booksize))
1266 strcat (retbuf, tmpbuf);
1267 else
1268 break;
1269 1250
1270 /* Note that the value this returns is not based on level */ 1251 /* Note that the value this returns is not based on level */
1271 tmp = get_next_mon (tmp); 1252 tmp = get_next_mon (tmp);
1272 } 1253 }
1273 1254
1274#ifdef BOOK_MSG_DEBUG
1275 LOG (llevDebug, "\n mon_info_msg() created string: %d\n", strlen (retbuf));
1276 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1277#endif
1278
1279 return retbuf; 1255 return buf;
1280} 1256}
1281 1257
1282 1258
1283/***************************************************************************** 1259/*****************************************************************************
1284 * Artifact msg generation code. 1260 * Artifact msg generation code.
1285 ****************************************************************************/ 1261 ****************************************************************************/
1286 1262
1287/* artifact_msg() - generate a message detailing the properties 1263/* artifact_msg() - generate a message detailing the properties
1288 * of 1-6 artifacts drawn sequentially from the artifact list. 1264 * of 1-6 artifacts drawn sequentially from the artifact list.
1289 */ 1265 */
1290const char * 1266static const char *
1291artifact_msg (int level, int booksize) 1267artifact_msg (int level, int booksize)
1292{ 1268{
1293 artifactlist *al = NULL; 1269 artifactlist *al = NULL;
1294 artifact *art; 1270 artifact *art;
1295 int chance, i, type, index; 1271 int chance, i, type, index;
1296 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;
1297 const char *ch; 1273 const char *ch;
1298 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1274 char name[MAX_BUF];
1299 static char retbuf[BOOK_BUF];
1300 object *tmp = NULL; 1275 object *tmp = NULL;
1276
1277 static dynbuf_text buf; buf.clear ();
1301 1278
1302 /* values greater than 5 create msg buffers that are too big! */ 1279 /* values greater than 5 create msg buffers that are too big! */
1303 if (book_entries > 5) 1280 if (book_entries > 5)
1304 book_entries = 5; 1281 book_entries = 5;
1305 1282
… …
1334 1311
1335 /* the base 'generic' name for our artifact */ 1312 /* the base 'generic' name for our artifact */
1336 assign (name, art_name_array[index].name); 1313 assign (name, art_name_array[index].name);
1337 1314
1338 /* Ok, lets print out the contents */ 1315 /* Ok, lets print out the contents */
1339 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");
1340 1319
1341 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1320 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1342 * 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)
1343 */ 1322 */
1344 while (book_entries > 0) 1323 while (book_entries > 0 && buf.size () < BOOK_BUF)
1345 { 1324 {
1346 1325
1347 if (art == NULL) 1326 if (!art)
1348 art = al->items; 1327 art = al->items;
1349 1328
1350 /* separator of items */ 1329 buf << '\n';
1351 strcpy (buf, "--- \n");
1352 1330
1353 /* Name */ 1331 /* Name */
1354 if (art->allowed && art->allowed->name != shstr_All) 1332 if (art->allowed && art->allowed->name != shstr_All)
1355 { 1333 {
1356 linked_char *temp, *next = art->allowed; 1334 linked_char *temp, *next = art->allowed;
… …
1359 { 1337 {
1360 temp = next; 1338 temp = next;
1361 next = next->next; 1339 next = next->next;
1362 } 1340 }
1363 while (next && rndm (2)); 1341 while (next && rndm (2));
1342
1364 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);
1365 } 1344 }
1366 else /* default name is used */ 1345 else /* default name is used */
1367 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 ";
1368 1349
1369 /* chance of finding */ 1350 /* chance of finding */
1370 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1351 chance = (int) (100 * ((float) art->chance / al->total_chance));
1371 if (chance >= 20) 1352 if (chance >= 20)
1372 sprintf (sbuf, "an uncommon"); 1353 buf << "an uncommon";
1373 else if (chance >= 10) 1354 else if (chance >= 10)
1374 sprintf (sbuf, "an unusual"); 1355 buf << "an unusual";
1375 else if (chance >= 5) 1356 else if (chance >= 5)
1376 sprintf (sbuf, "a rare"); 1357 buf << "a rare";
1377 else 1358 else
1378 sprintf (sbuf, "a very rare"); 1359 buf << "a very rare";
1379 sprintf (buf, "%s is %s\n", buf, sbuf);
1380 1360
1381 /* value of artifact */ 1361 /* value of artifact */
1382 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";
1383 1363
1384 /* include the message about the artifact, if exists, and book 1364 /* include the message about the artifact, if exists, and book
1385 * level is kinda high */ 1365 * level is kinda high */
1386 if (art->item->msg 1366 if (art->item->msg
1387 && rndm (4) + 1 < level 1367 && rndm (4) + 1 < level)
1388 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1389 strcat (buf, art->item->msg); 1368 buf << art->item->msg;
1390 1369
1391 /* properties of the artifact */ 1370 /* properties of the artifact */
1392 tmp = object::create (); 1371 tmp = object::create ();
1393 add_abilities (tmp, art->item); 1372 add_abilities (tmp, art->item);
1394 tmp->type = type; 1373 tmp->type = type;
1395 SET_FLAG (tmp, FLAG_IDENTIFIED); 1374 SET_FLAG (tmp, FLAG_IDENTIFIED);
1396 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1375 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1397 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1376 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1377
1398 tmp->destroy (); 1378 tmp->destroy ();
1399 /* add the buf if it will fit */
1400 if (!book_overflow (retbuf, buf, booksize))
1401 strcat (retbuf, buf);
1402 else
1403 break;
1404 1379
1405 art = art->next; 1380 art = art->next;
1406 book_entries--; 1381 book_entries--;
1407 } 1382 }
1408 1383
1409#ifdef BOOK_MSG_DEBUG
1410 LOG (llevDebug, "artifact_msg() created string: %d\n", strlen (retbuf));
1411 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1412#endif
1413 return retbuf; 1384 return buf;
1414} 1385}
1415 1386
1416/***************************************************************************** 1387/*****************************************************************************
1417 * Spellpath message generation 1388 * Spellpath message generation
1418 *****************************************************************************/ 1389 *****************************************************************************/
1419 1390
1420/* spellpath_msg() - generate a message detailing the member 1391/* spellpath_msg() - generate a message detailing the member
1421 * incantations/prayers (and some of their properties) belonging to 1392 * incantations/prayers (and some of their properties) belonging to
1422 * a given spellpath. 1393 * a given spellpath.
1423 */ 1394 */
1424 1395static char *
1425char *
1426spellpath_msg (int level, int booksize) 1396spellpath_msg (int level, int booksize)
1427{ 1397{
1398 static dynbuf_text buf; buf.clear ();
1399
1428 static char retbuf[BOOK_BUF]; 1400 static char retbuf[BOOK_BUF];
1429 char tmpbuf[BOOK_BUF]; 1401 char tmpbuf[BOOK_BUF];
1430 int path = rndm (NRSPELLPATHS), prayers = rndm (2); 1402 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1431 int did_first_sp = 0;
1432 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1403 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1433 archetype *at; 1404 archetype *at;
1434 1405
1435 /* Preamble */ 1406 /* Preamble */
1436 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");
1437 1409
1438 if (path == -1) 1410 if (path == -1)
1439 strcat (retbuf, "having no known spell path.\n"); 1411 buf << " having no known spell path.\n";
1440 else 1412 else
1441 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;
1442 1416
1443 for_all_archetypes (at) 1417 for_all_archetypes (at)
1444 {
1445 /* Determine if this is an appropriate spell. Must 1418 /* Determine if this is an appropriate spell. Must
1446 * be of matching path, must be of appropriate type (prayer 1419 * be of matching path, must be of appropriate type (prayer
1447 * or not), and must be within the valid level range. 1420 * or not), and must be within the valid level range.
1448 */ 1421 */
1449 if (at->type == SPELL && at->path_attuned & pnum && 1422 if (at->type == SPELL && at->path_attuned & pnum &&
1450 ((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)))
1451 { 1424 {
1452 assign (tmpbuf, at->object::name); 1425 seen = 1;
1453 1426 buf << at->object::name << '\r';
1454 if (book_overflow (retbuf, tmpbuf, booksize))
1455 break;
1456 else
1457 {
1458 if (did_first_sp)
1459 strcat (retbuf, ",\n");
1460 did_first_sp = 1;
1461 strcat (retbuf, tmpbuf);
1462 }
1463 } 1427 }
1464 } 1428
1465 /* Geez, no spells were generated. */ 1429 /* Geez, no spells were generated. */
1466 if (!did_first_sp) 1430 if (!seen)
1467 {
1468 if (rndm (4)) /* usually, lets make a recursive call... */ 1431 if (rndm (4)) /* usually, lets make a recursive call... */
1469 spellpath_msg (level, booksize); 1432 return spellpath_msg (level, booksize);
1470 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. */
1471 strcat (retbuf, "\n - no known spells exist -\n"); 1434 buf << "- no known spells exist.\n";
1472 }
1473 else
1474 {
1475 strcat (retbuf, "\n");
1476 }
1477 1435
1478#ifdef BOOK_MSG_DEBUG
1479 LOG (llevDebug, "spellpath_msg() created string: %d\n", strlen (retbuf));
1480 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1481#endif
1482 return retbuf; 1436 return buf;
1483} 1437}
1484 1438
1485/* formula_msg() - generate a message detailing the properties 1439/* formula_msg() - generate a message detailing the properties
1486 * of a randomly selected alchemical formula. 1440 * of a randomly selected alchemical formula.
1487 */ 1441 */
1488void 1442static void
1489make_formula_book (object *book, int level) 1443make_formula_book (object *book, int level)
1490{ 1444{
1491 char retbuf[BOOK_BUF], title[MAX_BUF]; 1445 char title[MAX_BUF];
1492 recipelist *fl; 1446 recipelist *fl;
1493 recipe *formula = NULL; 1447 recipe *formula = NULL;
1494 int chance; 1448 int chance;
1449
1450 static dynbuf_text buf; buf.clear ();
1495 1451
1496 /* the higher the book level, the more complex (ie number of 1452 /* the higher the book level, the more complex (ie number of
1497 * ingredients) the formula can be. 1453 * ingredients) the formula can be.
1498 */ 1454 */
1499 fl = get_formulalist (rndm (level) / 3 + 1); 1455 fl = get_formulalist (rndm (level) / 3 + 1);
… …
1512 /* get a random formula, weighted by its bookchance */ 1468 /* get a random formula, weighted by its bookchance */
1513 chance = rndm (fl->total_chance); 1469 chance = rndm (fl->total_chance);
1514 for (formula = fl->items; formula; formula = formula->next) 1470 for (formula = fl->items; formula; formula = formula->next)
1515 { 1471 {
1516 chance -= formula->chance; 1472 chance -= formula->chance;
1473
1517 if (chance <= 0) 1474 if (chance <= 0)
1518 break; 1475 break;
1519 } 1476 }
1520 1477
1521 if (!formula || formula->arch_names <= 0) 1478 if (!formula || formula->arch_names <= 0)
1522 { 1479 {
1523 book->msg = "<indecipherable text>\n"; 1480 book->msg = "<indecipherable text>\n";
1524 new_text_name (book, 4); 1481 new_text_name (book, 4);
1525 add_author (book, 4); 1482 add_author (book, 4);
1526 1483 return;
1527 } 1484 }
1485
1486 /* looks like a formula was found. Base the amount
1487 * of information on the booklevel and the spellevel
1488 * of the formula. */
1489
1490 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1491 archetype *at;
1492
1493 /* preamble */
1494 buf << "Herein is described a project using B<< "
1495 << (formula->skill ? &formula->skill : "an unknown skill")
1496 << " >>:\n\n";
1497
1498 if ((at = archetype::find (op_name)))
1499 op_name = at->object::name;
1528 else 1500 else
1501 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1502
1503 /* item name */
1504 if (formula->title != shstr_NONE)
1505 {
1506 buf.printf ("The B<< %s of %s >>", op_name, &formula->title);
1507 /* This results in things like pile of philo. sulfur.
1508 * while philo. sulfur may look better, without this,
1509 * you get things like 'the wise' because its missing the
1510 * water of section.
1511 */
1512 sprintf (title, "%s: %s of %s",
1513 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1529 { 1514 }
1530 /* looks like a formula was found. Base the amount 1515 else
1531 * of information on the booklevel and the spellevel 1516 {
1532 * of the formula. */ 1517 buf << "The B<< " << op_name;
1533 1518
1534 const char *op_name = formula->arch_name [rndm (formula->arch_names)]; 1519 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1520 if (at->title)
1521 {
1522 buf << " " << at->title;
1523 strcat (title, " ");
1524 strcat (title, at->title);
1525 }
1526
1527 buf << " >>";
1528 }
1529
1530 /* Lets name the book something meaningful ! */
1531 book->name = title;
1532 book->title = NULL;
1533
1534 /* ingredients to make it */
1535 if (formula->ingred)
1536 {
1537 linked_char *next;
1535 archetype *at; 1538 archetype *at;
1536 1539
1537 /* preamble */
1538 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1539
1540 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1541 op_name = at->object::name;
1542 else
1543 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1544
1545 /* item name */
1546 if (formula->title != shstr_NONE)
1547 {
1548 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1549 /* This results in things like pile of philo. sulfur.
1550 * while philo. sulfur may look better, without this,
1551 * you get things like 'the wise' because its missing the
1552 * water of section.
1553 */
1554 sprintf (title, "%s: %s of %s",
1555 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1556 }
1557 else
1558 {
1559 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1560 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1561 if (at->title)
1562 {
1563 strcat (retbuf, " ");
1564 strcat (retbuf, at->title);
1565 strcat (title, " ");
1566 strcat (title, at->title);
1567 }
1568 }
1569
1570 /* Lets name the book something meaningful ! */
1571 book->name = title;
1572 book->title = NULL;
1573
1574 /* ingredients to make it */
1575 if (formula->ingred != NULL)
1576 {
1577 linked_char *next;
1578 archetype *at;
1579
1580 at = archetype::find (formula->cauldron); 1540 at = archetype::find (formula->cauldron);
1581 1541
1582 sprintf (retbuf + strlen (retbuf), 1542 buf.printf (" may be made at %s using the following ingredients:\n\n",
1583 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place"); 1543 at ? query_name (at) : "an appropriate place");
1584 1544
1585 for (next = formula->ingred; next != NULL; next = next->next) 1545 for (next = formula->ingred; next; next = next->next)
1586 { 1546 buf << next->name << '\r';
1587 strcat (retbuf, next->name); 1547 }
1588 strcat (retbuf, "\n");
1589 }
1590 }
1591 else 1548 else
1592 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title); 1549 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title);
1593 if (retbuf[strlen (retbuf) - 1] != '\n')
1594 strcat (retbuf, "\n");
1595 1550
1596 book->msg = retbuf; 1551 book->msg = buf;
1597 }
1598} 1552}
1599 1553
1600#define DESCRIBE_PATH(retbuf, variable, name) \ 1554#define DESCRIBE_PATH(retbuf, variable, name) \
1601 if(variable) { \ 1555 if(variable) { \
1602 int i,j=0; \ 1556 int i,j=0; \
… …
1613 } 1567 }
1614 1568
1615/* god_info_msg() - generate a message detailing the properties 1569/* god_info_msg() - generate a message detailing the properties
1616 * of a random god. Used by the book hack. b.t. 1570 * of a random god. Used by the book hack. b.t.
1617 */ 1571 */
1618const char * 1572static const char *
1619god_info_msg (int level, int booksize) 1573god_info_msg (int level, int booksize)
1620{ 1574{
1621 static char retbuf[BOOK_BUF]; 1575 static char retbuf[BOOK_BUF];
1622 const char *name = NULL; 1576 const char *name = NULL;
1623 char buf[BOOK_BUF]; 1577 char buf[BOOK_BUF];
… …
1861 * 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()
1862 * and add_authour(). 1816 * and add_authour().
1863 * 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
1864 */ 1818 */
1865 msg_type = msg_type > 0 ? msg_type : rndm (8); 1819 msg_type = msg_type > 0 ? msg_type : rndm (8);
1866 switch (msg_type) 1820 switch (msg_type*0+4)//D
1867 { 1821 {
1868 case 1: /* monster attrib */ 1822 case 1: /* monster attrib */
1869 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1823 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1870 break; 1824 break;
1871 case 2: /* artifact attrib */ 1825 case 2: /* artifact attrib */

Diff Legend

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