ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/readable.C
(Generate patch)

Comparing deliantra/server/common/readable.C (file contents):
Revision 1.38 by root, Sat Dec 27 02:31:19 2008 UTC vs.
Revision 1.59 by root, Wed Apr 28 19:49:50 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains code relevant to the BOOKS hack -- designed 25/* This file contains code relevant to the BOOKS hack -- designed
29 30
30#include <global.h> 31#include <global.h>
31#include <book.h> 32#include <book.h>
32#include <living.h> 33#include <living.h>
33#include <spells.h> 34#include <spells.h>
34
35 35
36/* Define this if you want to archive book titles by contents. 36/* Define this if you want to archive book titles by contents.
37 * This option should enforce UNIQUE combinations of titles,authors and 37 * This option should enforce UNIQUE combinations of titles,authors and
38 * msg contents during and *between* game sessions. 38 * msg contents during and *between* game sessions.
39 * Note: a slight degeneracy exists since books are archived based on an integer 39 * Note: a slight degeneracy exists since books are archived based on an integer
108/* these are needed for creation of a linked list of 108/* these are needed for creation of a linked list of
109 * pointers to all (hostile) monster objects */ 109 * pointers to all (hostile) monster objects */
110 110
111static int nrofmon = 0, need_to_write_bookarchive = 0; 111static int nrofmon = 0, need_to_write_bookarchive = 0;
112 112
113
114/* this is needed to keep track of status of initialisation
115 * of the message file */
116static int nrofmsg = 0;
117
118/* first_msg is the started of the linked list of messages as read from
119 * the messages file
120 */
121static linked_char *first_msg = NULL;
122
123/* 113/*
124 * Spellpath information 114 * Spellpath information
125 */ 115 */
126
127static uint32 spellpathdef[NRSPELLPATHS] = { 116static uint32 spellpathdef[NRSPELLPATHS] = {
128 PATH_PROT, 117 PATH_PROT,
129 PATH_FIRE, 118 PATH_FIRE,
130 PATH_FROST, 119 PATH_FROST,
131 PATH_ELEC, 120 PATH_ELEC,
497 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"}, 486 /*subtype 50 */ {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_GRAVESTONE_3, "readable-monument-gravestone-3"},
498 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"}, 487 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_1, "readable-monument-wall-1"},
499 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"}, 488 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_2, "readable-monument-wall-2"},
500 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"} 489 {MSG_TYPE_MONUMENT, MSG_TYPE_MONUMENT_WALL_3, "readable-monument-wall-3"}
501}; 490};
502int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type); 491static int last_readable_subtype = sizeof (readable_message_types) / sizeof (readable_message_type);
503 492
504static int max_titles[6] = { 493static int max_titles[6] = {
505 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)), 494 ((sizeof (light_book_name) / sizeof (char *)) + (sizeof (heavy_book_name) / sizeof (char *))) * (sizeof (book_author) / sizeof (char *)),
506 (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)), 495 (sizeof (mon_book_name) / sizeof (char *)) * (sizeof (mon_author) / sizeof (char *)),
507 (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)), 496 (sizeof (art_book_name) / sizeof (char *)) * (sizeof (art_author) / sizeof (char *)),
515 * Start of misc. readable functions used by others functions in this file 504 * Start of misc. readable functions used by others functions in this file
516 * 505 *
517 *****************************************************************************/ 506 *****************************************************************************/
518 507
519static titlelist * 508static titlelist *
520get_empty_booklist (void) 509get_empty_booklist ()
521{ 510{
522 titlelist *bl = new titlelist; 511 titlelist *bl = new titlelist;
523 512
524 bl->number = 0; 513 bl->number = 0;
525 bl->first_book = NULL; 514 bl->first_book = NULL;
526 bl->next = NULL; 515 bl->next = NULL;
527 return bl; 516 return bl;
528} 517}
529 518
530static title * 519static title *
531get_empty_book (void) 520get_empty_book ()
532{ 521{
533 title *t = new title; 522 title *t = new title;
534 523
535 t->name = NULL; 524 t->name = NULL;
536 t->archname = NULL; 525 t->archname = NULL;
545/* get_titlelist() - returns pointer to the title list referanced by i */ 534/* get_titlelist() - returns pointer to the title list referanced by i */
546 535
547static titlelist * 536static titlelist *
548get_titlelist (int i) 537get_titlelist (int i)
549{ 538{
539 if (!booklist)
540 booklist = get_empty_booklist ();
541
550 titlelist *tl = booklist; 542 titlelist *tl = booklist;
551 int number = i; 543 int number = i;
552 544
553 if (number < 0) 545 if (number < 0)
554 return tl; 546 return tl;
557 { 549 {
558 if (!tl->next) 550 if (!tl->next)
559 tl->next = get_empty_booklist (); 551 tl->next = get_empty_booklist ();
560 552
561 tl = tl->next; 553 tl = tl->next;
562 number--; 554 --number;
563 } 555 }
564 556
565 return tl; 557 return tl;
566} 558}
567 559
569 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */ 561 * (shstr.c ?), but the quantity BOOK_BUF will need to be defined. */
570 562
571/* nstrtok() - simple routine to return the number of list 563/* nstrtok() - simple routine to return the number of list
572 * items in buf1 as separated by the value of buf2 564 * items in buf1 as separated by the value of buf2
573 */ 565 */
574 566static int
575int
576nstrtok (const char *buf1, const char *buf2) 567nstrtok (const char *buf1, const char *buf2)
577{ 568{
578 char *tbuf, sbuf[12], buf[MAX_BUF]; 569 char *tbuf, sbuf[12], buf[MAX_BUF];
579 int number = 0; 570 int number = 0;
580 571
581 if (!buf1 || !buf2) 572 if (!buf1 || !buf2)
582 return 0; 573 return 0;
583 sprintf (buf, "%s", buf1); 574
584 sprintf (sbuf, "%s", buf2); 575 strcpy (buf, buf1);
576 strcpy (sbuf, buf2);
577
585 tbuf = strtok (buf, sbuf); 578 tbuf = strtok (buf, sbuf);
586 while (tbuf) 579 while (tbuf)
587 { 580 {
588 number++; 581 number++;
589 tbuf = strtok (NULL, sbuf); 582 tbuf = strtok (NULL, sbuf);
593 586
594/* strtoktolin() - takes a string in buf1 and separates it into 587/* strtoktolin() - takes a string in buf1 and separates it into
595 * a list of strings delimited by buf2. Then returns a comma 588 * a list of strings delimited by buf2. Then returns a comma
596 * separated string w/ decent punctuation. 589 * separated string w/ decent punctuation.
597 */ 590 */
598 591static char *
599char *
600strtoktolin (const char *buf1, const char *buf2) 592strtoktolin (const char *buf1, const char *buf2)
601{ 593{
602 int maxi, i = nstrtok (buf1, buf2); 594 int maxi, i = nstrtok (buf1, buf2);
603 char *tbuf, buf[MAX_BUF], sbuf[12]; 595 char *tbuf, buf[MAX_BUF], sbuf[12];
604 static char rbuf[BOOK_BUF]; 596 static char rbuf[BOOK_BUF];
609 strcpy (rbuf, " "); 601 strcpy (rbuf, " ");
610 tbuf = strtok (buf, sbuf); 602 tbuf = strtok (buf, sbuf);
611 while (tbuf && i > 0) 603 while (tbuf && i > 0)
612 { 604 {
613 strcat (rbuf, tbuf); 605 strcat (rbuf, tbuf);
606
614 i--; 607 i--;
615 if (i == 1 && maxi > 1) 608 if (i == 1 && maxi > 1)
616 strcat (rbuf, " and "); 609 strcat (rbuf, " and ");
617 else if (i > 0 && maxi > 1) 610 else if (i > 0 && maxi > 1)
618 strcat (rbuf, ", "); 611 strcat (rbuf, ", ");
619 else 612 else
620 strcat (rbuf, "."); 613 strcat (rbuf, ".");
614
621 tbuf = strtok (NULL, sbuf); 615 tbuf = strtok (NULL, sbuf);
622 } 616 }
623 return (char *) rbuf;
624}
625 617
626int
627book_overflow (const char *buf1, const char *buf2, int booksize)
628{
629
630 if (buf_overflow (buf1, buf2, BOOK_BUF - 2) /* 2 less so always room for trailing \n */
631 || buf_overflow (buf1, buf2, booksize))
632 return 1;
633 return 0; 618 return rbuf;
634
635
636} 619}
637 620
638/***************************************************************************** 621/*****************************************************************************
639 * 622 *
640 * Start of initialisation related functions. 623 * Start of initialisation related functions.
644/* init_book_archive() - if not called before, initialise the info list 627/* init_book_archive() - if not called before, initialise the info list
645 * This reads in the bookarch file into memory. bookarch is the file 628 * This reads in the bookarch file into memory. bookarch is the file
646 * created and updated across multiple runs of the program. 629 * created and updated across multiple runs of the program.
647 */ 630 */
648static void 631static void
649init_book_archive (void) 632init_book_archive ()
650{ 633{
651 FILE *fp;
652 int comp, nroftitle = 0; 634 int nroftitle = 0;
653 char buf[MAX_BUF], fname[MAX_BUF], *cp;
654 title *book = NULL;
655 titlelist *bl = get_empty_booklist (); 635 titlelist *bl = get_empty_booklist ();
656 static int did_init_barch;
657 636
658 if (did_init_barch) 637 object_thawer thawer (settings.localdir, "bookarch");
638
639 if (!thawer)
640 {
641 LOG (llevDebug, "could not read bookarch file\n");
659 return; 642 return;
660
661 did_init_barch = 1;
662
663 if (!booklist)
664 booklist = bl;
665
666 sprintf (fname, "%s/bookarch", settings.localdir);
667 LOG (llevDebug, " Reading bookarch from %s...\n", fname);
668
669 if ((fp = open_and_uncompress (fname, 0, &comp)) != NULL)
670 { 643 }
644
645 while (thawer.kw)
646 {
647 if (thawer.kw != KW_title)
648 if (!thawer.parse_error ("bookarch file"))
649 break;
650
651 title *book = get_empty_book (); /* init new book entry */
652 thawer.get (book->name);
653
671 int value, type = 0; 654 int type = -1;
672 size_t i;
673 655
674 while (fgets (buf, MAX_BUF, fp) != NULL) 656 for (;;)
675 { 657 {
676 if (*buf == '#') 658 thawer.next ();
677 continue; 659
678 if ((cp = strchr (buf, '\n')) != NULL) 660 switch (thawer.kw)
679 *cp = '\0';
680 cp = buf;
681 while (*cp == ' ') /* Skip blanks */
682 cp++;
683 if (!strncmp (cp, "title", 4))
684 { 661 {
685 book = get_empty_book (); /* init new book entry */ 662 case KW_type: thawer.get (type ); break;
686 book->name = strchr (cp, ' ') + 1; 663 case KW_authour: thawer.get (book->authour ); break;
687 type = -1; 664 case KW_arch: thawer.get (book->archname ); break;
688 nroftitle++; 665 case KW_level: thawer.get (book->level ); break;
689 continue; 666 case KW_size: thawer.get (book->size ); break;
690 } 667 case KW_index: thawer.get (book->msg_index); break;
691 if (!strncmp (cp, "authour", 4)) 668
692 { 669 case KW_end:
693 book->authour = strchr (cp, ' ') + 1;
694 }
695 if (!strncmp (cp, "arch", 4))
696 {
697 book->archname = strchr (cp, ' ') + 1;
698 }
699 else if (sscanf (cp, "level %d", &value))
700 {
701 book->level = (uint16) value;
702 }
703 else if (sscanf (cp, "type %d", &value))
704 {
705 type = (uint16) value;
706 }
707 else if (sscanf (cp, "size %d", &value))
708 {
709 book->size = (uint16) value;
710 }
711 else if (sscanf (cp, "index %d", &value))
712 {
713 book->msg_index = (uint16) value;
714 }
715 else if (!strncmp (cp, "end", 3))
716 { /* link it */ 670 /* link it */
717 bl = get_titlelist (type); 671 bl = get_titlelist (type);
718 book->next = bl->first_book; 672 book->next = bl->first_book;
719 bl->first_book = book; 673 bl->first_book = book;
720 bl->number++; 674 bl->number++;
675 ++nroftitle;
676 goto book_done;
677
678 default:
679 delete book;
680 goto book_done;
721 } 681 }
722 } 682 }
683
684book_done:
685 thawer.next ();
686 }
687
723 LOG (llevDebug, "book archives(used/avail): \n"); 688 LOG (llevDebug, "book archives(used/avail): \n");
689 int i;
724 for (bl = booklist, i = 0; bl != NULL && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++) 690 for (bl = booklist, i = 0; bl && i < sizeof (max_titles) / sizeof (*max_titles); bl = bl->next, i++)
725 {
726 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]); 691 LOG (llevDebug, " (%d/%d)\n", bl->number, max_titles[i]);
727 }
728 close_and_delete (fp, comp);
729 }
730 692
731#ifdef BOOK_MSG_DEBUG
732 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle); 693 LOG (llevDebug, "init_book_archive() got %d titles.\n", nroftitle);
733#endif
734 LOG (llevDebug, " done.\n");
735} 694}
736 695
737/* init_mon_info() - creates the linked list of pointers to 696/* init_mon_info() - creates the linked list of pointers to
738 * monster archetype objects if not called previously 697 * monster archetype objects if not called previously
739 */ 698 */
740
741static void 699static void
742init_mon_info (void) 700init_mon_info ()
743{ 701{
744 archetype *at; 702 archetype *at;
745 static int did_init_mon_info = 0; 703 static int did_init_mon_info = 0;
746 704
747 if (did_init_mon_info) 705 if (did_init_mon_info)
748 return; 706 return;
749 707
750 did_init_mon_info = 1; 708 did_init_mon_info = 1;
751 709
752 for_all_archetypes (at) 710 for_all_archetypes (at)
753 { 711 if (at->flag [FLAG_MONSTER]
754 if (QUERY_FLAG (at, FLAG_MONSTER) && (!QUERY_FLAG (at, FLAG_CHANGING) || QUERY_FLAG (at, FLAG_UNAGGRESSIVE))) 712 && at->is_head ()
713 && (!at->flag [FLAG_CHANGING] || at->flag [FLAG_UNAGGRESSIVE]))
755 { 714 {
756 objectlink *mon = new objectlink; 715 objectlink *mon = new objectlink;
757 716
758 mon->ob = at; 717 mon->ob = at;
759 mon->next = first_mon_info; 718 mon->next = first_mon_info;
760 first_mon_info = mon; 719 first_mon_info = mon;
761 nrofmon++; 720 nrofmon++;
762 } 721 }
763 }
764 722
765 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon); 723 LOG (llevDebug, "init_mon_info() got %d monsters\n", nrofmon);
766} 724}
767 725
768/* init_readable() - initialise linked lists utilized by 726/* init_readable() - initialise linked lists utilized by
770 * 728 *
771 * This is the function called by the main routine to initialise 729 * This is the function called by the main routine to initialise
772 * all the readable information. 730 * all the readable information.
773 */ 731 */
774void 732void
775init_readable (void) 733init_readable ()
776{ 734{
777 static int did_this; 735 static int did_this;
778 736
779 if (did_this) 737 if (did_this)
780 return; 738 return;
817 else 775 else
818 t = t->next; 776 t = t->next;
819 777
820#ifdef ARCHIVE_DEBUG 778#ifdef ARCHIVE_DEBUG
821 if (t) 779 if (t)
822 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 780 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
823#endif 781#endif
824 782
825 return t; 783 return t;
826} 784}
827 785
829 * handled directly in change_book_name(). Names are based on text 787 * handled directly in change_book_name(). Names are based on text
830 * msgtype 788 * msgtype
831 * this sets book book->name based on msgtype given. What name 789 * this sets book book->name based on msgtype given. What name
832 * is given is based on various criteria 790 * is given is based on various criteria
833 */ 791 */
834
835static void 792static void
836new_text_name (object *book, int msgtype) 793new_text_name (object *book, int msgtype)
837{ 794{
838 int nbr; 795 const char *name;
839 char name[MAX_BUF];
840 796
841 if (book->type != BOOK) 797 if (book->type != BOOK)
842 return; 798 return;
843 799
844 switch (msgtype) 800 switch (msgtype)
845 { 801 {
846 case 1: /*monster */ 802 case 1: /*monster */
847 nbr = sizeof (mon_book_name) / sizeof (char *); 803 name = mon_book_name[rndm (array_length (mon_book_name))];
848 assign (name, mon_book_name[rndm (nbr)]);
849 break; 804 break;
850 case 2: /*artifact */ 805 case 2: /*artifact */
851 nbr = sizeof (art_book_name) / sizeof (char *); 806 name = art_book_name[rndm (array_length (art_book_name))];
852 assign (name, art_book_name[rndm (nbr)]);
853 break; 807 break;
854 case 3: /*spellpath */ 808 case 3: /*spellpath */
855 nbr = sizeof (path_book_name) / sizeof (char *); 809 name = path_book_name[rndm (array_length (path_book_name))];
856 assign (name, path_book_name[rndm (nbr)]);
857 break; 810 break;
858 case 4: /*alchemy */ 811 case 4: /*alchemy */
859 nbr = sizeof (formula_book_name) / sizeof (char *); 812 name = formula_book_name[rndm (array_length (formula_book_name))];
860 assign (name, formula_book_name[rndm (nbr)]);
861 break; 813 break;
862 case 5: /*gods */ 814 case 5: /*gods */
863 nbr = sizeof (gods_book_name) / sizeof (char *); 815 name = gods_book_name[rndm (array_length (gods_book_name))];
864 assign (name, gods_book_name[rndm (nbr)]);
865 break; 816 break;
866 case 6: /*msg file */ 817 case 6: /*msg file */
867 default: 818 default:
868 if (book->weight > 2000) 819 if (book->weight > 2000)
869 { /* based on weight */ 820 { /* based on weight */
870 nbr = sizeof (heavy_book_name) / sizeof (char *); 821 name = heavy_book_name[rndm (array_length (heavy_book_name))];
871 assign (name, heavy_book_name[rndm (nbr)]);
872 } 822 }
873 else if (book->weight < 2001) 823 else if (book->weight < 2001)
874 { 824 {
875 nbr = sizeof (light_book_name) / sizeof (char *); 825 name = light_book_name[rndm (array_length (light_book_name))];
876 assign (name, light_book_name[rndm (nbr)]);
877 } 826 }
878 break; 827 break;
879 } 828 }
880 829
881 book->name = name; 830 book->name = name;
887 */ 836 */
888 837
889static void 838static void
890add_author (object *op, int msgtype) 839add_author (object *op, int msgtype)
891{ 840{
892 char title[MAX_BUF], name[MAX_BUF]; 841 const char *name;
893 int nbr = sizeof (book_author) / sizeof (char *);
894 842
895 if (msgtype < 0 || strlen (op->msg) < 5) 843 if (msgtype < 0 || strlen (op->msg) < 5)
896 return; 844 return;
897 845
898 switch (msgtype) 846 switch (msgtype)
899 { 847 {
900 case 1: /* monster */ 848 case 1: /* monster */
901 nbr = sizeof (mon_author) / sizeof (char *); 849 name = mon_author[rndm (array_length (mon_author))];
902 assign (name, mon_author[rndm (nbr)]);
903 break; 850 break;
904 case 2: /* artifacts */ 851 case 2: /* artifacts */
905 nbr = sizeof (art_author) / sizeof (char *); 852 name = art_author[rndm (array_length (art_author))];
906 assign (name, art_author[rndm (nbr)]);
907 break; 853 break;
908 case 3: /* spellpath */ 854 case 3: /* spellpath */
909 nbr = sizeof (path_author) / sizeof (char *); 855 name = path_author[rndm (array_length (path_author))];
910 assign (name, path_author[rndm (nbr)]);
911 break; 856 break;
912 case 4: /* alchemy */ 857 case 4: /* alchemy */
913 nbr = sizeof (formula_author) / sizeof (char *); 858 name = formula_author[rndm (array_length (formula_author))];
914 assign (name, formula_author[rndm (nbr)]);
915 break; 859 break;
916 case 5: /* gods */ 860 case 5: /* gods */
917 nbr = sizeof (gods_author) / sizeof (char *); 861 name = gods_author[rndm (array_length (gods_author))];
918 assign (name, gods_author[rndm (nbr)]);
919 break; 862 break;
920 case 6: /* msg file */ 863 case 6: /* msg file */
921 default: 864 default:
922 assign (name, book_author[rndm (nbr)]); 865 name = book_author[rndm (array_length (book_author))];
923 } 866 }
924 867
925 sprintf (title, "of %s", name); 868 op->title = format ("of %s", name);
926 op->title = title;
927} 869}
928 870
929/* unique_book() - check to see if the book title/msg is unique. We 871/* unique_book() - check to see if the book title/msg is unique. We
930 * go through the entire list of possibilities each time. If we find 872 * go through the entire list of possibilities each time. If we find
931 * a match, then unique_book returns true (because inst unique). 873 * a match, then unique_book returns true (because inst unique).
932 */ 874 */
933 875
934static int 876static int
935unique_book (const object *book, int msgtype) 877unique_book (const object *book, int msgtype)
936{ 878{
937 title *test;
938
939 if (!booklist) 879 if (!booklist)
940 return 1; /* No archival entries! Must be unique! */ 880 return 1; /* No archival entries! Must be unique! */
941 881
942 /* Go through the booklist. If the author and name match, not unique so 882 /* Go through the booklist. If the author and name match, not unique so
943 * return 0. 883 * return 0.
944 */ 884 */
945 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 885 for (title *test = get_titlelist (msgtype)->first_book; test; test = test->next)
946 {
947 if (!strcmp (test->name, book->name) && !strcmp (book->title, test->authour)) 886 if (test->name == book->name && book->title == test->authour)
948 return 0; 887 return 0;
949 } 888
950 return 1; 889 return 1;
951} 890}
952 891
953/* add_book_to_list() */ 892/* add_book_to_list() */
954 893
978 917
979 /* We have stuff we need to write now */ 918 /* We have stuff we need to write now */
980 need_to_write_bookarchive = 1; 919 need_to_write_bookarchive = 1;
981 920
982#ifdef ARCHIVE_DEBUG 921#ifdef ARCHIVE_DEBUG
983 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 922 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
984#endif 923#endif
985 924
986} 925}
987 926
988 927
994 * levels and architypes. -b.t. 933 * levels and architypes. -b.t.
995 */ 934 */
996 935
997#define MAX_TITLE_CHECK 20 936#define MAX_TITLE_CHECK 20
998 937
999void 938static void
1000change_book (object *book, int msgtype) 939change_book (object *book, int msgtype)
1001{ 940{
1002 int nbr = sizeof (book_descrpt) / sizeof (char *); 941 int nbr = sizeof (book_descrpt) / sizeof (char *);
1003 942
1004 switch (book->type) 943 switch (book->type)
1054 if (numb == maxnames) 993 if (numb == maxnames)
1055 { 994 {
1056#ifdef ARCHIVE_DEBUG 995#ifdef ARCHIVE_DEBUG
1057 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 996 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1058#endif 997#endif
1059 break;
1060 } 998 }
1061 /* shouldnt change map-maker books */ 999 /* shouldnt change map-maker books */
1062 else if (!book->title) 1000 else if (!book->title)
1063 do 1001 do
1064 { 1002 {
1079 */ 1017 */
1080 1018
1081 if (tries == MAX_TITLE_CHECK || numb == maxnames) 1019 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1082 { /* got to check maxnames again */ 1020 { /* got to check maxnames again */
1083#ifdef ARCHIVE_DEBUG 1021#ifdef ARCHIVE_DEBUG
1084 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames); 1022 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", &book->name, &book->title, numb, maxnames);
1085#endif 1023#endif
1086 /* restore old book properties here */ 1024 /* restore old book properties here */
1087 book->title = old_title; 1025 book->title = old_title;
1088 1026
1089 if (rndm (4)) 1027 if (rndm (4))
1090 {
1091 /* Lets give the book a description to individualize it some */ 1028 /* Lets give the book a description to individualize it some */
1092 char new_name[MAX_BUF];
1093
1094 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name); 1029 book->name = format ("%s %s", book_descrpt[rndm (nbr)], old_name);
1095
1096 book->name = new_name;
1097 }
1098 else 1030 else
1099 {
1100 book->name = old_name; 1031 book->name = old_name;
1101 }
1102 } 1032 }
1103 else if (book->title && strlen (book->msg) > 5) 1033 else if (book->title && strlen (book->msg) > 5)
1104 { /* archive if long msg texts */ 1034 { /* archive if long msg texts */
1105 add_book_to_list (book, msgtype); 1035 add_book_to_list (book, msgtype);
1106 } 1036 }
1129 * list of all monsters in the current game. If level is non-zero, 1059 * list of all monsters in the current game. If level is non-zero,
1130 * then only monsters greater than that level will be returned. 1060 * then only monsters greater than that level will be returned.
1131 * Changed 971225 to be greater than equal to level passed. Also 1061 * Changed 971225 to be greater than equal to level passed. Also
1132 * made choosing by level more random. 1062 * made choosing by level more random.
1133 */ 1063 */
1134
1135object * 1064object *
1136get_random_mon (int level) 1065get_random_mon (int level)
1137{ 1066{
1138 objectlink *mon = first_mon_info; 1067 objectlink *mon = first_mon_info;
1139 int i = 0, monnr; 1068 int i = 0, monnr;
1197 1126
1198/* 1127/*
1199 * Returns a description of the monster. This really needs to be 1128 * Returns a description of the monster. This really needs to be
1200 * redone, as describe_item really gives a pretty internal description. 1129 * redone, as describe_item really gives a pretty internal description.
1201 */ 1130 */
1202 1131static const char *
1203char *
1204mon_desc (const object *mon) 1132mon_desc (const object *mon)
1205{ 1133{
1206 static char retbuf[HUGE_BUF]; 1134 static dynbuf_text buf; buf.clear ();
1207 1135
1208 sprintf (retbuf, " *** %s ***\n", &mon->name); 1136 buf.printf ("B<< %s >>\r", &mon->name);
1209 strcat (retbuf, describe_item (mon, NULL)); 1137 buf << describe_item (mon, 0);
1210 1138
1211 return retbuf; 1139 return buf;
1212} 1140}
1213 1141
1214 1142
1215/* This function returns the next monsters after 'tmp'. If no match is 1143/* This function returns the next monsters after 'tmp'. If no match is
1216 * found, it returns NULL (changed 0.94.3 to do this, since the 1144 * found, it returns NULL (changed 0.94.3 to do this, since the
1217 * calling function (mon_info_msg) seems to expect that. 1145 * calling function (mon_info_msg) seems to expect that.
1218 */ 1146 */
1219 1147static object *
1220object *
1221get_next_mon (object *tmp) 1148get_next_mon (object *tmp)
1222{ 1149{
1223 objectlink *mon; 1150 objectlink *mon;
1224 1151
1225 for (mon = first_mon_info; mon; mon = mon->next) 1152 for (mon = first_mon_info; mon; mon = mon->next)
1227 break; 1154 break;
1228 1155
1229 /* didn't find a match */ 1156 /* didn't find a match */
1230 if (!mon) 1157 if (!mon)
1231 return NULL; 1158 return NULL;
1159
1232 if (mon->next) 1160 if (mon->next)
1233 return mon->next->ob; 1161 return mon->next->ob;
1234 else 1162 else
1235 return first_mon_info->ob; 1163 return first_mon_info->ob;
1236 1164
1237} 1165}
1238 1166
1239
1240
1241/* mon_info_msg() - generate a message detailing the properties 1167/* mon_info_msg() - generate a message detailing the properties
1242 * of a randomly selected monster. 1168 * of a randomly selected monster.
1243 */ 1169 */
1244 1170static const char *
1245char *
1246mon_info_msg (int level, int booksize) 1171mon_info_msg (int level)
1247{ 1172{
1248 static char retbuf[BOOK_BUF]; 1173 static dynbuf_text buf; buf.clear ();
1249 char tmpbuf[HUGE_BUF];
1250 object *tmp;
1251 1174
1252 /*preamble */ 1175 /*preamble */
1253 strcpy (retbuf, "This beastiary contains:"); 1176 buf << "This beastiary contains:\n";
1254 1177
1255 /* lets print info on as many monsters as will fit in our 1178 /* lets print info on as many monsters as will fit in our
1256 * document. 1179 * document.
1257 * 8-96 Had to change this a bit, otherwise there would 1180 * 8-96 Had to change this a bit, otherwise there would
1258 * have been an impossibly large number of combinations 1181 * have been an impossibly large number of combinations
1259 * of text! (and flood out the available number of titles 1182 * of text! (and flood out the available number of titles
1260 * in the archive in a snap!) -b.t. 1183 * in the archive in a snap!) -b.t.
1261 */ 1184 */
1262 tmp = get_random_mon (level * 3); 1185 object *tmp = get_random_mon (level * 3);
1263 while (tmp) 1186 while (tmp && buf.size () < BOOK_BUF)
1264 { 1187 {
1265 /* monster description */ 1188 /* monster description */
1266 sprintf (tmpbuf, "\n---\n%s", mon_desc (tmp)); 1189 buf.printf ("\n%s\n", mon_desc (tmp));
1267
1268 if (!book_overflow (retbuf, tmpbuf, booksize))
1269 strcat (retbuf, tmpbuf);
1270 else
1271 break;
1272 1190
1273 /* Note that the value this returns is not based on level */ 1191 /* Note that the value this returns is not based on level */
1274 tmp = get_next_mon (tmp); 1192 tmp = get_next_mon (tmp);
1275 } 1193 }
1276 1194
1277#ifdef BOOK_MSG_DEBUG
1278 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf));
1279 fprintf (logfile, " MADE THIS:\n%s\n", retbuf);
1280#endif
1281
1282 return retbuf; 1195 return buf;
1283} 1196}
1284 1197
1285 1198
1286/***************************************************************************** 1199/*****************************************************************************
1287 * Artifact msg generation code. 1200 * Artifact msg generation code.
1288 ****************************************************************************/ 1201 ****************************************************************************/
1289 1202
1290/* artifact_msg() - generate a message detailing the properties 1203/* artifact_msg() - generate a message detailing the properties
1291 * of 1-6 artifacts drawn sequentially from the artifact list. 1204 * of 1-6 artifacts drawn sequentially from the artifact list.
1292 */ 1205 */
1293const char * 1206static const char *
1294artifact_msg (int level, int booksize) 1207artifact_msg (int level)
1295{ 1208{
1296 artifactlist *al = NULL; 1209 artifactlist *al = NULL;
1297 artifact *art; 1210 artifact *art;
1298 int chance, i, type, index; 1211 int chance, i, type, index;
1299 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1; 1212 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1300 const char *ch; 1213 const char *ch;
1301 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1214 char name[MAX_BUF];
1302 static char retbuf[BOOK_BUF];
1303 object *tmp = NULL; 1215 object *tmp = NULL;
1216
1217 static dynbuf_text buf; buf.clear ();
1304 1218
1305 /* values greater than 5 create msg buffers that are too big! */ 1219 /* values greater than 5 create msg buffers that are too big! */
1306 if (book_entries > 5) 1220 if (book_entries > 5)
1307 book_entries = 5; 1221 book_entries = 5;
1308 1222
1312 * for that type exists! 1226 * for that type exists!
1313 */ 1227 */
1314 i = 0; 1228 i = 0;
1315 do 1229 do
1316 { 1230 {
1317 index = rndm (sizeof (art_name_array) / sizeof (arttypename)); 1231 index = rndm (array_length (art_name_array));
1318 type = art_name_array[index].type; 1232 type = art_name_array[index].type;
1319 al = find_artifactlist (type); 1233 al = find_artifactlist (type);
1320 i++; 1234 i++;
1321 } 1235 }
1322 while ((al == NULL) && (i < 10)); 1236 while ((al == NULL) && (i < 10));
1337 1251
1338 /* the base 'generic' name for our artifact */ 1252 /* the base 'generic' name for our artifact */
1339 assign (name, art_name_array[index].name); 1253 assign (name, art_name_array[index].name);
1340 1254
1341 /* Ok, lets print out the contents */ 1255 /* Ok, lets print out the contents */
1342 sprintf (retbuf, "Herein %s detailed %s...\n", book_entries > 1 ? "are" : "is", book_entries > 1 ? "some artifacts" : "an artifact"); 1256 buf.printf ("Herein %s detailed %s...\n",
1257 book_entries > 1 ? "are" : "is",
1258 book_entries > 1 ? "some artifacts" : "an artifact");
1343 1259
1344 /* artifact msg attributes loop. Lets keep adding entries to the 'book' 1260 /* artifact msg attributes loop. Lets keep adding entries to the 'book'
1345 * as long as we have space up to the allowed max # (book_entires) 1261 * as long as we have space up to the allowed max # (book_entires)
1346 */ 1262 */
1347 while (book_entries > 0) 1263 while (book_entries > 0 && buf.size () < BOOK_BUF)
1348 { 1264 {
1349 1265
1350 if (art == NULL) 1266 if (!art)
1351 art = al->items; 1267 art = al->items;
1352 1268
1353 /* separator of items */ 1269 buf << '\n';
1354 strcpy (buf, "--- \n");
1355 1270
1356 /* Name */ 1271 /* Name */
1357 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1272 if (art->allowed && art->allowed->name != shstr_All)
1358 { 1273 {
1359 linked_char *temp, *next = art->allowed; 1274 linked_char *temp, *next = art->allowed;
1360 1275
1361 do 1276 do
1362 { 1277 {
1363 temp = next; 1278 temp = next;
1364 next = next->next; 1279 next = next->next;
1365 } 1280 }
1366 while (next && rndm (2)); 1281 while (next && rndm (2));
1282
1367 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1283 buf.printf ("A B<< %s of %s >>", &temp->name, &art->item->name);
1368 } 1284 }
1369 else /* default name is used */ 1285 else /* default name is used */
1370 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1286 buf.printf ("The B<< %s of %s >>", name, &art->item->name);
1287
1288 buf << " is ";
1371 1289
1372 /* chance of finding */ 1290 /* chance of finding */
1373 chance = (int) (100 * ((float) art->chance / al->total_chance)); 1291 chance = (int) (100 * ((float) art->chance / al->total_chance));
1374 if (chance >= 20) 1292 if (chance >= 20)
1375 sprintf (sbuf, "an uncommon"); 1293 buf << "an uncommon";
1376 else if (chance >= 10) 1294 else if (chance >= 10)
1377 sprintf (sbuf, "an unusual"); 1295 buf << "an unusual";
1378 else if (chance >= 5) 1296 else if (chance >= 5)
1379 sprintf (sbuf, "a rare"); 1297 buf << "a rare";
1380 else 1298 else
1381 sprintf (sbuf, "a very rare"); 1299 buf << "a very rare";
1382 sprintf (buf, "%s is %s\n", buf, sbuf);
1383 1300
1384 /* value of artifact */ 1301 /* value of artifact */
1385 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1302 buf << " item with a value that is " << art->item->value << " times normal.\n";
1386 1303
1387 /* include the message about the artifact, if exists, and book 1304 /* include the message about the artifact, if exists, and book
1388 * level is kinda high */ 1305 * level is kinda high */
1389 if (art->item->msg 1306 if (art->item->msg
1390 && rndm (4) + 1 < level 1307 && rndm (4) + 1 < level)
1391 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1392 strcat (buf, art->item->msg); 1308 buf << art->item->msg;
1393 1309
1394 /* properties of the artifact */ 1310 /* properties of the artifact */
1395 tmp = object::create (); 1311 tmp = object::create ();
1396 add_abilities (tmp, art->item); 1312 add_abilities (tmp, art->item);
1397 tmp->type = type; 1313 tmp->type = type;
1398 SET_FLAG (tmp, FLAG_IDENTIFIED); 1314 tmp->set_flag (FLAG_IDENTIFIED);
1399 if ((ch = describe_item (tmp, NULL)) != NULL && strlen (ch) > 1) 1315 if ((ch = describe_item (tmp, 0)) && strlen (ch) > 1)
1400 sprintf (buf, "%s Properties of this artifact include: \n %s \n", buf, ch); 1316 buf << "\rProperties of this artifact include:\r" << ch << "\n";
1317
1401 tmp->destroy (); 1318 tmp->destroy ();
1402 /* add the buf if it will fit */
1403 if (!book_overflow (retbuf, buf, booksize))
1404 strcat (retbuf, buf);
1405 else
1406 break;
1407 1319
1408 art = art->next; 1320 art = art->next;
1409 book_entries--; 1321 book_entries--;
1410 } 1322 }
1411 1323
1412#ifdef BOOK_MSG_DEBUG
1413 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf));
1414 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1415#endif
1416 return retbuf; 1324 return buf;
1417} 1325}
1418 1326
1419/***************************************************************************** 1327/*****************************************************************************
1420 * Spellpath message generation 1328 * Spellpath message generation
1421 *****************************************************************************/ 1329 *****************************************************************************/
1422 1330
1423/* spellpath_msg() - generate a message detailing the member 1331/* spellpath_msg() - generate a message detailing the member
1424 * incantations/prayers (and some of their properties) belonging to 1332 * incantations/prayers (and some of their properties) belonging to
1425 * a given spellpath. 1333 * a given spellpath.
1426 */ 1334 */
1427 1335static char *
1428char *
1429spellpath_msg (int level, int booksize) 1336spellpath_msg (int level)
1430{ 1337{
1338 static dynbuf_text buf; buf.clear ();
1339
1431 static char retbuf[BOOK_BUF]; 1340 static char retbuf[BOOK_BUF];
1432 char tmpbuf[BOOK_BUF]; 1341 char tmpbuf[BOOK_BUF];
1433 int path = rndm (NRSPELLPATHS), prayers = rndm (2); 1342 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1434 int did_first_sp = 0;
1435 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1343 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1436 archetype *at; 1344 archetype *at;
1437 1345
1438 /* Preamble */ 1346 /* Preamble */
1439 sprintf (retbuf, "Herein are detailed the names of %s\n", prayers ? "prayers" : "incantations"); 1347 buf << "Herein are detailed the names of "
1348 << (prayers ? "prayers" : "incantations");
1440 1349
1441 if (path == -1) 1350 if (path == -1)
1442 strcat (retbuf, "having no known spell path.\n"); 1351 buf << " having no known spell path.\n";
1443 else 1352 else
1444 sprintf (retbuf, "%sbelonging to the path of %s:\n", retbuf, spellpathnames[path]); 1353 buf << " belonging to the path of B<< " << spellpathnames[path] << " >>:\n\n";
1354
1355 int seen = 0;
1445 1356
1446 for_all_archetypes (at) 1357 for_all_archetypes (at)
1447 {
1448 /* Determine if this is an appropriate spell. Must 1358 /* Determine if this is an appropriate spell. Must
1449 * be of matching path, must be of appropriate type (prayer 1359 * be of matching path, must be of appropriate type (prayer
1450 * or not), and must be within the valid level range. 1360 * or not), and must be within the valid level range.
1451 */ 1361 */
1452 if (at->type == SPELL && at->path_attuned & pnum && 1362 if (at->type == SPELL && at->path_attuned & pnum &&
1453 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8))) 1363 ((at->stats.grace && prayers) || (at->stats.sp && !prayers)) && (at->level < (level * 8)))
1454 { 1364 {
1455 assign (tmpbuf, at->object::name); 1365 seen = 1;
1456 1366 buf << at->object::name << '\r';
1457 if (book_overflow (retbuf, tmpbuf, booksize))
1458 break;
1459 else
1460 {
1461 if (did_first_sp)
1462 strcat (retbuf, ",\n");
1463 did_first_sp = 1;
1464 strcat (retbuf, tmpbuf);
1465 }
1466 } 1367 }
1467 } 1368
1468 /* Geez, no spells were generated. */ 1369 /* Geez, no spells were generated. */
1469 if (!did_first_sp) 1370 if (!seen)
1470 {
1471 if (rndm (4)) /* usually, lets make a recursive call... */ 1371 if (rndm (4)) /* usually, lets make a recursive call... */
1472 spellpath_msg (level, booksize); 1372 return spellpath_msg (level);
1473 else /* give up, cause knowing no spells exist for path is info too. */ 1373 else /* give up, cause knowing no spells exist for path is info too. */
1474 strcat (retbuf, "\n - no known spells exist -\n"); 1374 buf << "- no known spells exist.\n";
1475 } 1375
1476 else
1477 {
1478 strcat (retbuf, "\n");
1479 }
1480 return retbuf; 1376 return buf;
1481} 1377}
1482 1378
1483/* formula_msg() - generate a message detailing the properties 1379/* formula_msg() - generate a message detailing the properties
1484 * of a randomly selected alchemical formula. 1380 * of a randomly selected alchemical formula.
1485 */ 1381 */
1486void 1382static void
1487make_formula_book (object *book, int level) 1383make_formula_book (object *book, int level)
1488{ 1384{
1489 char retbuf[BOOK_BUF], title[MAX_BUF]; 1385 char title[MAX_BUF];
1490 recipelist *fl; 1386 recipelist *fl;
1491 recipe *formula = NULL; 1387 recipe *formula = NULL;
1492 int chance; 1388 int chance;
1389
1390 static dynbuf_text buf; buf.clear ();
1493 1391
1494 /* the higher the book level, the more complex (ie number of 1392 /* the higher the book level, the more complex (ie number of
1495 * ingredients) the formula can be. 1393 * ingredients) the formula can be.
1496 */ 1394 */
1497 fl = get_formulalist (rndm (level) / 3 + 1); 1395 fl = get_formulalist (rndm (level) / 3 + 1);
1510 /* get a random formula, weighted by its bookchance */ 1408 /* get a random formula, weighted by its bookchance */
1511 chance = rndm (fl->total_chance); 1409 chance = rndm (fl->total_chance);
1512 for (formula = fl->items; formula; formula = formula->next) 1410 for (formula = fl->items; formula; formula = formula->next)
1513 { 1411 {
1514 chance -= formula->chance; 1412 chance -= formula->chance;
1413
1515 if (chance <= 0) 1414 if (chance <= 0)
1516 break; 1415 break;
1517 } 1416 }
1518 1417
1519 if (!formula || formula->arch_names <= 0) 1418 if (!formula || formula->arch_names <= 0)
1520 { 1419 {
1521 book->msg = "<indecipherable text>\n"; 1420 book->msg = "<indecipherable text>\n";
1522 new_text_name (book, 4); 1421 new_text_name (book, 4);
1523 add_author (book, 4); 1422 add_author (book, 4);
1524 1423 return;
1525 } 1424 }
1425
1426 /* looks like a formula was found. Base the amount
1427 * of information on the booklevel and the spellevel
1428 * of the formula. */
1429
1430 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1431 archetype *at;
1432
1433 /* preamble */
1434 buf << "Herein is described a project using B<< "
1435 << (formula->skill ? &formula->skill : "an unknown skill")
1436 << " >>:\n\n";
1437
1438 if ((at = archetype::find (op_name)))
1439 op_name = at->object::name;
1526 else 1440 else
1441 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1442
1443 /* item name */
1444 if (formula->title != shstr_NONE)
1445 {
1446 buf.printf ("The B<< %s of %s >>", op_name, &formula->title);
1447 /* This results in things like pile of philo. sulfur.
1448 * while philo. sulfur may look better, without this,
1449 * you get things like 'the wise' because its missing the
1450 * water of section.
1451 */
1452 sprintf (title, "%s: %s of %s",
1453 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1527 { 1454 }
1528 /* looks like a formula was found. Base the amount 1455 else
1529 * of information on the booklevel and the spellevel 1456 {
1530 * of the formula. */ 1457 buf << "The B<< " << op_name;
1531 1458
1532 const char *op_name = formula->arch_name [rndm (formula->arch_names)]; 1459 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1460 if (at->title)
1461 {
1462 buf << " " << at->title;
1463 strcat (title, " ");
1464 strcat (title, at->title);
1465 }
1466
1467 buf << " >>";
1468 }
1469
1470 /* Lets name the book something meaningful ! */
1471 book->name = title;
1472 book->title = NULL;
1473
1474 /* ingredients to make it */
1475 if (formula->ingred)
1476 {
1477 linked_char *next;
1533 archetype *at; 1478 archetype *at;
1534 1479
1535 /* preamble */
1536 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1537
1538 if ((at = archetype::find (op_name)) != (archetype *) NULL)
1539 op_name = at->object::name;
1540 else
1541 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1542
1543 /* item name */
1544 if (strcmp (formula->title, "NONE"))
1545 {
1546 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1547 /* This results in things like pile of philo. sulfur.
1548 * while philo. sulfur may look better, without this,
1549 * you get things like 'the wise' because its missing the
1550 * water of section.
1551 */
1552 sprintf (title, "%s: %s of %s",
1553 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1554 }
1555 else
1556 {
1557 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1558 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1559 if (at->title)
1560 {
1561 strcat (retbuf, " ");
1562 strcat (retbuf, at->title);
1563 strcat (title, " ");
1564 strcat (title, at->title);
1565 }
1566 }
1567 /* Lets name the book something meaningful ! */
1568 book->name = title;
1569 book->title = NULL;
1570
1571 /* ingredients to make it */
1572 if (formula->ingred != NULL)
1573 {
1574 linked_char *next;
1575 archetype *at;
1576
1577 at = archetype::find (formula->cauldron); 1480 at = archetype::find (formula->cauldron);
1578 1481
1579 sprintf (retbuf + strlen (retbuf), 1482 buf.printf (" may be made at %s using the following ingredients:\n\n",
1580 " may be made at %s using the following ingredients:\n", at ? query_name (at) : "an unknown place"); 1483 at ? query_name (at) : "an appropriate place");
1581 1484
1582 for (next = formula->ingred; next != NULL; next = next->next) 1485 for (next = formula->ingred; next; next = next->next)
1583 { 1486 buf << next->name << '\r';
1584 strcat (retbuf, next->name); 1487 }
1585 strcat (retbuf, "\n");
1586 }
1587 }
1588 else 1488 else
1589 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title); 1489 LOG (llevError, "formula_msg() no ingredient list for object %s of %s\n", op_name, &formula->title);
1590 if (retbuf[strlen (retbuf) - 1] != '\n')
1591 strcat (retbuf, "\n");
1592 1490
1593 book->msg = retbuf; 1491 book->msg = buf;
1594 }
1595} 1492}
1596 1493
1597#define DESCRIBE_PATH(retbuf, variable, name) \ 1494#define DESCRIBE_PATH(retbuf, variable, name) \
1598 if(variable) { \ 1495 if(variable) { \
1599 int i,j=0; \ 1496 int i,j=0; \
1610 } 1507 }
1611 1508
1612/* god_info_msg() - generate a message detailing the properties 1509/* god_info_msg() - generate a message detailing the properties
1613 * of a random god. Used by the book hack. b.t. 1510 * of a random god. Used by the book hack. b.t.
1614 */ 1511 */
1615const char * 1512static const char *
1616god_info_msg (int level, int booksize) 1513god_info_msg (int level)
1617{ 1514{
1618 static char retbuf[BOOK_BUF];
1619 const char *name = NULL; 1515 const char *name = NULL;
1620 char buf[BOOK_BUF];
1621 int i;
1622 size_t introlen;
1623 object *god = pntr_to_god_obj (get_rand_god ()); 1516 object *god = pntr_to_god_obj (get_rand_god ());
1624 1517
1518 static dynbuf_text buf; buf.clear ();
1519
1625 if (!god) 1520 if (!god)
1626 return (char *) NULL; /* oops, problems... */ 1521 return 0; /* oops, problems... */
1522
1627 name = god->name; 1523 name = god->name;
1628 1524
1629 /* preamble.. */ 1525 /* preamble.. */
1630 sprintf (retbuf, "This document contains knowledge concerning\n"); 1526 buf << "This document contains knowledge concerning the diety B<< "
1631 sprintf (retbuf, "%sthe diety %s", retbuf, name); 1527 << name << " >>";
1632 1528
1633 /* Always have as default information the god's descriptive terms. */ 1529 /* Always have as default information the god's descriptive terms. */
1634 if (nstrtok (god->msg, ",") > 0) 1530 if (nstrtok (god->msg, ",") > 0)
1635 { 1531 buf << ", known as" << strtoktolin (god->msg, ",");
1636 strcat (retbuf, ", known as");
1637 strcat (retbuf, strtoktolin (god->msg, ","));
1638 }
1639 else 1532 else
1640 strcat (retbuf, "..."); 1533 buf << "...";
1641 1534
1642 strcat (retbuf, "\n ---\n"); 1535 buf << "\n\n";
1536
1643 introlen = strlen (retbuf); /* so we will know if no new info is added later */ 1537 int introlen = buf.size (); /* so we will know if no new info is added later */
1644 1538
1645 /* Information about the god is random, and based on the level of the 1539 /* Information about the god is random, and based on the level of the
1646 * 'book'. Probably there is a more intellegent way to implement 1540 * 'book'. Probably there is a more intellegent way to implement
1647 * this ... 1541 * this ...
1648 */ 1542 */
1649 while (level > 0) 1543 while (level > 0 && buf.size () < BOOK_BUF)
1650 { 1544 {
1651 sprintf (buf, " ");
1652 if (level == 2 && rndm (2)) 1545 if (level == 2 && rndm (2))
1653 { /* enemy god */ 1546 { /* enemy god */
1654 const char *enemy = god->title; 1547 const char *enemy = god->title;
1655 1548
1656 if (enemy) 1549 if (enemy)
1657 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1550 buf.printf ("The gods %s and %s are enemies.\r", name, enemy);
1658 } 1551 }
1659 1552
1660 if (level == 3 && rndm (2)) 1553 if (level == 3 && rndm (2))
1661 { /* enemy race, what the god's holy word effects */ 1554 { /* enemy race, what the god's holy word effects */
1662 const char *enemy = god->slaying; 1555 const char *enemy = god->slaying;
1556 int i;
1663 1557
1664 if (enemy && !(god->path_denied & PATH_TURNING)) 1558 if (enemy && !(god->path_denied & PATH_TURNING))
1665 if ((i = nstrtok (enemy, ",")) > 0) 1559 if ((i = nstrtok (enemy, ",")) > 0)
1666 { 1560 {
1667 char tmpbuf[MAX_BUF]; 1561 buf << "The holy words of " << name
1562 << " have the power to slay creatures belonging to the ";
1668 1563
1669 sprintf (buf, "The holy words of %s have the power to\n", name);
1670 strcat (buf, "slay creatures belonging to the ");
1671 if (i > 1) 1564 if (i > 1)
1672 sprintf (tmpbuf, "following \n races:%s", strtoktolin (enemy, ",")); 1565 buf << "following races:" << strtoktolin (enemy, ",");
1673 else 1566 else
1674 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1567 buf << "race of" << strtoktolin (enemy, ",");
1675 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1568
1569 buf << '\r';
1676 } 1570 }
1677 } 1571 }
1678 1572
1679 if (level == 4 && rndm (2)) 1573 if (level == 4 && rndm (2))
1680 { /* Priest of god gets these protect,vulnerable... */ 1574 { /* Priest of god gets these protect,vulnerable... */
1681 char tmpbuf[MAX_BUF];
1682
1683 if (const char *cp = describe_resistance (god, 1)) 1575 if (const char *cp = describe_resistance (god, 1))
1684 { /* This god does have protections */ 1576 { /* This god does have protections */
1685 sprintf (tmpbuf, "%s has a potent aura which is extended\n", name); 1577 buf << name
1578 << " has a potent aura which is extended to"
1686 strcat (tmpbuf, "faithful priests. The effects of this aura include:\n"); 1579 " faithful priests. The effects of this aura include: "
1687 strcat (tmpbuf, cp); 1580 << cp
1688 strcat (buf, tmpbuf); 1581 << ".\r";
1689 strcat (buf, "\n ---\n");
1690 } 1582 }
1691 else
1692 sprintf (buf, " ");
1693 } 1583 }
1694 1584
1695 if (level == 5 && rndm (2)) 1585 if (level == 5 && rndm (2))
1696 { /* aligned race, summoning */ 1586 { /* aligned race, summoning */
1697 const char *race = god->race; /* aligned race */ 1587 const char *race = god->race; /* aligned race */
1588 int i;
1698 1589
1699 if (race && !(god->path_denied & PATH_SUMMON)) 1590 if (race && !(god->path_denied & PATH_SUMMON))
1700 if ((i = nstrtok (race, ",")) > 0) 1591 if ((i = nstrtok (race, ",")) > 0)
1701 { 1592 {
1702 char tmpbuf[MAX_BUF]; 1593 buf << "Creatures sacred to " << name << " include the ";
1703
1704 sprintf (buf, "Creatures sacred to %s include the \n", name);
1705 if (i > 1) 1594 if (i > 1)
1706 sprintf (tmpbuf, "following \n races:%s", strtoktolin (race, ",")); 1595 buf << "following races:" << strtoktolin (race, ",");
1707 else 1596 else
1708 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1597 buf << "race of" << strtoktolin (race, ",");
1709 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1598
1599 buf << '\r';
1710 } 1600 }
1711 } 1601 }
1712 1602
1713 if (level == 6 && rndm (2)) 1603 if (level == 6 && rndm (2))
1714 { /* blessing,curse properties of the god */ 1604 { /* blessing,curse properties of the god */
1715 char tmpbuf[MAX_BUF];
1716
1717 if (const char *cp = describe_resistance (god, 1)) 1605 if (const char *cp = describe_resistance (god, 1))
1718 { /* This god does have protections */ 1606 { /* This god does have protections */
1719 sprintf (tmpbuf, "\nThe priests of %s are known to be able to \n", name); 1607 buf << "The priests of " << name
1608 << " are known to be able to "
1720 strcat (tmpbuf, "bestow a blessing which makes the recipient\n"); 1609 "bestow a blessing which makes the recipient "
1721 strcat (tmpbuf, cp); 1610 << cp
1722 strcat (buf, tmpbuf); 1611 << '\r';
1723 strcat (buf, "\n ---\n");
1724 } 1612 }
1725 else
1726 sprintf (buf, " ");
1727
1728 } 1613 }
1729 1614
1730 if (level == 8 && rndm (2)) 1615 if (level == 8 && rndm (2))
1731 { /* immunity, holy possession */ 1616 { /* immunity, holy possession */
1617 buf << "The priests of " << name
1618 << " are known to make cast a mighty"
1619 " prayer of possession";
1620
1621 int first = 1;
1622
1623 for (int i = 0; i < NROFATTACKS; i++)
1624 if (god->resist[i] == 100)
1625 {
1626 if (first)
1627 {
1628 buf << " which gives the recipient";
1629 first = 0;
1630 }
1631 else
1632 buf << ", ";
1633
1634 buf << " immunity to " << attacktype_desc[i];
1635 }
1636
1637 buf << ".\r";
1638 }
1639
1640 if (level == 12 && rndm (2))
1641 { /* spell paths */
1642 //TODO:
1732 int has_effect = 0, tmpvar; 1643 int has_effect = 0, tmpvar;
1733 char tmpbuf[MAX_BUF]; 1644 char tmpbuf[MAX_BUF];
1734 1645
1735 sprintf (tmpbuf, "\n");
1736 sprintf (tmpbuf, "The priests of %s are known to make cast a mighty \n", name);
1737
1738 strcat (tmpbuf, "prayer of possession which gives the recipient\n");
1739
1740 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
1741 {
1742 if (god->resist[tmpvar] == 100)
1743 {
1744 has_effect = 1;
1745 sprintf (tmpbuf + strlen (tmpbuf), "Immunity to %s", attacktype_desc[tmpvar]);
1746 }
1747 }
1748
1749 if (has_effect)
1750 {
1751 strcat (buf, tmpbuf);
1752 strcat (buf, "\n ---\n");
1753 }
1754 else
1755 sprintf (buf, " ");
1756 }
1757
1758 if (level == 12 && rndm (2))
1759 { /* spell paths */
1760 int has_effect = 0, tmpvar;
1761 char tmpbuf[MAX_BUF];
1762
1763 sprintf (tmpbuf, "\n");
1764 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name); 1646 sprintf (tmpbuf, "It is rarely known fact that the priests of %s\n", name);
1765 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n"); 1647 strcat (tmpbuf, "are mystically transformed. Effects of this include:\n");
1766 1648
1767 if ((tmpvar = god->path_attuned)) 1649 if ((tmpvar = god->path_attuned))
1768 { 1650 {
1781 has_effect = 1; 1663 has_effect = 1;
1782 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied"); 1664 DESCRIBE_PATH (tmpbuf, tmpvar, "Denied");
1783 } 1665 }
1784 1666
1785 if (has_effect) 1667 if (has_effect)
1786 { 1668 buf << tmpbuf << '\r';
1787 strcat (buf, tmpbuf);
1788 strcat (buf, "\n ---\n");
1789 }
1790 else 1669 else
1791 sprintf (buf, " "); 1670 buf << '\r';
1792 } 1671 }
1793 1672
1794 /* check to be sure new buffer size dont exceed either
1795 * the maximum buffer size, or the 'natural' size of the
1796 * book...
1797 */
1798 if (book_overflow (retbuf, buf, booksize))
1799 break;
1800 else if (strlen (buf) > 1)
1801 strcat (retbuf, buf);
1802
1803 level--; 1673 level--;
1804 } 1674 }
1805 1675
1806 if (strlen (retbuf) == introlen) 1676 if (buf.size () == introlen)
1807 { /* we got no information beyond the preamble! */ 1677 /* we got no information beyond the preamble! */
1808 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1678 buf << "[Unfortunately the rest of the information is hopelessly garbled!]";
1809 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1679
1810 }
1811#ifdef BOOK_MSG_DEBUG
1812 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf));
1813 fprintf (logfile, " MADE THIS:\n%s", retbuf);
1814#endif
1815 return retbuf; 1680 return buf;
1816} 1681}
1817 1682
1818/* tailor_readable_ob()- The main routine. This chooses a random 1683/* tailor_readable_ob()- The main routine. This chooses a random
1819 * message to put in given readable object (type==BOOK) which will 1684 * message to put in given readable object (type==BOOK) which will
1820 * be referred hereafter as a 'book'. We use the book level to de- 1685 * be referred hereafter as a 'book'. We use the book level to de-
1832 * 1697 *
1833 */ 1698 */
1834void 1699void
1835tailor_readable_ob (object *book, int msg_type) 1700tailor_readable_ob (object *book, int msg_type)
1836{ 1701{
1837 char msgbuf[BOOK_BUF];
1838 int level = book->level ? rndm (book->level) + 1 : 1; 1702 int level = book->level ? rndm (book->level) + 1 : 1;
1839 int book_buf_size;
1840 1703
1841 /* safety */ 1704 /* safety */
1842 if (book->type != BOOK) 1705 if (book->type != BOOK)
1843 return; 1706 return;
1844 1707
1845 if (level <= 0) 1708 if (level <= 0)
1846 return; /* if no level no point in doing any more... */ 1709 return; /* if no level no point in doing any more... */
1847
1848 /* Max text length this book can have. */
1849 book_buf_size = BOOKSIZE (book);
1850 1710
1851 /* &&& The message switch &&& */ 1711 /* &&& The message switch &&& */
1852 /* Below all of the possible types of messages in the "book"s. 1712 /* Below all of the possible types of messages in the "book"s.
1853 */ 1713 */
1854 /* 1714 /*
1857 * 2) make sure there is an entry in max_titles[] array. 1717 * 2) make sure there is an entry in max_titles[] array.
1858 * 3) make sure there are entries for your case in new_text_title() 1718 * 3) make sure there are entries for your case in new_text_title()
1859 * and add_authour(). 1719 * and add_authour().
1860 * 4) you may want separate authour/book name arrays in read.h 1720 * 4) you may want separate authour/book name arrays in read.h
1861 */ 1721 */
1722 const char *new_msg = "";
1862 msg_type = msg_type > 0 ? msg_type : rndm (8); 1723 msg_type = msg_type > 0 ? msg_type : rndm (8);
1863 switch (msg_type) 1724 switch (msg_type)
1864 { 1725 {
1865 case 1: /* monster attrib */ 1726 case 1: /* monster attrib */
1866 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1727 new_msg = mon_info_msg (level);
1867 break; 1728 break;
1868 case 2: /* artifact attrib */ 1729 case 2: /* artifact attrib */
1869 strcpy (msgbuf, artifact_msg (level, book_buf_size)); 1730 new_msg = artifact_msg (level);
1870 break; 1731 break;
1871 case 3: /* grouping incantations/prayers by path */ 1732 case 3: /* grouping incantations/prayers by path */
1872 strcpy (msgbuf, spellpath_msg (level, book_buf_size)); 1733 new_msg = spellpath_msg (level);
1873 break; 1734 break;
1874 case 4: /* describe an alchemy formula */ 1735 case 4: /* describe an alchemy formula */
1875 make_formula_book (book, level); 1736 make_formula_book (book, level);
1876 /* make_formula_book already gives title */ 1737 /* make_formula_book already gives title */
1877 return; 1738 return;
1878 break;
1879 case 5: /* bits of information about a god */ 1739 case 5: /* bits of information about a god */
1880 strcpy (msgbuf, god_info_msg (level, book_buf_size)); 1740 new_msg = god_info_msg (level);
1881 break; 1741 break;
1882 case 0: /* use info list in lib/ */ 1742 case 0: /* use info list in lib/ */
1883 default: 1743 default:
1884 cfperl_make_book (book, level); 1744 cfperl_make_book (book, level);
1745 /* already gives title */
1885 return; 1746 return;
1886 } 1747 }
1887 1748
1888 strcat (msgbuf, "\n"); /* safety -- we get ugly map saves/crashes w/o this */
1889
1890 if (strlen (msgbuf) > 1) 1749 if (strlen (new_msg) > 1)
1891 { 1750 {
1892 book->msg = msgbuf; 1751 book->msg = new_msg;
1893 /* lets give the "book" a new name, which may be a compound word */ 1752 /* lets give the "book" a new name, which may be a compound word */
1894 change_book (book, msg_type); 1753 change_book (book, msg_type);
1895 } 1754 }
1896} 1755}
1897
1898
1899/*****************************************************************************
1900 *
1901 * Cleanup routine for readble stuff.
1902 *
1903 *****************************************************************************/
1904
1905void
1906free_all_readable (void)
1907{
1908 titlelist *tlist, *tnext;
1909 title *title1, *titlenext;
1910 linked_char *lmsg, *nextmsg;
1911 objectlink *monlink, *nextmon;
1912
1913 LOG (llevDebug, "freeing all book information\n");
1914
1915 for (tlist = booklist; tlist != NULL; tlist = tnext)
1916 {
1917 tnext = tlist->next;
1918
1919 for (title1 = tlist->first_book; title1; title1 = titlenext)
1920 {
1921 titlenext = title1->next;
1922 delete title1;
1923 }
1924
1925 delete tlist;
1926 }
1927
1928 for (lmsg = first_msg; lmsg; lmsg = nextmsg)
1929 {
1930 nextmsg = lmsg->next;
1931 delete lmsg;
1932 }
1933
1934 for (monlink = first_mon_info; monlink; monlink = nextmon)
1935 {
1936 nextmon = monlink->next;
1937 delete monlink;
1938 }
1939}
1940
1941 1756
1942/***************************************************************************** 1757/*****************************************************************************
1943 * 1758 *
1944 * Writeback routine for updating the bookarchive. 1759 * Writeback routine for updating the bookarchive.
1945 * 1760 *
1946 ****************************************************************************/ 1761 ****************************************************************************/
1947
1948/* write_book_archive() - write out the updated book archive */ 1762/* write_book_archive() - write out the updated book archive */
1949
1950void 1763void
1951write_book_archive (void) 1764write_book_archive ()
1952{ 1765{
1953 FILE *fp; 1766 FILE *fp;
1954 int index = 0; 1767 int index = 0;
1955 char fname[MAX_BUF]; 1768 char fname[MAX_BUF];
1956 title *book = NULL; 1769 title *book = NULL;
1957 titlelist *bl = get_titlelist (0); 1770 titlelist *bl = get_titlelist (0);
1958 1771
1959 /* If nothing changed, don't write anything */ 1772 /* If nothing changed, don't write anything */
1960 if (!need_to_write_bookarchive) 1773 if (!need_to_write_bookarchive)
1961 return; 1774 return;
1775
1962 need_to_write_bookarchive = 0; 1776 need_to_write_bookarchive = 0;
1963 1777
1964 sprintf (fname, "%s/bookarch", settings.localdir); 1778 sprintf (fname, "%s/bookarch", settings.localdir);
1965 LOG (llevDebug, "Updating book archive: %s...\n", fname); 1779 LOG (llevDebug, "Updating book archive: %s...\n", fname);
1966 1780
1967 if ((fp = fopen (fname, "w")) == NULL) 1781 if ((fp = fopen (fname, "w")) == NULL)
1968 {
1969 LOG (llevDebug, "Can't open book archive file %s\n", fname); 1782 LOG (llevDebug, "Can't open book archive file %s\n", fname);
1970 }
1971 else 1783 else
1972 { 1784 {
1973 while (bl) 1785 while (bl)
1974 { 1786 {
1975 for (book = bl->first_book; book; book = book->next) 1787 for (book = bl->first_book; book; book = book->next)
1982 fprintf (fp, "type %d\n", index); 1794 fprintf (fp, "type %d\n", index);
1983 fprintf (fp, "size %d\n", book->size); 1795 fprintf (fp, "size %d\n", book->size);
1984 fprintf (fp, "index %d\n", book->msg_index); 1796 fprintf (fp, "index %d\n", book->msg_index);
1985 fprintf (fp, "end\n"); 1797 fprintf (fp, "end\n");
1986 } 1798 }
1799
1987 bl = bl->next; 1800 bl = bl->next;
1988 index++; 1801 index++;
1989 } 1802 }
1803
1990 fclose (fp); 1804 fclose (fp);
1991 chmod (fname, SAVE_MODE); 1805 chmod (fname, SAVE_MODE);
1992 } 1806 }
1993} 1807}
1808
1994readable_message_type * 1809readable_message_type *
1995get_readable_message_type (object *readable) 1810get_readable_message_type (object *readable)
1996{ 1811{
1997 uint8 subtype = readable->subtype; 1812 uint8 subtype = readable->subtype;
1998 1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines