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.17 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.26 by root, Mon Jun 4 12:19:08 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 (at your option) any later version. 11 * 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, but
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 GNU General Public License for more details. 16 * 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 GNU General Public License along
19 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23*/ 23 */
24
25 24
26/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
27 * to allow randomly occuring messages in non-magical texts. 26 * to allow randomly occuring messages in non-magical texts.
28 */ 27 */
29 28
… …
188 {"Shield", SHIELD}, 187 {"Shield", SHIELD},
189 {"Bracers", BRACERS}, 188 {"Bracers", BRACERS},
190 {"Boots", BOOTS}, 189 {"Boots", BOOTS},
191 {"Cloak", CLOAK}, 190 {"Cloak", CLOAK},
192 {"Gloves", GLOVES}, 191 {"Gloves", GLOVES},
193 {"Gridle", GIRDLE}, 192 {"Girdle", GIRDLE},
194 {"Ring", RING}, 193 {"Ring", RING},
195 {"Horn", HORN}, 194 {"Horn", HORN},
196 {"Missile Weapon", BOW}, 195 {"Missile Weapon", BOW},
197 {"Missile", ARROW}, 196 {"Missile", ARROW},
198 {"Hand Weapon", WEAPON}, 197 {"Hand Weapon", WEAPON},
… …
641 * 640 *
642 * Start of initialisation related functions. 641 * Start of initialisation related functions.
643 * 642 *
644 ****************************************************************************/ 643 ****************************************************************************/
645 644
646/* init_msgfile() - if not called before, initialise the info list
647 * reads the messages file into the list pointed to by first_msg
648*/
649
650static void
651init_msgfile (void)
652{
653 FILE *fp;
654 char buf[MAX_BUF], msgbuf[HUGE_BUF], fname[MAX_BUF], *cp;
655 int comp;
656 static int did_init_msgfile;
657
658 if (did_init_msgfile)
659 return;
660 did_init_msgfile = 1;
661
662 sprintf (fname, "%s/messages", settings.datadir);
663 LOG (llevDebug, "Reading messages from %s...\n", fname);
664
665 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
666 {
667 linked_char *tmp = NULL;
668
669 while (fgets (buf, MAX_BUF, fp) != NULL)
670 {
671 if (*buf == '#')
672 continue;
673 if ((cp = strchr (buf, '\n')) != NULL)
674 *cp = '\0';
675 cp = buf;
676 while (*cp == ' ') /* Skip blanks */
677 cp++;
678 if (!strncmp (cp, "ENDMSG", 6))
679 {
680 if (strlen (msgbuf) > BOOK_BUF)
681 {
682 LOG (llevDebug, "Warning: this string exceeded max book buf size:");
683 LOG (llevDebug, " %s\n", msgbuf);
684 }
685 tmp->name = msgbuf;
686 tmp->next = first_msg;
687 first_msg = tmp;
688 nrofmsg++;
689 continue;
690 }
691 else if (!strncmp (cp, "MSG", 3))
692 {
693 tmp = new linked_char;
694
695 strcpy (msgbuf, " "); /* reset msgbuf for new message */
696 continue;
697 }
698 else if (!buf_overflow (msgbuf, cp, HUGE_BUF - 1))
699 {
700 strcat (msgbuf, cp);
701 strcat (msgbuf, "\n");
702 }
703 }
704 close_and_delete (fp, comp);
705 }
706
707#ifdef BOOK_MSG_DEBUG
708 LOG (llevDebug, "init_info_listfile() got %d messages.\n", nrofmsg);
709#endif
710 LOG (llevDebug, "done.\n");
711}
712
713
714/* init_book_archive() - if not called before, initialise the info list 645/* init_book_archive() - if not called before, initialise the info list
715 * This reads in the bookarch file into memory. bookarch is the file 646 * This reads in the bookarch file into memory. bookarch is the file
716 * created and updated across multiple runs of the program. 647 * created and updated across multiple runs of the program.
717 */ 648 */
718
719static void 649static void
720init_book_archive (void) 650init_book_archive (void)
721{ 651{
722 FILE *fp; 652 FILE *fp;
723 int comp, nroftitle = 0; 653 int comp, nroftitle = 0;
… …
835 } 765 }
836 766
837 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 767 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
838} 768}
839 769
840
841/* init_readable() - initialise linked lists utilized by 770/* init_readable() - initialise linked lists utilized by
842 * message functions in tailor_readable_ob() 771 * message functions in tailor_readable_ob()
843 * 772 *
844 * This is the function called by the main routine to initialise 773 * This is the function called by the main routine to initialise
845 * all the readable information. 774 * all the readable information.
846 */ 775 */
847
848void 776void
849init_readable (void) 777init_readable (void)
850{ 778{
851 static int did_this; 779 static int did_this;
852 780
… …
854 return; 782 return;
855 783
856 did_this = 1; 784 did_this = 1;
857 785
858 LOG (llevDebug, "Initialising reading data...\n"); 786 LOG (llevDebug, "Initialising reading data...\n");
859 init_msgfile ();
860 init_book_archive (); 787 init_book_archive ();
861 init_mon_info (); 788 init_mon_info ();
862 LOG (llevDebug, " Done\n"); 789 LOG (llevDebug, " Done\n");
863
864} 790}
865 791
866/***************************************************************************** 792/*****************************************************************************
867 * 793 *
868 * This is the start of the administrative functions when creating 794 * This is the start of the administrative functions when creating
869 * new books (ie, updating title and the like) 795 * new books (ie, updating title and the like)
870 * 796 *
871 *****************************************************************************/ 797 *****************************************************************************/
872 798
873
874/* find_title() - Search the titlelist (based on msgtype) to see if 799/* find_title() - Search the titlelist (based on msgtype) to see if
875 * book matches something already there. IF so, return that title. 800 * book matches something already there. IF so, return that title.
876 */ 801 */
877
878static title * 802static title *
879find_title (const object *book, int msgtype) 803find_title (const object *book, int msgtype)
880{ 804{
881 title *t = NULL; 805 title *t = NULL;
882 titlelist *tl = get_titlelist (msgtype); 806 titlelist *tl = get_titlelist (msgtype);
… …
919 if (book->type != BOOK) 843 if (book->type != BOOK)
920 return; 844 return;
921 845
922 switch (msgtype) 846 switch (msgtype)
923 { 847 {
924 case 1: /*monster */ 848 case 1: /*monster */
925 nbr = sizeof (mon_book_name) / sizeof (char *); 849 nbr = sizeof (mon_book_name) / sizeof (char *);
926 strcpy (name, mon_book_name[RANDOM () % nbr]); 850 assign (name, mon_book_name[rndm (nbr)]);
927 break; 851 break;
928 case 2: /*artifact */ 852 case 2: /*artifact */
929 nbr = sizeof (art_book_name) / sizeof (char *); 853 nbr = sizeof (art_book_name) / sizeof (char *);
930 strcpy (name, art_book_name[RANDOM () % nbr]); 854 assign (name, art_book_name[rndm (nbr)]);
931 break; 855 break;
932 case 3: /*spellpath */ 856 case 3: /*spellpath */
933 nbr = sizeof (path_book_name) / sizeof (char *); 857 nbr = sizeof (path_book_name) / sizeof (char *);
934 strcpy (name, path_book_name[RANDOM () % nbr]); 858 assign (name, path_book_name[rndm (nbr)]);
935 break; 859 break;
936 case 4: /*alchemy */ 860 case 4: /*alchemy */
937 nbr = sizeof (formula_book_name) / sizeof (char *); 861 nbr = sizeof (formula_book_name) / sizeof (char *);
938 strcpy (name, formula_book_name[RANDOM () % nbr]); 862 assign (name, formula_book_name[rndm (nbr)]);
939 break; 863 break;
940 case 5: /*gods */ 864 case 5: /*gods */
941 nbr = sizeof (gods_book_name) / sizeof (char *); 865 nbr = sizeof (gods_book_name) / sizeof (char *);
942 strcpy (name, gods_book_name[RANDOM () % nbr]); 866 assign (name, gods_book_name[rndm (nbr)]);
943 break; 867 break;
944 case 6: /*msg file */ 868 case 6: /*msg file */
945 default: 869 default:
946 if (book->weight > 2000) 870 if (book->weight > 2000)
947 { /* based on weight */ 871 { /* based on weight */
948 nbr = sizeof (heavy_book_name) / sizeof (char *); 872 nbr = sizeof (heavy_book_name) / sizeof (char *);
949 strcpy (name, heavy_book_name[RANDOM () % nbr]); 873 assign (name, heavy_book_name[rndm (nbr)]);
950 } 874 }
951 else if (book->weight < 2001) 875 else if (book->weight < 2001)
952 { 876 {
953 nbr = sizeof (light_book_name) / sizeof (char *); 877 nbr = sizeof (light_book_name) / sizeof (char *);
954 strcpy (name, light_book_name[RANDOM () % nbr]); 878 assign (name, light_book_name[rndm (nbr)]);
955 } 879 }
956 break; 880 break;
957 } 881 }
958 882
959 book->name = name; 883 book->name = name;
960} 884}
961 885
… …
973 if (msgtype < 0 || strlen (op->msg) < 5) 897 if (msgtype < 0 || strlen (op->msg) < 5)
974 return; 898 return;
975 899
976 switch (msgtype) 900 switch (msgtype)
977 { 901 {
978 case 1: /* monster */ 902 case 1: /* monster */
979 nbr = sizeof (mon_author) / sizeof (char *); 903 nbr = sizeof (mon_author) / sizeof (char *);
980 strcpy (name, mon_author[RANDOM () % nbr]); 904 assign (name, mon_author[rndm (nbr)]);
981 break; 905 break;
982 case 2: /* artifacts */ 906 case 2: /* artifacts */
983 nbr = sizeof (art_author) / sizeof (char *); 907 nbr = sizeof (art_author) / sizeof (char *);
984 strcpy (name, art_author[RANDOM () % nbr]); 908 assign (name, art_author[rndm (nbr)]);
985 break; 909 break;
986 case 3: /* spellpath */ 910 case 3: /* spellpath */
987 nbr = sizeof (path_author) / sizeof (char *); 911 nbr = sizeof (path_author) / sizeof (char *);
988 strcpy (name, path_author[RANDOM () % nbr]); 912 assign (name, path_author[rndm (nbr)]);
989 break; 913 break;
990 case 4: /* alchemy */ 914 case 4: /* alchemy */
991 nbr = sizeof (formula_author) / sizeof (char *); 915 nbr = sizeof (formula_author) / sizeof (char *);
992 strcpy (name, formula_author[RANDOM () % nbr]); 916 assign (name, formula_author[rndm (nbr)]);
993 break; 917 break;
994 case 5: /* gods */ 918 case 5: /* gods */
995 nbr = sizeof (gods_author) / sizeof (char *); 919 nbr = sizeof (gods_author) / sizeof (char *);
996 strcpy (name, gods_author[RANDOM () % nbr]); 920 assign (name, gods_author[rndm (nbr)]);
997 break; 921 break;
998 case 6: /* msg file */ 922 case 6: /* msg file */
999 default: 923 default:
1000 strcpy (name, book_author[RANDOM () % nbr]); 924 assign (name, book_author[rndm (nbr)]);
1001 } 925 }
1002 926
1003 sprintf (title, "of %s", name); 927 sprintf (title, "of %s", name);
1004 op->title = title; 928 op->title = title;
1005} 929}
… …
1045 t = get_empty_book (); 969 t = get_empty_book ();
1046 t->name = book->name; 970 t->name = book->name;
1047 t->authour = book->title; 971 t->authour = book->title;
1048 t->size = strlen (book->msg); 972 t->size = strlen (book->msg);
1049 t->msg_index = strtoint (book->msg); 973 t->msg_index = strtoint (book->msg);
1050 t->archname = book->arch->name; 974 t->archname = book->arch->archname;
1051 t->level = book->level; 975 t->level = book->level;
1052 976
1053 t->next = tl->first_book; 977 t->next = tl->first_book;
1054 tl->first_book = t; 978 tl->first_book = t;
1055 tl->number++; 979 tl->number++;
… …
1169 if (RANDOM () % 4) 1093 if (RANDOM () % 4)
1170 { 1094 {
1171 /* Lets give the book a description to individualize it some */ 1095 /* Lets give the book a description to individualize it some */
1172 char new_name[MAX_BUF]; 1096 char new_name[MAX_BUF];
1173 1097
1174 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[RANDOM () % nbr], old_name); 1098 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1175 1099
1176 book->name = new_name; 1100 book->name = new_name;
1177 } 1101 }
1178 else 1102 else
1179 { 1103 {
… …
1368 ****************************************************************************/ 1292 ****************************************************************************/
1369 1293
1370/* artifact_msg() - generate a message detailing the properties 1294/* artifact_msg() - generate a message detailing the properties
1371 * of 1-6 artifacts drawn sequentially from the artifact list. 1295 * of 1-6 artifacts drawn sequentially from the artifact list.
1372 */ 1296 */
1373 1297const char *
1374char *
1375artifact_msg (int level, int booksize) 1298artifact_msg (int level, int booksize)
1376{ 1299{
1377 artifactlist *al = NULL; 1300 artifactlist *al = NULL;
1378 artifact *art; 1301 artifact *art;
1379 int chance, i, type, index; 1302 int chance, i, type, index;
1380 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1303 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1;
1304 const char *ch;
1381 char *ch, name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1305 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1382 static char retbuf[BOOK_BUF]; 1306 static char retbuf[BOOK_BUF];
1383 object *tmp = NULL; 1307 object *tmp = NULL;
1384 1308
1385 /* values greater than 5 create msg buffers that are too big! */ 1309 /* values greater than 5 create msg buffers that are too big! */
1386 if (book_entries > 5) 1310 if (book_entries > 5)
… …
1400 i++; 1324 i++;
1401 } 1325 }
1402 while ((al == NULL) && (i < 10)); 1326 while ((al == NULL) && (i < 10));
1403 1327
1404 if (i == 10) /* Unable to find a message */ 1328 if (i == 10) /* Unable to find a message */
1405 return ("None"); 1329 return "None";
1406 1330
1407 /* There is no reason to start on the artifact list at the begining. Lets 1331 /* There is no reason to start on the artifact list at the begining. Lets
1408 * take our starting position randomly... */ 1332 * take our starting position randomly... */
1409 art = al->items; 1333 art = al->items;
1410 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1334 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--)
… …
1413 art = al->items; /* hmm, out of stuff, loop back around */ 1337 art = al->items; /* hmm, out of stuff, loop back around */
1414 art = art->next; 1338 art = art->next;
1415 } 1339 }
1416 1340
1417 /* the base 'generic' name for our artifact */ 1341 /* the base 'generic' name for our artifact */
1418 strcpy (name, art_name_array[index].name); 1342 assign (name, art_name_array[index].name);
1419 1343
1420 /* Ok, lets print out the contents */ 1344 /* Ok, lets print out the contents */
1421 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1345 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
1422 1346
1423 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1347 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
… …
1527 * or not), and must be within the valid level range. 1451 * or not), and must be within the valid level range.
1528 */ 1452 */
1529 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1453 if (at->clone.type == SPELL && at->clone.path_attuned & pnum &&
1530 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1454 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8)))
1531 { 1455 {
1532 strcpy (tmpbuf, at->clone.name); 1456 assign (tmpbuf, at->clone.name);
1533 1457
1534 if (book_overflow (retbuf, tmpbuf, booksize)) 1458 if (book_overflow (retbuf, tmpbuf, booksize))
1535 break; 1459 break;
1536 else 1460 else
1537 { 1461 {
… …
1555 strcat (retbuf, "\n"); 1479 strcat (retbuf, "\n");
1556 } 1480 }
1557 return retbuf; 1481 return retbuf;
1558} 1482}
1559 1483
1560
1561
1562/* formula_msg() - generate a message detailing the properties 1484/* formula_msg() - generate a message detailing the properties
1563 * of a randomly selected alchemical formula. 1485 * of a randomly selected alchemical formula.
1564 */ 1486 */
1565
1566void 1487void
1567make_formula_book (object *book, int level) 1488make_formula_book (object *book, int level)
1568{ 1489{
1569 char retbuf[BOOK_BUF], title[MAX_BUF]; 1490 char retbuf[BOOK_BUF], title[MAX_BUF];
1570 recipelist *fl; 1491 recipelist *fl;
… …
1672 1593
1673 book->msg = retbuf; 1594 book->msg = retbuf;
1674 } 1595 }
1675} 1596}
1676 1597
1677
1678/* msgfile_msg() - generate a message drawn randomly from a
1679 * file in lib/. Level currently has no effect on the message
1680 * which is returned.
1681 */
1682
1683char *
1684msgfile_msg (int level, int booksize)
1685{
1686 static char retbuf[BOOK_BUF];
1687 int i, msgnum;
1688 linked_char *msg = NULL;
1689
1690 /* get a random message for the 'book' from linked list */
1691 if (nrofmsg > 1)
1692 {
1693 msg = first_msg;
1694 msgnum = RANDOM () % nrofmsg;
1695 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1696 msg = msg->next;
1697 }
1698
1699 if (msg && !book_overflow (retbuf, msg->name, booksize))
1700 strcpy (retbuf, msg->name);
1701 else
1702 sprintf (retbuf, "\n <undecipherable text>");
1703
1704#ifdef BOOK_MSG_DEBUG
1705 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf));
1706 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1707#endif
1708
1709 return retbuf;
1710}
1711
1712
1713/* god_info_msg() - generate a message detailing the properties 1598/* god_info_msg() - generate a message detailing the properties
1714 * of a random god. Used by the book hack. b.t. 1599 * of a random god. Used by the book hack. b.t.
1715 */ 1600 */
1716
1717const char * 1601const char *
1718god_info_msg (int level, int booksize) 1602god_info_msg (int level, int booksize)
1719{ 1603{
1720 static char retbuf[BOOK_BUF]; 1604 static char retbuf[BOOK_BUF];
1721 const char *name = NULL; 1605 const char *name = NULL;
… …
1757 const char *enemy = god->title; 1641 const char *enemy = god->title;
1758 1642
1759 if (enemy) 1643 if (enemy)
1760 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1644 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1761 } 1645 }
1646
1762 if (level == 3 && RANDOM () % 2) 1647 if (level == 3 && RANDOM () % 2)
1763 { /* enemy race, what the god's holy word effects */ 1648 { /* enemy race, what the god's holy word effects */
1764 const char *enemy = god->slaying; 1649 const char *enemy = god->slaying;
1765 1650
1766 if (enemy && !(god->path_denied & PATH_TURNING)) 1651 if (enemy && !(god->path_denied & PATH_TURNING))
… …
1775 else 1660 else
1776 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1661 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1777 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1662 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1778 } 1663 }
1779 } 1664 }
1665
1780 if (level == 4 && RANDOM () % 2) 1666 if (level == 4 && RANDOM () % 2)
1781 { /* Priest of god gets these protect,vulnerable... */ 1667 { /* Priest of god gets these protect,vulnerable... */
1782 char tmpbuf[MAX_BUF], *cp; 1668 char tmpbuf[MAX_BUF];
1783 1669
1784 cp = describe_resistance (god, 1); 1670 if (const char *cp = describe_resistance (god, 1))
1785
1786 if (*cp)
1787 { /* This god does have protections */ 1671 { /* This god does have protections */
1788 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1672 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name);
1789 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1673 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n");
1790 strcat (tmpbuf, cp); 1674 strcat (tmpbuf, cp);
1791 strcat (buf, tmpbuf); 1675 strcat (buf, tmpbuf);
1792 strcat (buf, "\n ---\n"); 1676 strcat (buf, "\n ---\n");
1793 } 1677 }
1794 else 1678 else
1795 sprintf (buf, " "); 1679 sprintf (buf, " ");
1796 } 1680 }
1681
1797 if (level == 5 && RANDOM () % 2) 1682 if (level == 5 && RANDOM () % 2)
1798 { /* aligned race, summoning */ 1683 { /* aligned race, summoning */
1799 const char *race = god->race; /* aligned race */ 1684 const char *race = god->race; /* aligned race */
1800 1685
1801 if (race && !(god->path_denied & PATH_SUMMON)) 1686 if (race && !(god->path_denied & PATH_SUMMON))
… …
1809 else 1694 else
1810 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1695 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1811 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1696 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1812 } 1697 }
1813 } 1698 }
1699
1814 if (level == 6 && RANDOM () % 2) 1700 if (level == 6 && RANDOM () % 2)
1815 { /* blessing,curse properties of the god */ 1701 { /* blessing,curse properties of the god */
1816 char tmpbuf[MAX_BUF], *cp; 1702 char tmpbuf[MAX_BUF];
1817 1703
1818 cp = describe_resistance (god, 1); 1704 if (const char *cp = describe_resistance (god, 1))
1819
1820 if (*cp)
1821 { /* This god does have protections */ 1705 { /* This god does have protections */
1822 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1706 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name);
1823 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1707 strcat (tmpbuf, "bestow a blessing which makes the recipient\n");
1824 strcat (tmpbuf, cp); 1708 strcat (tmpbuf, cp);
1825 strcat (buf, tmpbuf); 1709 strcat (buf, tmpbuf);
… …
1827 } 1711 }
1828 else 1712 else
1829 sprintf (buf, " "); 1713 sprintf (buf, " ");
1830 1714
1831 } 1715 }
1716
1832 if (level == 8 && RANDOM () % 2) 1717 if (level == 8 && RANDOM () % 2)
1833 { /* immunity, holy possession */ 1718 { /* immunity, holy possession */
1834 int has_effect = 0, tmpvar; 1719 int has_effect = 0, tmpvar;
1835 char tmpbuf[MAX_BUF]; 1720 char tmpbuf[MAX_BUF];
1836 1721
… …
1845 { 1730 {
1846 has_effect = 1; 1731 has_effect = 1;
1847 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]); 1732 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1848 } 1733 }
1849 } 1734 }
1735
1850 if (has_effect) 1736 if (has_effect)
1851 { 1737 {
1852 strcat (buf, tmpbuf); 1738 strcat (buf, tmpbuf);
1853 strcat (buf, "\n ---\n"); 1739 strcat (buf, "\n ---\n");
1854 } 1740 }
1855 else 1741 else
1856 sprintf (buf, " "); 1742 sprintf (buf, " ");
1857 } 1743 }
1744
1858 if (level == 12 && RANDOM () % 2) 1745 if (level == 12 && RANDOM () % 2)
1859 { /* spell paths */ 1746 { /* spell paths */
1860 int has_effect = 0, tmpvar; 1747 int has_effect = 0, tmpvar;
1861 char tmpbuf[MAX_BUF]; 1748 char tmpbuf[MAX_BUF];
1862 1749
1863 sprintf (tmpbuf, "\n"); 1750 sprintf (tmpbuf, "\n");
1864 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1751 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
1865 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1752 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1753
1866 if ((tmpvar = god->path_attuned)) 1754 if ((tmpvar = god->path_attuned))
1867 { 1755 {
1868 has_effect = 1; 1756 has_effect = 1;
1869 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned"); 1757 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned");
1870 } 1758 }
1759
1871 if ((tmpvar = god->path_repelled)) 1760 if ((tmpvar = god->path_repelled))
1872 { 1761 {
1873 has_effect = 1; 1762 has_effect = 1;
1874 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled"); 1763 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled");
1875 } 1764 }
1765
1876 if ((tmpvar = god->path_denied)) 1766 if ((tmpvar = god->path_denied))
1877 { 1767 {
1878 has_effect = 1; 1768 has_effect = 1;
1879 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1769 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1880 } 1770 }
1771
1881 if (has_effect) 1772 if (has_effect)
1882 { 1773 {
1883 strcat (buf, tmpbuf); 1774 strcat (buf, tmpbuf);
1884 strcat (buf, "\n ---\n"); 1775 strcat (buf, "\n ---\n");
1885 } 1776 }
… …
1893 */ 1784 */
1894 if (book_overflow (retbuf, buf, booksize)) 1785 if (book_overflow (retbuf, buf, booksize))
1895 break; 1786 break;
1896 else if (strlen (buf) > 1) 1787 else if (strlen (buf) > 1)
1897 strcat (retbuf, buf); 1788 strcat (retbuf, buf);
1789
1898 level--; 1790 level--;
1899 } 1791 }
1792
1900 if (strlen (retbuf) == introlen) 1793 if (strlen (retbuf) == introlen)
1901 { /* we got no information beyond the preamble! */ 1794 { /* we got no information beyond the preamble! */
1902 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1795 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1903 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1796 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1904 } 1797 }
… …
1923 * book is the object we are creating into. 1816 * book is the object we are creating into.
1924 * If msg_type is a positive value, we use that to determine the 1817 * If msg_type is a positive value, we use that to determine the
1925 * message type - otherwise a random value is used. 1818 * message type - otherwise a random value is used.
1926 * 1819 *
1927 */ 1820 */
1928
1929void 1821void
1930tailor_readable_ob (object *book, int msg_type) 1822tailor_readable_ob (object *book, int msg_type)
1931{ 1823{
1932 char msgbuf[BOOK_BUF]; 1824 char msgbuf[BOOK_BUF];
1933 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1825 int level = book->level ? (RANDOM () % book->level) + 1 : 1;
… …
1956 */ 1848 */
1957 1849
1958 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1850 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6);
1959 switch (msg_type) 1851 switch (msg_type)
1960 { 1852 {
1961 case 1: /* monster attrib */ 1853 case 1: /* monster attrib */
1962 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1854 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1963 break; 1855 break;
1964 case 2: /* artifact attrib */ 1856 case 2: /* artifact attrib */
1965 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1857 strcpy (msgbuf, artifact_msg (level, book_buf_size));
1966 break; 1858 break;
1967 case 3: /* grouping incantations/prayers by path */ 1859 case 3: /* grouping incantations/prayers by path */
1968 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1860 strcpy (msgbuf, spellpath_msg (level, book_buf_size));
1969 break; 1861 break;
1970 case 4: /* describe an alchemy formula */ 1862 case 4: /* describe an alchemy formula */
1971 make_formula_book (book, level); 1863 make_formula_book (book, level);
1972 /* make_formula_book already gives title */ 1864 /* make_formula_book already gives title */
1973 return; 1865 return;
1974 break; 1866 break;
1975 case 5: /* bits of information about a god */ 1867 case 5: /* bits of information about a god */
1976 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1868 strcpy (msgbuf, god_info_msg (level, book_buf_size));
1977 break; 1869 break;
1978 case 0: /* use info list in lib/ */ 1870 case 0: /* use info list in lib/ */
1979 default: 1871 default:
1980 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1872 cfperl_make_book (book, level);
1981 break; 1873 return;
1982 } 1874 }
1983 1875
1984 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */ 1876 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1985 1877
1986 if (strlen (msgbuf) > 1) 1878 if (strlen (msgbuf) > 1)

Diff Legend

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