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.30 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.39 by root, Wed Dec 31 17:35:37 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* This file contains code relevant to the BOOKS hack -- designed 24/* This file contains code relevant to the BOOKS hack -- designed
25 * to allow randomly occuring messages in non-magical texts. 25 * to allow randomly occuring messages in non-magical texts.
26 */ 26 */
… …
932 */ 932 */
933 933
934static int 934static int
935unique_book (const object *book, int msgtype) 935unique_book (const object *book, int msgtype)
936{ 936{
937 title *test;
938
939 if (!booklist) 937 if (!booklist)
940 return 1; /* No archival entries! Must be unique! */ 938 return 1; /* No archival entries! Must be unique! */
941 939
942 /* Go through the booklist. If the author and name match, not unique so 940 /* Go through the booklist. If the author and name match, not unique so
943 * return 0. 941 * return 0.
944 */ 942 */
945 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 943 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)) 944 if (test->name == book->name && book->title == test->authour)
948 return 0; 945 return 0;
949 } 946
950 return 1; 947 return 1;
951} 948}
952 949
953/* add_book_to_list() */ 950/* add_book_to_list() */
954 951
… …
1001{ 998{
1002 int nbr = sizeof (book_descrpt) / sizeof (char *); 999 int nbr = sizeof (book_descrpt) / sizeof (char *);
1003 1000
1004 switch (book->type) 1001 switch (book->type)
1005 { 1002 {
1006 case BOOK: 1003 case BOOK:
1007 { 1004 {
1008 titlelist *tl = get_titlelist (msgtype); 1005 titlelist *tl = get_titlelist (msgtype);
1009 title *t = NULL; 1006 title *t = NULL;
1010 int tries = 0; 1007 int tries = 0;
1011 1008
1012 /* look to see if our msg already been archived. If so, alter 1009 /* look to see if our msg already been archived. If so, alter
1013 * the book to match the archival text. If we fail to match, 1010 * the book to match the archival text. If we fail to match,
1014 * then we archive the new title/name/msg combo if there is 1011 * then we archive the new title/name/msg combo if there is
1015 * room on the titlelist. 1012 * room on the titlelist.
1016 */ 1013 */
1017 1014
1018 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1015 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1019 { 1016 {
1020 object *tmpbook;
1021
1022 /* alter book properties */ 1017 /* alter book properties */
1023 if ((tmpbook = get_archetype (t->archname)) != NULL) 1018 if (object *tmpbook = get_archetype (t->archname))
1019 {
1020 tmpbook->msg = book->msg;
1021 tmpbook->copy_to (book);
1022 tmpbook->destroy ();
1023 }
1024
1025 book->title = t->authour;
1026 book->name = t->name;
1027 book->level = t->level;
1028 }
1029 /* Don't have any default title, so lets make up a new one */
1030 else
1031 {
1032 int numb, maxnames = max_titles[msgtype];
1033 const char *old_title;
1034 const char *old_name;
1035
1036 old_title = book->title;
1037 old_name = book->name;
1038
1039 /* some pre-generated books have title already set (from
1040 * maps), also don't bother looking for unique title if
1041 * we already used up all the available names! */
1042
1043 if (!tl)
1044 {
1045 LOG (llevError, "change_book_name(): can't find title list\n");
1046 numb = 0;
1047 }
1048 else
1049 numb = tl->number;
1050
1051 if (numb == maxnames)
1052 {
1053#ifdef ARCHIVE_DEBUG
1054 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1055#endif
1056 break;
1057 }
1058 /* shouldnt change map-maker books */
1059 else if (!book->title)
1060 do
1024 { 1061 {
1025 tmpbook->msg = book->msg; 1062 /* random book name */
1026 tmpbook->copy_to (book); 1063 new_text_name (book, msgtype);
1027 tmpbook->destroy (); 1064 add_author (book, msgtype); /* random author */
1065 tries++;
1028 } 1066 }
1067 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1029 1068
1030 book->title = t->authour; 1069 /* Now deal with 2 cases.
1031 book->name = t->name; 1070 * 1)If no space for a new title exists lets just restore
1032 book->level = t->level; 1071 * the old book properties. Remember, if the book had
1072 * matchd an older entry on the titlelist, we shouldnt
1073 * have called this routine in the first place!
1074 * 2) If we got a unique title, we need to add it to
1075 * the list.
1033 } 1076 */
1034 /* Don't have any default title, so lets make up a new one */
1035 else
1036 {
1037 int numb, maxnames = max_titles[msgtype];
1038 const char *old_title;
1039 const char *old_name;
1040 1077
1041 old_title = book->title; 1078 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1042 old_name = book->name; 1079 { /* got to check maxnames again */
1043
1044 /* some pre-generated books have title already set (from
1045 * maps), also don't bother looking for unique title if
1046 * we already used up all the available names! */
1047
1048 if (!tl)
1049 {
1050 LOG (llevError, "change_book_name(): can't find title list\n");
1051 numb = 0;
1052 }
1053 else
1054 numb = tl->number;
1055
1056 if (numb == maxnames)
1057 {
1058#ifdef ARCHIVE_DEBUG 1080#ifdef ARCHIVE_DEBUG
1059 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames); 1081 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1060#endif 1082#endif
1061 break; 1083 /* restore old book properties here */
1062 } 1084 book->title = old_title;
1063 /* shouldnt change map-maker books */ 1085
1064 else if (!book->title) 1086 if (rndm (4))
1065 do
1066 { 1087 {
1067 /* random book name */ 1088 /* Lets give the book a description to individualize it some */
1068 new_text_name (book, msgtype); 1089 char new_name[MAX_BUF];
1069 add_author (book, msgtype); /* random author */ 1090
1070 tries++; 1091 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1092
1093 book->name = new_name;
1071 } 1094 }
1072 while (!unique_book (book, msgtype) && tries < MAX_TITLE_CHECK);
1073
1074 /* Now deal with 2 cases.
1075 * 1)If no space for a new title exists lets just restore
1076 * the old book properties. Remember, if the book had
1077 * matchd an older entry on the titlelist, we shouldnt
1078 * have called this routine in the first place!
1079 * 2) If we got a unique title, we need to add it to
1080 * the list.
1081 */
1082
1083 if (tries == MAX_TITLE_CHECK || numb == maxnames)
1084 { /* got to check maxnames again */
1085#ifdef ARCHIVE_DEBUG
1086 LOG (llevDebug, "Failed to obtain unique title for %s %s (names:%d/%d)\n", book->name, book->title, numb, maxnames);
1087#endif
1088 /* restore old book properties here */
1089 book->title = old_title;
1090
1091 if (RANDOM () % 4)
1092 {
1093 /* Lets give the book a description to individualize it some */
1094 char new_name[MAX_BUF];
1095
1096 snprintf (new_name, MAX_BUF, "%s %s", book_descrpt[rndm (nbr)], old_name);
1097
1098 book->name = new_name;
1099 }
1100 else 1095 else
1101 { 1096 {
1102 book->name = old_name; 1097 book->name = old_name;
1103 } 1098 }
1104 } 1099 }
1105 else if (book->title && strlen (book->msg) > 5) 1100 else if (book->title && strlen (book->msg) > 5)
1106 { /* archive if long msg texts */ 1101 { /* archive if long msg texts */
1107 add_book_to_list (book, msgtype); 1102 add_book_to_list (book, msgtype);
1108 } 1103 }
1109 } 1104 }
1110 break; 1105 break;
1111 } 1106 }
1112 1107
1113 default: 1108 default:
1114 LOG (llevError, "change_book_name() called w/ illegal obj type.\n"); 1109 LOG (llevError, "change_book_name() called w/ illegal obj type.\n");
1115 return; 1110 return;
1116 } 1111 }
1117} 1112}
1118 1113
1119/***************************************************************************** 1114/*****************************************************************************
1120 * 1115 *
… …
1145 return (object *) NULL; 1140 return (object *) NULL;
1146 1141
1147 if (!level) 1142 if (!level)
1148 { 1143 {
1149 /* lets get a random monster from the mon_info linked list */ 1144 /* lets get a random monster from the mon_info linked list */
1150 monnr = RANDOM () % nrofmon; 1145 monnr = rndm (nrofmon);
1151 1146
1152 for (mon = first_mon_info, i = 0; mon; mon = mon->next) 1147 for (mon = first_mon_info, i = 0; mon; mon = mon->next)
1153 if (i++ == monnr) 1148 if (i++ == monnr)
1154 break; 1149 break;
1155 1150
… …
1182 { 1177 {
1183 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level); 1178 LOG (llevError, "get_random_mon() couldn't return monster for level %d\n", level);
1184 return NULL; 1179 return NULL;
1185 } 1180 }
1186 1181
1187 monnr = RANDOM () % i; 1182 monnr = rndm (i);
1188 for (mon = first_mon_info; mon; mon = mon->next) 1183 for (mon = first_mon_info; mon; mon = mon->next)
1189 if (mon->ob->level >= level && monnr-- == 0) 1184 if (mon->ob->level >= level && monnr-- == 0)
1190 return mon->ob; 1185 return mon->ob;
1191 1186
1192 if (!mon) 1187 if (!mon)
… …
1296artifact_msg (int level, int booksize) 1291artifact_msg (int level, int booksize)
1297{ 1292{
1298 artifactlist *al = NULL; 1293 artifactlist *al = NULL;
1299 artifact *art; 1294 artifact *art;
1300 int chance, i, type, index; 1295 int chance, i, type, index;
1301 int book_entries = level > 5 ? RANDOM () % 3 + RANDOM () % 3 + 2 : RANDOM () % level + 1; 1296 int book_entries = level > 5 ? rndm (3) + rndm (3) + 2 : rndm (level) + 1;
1302 const char *ch; 1297 const char *ch;
1303 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF]; 1298 char name[MAX_BUF], buf[BOOK_BUF], sbuf[MAX_BUF];
1304 static char retbuf[BOOK_BUF]; 1299 static char retbuf[BOOK_BUF];
1305 object *tmp = NULL; 1300 object *tmp = NULL;
1306 1301
… …
1314 * for that type exists! 1309 * for that type exists!
1315 */ 1310 */
1316 i = 0; 1311 i = 0;
1317 do 1312 do
1318 { 1313 {
1319 index = RANDOM () % (sizeof (art_name_array) / sizeof (arttypename)); 1314 index = rndm (sizeof (art_name_array) / sizeof (arttypename));
1320 type = art_name_array[index].type; 1315 type = art_name_array[index].type;
1321 al = find_artifactlist (type); 1316 al = find_artifactlist (type);
1322 i++; 1317 i++;
1323 } 1318 }
1324 while ((al == NULL) && (i < 10)); 1319 while ((al == NULL) && (i < 10));
… …
1327 return "None"; 1322 return "None";
1328 1323
1329 /* There is no reason to start on the artifact list at the begining. Lets 1324 /* There is no reason to start on the artifact list at the begining. Lets
1330 * take our starting position randomly... */ 1325 * take our starting position randomly... */
1331 art = al->items; 1326 art = al->items;
1332 for (i = RANDOM () % level + RANDOM () % 2 + 1; i > 0; i--) 1327 for (i = rndm (level) + rndm (2) + 1; i > 0; i--)
1333 { 1328 {
1334 if (art == NULL) 1329 if (!art)
1335 art = al->items; /* hmm, out of stuff, loop back around */ 1330 art = al->items; /* hmm, out of stuff, loop back around */
1331
1336 art = art->next; 1332 art = art->next;
1337 } 1333 }
1338 1334
1339 /* the base 'generic' name for our artifact */ 1335 /* the base 'generic' name for our artifact */
1340 assign (name, art_name_array[index].name); 1336 assign (name, art_name_array[index].name);
… …
1362 do 1358 do
1363 { 1359 {
1364 temp = next; 1360 temp = next;
1365 next = next->next; 1361 next = next->next;
1366 } 1362 }
1367 while (next && !RANDOM () % 2); 1363 while (next && rndm (2));
1368 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name); 1364 sprintf (buf, "%s A %s of %s", buf, &temp->name, &art->item->name);
1369 } 1365 }
1370 else /* default name is used */ 1366 else /* default name is used */
1371 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name); 1367 sprintf (buf, "%s The %s of %s", buf, name, &art->item->name);
1372 1368
… …
1385 /* value of artifact */ 1381 /* value of artifact */
1386 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value); 1382 sprintf (buf, "%s item with a value that is %d times normal.\n", buf, art->item->value);
1387 1383
1388 /* include the message about the artifact, if exists, and book 1384 /* include the message about the artifact, if exists, and book
1389 * level is kinda high */ 1385 * level is kinda high */
1390 if (art->item->msg && (RANDOM () % 4 + 1) < level && !((strlen (art->item->msg) + strlen (buf)) > BOOK_BUF)) 1386 if (art->item->msg
1387 && rndm (4) + 1 < level
1388 && !(strlen (art->item->msg) + strlen (buf) > BOOK_BUF))
1391 strcat (buf, art->item->msg); 1389 strcat (buf, art->item->msg);
1392 1390
1393 /* properties of the artifact */ 1391 /* properties of the artifact */
1394 tmp = object::create (); 1392 tmp = object::create ();
1395 add_abilities (tmp, art->item); 1393 add_abilities (tmp, art->item);
… …
1427char * 1425char *
1428spellpath_msg (int level, int booksize) 1426spellpath_msg (int level, int booksize)
1429{ 1427{
1430 static char retbuf[BOOK_BUF]; 1428 static char retbuf[BOOK_BUF];
1431 char tmpbuf[BOOK_BUF]; 1429 char tmpbuf[BOOK_BUF];
1432 int path = RANDOM () % NRSPELLPATHS, prayers = RANDOM () % 2; 1430 int path = rndm (NRSPELLPATHS), prayers = rndm (2);
1433 int did_first_sp = 0; 1431 int did_first_sp = 0;
1434 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path]; 1432 uint32 pnum = (path == -1) ? PATH_NULL : spellpathdef[path];
1435 archetype *at; 1433 archetype *at;
1436 1434
1437 /* Preamble */ 1435 /* Preamble */
… …
1465 } 1463 }
1466 } 1464 }
1467 /* Geez, no spells were generated. */ 1465 /* Geez, no spells were generated. */
1468 if (!did_first_sp) 1466 if (!did_first_sp)
1469 { 1467 {
1470 if (RANDOM () % 4) /* usually, lets make a recursive call... */ 1468 if (rndm (4)) /* usually, lets make a recursive call... */
1471 spellpath_msg (level, booksize); 1469 spellpath_msg (level, booksize);
1472 else /* give up, cause knowing no spells exist for path is info too. */ 1470 else /* give up, cause knowing no spells exist for path is info too. */
1473 strcat (retbuf, "\n - no known spells exist -\n"); 1471 strcat (retbuf, "\n - no known spells exist -\n");
1474 } 1472 }
1475 else 1473 else
… …
1491 int chance; 1489 int chance;
1492 1490
1493 /* the higher the book level, the more complex (ie number of 1491 /* the higher the book level, the more complex (ie number of
1494 * ingredients) the formula can be. 1492 * ingredients) the formula can be.
1495 */ 1493 */
1496 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1494 fl = get_formulalist (rndm (level) / 3 + 1);
1497 1495
1498 if (!fl) 1496 if (!fl)
1499 fl = get_formulalist (1); /* safety */ 1497 fl = get_formulalist (1); /* safety */
1500 1498
1501 if (fl->total_chance == 0) 1499 if (fl->total_chance == 0)
… …
1505 add_author (book, 4); 1503 add_author (book, 4);
1506 return; 1504 return;
1507 } 1505 }
1508 1506
1509 /* get a random formula, weighted by its bookchance */ 1507 /* get a random formula, weighted by its bookchance */
1510 chance = RANDOM () % fl->total_chance; 1508 chance = rndm (fl->total_chance);
1511 for (formula = fl->items; formula != NULL; formula = formula->next) 1509 for (formula = fl->items; formula; formula = formula->next)
1512 { 1510 {
1513 chance -= formula->chance; 1511 chance -= formula->chance;
1514 if (chance <= 0) 1512 if (chance <= 0)
1515 break; 1513 break;
1516 } 1514 }
… …
1526 { 1524 {
1527 /* looks like a formula was found. Base the amount 1525 /* looks like a formula was found. Base the amount
1528 * of information on the booklevel and the spellevel 1526 * of information on the booklevel and the spellevel
1529 * of the formula. */ 1527 * of the formula. */
1530 1528
1531 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1529 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1532 archetype *at; 1530 archetype *at;
1533 1531
1534 /* preamble */ 1532 /* preamble */
1535 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1533 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1536 1534
… …
1547 * while philo. sulfur may look better, without this, 1545 * while philo. sulfur may look better, without this,
1548 * you get things like 'the wise' because its missing the 1546 * you get things like 'the wise' because its missing the
1549 * water of section. 1547 * water of section.
1550 */ 1548 */
1551 sprintf (title, "%s: %s of %s", 1549 sprintf (title, "%s: %s of %s",
1552 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1550 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1553 } 1551 }
1554 else 1552 else
1555 { 1553 {
1556 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1554 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1557 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1555 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1558 if (at->title) 1556 if (at->title)
1559 { 1557 {
1560 strcat (retbuf, " "); 1558 strcat (retbuf, " ");
1561 strcat (retbuf, at->title); 1559 strcat (retbuf, at->title);
1562 strcat (title, " "); 1560 strcat (title, " ");
… …
1591 1589
1592 book->msg = retbuf; 1590 book->msg = retbuf;
1593 } 1591 }
1594} 1592}
1595 1593
1594#define DESCRIBE_PATH(retbuf, variable, name) \
1595 if(variable) { \
1596 int i,j=0; \
1597 strcat(retbuf,"(" name ": "); \
1598 for(i=0; i<NRSPELLPATHS; i++) \
1599 if(variable & (1<<i)) { \
1600 if (j) \
1601 strcat(retbuf,", "); \
1602 else \
1603 j = 1; \
1604 strcat(retbuf, spellpathnames[i]); \
1605 } \
1606 strcat(retbuf,")"); \
1607 }
1608
1596/* god_info_msg() - generate a message detailing the properties 1609/* god_info_msg() - generate a message detailing the properties
1597 * of a random god. Used by the book hack. b.t. 1610 * of a random god. Used by the book hack. b.t.
1598 */ 1611 */
1599const char * 1612const char *
1600god_info_msg (int level, int booksize) 1613god_info_msg (int level, int booksize)
… …
1628 1641
1629 /* Information about the god is random, and based on the level of the 1642 /* Information about the god is random, and based on the level of the
1630 * 'book'. Probably there is a more intellegent way to implement 1643 * 'book'. Probably there is a more intellegent way to implement
1631 * this ... 1644 * this ...
1632 */ 1645 */
1633
1634 while (level > 0) 1646 while (level > 0)
1635 { 1647 {
1636 sprintf (buf, " "); 1648 sprintf (buf, " ");
1637 if (level == 2 && RANDOM () % 2) 1649 if (level == 2 && rndm (2))
1638 { /* enemy god */ 1650 { /* enemy god */
1639 const char *enemy = god->title; 1651 const char *enemy = god->title;
1640 1652
1641 if (enemy) 1653 if (enemy)
1642 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1654 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1643 } 1655 }
1644 1656
1645 if (level == 3 && RANDOM () % 2) 1657 if (level == 3 && rndm (2))
1646 { /* enemy race, what the god's holy word effects */ 1658 { /* enemy race, what the god's holy word effects */
1647 const char *enemy = god->slaying; 1659 const char *enemy = god->slaying;
1648 1660
1649 if (enemy && !(god->path_denied & PATH_TURNING)) 1661 if (enemy && !(god->path_denied & PATH_TURNING))
1650 if ((i = nstrtok (enemy, ",")) > 0) 1662 if ((i = nstrtok (enemy, ",")) > 0)
… …
1659 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1671 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1660 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1672 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1661 } 1673 }
1662 } 1674 }
1663 1675
1664 if (level == 4 && RANDOM () % 2) 1676 if (level == 4 && rndm (2))
1665 { /* Priest of god gets these protect,vulnerable... */ 1677 { /* Priest of god gets these protect,vulnerable... */
1666 char tmpbuf[MAX_BUF]; 1678 char tmpbuf[MAX_BUF];
1667 1679
1668 if (const char *cp = describe_resistance (god, 1)) 1680 if (const char *cp = describe_resistance (god, 1))
1669 { /* This god does have protections */ 1681 { /* This god does have protections */
… …
1675 } 1687 }
1676 else 1688 else
1677 sprintf (buf, " "); 1689 sprintf (buf, " ");
1678 } 1690 }
1679 1691
1680 if (level == 5 && RANDOM () % 2) 1692 if (level == 5 && rndm (2))
1681 { /* aligned race, summoning */ 1693 { /* aligned race, summoning */
1682 const char *race = god->race; /* aligned race */ 1694 const char *race = god->race; /* aligned race */
1683 1695
1684 if (race && !(god->path_denied & PATH_SUMMON)) 1696 if (race && !(god->path_denied & PATH_SUMMON))
1685 if ((i = nstrtok (race, ",")) > 0) 1697 if ((i = nstrtok (race, ",")) > 0)
… …
1693 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1705 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1694 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1706 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1695 } 1707 }
1696 } 1708 }
1697 1709
1698 if (level == 6 && RANDOM () % 2) 1710 if (level == 6 && rndm (2))
1699 { /* blessing,curse properties of the god */ 1711 { /* blessing,curse properties of the god */
1700 char tmpbuf[MAX_BUF]; 1712 char tmpbuf[MAX_BUF];
1701 1713
1702 if (const char *cp = describe_resistance (god, 1)) 1714 if (const char *cp = describe_resistance (god, 1))
1703 { /* This god does have protections */ 1715 { /* This god does have protections */
… …
1710 else 1722 else
1711 sprintf (buf, " "); 1723 sprintf (buf, " ");
1712 1724
1713 } 1725 }
1714 1726
1715 if (level == 8 && RANDOM () % 2) 1727 if (level == 8 && rndm (2))
1716 { /* immunity, holy possession */ 1728 { /* immunity, holy possession */
1717 int has_effect = 0, tmpvar; 1729 int has_effect = 0, tmpvar;
1718 char tmpbuf[MAX_BUF]; 1730 char tmpbuf[MAX_BUF];
1719 1731
1720 sprintf (tmpbuf, "\n"); 1732 sprintf (tmpbuf, "\n");
… …
1738 } 1750 }
1739 else 1751 else
1740 sprintf (buf, " "); 1752 sprintf (buf, " ");
1741 } 1753 }
1742 1754
1743 if (level == 12 && RANDOM () % 2) 1755 if (level == 12 && rndm (2))
1744 { /* spell paths */ 1756 { /* spell paths */
1745 int has_effect = 0, tmpvar; 1757 int has_effect = 0, tmpvar;
1746 char tmpbuf[MAX_BUF]; 1758 char tmpbuf[MAX_BUF];
1747 1759
1748 sprintf (tmpbuf, "\n"); 1760 sprintf (tmpbuf, "\n");
… …
1818 */ 1830 */
1819void 1831void
1820tailor_readable_ob (object *book, int msg_type) 1832tailor_readable_ob (object *book, int msg_type)
1821{ 1833{
1822 char msgbuf[BOOK_BUF]; 1834 char msgbuf[BOOK_BUF];
1823 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1835 int level = book->level ? rndm (book->level) + 1 : 1;
1824 int book_buf_size; 1836 int book_buf_size;
1825 1837
1826 /* safety */ 1838 /* safety */
1827 if (book->type != BOOK) 1839 if (book->type != BOOK)
1828 return; 1840 return;
… …
1842 * 2) make sure there is an entry in max_titles[] array. 1854 * 2) make sure there is an entry in max_titles[] array.
1843 * 3) make sure there are entries for your case in new_text_title() 1855 * 3) make sure there are entries for your case in new_text_title()
1844 * and add_authour(). 1856 * and add_authour().
1845 * 4) you may want separate authour/book name arrays in read.h 1857 * 4) you may want separate authour/book name arrays in read.h
1846 */ 1858 */
1847
1848 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1859 msg_type = msg_type > 0 ? msg_type : rndm (8);
1849 switch (msg_type) 1860 switch (msg_type)
1850 { 1861 {
1851 case 1: /* monster attrib */ 1862 case 1: /* monster attrib */
1852 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1863 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1853 break; 1864 break;
… …
1877 { 1888 {
1878 book->msg = msgbuf; 1889 book->msg = msgbuf;
1879 /* lets give the "book" a new name, which may be a compound word */ 1890 /* lets give the "book" a new name, which may be a compound word */
1880 change_book (book, msg_type); 1891 change_book (book, msg_type);
1881 } 1892 }
1882
1883} 1893}
1884 1894
1885 1895
1886/***************************************************************************** 1896/*****************************************************************************
1887 * 1897 *

Diff Legend

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