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.98 by root, Sun Nov 29 17:41:07 2009 UTC vs.
Revision 1.107 by root, Sun Apr 25 07:08:57 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,2009 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
33 33
34//#define TREASURE_VERBOSE 34//#define TREASURE_VERBOSE
35 35
36#include <global.h> 36#include <global.h>
37#include <treasure.h> 37#include <treasure.h>
38#include <loader.h>
39 38
40extern char *spell_mapping[]; 39extern char *spell_mapping[];
41 40
42static treasurelist *first_treasurelist; 41static treasurelist *first_treasurelist;
43 42
… …
256 return; 255 return;
257 } 256 }
258 257
259 op->expand_tail (); 258 op->expand_tail ();
260 259
260 if (!creator->is_on_map ()
261 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y)) 261 || (op->weight && op->blocked (creator->map, creator->x, creator->y)))
262 op->destroy (); 262 op->destroy ();
263 else 263 else
264 { 264 {
265 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 265 op->flag [FLAG_OBJ_ORIGINAL] = true;
266 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 266 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
267 } 267 }
268 } 268 }
269 else 269 else
270 { 270 {
271 op = creator->insert (op); 271 op = creator->insert (op);
272 272
273 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 273 if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
274 monster_check_apply (creator, op); 274 monster_check_apply (creator, op);
275 } 275 }
276} 276}
277 277
278/* if there are change_xxx commands in the treasure, we include the changes 278/* if there are change_xxx commands in the treasure, we include the changes
… …
510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.)); 510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
511 511
512 if (olevel <= 0) 512 if (olevel <= 0)
513 olevel = rndm (1, op->inv->level); 513 olevel = rndm (1, op->inv->level);
514 514
515 return min (olevel, MAXLEVEL); 515 return min (olevel, MAXLEVEL_TREASURE);
516} 516}
517 517
518/* 518/*
519 * Based upon the specified difficulty and upon the difftomagic_list array, 519 * Based upon the specified difficulty and upon the difftomagic_list array,
520 * a random magical bonus is returned. This is used when determine 520 * a random magical bonus is returned. This is used when determine
… …
526 * 526 *
527 */ 527 */
528static int 528static int
529magic_from_difficulty (int difficulty) 529magic_from_difficulty (int difficulty)
530{ 530{
531 int percent = 0, magic = 0;
532 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 531 int scaled_diff = lerp (difficulty, 0, settings.max_level, 0, DIFFLEVELS - 1);
532 scaled_diff = clamp (scaled_diff, 0, DIFFLEVELS - 1);
533 533
534 scaled_diff--;
535
536 if (scaled_diff < 0)
537 scaled_diff = 0;
538
539 if (scaled_diff >= DIFFLEVELS)
540 scaled_diff = DIFFLEVELS - 1;
541
542 percent = rndm (100); 534 int percent = rndm (100);
535 int magic;
543 536
544 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 537 for (magic = 0; magic <= MAXMAGIC; magic++)
545 { 538 {
546 percent -= difftomagic_list[scaled_diff][magic]; 539 percent -= difftomagic_list[scaled_diff][magic];
547 540
548 if (percent < 0) 541 if (percent < 0)
549 break; 542 break;
550 } 543 }
551 544
552 if (magic == (MAXMAGIC + 1)) 545 if (magic > MAXMAGIC)
553 { 546 {
554 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 547 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
555 magic = 0; 548 magic = 0;
556 } 549 }
557 550
… …
565 * Sets magical bonus in an object, and recalculates the effect on 558 * Sets magical bonus in an object, and recalculates the effect on
566 * the armour variable, and the effect on speed of armour. 559 * the armour variable, and the effect on speed of armour.
567 * This function doesn't work properly, should add use of archetypes 560 * This function doesn't work properly, should add use of archetypes
568 * to make it truly absolute. 561 * to make it truly absolute.
569 */ 562 */
570
571void 563void
572set_abs_magic (object *op, int magic) 564set_abs_magic (object *op, int magic)
573{ 565{
574 if (!magic) 566 if (!magic)
575 return; 567 return;
… …
603 */ 595 */
604 596
605static void 597static void
606set_magic (int difficulty, object *op, int max_magic, int flags) 598set_magic (int difficulty, object *op, int max_magic, int flags)
607{ 599{
608 int i;
609
610 i = magic_from_difficulty (difficulty); 600 int i = magic_from_difficulty (difficulty);
601
611 if ((flags & GT_ONLY_GOOD) && i < 0) 602 if ((flags & GT_ONLY_GOOD) && i < 0)
612 i = -i; 603 i = -i;
604
613 if (i > max_magic) 605 i = min (i, max_magic);
614 i = max_magic; 606
615 set_abs_magic (op, i); 607 set_abs_magic (op, i);
616 if (i < 0) 608 if (i < 0)
617 SET_FLAG (op, FLAG_CURSED); 609 op->set_flag (FLAG_CURSED);
618} 610}
619 611
620/* 612/*
621 * Randomly adds one magical ability to the given object. 613 * Randomly adds one magical ability to the given object.
622 * Modified for Partial Resistance in many ways: 614 * Modified for Partial Resistance in many ways:
… …
629set_ring_bonus (object *op, int bonus) 621set_ring_bonus (object *op, int bonus)
630{ 622{
631 int r = rndm (bonus > 0 ? 25 : 11); 623 int r = rndm (bonus > 0 ? 25 : 11);
632 624
633 if (op->type == AMULET) 625 if (op->type == AMULET)
634 {
635 if (!(rndm (21))) 626 if (!rndm (21))
636 r = 20 + rndm (2); 627 r = 20 + rndm (2);
628 else if (rndm (2))
629 r = 10;
637 else 630 else
638 {
639 if (rndm (2))
640 r = 10;
641 else
642 r = 11 + rndm (9); 631 r = 11 + rndm (9);
643 }
644 }
645 632
646 switch (r) 633 switch (r)
647 { 634 {
648 /* Redone by MSW 2000-11-26 to have much less code. Also, 635 /* Redone by MSW 2000-11-26 to have much less code. Also,
649 * bonuses and penalties will stack and add to existing values. 636 * bonuses and penalties will stack and add to existing values.
650 * of the item. 637 * of the item.
651 */ 638 */
652 case 0: 639 case 0:
653 case 1: 640 case 1:
654 case 2: 641 case 2:
655 case 3: 642 case 3:
656 case 4: 643 case 4:
… …
696 * little random element in since that they don't always end up with 683 * little random element in since that they don't always end up with
697 * even values. 684 * even values.
698 */ 685 */
699 if (bonus < 0) 686 if (bonus < 0)
700 val = 2 * -val - rndm (b); 687 val = 2 * -val - rndm (b);
701 if (val > 35) 688
702 val = 35; /* Upper limit */ 689 val = min (35, val); /* Upper limit */
690
703 b = 0; 691 b = 0;
704 692
705 while (op->resist[resist_table[resist]] != 0 && b < 4) 693 while (op->resist[resist_table[resist]] != 0 && b < 4)
706 resist = rndm (num_resist_table); 694 resist = rndm (num_resist_table);
707 695
… …
715 break; 703 break;
716 } 704 }
717 case 20: 705 case 20:
718 if (op->type == AMULET) 706 if (op->type == AMULET)
719 { 707 {
720 SET_FLAG (op, FLAG_REFL_SPELL); 708 op->set_flag (FLAG_REFL_SPELL);
721 op->value *= 11; 709 op->value *= 11;
722 } 710 }
723 else 711 else
724 { 712 {
725 op->stats.hp = 1; /* regenerate hit points */ 713 op->stats.hp = 1; /* regenerate hit points */
… …
728 break; 716 break;
729 717
730 case 21: 718 case 21:
731 if (op->type == AMULET) 719 if (op->type == AMULET)
732 { 720 {
733 SET_FLAG (op, FLAG_REFL_MISSILE); 721 op->set_flag (FLAG_REFL_MISSILE);
734 op->value *= 9; 722 op->value *= 9;
735 } 723 }
736 else 724 else
737 { 725 {
738 op->stats.sp = 1; /* regenerate spell points */ 726 op->stats.sp = 1; /* regenerate spell points */
… …
740 } 728 }
741 break; 729 break;
742 730
743 case 22: 731 case 22:
744 op->stats.exp += bonus; /* Speed! */ 732 op->stats.exp += bonus; /* Speed! */
745 op->value = (op->value * 2) / 3; 733 op->value = op->value * 2 / 3;
746 break; 734 break;
747 } 735 }
748 736
749 if (bonus > 0) 737 if (bonus > 0)
750 op->value *= 2 * bonus; 738 op->value = 2 * op->value * bonus;
751 else 739 else
752 op->value = -(op->value * 2 * bonus) / 3; 740 op->value = -2 * op->value * bonus / 3;
753} 741}
754 742
755/* 743/*
756 * get_magic(diff) will return a random number between 0 and 4. 744 * get_magic(diff) will return a random number between 0 and 4.
757 * diff can be any value above 2. The higher the diff-variable, the 745 * diff can be any value above 2. The higher the diff-variable, the
… …
761 * Another scheme is used to calculate the magic of weapons and armours. 749 * Another scheme is used to calculate the magic of weapons and armours.
762 */ 750 */
763static int 751static int
764get_magic (int diff) 752get_magic (int diff)
765{ 753{
766 int i; 754 diff = min (3, diff);
767 755
768 if (diff < 3)
769 diff = 3;
770
771 for (i = 0; i < 4; i++) 756 for (int i = 0; i < 4; i++)
772 if (rndm (diff)) 757 if (rndm (diff))
773 return i; 758 return i;
774 759
775 return 4; 760 return 4;
776} 761}
… …
790 return 1; 775 return 1;
791 776
792 return 0; 777 return 0;
793} 778}
794 779
795#define DICE2 (get_magic(2)==2?2:1) 780#define DICE2 (get_magic(2) == 2 ? 2 : 1)
796#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) 781#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
797 782
798/* 783/*
799 * fix_generated_item(): This is called after an item is generated, in 784 * fix_generated_item(): This is called after an item is generated, in
800 * order to set it up right. This produced magical bonuses, puts spells 785 * order to set it up right. This produced magical bonuses, puts spells
… …
924 case WEAPON: 909 case WEAPON:
925 case ARMOUR: 910 case ARMOUR:
926 case SHIELD: 911 case SHIELD:
927 case HELMET: 912 case HELMET:
928 case CLOAK: 913 case CLOAK:
929 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) 914 if (op->flag [FLAG_CURSED] && !(rndm (4)))
930 set_ring_bonus (op, -DICE2); 915 set_ring_bonus (op, -DICE2);
931 break; 916 break;
932 917
933 case BRACERS: 918 case BRACERS:
934 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)) 919 if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
935 { 920 {
936 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 921 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
937 if (!QUERY_FLAG (op, FLAG_CURSED)) 922 if (!op->flag [FLAG_CURSED])
938 op->value *= 3; 923 op->value *= 3;
939 } 924 }
940 break; 925 break;
941 926
942 case POTION: 927 case POTION:
… …
967 op->value *= op->inv->value; 952 op->value *= op->inv->value;
968 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); 953 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
969 } 954 }
970 else 955 else
971 { 956 {
972 op->name = "potion"; 957 op->name = shstr_potion;
973 op->name_pl = "potions"; 958 op->name_pl = shstr_potions;
974 } 959 }
975 960
976 if (!(flags & GT_ONLY_GOOD) && rndm (2)) 961 if (!(flags & GT_ONLY_GOOD) && rndm (2))
977 SET_FLAG (op, FLAG_CURSED); 962 op->set_flag (FLAG_CURSED);
978 963
979 break; 964 break;
980 } 965 }
981 966
982 case AMULET: 967 case AMULET:
… …
986 case RING: 971 case RING:
987 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */ 972 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
988 break; 973 break;
989 974
990 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 975 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
991 SET_FLAG (op, FLAG_CURSED); 976 op->set_flag (FLAG_CURSED);
992 977
993 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 978 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
994 979
995 if (op->type != RING) /* Amulets have only one ability */ 980 if (op->type != RING) /* Amulets have only one ability */
996 break; 981 break;
997 982
998 if (!(rndm (4))) 983 if (!rndm (4))
999 { 984 {
1000 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 985 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1001 986
1002 if (d > 0) 987 if (d > 0)
1003 op->value *= 3; 988 op->value *= 3;
1004 989
1005 set_ring_bonus (op, d); 990 set_ring_bonus (op, d);
1006 991
1007 if (!(rndm (4))) 992 if (!rndm (4))
1008 { 993 {
1009 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 994 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1010 995
1011 if (d > 0) 996 if (d > 0)
1012 op->value *= 5; 997 op->value *= 5;
998
1013 set_ring_bonus (op, d); 999 set_ring_bonus (op, d);
1014 } 1000 }
1015 } 1001 }
1016 1002
1017 if (op->animation_id) 1003 if (op->animation_id)
… …
1025 * creator and/or map level we found it on. 1011 * creator and/or map level we found it on.
1026 */ 1012 */
1027 if (!op->msg && rndm (10)) 1013 if (!op->msg && rndm (10))
1028 { 1014 {
1029 /* set the book level properly */ 1015 /* set the book level properly */
1030 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1016 if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1031 { 1017 {
1032 if (op->map && op->map->difficulty) 1018 if (op->map && op->map->difficulty)
1033 op->level = rndm (op->map->difficulty) + rndm (10) + 1; 1019 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1034 else 1020 else
1035 op->level = rndm (20) + 1; 1021 op->level = rndm (20) + 1;
… …
1048 /* creator related stuff */ 1034 /* creator related stuff */
1049 1035
1050 /* for library, chained books. Note that some monsters have no_pick 1036 /* for library, chained books. Note that some monsters have no_pick
1051 * set - we don't want to set no pick in that case. 1037 * set - we don't want to set no pick in that case.
1052 */ 1038 */
1053 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER)) 1039 if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1054 SET_FLAG (op, FLAG_NO_PICK); 1040 op->set_flag (FLAG_NO_PICK);
1055 if (creator->slaying && !op->slaying) /* for check_inv floors */ 1041 if (creator->slaying && !op->slaying) /* for check_inv floors */
1056 op->slaying = creator->slaying; 1042 op->slaying = creator->slaying;
1057 break; 1043 break;
1058 1044
1059 case SPELLBOOK: 1045 case SPELLBOOK:
1060 op->value = op->value * op->inv->value; 1046 op->value *= pow ((op->inv->value > 0 ? op->inv->value : 1)
1047 * op->inv->level,
1048 1.5);
1049
1061 /* add exp so learning gives xp */ 1050 /* add exp so learning gives xp */
1062 op->level = op->inv->level; 1051 op->level = op->inv->level;
1063 op->stats.exp = op->value; 1052 op->stats.exp = op->value;
1064 break; 1053 break;
1065 1054
… …
1093 * reasonable. Otherwise, a high level version of a low level 1082 * reasonable. Otherwise, a high level version of a low level
1094 * spell can be worth tons a money (eg, level 20 rod, level 2 spell = 1083 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1095 * 10 time multiplier). This way, the value are a bit more reasonable. 1084 * 10 time multiplier). This way, the value are a bit more reasonable.
1096 */ 1085 */
1097 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1086 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1087
1098 /* maxhp is used to denote how many 'charges' the rod holds before */ 1088 /* maxhp is used to denote how many 'charges' the rod holds before */
1099 if (op->stats.maxhp) 1089 if (op->stats.maxhp)
1100 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace); 1090 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1101 else 1091 else
1102 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace); 1092 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
… …
1122 break; 1112 break;
1123 } /* switch type */ 1113 } /* switch type */
1124 1114
1125 if (flags & GT_STARTEQUIP) 1115 if (flags & GT_STARTEQUIP)
1126 { 1116 {
1127 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN)) 1117 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1128 SET_FLAG (op, FLAG_STARTEQUIP); 1118 op->set_flag (FLAG_STARTEQUIP);
1129 else if (op->type != MONEY) 1119 else if (op->type != MONEY)
1130 op->value = 0; 1120 op->value = 0;
1131 } 1121 }
1132 1122
1133 if (!(flags & GT_ENVIRONMENT)) 1123 if (!(flags & GT_ENVIRONMENT))
… …
1210 1200
1211 const char *cp = f.get_str (); 1201 const char *cp = f.get_str ();
1212 char *next; 1202 char *next;
1213 do 1203 do
1214 { 1204 {
1215 if ((next = strchr (cp, ','))) 1205 if ((next = (char *)strchr (cp, ',')))
1216 *next++ = '\0'; 1206 *next++ = '\0';
1217 1207
1218 linked_char *tmp = new linked_char; 1208 linked_char *tmp = new linked_char;
1219 1209
1220 tmp->name = cp; 1210 tmp->name = cp;
… …
1295 * is modified by the bonuses of the second object. 1285 * is modified by the bonuses of the second object.
1296 */ 1286 */
1297void 1287void
1298add_abilities (object *op, object *change) 1288add_abilities (object *op, object *change)
1299{ 1289{
1300 int i, tmp;
1301
1302 if (change->face != blank_face) 1290 if (change->face != blank_face)
1303 { 1291 {
1304#ifdef TREASURE_VERBOSE 1292#ifdef TREASURE_VERBOSE
1305 LOG (llevDebug, "add_abilities change face: %d\n", change->face); 1293 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1306#endif 1294#endif
1307 op->face = change->face; 1295 op->face = change->face;
1308 } 1296 }
1309 1297
1310 for (i = 0; i < NUM_STATS; i++) 1298 for (int i = 0; i < NUM_STATS; i++)
1311 change_attr_value (&(op->stats), i, change->stats.stat (i)); 1299 change_attr_value (&(op->stats), i, change->stats.stat (i));
1312 1300
1313 op->attacktype |= change->attacktype; 1301 op->attacktype |= change->attacktype;
1314 op->path_attuned |= change->path_attuned; 1302 op->path_attuned |= change->path_attuned;
1315 op->path_repelled |= change->path_repelled; 1303 op->path_repelled |= change->path_repelled;
1316 op->path_denied |= change->path_denied; 1304 op->path_denied |= change->path_denied;
1317 op->move_type |= change->move_type; 1305 op->move_type |= change->move_type;
1318 op->stats.luck += change->stats.luck; 1306 op->stats.luck += change->stats.luck;
1319 1307
1320 if (QUERY_FLAG (change, FLAG_CURSED)) 1308 static const struct copyflags : object::flags_t
1321 SET_FLAG (op, FLAG_CURSED); 1309 {
1322 if (QUERY_FLAG (change, FLAG_DAMNED)) 1310 copyflags ()
1323 SET_FLAG (op, FLAG_DAMNED); 1311 {
1324 if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0) 1312 set (FLAG_CURSED);
1313 set (FLAG_DAMNED);
1314 set (FLAG_LIFESAVE);
1315 set (FLAG_REFL_SPELL);
1316 set (FLAG_STEALTH);
1317 set (FLAG_XRAYS);
1318 set (FLAG_BLIND);
1319 set (FLAG_SEE_IN_DARK);
1320 set (FLAG_REFL_MISSILE);
1321 set (FLAG_MAKE_INVIS);
1322 }
1323 } copyflags;
1324
1325 // we might want to just copy, but or'ing is what the original code did
1326 op->flag |= change->flag & copyflags;
1327
1328 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1325 set_abs_magic (op, -op->magic); 1329 set_abs_magic (op, -op->magic);
1326 1330
1327 if (QUERY_FLAG (change, FLAG_LIFESAVE)) 1331 if (change->flag [FLAG_STAND_STILL])
1328 SET_FLAG (op, FLAG_LIFESAVE);
1329 if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1330 SET_FLAG (op, FLAG_REFL_SPELL);
1331 if (QUERY_FLAG (change, FLAG_STEALTH))
1332 SET_FLAG (op, FLAG_STEALTH);
1333 if (QUERY_FLAG (change, FLAG_XRAYS))
1334 SET_FLAG (op, FLAG_XRAYS);
1335 if (QUERY_FLAG (change, FLAG_BLIND))
1336 SET_FLAG (op, FLAG_BLIND);
1337 if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1338 SET_FLAG (op, FLAG_SEE_IN_DARK);
1339 if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1340 SET_FLAG (op, FLAG_REFL_MISSILE);
1341 if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1342 SET_FLAG (op, FLAG_MAKE_INVIS);
1343
1344 if (QUERY_FLAG (change, FLAG_STAND_STILL))
1345 { 1332 {
1346 CLEAR_FLAG (op, FLAG_ANIMATE); 1333 op->clr_flag (FLAG_ANIMATE);
1334
1347 /* so artifacts will join */ 1335 /* so artifacts will join */
1348 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1336 if (!op->flag [FLAG_ALIVE])
1349 op->speed = 0.0; 1337 op->speed = 0.;
1350 1338
1351 op->set_speed (op->speed); 1339 op->set_speed (op->speed);
1352 } 1340 }
1353 1341
1354 if (change->nrof) 1342 if (change->nrof)
1355 op->nrof = rndm (change->nrof) + 1; 1343 op->nrof = rndm (change->nrof) + 1;
1356 1344
1357 op->stats.exp += change->stats.exp; /* Speed modifier */ 1345 op->stats.exp += change->stats.exp; /* Speed modifier */
1358 op->stats.wc += change->stats.wc; 1346 op->stats.wc += change->stats.wc;
1359 op->stats.ac += change->stats.ac; 1347 op->stats.ac += change->stats.ac;
1360 1348
1361 if (change->other_arch) 1349 if (change->other_arch)
1362 { 1350 {
1363 /* Basically, for horns & potions, the other_arch field is the spell 1351 /* Basically, for horns & potions, the other_arch field is the spell
1364 * to cast. So convert that to into a spell and put it into 1352 * to cast. So convert that to into a spell and put it into
… …
1370 op->destroy_inv (false); 1358 op->destroy_inv (false);
1371 1359
1372 object *tmp = change->other_arch->instance (); 1360 object *tmp = change->other_arch->instance ();
1373 insert_ob_in_ob (tmp, op); 1361 insert_ob_in_ob (tmp, op);
1374 } 1362 }
1363
1375 /* No harm setting this for potions/horns */ 1364 /* No harm setting this for potions/horns */
1376 op->other_arch = change->other_arch; 1365 op->other_arch = change->other_arch;
1377 } 1366 }
1378 1367
1379 if (change->stats.hp < 0) 1368 if (change->stats.hp < 0)
… …
1395 op->stats.maxsp = -change->stats.maxsp; 1384 op->stats.maxsp = -change->stats.maxsp;
1396 else 1385 else
1397 op->stats.maxsp += change->stats.maxsp; 1386 op->stats.maxsp += change->stats.maxsp;
1398 1387
1399 if (change->stats.food < 0) 1388 if (change->stats.food < 0)
1400 op->stats.food = -(change->stats.food); 1389 op->stats.food = -change->stats.food;
1401 else 1390 else
1402 op->stats.food += change->stats.food; 1391 op->stats.food += change->stats.food;
1403 1392
1404 if (change->level < 0) 1393 if (change->level < 0)
1405 op->level = -(change->level); 1394 op->level = -change->level;
1406 else 1395 else
1407 op->level += change->level; 1396 op->level += change->level;
1408 1397
1409 if (change->gen_sp_armour < 0) 1398 if (change->gen_sp_armour < 0)
1410 op->gen_sp_armour = -(change->gen_sp_armour); 1399 op->gen_sp_armour = -change->gen_sp_armour;
1411 else 1400 else
1412 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1401 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1413 1402
1414 op->item_power = change->item_power; 1403 op->item_power = change->item_power;
1415 1404
1416 for (i = 0; i < NROFATTACKS; i++) 1405 for (int i = 0; i < NROFATTACKS; i++)
1417 if (change->resist[i])
1418 op->resist[i] += change->resist[i]; 1406 op->resist[i] += change->resist[i];
1419 1407
1420 if (change->stats.dam) 1408 if (change->stats.dam)
1421 { 1409 {
1422 if (change->stats.dam < 0) 1410 if (change->stats.dam < 0)
1423 op->stats.dam = (-change->stats.dam); 1411 op->stats.dam = -change->stats.dam;
1424 else if (op->stats.dam) 1412 else if (op->stats.dam)
1425 { 1413 {
1426 tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10); 1414 int tmp = op->stats.dam * change->stats.dam / 10;
1415
1427 if (tmp == op->stats.dam) 1416 if (tmp == op->stats.dam)
1428 { 1417 {
1429 if (change->stats.dam < 10) 1418 if (change->stats.dam < 10)
1430 op->stats.dam--; 1419 op->stats.dam--;
1431 else 1420 else
… …
1437 } 1426 }
1438 1427
1439 if (change->weight) 1428 if (change->weight)
1440 { 1429 {
1441 if (change->weight < 0) 1430 if (change->weight < 0)
1442 op->weight = (-change->weight); 1431 op->weight = -change->weight;
1443 else 1432 else
1444 op->weight = (op->weight * (change->weight)) / 100; 1433 op->weight = op->weight * change->weight / 100;
1445 } 1434 }
1446 1435
1447 if (change->last_sp) 1436 if (change->last_sp)
1448 { 1437 {
1449 if (change->last_sp < 0) 1438 if (change->last_sp < 0)
1450 op->last_sp = (-change->last_sp); 1439 op->last_sp = -change->last_sp;
1451 else 1440 else
1452 op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100); 1441 op->last_sp = op->last_sp * (int)change->last_sp / 100;
1453 } 1442 }
1454 1443
1455 if (change->gen_sp_armour) 1444 if (change->gen_sp_armour)
1456 { 1445 {
1457 if (change->gen_sp_armour < 0) 1446 if (change->gen_sp_armour < 0)
1458 op->gen_sp_armour = (-change->gen_sp_armour); 1447 op->gen_sp_armour = -change->gen_sp_armour;
1459 else 1448 else
1460 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1449 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1461 } 1450 }
1462 1451
1463 op->value *= change->value; 1452 op->value *= change->value;
1464 1453
1465 if (change->materials) 1454 if (change->materials)
… …
1518 */ 1507 */
1519 1508
1520void 1509void
1521give_artifact_abilities (object *op, object *artifct) 1510give_artifact_abilities (object *op, object *artifct)
1522{ 1511{
1523 char new_name[MAX_BUF]; 1512 op->title = format ("of %s", &artifct->name);
1524 1513
1525 sprintf (new_name, "of %s", &artifct->name);
1526 op->title = new_name;
1527 add_abilities (op, artifct); /* Give out the bonuses */ 1514 add_abilities (op, artifct); /* Give out the bonuses */
1528 1515
1529#if 0 /* Bit verbose, but keep it here until next time I need it... */ 1516#if 0 /* Bit verbose, but keep it here until next time I need it... */
1530 { 1517 {
1531 char identified = QUERY_FLAG (op, FLAG_IDENTIFIED); 1518 char identified = op->flag [FLAG_IDENTIFIED];
1532 1519
1533 SET_FLAG (op, FLAG_IDENTIFIED); 1520 op->set_flag (FLAG_IDENTIFIED);
1534 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL)); 1521 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1535 if (!identified) 1522 if (!identified)
1536 CLEAR_FLAG (op, FLAG_IDENTIFIED); 1523 op->clr_flag (FLAG_IDENTIFIED);
1537 } 1524 }
1538#endif 1525#endif
1539 return; 1526 return;
1540} 1527}
1541 1528
… …
1551#define ARTIFACT_TRIES 2 1538#define ARTIFACT_TRIES 2
1552 1539
1553void 1540void
1554generate_artifact (object *op, int difficulty) 1541generate_artifact (object *op, int difficulty)
1555{ 1542{
1556 artifactlist *al;
1557 artifact *art; 1543 artifact *art;
1558 int i;
1559 1544
1560 al = find_artifactlist (op->type); 1545 artifactlist *al = find_artifactlist (op->type);
1561 1546
1562 if (al == NULL) 1547 if (al == NULL)
1563 { 1548 {
1564#if 0 /* This is too verbose, usually */ 1549#if 0 /* This is too verbose, usually */
1565 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name); 1550 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1566#endif 1551#endif
1567 return; 1552 return;
1568 } 1553 }
1569 1554
1570 for (i = 0; i < ARTIFACT_TRIES; i++) 1555 for (int i = 0; i < ARTIFACT_TRIES; i++)
1571 { 1556 {
1572 int roll = rndm (al->total_chance); 1557 int roll = rndm (al->total_chance);
1573 1558
1574 for (art = al->items; art; art = art->next) 1559 for (art = al->items; art; art = art->next)
1575 { 1560 {
… …
1615 */ 1600 */
1616 1601
1617void 1602void
1618fix_flesh_item (object *item, object *donor) 1603fix_flesh_item (object *item, object *donor)
1619{ 1604{
1620 char tmpbuf[MAX_BUF];
1621 int i;
1622
1623 if (item->type == FLESH && donor) 1605 if (item->type == FLESH && donor)
1624 { 1606 {
1625 /* change the name */ 1607 /* change the name */
1626 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); 1608 item->name = format ("%s's %s", &donor->name, &item->name);
1627 item->name = tmpbuf;
1628 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl); 1609 item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1629 item->name_pl = tmpbuf;
1630 1610
1631 /* weight is FLESH weight/100 * donor */ 1611 /* weight is FLESH weight/100 * donor */
1632 if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0) 1612 item->weight = max (1, item->weight * donor->weight / 100);
1633 item->weight = 1;
1634 1613
1635 /* value is multiplied by level of donor */ 1614 /* value is multiplied by level of donor */
1636 item->value *= isqrt (donor->level * 2); 1615 item->value *= isqrt (donor->level * 2);
1637 1616
1638 /* food value */ 1617 /* food value */
1639 item->stats.food += (donor->stats.hp / 100) + donor->stats.Con; 1618 item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1640 1619
1641 /* flesh items inherit some abilities of donor, but not 1620 /* flesh items inherit some abilities of donor, but not
1642 * full effect. 1621 * full effect.
1643 */ 1622 */
1644 for (i = 0; i < NROFATTACKS; i++) 1623 for (int i = 0; i < NROFATTACKS; i++)
1645 item->resist[i] = donor->resist[i] / 2; 1624 item->resist[i] = donor->resist[i] / 2;
1646 1625
1647 /* item inherits donor's level (important for quezals) */ 1626 /* item inherits donor's level (important for quezals) */
1648 item->level = donor->level; 1627 item->level = donor->level;
1649 1628
1650 /* if donor has some attacktypes, the flesh is poisonous */ 1629 /* if donor has some attacktypes, the flesh is poisonous */
1651 if (donor->attacktype & AT_POISON) 1630 if (donor->attacktype & AT_POISON)
1652 item->type = POISON; 1631 item->type = POISON;
1653 1632
1654 if (donor->attacktype & AT_ACID) 1633 if (donor->attacktype & AT_ACID)
1655 item->stats.hp = -1 * item->stats.food; 1634 item->stats.hp = -item->stats.food;
1656 1635
1657 SET_FLAG (item, FLAG_NO_STEAL); 1636 item->set_flag (FLAG_NO_STEAL);
1658 } 1637 }
1659} 1638}
1660 1639
1661static void 1640static void
1662free_treasurestruct (treasure *t) 1641free_treasurestruct (treasure *t)

Diff Legend

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