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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.33 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.39 by pippijn, Thu Mar 1 12:28:16 2007 UTC

… …
348 { 348 {
349 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 349 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
350 { 350 {
351 tmp = arch_to_object (t->item); 351 tmp = arch_to_object (t->item);
352 if (t->nrof && tmp->nrof <= 1) 352 if (t->nrof && tmp->nrof <= 1)
353 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 353 tmp->nrof = rndm (t->nrof) + 1;
354
354 fix_generated_item (tmp, op, difficulty, t->magic, flag); 355 fix_generated_item (tmp, op, difficulty, t->magic, flag);
355 change_treasure (t, tmp); 356 change_treasure (t, tmp);
356 put_treasure (tmp, op, flag); 357 put_treasure (tmp, op, flag);
357 } 358 }
358 } 359 }
… …
366 if (t->next != NULL) 367 if (t->next != NULL)
367 create_all_treasures (t->next, op, flag, difficulty, tries); 368 create_all_treasures (t->next, op, flag, difficulty, tries);
368} 369}
369 370
370void 371void
371create_one_treasure (treasurelist * tl, object *op, int flag, int difficulty, int tries) 372create_one_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
372{ 373{
373 int value = RANDOM () % tl->total_chance; 374 int value = rndm (tl->total_chance);
374 treasure *t; 375 treasure *t;
375 376
376 if (tries++ > 100) 377 if (tries++ > 100)
377 { 378 {
378 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n"); 379 LOG (llevDebug, "create_one_treasure: tries exceeded 100, returning without making treasure\n");
… …
414 415
415 if (!tmp) 416 if (!tmp)
416 return; 417 return;
417 418
418 if (t->nrof && tmp->nrof <= 1) 419 if (t->nrof && tmp->nrof <= 1)
419 tmp->nrof = RANDOM () % ((int) t->nrof) + 1; 420 tmp->nrof = rndm (t->nrof) + 1;
420 421
421 fix_generated_item (tmp, op, difficulty, t->magic, flag); 422 fix_generated_item (tmp, op, difficulty, t->magic, flag);
422 change_treasure (t, tmp); 423 change_treasure (t, tmp);
423 put_treasure (tmp, op, flag); 424 put_treasure (tmp, op, flag);
424 } 425 }
… …
432 * to do that. 433 * to do that.
433 */ 434 */
434void 435void
435create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries) 436create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
436{ 437{
437
438 if (tries++ > 100) 438 if (tries++ > 100)
439 { 439 {
440 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 440 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
441 return; 441 return;
442 } 442 }
443
443 if (tl->total_chance) 444 if (tl->total_chance)
444 create_one_treasure (tl, op, flag, difficulty, tries); 445 create_one_treasure (tl, op, flag, difficulty, tries);
445 else 446 else
446 create_all_treasures (tl->items, op, flag, difficulty, tries); 447 create_all_treasures (tl->items, op, flag, difficulty, tries);
447} 448}
… …
658 659
659void 660void
660set_ring_bonus (object *op, int bonus) 661set_ring_bonus (object *op, int bonus)
661{ 662{
662 663
663 int r = RANDOM () % (bonus > 0 ? 25 : 11); 664 int r = rndm (bonus > 0 ? 25 : 11);
664 665
665 if (op->type == AMULET) 666 if (op->type == AMULET)
666 { 667 {
667 if (!(rndm (21))) 668 if (!(rndm (21)))
668 r = 20 + rndm (2); 669 r = 20 + rndm (2);
669 else 670 else
670 { 671 {
671 if (RANDOM () & 2) 672 if (rndm (2))
672 r = 10; 673 r = 10;
673 else 674 else
674 r = 11 + rndm (9); 675 r = 11 + rndm (9);
675 } 676 }
676 } 677 }
… …
716 case 16: 717 case 16:
717 case 17: 718 case 17:
718 case 18: 719 case 18:
719 case 19: 720 case 19:
720 { 721 {
721 int b = 5 + FABS (bonus), val, resist = RANDOM () % num_resist_table; 722 int b = 5 + abs (bonus), val, resist = rndm (num_resist_table);
722 723
723 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */ 724 /* Roughly generate a bonus between 100 and 35 (depending on the bonus) */
724 val = 10 + RANDOM () % b + RANDOM () % b + RANDOM () % b + RANDOM () % b; 725 val = 10 + rndm (b) + rndm (b) + rndm (b) + rndm (b);
725 726
726 /* Cursed items need to have higher negative values to equal out with 727 /* Cursed items need to have higher negative values to equal out with
727 * positive values for how protections work out. Put another 728 * positive values for how protections work out. Put another
728 * little random element in since that they don't always end up with 729 * little random element in since that they don't always end up with
729 * even values. 730 * even values.
730 */ 731 */
731 if (bonus < 0) 732 if (bonus < 0)
732 val = 2 * -val - RANDOM () % b; 733 val = 2 * -val - rndm (b);
733 if (val > 35) 734 if (val > 35)
734 val = 35; /* Upper limit */ 735 val = 35; /* Upper limit */
735 b = 0; 736 b = 0;
737
736 while (op->resist[resist_table[resist]] != 0 && b < 4) 738 while (op->resist[resist_table[resist]] != 0 && b < 4)
737 {
738 resist = RANDOM () % num_resist_table; 739 resist = rndm (num_resist_table);
739 } 740
740 if (b == 4) 741 if (b == 4)
741 return; /* Not able to find a free resistance */ 742 return; /* Not able to find a free resistance */
743
742 op->resist[resist_table[resist]] = val; 744 op->resist[resist_table[resist]] = val;
743 /* We should probably do something more clever here to adjust value 745 /* We should probably do something more clever here to adjust value
744 * based on how good a resistance we gave. 746 * based on how good a resistance we gave.
745 */ 747 */
746 break; 748 break;
… …
774 case 22: 776 case 22:
775 op->stats.exp += bonus; /* Speed! */ 777 op->stats.exp += bonus; /* Speed! */
776 op->value = (op->value * 2) / 3; 778 op->value = (op->value * 2) / 3;
777 break; 779 break;
778 } 780 }
781
779 if (bonus > 0) 782 if (bonus > 0)
780 op->value *= 2 * bonus; 783 op->value *= 2 * bonus;
781 else 784 else
782 op->value = -(op->value * 2 * bonus) / 3; 785 op->value = -(op->value * 2 * bonus) / 3;
783} 786}
… …
788 * higher is the chance of returning a low number. 791 * higher is the chance of returning a low number.
789 * It is only used in fix_generated_treasure() to set bonuses on 792 * It is only used in fix_generated_treasure() to set bonuses on
790 * rings and amulets. 793 * rings and amulets.
791 * Another scheme is used to calculate the magic of weapons and armours. 794 * Another scheme is used to calculate the magic of weapons and armours.
792 */ 795 */
793
794int 796int
795get_magic (int diff) 797get_magic (int diff)
796{ 798{
797 int i; 799 int i;
798 800
799 if (diff < 3) 801 if (diff < 3)
800 diff = 3; 802 diff = 3;
803
801 for (i = 0; i < 4; i++) 804 for (i = 0; i < 4; i++)
802 if (RANDOM () % diff) 805 if (rndm (diff))
803 return i; 806 return i;
807
804 return 4; 808 return 4;
805} 809}
806 810
807#define DICE2 (get_magic(2)==2?2:1) 811#define DICE2 (get_magic(2)==2?2:1)
808#define DICESPELL (rndm (3)+RANDOM()%3+RANDOM()%3+RANDOM()%3+RANDOM()%3) 812#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
809 813
810/* 814/*
811 * fix_generated_item(): This is called after an item is generated, in 815 * fix_generated_item(): This is called after an item is generated, in
812 * order to set it up right. This produced magical bonuses, puts spells 816 * order to set it up right. This produced magical bonuses, puts spells
813 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 817 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
… …
827 * value. 831 * value.
828 * GT_MINIMAL: Does minimal processing on the object - just enough to make it 832 * GT_MINIMAL: Does minimal processing on the object - just enough to make it
829 * a working object - don't change magic, value, etc, but set it material 833 * a working object - don't change magic, value, etc, but set it material
830 * type as appropriate, for objects that need spell objects, set those, etc 834 * type as appropriate, for objects that need spell objects, set those, etc
831 */ 835 */
832
833void 836void
834fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags) 837fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags)
835{ 838{
836 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0; 839 int was_magic = op->magic, num_enchantments = 0, save_item_power = 0;
837 840
… …
874 if (!op->magic && max_magic) 877 if (!op->magic && max_magic)
875 set_magic (difficulty, op, max_magic, flags); 878 set_magic (difficulty, op, max_magic, flags);
876 879
877 num_enchantments = calc_item_power (op, 1); 880 num_enchantments = calc_item_power (op, 1);
878 881
879 if ((!was_magic && !(RANDOM () % CHANCE_FOR_ARTIFACT)) || op->type == HORN || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 882 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
883 || op->type == HORN
884 || difficulty >= settings.max_level) /* high difficulties always generate an artifact,
880 * used for shop_floors or treasures */ 885 * used for shop_floors or treasures */
881 generate_artifact (op, difficulty); 886 generate_artifact (op, difficulty);
882 } 887 }
883 888
884 /* Object was made an artifact. Calculate its item_power rating. 889 /* Object was made an artifact. Calculate its item_power rating.
… …
947 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) 952 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4)))
948 set_ring_bonus (op, -DICE2); 953 set_ring_bonus (op, -DICE2);
949 break; 954 break;
950 955
951 case BRACERS: 956 case BRACERS:
952 if (!(RANDOM () % (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))) 957 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20))
953 { 958 {
954 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 959 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2);
955 if (!QUERY_FLAG (op, FLAG_CURSED)) 960 if (!QUERY_FLAG (op, FLAG_CURSED))
956 op->value *= 3; 961 op->value *= 3;
957 } 962 }
… …
983 */ 988 */
984 if (op->inv && op->randomitems) 989 if (op->inv && op->randomitems)
985 { 990 {
986 /* value multiplier is same as for scrolls */ 991 /* value multiplier is same as for scrolls */
987 op->value = (op->value * op->inv->value); 992 op->value = (op->value * op->inv->value);
988 op->level = op->inv->level / 2 + RANDOM () % difficulty + RANDOM () % difficulty; 993 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
989 } 994 }
990 else 995 else
991 { 996 {
992 op->name = "potion"; 997 op->name = "potion";
993 op->name_pl = "potions"; 998 op->name_pl = "potions";
… …
1039 set_ring_bonus (op, d); 1044 set_ring_bonus (op, d);
1040 } 1045 }
1041 } 1046 }
1042 1047
1043 if (GET_ANIM_ID (op)) 1048 if (GET_ANIM_ID (op))
1044 SET_ANIMATION (op, RANDOM () % ((int) NUM_ANIMATIONS (op))); 1049 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op)));
1045 1050
1046 break; 1051 break;
1047 1052
1048 case BOOK: 1053 case BOOK:
1049 /* Is it an empty book?, if yes lets make a special· 1054 /* Is it an empty book?, if yes lets make a special·
… …
1054 { 1059 {
1055 /* set the book level properly */ 1060 /* set the book level properly */
1056 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1061 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE))
1057 { 1062 {
1058 if (op->map && op->map->difficulty) 1063 if (op->map && op->map->difficulty)
1059 op->level = RANDOM () % (op->map->difficulty) + rndm (10) + 1; 1064 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1060 else 1065 else
1061 op->level = rndm (20) + 1; 1066 op->level = rndm (20) + 1;
1062 } 1067 }
1063 else 1068 else
1064 op->level = RANDOM () % creator->level; 1069 op->level = rndm (creator->level);
1065 1070
1066 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1071 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1067 /* books w/ info are worth more! */ 1072 /* books w/ info are worth more! */
1068 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1073 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1069 /* creator related stuff */ 1074 /* creator related stuff */
… …
1168 */ 1173 */
1169 1174
1170/* 1175/*
1171 * Allocate and return the pointer to an empty artifactlist structure. 1176 * Allocate and return the pointer to an empty artifactlist structure.
1172 */ 1177 */
1173
1174static artifactlist * 1178static artifactlist *
1175get_empty_artifactlist (void) 1179get_empty_artifactlist (void)
1176{ 1180{
1177 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist)); 1181 artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist));
1178 1182
… …
1185} 1189}
1186 1190
1187/* 1191/*
1188 * Allocate and return the pointer to an empty artifact structure. 1192 * Allocate and return the pointer to an empty artifact structure.
1189 */ 1193 */
1190
1191static artifact * 1194static artifact *
1192get_empty_artifact (void) 1195get_empty_artifact (void)
1193{ 1196{
1194 artifact *a = (artifact *) malloc (sizeof (artifact)); 1197 artifact *a = (artifact *) malloc (sizeof (artifact));
1195 1198
1196 if (a == NULL) 1199 if (a == NULL)
1197 fatal (OUT_OF_MEMORY); 1200 fatal (OUT_OF_MEMORY);
1201
1198 a->item = NULL; 1202 a->item = NULL;
1199 a->next = NULL; 1203 a->next = NULL;
1200 a->chance = 0; 1204 a->chance = 0;
1201 a->difficulty = 0; 1205 a->difficulty = 0;
1202 a->allowed = NULL; 1206 a->allowed = NULL;
… …
1205 1209
1206/* 1210/*
1207 * Searches the artifact lists and returns one that has the same type 1211 * Searches the artifact lists and returns one that has the same type
1208 * of objects on it. 1212 * of objects on it.
1209 */ 1213 */
1210
1211artifactlist * 1214artifactlist *
1212find_artifactlist (int type) 1215find_artifactlist (int type)
1213{ 1216{
1214 artifactlist *al; 1217 artifactlist *al;
1215 1218
1216 for (al = first_artifactlist; al != NULL; al = al->next) 1219 for (al = first_artifactlist; al; al = al->next)
1217 if (al->type == type) 1220 if (al->type == type)
1218 return al; 1221 return al;
1222
1219 return NULL; 1223 return 0;
1220} 1224}
1221 1225
1222/* 1226/*
1223 * For debugging purposes. Dumps all tables. 1227 * For debugging purposes. Dumps all tables.
1224 */ 1228 */
1225
1226void 1229void
1227dump_artifacts (void) 1230dump_artifacts (void)
1228{ 1231{
1229 artifactlist *al; 1232 artifactlist *al;
1230 artifact *art; 1233 artifact *art;
… …
1237 for (art = al->items; art != NULL; art = art->next) 1240 for (art = al->items; art != NULL; art = art->next)
1238 { 1241 {
1239 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance); 1242 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1240 if (art->allowed != NULL) 1243 if (art->allowed != NULL)
1241 { 1244 {
1242 fprintf (logfile, "\tAllowed combinations:"); 1245 fprintf (logfile, "\tallowed combinations:");
1243 for (next = art->allowed; next != NULL; next = next->next) 1246 for (next = art->allowed; next != NULL; next = next->next)
1244 fprintf (logfile, "%s,", &next->name); 1247 fprintf (logfile, "%s,", &next->name);
1245 fprintf (logfile, "\n"); 1248 fprintf (logfile, "\n");
1246 } 1249 }
1247 } 1250 }
… …
1315 archetype *at; 1318 archetype *at;
1316 int found; 1319 int found;
1317 1320
1318 found = 0; 1321 found = 0;
1319 fprintf (logfile, "\n"); 1322 fprintf (logfile, "\n");
1323
1320 for (at = first_archetype; at != NULL; at = at->next) 1324 for (at = first_archetype; at != NULL; at = at->next)
1321 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1325 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1322 { 1326 {
1323 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1327 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1324 if (at->clone.randomitems != NULL) 1328 if (at->clone.randomitems != NULL)
1325 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1329 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1326 else 1330 else
1327 fprintf (logfile, "(nothing)\n"); 1331 fprintf (logfile, "(nothing)\n");
1332
1328 fprintf (logfile, "\n"); 1333 fprintf (logfile, "\n");
1329 found++; 1334 found++;
1330 } 1335 }
1336
1331 if (found == 0) 1337 if (found == 0)
1332 fprintf (logfile, "No objects have the name %s!\n\n", name); 1338 fprintf (logfile, "No objects have the name %s!\n\n", name);
1333} 1339}
1334 1340
1335/* 1341/*
1336 * Builds up the lists of artifacts from the file in the libdir. 1342 * Builds up the lists of artifacts from the file in the libdir.
1337 */ 1343 */
1338
1339void 1344void
1340init_artifacts (void) 1345init_artifacts (void)
1341{ 1346{
1342 static int has_been_inited = 0; 1347 static int has_been_inited = 0;
1343 char filename[MAX_BUF], buf[HUGE_BUF], *cp, *next; 1348 char filename[MAX_BUF];
1344 artifact *art = NULL; 1349 artifact *art = NULL;
1345 linked_char *tmp;
1346 int value;
1347 artifactlist *al; 1350 artifactlist *al;
1348 1351
1349 if (has_been_inited) 1352 if (has_been_inited)
1350 return; 1353 return;
1351 else 1354 else
1352 has_been_inited = 1; 1355 has_been_inited = 1;
1353 1356
1354 sprintf (filename, "%s/artifacts", settings.datadir); 1357 sprintf (filename, "%s/artifacts", settings.datadir);
1355 object_thawer thawer (filename); 1358 object_thawer f (filename);
1356 1359
1357 if (!thawer) 1360 if (!f)
1358 return; 1361 return;
1359 1362
1360 while (fgets (buf, HUGE_BUF, thawer) != NULL) 1363 f.next ();
1361 {
1362 if (*buf == '#')
1363 continue;
1364 if ((cp = strchr (buf, '\n')) != NULL)
1365 *cp = '\0';
1366 cp = buf;
1367 while (*cp == ' ') /* Skip blanks */
1368 cp++;
1369 if (*cp == '\0')
1370 continue;
1371 1364
1372 if (!strncmp (cp, "Allowed", 7)) 1365 for (;;)
1366 {
1367 switch (f.kw)
1373 { 1368 {
1369 case KW_allowed:
1374 if (art == NULL) 1370 if (!art)
1371 {
1372 art = get_empty_artifact ();
1373 nrofartifacts++;
1374 }
1375
1375 { 1376 {
1376 art = get_empty_artifact (); 1377 if (!strcmp (f.get_str (), "all"))
1377 nrofartifacts++; 1378 break;
1379
1380 char *next, *cp = f.get_str ();
1381
1382 do
1383 {
1384 nrofallowedstr++;
1385
1386 if ((next = strchr (cp, ',')))
1387 *next++ = '\0';
1388
1389 linked_char *tmp = new linked_char;
1390
1391 tmp->name = cp;
1392 tmp->next = art->allowed;
1393 art->allowed = tmp;
1394 }
1395 while ((cp = next));
1378 } 1396 }
1379 cp = strchr (cp, ' ') + 1; 1397 break;
1380 if (!strcmp (cp, "all")) 1398
1399 case KW_chance:
1400 f.get (art->chance);
1401 break;
1402
1403 case KW_difficulty:
1404 f.get (art->difficulty);
1405 break;
1406
1407 case KW_object:
1408 {
1409 art->item = object::create ();
1410
1411 if (!art->item->parse_kv (f))
1412 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1413
1414 al = find_artifactlist (art->item->type);
1415
1416 if (!al)
1417 {
1418 al = get_empty_artifactlist ();
1419 al->type = art->item->type;
1420 al->next = first_artifactlist;
1421 first_artifactlist = al;
1422 }
1423
1424 art->next = al->items;
1425 al->items = art;
1426 art = 0;
1427 }
1381 continue; 1428 continue;
1382 1429
1383 do 1430 case KW_EOF:
1431 goto done;
1432
1433 default:
1434 if (!f.parse_error ("artifacts file"))
1435 cleanup ("artifacts file required");
1384 { 1436 break;
1385 nrofallowedstr++;
1386 if ((next = strchr (cp, ',')) != NULL)
1387 *(next++) = '\0';
1388 tmp = new linked_char;
1389
1390 tmp->name = cp;
1391 tmp->next = art->allowed;
1392 art->allowed = tmp;
1393 }
1394 while ((cp = next) != NULL);
1395 }
1396 else if (sscanf (cp, "chance %d", &value))
1397 art->chance = (uint16) value;
1398 else if (sscanf (cp, "difficulty %d", &value))
1399 art->difficulty = (uint8) value;
1400 else if (!strncmp (cp, "Object", 6))
1401 { 1437 }
1402 art->item = object::create ();
1403 1438
1404 if (!load_object (thawer, art->item, 0)) 1439 f.next ();
1405 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1406
1407 art->item->name = strchr (cp, ' ') + 1;
1408 al = find_artifactlist (art->item->type);
1409 if (al == NULL)
1410 {
1411 al = get_empty_artifactlist ();
1412 al->type = art->item->type;
1413 al->next = first_artifactlist;
1414 first_artifactlist = al;
1415 }
1416 art->next = al->items;
1417 al->items = art;
1418 art = NULL;
1419 }
1420 else
1421 LOG (llevError, "Unknown input in artifact file: %s\n", buf);
1422 } 1440 }
1423 1441
1442done:
1424 for (al = first_artifactlist; al != NULL; al = al->next) 1443 for (al = first_artifactlist; al; al = al->next)
1425 { 1444 {
1426 for (art = al->items; art != NULL; art = art->next) 1445 for (art = al->items; art; art = art->next)
1427 { 1446 {
1428 if (!art->chance) 1447 if (!art->chance)
1429 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1448 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1430 else 1449 else
1431 al->total_chance += art->chance; 1450 al->total_chance += art->chance;
… …
1500 1519
1501 op->set_speed (op->speed); 1520 op->set_speed (op->speed);
1502 } 1521 }
1503 1522
1504 if (change->nrof) 1523 if (change->nrof)
1505 op->nrof = RANDOM () % ((int) change->nrof) + 1; 1524 op->nrof = rndm (change->nrof) + 1;
1506 1525
1507 op->stats.exp += change->stats.exp; /* Speed modifier */ 1526 op->stats.exp += change->stats.exp; /* Speed modifier */
1508 op->stats.wc += change->stats.wc; 1527 op->stats.wc += change->stats.wc;
1509 op->stats.ac += change->stats.ac; 1528 op->stats.ac += change->stats.ac;
1510 1529
… …
1613 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1632 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100);
1614 } 1633 }
1615 1634
1616 op->value *= change->value; 1635 op->value *= change->value;
1617 1636
1618 if (change->material) 1637 if (change->materials)
1619 op->material = change->material; 1638 op->materials = change->materials;
1620 1639
1621 if (change->materialname) 1640 if (change->materialname)
1622 op->materialname = change->materialname; 1641 op->materialname = change->materialname;
1623 1642
1624 if (change->slaying) 1643 if (change->slaying)
… …
1718 return; 1737 return;
1719 } 1738 }
1720 1739
1721 for (i = 0; i < ARTIFACT_TRIES; i++) 1740 for (i = 0; i < ARTIFACT_TRIES; i++)
1722 { 1741 {
1723 int roll = RANDOM () % al->total_chance; 1742 int roll = rndm (al->total_chance);
1724 1743
1725 for (art = al->items; art != NULL; art = art->next) 1744 for (art = al->items; art; art = art->next)
1726 { 1745 {
1727 roll -= art->chance; 1746 roll -= art->chance;
1728 if (roll < 0) 1747 if (roll < 0)
1729 break; 1748 break;
1730 } 1749 }

Diff Legend

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