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.106 by elmex, Wed Apr 21 09:30:07 2010 UTC vs.
Revision 1.124 by root, Sat Dec 1 20:22:12 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,2010 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 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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
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 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)
44
39extern char *spell_mapping[]; 45extern char *spell_mapping[];
40 46
41static treasurelist *first_treasurelist; 47static treasurelist *first_treasurelist;
42 48
43static void change_treasure (treasure *t, object *op); /* overrule default values */ 49static void change_treasure (treasure *t, object *op); /* overrule default values */
44 50
45typedef std::tr1::unordered_map< 51typedef ska::flat_hash_map
52 <
46 const char *, 53 const char *,
47 treasurelist *, 54 treasurelist *,
48 str_hash, 55 str_hash,
49 str_equal, 56 str_equal,
50 slice_allocator< std::pair<const char *const, treasurelist *> > 57 slice_allocator< std::pair<const char *const, treasurelist *> >
51> tl_map_t; 58 > tl_map_t;
52 59
53static tl_map_t tl_map; 60static tl_map_t tl_map;
54 61
55//TODO: class method 62//TODO: class method
56static void free_treasurestruct (treasure *t); // bleh desu 63static void free_treasurestruct (treasure *t); // bleh desu
73treasurelist::find (const char *name) 80treasurelist::find (const char *name)
74{ 81{
75 if (!name) 82 if (!name)
76 return 0; 83 return 0;
77 84
78 auto (i, tl_map.find (name)); 85 auto i = tl_map.find (name);
79 86
80 if (i == tl_map.end ()) 87 if (i == tl_map.end ())
81 return 0; 88 return 0;
82 89
83 return i->second; 90 return i->second;
490 { 0, 0, 0, 3, 97}, // 29 497 { 0, 0, 0, 3, 97}, // 29
491 { 0, 0, 0, 0, 100}, // 30 498 { 0, 0, 0, 0, 100}, // 30
492 { 0, 0, 0, 0, 100}, // 31 499 { 0, 0, 0, 0, 100}, // 31
493}; 500};
494 501
495/* calculate the appropriate level for wands staves and scrolls. 502/* calculate the appropriate level for wands staves and scrolls.
496 * This code presumes that op has had its spell object created (in op->inv) 503 * This code presumes that op has had its spell object created (in op->inv)
497 * 504 *
498 * elmex Wed Aug 9 17:44:59 CEST 2006: 505 * elmex Wed Aug 9 17:44:59 CEST 2006:
499 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 506 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
500 */ 507 */
526 * 533 *
527 */ 534 */
528static int 535static int
529magic_from_difficulty (int difficulty) 536magic_from_difficulty (int difficulty)
530{ 537{
531 int percent = 0, magic = 0;
532 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 538 int scaled_diff = lerp (difficulty, 0, settings.max_level, 0, DIFFLEVELS - 1);
539 scaled_diff = clamp (scaled_diff, 0, DIFFLEVELS - 1);
533 540
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); 541 int percent = rndm (100);
542 int magic;
543 543
544 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 544 for (magic = 0; magic <= MAXMAGIC; magic++)
545 { 545 {
546 percent -= difftomagic_list[scaled_diff][magic]; 546 percent -= difftomagic_list[scaled_diff][magic];
547 547
548 if (percent < 0) 548 if (percent < 0)
549 break; 549 break;
550 } 550 }
551 551
552 if (magic == (MAXMAGIC + 1)) 552 if (magic > MAXMAGIC)
553 { 553 {
554 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 554 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
555 magic = 0; 555 magic = 0;
556 } 556 }
557 557
565 * Sets magical bonus in an object, and recalculates the effect on 565 * Sets magical bonus in an object, and recalculates the effect on
566 * the armour variable, and the effect on speed of armour. 566 * the armour variable, and the effect on speed of armour.
567 * This function doesn't work properly, should add use of archetypes 567 * This function doesn't work properly, should add use of archetypes
568 * to make it truly absolute. 568 * to make it truly absolute.
569 */ 569 */
570
571void 570void
572set_abs_magic (object *op, int magic) 571set_abs_magic (object *op, int magic)
573{ 572{
574 if (!magic) 573 if (!magic)
575 return; 574 return;
603 */ 602 */
604 603
605static void 604static void
606set_magic (int difficulty, object *op, int max_magic, int flags) 605set_magic (int difficulty, object *op, int max_magic, int flags)
607{ 606{
608 int i;
609
610 i = magic_from_difficulty (difficulty); 607 int i = magic_from_difficulty (difficulty);
608
611 if ((flags & GT_ONLY_GOOD) && i < 0) 609 if ((flags & GT_ONLY_GOOD) && i < 0)
612 i = -i; 610 i = -i;
611
613 if (i > max_magic) 612 i = min (i, max_magic);
614 i = max_magic; 613
615 set_abs_magic (op, i); 614 set_abs_magic (op, i);
616 if (i < 0) 615 if (i < 0)
617 op->set_flag (FLAG_CURSED); 616 op->set_flag (FLAG_CURSED);
618} 617}
619 618
629set_ring_bonus (object *op, int bonus) 628set_ring_bonus (object *op, int bonus)
630{ 629{
631 int r = rndm (bonus > 0 ? 25 : 11); 630 int r = rndm (bonus > 0 ? 25 : 11);
632 631
633 if (op->type == AMULET) 632 if (op->type == AMULET)
634 {
635 if (!(rndm (21))) 633 if (!rndm (21))
636 r = 20 + rndm (2); 634 r = 20 + rndm (2);
635 else if (rndm (2))
636 r = 10;
637 else 637 else
638 {
639 if (rndm (2))
640 r = 10;
641 else
642 r = 11 + rndm (9); 638 r = 11 + rndm (9);
643 }
644 }
645 639
646 switch (r) 640 switch (r)
647 { 641 {
648 /* Redone by MSW 2000-11-26 to have much less code. Also, 642 /* Redone by MSW 2000-11-26 to have much less code. Also,
649 * bonuses and penalties will stack and add to existing values. 643 * bonuses and penalties will stack and add to existing values.
650 * of the item. 644 * of the item.
651 */ 645 */
652 case 0: 646 case 0:
653 case 1: 647 case 1:
654 case 2: 648 case 2:
655 case 3: 649 case 3:
656 case 4: 650 case 4:
696 * little random element in since that they don't always end up with 690 * little random element in since that they don't always end up with
697 * even values. 691 * even values.
698 */ 692 */
699 if (bonus < 0) 693 if (bonus < 0)
700 val = 2 * -val - rndm (b); 694 val = 2 * -val - rndm (b);
701 if (val > 35) 695
702 val = 35; /* Upper limit */ 696 val = min (35, val); /* Upper limit */
697
703 b = 0; 698 b = 0;
704 699
705 while (op->resist[resist_table[resist]] != 0 && b < 4) 700 while (op->resist[resist_table[resist]] != 0 && b < 4)
706 resist = rndm (num_resist_table); 701 resist = rndm (num_resist_table);
707 702
740 } 735 }
741 break; 736 break;
742 737
743 case 22: 738 case 22:
744 op->stats.exp += bonus; /* Speed! */ 739 op->stats.exp += bonus; /* Speed! */
745 op->value = (op->value * 2) / 3; 740 op->value = op->value * 2 / 3;
746 break; 741 break;
747 } 742 }
748 743
749 if (bonus > 0) 744 if (bonus > 0)
750 op->value *= 2 * bonus; 745 op->value = 2 * op->value * bonus;
751 else 746 else
752 op->value = -(op->value * 2 * bonus) / 3; 747 op->value = -2 * op->value * bonus / 3;
753} 748}
754 749
755/* 750/*
756 * get_magic(diff) will return a random number between 0 and 4. 751 * 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 752 * 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. 756 * Another scheme is used to calculate the magic of weapons and armours.
762 */ 757 */
763static int 758static int
764get_magic (int diff) 759get_magic (int diff)
765{ 760{
766 int i; 761 diff = min (3, diff);
767 762
768 if (diff < 3)
769 diff = 3;
770
771 for (i = 0; i < 4; i++) 763 for (int i = 0; i < 4; i++)
772 if (rndm (diff)) 764 if (rndm (diff))
773 return i; 765 return i;
774 766
775 return 4; 767 return 4;
776} 768}
790 return 1; 782 return 1;
791 783
792 return 0; 784 return 0;
793} 785}
794 786
787static double
788value_factor_from_spell_item (object *spell, object *item)
789{
790 double factor =
791 pow ((spell->value > 0 ? spell->value : 1)
792 * spell->level, 1.5);
793
794 if (item) // this if for: wands/staffs/rods:
795 {
796 /* Old crossfire comment ahead:
797 * Add 50 to both level an divisor to keep prices a little more
798 * reasonable. Otherwise, a high level version of a low level
799 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
800 * 10 time multiplier). This way, the value are a bit more reasonable.
801 */
802
803 factor *= item->level + 50;
804 factor /= item->inv->level + 50;
805 }
806
807 return factor;
808}
809
795#define DICE2 (get_magic(2)==2?2:1) 810#define DICE2 (get_magic(2) == 2 ? 2 : 1)
796#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) 811#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
797 812
798/* 813/*
799 * fix_generated_item(): This is called after an item is generated, in 814 * 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 815 * order to set it up right. This produced magical bonuses, puts spells
801 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 816 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
802 */ 817 */
803 818
804/* 4/28/96 added creator object from which op may now inherit properties based on 819/* 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 820 * 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 821 * dependant. I know this is a spagetti manuever, but is there a cleaner
807 * way to do this? b.t. */ 822 * way to do this? b.t. */
808 823
809/* 824/*
810 * ! (flags & GT_ENVIRONMENT): 825 * ! (flags & GT_ENVIRONMENT):
811 * Automatically calls fix_flesh_item(). 826 * Automatically calls fix_flesh_item().
911 { 926 {
912 if (op->type == POTION) 927 if (op->type == POTION)
913 /* Handle healing and magic power potions */ 928 /* Handle healing and magic power potions */
914 if (op->stats.sp && !op->randomitems) 929 if (op->stats.sp && !op->randomitems)
915 { 930 {
916 object *tmp = get_archetype (spell_mapping [op->stats.sp]); 931 object *tmp = archetype::get (spell_mapping [op->stats.sp]);
917 insert_ob_in_ob (tmp, op); 932 insert_ob_in_ob (tmp, op);
918 op->stats.sp = 0; 933 op->stats.sp = 0;
919 } 934 }
920 } 935 }
921 else if (!op->title) /* Only modify object if not special */ 936 else if (!op->title) /* Only modify object if not special */
939 } 954 }
940 break; 955 break;
941 956
942 case POTION: 957 case POTION:
943 { 958 {
944 int too_many_tries = 0, is_special = 0; 959 int too_many_tries = 0;
945 960
946 /* Handle healing and magic power potions */ 961 /* Handle healing and magic power potions */
947 if (op->stats.sp && !op->randomitems) 962 if (op->stats.sp && !op->randomitems)
948 { 963 {
949 object *tmp = get_archetype (spell_mapping[op->stats.sp]); 964 object *tmp = archetype::get (spell_mapping[op->stats.sp]);
950 insert_ob_in_ob (tmp, op); 965 insert_ob_in_ob (tmp, op);
951 op->stats.sp = 0; 966 op->stats.sp = 0;
952 } 967 }
953 968
954 while (!(is_special = special_potion (op)) && !op->inv) 969 while (!special_potion (op) && !op->inv)
955 { 970 {
956 generate_artifact (op, difficulty); 971 generate_artifact (op, difficulty);
957 if (too_many_tries++ > 10) 972 if (too_many_tries++ > 10)
958 break; 973 break;
959 } 974 }
967 op->value *= op->inv->value; 982 op->value *= op->inv->value;
968 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); 983 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
969 } 984 }
970 else 985 else
971 { 986 {
972 op->name = "potion"; 987 op->name = shstr_potion;
973 op->name_pl = "potions"; 988 op->name_pl = shstr_potions;
974 } 989 }
975 990
976 if (!(flags & GT_ONLY_GOOD) && rndm (2)) 991 if (!(flags & GT_ONLY_GOOD) && rndm (2))
977 op->set_flag (FLAG_CURSED); 992 op->set_flag (FLAG_CURSED);
978 993
993 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2); 1008 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
994 1009
995 if (op->type != RING) /* Amulets have only one ability */ 1010 if (op->type != RING) /* Amulets have only one ability */
996 break; 1011 break;
997 1012
998 if (!(rndm (4))) 1013 if (!rndm (4))
999 { 1014 {
1000 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2; 1015 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1001 1016
1002 if (d > 0) 1017 if (d > 0)
1003 op->value *= 3; 1018 op->value *= 3;
1004 1019
1005 set_ring_bonus (op, d); 1020 set_ring_bonus (op, d);
1006 1021
1007 if (!(rndm (4))) 1022 if (!rndm (4))
1008 { 1023 {
1009 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2; 1024 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1010 1025
1011 if (d > 0) 1026 if (d > 0)
1012 op->value *= 5; 1027 op->value *= 5;
1028
1013 set_ring_bonus (op, d); 1029 set_ring_bonus (op, d);
1014 } 1030 }
1015 } 1031 }
1016 1032
1017 if (op->animation_id) 1033 if (op->animation_id)
1055 if (creator->slaying && !op->slaying) /* for check_inv floors */ 1071 if (creator->slaying && !op->slaying) /* for check_inv floors */
1056 op->slaying = creator->slaying; 1072 op->slaying = creator->slaying;
1057 break; 1073 break;
1058 1074
1059 case SPELLBOOK: 1075 case SPELLBOOK:
1060 op->value *= 1076 op->value *= value_factor_from_spell_item (op->inv, 0);
1061 pow ((op->inv->value > 0 ? op->inv->value : 1) 1077
1062 * op->inv->level,
1063 1.5);
1064 /* add exp so learning gives xp */ 1078 /* add exp so learning gives xp */
1065 op->level = op->inv->level; 1079 op->level = op->inv->level;
1066 op->stats.exp = op->value; 1080 op->stats.exp = op->value;
1067 break; 1081 break;
1068 1082
1072 * and reset nrof. 1086 * and reset nrof.
1073 */ 1087 */
1074 op->stats.food = op->inv->nrof; 1088 op->stats.food = op->inv->nrof;
1075 op->nrof = 1; 1089 op->nrof = 1;
1076 /* If the spell changes by level, choose a random level 1090 /* If the spell changes by level, choose a random level
1077 * for it, and adjust price. If the spell doesn't 1091 * for it.
1078 * change by level, just set the wand to the level of
1079 * the spell, and value calculation is simpler.
1080 */ 1092 */
1081 if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier) 1093 if (op->inv->duration_modifier
1082 { 1094 || op->inv->dam_modifier
1095 || op->inv->range_modifier)
1083 op->level = level_for_item (op, difficulty); 1096 op->level = level_for_item (op, difficulty);
1084 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1085 }
1086 else 1097 else
1087 {
1088 op->level = op->inv->level; 1098 op->level = op->inv->level;
1089 op->value = op->value * op->inv->value; 1099
1090 } 1100 op->value *= value_factor_from_spell_item (op->inv, op);
1091 break; 1101 break;
1092 1102
1093 case ROD: 1103 case ROD:
1094 op->level = level_for_item (op, difficulty); 1104 op->level = level_for_item (op, difficulty);
1095 /* Add 50 to both level an divisor to keep prices a little more 1105 op->value *= value_factor_from_spell_item (op->inv, op);
1096 * reasonable. Otherwise, a high level version of a low level 1106
1097 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1098 * 10 time multiplier). This way, the value are a bit more reasonable.
1099 */
1100 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1101 /* maxhp is used to denote how many 'charges' the rod holds before */ 1107 /* maxhp is used to denote how many 'charges' the rod holds before */
1102 if (op->stats.maxhp) 1108 if (op->stats.maxhp)
1103 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace); 1109 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1104 else 1110 else
1105 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace); 1111 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1107 op->stats.hp = op->stats.maxhp; 1113 op->stats.hp = op->stats.maxhp;
1108 break; 1114 break;
1109 1115
1110 case SCROLL: 1116 case SCROLL:
1111 op->level = level_for_item (op, difficulty); 1117 op->level = level_for_item (op, difficulty);
1112 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1118 op->value *= value_factor_from_spell_item (op->inv, op);
1113 1119
1114 /* add exp so reading them properly gives xp */ 1120 /* add exp so reading them properly gives xp */
1115 op->stats.exp = op->value / 5; 1121 op->stats.exp = op->value / 5;
1116 op->nrof = op->inv->nrof; 1122 op->nrof = op->inv->nrof;
1117 break; 1123 break;
1182 */ 1188 */
1183void 1189void
1184init_artifacts () 1190init_artifacts ()
1185{ 1191{
1186 static int has_been_inited = 0; 1192 static int has_been_inited = 0;
1187 char filename[MAX_BUF];
1188 artifact *art = NULL; 1193 artifact *art = NULL;
1189 artifactlist *al; 1194 artifactlist *al;
1190 1195
1191 if (has_been_inited) 1196 if (has_been_inited)
1192 return; 1197 return;
1193 else 1198 else
1194 has_been_inited = 1; 1199 has_been_inited = 1;
1195 1200
1196 sprintf (filename, "%s/artifacts", settings.datadir); 1201 object_thawer f (settings.datadir, "artifacts");
1197 object_thawer f (filename);
1198 1202
1199 if (!f) 1203 if (!f)
1200 return; 1204 return;
1201 1205
1202 for (;;) 1206 for (;;)
1287 } 1291 }
1288#if 0 1292#if 0
1289 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance); 1293 LOG (llevDebug, "Artifact list type %d has %d total chance\n", al->type, al->total_chance);
1290#endif 1294#endif
1291 } 1295 }
1292
1293 LOG (llevDebug, "done.\n");
1294} 1296}
1295 1297
1296/* 1298/*
1297 * Used in artifact generation. The bonuses of the first object 1299 * Used in artifact generation. The bonuses of the first object
1298 * is modified by the bonuses of the second object. 1300 * is modified by the bonuses of the second object.
1299 */ 1301 */
1300void 1302void
1301add_abilities (object *op, object *change) 1303add_abilities (object *op, object *change)
1302{ 1304{
1303 int i, tmp;
1304
1305 if (change->face != blank_face) 1305 if (change->face != blank_face)
1306 {
1307#ifdef TREASURE_VERBOSE
1308 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1309#endif
1310 op->face = change->face; 1306 op->face = change->face;
1311 }
1312 1307
1313 for (i = 0; i < NUM_STATS; i++) 1308 for (int i = 0; i < NUM_STATS; i++)
1314 change_attr_value (&(op->stats), i, change->stats.stat (i)); 1309 change_attr_value (&(op->stats), i, change->stats.stat (i));
1315 1310
1316 op->attacktype |= change->attacktype; 1311 op->attacktype |= change->attacktype;
1317 op->path_attuned |= change->path_attuned; 1312 op->path_attuned |= change->path_attuned;
1318 op->path_repelled |= change->path_repelled; 1313 op->path_repelled |= change->path_repelled;
1319 op->path_denied |= change->path_denied; 1314 op->path_denied |= change->path_denied;
1320 op->move_type |= change->move_type; 1315 op->move_type |= change->move_type;
1321 op->stats.luck += change->stats.luck; 1316 op->stats.luck += change->stats.luck;
1322 1317
1323 if (change->flag [FLAG_CURSED]) 1318 static const struct copyflags : object::flags_t
1319 {
1320 copyflags ()
1321 {
1324 op->set_flag (FLAG_CURSED); 1322 set (FLAG_CURSED);
1325 if (change->flag [FLAG_DAMNED])
1326 op->set_flag (FLAG_DAMNED); 1323 set (FLAG_DAMNED);
1324 set (FLAG_LIFESAVE);
1325 set (FLAG_REFL_SPELL);
1326 set (FLAG_STEALTH);
1327 set (FLAG_XRAYS);
1328 set (FLAG_BLIND);
1329 set (FLAG_SEE_IN_DARK);
1330 set (FLAG_REFL_MISSILE);
1331 set (FLAG_MAKE_INVIS);
1332 }
1333 } copyflags;
1334
1335 // we might want to just copy, but or'ing is what the original code did
1336 op->flag |= change->flag & copyflags;
1337
1327 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0) 1338 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1328 set_abs_magic (op, -op->magic); 1339 set_abs_magic (op, -op->magic);
1329 1340
1330 if (change->flag [FLAG_LIFESAVE])
1331 op->set_flag (FLAG_LIFESAVE);
1332 if (change->flag [FLAG_REFL_SPELL])
1333 op->set_flag (FLAG_REFL_SPELL);
1334 if (change->flag [FLAG_STEALTH])
1335 op->set_flag (FLAG_STEALTH);
1336 if (change->flag [FLAG_XRAYS])
1337 op->set_flag (FLAG_XRAYS);
1338 if (change->flag [FLAG_BLIND])
1339 op->set_flag (FLAG_BLIND);
1340 if (change->flag [FLAG_SEE_IN_DARK])
1341 op->set_flag (FLAG_SEE_IN_DARK);
1342 if (change->flag [FLAG_REFL_MISSILE])
1343 op->set_flag (FLAG_REFL_MISSILE);
1344 if (change->flag [FLAG_MAKE_INVIS])
1345 op->set_flag (FLAG_MAKE_INVIS);
1346
1347 if (change->flag [FLAG_STAND_STILL]) 1341 if (change->flag [FLAG_STAND_STILL])
1348 { 1342 {
1349 op->clr_flag (FLAG_ANIMATE); 1343 op->clr_flag (FLAG_ANIMATE);
1344
1350 /* so artifacts will join */ 1345 /* so artifacts will join */
1351 if (!op->flag [FLAG_ALIVE]) 1346 if (!op->flag [FLAG_ALIVE])
1352 op->speed = 0.0; 1347 op->speed = 0.;
1353 1348
1354 op->set_speed (op->speed); 1349 op->set_speed (op->speed);
1355 } 1350 }
1356 1351
1357 if (change->nrof) 1352 if (change->nrof)
1358 op->nrof = rndm (change->nrof) + 1; 1353 op->nrof = rndm (change->nrof) + 1;
1359 1354
1360 op->stats.exp += change->stats.exp; /* Speed modifier */ 1355 op->stats.exp += change->stats.exp; /* Speed modifier */
1361 op->stats.wc += change->stats.wc; 1356 op->stats.wc += change->stats.wc;
1362 op->stats.ac += change->stats.ac; 1357 op->stats.ac += change->stats.ac;
1363 1358
1364 if (change->other_arch) 1359 if (change->other_arch)
1365 { 1360 {
1366 /* Basically, for horns & potions, the other_arch field is the spell 1361 /* Basically, for horns & potions, the other_arch field is the spell
1367 * to cast. So convert that to into a spell and put it into 1362 * to cast. So convert that to into a spell and put it into
1399 op->stats.maxsp = -change->stats.maxsp; 1394 op->stats.maxsp = -change->stats.maxsp;
1400 else 1395 else
1401 op->stats.maxsp += change->stats.maxsp; 1396 op->stats.maxsp += change->stats.maxsp;
1402 1397
1403 if (change->stats.food < 0) 1398 if (change->stats.food < 0)
1404 op->stats.food = -(change->stats.food); 1399 op->stats.food = -change->stats.food;
1405 else 1400 else
1406 op->stats.food += change->stats.food; 1401 op->stats.food += change->stats.food;
1407 1402
1408 if (change->level < 0) 1403 if (change->level < 0)
1409 op->level = -(change->level); 1404 op->level = -change->level;
1410 else 1405 else
1411 op->level += change->level; 1406 op->level += change->level;
1412 1407
1413 if (change->gen_sp_armour < 0) 1408 if (change->gen_sp_armour < 0)
1414 op->gen_sp_armour = -(change->gen_sp_armour); 1409 op->gen_sp_armour = -change->gen_sp_armour;
1415 else 1410 else
1416 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1411 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1417 1412
1418 op->item_power = change->item_power; 1413 op->item_power = change->item_power;
1419 1414
1420 for (i = 0; i < NROFATTACKS; i++) 1415 for (int i = 0; i < NROFATTACKS; i++)
1421 if (change->resist[i])
1422 op->resist[i] += change->resist[i]; 1416 op->resist[i] += change->resist[i];
1423 1417
1424 if (change->stats.dam) 1418 if (change->stats.dam)
1425 { 1419 {
1426 if (change->stats.dam < 0) 1420 if (change->stats.dam < 0)
1427 op->stats.dam = (-change->stats.dam); 1421 op->stats.dam = -change->stats.dam;
1428 else if (op->stats.dam) 1422 else if (op->stats.dam)
1429 { 1423 {
1430 tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10); 1424 int tmp = op->stats.dam * change->stats.dam / 10;
1425
1431 if (tmp == op->stats.dam) 1426 if (tmp == op->stats.dam)
1432 { 1427 {
1433 if (change->stats.dam < 10) 1428 if (change->stats.dam < 10)
1434 op->stats.dam--; 1429 op->stats.dam--;
1435 else 1430 else
1441 } 1436 }
1442 1437
1443 if (change->weight) 1438 if (change->weight)
1444 { 1439 {
1445 if (change->weight < 0) 1440 if (change->weight < 0)
1446 op->weight = (-change->weight); 1441 op->weight = -change->weight;
1447 else 1442 else
1448 op->weight = (op->weight * (change->weight)) / 100; 1443 op->weight = op->weight * change->weight / 100;
1449 } 1444 }
1450 1445
1451 if (change->last_sp) 1446 if (change->last_sp)
1452 { 1447 {
1453 if (change->last_sp < 0) 1448 if (change->last_sp < 0)
1454 op->last_sp = (-change->last_sp); 1449 op->last_sp = -change->last_sp;
1455 else 1450 else
1456 op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100); 1451 op->last_sp = op->last_sp * (int)change->last_sp / 100;
1457 } 1452 }
1458 1453
1459 if (change->gen_sp_armour) 1454 if (change->gen_sp_armour)
1460 { 1455 {
1461 if (change->gen_sp_armour < 0) 1456 if (change->gen_sp_armour < 0)
1462 op->gen_sp_armour = (-change->gen_sp_armour); 1457 op->gen_sp_armour = -change->gen_sp_armour;
1463 else 1458 else
1464 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1459 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1465 } 1460 }
1466 1461
1467 op->value *= change->value; 1462 op->value *= change->value;
1468 1463
1469 if (change->materials) 1464 if (change->materials)
1501 name = tmp->name + 1, neg = 1; 1496 name = tmp->name + 1, neg = 1;
1502 else 1497 else
1503 name = tmp->name, neg = 0; 1498 name = tmp->name, neg = 0;
1504 1499
1505 /* If we match name, then return the opposite of 'neg' */ 1500 /* If we match name, then return the opposite of 'neg' */
1506 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname))) 1501 if (!strcmp (name, op->arch->archname))
1507 return !neg; 1502 return !neg;
1508 1503
1509 /* Set success as true, since if the match was an inverse, it means 1504 /* Set success as true, since if the match was an inverse, it means
1510 * everything is allowed except what we match 1505 * everything is allowed except what we match
1511 */ 1506 */
1522 */ 1517 */
1523 1518
1524void 1519void
1525give_artifact_abilities (object *op, object *artifct) 1520give_artifact_abilities (object *op, object *artifct)
1526{ 1521{
1527 char new_name[MAX_BUF]; 1522 op->title = format ("of %s", &artifct->name);
1528 1523
1529 sprintf (new_name, "of %s", &artifct->name);
1530 op->title = new_name;
1531 add_abilities (op, artifct); /* Give out the bonuses */ 1524 add_abilities (op, artifct); /* Give out the bonuses */
1532 1525
1533#if 0 /* Bit verbose, but keep it here until next time I need it... */ 1526#if 0 /* Bit verbose, but keep it here until next time I need it... */
1534 { 1527 {
1535 char identified = op->flag [FLAG_IDENTIFIED]; 1528 char identified = op->flag [FLAG_IDENTIFIED];
1555#define ARTIFACT_TRIES 2 1548#define ARTIFACT_TRIES 2
1556 1549
1557void 1550void
1558generate_artifact (object *op, int difficulty) 1551generate_artifact (object *op, int difficulty)
1559{ 1552{
1560 artifactlist *al;
1561 artifact *art; 1553 artifact *art;
1562 int i;
1563 1554
1564 al = find_artifactlist (op->type); 1555 artifactlist *al = find_artifactlist (op->type);
1565 1556
1566 if (al == NULL) 1557 if (al == NULL)
1567 { 1558 {
1568#if 0 /* This is too verbose, usually */ 1559#if 0 /* This is too verbose, usually */
1569 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name); 1560 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1570#endif 1561#endif
1571 return; 1562 return;
1572 } 1563 }
1573 1564
1574 for (i = 0; i < ARTIFACT_TRIES; i++) 1565 for (int i = 0; i < ARTIFACT_TRIES; i++)
1575 { 1566 {
1576 int roll = rndm (al->total_chance); 1567 int roll = rndm (al->total_chance);
1577 1568
1578 for (art = al->items; art; art = art->next) 1569 for (art = al->items; art; art = art->next)
1579 { 1570 {
1619 */ 1610 */
1620 1611
1621void 1612void
1622fix_flesh_item (object *item, object *donor) 1613fix_flesh_item (object *item, object *donor)
1623{ 1614{
1624 char tmpbuf[MAX_BUF];
1625 int i;
1626
1627 if (item->type == FLESH && donor) 1615 if (item->type == FLESH && donor)
1628 { 1616 {
1629 /* change the name */ 1617 /* change the name */
1630 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); 1618 item->name = format ("%s's %s", &donor->name, &item->name);
1631 item->name = tmpbuf;
1632 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl); 1619 item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1633 item->name_pl = tmpbuf;
1634 1620
1635 /* weight is FLESH weight/100 * donor */ 1621 /* weight is FLESH weight/100 * donor */
1636 if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0) 1622 item->weight = max (1, item->weight * donor->weight / 100);
1637 item->weight = 1;
1638 1623
1639 /* value is multiplied by level of donor */ 1624 /* value is multiplied by level of donor */
1640 item->value *= isqrt (donor->level * 2); 1625 item->value *= isqrt (donor->level * 2);
1641 1626
1642 /* food value */ 1627 /* food value */
1643 item->stats.food += (donor->stats.hp / 100) + donor->stats.Con; 1628 item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1644 1629
1645 /* flesh items inherit some abilities of donor, but not 1630 /* flesh items inherit some abilities of donor, but not
1646 * full effect. 1631 * full effect.
1647 */ 1632 */
1648 for (i = 0; i < NROFATTACKS; i++) 1633 for (int i = 0; i < NROFATTACKS; i++)
1649 item->resist[i] = donor->resist[i] / 2; 1634 item->resist[i] = donor->resist[i] / 2;
1650 1635
1651 /* item inherits donor's level (important for quezals) */ 1636 /* item inherits donor's level (important for quezals) */
1652 item->level = donor->level; 1637 item->level = donor->level;
1653 1638
1654 /* if donor has some attacktypes, the flesh is poisonous */ 1639 /* if donor has some attacktypes, the flesh is poisonous */
1655 if (donor->attacktype & AT_POISON) 1640 if (donor->attacktype & AT_POISON)
1656 item->type = POISON; 1641 item->type = POISON;
1657 1642
1658 if (donor->attacktype & AT_ACID) 1643 if (donor->attacktype & AT_ACID)
1659 item->stats.hp = -1 * item->stats.food; 1644 item->stats.hp = -item->stats.food;
1660 1645
1661 item->set_flag (FLAG_NO_STEAL); 1646 item->set_flag (FLAG_NO_STEAL);
1662 } 1647 }
1663} 1648}
1664 1649

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines