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.97 by root, Sun Nov 29 10:55:18 2009 UTC vs.
Revision 1.122 by root, Sun Nov 18 15:19:48 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25/* TREASURE_DEBUG does some checking on the treasurelists after loading. 26/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26 * It is useful for finding bugs in the treasures file. Since it only 27 * It is useful for finding bugs in the treasures file. Since it only
… …
33 34
34//#define TREASURE_VERBOSE 35//#define TREASURE_VERBOSE
35 36
36#include <global.h> 37#include <global.h>
37#include <treasure.h> 38#include <treasure.h>
38#include <loader.h> 39
40#include <flat_hash_map.hpp>
41
42// used only by treasure.C, does not handle null arch ptrs
43#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)
39 44
40extern char *spell_mapping[]; 45extern char *spell_mapping[];
41 46
42static treasurelist *first_treasurelist; 47static treasurelist *first_treasurelist;
43 48
44static void change_treasure (treasure *t, object *op); /* overrule default values */ 49static void change_treasure (treasure *t, object *op); /* overrule default values */
45 50
46typedef std::tr1::unordered_map< 51typedef ska::flat_hash_map<
47 const char *, 52 const char *,
48 treasurelist *, 53 treasurelist *,
49 str_hash, 54 str_hash,
50 str_equal, 55 str_equal,
51 slice_allocator< std::pair<const char *const, treasurelist *> > 56 slice_allocator< std::pair<const char *const, treasurelist *> >
52> tl_map_t; 57> tl_map_t;
53 58
54static tl_map_t tl_map; 59static tl_map_t tl_map;
55 60
56//TODO: class method 61//TODO: class method
… …
256 return; 261 return;
257 } 262 }
258 263
259 op->expand_tail (); 264 op->expand_tail ();
260 265
266 if (!creator->is_on_map ()
261 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y)) 267 || (op->weight && op->blocked (creator->map, creator->x, creator->y)))
262 op->destroy (); 268 op->destroy ();
263 else 269 else
264 { 270 {
265 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 271 op->flag [FLAG_OBJ_ORIGINAL] = true;
266 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 272 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
267 } 273 }
268 } 274 }
269 else 275 else
270 { 276 {
271 op = creator->insert (op); 277 op = creator->insert (op);
272 278
273 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 279 if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
274 monster_check_apply (creator, op); 280 monster_check_apply (creator, op);
275 } 281 }
276} 282}
277 283
278/* if there are change_xxx commands in the treasure, we include the changes 284/* if there are change_xxx commands in the treasure, we include the changes
… …
310 } 316 }
311 else 317 else
312 { 318 {
313 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE))) 319 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
314 { 320 {
315 object *tmp = arch_to_object (t->item); 321 object *tmp = t->item->instance ();
316 322
317 if (t->nrof && tmp->nrof <= 1) 323 if (t->nrof && tmp->nrof <= 1)
318 tmp->nrof = rndm (t->nrof) + 1; 324 tmp->nrof = rndm (t->nrof) + 1;
319 325
320 fix_generated_item (tmp, op, difficulty, t->magic, flag); 326 fix_generated_item (tmp, op, difficulty, t->magic, flag);
… …
367 else if (t->nrof) 373 else if (t->nrof)
368 create_one_treasure (tl, op, flag, difficulty, tries); 374 create_one_treasure (tl, op, flag, difficulty, tries);
369 } 375 }
370 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE)) 376 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
371 { 377 {
372 if (object *tmp = arch_to_object (t->item)) 378 if (object *tmp = t->item->instance ())
373 { 379 {
374 if (t->nrof && tmp->nrof <= 1) 380 if (t->nrof && tmp->nrof <= 1)
375 tmp->nrof = rndm (t->nrof) + 1; 381 tmp->nrof = rndm (t->nrof) + 1;
376 382
377 fix_generated_item (tmp, op, difficulty, t->magic, flag); 383 fix_generated_item (tmp, op, difficulty, t->magic, flag);
… …
490 { 0, 0, 0, 3, 97}, // 29 496 { 0, 0, 0, 3, 97}, // 29
491 { 0, 0, 0, 0, 100}, // 30 497 { 0, 0, 0, 0, 100}, // 30
492 { 0, 0, 0, 0, 100}, // 31 498 { 0, 0, 0, 0, 100}, // 31
493}; 499};
494 500
495/* calculate the appropriate level for wands staves and scrolls. 501/* calculate the appropriate level for wands staves and scrolls.
496 * This code presumes that op has had its spell object created (in op->inv) 502 * This code presumes that op has had its spell object created (in op->inv)
497 * 503 *
498 * elmex Wed Aug 9 17:44:59 CEST 2006: 504 * elmex Wed Aug 9 17:44:59 CEST 2006:
499 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 505 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
500 */ 506 */
… …
510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.)); 516 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
511 517
512 if (olevel <= 0) 518 if (olevel <= 0)
513 olevel = rndm (1, op->inv->level); 519 olevel = rndm (1, op->inv->level);
514 520
515 return min (olevel, MAXLEVEL); 521 return min (olevel, MAXLEVEL_TREASURE);
516} 522}
517 523
518/* 524/*
519 * Based upon the specified difficulty and upon the difftomagic_list array, 525 * Based upon the specified difficulty and upon the difftomagic_list array,
520 * a random magical bonus is returned. This is used when determine 526 * a random magical bonus is returned. This is used when determine
… …
526 * 532 *
527 */ 533 */
528static int 534static int
529magic_from_difficulty (int difficulty) 535magic_from_difficulty (int difficulty)
530{ 536{
531 int percent = 0, magic = 0;
532 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 537 int scaled_diff = lerp (difficulty, 0, settings.max_level, 0, DIFFLEVELS - 1);
538 scaled_diff = clamp (scaled_diff, 0, DIFFLEVELS - 1);
533 539
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); 540 int percent = rndm (100);
541 int magic;
543 542
544 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 543 for (magic = 0; magic <= MAXMAGIC; magic++)
545 { 544 {
546 percent -= difftomagic_list[scaled_diff][magic]; 545 percent -= difftomagic_list[scaled_diff][magic];
547 546
548 if (percent < 0) 547 if (percent < 0)
549 break; 548 break;
550 } 549 }
551 550
552 if (magic == (MAXMAGIC + 1)) 551 if (magic > MAXMAGIC)
553 { 552 {
554 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 553 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
555 magic = 0; 554 magic = 0;
556 } 555 }
557 556
… …
565 * Sets magical bonus in an object, and recalculates the effect on 564 * Sets magical bonus in an object, and recalculates the effect on
566 * the armour variable, and the effect on speed of armour. 565 * the armour variable, and the effect on speed of armour.
567 * This function doesn't work properly, should add use of archetypes 566 * This function doesn't work properly, should add use of archetypes
568 * to make it truly absolute. 567 * to make it truly absolute.
569 */ 568 */
570
571void 569void
572set_abs_magic (object *op, int magic) 570set_abs_magic (object *op, int magic)
573{ 571{
574 if (!magic) 572 if (!magic)
575 return; 573 return;
… …
603 */ 601 */
604 602
605static void 603static void
606set_magic (int difficulty, object *op, int max_magic, int flags) 604set_magic (int difficulty, object *op, int max_magic, int flags)
607{ 605{
608 int i;
609
610 i = magic_from_difficulty (difficulty); 606 int i = magic_from_difficulty (difficulty);
607
611 if ((flags & GT_ONLY_GOOD) && i < 0) 608 if ((flags & GT_ONLY_GOOD) && i < 0)
612 i = -i; 609 i = -i;
610
613 if (i > max_magic) 611 i = min (i, max_magic);
614 i = max_magic; 612
615 set_abs_magic (op, i); 613 set_abs_magic (op, i);
616 if (i < 0) 614 if (i < 0)
617 SET_FLAG (op, FLAG_CURSED); 615 op->set_flag (FLAG_CURSED);
618} 616}
619 617
620/* 618/*
621 * Randomly adds one magical ability to the given object. 619 * Randomly adds one magical ability to the given object.
622 * Modified for Partial Resistance in many ways: 620 * Modified for Partial Resistance in many ways:
… …
629set_ring_bonus (object *op, int bonus) 627set_ring_bonus (object *op, int bonus)
630{ 628{
631 int r = rndm (bonus > 0 ? 25 : 11); 629 int r = rndm (bonus > 0 ? 25 : 11);
632 630
633 if (op->type == AMULET) 631 if (op->type == AMULET)
634 {
635 if (!(rndm (21))) 632 if (!rndm (21))
636 r = 20 + rndm (2); 633 r = 20 + rndm (2);
634 else if (rndm (2))
635 r = 10;
637 else 636 else
638 {
639 if (rndm (2))
640 r = 10;
641 else
642 r = 11 + rndm (9); 637 r = 11 + rndm (9);
643 }
644 }
645 638
646 switch (r) 639 switch (r)
647 { 640 {
648 /* Redone by MSW 2000-11-26 to have much less code. Also, 641 /* Redone by MSW 2000-11-26 to have much less code. Also,
649 * bonuses and penalties will stack and add to existing values. 642 * bonuses and penalties will stack and add to existing values.
650 * of the item. 643 * of the item.
651 */ 644 */
652 case 0: 645 case 0:
653 case 1: 646 case 1:
654 case 2: 647 case 2:
655 case 3: 648 case 3:
656 case 4: 649 case 4:
… …
696 * little random element in since that they don't always end up with 689 * little random element in since that they don't always end up with
697 * even values. 690 * even values.
698 */ 691 */
699 if (bonus < 0) 692 if (bonus < 0)
700 val = 2 * -val - rndm (b); 693 val = 2 * -val - rndm (b);
701 if (val > 35) 694
702 val = 35; /* Upper limit */ 695 val = min (35, val); /* Upper limit */
696
703 b = 0; 697 b = 0;
704 698
705 while (op->resist[resist_table[resist]] != 0 && b < 4) 699 while (op->resist[resist_table[resist]] != 0 && b < 4)
706 resist = rndm (num_resist_table); 700 resist = rndm (num_resist_table);
707 701
… …
715 break; 709 break;
716 } 710 }
717 case 20: 711 case 20:
718 if (op->type == AMULET) 712 if (op->type == AMULET)
719 { 713 {
720 SET_FLAG (op, FLAG_REFL_SPELL); 714 op->set_flag (FLAG_REFL_SPELL);
721 op->value *= 11; 715 op->value *= 11;
722 } 716 }
723 else 717 else
724 { 718 {
725 op->stats.hp = 1; /* regenerate hit points */ 719 op->stats.hp = 1; /* regenerate hit points */
… …
728 break; 722 break;
729 723
730 case 21: 724 case 21:
731 if (op->type == AMULET) 725 if (op->type == AMULET)
732 { 726 {
733 SET_FLAG (op, FLAG_REFL_MISSILE); 727 op->set_flag (FLAG_REFL_MISSILE);
734 op->value *= 9; 728 op->value *= 9;
735 } 729 }
736 else 730 else
737 { 731 {
738 op->stats.sp = 1; /* regenerate spell points */ 732 op->stats.sp = 1; /* regenerate spell points */
… …
740 } 734 }
741 break; 735 break;
742 736
743 case 22: 737 case 22:
744 op->stats.exp += bonus; /* Speed! */ 738 op->stats.exp += bonus; /* Speed! */
745 op->value = (op->value * 2) / 3; 739 op->value = op->value * 2 / 3;
746 break; 740 break;
747 } 741 }
748 742
749 if (bonus > 0) 743 if (bonus > 0)
750 op->value *= 2 * bonus; 744 op->value = 2 * op->value * bonus;
751 else 745 else
752 op->value = -(op->value * 2 * bonus) / 3; 746 op->value = -2 * op->value * bonus / 3;
753} 747}
754 748
755/* 749/*
756 * get_magic(diff) will return a random number between 0 and 4. 750 * 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 751 * 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. 755 * Another scheme is used to calculate the magic of weapons and armours.
762 */ 756 */
763static int 757static int
764get_magic (int diff) 758get_magic (int diff)
765{ 759{
766 int i; 760 diff = min (3, diff);
767 761
768 if (diff < 3)
769 diff = 3;
770
771 for (i = 0; i < 4; i++) 762 for (int i = 0; i < 4; i++)
772 if (rndm (diff)) 763 if (rndm (diff))
773 return i; 764 return i;
774 765
775 return 4; 766 return 4;
776} 767}
… …
790 return 1; 781 return 1;
791 782
792 return 0; 783 return 0;
793} 784}
794 785
786static double
787value_factor_from_spell_item (object *spell, object *item)
788{
789 double factor =
790 pow ((spell->value > 0 ? spell->value : 1)
791 * spell->level, 1.5);
792
793 if (item) // this if for: wands/staffs/rods:
794 {
795 /* Old crossfire comment ahead:
796 * Add 50 to both level an divisor to keep prices a little more
797 * reasonable. Otherwise, a high level version of a low level
798 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
799 * 10 time multiplier). This way, the value are a bit more reasonable.
800 */
801
802 factor *= item->level + 50;
803 factor /= item->inv->level + 50;
804 }
805
806 return factor;
807}
808
795#define DICE2 (get_magic(2)==2?2:1) 809#define DICE2 (get_magic(2) == 2 ? 2 : 1)
796#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) 810#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
797 811
798/* 812/*
799 * fix_generated_item(): This is called after an item is generated, in 813 * 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 814 * order to set it up right. This produced magical bonuses, puts spells
801 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 815 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
802 */ 816 */
803 817
804/* 4/28/96 added creator object from which op may now inherit properties based on 818/* 4/28/96 added creator object from which op may now inherit properties based on
805 * op->type. Right now, which stuff the creator passes on is object type 819 * op->type. Right now, which stuff the creator passes on is object type
806 * dependant. I know this is a spagetti manuever, but is there a cleaner 820 * dependant. I know this is a spagetti manuever, but is there a cleaner
807 * way to do this? b.t. */ 821 * way to do this? b.t. */
808 822
809/* 823/*
810 * ! (flags & GT_ENVIRONMENT): 824 * ! (flags & GT_ENVIRONMENT):
811 * Automatically calls fix_flesh_item(). 825 * Automatically calls fix_flesh_item().
… …
911 { 925 {
912 if (op->type == POTION) 926 if (op->type == POTION)
913 /* Handle healing and magic power potions */ 927 /* Handle healing and magic power potions */
914 if (op->stats.sp && !op->randomitems) 928 if (op->stats.sp && !op->randomitems)
915 { 929 {
916 object *tmp = get_archetype (spell_mapping [op->stats.sp]); 930 object *tmp = archetype::get (spell_mapping [op->stats.sp]);
917 insert_ob_in_ob (tmp, op); 931 insert_ob_in_ob (tmp, op);
918 op->stats.sp = 0; 932 op->stats.sp = 0;
919 } 933 }
920 } 934 }
921 else if (!op->title) /* Only modify object if not special */ 935 else if (!op->title) /* Only modify object if not special */
… …
924 case WEAPON: 938 case WEAPON:
925 case ARMOUR: 939 case ARMOUR:
926 case SHIELD: 940 case SHIELD:
927 case HELMET: 941 case HELMET:
928 case CLOAK: 942 case CLOAK:
929 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) 943 if (op->flag [FLAG_CURSED] && !(rndm (4)))
930 set_ring_bonus (op, -DICE2); 944 set_ring_bonus (op, -DICE2);
931 break; 945 break;
932 946
933 case BRACERS: 947 case BRACERS:
934 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)) 948 if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
935 { 949 {
936 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 950 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
937 if (!QUERY_FLAG (op, FLAG_CURSED)) 951 if (!op->flag [FLAG_CURSED])
938 op->value *= 3; 952 op->value *= 3;
939 } 953 }
940 break; 954 break;
941 955
942 case POTION: 956 case POTION:
943 { 957 {
944 int too_many_tries = 0, is_special = 0; 958 int too_many_tries = 0;
945 959
946 /* Handle healing and magic power potions */ 960 /* Handle healing and magic power potions */
947 if (op->stats.sp && !op->randomitems) 961 if (op->stats.sp && !op->randomitems)
948 { 962 {
949 object *tmp = get_archetype (spell_mapping[op->stats.sp]); 963 object *tmp = archetype::get (spell_mapping[op->stats.sp]);
950 insert_ob_in_ob (tmp, op); 964 insert_ob_in_ob (tmp, op);
951 op->stats.sp = 0; 965 op->stats.sp = 0;
952 } 966 }
953 967
954 while (!(is_special = special_potion (op)) && !op->inv) 968 while (!special_potion (op) && !op->inv)
955 { 969 {
956 generate_artifact (op, difficulty); 970 generate_artifact (op, difficulty);
957 if (too_many_tries++ > 10) 971 if (too_many_tries++ > 10)
958 break; 972 break;
959 } 973 }
… …
967 op->value *= op->inv->value; 981 op->value *= op->inv->value;
968 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); 982 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
969 } 983 }
970 else 984 else
971 { 985 {
972 op->name = "potion"; 986 op->name = shstr_potion;
973 op->name_pl = "potions"; 987 op->name_pl = shstr_potions;
974 } 988 }
975 989
976 if (!(flags & GT_ONLY_GOOD) && rndm (2)) 990 if (!(flags & GT_ONLY_GOOD) && rndm (2))
977 SET_FLAG (op, FLAG_CURSED); 991 op->set_flag (FLAG_CURSED);
978 992
979 break; 993 break;
980 } 994 }
981 995
982 case AMULET: 996 case AMULET:
… …
986 case RING: 1000 case RING:
987 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */ 1001 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
988 break; 1002 break;
989 1003
990 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 1004 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
991 SET_FLAG (op, FLAG_CURSED); 1005 op->set_flag (FLAG_CURSED);
992 1006
993 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 1007 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
994 1008
995 if (op->type != RING) /* Amulets have only one ability */ 1009 if (op->type != RING) /* Amulets have only one ability */
996 break; 1010 break;
997 1011
998 if (!(rndm (4))) 1012 if (!rndm (4))
999 { 1013 {
1000 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1014 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1001 1015
1002 if (d > 0) 1016 if (d > 0)
1003 op->value *= 3; 1017 op->value *= 3;
1004 1018
1005 set_ring_bonus (op, d); 1019 set_ring_bonus (op, d);
1006 1020
1007 if (!(rndm (4))) 1021 if (!rndm (4))
1008 { 1022 {
1009 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1023 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1010 1024
1011 if (d > 0) 1025 if (d > 0)
1012 op->value *= 5; 1026 op->value *= 5;
1027
1013 set_ring_bonus (op, d); 1028 set_ring_bonus (op, d);
1014 } 1029 }
1015 } 1030 }
1016 1031
1017 if (op->animation_id) 1032 if (op->animation_id)
… …
1025 * creator and/or map level we found it on. 1040 * creator and/or map level we found it on.
1026 */ 1041 */
1027 if (!op->msg && rndm (10)) 1042 if (!op->msg && rndm (10))
1028 { 1043 {
1029 /* set the book level properly */ 1044 /* set the book level properly */
1030 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1045 if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1031 { 1046 {
1032 if (op->map && op->map->difficulty) 1047 if (op->map && op->map->difficulty)
1033 op->level = rndm (op->map->difficulty) + rndm (10) + 1; 1048 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1034 else 1049 else
1035 op->level = rndm (20) + 1; 1050 op->level = rndm (20) + 1;
… …
1048 /* creator related stuff */ 1063 /* creator related stuff */
1049 1064
1050 /* for library, chained books. Note that some monsters have no_pick 1065 /* for library, chained books. Note that some monsters have no_pick
1051 * set - we don't want to set no pick in that case. 1066 * set - we don't want to set no pick in that case.
1052 */ 1067 */
1053 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER)) 1068 if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1054 SET_FLAG (op, FLAG_NO_PICK); 1069 op->set_flag (FLAG_NO_PICK);
1055 if (creator->slaying && !op->slaying) /* for check_inv floors */ 1070 if (creator->slaying && !op->slaying) /* for check_inv floors */
1056 op->slaying = creator->slaying; 1071 op->slaying = creator->slaying;
1057 break; 1072 break;
1058 1073
1059 case SPELLBOOK: 1074 case SPELLBOOK:
1060 op->value = op->value * op->inv->value; 1075 op->value *= value_factor_from_spell_item (op->inv, 0);
1076
1061 /* add exp so learning gives xp */ 1077 /* add exp so learning gives xp */
1062 op->level = op->inv->level; 1078 op->level = op->inv->level;
1063 op->stats.exp = op->value; 1079 op->stats.exp = op->value;
1064 break; 1080 break;
1065 1081
… …
1069 * and reset nrof. 1085 * and reset nrof.
1070 */ 1086 */
1071 op->stats.food = op->inv->nrof; 1087 op->stats.food = op->inv->nrof;
1072 op->nrof = 1; 1088 op->nrof = 1;
1073 /* If the spell changes by level, choose a random level 1089 /* If the spell changes by level, choose a random level
1074 * for it, and adjust price. If the spell doesn't 1090 * for it.
1075 * change by level, just set the wand to the level of
1076 * the spell, and value calculation is simpler.
1077 */ 1091 */
1078 if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier) 1092 if (op->inv->duration_modifier
1079 { 1093 || op->inv->dam_modifier
1094 || op->inv->range_modifier)
1080 op->level = level_for_item (op, difficulty); 1095 op->level = level_for_item (op, difficulty);
1081 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1082 }
1083 else 1096 else
1084 {
1085 op->level = op->inv->level; 1097 op->level = op->inv->level;
1086 op->value = op->value * op->inv->value; 1098
1087 } 1099 op->value *= value_factor_from_spell_item (op->inv, op);
1088 break; 1100 break;
1089 1101
1090 case ROD: 1102 case ROD:
1091 op->level = level_for_item (op, difficulty); 1103 op->level = level_for_item (op, difficulty);
1092 /* Add 50 to both level an divisor to keep prices a little more 1104 op->value *= value_factor_from_spell_item (op->inv, op);
1093 * reasonable. Otherwise, a high level version of a low level 1105
1094 * 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.
1096 */
1097 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1098 /* maxhp is used to denote how many 'charges' the rod holds before */ 1106 /* maxhp is used to denote how many 'charges' the rod holds before */
1099 if (op->stats.maxhp) 1107 if (op->stats.maxhp)
1100 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace); 1108 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1101 else 1109 else
1102 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace); 1110 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
… …
1104 op->stats.hp = op->stats.maxhp; 1112 op->stats.hp = op->stats.maxhp;
1105 break; 1113 break;
1106 1114
1107 case SCROLL: 1115 case SCROLL:
1108 op->level = level_for_item (op, difficulty); 1116 op->level = level_for_item (op, difficulty);
1109 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1117 op->value *= value_factor_from_spell_item (op->inv, op);
1110 1118
1111 /* add exp so reading them properly gives xp */ 1119 /* add exp so reading them properly gives xp */
1112 op->stats.exp = op->value / 5; 1120 op->stats.exp = op->value / 5;
1113 op->nrof = op->inv->nrof; 1121 op->nrof = op->inv->nrof;
1114 break; 1122 break;
… …
1122 break; 1130 break;
1123 } /* switch type */ 1131 } /* switch type */
1124 1132
1125 if (flags & GT_STARTEQUIP) 1133 if (flags & GT_STARTEQUIP)
1126 { 1134 {
1127 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN)) 1135 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1128 SET_FLAG (op, FLAG_STARTEQUIP); 1136 op->set_flag (FLAG_STARTEQUIP);
1129 else if (op->type != MONEY) 1137 else if (op->type != MONEY)
1130 op->value = 0; 1138 op->value = 0;
1131 } 1139 }
1132 1140
1133 if (!(flags & GT_ENVIRONMENT)) 1141 if (!(flags & GT_ENVIRONMENT))
… …
1179 */ 1187 */
1180void 1188void
1181init_artifacts () 1189init_artifacts ()
1182{ 1190{
1183 static int has_been_inited = 0; 1191 static int has_been_inited = 0;
1184 char filename[MAX_BUF];
1185 artifact *art = NULL; 1192 artifact *art = NULL;
1186 artifactlist *al; 1193 artifactlist *al;
1187 1194
1188 if (has_been_inited) 1195 if (has_been_inited)
1189 return; 1196 return;
1190 else 1197 else
1191 has_been_inited = 1; 1198 has_been_inited = 1;
1192 1199
1193 sprintf (filename, "%s/artifacts", settings.datadir); 1200 object_thawer f (settings.datadir, "artifacts");
1194 object_thawer f (filename);
1195 1201
1196 if (!f) 1202 if (!f)
1197 return; 1203 return;
1198 1204
1199 for (;;) 1205 for (;;)
… …
1210 1216
1211 const char *cp = f.get_str (); 1217 const char *cp = f.get_str ();
1212 char *next; 1218 char *next;
1213 do 1219 do
1214 { 1220 {
1215 if ((next = strchr (cp, ','))) 1221 if ((next = (char *)strchr (cp, ',')))
1216 *next++ = '\0'; 1222 *next++ = '\0';
1217 1223
1218 linked_char *tmp = new linked_char; 1224 linked_char *tmp = new linked_char;
1219 1225
1220 tmp->name = cp; 1226 tmp->name = cp;
… …
1284 } 1290 }
1285#if 0 1291#if 0
1286 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance); 1292 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);
1287#endif 1293#endif
1288 } 1294 }
1289
1290 LOG (llevDebug, "done.\n");
1291} 1295}
1292 1296
1293/* 1297/*
1294 * Used in artifact generation. The bonuses of the first object 1298 * Used in artifact generation. The bonuses of the first object
1295 * is modified by the bonuses of the second object. 1299 * is modified by the bonuses of the second object.
1296 */ 1300 */
1297void 1301void
1298add_abilities (object *op, object *change) 1302add_abilities (object *op, object *change)
1299{ 1303{
1300 int i, tmp;
1301
1302 if (change->face != blank_face) 1304 if (change->face != blank_face)
1303 {
1304#ifdef TREASURE_VERBOSE
1305 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1306#endif
1307 op->face = change->face; 1305 op->face = change->face;
1308 }
1309 1306
1310 for (i = 0; i < NUM_STATS; i++) 1307 for (int i = 0; i < NUM_STATS; i++)
1311 change_attr_value (&(op->stats), i, change->stats.stat (i)); 1308 change_attr_value (&(op->stats), i, change->stats.stat (i));
1312 1309
1313 op->attacktype |= change->attacktype; 1310 op->attacktype |= change->attacktype;
1314 op->path_attuned |= change->path_attuned; 1311 op->path_attuned |= change->path_attuned;
1315 op->path_repelled |= change->path_repelled; 1312 op->path_repelled |= change->path_repelled;
1316 op->path_denied |= change->path_denied; 1313 op->path_denied |= change->path_denied;
1317 op->move_type |= change->move_type; 1314 op->move_type |= change->move_type;
1318 op->stats.luck += change->stats.luck; 1315 op->stats.luck += change->stats.luck;
1319 1316
1320 if (QUERY_FLAG (change, FLAG_CURSED)) 1317 static const struct copyflags : object::flags_t
1321 SET_FLAG (op, FLAG_CURSED); 1318 {
1322 if (QUERY_FLAG (change, FLAG_DAMNED)) 1319 copyflags ()
1323 SET_FLAG (op, FLAG_DAMNED); 1320 {
1324 if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0) 1321 set (FLAG_CURSED);
1322 set (FLAG_DAMNED);
1323 set (FLAG_LIFESAVE);
1324 set (FLAG_REFL_SPELL);
1325 set (FLAG_STEALTH);
1326 set (FLAG_XRAYS);
1327 set (FLAG_BLIND);
1328 set (FLAG_SEE_IN_DARK);
1329 set (FLAG_REFL_MISSILE);
1330 set (FLAG_MAKE_INVIS);
1331 }
1332 } copyflags;
1333
1334 // we might want to just copy, but or'ing is what the original code did
1335 op->flag |= change->flag & copyflags;
1336
1337 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1325 set_abs_magic (op, -op->magic); 1338 set_abs_magic (op, -op->magic);
1326 1339
1327 if (QUERY_FLAG (change, FLAG_LIFESAVE)) 1340 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 { 1341 {
1346 CLEAR_FLAG (op, FLAG_ANIMATE); 1342 op->clr_flag (FLAG_ANIMATE);
1343
1347 /* so artifacts will join */ 1344 /* so artifacts will join */
1348 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1345 if (!op->flag [FLAG_ALIVE])
1349 op->speed = 0.0; 1346 op->speed = 0.;
1350 1347
1351 op->set_speed (op->speed); 1348 op->set_speed (op->speed);
1352 } 1349 }
1353 1350
1354 if (change->nrof) 1351 if (change->nrof)
1355 op->nrof = rndm (change->nrof) + 1; 1352 op->nrof = rndm (change->nrof) + 1;
1356 1353
1357 op->stats.exp += change->stats.exp; /* Speed modifier */ 1354 op->stats.exp += change->stats.exp; /* Speed modifier */
1358 op->stats.wc += change->stats.wc; 1355 op->stats.wc += change->stats.wc;
1359 op->stats.ac += change->stats.ac; 1356 op->stats.ac += change->stats.ac;
1360 1357
1361 if (change->other_arch) 1358 if (change->other_arch)
1362 { 1359 {
1363 /* Basically, for horns & potions, the other_arch field is the spell 1360 /* 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 1361 * to cast. So convert that to into a spell and put it into
… …
1367 if (op->type == HORN || op->type == POTION) 1364 if (op->type == HORN || op->type == POTION)
1368 { 1365 {
1369 /* Remove any spells this object currently has in it */ 1366 /* Remove any spells this object currently has in it */
1370 op->destroy_inv (false); 1367 op->destroy_inv (false);
1371 1368
1372 object *tmp = arch_to_object (change->other_arch); 1369 object *tmp = change->other_arch->instance ();
1373 insert_ob_in_ob (tmp, op); 1370 insert_ob_in_ob (tmp, op);
1374 } 1371 }
1372
1375 /* No harm setting this for potions/horns */ 1373 /* No harm setting this for potions/horns */
1376 op->other_arch = change->other_arch; 1374 op->other_arch = change->other_arch;
1377 } 1375 }
1378 1376
1379 if (change->stats.hp < 0) 1377 if (change->stats.hp < 0)
… …
1395 op->stats.maxsp = -change->stats.maxsp; 1393 op->stats.maxsp = -change->stats.maxsp;
1396 else 1394 else
1397 op->stats.maxsp += change->stats.maxsp; 1395 op->stats.maxsp += change->stats.maxsp;
1398 1396
1399 if (change->stats.food < 0) 1397 if (change->stats.food < 0)
1400 op->stats.food = -(change->stats.food); 1398 op->stats.food = -change->stats.food;
1401 else 1399 else
1402 op->stats.food += change->stats.food; 1400 op->stats.food += change->stats.food;
1403 1401
1404 if (change->level < 0) 1402 if (change->level < 0)
1405 op->level = -(change->level); 1403 op->level = -change->level;
1406 else 1404 else
1407 op->level += change->level; 1405 op->level += change->level;
1408 1406
1409 if (change->gen_sp_armour < 0) 1407 if (change->gen_sp_armour < 0)
1410 op->gen_sp_armour = -(change->gen_sp_armour); 1408 op->gen_sp_armour = -change->gen_sp_armour;
1411 else 1409 else
1412 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1410 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1413 1411
1414 op->item_power = change->item_power; 1412 op->item_power = change->item_power;
1415 1413
1416 for (i = 0; i < NROFATTACKS; i++) 1414 for (int i = 0; i < NROFATTACKS; i++)
1417 if (change->resist[i])
1418 op->resist[i] += change->resist[i]; 1415 op->resist[i] += change->resist[i];
1419 1416
1420 if (change->stats.dam) 1417 if (change->stats.dam)
1421 { 1418 {
1422 if (change->stats.dam < 0) 1419 if (change->stats.dam < 0)
1423 op->stats.dam = (-change->stats.dam); 1420 op->stats.dam = -change->stats.dam;
1424 else if (op->stats.dam) 1421 else if (op->stats.dam)
1425 { 1422 {
1426 tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10); 1423 int tmp = op->stats.dam * change->stats.dam / 10;
1424
1427 if (tmp == op->stats.dam) 1425 if (tmp == op->stats.dam)
1428 { 1426 {
1429 if (change->stats.dam < 10) 1427 if (change->stats.dam < 10)
1430 op->stats.dam--; 1428 op->stats.dam--;
1431 else 1429 else
… …
1437 } 1435 }
1438 1436
1439 if (change->weight) 1437 if (change->weight)
1440 { 1438 {
1441 if (change->weight < 0) 1439 if (change->weight < 0)
1442 op->weight = (-change->weight); 1440 op->weight = -change->weight;
1443 else 1441 else
1444 op->weight = (op->weight * (change->weight)) / 100; 1442 op->weight = op->weight * change->weight / 100;
1445 } 1443 }
1446 1444
1447 if (change->last_sp) 1445 if (change->last_sp)
1448 { 1446 {
1449 if (change->last_sp < 0) 1447 if (change->last_sp < 0)
1450 op->last_sp = (-change->last_sp); 1448 op->last_sp = -change->last_sp;
1451 else 1449 else
1452 op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100); 1450 op->last_sp = op->last_sp * (int)change->last_sp / 100;
1453 } 1451 }
1454 1452
1455 if (change->gen_sp_armour) 1453 if (change->gen_sp_armour)
1456 { 1454 {
1457 if (change->gen_sp_armour < 0) 1455 if (change->gen_sp_armour < 0)
1458 op->gen_sp_armour = (-change->gen_sp_armour); 1456 op->gen_sp_armour = -change->gen_sp_armour;
1459 else 1457 else
1460 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1458 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1461 } 1459 }
1462 1460
1463 op->value *= change->value; 1461 op->value *= change->value;
1464 1462
1465 if (change->materials) 1463 if (change->materials)
… …
1497 name = tmp->name + 1, neg = 1; 1495 name = tmp->name + 1, neg = 1;
1498 else 1496 else
1499 name = tmp->name, neg = 0; 1497 name = tmp->name, neg = 0;
1500 1498
1501 /* If we match name, then return the opposite of 'neg' */ 1499 /* If we match name, then return the opposite of 'neg' */
1502 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname))) 1500 if (!strcmp (name, op->arch->archname))
1503 return !neg; 1501 return !neg;
1504 1502
1505 /* Set success as true, since if the match was an inverse, it means 1503 /* Set success as true, since if the match was an inverse, it means
1506 * everything is allowed except what we match 1504 * everything is allowed except what we match
1507 */ 1505 */
… …
1518 */ 1516 */
1519 1517
1520void 1518void
1521give_artifact_abilities (object *op, object *artifct) 1519give_artifact_abilities (object *op, object *artifct)
1522{ 1520{
1523 char new_name[MAX_BUF]; 1521 op->title = format ("of %s", &artifct->name);
1524 1522
1525 sprintf (new_name, "of %s", &artifct->name);
1526 op->title = new_name;
1527 add_abilities (op, artifct); /* Give out the bonuses */ 1523 add_abilities (op, artifct); /* Give out the bonuses */
1528 1524
1529#if 0 /* Bit verbose, but keep it here until next time I need it... */ 1525#if 0 /* Bit verbose, but keep it here until next time I need it... */
1530 { 1526 {
1531 char identified = QUERY_FLAG (op, FLAG_IDENTIFIED); 1527 char identified = op->flag [FLAG_IDENTIFIED];
1532 1528
1533 SET_FLAG (op, FLAG_IDENTIFIED); 1529 op->set_flag (FLAG_IDENTIFIED);
1534 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL)); 1530 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1535 if (!identified) 1531 if (!identified)
1536 CLEAR_FLAG (op, FLAG_IDENTIFIED); 1532 op->clr_flag (FLAG_IDENTIFIED);
1537 } 1533 }
1538#endif 1534#endif
1539 return; 1535 return;
1540} 1536}
1541 1537
… …
1551#define ARTIFACT_TRIES 2 1547#define ARTIFACT_TRIES 2
1552 1548
1553void 1549void
1554generate_artifact (object *op, int difficulty) 1550generate_artifact (object *op, int difficulty)
1555{ 1551{
1556 artifactlist *al;
1557 artifact *art; 1552 artifact *art;
1558 int i;
1559 1553
1560 al = find_artifactlist (op->type); 1554 artifactlist *al = find_artifactlist (op->type);
1561 1555
1562 if (al == NULL) 1556 if (al == NULL)
1563 { 1557 {
1564#if 0 /* This is too verbose, usually */ 1558#if 0 /* This is too verbose, usually */
1565 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name); 1559 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1566#endif 1560#endif
1567 return; 1561 return;
1568 } 1562 }
1569 1563
1570 for (i = 0; i < ARTIFACT_TRIES; i++) 1564 for (int i = 0; i < ARTIFACT_TRIES; i++)
1571 { 1565 {
1572 int roll = rndm (al->total_chance); 1566 int roll = rndm (al->total_chance);
1573 1567
1574 for (art = al->items; art; art = art->next) 1568 for (art = al->items; art; art = art->next)
1575 { 1569 {
… …
1615 */ 1609 */
1616 1610
1617void 1611void
1618fix_flesh_item (object *item, object *donor) 1612fix_flesh_item (object *item, object *donor)
1619{ 1613{
1620 char tmpbuf[MAX_BUF];
1621 int i;
1622
1623 if (item->type == FLESH && donor) 1614 if (item->type == FLESH && donor)
1624 { 1615 {
1625 /* change the name */ 1616 /* change the name */
1626 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); 1617 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); 1618 item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1629 item->name_pl = tmpbuf;
1630 1619
1631 /* weight is FLESH weight/100 * donor */ 1620 /* weight is FLESH weight/100 * donor */
1632 if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0) 1621 item->weight = max (1, item->weight * donor->weight / 100);
1633 item->weight = 1;
1634 1622
1635 /* value is multiplied by level of donor */ 1623 /* value is multiplied by level of donor */
1636 item->value *= isqrt (donor->level * 2); 1624 item->value *= isqrt (donor->level * 2);
1637 1625
1638 /* food value */ 1626 /* food value */
1639 item->stats.food += (donor->stats.hp / 100) + donor->stats.Con; 1627 item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1640 1628
1641 /* flesh items inherit some abilities of donor, but not 1629 /* flesh items inherit some abilities of donor, but not
1642 * full effect. 1630 * full effect.
1643 */ 1631 */
1644 for (i = 0; i < NROFATTACKS; i++) 1632 for (int i = 0; i < NROFATTACKS; i++)
1645 item->resist[i] = donor->resist[i] / 2; 1633 item->resist[i] = donor->resist[i] / 2;
1646 1634
1647 /* item inherits donor's level (important for quezals) */ 1635 /* item inherits donor's level (important for quezals) */
1648 item->level = donor->level; 1636 item->level = donor->level;
1649 1637
1650 /* if donor has some attacktypes, the flesh is poisonous */ 1638 /* if donor has some attacktypes, the flesh is poisonous */
1651 if (donor->attacktype & AT_POISON) 1639 if (donor->attacktype & AT_POISON)
1652 item->type = POISON; 1640 item->type = POISON;
1653 1641
1654 if (donor->attacktype & AT_ACID) 1642 if (donor->attacktype & AT_ACID)
1655 item->stats.hp = -1 * item->stats.food; 1643 item->stats.hp = -item->stats.food;
1656 1644
1657 SET_FLAG (item, FLAG_NO_STEAL); 1645 item->set_flag (FLAG_NO_STEAL);
1658 } 1646 }
1659} 1647}
1660 1648
1661static void 1649static void
1662free_treasurestruct (treasure *t) 1650free_treasurestruct (treasure *t)

Diff Legend

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