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

Diff Legend

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