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.16 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.41 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 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 (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23
24 24
25/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
26 * to allow randomly occuring messages in non-magical texts. 26 * to allow randomly occuring messages in non-magical texts.
27 */ 27 */
28 28
… …
187 {"Shield", SHIELD}, 187 {"Shield", SHIELD},
188 {"Bracers", BRACERS}, 188 {"Bracers", BRACERS},
189 {"Boots", BOOTS}, 189 {"Boots", BOOTS},
190 {"Cloak", CLOAK}, 190 {"Cloak", CLOAK},
191 {"Gloves", GLOVES}, 191 {"Gloves", GLOVES},
192 {"Gridle", GIRDLE}, 192 {"Girdle", GIRDLE},
193 {"Ring", RING}, 193 {"Ring", RING},
194 {"Horn", HORN}, 194 {"Horn", HORN},
195 {"Missile Weapon", BOW}, 195 {"Missile Weapon", BOW},
196 {"Missile", ARROW}, 196 {"Missile", ARROW},
197 {"Hand Weapon", WEAPON}, 197 {"Hand Weapon", WEAPON},
… …
435 * Be careful to keep the order. If you add readable subtype, add them 435 * Be careful to keep the order. If you add readable subtype, add them
436 * at the bottom of the list. Never delete a subtype because index is used as 436 * at the bottom of the list. Never delete a subtype because index is used as
437 * subtype paramater in arch files! 437 * subtype paramater in arch files!
438 */ 438 */
439static readable_message_type readable_message_types[] = { 439static readable_message_type readable_message_types[] = {
440 /*subtype 0 */ {0, 0}, 440 /*subtype 0 */ {0, 0, "info"},
441 /* book messages subtypes */ 441 /* book messages subtypes */
442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1}, 442 /*subtype 1 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_1, "readable-book-clasp-1"},
443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2}, 443 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_CLASP_2, "readable-book-clasp-2"},
444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1}, 444 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_1, "readable-book-elegant-1"},
445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2}, 445 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_ELEGANT_2, "readable-book-elegant-2"},
446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1}, 446 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_1, "readable-book-quarto-1"},
447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2}, 447 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_QUARTO_2, "readable-book-quarto-2"},
448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER}, 448 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_EVOKER, "readable-book-spell-evocation"},
449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER}, 449 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PRAYER, "readable-book-spell-praying"},
450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO}, 450 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_PYRO, "readable-book-spell-pyromancy"},
451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER}, 451 /*subtype 10 */ {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SORCERER, "readable-book-spell-sorcery"},
452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER}, 452 {MSG_TYPE_BOOK, MSG_TYPE_BOOK_SPELL_SUMMONER, "readable-book-spell-summoning"},
453 /* card messages subtypes */ 453 /* card messages subtypes */
454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1}, 454 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_1, "readable-card-simple-1"},
455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2}, 455 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_2, "readable-card-simple-2"},
456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3}, 456 {MSG_TYPE_CARD, MSG_TYPE_CARD_SIMPLE_3, "readable-card-simple-3"},
457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1}, 457 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_1, "readable-card-elegant-1"},
458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2}, 458 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_2, "readable-card-elegant-2"},
459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3}, 459 {MSG_TYPE_CARD, MSG_TYPE_CARD_ELEGANT_3, "readable-card-elegant-3"},
460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1}, 460 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_1, "readable-card-strange-1"},
461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2}, 461 {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_2, "readable-card-strange-2"},
462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3}, 462 /*subtype 20 */ {MSG_TYPE_CARD, MSG_TYPE_CARD_STRANGE_3, "readable-card-strange-3"},
463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1}, 463 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_1, "readable-card-money-1"},
464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2}, 464 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_2, "readable-card-money-2"},
465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3}, 465 {MSG_TYPE_CARD, MSG_TYPE_CARD_MONEY_3, "readable-card-money-3"},
466 466
467 /* Paper messages subtypes */ 467 /* Paper messages subtypes */
468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1}, 468 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_1, "readable-paper-note-1"},
469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2}, 469 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_2, "readable-paper-note-2"},
470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3}, 470 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_NOTE_3, "readable-paper-note-3"},
471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1}, 471 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_1, "readable-paper-letter-old-1"},
472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2}, 472 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_OLD_2, "readable-paper-letter-old-2"},
473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1}, 473 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_1, "readable-paper-letter-new-1"},
474 /*subtype 30 */ {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_2}, 474 /*subtype 30 */ {MSG_TYPE_PAPER, MSG_TYPE_PAPER_LETTER_NEW_2, "readable-paper-letter-new-2"},
475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1}, 475 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_1, "readable-paper-envelope-1"},
476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2}, 476 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_ENVELOPE_2, "readable-paper-envelope-2"},
477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1}, 477 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_1, "readable-paper-scroll-old-1"},
478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2}, 478 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_OLD_2, "readable-paper-scroll-old-2"},
479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1}, 479 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_1, "readable-paper-scroll-new-1"},
480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2}, 480 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_NEW_2, "readable-paper-scroll-new-2"},
481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC}, 481 {MSG_TYPE_PAPER, MSG_TYPE_PAPER_SCROLL_MAGIC, "readable-paper-scroll-magic"},
482 482
483 /* road signs messages subtypes */ 483 /* road signs messages subtypes */
484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC}, 484 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_BASIC, "readable-sign-basic"},
485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT}, 485 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_LEFT, "readable-sign-dir-left"},
486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT}, 486 /*subtype 40 */ {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_RIGHT, "readable-sign-dir-right"},
487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH}, 487 {MSG_TYPE_SIGN, MSG_TYPE_SIGN_DIR_BOTH, "readable-sign-dir-both"},
488 488
489 /* stones and monument messages */ 489 /* stones and monument messages */
490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1}, 490 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_1, "readable-monument-stone-1"},
491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2}, 491 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_2, "readable-monument-stone-2"},
492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3}, 492 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STONE_3, "readable-monument-stone-3"},
493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1}, 493 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_1, "readable-monument-statue-1"},
494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2}, 494 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_2, "readable-monument-statue-2"},
495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3}, 495 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_STATUE_3, "readable-monument-statue-3"},
496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1}, 496 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_1, "readable-monument-gravestone-1"},
497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2}, 497 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_2, "readable-monument-gravestone-2"},
498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3}, 498 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1}, 499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2}, 500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3} 501 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
502}; 502};
503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 503int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
504 504
505static int max_titles[6] = { 505static int max_titles[6] = {
506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 506 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
… …
640 * 640 *
641 * Start of initialisation related functions. 641 * Start of initialisation related functions.
642 * 642 *
643 ****************************************************************************/ 643 ****************************************************************************/
644 644
645/* init_msgfile() - if not called before, initialise the info list
646 * reads the messages file into the list pointed to by first_msg
647*/
648
649static void
650init_msgfile (void)
651{
652 FILE *fp;
653 char buf[MAX_BUF], msgbuf[HUGE_BUF], fname[MAX_BUF], *cp;
654 int comp;
655 static int did_init_msgfile;
656
657 if (did_init_msgfile)
658 return;
659 did_init_msgfile = 1;
660
661 sprintf (fname, "%s/messages", settings.datadir);
662 LOG (llevDebug, "Reading messages from %s...\n", fname);
663
664 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
665 {
666 linked_char *tmp = NULL;
667
668 while (fgets (buf, MAX_BUF, fp) != NULL)
669 {
670 if (*buf == '#')
671 continue;
672 if ((cp = strchr (buf, '\n')) != NULL)
673 *cp = '\0';
674 cp = buf;
675 while (*cp == ' ') /* Skip blanks */
676 cp++;
677 if (!strncmp (cp, "ENDMSG", 6))
678 {
679 if (strlen (msgbuf) > BOOK_BUF)
680 {
681 LOG (llevDebug, "Warning: this string exceeded max book buf size:");
682 LOG (llevDebug, " %s\n", msgbuf);
683 }
684 tmp->name = msgbuf;
685 tmp->next = first_msg;
686 first_msg = tmp;
687 nrofmsg++;
688 continue;
689 }
690 else if (!strncmp (cp, "MSG", 3))
691 {
692 tmp = new linked_char;
693
694 strcpy (msgbuf, " "); /* reset msgbuf for new message */
695 continue;
696 }
697 else if (!buf_overflow (msgbuf, cp, HUGE_BUF - 1))
698 {
699 strcat (msgbuf, cp);
700 strcat (msgbuf, "\n");
701 }
702 }
703 close_and_delete (fp, comp);
704 }
705
706#ifdef BOOK_MSG_DEBUG
707 LOG (llevDebug, "init_info_listfile() got %d messages.\n", nrofmsg);
708#endif
709 LOG (llevDebug, "done.\n");
710}
711
712
713/* init_book_archive() - if not called before, initialise the info list 645/* init_book_archive() - if not called before, initialise the info list
714 * 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
715 * created and updated across multiple runs of the program. 647 * created and updated across multiple runs of the program.
716 */ 648 */
717
718static void 649static void
719init_book_archive (void) 650init_book_archive (void)
720{ 651{
721 FILE *fp; 652 FILE *fp;
722 int comp, nroftitle = 0; 653 int comp, nroftitle = 0;
… …
817 if (did_init_mon_info) 748 if (did_init_mon_info)
818 return; 749 return;
819 750
820 did_init_mon_info = 1; 751 did_init_mon_info = 1;
821 752
822 753 for_all_archetypes (at)
823 for (at = first_archetype; at != NULL; at = at->next)
824 { 754 {
825 if (QUERY_FLAG (&at->clone, FLAG_MONSTER) && (!QUERY_FLAG (&at->clone, FLAG_CHANGING) || QUERY_FLAG (&at->clone, FLAG_UNAGGRESSIVE))) 755 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE)))
826 { 756 {
827 objectlink *mon = new objectlink; 757 objectlink *mon = new objectlink;
828 758
829 mon->ob = &at->clone; 759 mon->ob = at;
830 mon->next = first_mon_info; 760 mon->next = first_mon_info;
831 first_mon_info = mon; 761 first_mon_info = mon;
832 nrofmon++; 762 nrofmon++;
833 } 763 }
834 } 764 }
835 765
836 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 766 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
837} 767}
838
839 768
840/* init_readable() - initialise linked lists utilized by 769/* init_readable() - initialise linked lists utilized by
841 * message functions in tailor_readable_ob() 770 * message functions in tailor_readable_ob()
842 * 771 *
843 * This is the function called by the main routine to initialise 772 * This is the function called by the main routine to initialise
844 * all the readable information. 773 * all the readable information.
845 */ 774 */
846
847void 775void
848init_readable (void) 776init_readable (void)
849{ 777{
850 static int did_this; 778 static int did_this;
851 779
… …
853 return; 781 return;
854 782
855 did_this = 1; 783 did_this = 1;
856 784
857 LOG (llevDebug, "Initialising reading data...\n"); 785 LOG (llevDebug, "Initialising reading data...\n");
858 init_msgfile ();
859 init_book_archive (); 786 init_book_archive ();
860 init_mon_info (); 787 init_mon_info ();
861 LOG (llevDebug, " Done\n"); 788 LOG (llevDebug, " Done\n");
862
863} 789}
864 790
865/***************************************************************************** 791/*****************************************************************************
866 * 792 *
867 * This is the start of the administrative functions when creating 793 * This is the start of the administrative functions when creating
868 * new books (ie, updating title and the like) 794 * new books (ie, updating title and the like)
869 * 795 *
870 *****************************************************************************/ 796 *****************************************************************************/
871 797
872
873/* find_title() - Search the titlelist (based on msgtype) to see if 798/* find_title() - Search the titlelist (based on msgtype) to see if
874 * book matches something already there. IF so, return that title. 799 * book matches something already there. IF so, return that title.
875 */ 800 */
876
877static title * 801static title *
878find_title (const object *book, int msgtype) 802find_title (const object *book, int msgtype)
879{ 803{
880 title *t = NULL; 804 title *t = NULL;
881 titlelist *tl = get_titlelist (msgtype); 805 titlelist *tl = get_titlelist (msgtype);
… …
918 if (book->type != BOOK) 842 if (book->type != BOOK)
919 return; 843 return;
920 844
921 switch (msgtype) 845 switch (msgtype)
922 { 846 {
923 case 1: /*monster */ 847 case 1: /*monster */
924 nbr = sizeof (mon_book_name) / sizeof (char *); 848 nbr = sizeof (mon_book_name) / sizeof (char *);
925 strcpy (name, mon_book_name[RANDOM () % nbr]); 849 assign (name, mon_book_name[rndm (nbr)]);
926 break; 850 break;
927 case 2: /*artifact */ 851 case 2: /*artifact */
928 nbr = sizeof (art_book_name) / sizeof (char *); 852 nbr = sizeof (art_book_name) / sizeof (char *);
929 strcpy (name, art_book_name[RANDOM () % nbr]); 853 assign (name, art_book_name[rndm (nbr)]);
930 break; 854 break;
931 case 3: /*spellpath */ 855 case 3: /*spellpath */
932 nbr = sizeof (path_book_name) / sizeof (char *); 856 nbr = sizeof (path_book_name) / sizeof (char *);
933 strcpy (name, path_book_name[RANDOM () % nbr]); 857 assign (name, path_book_name[rndm (nbr)]);
934 break; 858 break;
935 case 4: /*alchemy */ 859 case 4: /*alchemy */
936 nbr = sizeof (formula_book_name) / sizeof (char *); 860 nbr = sizeof (formula_book_name) / sizeof (char *);
937 strcpy (name, formula_book_name[RANDOM () % nbr]); 861 assign (name, formula_book_name[rndm (nbr)]);
938 break; 862 break;
939 case 5: /*gods */ 863 case 5: /*gods */
940 nbr = sizeof (gods_book_name) / sizeof (char *); 864 nbr = sizeof (gods_book_name) / sizeof (char *);
941 strcpy (name, gods_book_name[RANDOM () % nbr]); 865 assign (name, gods_book_name[rndm (nbr)]);
942 break; 866 break;
943 case 6: /*msg file */ 867 case 6: /*msg file */
944 default: 868 default:
945 if (book->weight > 2000) 869 if (book->weight > 2000)
946 { /* based on weight */ 870 { /* based on weight */
947 nbr = sizeof (heavy_book_name) / sizeof (char *); 871 nbr = sizeof (heavy_book_name) / sizeof (char *);
948 strcpy (name, heavy_book_name[RANDOM () % nbr]); 872 assign (name, heavy_book_name[rndm (nbr)]);
949 } 873 }
950 else if (book->weight < 2001) 874 else if (book->weight < 2001)
951 { 875 {
952 nbr = sizeof (light_book_name) / sizeof (char *); 876 nbr = sizeof (light_book_name) / sizeof (char *);
953 strcpy (name, light_book_name[RANDOM () % nbr]); 877 assign (name, light_book_name[rndm (nbr)]);
954 } 878 }
955 break; 879 break;
956 } 880 }
957 881
958 book->name = name; 882 book->name = name;
959} 883}
960 884
… …
972 if (msgtype < 0 || strlen (op->msg) < 5) 896 if (msgtype < 0 || strlen (op->msg) < 5)
973 return; 897 return;
974 898
975 switch (msgtype) 899 switch (msgtype)
976 { 900 {
977 case 1: /* monster */ 901 case 1: /* monster */
978 nbr = sizeof (mon_author) / sizeof (char *); 902 nbr = sizeof (mon_author) / sizeof (char *);
979 strcpy (name, mon_author[RANDOM () % nbr]); 903 assign (name, mon_author[rndm (nbr)]);
980 break; 904 break;
981 case 2: /* artifacts */ 905 case 2: /* artifacts */
982 nbr = sizeof (art_author) / sizeof (char *); 906 nbr = sizeof (art_author) / sizeof (char *);
983 strcpy (name, art_author[RANDOM () % nbr]); 907 assign (name, art_author[rndm (nbr)]);
984 break; 908 break;
985 case 3: /* spellpath */ 909 case 3: /* spellpath */
986 nbr = sizeof (path_author) / sizeof (char *); 910 nbr = sizeof (path_author) / sizeof (char *);
987 strcpy (name, path_author[RANDOM () % nbr]); 911 assign (name, path_author[rndm (nbr)]);
988 break; 912 break;
989 case 4: /* alchemy */ 913 case 4: /* alchemy */
990 nbr = sizeof (formula_author) / sizeof (char *); 914 nbr = sizeof (formula_author) / sizeof (char *);
991 strcpy (name, formula_author[RANDOM () % nbr]); 915 assign (name, formula_author[rndm (nbr)]);
992 break; 916 break;
993 case 5: /* gods */ 917 case 5: /* gods */
994 nbr = sizeof (gods_author) / sizeof (char *); 918 nbr = sizeof (gods_author) / sizeof (char *);
995 strcpy (name, gods_author[RANDOM () % nbr]); 919 assign (name, gods_author[rndm (nbr)]);
996 break; 920 break;
997 case 6: /* msg file */ 921 case 6: /* msg file */
998 default: 922 default:
999 strcpy (name, book_author[RANDOM () % nbr]); 923 assign (name, book_author[rndm (nbr)]);
1000 } 924 }
1001 925
1002 sprintf (title, "of %s", name); 926 sprintf (title, "of %s", name);
1003 op->title = title; 927 op->title = title;
1004} 928}
… …
1009 */ 933 */
1010 934
1011static int 935static int
1012unique_book (const object *book, int msgtype) 936unique_book (const object *book, int msgtype)
1013{ 937{
1014 title *test;
1015
1016 if (!booklist) 938 if (!booklist)
1017 return 1; /* No archival entries! Must be unique! */ 939 return 1; /* No archival entries! Must be unique! */
1018 940
1019 /* Go through the booklist. If the author and name match, not unique so 941 /* Go through the booklist. If the author and name match, not unique so
1020 * return 0. 942 * return 0.
1021 */ 943 */
1022 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 944 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
1023 {
1024 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 945 if (test->name == book->name && book->title == test->authour)
1025 return 0; 946 return 0;
1026 } 947
1027 return 1; 948 return 1;
1028} 949}
1029 950
1030/* add_book_to_list() */ 951/* add_book_to_list() */
1031 952
… …
1044 t = get_empty_book (); 965 t = get_empty_book ();
1045 t->name = book->name; 966 t->name = book->name;
1046 t->authour = book->title; 967 t->authour = book->title;
1047 t->size = strlen (book->msg); 968 t->size = strlen (book->msg);
1048 t->msg_index = strtoint (book->msg); 969 t->msg_index = strtoint (book->msg);
1049 t->archname = book->arch->name; 970 t->archname = book->arch->archname;
1050 t->level = book->level; 971 t->level = book->level;
1051 972
1052 t->next = tl->first_book; 973 t->next = tl->first_book;
1053 tl->first_book = t; 974 tl->first_book = t;
1054 tl->number++; 975 tl->number++;
… …
1078{ 999{
1079 int nbr = sizeof (book_descrpt) / sizeof (char *); 1000 int nbr = sizeof (book_descrpt) / sizeof (char *);
1080 1001
1081 switch (book->type) 1002 switch (book->type)
1082 { 1003 {
1083 case BOOK: 1004 case BOOK:
1084 { 1005 {
1085 titlelist *tl = get_titlelist (msgtype); 1006 titlelist *tl = get_titlelist (msgtype);
1086 title *t = NULL; 1007 title *t = NULL;
1087 int tries = 0; 1008 int tries = 0;
1088 1009
1089 /* look to see if our msg already been archived. If so, alter 1010 /* look to see if our msg already been archived. If so, alter
1090 * the book to match the archival text. If we fail to match, 1011 * the book to match the archival text. If we fail to match,
1091 * then we archive the new title/name/msg combo if there is 1012 * then we archive the new title/name/msg combo if there is
1092 * room on the titlelist. 1013 * room on the titlelist.
1093 */ 1014 */
1094 1015
1095 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1016 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1096 { 1017 {
1097 object *tmpbook;
1098
1099 /* alter book properties */ 1018 /* alter book properties */
1100 if ((tmpbook = get_archetype (t->archname)) != NULL) 1019 if (object *tmpbook = get_archetype (t->archname))
1020 {
1021 tmpbook->msg = book->msg;
1022 tmpbook->copy_to (book);
1023 tmpbook->destroy ();
1024 }
1025
1026 book->title = t->authour;
1027 book->name = t->name;
1028 book->level = t->level;
1029 }
1030 /* Don't have any default title, so lets make up a new one */
1031 else
1032 {
1033 int numb, maxnames = max_titles[msgtype];
1034 const char *old_title;
1035 const char *old_name;
1036
1037 old_title = book->title;
1038 old_name = book->name;
1039
1040 /* some pre-generated books have title already set (from
1041 * maps), also don't bother looking for unique title if
1042 * we already used up all the available names! */
1043
1044 if (!tl)
1045 {
1046 LOG (llevError, "change_book_name(): can't find title list\n");
1047 numb = 0;
1048 }
1049 else
1050 numb = tl->number;
1051
1052 if (numb == maxnames)
1053 {
1054#ifdef ARCHIVE_DEBUG
1055 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1056#endif
1057 break;
1058 }
1059 /* shouldnt change map-maker books */
1060 else if (!book->title)
1061 do
1101 { 1062 {
1102 tmpbook->msg = book->msg; 1063 /* random book name */
1103 tmpbook->copy_to (book); 1064 new_text_name (book, msgtype);
1104 tmpbook->destroy (); 1065 add_author (book, msgtype); /* random author */
1066 tries++;
1105 } 1067 }
1068 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1106 1069
1107 book->title = t->authour; 1070 /* Now deal with 2 cases.
1108 book->name = t->name; 1071 * 1)If no space for a new title exists lets just restore
1109 book->level = t->level; 1072 * the old book properties. Remember, if the book had
1073 * matchd an older entry on the titlelist, we shouldnt
1074 * have called this routine in the first place!
1075 * 2) If we got a unique title, we need to add it to
1076 * the list.
1110 } 1077 */
1111 /* Don't have any default title, so lets make up a new one */
1112 else
1113 {
1114 int numb, maxnames = max_titles[msgtype];
1115 const char *old_title;
1116 const char *old_name;
1117 1078
1118 old_title = book->title; 1079 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1119 old_name = book->name; 1080 { /* got to check maxnames again */
1120
1121 /* some pre-generated books have title already set (from
1122 * maps), also don't bother looking for unique title if
1123 * we already used up all the available names! */
1124
1125 if (!tl)
1126 {
1127 LOG (llevError, "change_book_name(): can't find title list\n");
1128 numb = 0;
1129 }
1130 else
1131 numb = tl->number;
1132
1133 if (numb == maxnames)
1134 {
1135#ifdef ARCHIVE_DEBUG 1081#ifdef ARCHIVE_DEBUG
1136 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1082 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1137#endif 1083#endif
1138 break; 1084 /* restore old book properties here */
1139 } 1085 book->title = old_title;
1140 /* shouldnt change map-maker books */ 1086
1141 else if (!book->title) 1087 if (rndm (4))
1142 do
1143 { 1088 {
1144 /* random book name */ 1089 /* Lets give the book a description to individualize it some */
1145 new_text_name (book, msgtype); 1090 char new_name[MAX_BUF];
1146 add_author (book, msgtype); /* random author */ 1091
1147 tries++; 1092 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1093
1094 book->name = new_name;
1148 } 1095 }
1149 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1150
1151 /* Now deal with 2 cases.
1152 * 1)If no space for a new title exists lets just restore
1153 * the old book properties. Remember, if the book had
1154 * matchd an older entry on the titlelist, we shouldnt
1155 * have called this routine in the first place!
1156 * 2) If we got a unique title, we need to add it to
1157 * the list.
1158 */
1159
1160 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1161 { /* got to check maxnames again */
1162#ifdef ARCHIVE_DEBUG
1163 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1164#endif
1165 /* restore old book properties here */
1166 book->title = old_title;
1167
1168 if (RANDOM () % 4)
1169 {
1170 /* Lets give the book a description to individualize it some */
1171 char new_name[MAX_BUF];
1172
1173 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[RANDOM () % nbr], old_name);
1174
1175 book->name = new_name;
1176 }
1177 else 1096 else
1178 { 1097 {
1179 book->name = old_name; 1098 book->name = old_name;
1180 } 1099 }
1181 } 1100 }
1182 else if (book->title && strlen (book->msg) > 5) 1101 else if (book->title && strlen (book->msg) > 5)
1183 { /* archive if long msg texts */ 1102 { /* archive if long msg texts */
1184 add_book_to_list (book, msgtype); 1103 add_book_to_list (book, msgtype);
1185 } 1104 }
1186 } 1105 }
1187 break; 1106 break;
1188 } 1107 }
1189 1108
1190 default: 1109 default:
1191 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1110 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1192 return; 1111 return;
1193 } 1112 }
1194} 1113}
1195 1114
1196/***************************************************************************** 1115/*****************************************************************************
1197 * 1116 *
… …
1222 return (object *) NULL; 1141 return (object *) NULL;
1223 1142
1224 if (!level) 1143 if (!level)
1225 { 1144 {
1226 /* lets get a random monster from the mon_info linked list */ 1145 /* lets get a random monster from the mon_info linked list */
1227 monnr = RANDOM () % nrofmon; 1146 monnr = rndm (nrofmon);
1228 1147
1229 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1148 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1230 if (i++ == monnr) 1149 if (i++ == monnr)
1231 break; 1150 break;
1232 1151
… …
1259 { 1178 {
1260 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1179 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1261 return NULL; 1180 return NULL;
1262 } 1181 }
1263 1182
1264 monnr = RANDOM () % i; 1183 monnr = rndm (i);
1265 for (mon = first_mon_info; mon; mon = mon->next) 1184 for (mon = first_mon_info; mon; mon = mon->next)
1266 if (mon->ob->level >= level && monnr-- == 0) 1185 if (mon->ob->level >= level && monnr-- == 0)
1267 return mon->ob; 1186 return mon->ob;
1268 1187
1269 if (!mon) 1188 if (!mon)
… …
1367 ****************************************************************************/ 1286 ****************************************************************************/
1368 1287
1369/* artifact_msg() - generate a message detailing the properties 1288/* artifact_msg() - generate a message detailing the properties
1370 * of 1-6 artifacts drawn sequentially from the artifact list. 1289 * of 1-6 artifacts drawn sequentially from the artifact list.
1371 */ 1290 */
1372 1291const char *
1373char *
1374artifact_msg (int level, int booksize) 1292artifact_msg (int level, int booksize)
1375{ 1293{
1376 artifactlist *al = NULL; 1294 artifactlist *al = NULL;
1377 artifact *art; 1295 artifact *art;
1378 int chance, i, type, index; 1296 int chance, i, type, index;
1379 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1297 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1298 const char *ch;
1380 char *ch, name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1299 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1381 static char retbuf[BOOK_BUF]; 1300 static char retbuf[BOOK_BUF];
1382 object *tmp = NULL; 1301 object *tmp = NULL;
1383 1302
1384 /* values greater than 5 create msg buffers that are too big! */ 1303 /* values greater than 5 create msg buffers that are too big! */
1385 if (book_entries > 5) 1304 if (book_entries > 5)
… …
1391 * for that type exists! 1310 * for that type exists!
1392 */ 1311 */
1393 i = 0; 1312 i = 0;
1394 do 1313 do
1395 { 1314 {
1396 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1315 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1397 type = art_name_array[index].type; 1316 type = art_name_array[index].type;
1398 al = find_artifactlist (type); 1317 al = find_artifactlist (type);
1399 i++; 1318 i++;
1400 } 1319 }
1401 while ((al == NULL) && (i < 10)); 1320 while ((al == NULL) && (i < 10));
1402 1321
1403 if (i == 10) /* Unable to find a message */ 1322 if (i == 10) /* Unable to find a message */
1404 return ("None"); 1323 return "None";
1405 1324
1406 /* There is no reason to start on the artifact list at the begining. Lets 1325 /* There is no reason to start on the artifact list at the begining. Lets
1407 * take our starting position randomly... */ 1326 * take our starting position randomly... */
1408 art = al->items; 1327 art = al->items;
1409 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1328 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1410 { 1329 {
1411 if (art == NULL) 1330 if (!art)
1412 art = al->items; /* hmm, out of stuff, loop back around */ 1331 art = al->items; /* hmm, out of stuff, loop back around */
1332
1413 art = art->next; 1333 art = art->next;
1414 } 1334 }
1415 1335
1416 /* the base 'generic' name for our artifact */ 1336 /* the base 'generic' name for our artifact */
1417 strcpy (name, art_name_array[index].name); 1337 assign (name, art_name_array[index].name);
1418 1338
1419 /* Ok, lets print out the contents */ 1339 /* Ok, lets print out the contents */
1420 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1340 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact");
1421 1341
1422 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1342 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
… …
1430 1350
1431 /* separator of items */ 1351 /* separator of items */
1432 strcpy (buf, "--- \n"); 1352 strcpy (buf, "--- \n");
1433 1353
1434 /* Name */ 1354 /* Name */
1435 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1355 if (art->allowed && art->allowed->name != shstr_All)
1436 { 1356 {
1437 linked_char *temp, *next = art->allowed; 1357 linked_char *temp, *next = art->allowed;
1438 1358
1439 do 1359 do
1440 { 1360 {
1441 temp = next; 1361 temp = next;
1442 next = next->next; 1362 next = next->next;
1443 } 1363 }
1444 while (next && !RANDOM () % 2); 1364 while (next && rndm (2));
1445 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1365 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name);
1446 } 1366 }
1447 else /* default name is used */ 1367 else /* default name is used */
1448 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1368 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name);
1449 1369
… …
1462 /* value of artifact */ 1382 /* value of artifact */
1463 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1383 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value);
1464 1384
1465 /* include the message about the artifact, if exists, and book 1385 /* include the message about the artifact, if exists, and book
1466 * level is kinda high */ 1386 * level is kinda high */
1467 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1387 if (art->item->msg
1388 && rndm (4) + 1 < level
1389 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1468 strcat (buf, art->item->msg); 1390 strcat (buf, art->item->msg);
1469 1391
1470 /* properties of the artifact */ 1392 /* properties of the artifact */
1471 tmp = object::create (); 1393 tmp = object::create ();
1472 add_abilities (tmp, art->item); 1394 add_abilities (tmp, art->item);
… …
1504char * 1426char *
1505spellpath_msg (int level, int booksize) 1427spellpath_msg (int level, int booksize)
1506{ 1428{
1507 static char retbuf[BOOK_BUF]; 1429 static char retbuf[BOOK_BUF];
1508 char tmpbuf[BOOK_BUF]; 1430 char tmpbuf[BOOK_BUF];
1509 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1431 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1510 int did_first_sp = 0; 1432 int did_first_sp = 0;
1511 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1433 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1512 archetype *at; 1434 archetype *at;
1513 1435
1514 /* Preamble */ 1436 /* Preamble */
… …
1517 if (path == -1) 1439 if (path == -1)
1518 strcat (retbuf, "having no known spell path.\n"); 1440 strcat (retbuf, "having no known spell path.\n");
1519 else 1441 else
1520 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1442 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]);
1521 1443
1522 for (at = first_archetype; at != NULL; at = at->next) 1444 for_all_archetypes (at)
1523 { 1445 {
1524 /* Determine if this is an appropriate spell. Must 1446 /* Determine if this is an appropriate spell. Must
1525 * be of matching path, must be of appropriate type (prayer 1447 * be of matching path, must be of appropriate type (prayer
1526 * or not), and must be within the valid level range. 1448 * or not), and must be within the valid level range.
1527 */ 1449 */
1528 if (at->clone.type == SPELL && at->clone.path_attuned & pnum && 1450 if (at->type == SPELL && at->path_attuned & pnum &&
1529 ((at->clone.stats.grace && prayers) || (at->clone.stats.sp && !prayers)) && (at->clone.level < (level * 8))) 1451 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1530 { 1452 {
1531 strcpy (tmpbuf, at->clone.name); 1453 assign (tmpbuf, at->object::name);
1532 1454
1533 if (book_overflow (retbuf, tmpbuf, booksize)) 1455 if (book_overflow (retbuf, tmpbuf, booksize))
1534 break; 1456 break;
1535 else 1457 else
1536 { 1458 {
… …
1542 } 1464 }
1543 } 1465 }
1544 /* Geez, no spells were generated. */ 1466 /* Geez, no spells were generated. */
1545 if (!did_first_sp) 1467 if (!did_first_sp)
1546 { 1468 {
1547 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1469 if (rndm (4)) /* usually, lets make a recursive call... */
1548 spellpath_msg (level, booksize); 1470 spellpath_msg (level, booksize);
1549 else /* give up, cause knowing no spells exist for path is info too. */ 1471 else /* give up, cause knowing no spells exist for path is info too. */
1550 strcat (retbuf, "\n - no known spells exist -\n"); 1472 strcat (retbuf, "\n - no known spells exist -\n");
1551 } 1473 }
1552 else 1474 else
… …
1554 strcat (retbuf, "\n"); 1476 strcat (retbuf, "\n");
1555 } 1477 }
1556 return retbuf; 1478 return retbuf;
1557} 1479}
1558 1480
1559
1560
1561/* formula_msg() - generate a message detailing the properties 1481/* formula_msg() - generate a message detailing the properties
1562 * of a randomly selected alchemical formula. 1482 * of a randomly selected alchemical formula.
1563 */ 1483 */
1564
1565void 1484void
1566make_formula_book (object *book, int level) 1485make_formula_book (object *book, int level)
1567{ 1486{
1568 char retbuf[BOOK_BUF], title[MAX_BUF]; 1487 char retbuf[BOOK_BUF], title[MAX_BUF];
1569 recipelist *fl; 1488 recipelist *fl;
… …
1571 int chance; 1490 int chance;
1572 1491
1573 /* the higher the book level, the more complex (ie number of 1492 /* the higher the book level, the more complex (ie number of
1574 * ingredients) the formula can be. 1493 * ingredients) the formula can be.
1575 */ 1494 */
1576 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1495 fl = get_formulalist (rndm (level) / 3 + 1);
1577 1496
1578 if (!fl) 1497 if (!fl)
1579 fl = get_formulalist (1); /* safety */ 1498 fl = get_formulalist (1); /* safety */
1580 1499
1581 if (fl->total_chance == 0) 1500 if (fl->total_chance == 0)
… …
1585 add_author (book, 4); 1504 add_author (book, 4);
1586 return; 1505 return;
1587 } 1506 }
1588 1507
1589 /* get a random formula, weighted by its bookchance */ 1508 /* get a random formula, weighted by its bookchance */
1590 chance = RANDOM () % fl->total_chance; 1509 chance = rndm (fl->total_chance);
1591 for (formula = fl->items; formula != NULL; formula = formula->next) 1510 for (formula = fl->items; formula; formula = formula->next)
1592 { 1511 {
1593 chance -= formula->chance; 1512 chance -= formula->chance;
1594 if (chance <= 0) 1513 if (chance <= 0)
1595 break; 1514 break;
1596 } 1515 }
… …
1606 { 1525 {
1607 /* looks like a formula was found. Base the amount 1526 /* looks like a formula was found. Base the amount
1608 * of information on the booklevel and the spellevel 1527 * of information on the booklevel and the spellevel
1609 * of the formula. */ 1528 * of the formula. */
1610 1529
1611 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1530 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1612 archetype *at; 1531 archetype *at;
1613 1532
1614 /* preamble */ 1533 /* preamble */
1615 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1534 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1616 1535
1617 if ((at = archetype::find (op_name)) != (archetype *) NULL) 1536 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1618 op_name = at->clone.name; 1537 op_name = at->object::name;
1619 else 1538 else
1620 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1539 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1621 1540
1622 /* item name */ 1541 /* item name */
1623 if (strcmp (formula->title, "NONE")) 1542 if (formula->title != shstr_NONE)
1624 { 1543 {
1625 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title); 1544 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1626 /* This results in things like pile of philo. sulfur. 1545 /* This results in things like pile of philo. sulfur.
1627 * while philo. sulfur may look better, without this, 1546 * while philo. sulfur may look better, without this,
1628 * you get things like 'the wise' because its missing the 1547 * you get things like 'the wise' because its missing the
1629 * water of section. 1548 * water of section.
1630 */ 1549 */
1631 sprintf (title, "%s: %s of %s", 1550 sprintf (title, "%s: %s of %s",
1632 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1551 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1633 } 1552 }
1634 else 1553 else
1635 { 1554 {
1636 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1555 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1637 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1556 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1638 if (at->clone.title) 1557 if (at->title)
1639 { 1558 {
1640 strcat (retbuf, " "); 1559 strcat (retbuf, " ");
1641 strcat (retbuf, at->clone.title); 1560 strcat (retbuf, at->title);
1642 strcat (title, " "); 1561 strcat (title, " ");
1643 strcat (title, at->clone.title); 1562 strcat (title, at->title);
1644 } 1563 }
1645 } 1564 }
1565
1646 /* Lets name the book something meaningful ! */ 1566 /* Lets name the book something meaningful ! */
1647 book->name = title; 1567 book->name = title;
1648 book->title = NULL; 1568 book->title = NULL;
1649 1569
1650 /* ingredients to make it */ 1570 /* ingredients to make it */
… …
1654 archetype *at; 1574 archetype *at;
1655 1575
1656 at = archetype::find (formula->cauldron); 1576 at = archetype::find (formula->cauldron);
1657 1577
1658 sprintf (retbuf + strlen (retbuf), 1578 sprintf (retbuf + strlen (retbuf),
1659 " may be made at %s using the following ingredients:\n", at ? query_name (&at->clone) : "an unknown place"); 1579 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place");
1660 1580
1661 for (next = formula->ingred; next != NULL; next = next->next) 1581 for (next = formula->ingred; next != NULL; next = next->next)
1662 { 1582 {
1663 strcat (retbuf, next->name); 1583 strcat (retbuf, next->name);
1664 strcat (retbuf, "\n"); 1584 strcat (retbuf, "\n");
… …
1671 1591
1672 book->msg = retbuf; 1592 book->msg = retbuf;
1673 } 1593 }
1674} 1594}
1675 1595
1676 1596#define DESCRIBE_PATH(retbuf, variable, name) \
1677/* msgfile_msg() - generate a message drawn randomly from a 1597 if(variable) { \
1678 * file in lib/. Level currently has no effect on the message 1598 int i,j=0; \
1679 * which is returned. 1599 strcat(retbuf,"(" name ": "); \
1680 */ 1600 for(i=0; i<NRSPELLPATHS; i++) \
1681 1601 if(variable & (1<<i)) { \
1682char * 1602 if (j) \
1683msgfile_msg (int level, int booksize) 1603 strcat(retbuf,", "); \
1684{ 1604 else \
1685 static char retbuf[BOOK_BUF]; 1605 j = 1; \
1686 int i, msgnum; 1606 strcat(retbuf, spellpathnames[i]); \
1687 linked_char *msg = NULL; 1607 } \
1688 1608 strcat(retbuf,")"); \
1689 /* get a random message for the 'book' from linked list */
1690 if (nrofmsg > 1)
1691 { 1609 }
1692 msg = first_msg;
1693 msgnum = RANDOM () % nrofmsg;
1694 for (i = 0; msg && i < nrofmsg && i != msgnum; i++)
1695 msg = msg->next;
1696 }
1697
1698 if (msg && !book_overflow (retbuf, msg->name, booksize))
1699 strcpy (retbuf, msg->name);
1700 else
1701 sprintf (retbuf, "\n <undecipherable text>");
1702
1703#ifdef BOOK_MSG_DEBUG
1704 LOG (llevDebug, "\n info_list_msg() created strng: %d\n", strlen (retbuf));
1705 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1706#endif
1707
1708 return retbuf;
1709}
1710
1711 1610
1712/* god_info_msg() - generate a message detailing the properties 1611/* god_info_msg() - generate a message detailing the properties
1713 * of a random god. Used by the book hack. b.t. 1612 * of a random god. Used by the book hack. b.t.
1714 */ 1613 */
1715
1716const char * 1614const char *
1717god_info_msg (int level, int booksize) 1615god_info_msg (int level, int booksize)
1718{ 1616{
1719 static char retbuf[BOOK_BUF]; 1617 static char retbuf[BOOK_BUF];
1720 const char *name = NULL; 1618 const char *name = NULL;
… …
1745 1643
1746 /* Information about the god is random, and based on the level of the 1644 /* Information about the god is random, and based on the level of the
1747 * 'book'. Probably there is a more intellegent way to implement 1645 * 'book'. Probably there is a more intellegent way to implement
1748 * this ... 1646 * this ...
1749 */ 1647 */
1750
1751 while (level > 0) 1648 while (level > 0)
1752 { 1649 {
1753 sprintf (buf, " "); 1650 sprintf (buf, " ");
1754 if (level == 2 && RANDOM () % 2) 1651 if (level == 2 && rndm (2))
1755 { /* enemy god */ 1652 { /* enemy god */
1756 const char *enemy = god->title; 1653 const char *enemy = god->title;
1757 1654
1758 if (enemy) 1655 if (enemy)
1759 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1656 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1760 } 1657 }
1658
1761 if (level == 3 && RANDOM () % 2) 1659 if (level == 3 && rndm (2))
1762 { /* enemy race, what the god's holy word effects */ 1660 { /* enemy race, what the god's holy word effects */
1763 const char *enemy = god->slaying; 1661 const char *enemy = god->slaying;
1764 1662
1765 if (enemy && !(god->path_denied & PATH_TURNING)) 1663 if (enemy && !(god->path_denied & PATH_TURNING))
1766 if ((i = nstrtok (enemy, ",")) > 0) 1664 if ((i = nstrtok (enemy, ",")) > 0)
… …
1774 else 1672 else
1775 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1673 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1776 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1674 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1777 } 1675 }
1778 } 1676 }
1677
1779 if (level == 4 && RANDOM () % 2) 1678 if (level == 4 && rndm (2))
1780 { /* Priest of god gets these protect,vulnerable... */ 1679 { /* Priest of god gets these protect,vulnerable... */
1781 char tmpbuf[MAX_BUF], *cp; 1680 char tmpbuf[MAX_BUF];
1782 1681
1783 cp = describe_resistance (god, 1); 1682 if (const char *cp = describe_resistance (god, 1))
1784
1785 if (*cp)
1786 { /* This god does have protections */ 1683 { /* This god does have protections */
1787 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1684 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name);
1788 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1685 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n");
1789 strcat (tmpbuf, cp); 1686 strcat (tmpbuf, cp);
1790 strcat (buf, tmpbuf); 1687 strcat (buf, tmpbuf);
1791 strcat (buf, "\n ---\n"); 1688 strcat (buf, "\n ---\n");
1792 } 1689 }
1793 else 1690 else
1794 sprintf (buf, " "); 1691 sprintf (buf, " ");
1795 } 1692 }
1693
1796 if (level == 5 && RANDOM () % 2) 1694 if (level == 5 && rndm (2))
1797 { /* aligned race, summoning */ 1695 { /* aligned race, summoning */
1798 const char *race = god->race; /* aligned race */ 1696 const char *race = god->race; /* aligned race */
1799 1697
1800 if (race && !(god->path_denied & PATH_SUMMON)) 1698 if (race && !(god->path_denied & PATH_SUMMON))
1801 if ((i = nstrtok (race, ",")) > 0) 1699 if ((i = nstrtok (race, ",")) > 0)
… …
1808 else 1706 else
1809 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1707 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1810 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1708 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1811 } 1709 }
1812 } 1710 }
1711
1813 if (level == 6 && RANDOM () % 2) 1712 if (level == 6 && rndm (2))
1814 { /* blessing,curse properties of the god */ 1713 { /* blessing,curse properties of the god */
1815 char tmpbuf[MAX_BUF], *cp; 1714 char tmpbuf[MAX_BUF];
1816 1715
1817 cp = describe_resistance (god, 1); 1716 if (const char *cp = describe_resistance (god, 1))
1818
1819 if (*cp)
1820 { /* This god does have protections */ 1717 { /* This god does have protections */
1821 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1718 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name);
1822 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1719 strcat (tmpbuf, "bestow a blessing which makes the recipient\n");
1823 strcat (tmpbuf, cp); 1720 strcat (tmpbuf, cp);
1824 strcat (buf, tmpbuf); 1721 strcat (buf, tmpbuf);
… …
1826 } 1723 }
1827 else 1724 else
1828 sprintf (buf, " "); 1725 sprintf (buf, " ");
1829 1726
1830 } 1727 }
1728
1831 if (level == 8 && RANDOM () % 2) 1729 if (level == 8 && rndm (2))
1832 { /* immunity, holy possession */ 1730 { /* immunity, holy possession */
1833 int has_effect = 0, tmpvar; 1731 int has_effect = 0, tmpvar;
1834 char tmpbuf[MAX_BUF]; 1732 char tmpbuf[MAX_BUF];
1835 1733
1836 sprintf (tmpbuf, "\n"); 1734 sprintf (tmpbuf, "\n");
… …
1844 { 1742 {
1845 has_effect = 1; 1743 has_effect = 1;
1846 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]); 1744 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1847 } 1745 }
1848 } 1746 }
1747
1849 if (has_effect) 1748 if (has_effect)
1850 { 1749 {
1851 strcat (buf, tmpbuf); 1750 strcat (buf, tmpbuf);
1852 strcat (buf, "\n ---\n"); 1751 strcat (buf, "\n ---\n");
1853 } 1752 }
1854 else 1753 else
1855 sprintf (buf, " "); 1754 sprintf (buf, " ");
1856 } 1755 }
1756
1857 if (level == 12 && RANDOM () % 2) 1757 if (level == 12 && rndm (2))
1858 { /* spell paths */ 1758 { /* spell paths */
1859 int has_effect = 0, tmpvar; 1759 int has_effect = 0, tmpvar;
1860 char tmpbuf[MAX_BUF]; 1760 char tmpbuf[MAX_BUF];
1861 1761
1862 sprintf (tmpbuf, "\n"); 1762 sprintf (tmpbuf, "\n");
1863 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1763 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
1864 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1764 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1765
1865 if ((tmpvar = god->path_attuned)) 1766 if ((tmpvar = god->path_attuned))
1866 { 1767 {
1867 has_effect = 1; 1768 has_effect = 1;
1868 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned"); 1769 DESCRIBE_PATH (tmpbuf, tmpvar, "Attuned");
1869 } 1770 }
1771
1870 if ((tmpvar = god->path_repelled)) 1772 if ((tmpvar = god->path_repelled))
1871 { 1773 {
1872 has_effect = 1; 1774 has_effect = 1;
1873 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled"); 1775 DESCRIBE_PATH (tmpbuf, tmpvar, "Repelled");
1874 } 1776 }
1777
1875 if ((tmpvar = god->path_denied)) 1778 if ((tmpvar = god->path_denied))
1876 { 1779 {
1877 has_effect = 1; 1780 has_effect = 1;
1878 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1781 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1879 } 1782 }
1783
1880 if (has_effect) 1784 if (has_effect)
1881 { 1785 {
1882 strcat (buf, tmpbuf); 1786 strcat (buf, tmpbuf);
1883 strcat (buf, "\n ---\n"); 1787 strcat (buf, "\n ---\n");
1884 } 1788 }
… …
1892 */ 1796 */
1893 if (book_overflow (retbuf, buf, booksize)) 1797 if (book_overflow (retbuf, buf, booksize))
1894 break; 1798 break;
1895 else if (strlen (buf) > 1) 1799 else if (strlen (buf) > 1)
1896 strcat (retbuf, buf); 1800 strcat (retbuf, buf);
1801
1897 level--; 1802 level--;
1898 } 1803 }
1804
1899 if (strlen (retbuf) == introlen) 1805 if (strlen (retbuf) == introlen)
1900 { /* we got no information beyond the preamble! */ 1806 { /* we got no information beyond the preamble! */
1901 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1807 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1902 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1808 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1903 } 1809 }
… …
1922 * book is the object we are creating into. 1828 * book is the object we are creating into.
1923 * If msg_type is a positive value, we use that to determine the 1829 * If msg_type is a positive value, we use that to determine the
1924 * message type - otherwise a random value is used. 1830 * message type - otherwise a random value is used.
1925 * 1831 *
1926 */ 1832 */
1927
1928void 1833void
1929tailor_readable_ob (object *book, int msg_type) 1834tailor_readable_ob (object *book, int msg_type)
1930{ 1835{
1931 char msgbuf[BOOK_BUF]; 1836 char msgbuf[BOOK_BUF];
1932 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1837 int level = book->level ? rndm (book->level) + 1 : 1;
1933 int book_buf_size; 1838 int book_buf_size;
1934 1839
1935 /* safety */ 1840 /* safety */
1936 if (book->type != BOOK) 1841 if (book->type != BOOK)
1937 return; 1842 return;
… …
1951 * 2) make sure there is an entry in max_titles[] array. 1856 * 2) make sure there is an entry in max_titles[] array.
1952 * 3) make sure there are entries for your case in new_text_title() 1857 * 3) make sure there are entries for your case in new_text_title()
1953 * and add_authour(). 1858 * and add_authour().
1954 * 4) you may want separate authour/book name arrays in read.h 1859 * 4) you may want separate authour/book name arrays in read.h
1955 */ 1860 */
1956
1957 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1861 msg_type = msg_type > 0 ? msg_type : rndm (8);
1958 switch (msg_type) 1862 switch (msg_type)
1959 { 1863 {
1960 case 1: /* monster attrib */ 1864 case 1: /* monster attrib */
1961 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1865 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1962 break; 1866 break;
1963 case 2: /* artifact attrib */ 1867 case 2: /* artifact attrib */
1964 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1868 strcpy (msgbuf, artifact_msg (level, book_buf_size));
1965 break; 1869 break;
1966 case 3: /* grouping incantations/prayers by path */ 1870 case 3: /* grouping incantations/prayers by path */
1967 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1871 strcpy (msgbuf, spellpath_msg (level, book_buf_size));
1968 break; 1872 break;
1969 case 4: /* describe an alchemy formula */ 1873 case 4: /* describe an alchemy formula */
1970 make_formula_book (book, level); 1874 make_formula_book (book, level);
1971 /* make_formula_book already gives title */ 1875 /* make_formula_book already gives title */
1972 return; 1876 return;
1973 break; 1877 break;
1974 case 5: /* bits of information about a god */ 1878 case 5: /* bits of information about a god */
1975 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1879 strcpy (msgbuf, god_info_msg (level, book_buf_size));
1976 break; 1880 break;
1977 case 0: /* use info list in lib/ */ 1881 case 0: /* use info list in lib/ */
1978 default: 1882 default:
1979 strcpy (msgbuf, msgfile_msg (level, book_buf_size)); 1883 cfperl_make_book (book, level);
1980 break; 1884 return;
1981 } 1885 }
1982 1886
1983 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */ 1887 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1984 1888
1985 if (strlen (msgbuf) > 1) 1889 if (strlen (msgbuf) > 1)
1986 { 1890 {
1987 book->msg = msgbuf; 1891 book->msg = msgbuf;
1988 /* lets give the "book" a new name, which may be a compound word */ 1892 /* lets give the "book" a new name, which may be a compound word */
1989 change_book (book, msg_type); 1893 change_book (book, msg_type);
1990 } 1894 }
1991
1992} 1895}
1993 1896
1994 1897
1995/***************************************************************************** 1898/*****************************************************************************
1996 * 1899 *
… …
2091get_readable_message_type (object *readable) 1994get_readable_message_type (object *readable)
2092{ 1995{
2093 uint8 subtype = readable->subtype; 1996 uint8 subtype = readable->subtype;
2094 1997
2095 if (subtype > last_readable_subtype) 1998 if (subtype > last_readable_subtype)
2096 return &(readable_message_types[0]); 1999 return &readable_message_types[0];
2000
2097 return &(readable_message_types[subtype]); 2001 return &readable_message_types[subtype];
2098} 2002}

Diff Legend

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