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

Diff Legend

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