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.31 by root, Tue Jul 10 06:05:55 2007 UTC vs.
Revision 1.42 by sf-marcmagus, Thu Oct 15 16:00:37 2009 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 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 <crossfire@schmorp.de> 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
25 * to allow randomly occuring messages in non-magical texts. 26 * to allow randomly occuring messages in non-magical texts.
26 */ 27 */
… …
817 else 818 else
818 t = t->next; 819 t = t->next;
819 820
820#ifdef ARCHIVE_DEBUG 821#ifdef ARCHIVE_DEBUG
821 if (t) 822 if (t)
822 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, t->name, t->authour, t->msg_index); 823 LOG (llevDebug, "Found title match (list %d): %s %s (%d)\n", msgtype, &t->name, &t->authour, t->msg_index);
823#endif 824#endif
824 825
825 return t; 826 return t;
826} 827}
827 828
… …
932 */ 933 */
933 934
934static int 935static int
935unique_book (const object *book, int msgtype) 936unique_book (const object *book, int msgtype)
936{ 937{
937 title *test;
938
939 if (!booklist) 938 if (!booklist)
940 return 1; /* No archival entries! Must be unique! */ 939 return 1; /* No archival entries! Must be unique! */
941 940
942 /* Go through the booklist. If the author and name match, not unique so 941 /* Go through the booklist. If the author and name match, not unique so
943 * return 0. 942 * return 0.
944 */ 943 */
945 for (test = get_titlelist (msgtype)->first_book; test; test = test->next) 944 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)) 945 if (test->name == book->name && book->title == test->authour)
948 return 0; 946 return 0;
949 } 947
950 return 1; 948 return 1;
951} 949}
952 950
953/* add_book_to_list() */ 951/* add_book_to_list() */
954 952
… …
978 976
979 /* We have stuff we need to write now */ 977 /* We have stuff we need to write now */
980 need_to_write_bookarchive = 1; 978 need_to_write_bookarchive = 1;
981 979
982#ifdef ARCHIVE_DEBUG 980#ifdef ARCHIVE_DEBUG
983 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", book->name, book->title, msgtype); 981 LOG (llevDebug, "Archiving new title: %s %s (%d)\n", &book->name, &book->title, msgtype);
984#endif 982#endif
985 983
986} 984}
987 985
988 986
… …
1001{ 999{
1002 int nbr = sizeof (book_descrpt) / sizeof (char *); 1000 int nbr = sizeof (book_descrpt) / sizeof (char *);
1003 1001
1004 switch (book->type) 1002 switch (book->type)
1005 { 1003 {
1006 case BOOK: 1004 case BOOK:
1007 { 1005 {
1008 titlelist *tl = get_titlelist (msgtype); 1006 titlelist *tl = get_titlelist (msgtype);
1009 title *t = NULL; 1007 title *t = NULL;
1010 int tries = 0; 1008 int tries = 0;
1011 1009
1012 /* look to see if our msg already been archived. If so, alter 1010 /* look to see if our msg already been archived. If so, alter
1013 * the book to match the archival text. If we fail to match, 1011 * the book to match the archival text. If we fail to match,
1014 * then we archive the new title/name/msg combo if there is 1012 * then we archive the new title/name/msg combo if there is
1015 * room on the titlelist. 1013 * room on the titlelist.
1016 */ 1014 */
1017 1015
1018 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype))) 1016 if ((strlen (book->msg) > 5) && (t = find_title (book, msgtype)))
1019 { 1017 {
1020 object *tmpbook;
1021
1022 /* alter book properties */ 1018 /* alter book properties */
1023 if ((tmpbook = get_archetype (t->archname)) != NULL) 1019 if (object *tmpbook = get_archetype (t->archname))
1020 {
1021 tmpbook->msg = book->msg;
1022 tmpbook->copy_to (book);
1023 tmpbook->destroy ();
1024 }
1025
1026 book->title = t->authour;
1027 book->name = t->name;
1028 book->level = t->level;
1029 }
1030 /* Don't have any default title, so lets make up a new one */
1031 else
1032 {
1033 int numb, maxnames = max_titles[msgtype];
1034 const char *old_title;
1035 const char *old_name;
1036
1037 old_title = book->title;
1038 old_name = book->name;
1039
1040 /* some pre-generated books have title already set (from
1041 * maps), also don't bother looking for unique title if
1042 * we already used up all the available names! */
1043
1044 if (!tl)
1045 {
1046 LOG (llevError, "change_book_name(): can't find title list\n");
1047 numb = 0;
1048 }
1049 else
1050 numb = tl->number;
1051
1052 if (numb == maxnames)
1053 {
1054#ifdef ARCHIVE_DEBUG
1055 LOG (llevDebug, "titles for list %d full (%d possible).\n", msgtype, maxnames);
1056#endif
1057 }
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)
… …
1275 /* Note that the value this returns is not based on level */ 1270 /* Note that the value this returns is not based on level */
1276 tmp = get_next_mon (tmp); 1271 tmp = get_next_mon (tmp);
1277 } 1272 }
1278 1273
1279#ifdef BOOK_MSG_DEBUG 1274#ifdef BOOK_MSG_DEBUG
1280 LOG (llevDebug, "\n mon_info_msg() created strng: %d\n", strlen (retbuf)); 1275 LOG (llevDebug, "\n mon_info_msg() created string: %d\n", strlen (retbuf));
1281 fprintf (logfile, " MADE THIS:\n%s\n", retbuf); 1276 LOG (llevDebug, " MADE THIS:\n%s\n", retbuf);
1282#endif 1277#endif
1283 1278
1284 return retbuf; 1279 return retbuf;
1285} 1280}
1286 1281
… …
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);
… …
1353 1349
1354 /* separator of items */ 1350 /* separator of items */
1355 strcpy (buf, "--- \n"); 1351 strcpy (buf, "--- \n");
1356 1352
1357 /* Name */ 1353 /* Name */
1358 if (art->allowed != NULL && strcmp (art->allowed->name, "All")) 1354 if (art->allowed && art->allowed->name != shstr_All)
1359 { 1355 {
1360 linked_char *temp, *next = art->allowed; 1356 linked_char *temp, *next = art->allowed;
1361 1357
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);
… …
1407 art = art->next; 1405 art = art->next;
1408 book_entries--; 1406 book_entries--;
1409 } 1407 }
1410 1408
1411#ifdef BOOK_MSG_DEBUG 1409#ifdef BOOK_MSG_DEBUG
1412 LOG (llevDebug, "artifact_msg() created strng: %d\n", strlen (retbuf)); 1410 LOG (llevDebug, "artifact_msg() created string: %d\n", strlen (retbuf));
1413 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1411 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1414#endif 1412#endif
1415 return retbuf; 1413 return retbuf;
1416} 1414}
1417 1415
1418/***************************************************************************** 1416/*****************************************************************************
… …
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
1476 { 1474 {
1477 strcat (retbuf, "\n"); 1475 strcat (retbuf, "\n");
1478 } 1476 }
1477
1478#ifdef BOOK_MSG_DEBUG
1479 LOG (llevDebug, "spellpath_msg() created string: %d\n", strlen (retbuf));
1480 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1481#endif
1479 return retbuf; 1482 return retbuf;
1480} 1483}
1481 1484
1482/* formula_msg() - generate a message detailing the properties 1485/* formula_msg() - generate a message detailing the properties
1483 * of a randomly selected alchemical formula. 1486 * of a randomly selected alchemical formula.
… …
1491 int chance; 1494 int chance;
1492 1495
1493 /* the higher the book level, the more complex (ie number of 1496 /* the higher the book level, the more complex (ie number of
1494 * ingredients) the formula can be. 1497 * ingredients) the formula can be.
1495 */ 1498 */
1496 fl = get_formulalist (((RANDOM () % level) / 3) + 1); 1499 fl = get_formulalist (rndm (level) / 3 + 1);
1497 1500
1498 if (!fl) 1501 if (!fl)
1499 fl = get_formulalist (1); /* safety */ 1502 fl = get_formulalist (1); /* safety */
1500 1503
1501 if (fl->total_chance == 0) 1504 if (fl->total_chance == 0)
… …
1505 add_author (book, 4); 1508 add_author (book, 4);
1506 return; 1509 return;
1507 } 1510 }
1508 1511
1509 /* get a random formula, weighted by its bookchance */ 1512 /* get a random formula, weighted by its bookchance */
1510 chance = RANDOM () % fl->total_chance; 1513 chance = rndm (fl->total_chance);
1511 for (formula = fl->items; formula != NULL; formula = formula->next) 1514 for (formula = fl->items; formula; formula = formula->next)
1512 { 1515 {
1513 chance -= formula->chance; 1516 chance -= formula->chance;
1514 if (chance <= 0) 1517 if (chance <= 0)
1515 break; 1518 break;
1516 } 1519 }
… …
1526 { 1529 {
1527 /* looks like a formula was found. Base the amount 1530 /* looks like a formula was found. Base the amount
1528 * of information on the booklevel and the spellevel 1531 * of information on the booklevel and the spellevel
1529 * of the formula. */ 1532 * of the formula. */
1530 1533
1531 const char *op_name = formula->arch_name[RANDOM () % formula->arch_names]; 1534 const char *op_name = formula->arch_name [rndm (formula->arch_names)];
1532 archetype *at; 1535 archetype *at;
1533 1536
1534 /* preamble */ 1537 /* preamble */
1535 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill"); 1538 sprintf (retbuf, "Herein is described a project using %s: \n", formula->skill ? &formula->skill : "an unknown skill");
1536 1539
… …
1538 op_name = at->object::name; 1541 op_name = at->object::name;
1539 else 1542 else
1540 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name); 1543 LOG (llevError, "formula_msg() can't find arch %s for formula.\n", op_name);
1541 1544
1542 /* item name */ 1545 /* item name */
1543 if (strcmp (formula->title, "NONE")) 1546 if (formula->title != shstr_NONE)
1544 { 1547 {
1545 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title); 1548 sprintf (retbuf, "%sThe %s of %s", retbuf, op_name, &formula->title);
1546 /* This results in things like pile of philo. sulfur. 1549 /* This results in things like pile of philo. sulfur.
1547 * while philo. sulfur may look better, without this, 1550 * while philo. sulfur may look better, without this,
1548 * you get things like 'the wise' because its missing the 1551 * you get things like 'the wise' because its missing the
1549 * water of section. 1552 * water of section.
1550 */ 1553 */
1551 sprintf (title, "%s: %s of %s", 1554 sprintf (title, "%s: %s of %s",
1552 formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title); 1555 formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name, &formula->title);
1553 } 1556 }
1554 else 1557 else
1555 { 1558 {
1556 sprintf (retbuf, "%sThe %s", retbuf, op_name); 1559 sprintf (retbuf, "%sThe %s", retbuf, op_name);
1557 sprintf (title, "%s: %s", formula_book_name[RANDOM () % (sizeof (formula_book_name) / sizeof (char *))], op_name); 1560 sprintf (title, "%s: %s", formula_book_name [rndm (sizeof (formula_book_name) / sizeof (char *))], op_name);
1558 if (at->title) 1561 if (at->title)
1559 { 1562 {
1560 strcat (retbuf, " "); 1563 strcat (retbuf, " ");
1561 strcat (retbuf, at->title); 1564 strcat (retbuf, at->title);
1562 strcat (title, " "); 1565 strcat (title, " ");
1563 strcat (title, at->title); 1566 strcat (title, at->title);
1564 } 1567 }
1565 } 1568 }
1569
1566 /* Lets name the book something meaningful ! */ 1570 /* Lets name the book something meaningful ! */
1567 book->name = title; 1571 book->name = title;
1568 book->title = NULL; 1572 book->title = NULL;
1569 1573
1570 /* ingredients to make it */ 1574 /* ingredients to make it */
… …
1646 * this ... 1650 * this ...
1647 */ 1651 */
1648 while (level > 0) 1652 while (level > 0)
1649 { 1653 {
1650 sprintf (buf, " "); 1654 sprintf (buf, " ");
1651 if (level == 2 && RANDOM () % 2) 1655 if (level == 2 && rndm (2))
1652 { /* enemy god */ 1656 { /* enemy god */
1653 const char *enemy = god->title; 1657 const char *enemy = god->title;
1654 1658
1655 if (enemy) 1659 if (enemy)
1656 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy); 1660 sprintf (buf, "The gods %s and %s are enemies.\n ---\n", name, enemy);
1657 } 1661 }
1658 1662
1659 if (level == 3 && RANDOM () % 2) 1663 if (level == 3 && rndm (2))
1660 { /* enemy race, what the god's holy word effects */ 1664 { /* enemy race, what the god's holy word effects */
1661 const char *enemy = god->slaying; 1665 const char *enemy = god->slaying;
1662 1666
1663 if (enemy && !(god->path_denied & PATH_TURNING)) 1667 if (enemy && !(god->path_denied & PATH_TURNING))
1664 if ((i = nstrtok (enemy, ",")) > 0) 1668 if ((i = nstrtok (enemy, ",")) > 0)
… …
1673 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ",")); 1677 sprintf (tmpbuf, "race of%s", strtoktolin (enemy, ","));
1674 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1678 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1675 } 1679 }
1676 } 1680 }
1677 1681
1678 if (level == 4 && RANDOM () % 2) 1682 if (level == 4 && rndm (2))
1679 { /* Priest of god gets these protect,vulnerable... */ 1683 { /* Priest of god gets these protect,vulnerable... */
1680 char tmpbuf[MAX_BUF]; 1684 char tmpbuf[MAX_BUF];
1681 1685
1682 if (const char *cp = describe_resistance (god, 1)) 1686 if (const char *cp = describe_resistance (god, 1))
1683 { /* This god does have protections */ 1687 { /* This god does have protections */
… …
1689 } 1693 }
1690 else 1694 else
1691 sprintf (buf, " "); 1695 sprintf (buf, " ");
1692 } 1696 }
1693 1697
1694 if (level == 5 && RANDOM () % 2) 1698 if (level == 5 && rndm (2))
1695 { /* aligned race, summoning */ 1699 { /* aligned race, summoning */
1696 const char *race = god->race; /* aligned race */ 1700 const char *race = god->race; /* aligned race */
1697 1701
1698 if (race && !(god->path_denied & PATH_SUMMON)) 1702 if (race && !(god->path_denied & PATH_SUMMON))
1699 if ((i = nstrtok (race, ",")) > 0) 1703 if ((i = nstrtok (race, ",")) > 0)
… …
1707 sprintf (tmpbuf, "race of%s", strtoktolin (race, ",")); 1711 sprintf (tmpbuf, "race of%s", strtoktolin (race, ","));
1708 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf); 1712 sprintf (buf, "%s%s\n ---\n", buf, tmpbuf);
1709 } 1713 }
1710 } 1714 }
1711 1715
1712 if (level == 6 && RANDOM () % 2) 1716 if (level == 6 && rndm (2))
1713 { /* blessing,curse properties of the god */ 1717 { /* blessing,curse properties of the god */
1714 char tmpbuf[MAX_BUF]; 1718 char tmpbuf[MAX_BUF];
1715 1719
1716 if (const char *cp = describe_resistance (god, 1)) 1720 if (const char *cp = describe_resistance (god, 1))
1717 { /* This god does have protections */ 1721 { /* This god does have protections */
… …
1724 else 1728 else
1725 sprintf (buf, " "); 1729 sprintf (buf, " ");
1726 1730
1727 } 1731 }
1728 1732
1729 if (level == 8 && RANDOM () % 2) 1733 if (level == 8 && rndm (2))
1730 { /* immunity, holy possession */ 1734 { /* immunity, holy possession */
1731 int has_effect = 0, tmpvar; 1735 int has_effect = 0, tmpvar;
1732 char tmpbuf[MAX_BUF]; 1736 char tmpbuf[MAX_BUF];
1733 1737
1734 sprintf (tmpbuf, "\n"); 1738 sprintf (tmpbuf, "\n");
… …
1752 } 1756 }
1753 else 1757 else
1754 sprintf (buf, " "); 1758 sprintf (buf, " ");
1755 } 1759 }
1756 1760
1757 if (level == 12 && RANDOM () % 2) 1761 if (level == 12 && rndm (2))
1758 { /* spell paths */ 1762 { /* spell paths */
1759 int has_effect = 0, tmpvar; 1763 int has_effect = 0, tmpvar;
1760 char tmpbuf[MAX_BUF]; 1764 char tmpbuf[MAX_BUF];
1761 1765
1762 sprintf (tmpbuf, "\n"); 1766 sprintf (tmpbuf, "\n");
… …
1806 { /* we got no information beyond the preamble! */ 1810 { /* we got no information beyond the preamble! */
1807 strcat (retbuf, " [Unfortunately the rest of the information is\n"); 1811 strcat (retbuf, " [Unfortunately the rest of the information is\n");
1808 strcat (retbuf, " hopelessly garbled!]\n ---\n"); 1812 strcat (retbuf, " hopelessly garbled!]\n ---\n");
1809 } 1813 }
1810#ifdef BOOK_MSG_DEBUG 1814#ifdef BOOK_MSG_DEBUG
1811 LOG (llevDebug, "\n god_info_msg() created strng: %d\n", strlen (retbuf)); 1815 LOG (llevDebug, "\n god_info_msg() created string: %d\n", strlen (retbuf));
1812 fprintf (logfile, " MADE THIS:\n%s", retbuf); 1816 LOG (llevDebug, " MADE THIS:\n%s", retbuf);
1813#endif 1817#endif
1814 return retbuf; 1818 return retbuf;
1815} 1819}
1816 1820
1817/* tailor_readable_ob()- The main routine. This chooses a random 1821/* tailor_readable_ob()- The main routine. This chooses a random
… …
1832 */ 1836 */
1833void 1837void
1834tailor_readable_ob (object *book, int msg_type) 1838tailor_readable_ob (object *book, int msg_type)
1835{ 1839{
1836 char msgbuf[BOOK_BUF]; 1840 char msgbuf[BOOK_BUF];
1837 int level = book->level ? (RANDOM () % book->level) + 1 : 1; 1841 int level = book->level ? rndm (book->level) + 1 : 1;
1838 int book_buf_size; 1842 int book_buf_size;
1839 1843
1840 /* safety */ 1844 /* safety */
1841 if (book->type != BOOK) 1845 if (book->type != BOOK)
1842 return; 1846 return;
… …
1856 * 2) make sure there is an entry in max_titles[] array. 1860 * 2) make sure there is an entry in max_titles[] array.
1857 * 3) make sure there are entries for your case in new_text_title() 1861 * 3) make sure there are entries for your case in new_text_title()
1858 * and add_authour(). 1862 * and add_authour().
1859 * 4) you may want separate authour/book name arrays in read.h 1863 * 4) you may want separate authour/book name arrays in read.h
1860 */ 1864 */
1861
1862 msg_type = msg_type > 0 ? msg_type : (RANDOM () % 6); 1865 msg_type = msg_type > 0 ? msg_type : rndm (8);
1863 switch (msg_type) 1866 switch (msg_type)
1864 { 1867 {
1865 case 1: /* monster attrib */ 1868 case 1: /* monster attrib */
1866 strcpy (msgbuf, mon_info_msg (level, book_buf_size)); 1869 strcpy (msgbuf, mon_info_msg (level, book_buf_size));
1867 break; 1870 break;
… …
1891 { 1894 {
1892 book->msg = msgbuf; 1895 book->msg = msgbuf;
1893 /* lets give the "book" a new name, which may be a compound word */ 1896 /* lets give the "book" a new name, which may be a compound word */
1894 change_book (book, msg_type); 1897 change_book (book, msg_type);
1895 } 1898 }
1896
1897} 1899}
1898 1900
1899 1901
1900/***************************************************************************** 1902/*****************************************************************************
1901 * 1903 *

Diff Legend

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