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.72 by root, Sun Apr 20 00:44:12 2008 UTC vs.
Revision 1.107 by root, Sun Apr 25 07:08:57 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
… …
32 33
33//#define TREASURE_VERBOSE 34//#define TREASURE_VERBOSE
34 35
35#include <global.h> 36#include <global.h>
36#include <treasure.h> 37#include <treasure.h>
37#include <funcpoint.h>
38#include <loader.h>
39 38
40extern char *spell_mapping[]; 39extern char *spell_mapping[];
41 40
42static treasurelist *first_treasurelist; 41static treasurelist *first_treasurelist;
43 42
… …
46typedef std::tr1::unordered_map< 45typedef std::tr1::unordered_map<
47 const char *, 46 const char *,
48 treasurelist *, 47 treasurelist *,
49 str_hash, 48 str_hash,
50 str_equal, 49 str_equal,
51 slice_allocator< std::pair<const char *const, treasurelist *> >, 50 slice_allocator< std::pair<const char *const, treasurelist *> >
52 true
53> tl_map_t; 51> tl_map_t;
54 52
55static tl_map_t tl_map; 53static tl_map_t tl_map;
54
55//TODO: class method
56static void free_treasurestruct (treasure *t); // bleh desu
57static void
58clear (treasurelist *tl)
59{
60 if (tl->items)
61 {
62 free_treasurestruct (tl->items);
63 tl->items = 0;
64 }
65
66 tl->total_chance = 0;
67}
56 68
57/* 69/*
58 * Searches for the given treasurelist 70 * Searches for the given treasurelist
59 */ 71 */
60treasurelist * 72treasurelist *
… …
92 } 104 }
93 105
94 return tl; 106 return tl;
95} 107}
96 108
97//TODO: class method
98void
99clear (treasurelist *tl)
100{
101 if (tl->items)
102 {
103 free_treasurestruct (tl->items);
104 tl->items = 0;
105 }
106
107 tl->total_chance = 0;
108}
109
110#ifdef TREASURE_DEBUG 109#ifdef TREASURE_DEBUG
111/* recursived checks the linked list. Treasurelist is passed only 110/* recursived checks the linked list. Treasurelist is passed only
112 * so that the treasure name can be printed out 111 * so that the treasure name can be printed out
113 */ 112 */
114static void 113static void
… …
145 144
146 switch (f.kw) 145 switch (f.kw)
147 { 146 {
148 case KW_arch: 147 case KW_arch:
149 t->item = archetype::find (f.get_str ()); 148 t->item = archetype::find (f.get_str ());
149
150 if (!t->item) 150 if (!t->item)
151 { 151 {
152 f.parse_warn ("treasure references unknown archetype"); 152 f.parse_warn ("treasure references unknown archetype");
153 goto error; 153 t->item = archetype::empty;
154 } 154 }
155 155
156 break; 156 break;
157 157
158 case KW_list: f.get (t->name); break; 158 case KW_list: f.get (t->name); break;
… …
255 return; 255 return;
256 } 256 }
257 257
258 op->expand_tail (); 258 op->expand_tail ();
259 259
260 if (!creator->is_on_map ()
260 if (op->blocked (creator->map, creator->x, creator->y)) 261 || (op->weight && op->blocked (creator->map, creator->x, creator->y)))
261 op->destroy (); 262 op->destroy ();
262 else 263 else
263 { 264 {
264 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 265 op->flag [FLAG_OBJ_ORIGINAL] = true;
265 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 266 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
266 } 267 }
267 } 268 }
268 else 269 else
269 { 270 {
270 op = creator->insert (op); 271 op = creator->insert (op);
271 272
272 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 273 if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
273 monster_check_apply (creator, op); 274 monster_check_apply (creator, op);
274
275 if (flags & GT_UPDATE_INV)
276 if (object *tmp = creator->in_player ())
277 esrv_send_item (tmp, op);
278 } 275 }
279} 276}
280 277
281/* if there are change_xxx commands in the treasure, we include the changes 278/* if there are change_xxx commands in the treasure, we include the changes
282 * in the generated object 279 * in the generated object
… …
313 } 310 }
314 else 311 else
315 { 312 {
316 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE))) 313 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
317 { 314 {
318 object *tmp = arch_to_object (t->item); 315 object *tmp = t->item->instance ();
319 316
320 if (t->nrof && tmp->nrof <= 1) 317 if (t->nrof && tmp->nrof <= 1)
321 tmp->nrof = rndm (t->nrof) + 1; 318 tmp->nrof = rndm (t->nrof) + 1;
322 319
323 fix_generated_item (tmp, op, difficulty, t->magic, flag); 320 fix_generated_item (tmp, op, difficulty, t->magic, flag);
… …
370 else if (t->nrof) 367 else if (t->nrof)
371 create_one_treasure (tl, op, flag, difficulty, tries); 368 create_one_treasure (tl, op, flag, difficulty, tries);
372 } 369 }
373 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE)) 370 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
374 { 371 {
375 if (object *tmp = arch_to_object (t->item)) 372 if (object *tmp = t->item->instance ())
376 { 373 {
377 if (t->nrof && tmp->nrof <= 1) 374 if (t->nrof && tmp->nrof <= 1)
378 tmp->nrof = rndm (t->nrof) + 1; 375 tmp->nrof = rndm (t->nrof) + 1;
379 376
380 fix_generated_item (tmp, op, difficulty, t->magic, flag); 377 fix_generated_item (tmp, op, difficulty, t->magic, flag);
… …
446 443
447 if (ob->inv) 444 if (ob->inv)
448 LOG (llevError, "In generate treasure, created multiple objects.\n"); 445 LOG (llevError, "In generate treasure, created multiple objects.\n");
449 446
450 ob->destroy (); 447 ob->destroy ();
448
451 return tmp; 449 return tmp;
452} 450}
453 451
454/* 452/*
455 * This is a new way of calculating the chance for an item to have 453 * This is a new way of calculating the chance for an item to have
… …
498 * This code presumes that op has had its spell object created (in op->inv) 496 * This code presumes that op has had its spell object created (in op->inv)
499 * 497 *
500 * elmex Wed Aug 9 17:44:59 CEST 2006: 498 * elmex Wed Aug 9 17:44:59 CEST 2006:
501 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 499 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
502 */ 500 */
503int 501static int
504level_for_item (const object *op, int difficulty) 502level_for_item (const object *op, int difficulty)
505{ 503{
506 if (!op->inv) 504 if (!op->inv)
507 { 505 {
508 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 506 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
… …
512 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.)); 510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
513 511
514 if (olevel <= 0) 512 if (olevel <= 0)
515 olevel = rndm (1, op->inv->level); 513 olevel = rndm (1, op->inv->level);
516 514
517 return min (olevel, MAXLEVEL); 515 return min (olevel, MAXLEVEL_TREASURE);
518} 516}
519 517
520/* 518/*
521 * Based upon the specified difficulty and upon the difftomagic_list array, 519 * Based upon the specified difficulty and upon the difftomagic_list array,
522 * a random magical bonus is returned. This is used when determine 520 * a random magical bonus is returned. This is used when determine
… …
525 * elmex Thu Aug 10 18:45:44 CEST 2006: 523 * elmex Thu Aug 10 18:45:44 CEST 2006:
526 * Scaling difficulty by max_level, as difficulty is a level and not some 524 * Scaling difficulty by max_level, as difficulty is a level and not some
527 * weird integer between 1-31. 525 * weird integer between 1-31.
528 * 526 *
529 */ 527 */
530int 528static int
531magic_from_difficulty (int difficulty) 529magic_from_difficulty (int difficulty)
532{ 530{
533 int percent = 0, magic = 0;
534 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 531 int scaled_diff = lerp (difficulty, 0, settings.max_level, 0, DIFFLEVELS - 1);
532 scaled_diff = clamp (scaled_diff, 0, DIFFLEVELS - 1);
535 533
536 scaled_diff--;
537
538 if (scaled_diff < 0)
539 scaled_diff = 0;
540
541 if (scaled_diff >= DIFFLEVELS)
542 scaled_diff = DIFFLEVELS - 1;
543
544 percent = rndm (100); 534 int percent = rndm (100);
535 int magic;
545 536
546 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 537 for (magic = 0; magic <= MAXMAGIC; magic++)
547 { 538 {
548 percent -= difftomagic_list[scaled_diff][magic]; 539 percent -= difftomagic_list[scaled_diff][magic];
549 540
550 if (percent < 0) 541 if (percent < 0)
551 break; 542 break;
552 } 543 }
553 544
554 if (magic == (MAXMAGIC + 1)) 545 if (magic > MAXMAGIC)
555 { 546 {
556 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty); 547 LOG (llevError, "Warning, table for difficulty (scaled %d) %d bad.\n", scaled_diff, difficulty);
557 magic = 0; 548 magic = 0;
558 } 549 }
559 550
… …
567 * Sets magical bonus in an object, and recalculates the effect on 558 * Sets magical bonus in an object, and recalculates the effect on
568 * the armour variable, and the effect on speed of armour. 559 * the armour variable, and the effect on speed of armour.
569 * This function doesn't work properly, should add use of archetypes 560 * This function doesn't work properly, should add use of archetypes
570 * to make it truly absolute. 561 * to make it truly absolute.
571 */ 562 */
572
573void 563void
574set_abs_magic (object *op, int magic) 564set_abs_magic (object *op, int magic)
575{ 565{
576 if (!magic) 566 if (!magic)
577 return; 567 return;
… …
582 if (op->type == ARMOUR) 572 if (op->type == ARMOUR)
583 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100; 573 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
584 574
585 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 575 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
586 magic = (-magic); 576 magic = (-magic);
577
587 op->weight = (op->arch->weight * (100 - magic * 10)) / 100; 578 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
588 } 579 }
589 else 580 else
590 { 581 {
591 if (op->type == ARMOUR) 582 if (op->type == ARMOUR)
592 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 583 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
584
593 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 585 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
594 magic = (-magic); 586 magic = (-magic);
587
595 op->weight = (op->weight * (100 - magic * 10)) / 100; 588 op->weight = (op->weight * (100 - magic * 10)) / 100;
596 } 589 }
597} 590}
598 591
599/* 592/*
… …
602 */ 595 */
603 596
604static void 597static void
605set_magic (int difficulty, object *op, int max_magic, int flags) 598set_magic (int difficulty, object *op, int max_magic, int flags)
606{ 599{
607 int i;
608
609 i = magic_from_difficulty (difficulty); 600 int i = magic_from_difficulty (difficulty);
601
610 if ((flags & GT_ONLY_GOOD) && i < 0) 602 if ((flags & GT_ONLY_GOOD) && i < 0)
611 i = -i; 603 i = -i;
604
612 if (i > max_magic) 605 i = min (i, max_magic);
613 i = max_magic; 606
614 set_abs_magic (op, i); 607 set_abs_magic (op, i);
615 if (i < 0) 608 if (i < 0)
616 SET_FLAG (op, FLAG_CURSED); 609 op->set_flag (FLAG_CURSED);
617} 610}
618 611
619/* 612/*
620 * Randomly adds one magical ability to the given object. 613 * Randomly adds one magical ability to the given object.
621 * Modified for Partial Resistance in many ways: 614 * Modified for Partial Resistance in many ways:
622 * 1) Since rings can have multiple bonuses, if the same bonus 615 * 1) Since rings can have multiple bonuses, if the same bonus
623 * is rolled again, increase it - the bonuses now stack with 616 * is rolled again, increase it - the bonuses now stack with
624 * other bonuses previously rolled and ones the item might natively have. 617 * other bonuses previously rolled and ones the item might natively have.
625 * 2) Add code to deal with new PR method. 618 * 2) Add code to deal with new PR method.
626 */ 619 */
627void 620static void
628set_ring_bonus (object *op, int bonus) 621set_ring_bonus (object *op, int bonus)
629{ 622{
630
631 int r = rndm (bonus > 0 ? 25 : 11); 623 int r = rndm (bonus > 0 ? 25 : 11);
632 624
633 if (op->type == AMULET) 625 if (op->type == AMULET)
634 {
635 if (!(rndm (21))) 626 if (!rndm (21))
636 r = 20 + rndm (2); 627 r = 20 + rndm (2);
628 else if (rndm (2))
629 r = 10;
637 else 630 else
638 {
639 if (rndm (2))
640 r = 10;
641 else
642 r = 11 + rndm (9); 631 r = 11 + rndm (9);
643 }
644 }
645 632
646 switch (r) 633 switch (r)
647 { 634 {
648 /* Redone by MSW 2000-11-26 to have much less code. Also, 635 /* Redone by MSW 2000-11-26 to have much less code. Also,
649 * bonuses and penalties will stack and add to existing values. 636 * bonuses and penalties will stack and add to existing values.
650 * of the item. 637 * of the item.
651 */ 638 */
652 case 0: 639 case 0:
653 case 1: 640 case 1:
654 case 2: 641 case 2:
655 case 3: 642 case 3:
656 case 4: 643 case 4:
… …
696 * little random element in since that they don't always end up with 683 * little random element in since that they don't always end up with
697 * even values. 684 * even values.
698 */ 685 */
699 if (bonus < 0) 686 if (bonus < 0)
700 val = 2 * -val - rndm (b); 687 val = 2 * -val - rndm (b);
701 if (val > 35) 688
702 val = 35; /* Upper limit */ 689 val = min (35, val); /* Upper limit */
690
703 b = 0; 691 b = 0;
704 692
705 while (op->resist[resist_table[resist]] != 0 && b < 4) 693 while (op->resist[resist_table[resist]] != 0 && b < 4)
706 resist = rndm (num_resist_table); 694 resist = rndm (num_resist_table);
707 695
… …
715 break; 703 break;
716 } 704 }
717 case 20: 705 case 20:
718 if (op->type == AMULET) 706 if (op->type == AMULET)
719 { 707 {
720 SET_FLAG (op, FLAG_REFL_SPELL); 708 op->set_flag (FLAG_REFL_SPELL);
721 op->value *= 11; 709 op->value *= 11;
722 } 710 }
723 else 711 else
724 { 712 {
725 op->stats.hp = 1; /* regenerate hit points */ 713 op->stats.hp = 1; /* regenerate hit points */
… …
728 break; 716 break;
729 717
730 case 21: 718 case 21:
731 if (op->type == AMULET) 719 if (op->type == AMULET)
732 { 720 {
733 SET_FLAG (op, FLAG_REFL_MISSILE); 721 op->set_flag (FLAG_REFL_MISSILE);
734 op->value *= 9; 722 op->value *= 9;
735 } 723 }
736 else 724 else
737 { 725 {
738 op->stats.sp = 1; /* regenerate spell points */ 726 op->stats.sp = 1; /* regenerate spell points */
… …
740 } 728 }
741 break; 729 break;
742 730
743 case 22: 731 case 22:
744 op->stats.exp += bonus; /* Speed! */ 732 op->stats.exp += bonus; /* Speed! */
745 op->value = (op->value * 2) / 3; 733 op->value = op->value * 2 / 3;
746 break; 734 break;
747 } 735 }
748 736
749 if (bonus > 0) 737 if (bonus > 0)
750 op->value *= 2 * bonus; 738 op->value = 2 * op->value * bonus;
751 else 739 else
752 op->value = -(op->value * 2 * bonus) / 3; 740 op->value = -2 * op->value * bonus / 3;
753} 741}
754 742
755/* 743/*
756 * get_magic(diff) will return a random number between 0 and 4. 744 * get_magic(diff) will return a random number between 0 and 4.
757 * diff can be any value above 2. The higher the diff-variable, the 745 * diff can be any value above 2. The higher the diff-variable, the
758 * higher is the chance of returning a low number. 746 * higher is the chance of returning a low number.
759 * It is only used in fix_generated_treasure() to set bonuses on 747 * It is only used in fix_generated_treasure() to set bonuses on
760 * rings and amulets. 748 * rings and amulets.
761 * Another scheme is used to calculate the magic of weapons and armours. 749 * Another scheme is used to calculate the magic of weapons and armours.
762 */ 750 */
763int 751static int
764get_magic (int diff) 752get_magic (int diff)
765{ 753{
766 int i; 754 diff = min (3, diff);
767 755
768 if (diff < 3)
769 diff = 3;
770
771 for (i = 0; i < 4; i++) 756 for (int i = 0; i < 4; i++)
772 if (rndm (diff)) 757 if (rndm (diff))
773 return i; 758 return i;
774 759
775 return 4; 760 return 4;
776} 761}
777 762
763/* special_potion() - so that old potion code is still done right. */
764static int
765special_potion (object *op)
766{
767 if (op->attacktype)
768 return 1;
769
770 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
771 return 1;
772
773 for (int i = 0; i < NROFATTACKS; i++)
774 if (op->resist[i])
775 return 1;
776
777 return 0;
778}
779
778#define DICE2 (get_magic(2)==2?2:1) 780#define DICE2 (get_magic(2) == 2 ? 2 : 1)
779#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) 781#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
780 782
781/* 783/*
782 * fix_generated_item(): This is called after an item is generated, in 784 * fix_generated_item(): This is called after an item is generated, in
783 * order to set it up right. This produced magical bonuses, puts spells 785 * order to set it up right. This produced magical bonuses, puts spells
… …
817 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0); 819 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
818 /* So the treasure doesn't get created again */ 820 /* So the treasure doesn't get created again */
819 op->randomitems = 0; 821 op->randomitems = 0;
820 } 822 }
821 823
822 if (difficulty < 1) 824 max_it (difficulty, 1);
823 difficulty = 1;
824 825
825 if (INVOKE_OBJECT (ADD_BONUS, op, 826 if (INVOKE_OBJECT (ADD_BONUS, op,
826 ARG_OBJECT (creator != op ? creator : 0), 827 ARG_OBJECT (creator != op ? creator : 0),
827 ARG_INT (difficulty), ARG_INT (max_magic), 828 ARG_INT (difficulty), ARG_INT (max_magic),
828 ARG_INT (flags))) 829 ARG_INT (flags)))
… …
887 * again below */ 888 * again below */
888 } 889 }
889 } 890 }
890 891
891 /* materialtype modifications. Note we allow this on artifacts. */ 892 /* materialtype modifications. Note we allow this on artifacts. */
892 set_materialname (op, difficulty, NULL); 893 select_material (op, difficulty);
893 894
894 if (flags & GT_MINIMAL) 895 if (flags & GT_MINIMAL)
895 { 896 {
896 if (op->type == POTION) 897 if (op->type == POTION)
897 /* Handle healing and magic power potions */ 898 /* Handle healing and magic power potions */
… …
908 case WEAPON: 909 case WEAPON:
909 case ARMOUR: 910 case ARMOUR:
910 case SHIELD: 911 case SHIELD:
911 case HELMET: 912 case HELMET:
912 case CLOAK: 913 case CLOAK:
913 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) 914 if (op->flag [FLAG_CURSED] && !(rndm (4)))
914 set_ring_bonus (op, -DICE2); 915 set_ring_bonus (op, -DICE2);
915 break; 916 break;
916 917
917 case BRACERS: 918 case BRACERS:
918 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)) 919 if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
919 { 920 {
920 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 921 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
921 if (!QUERY_FLAG (op, FLAG_CURSED)) 922 if (!op->flag [FLAG_CURSED])
922 op->value *= 3; 923 op->value *= 3;
923 } 924 }
924 break; 925 break;
925 926
926 case POTION: 927 case POTION:
… …
928 int too_many_tries = 0, is_special = 0; 929 int too_many_tries = 0, is_special = 0;
929 930
930 /* Handle healing and magic power potions */ 931 /* Handle healing and magic power potions */
931 if (op->stats.sp && !op->randomitems) 932 if (op->stats.sp && !op->randomitems)
932 { 933 {
933 object *tmp;
934
935 tmp = get_archetype (spell_mapping[op->stats.sp]); 934 object *tmp = get_archetype (spell_mapping[op->stats.sp]);
936 insert_ob_in_ob (tmp, op); 935 insert_ob_in_ob (tmp, op);
937 op->stats.sp = 0; 936 op->stats.sp = 0;
938 } 937 }
939 938
940 while (!(is_special = special_potion (op)) && !op->inv) 939 while (!(is_special = special_potion (op)) && !op->inv)
… …
948 * since the value set on those is already correct. 947 * since the value set on those is already correct.
949 */ 948 */
950 if (op->inv && op->randomitems) 949 if (op->inv && op->randomitems)
951 { 950 {
952 /* value multiplier is same as for scrolls */ 951 /* value multiplier is same as for scrolls */
953 op->value = (op->value * op->inv->value); 952 op->value *= op->inv->value;
954 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); 953 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
955 } 954 }
956 else 955 else
957 { 956 {
958 op->name = "potion"; 957 op->name = shstr_potion;
959 op->name_pl = "potions"; 958 op->name_pl = shstr_potions;
960 } 959 }
961 960
962 if (!(flags & GT_ONLY_GOOD) && rndm (2)) 961 if (!(flags & GT_ONLY_GOOD) && rndm (2))
963 SET_FLAG (op, FLAG_CURSED); 962 op->set_flag (FLAG_CURSED);
963
964 break; 964 break;
965 } 965 }
966 966
967 case AMULET: 967 case AMULET:
968 if (IS_ARCH (op->arch, amulet)) 968 if (IS_ARCH (op->arch, amulet))
969 op->value *= 5; /* Since it's not just decoration */ 969 op->value *= 5; /* Since it's not just decoration */
970 970
971 case RING: 971 case RING:
972 if (!op->arch) // wtf? schmorp
973 {
974 op->destroy ();
975 op = 0;
976 break;
977 }
978
979 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */ 972 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
980 break; 973 break;
981 974
982 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 975 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
983 SET_FLAG (op, FLAG_CURSED); 976 op->set_flag (FLAG_CURSED);
984 977
985 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 978 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
986 979
987 if (op->type != RING) /* Amulets have only one ability */ 980 if (op->type != RING) /* Amulets have only one ability */
988 break; 981 break;
989 982
990 if (!(rndm (4))) 983 if (!rndm (4))
991 { 984 {
992 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 985 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
993 986
994 if (d > 0) 987 if (d > 0)
995 op->value *= 3; 988 op->value *= 3;
996 989
997 set_ring_bonus (op, d); 990 set_ring_bonus (op, d);
998 991
999 if (!(rndm (4))) 992 if (!rndm (4))
1000 { 993 {
1001 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 994 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
1002 995
1003 if (d > 0) 996 if (d > 0)
1004 op->value *= 5; 997 op->value *= 5;
998
1005 set_ring_bonus (op, d); 999 set_ring_bonus (op, d);
1006 } 1000 }
1007 } 1001 }
1008 1002
1009 if (GET_ANIM_ID (op)) 1003 if (op->animation_id)
1010 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); 1004 op->set_anim_frame (rndm (op->anim_frames ()));
1011 1005
1012 break; 1006 break;
1013 1007
1014 case BOOK: 1008 case BOOK:
1015 /* Is it an empty book?, if yes lets make a special· 1009 /* Is it an empty book?, if yes lets make a special·
… …
1017 * creator and/or map level we found it on. 1011 * creator and/or map level we found it on.
1018 */ 1012 */
1019 if (!op->msg && rndm (10)) 1013 if (!op->msg && rndm (10))
1020 { 1014 {
1021 /* set the book level properly */ 1015 /* set the book level properly */
1022 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1016 if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1023 { 1017 {
1024 if (op->map && op->map->difficulty) 1018 if (op->map && op->map->difficulty)
1025 op->level = rndm (op->map->difficulty) + rndm (10) + 1; 1019 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1026 else 1020 else
1027 op->level = rndm (20) + 1; 1021 op->level = rndm (20) + 1;
… …
1030 op->level = rndm (creator->level); 1024 op->level = rndm (creator->level);
1031 1025
1032 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1026 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1033 /* books w/ info are worth more! */ 1027 /* books w/ info are worth more! */
1034 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1028 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1035 /* creator related stuff */
1036
1037 /* for library, chained books. Note that some monsters have no_pick
1038 * set - we don't want to set no pick in that case.
1039 */
1040 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1041 SET_FLAG (op, FLAG_NO_PICK);
1042 if (creator->slaying && !op->slaying) /* for check_inv floors */
1043 op->slaying = creator->slaying;
1044 1029
1045 /* add exp so reading it gives xp (once) */ 1030 /* add exp so reading it gives xp (once) */
1046 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1031 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1047 } 1032 }
1033
1034 /* creator related stuff */
1035
1036 /* for library, chained books. Note that some monsters have no_pick
1037 * set - we don't want to set no pick in that case.
1038 */
1039 if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1040 op->set_flag (FLAG_NO_PICK);
1041 if (creator->slaying && !op->slaying) /* for check_inv floors */
1042 op->slaying = creator->slaying;
1048 break; 1043 break;
1049 1044
1050 case SPELLBOOK: 1045 case SPELLBOOK:
1051 op->value = op->value * op->inv->value; 1046 op->value *= pow ((op->inv->value > 0 ? op->inv->value : 1)
1047 * op->inv->level,
1048 1.5);
1049
1052 /* add exp so learning gives xp */ 1050 /* add exp so learning gives xp */
1053 op->level = op->inv->level; 1051 op->level = op->inv->level;
1054 op->stats.exp = op->value; 1052 op->stats.exp = op->value;
1055 break; 1053 break;
1056 1054
… …
1084 * reasonable. Otherwise, a high level version of a low level 1082 * reasonable. Otherwise, a high level version of a low level
1085 * spell can be worth tons a money (eg, level 20 rod, level 2 spell = 1083 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1086 * 10 time multiplier). This way, the value are a bit more reasonable. 1084 * 10 time multiplier). This way, the value are a bit more reasonable.
1087 */ 1085 */
1088 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1086 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1087
1089 /* maxhp is used to denote how many 'charges' the rod holds before */ 1088 /* maxhp is used to denote how many 'charges' the rod holds before */
1090 if (op->stats.maxhp) 1089 if (op->stats.maxhp)
1091 op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace); 1090 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1092 else 1091 else
1093 op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace); 1092 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1094 1093
1095 op->stats.hp = op->stats.maxhp; 1094 op->stats.hp = op->stats.maxhp;
1096 break; 1095 break;
1097 1096
1098 case SCROLL: 1097 case SCROLL:
… …
1113 break; 1112 break;
1114 } /* switch type */ 1113 } /* switch type */
1115 1114
1116 if (flags & GT_STARTEQUIP) 1115 if (flags & GT_STARTEQUIP)
1117 { 1116 {
1118 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN)) 1117 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1119 SET_FLAG (op, FLAG_STARTEQUIP); 1118 op->set_flag (FLAG_STARTEQUIP);
1120 else if (op->type != MONEY) 1119 else if (op->type != MONEY)
1121 op->value = 0; 1120 op->value = 0;
1122 } 1121 }
1123 1122
1124 if (!(flags & GT_ENVIRONMENT)) 1123 if (!(flags & GT_ENVIRONMENT))
… …
1135 1134
1136/* 1135/*
1137 * Allocate and return the pointer to an empty artifactlist structure. 1136 * Allocate and return the pointer to an empty artifactlist structure.
1138 */ 1137 */
1139static artifactlist * 1138static artifactlist *
1140get_empty_artifactlist (void) 1139get_empty_artifactlist ()
1141{ 1140{
1142 return salloc0<artifactlist> (); 1141 return salloc0<artifactlist> ();
1143} 1142}
1144 1143
1145/* 1144/*
1146 * Allocate and return the pointer to an empty artifact structure. 1145 * Allocate and return the pointer to an empty artifact structure.
1147 */ 1146 */
1148static artifact * 1147static artifact *
1149get_empty_artifact (void) 1148get_empty_artifact ()
1150{ 1149{
1151 return salloc0<artifact> (); 1150 return salloc0<artifact> ();
1152} 1151}
1153 1152
1154/* 1153/*
… …
1167 1166
1168/* 1167/*
1169 * Builds up the lists of artifacts from the file in the libdir. 1168 * Builds up the lists of artifacts from the file in the libdir.
1170 */ 1169 */
1171void 1170void
1172init_artifacts (void) 1171init_artifacts ()
1173{ 1172{
1174 static int has_been_inited = 0; 1173 static int has_been_inited = 0;
1175 char filename[MAX_BUF]; 1174 char filename[MAX_BUF];
1176 artifact *art = NULL; 1175 artifact *art = NULL;
1177 artifactlist *al; 1176 artifactlist *al;
… …
1197 1196
1198 { 1197 {
1199 if (!strcmp (f.get_str (), "all")) 1198 if (!strcmp (f.get_str (), "all"))
1200 break; 1199 break;
1201 1200
1202 char *next, *cp = f.get_str (); 1201 const char *cp = f.get_str ();
1203 1202 char *next;
1204 do 1203 do
1205 { 1204 {
1206 if ((next = strchr (cp, ','))) 1205 if ((next = (char *)strchr (cp, ',')))
1207 *next++ = '\0'; 1206 *next++ = '\0';
1208 1207
1209 linked_char *tmp = new linked_char; 1208 linked_char *tmp = new linked_char;
1210 1209
1211 tmp->name = cp; 1210 tmp->name = cp;
… …
1286 * is modified by the bonuses of the second object. 1285 * is modified by the bonuses of the second object.
1287 */ 1286 */
1288void 1287void
1289add_abilities (object *op, object *change) 1288add_abilities (object *op, object *change)
1290{ 1289{
1291 int i, tmp;
1292
1293 if (change->face != blank_face) 1290 if (change->face != blank_face)
1294 { 1291 {
1295#ifdef TREASURE_VERBOSE 1292#ifdef TREASURE_VERBOSE
1296 LOG (llevDebug, "add_abilities change face: %d\n", change->face); 1293 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1297#endif 1294#endif
1298 op->face = change->face; 1295 op->face = change->face;
1299 } 1296 }
1300 1297
1301 for (i = 0; i < NUM_STATS; i++) 1298 for (int i = 0; i < NUM_STATS; i++)
1302 change_attr_value (&(op->stats), i, change->stats.stat (i)); 1299 change_attr_value (&(op->stats), i, change->stats.stat (i));
1303 1300
1304 op->attacktype |= change->attacktype; 1301 op->attacktype |= change->attacktype;
1305 op->path_attuned |= change->path_attuned; 1302 op->path_attuned |= change->path_attuned;
1306 op->path_repelled |= change->path_repelled; 1303 op->path_repelled |= change->path_repelled;
1307 op->path_denied |= change->path_denied; 1304 op->path_denied |= change->path_denied;
1308 op->move_type |= change->move_type; 1305 op->move_type |= change->move_type;
1309 op->stats.luck += change->stats.luck; 1306 op->stats.luck += change->stats.luck;
1310 1307
1311 if (QUERY_FLAG (change, FLAG_CURSED)) 1308 static const struct copyflags : object::flags_t
1312 SET_FLAG (op, FLAG_CURSED); 1309 {
1313 if (QUERY_FLAG (change, FLAG_DAMNED)) 1310 copyflags ()
1314 SET_FLAG (op, FLAG_DAMNED); 1311 {
1315 if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0) 1312 set (FLAG_CURSED);
1313 set (FLAG_DAMNED);
1314 set (FLAG_LIFESAVE);
1315 set (FLAG_REFL_SPELL);
1316 set (FLAG_STEALTH);
1317 set (FLAG_XRAYS);
1318 set (FLAG_BLIND);
1319 set (FLAG_SEE_IN_DARK);
1320 set (FLAG_REFL_MISSILE);
1321 set (FLAG_MAKE_INVIS);
1322 }
1323 } copyflags;
1324
1325 // we might want to just copy, but or'ing is what the original code did
1326 op->flag |= change->flag & copyflags;
1327
1328 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1316 set_abs_magic (op, -op->magic); 1329 set_abs_magic (op, -op->magic);
1317 1330
1318 if (QUERY_FLAG (change, FLAG_LIFESAVE)) 1331 if (change->flag [FLAG_STAND_STILL])
1319 SET_FLAG (op, FLAG_LIFESAVE);
1320 if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1321 SET_FLAG (op, FLAG_REFL_SPELL);
1322 if (QUERY_FLAG (change, FLAG_STEALTH))
1323 SET_FLAG (op, FLAG_STEALTH);
1324 if (QUERY_FLAG (change, FLAG_XRAYS))
1325 SET_FLAG (op, FLAG_XRAYS);
1326 if (QUERY_FLAG (change, FLAG_BLIND))
1327 SET_FLAG (op, FLAG_BLIND);
1328 if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1329 SET_FLAG (op, FLAG_SEE_IN_DARK);
1330 if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1331 SET_FLAG (op, FLAG_REFL_MISSILE);
1332 if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1333 SET_FLAG (op, FLAG_MAKE_INVIS);
1334
1335 if (QUERY_FLAG (change, FLAG_STAND_STILL))
1336 { 1332 {
1337 CLEAR_FLAG (op, FLAG_ANIMATE); 1333 op->clr_flag (FLAG_ANIMATE);
1334
1338 /* so artifacts will join */ 1335 /* so artifacts will join */
1339 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1336 if (!op->flag [FLAG_ALIVE])
1340 op->speed = 0.0; 1337 op->speed = 0.;
1341 1338
1342 op->set_speed (op->speed); 1339 op->set_speed (op->speed);
1343 } 1340 }
1344 1341
1345 if (change->nrof) 1342 if (change->nrof)
1346 op->nrof = rndm (change->nrof) + 1; 1343 op->nrof = rndm (change->nrof) + 1;
1347 1344
1348 op->stats.exp += change->stats.exp; /* Speed modifier */ 1345 op->stats.exp += change->stats.exp; /* Speed modifier */
1349 op->stats.wc += change->stats.wc; 1346 op->stats.wc += change->stats.wc;
1350 op->stats.ac += change->stats.ac; 1347 op->stats.ac += change->stats.ac;
1351 1348
1352 if (change->other_arch) 1349 if (change->other_arch)
1353 { 1350 {
1354 /* Basically, for horns & potions, the other_arch field is the spell 1351 /* Basically, for horns & potions, the other_arch field is the spell
1355 * to cast. So convert that to into a spell and put it into 1352 * to cast. So convert that to into a spell and put it into
1356 * this object. 1353 * this object.
1357 */ 1354 */
1358 if (op->type == HORN || op->type == POTION) 1355 if (op->type == HORN || op->type == POTION)
1359 { 1356 {
1360 object *tmp_obj;
1361
1362 /* Remove any spells this object currently has in it */ 1357 /* Remove any spells this object currently has in it */
1363 while (op->inv)
1364 op->inv->destroy (); 1358 op->destroy_inv (false);
1365 1359
1366 tmp_obj = arch_to_object (change->other_arch); 1360 object *tmp = change->other_arch->instance ();
1367 insert_ob_in_ob (tmp_obj, op); 1361 insert_ob_in_ob (tmp, op);
1368 } 1362 }
1363
1369 /* No harm setting this for potions/horns */ 1364 /* No harm setting this for potions/horns */
1370 op->other_arch = change->other_arch; 1365 op->other_arch = change->other_arch;
1371 } 1366 }
1372 1367
1373 if (change->stats.hp < 0) 1368 if (change->stats.hp < 0)
… …
1389 op->stats.maxsp = -change->stats.maxsp; 1384 op->stats.maxsp = -change->stats.maxsp;
1390 else 1385 else
1391 op->stats.maxsp += change->stats.maxsp; 1386 op->stats.maxsp += change->stats.maxsp;
1392 1387
1393 if (change->stats.food < 0) 1388 if (change->stats.food < 0)
1394 op->stats.food = -(change->stats.food); 1389 op->stats.food = -change->stats.food;
1395 else 1390 else
1396 op->stats.food += change->stats.food; 1391 op->stats.food += change->stats.food;
1397 1392
1398 if (change->level < 0) 1393 if (change->level < 0)
1399 op->level = -(change->level); 1394 op->level = -change->level;
1400 else 1395 else
1401 op->level += change->level; 1396 op->level += change->level;
1402 1397
1403 if (change->gen_sp_armour < 0) 1398 if (change->gen_sp_armour < 0)
1404 op->gen_sp_armour = -(change->gen_sp_armour); 1399 op->gen_sp_armour = -change->gen_sp_armour;
1405 else 1400 else
1406 op->gen_sp_armour = (op->gen_sp_armour * (change->gen_sp_armour)) / 100; 1401 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1407 1402
1408 op->item_power = change->item_power; 1403 op->item_power = change->item_power;
1409 1404
1410 for (i = 0; i < NROFATTACKS; i++) 1405 for (int i = 0; i < NROFATTACKS; i++)
1411 if (change->resist[i])
1412 op->resist[i] += change->resist[i]; 1406 op->resist[i] += change->resist[i];
1413 1407
1414 if (change->stats.dam) 1408 if (change->stats.dam)
1415 { 1409 {
1416 if (change->stats.dam < 0) 1410 if (change->stats.dam < 0)
1417 op->stats.dam = (-change->stats.dam); 1411 op->stats.dam = -change->stats.dam;
1418 else if (op->stats.dam) 1412 else if (op->stats.dam)
1419 { 1413 {
1420 tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10); 1414 int tmp = op->stats.dam * change->stats.dam / 10;
1415
1421 if (tmp == op->stats.dam) 1416 if (tmp == op->stats.dam)
1422 { 1417 {
1423 if (change->stats.dam < 10) 1418 if (change->stats.dam < 10)
1424 op->stats.dam--; 1419 op->stats.dam--;
1425 else 1420 else
… …
1431 } 1426 }
1432 1427
1433 if (change->weight) 1428 if (change->weight)
1434 { 1429 {
1435 if (change->weight < 0) 1430 if (change->weight < 0)
1436 op->weight = (-change->weight); 1431 op->weight = -change->weight;
1437 else 1432 else
1438 op->weight = (op->weight * (change->weight)) / 100; 1433 op->weight = op->weight * change->weight / 100;
1439 } 1434 }
1440 1435
1441 if (change->last_sp) 1436 if (change->last_sp)
1442 { 1437 {
1443 if (change->last_sp < 0) 1438 if (change->last_sp < 0)
1444 op->last_sp = (-change->last_sp); 1439 op->last_sp = -change->last_sp;
1445 else 1440 else
1446 op->last_sp = (signed char) (((int) op->last_sp * (int) change->last_sp) / (int) 100); 1441 op->last_sp = op->last_sp * (int)change->last_sp / 100;
1447 } 1442 }
1448 1443
1449 if (change->gen_sp_armour) 1444 if (change->gen_sp_armour)
1450 { 1445 {
1451 if (change->gen_sp_armour < 0) 1446 if (change->gen_sp_armour < 0)
1452 op->gen_sp_armour = (-change->gen_sp_armour); 1447 op->gen_sp_armour = -change->gen_sp_armour;
1453 else 1448 else
1454 op->gen_sp_armour = (signed char) (((int) op->gen_sp_armour * ((int) change->gen_sp_armour)) / (int) 100); 1449 op->gen_sp_armour = op->gen_sp_armour * (int)change->gen_sp_armour / 100;
1455 } 1450 }
1456 1451
1457 op->value *= change->value; 1452 op->value *= change->value;
1458 1453
1459 if (change->materials) 1454 if (change->materials)
1460 op->materials = change->materials; 1455 op->materials = change->materials;
1461 1456
1462 if (change->materialname) 1457 if (change->material != MATERIAL_NULL)
1463 op->materialname = change->materialname; 1458 op->material = change->material;
1464 1459
1465 if (change->slaying) 1460 if (change->slaying)
1466 op->slaying = change->slaying; 1461 op->slaying = change->slaying;
1467 1462
1468 if (change->race) 1463 if (change->race)
… …
1512 */ 1507 */
1513 1508
1514void 1509void
1515give_artifact_abilities (object *op, object *artifct) 1510give_artifact_abilities (object *op, object *artifct)
1516{ 1511{
1517 char new_name[MAX_BUF]; 1512 op->title = format ("of %s", &artifct->name);
1518 1513
1519 sprintf (new_name, "of %s", &artifct->name);
1520 op->title = new_name;
1521 add_abilities (op, artifct); /* Give out the bonuses */ 1514 add_abilities (op, artifct); /* Give out the bonuses */
1522 1515
1523#if 0 /* Bit verbose, but keep it here until next time I need it... */ 1516#if 0 /* Bit verbose, but keep it here until next time I need it... */
1524 { 1517 {
1525 char identified = QUERY_FLAG (op, FLAG_IDENTIFIED); 1518 char identified = op->flag [FLAG_IDENTIFIED];
1526 1519
1527 SET_FLAG (op, FLAG_IDENTIFIED); 1520 op->set_flag (FLAG_IDENTIFIED);
1528 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL)); 1521 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1529 if (!identified) 1522 if (!identified)
1530 CLEAR_FLAG (op, FLAG_IDENTIFIED); 1523 op->clr_flag (FLAG_IDENTIFIED);
1531 } 1524 }
1532#endif 1525#endif
1533 return; 1526 return;
1534} 1527}
1535 1528
… …
1545#define ARTIFACT_TRIES 2 1538#define ARTIFACT_TRIES 2
1546 1539
1547void 1540void
1548generate_artifact (object *op, int difficulty) 1541generate_artifact (object *op, int difficulty)
1549{ 1542{
1550 artifactlist *al;
1551 artifact *art; 1543 artifact *art;
1552 int i;
1553 1544
1554 al = find_artifactlist (op->type); 1545 artifactlist *al = find_artifactlist (op->type);
1555 1546
1556 if (al == NULL) 1547 if (al == NULL)
1557 { 1548 {
1558#if 0 /* This is too verbose, usually */ 1549#if 0 /* This is too verbose, usually */
1559 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name); 1550 LOG (llevDebug, "Couldn't change %s into artifact - no table.\n", op->name);
1560#endif 1551#endif
1561 return; 1552 return;
1562 } 1553 }
1563 1554
1564 for (i = 0; i < ARTIFACT_TRIES; i++) 1555 for (int i = 0; i < ARTIFACT_TRIES; i++)
1565 { 1556 {
1566 int roll = rndm (al->total_chance); 1557 int roll = rndm (al->total_chance);
1567 1558
1568 for (art = al->items; art; art = art->next) 1559 for (art = al->items; art; art = art->next)
1569 { 1560 {
… …
1577#if 1 1568#if 1
1578 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1569 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1579#endif 1570#endif
1580 return; 1571 return;
1581 } 1572 }
1582 if (!strcmp (art->item->name, "NONE")) 1573
1574 if (art->item->name == shstr_NONE)
1583 return; 1575 return;
1576
1584 if (FABS (op->magic) < art->item->magic) 1577 if (fabs (op->magic) < art->item->magic)
1585 continue; /* Not magic enough to be this item */ 1578 continue; /* Not magic enough to be this item */
1586 1579
1587 /* Map difficulty not high enough */ 1580 /* Map difficulty not high enough */
1588 if (difficulty < art->difficulty) 1581 if (difficulty < art->difficulty)
1589 continue; 1582 continue;
… …
1607 */ 1600 */
1608 1601
1609void 1602void
1610fix_flesh_item (object *item, object *donor) 1603fix_flesh_item (object *item, object *donor)
1611{ 1604{
1612 char tmpbuf[MAX_BUF];
1613 int i;
1614
1615 if (item->type == FLESH && donor) 1605 if (item->type == FLESH && donor)
1616 { 1606 {
1617 /* change the name */ 1607 /* change the name */
1618 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); 1608 item->name = format ("%s's %s", &donor->name, &item->name);
1619 item->name = tmpbuf;
1620 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl); 1609 item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1621 item->name_pl = tmpbuf;
1622 1610
1623 /* weight is FLESH weight/100 * donor */ 1611 /* weight is FLESH weight/100 * donor */
1624 if ((item->weight = (signed long) (((double) item->weight / (double) 100.0) * (double) donor->weight)) == 0) 1612 item->weight = max (1, item->weight * donor->weight / 100);
1625 item->weight = 1;
1626 1613
1627 /* value is multiplied by level of donor */ 1614 /* value is multiplied by level of donor */
1628 item->value *= isqrt (donor->level * 2); 1615 item->value *= isqrt (donor->level * 2);
1629 1616
1630 /* food value */ 1617 /* food value */
1631 item->stats.food += (donor->stats.hp / 100) + donor->stats.Con; 1618 item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1632 1619
1633 /* flesh items inherit some abilities of donor, but not 1620 /* flesh items inherit some abilities of donor, but not
1634 * full effect. 1621 * full effect.
1635 */ 1622 */
1636 for (i = 0; i < NROFATTACKS; i++) 1623 for (int i = 0; i < NROFATTACKS; i++)
1637 item->resist[i] = donor->resist[i] / 2; 1624 item->resist[i] = donor->resist[i] / 2;
1638 1625
1639 /* item inherits donor's level (important for quezals) */ 1626 /* item inherits donor's level (important for quezals) */
1640 item->level = donor->level; 1627 item->level = donor->level;
1641 1628
1642 /* if donor has some attacktypes, the flesh is poisonous */ 1629 /* if donor has some attacktypes, the flesh is poisonous */
1643 if (donor->attacktype & AT_POISON) 1630 if (donor->attacktype & AT_POISON)
1644 item->type = POISON; 1631 item->type = POISON;
1632
1645 if (donor->attacktype & AT_ACID) 1633 if (donor->attacktype & AT_ACID)
1646 item->stats.hp = -1 * item->stats.food; 1634 item->stats.hp = -item->stats.food;
1647 SET_FLAG (item, FLAG_NO_STEAL);
1648 }
1649}
1650 1635
1651/* special_potion() - so that old potion code is still done right. */ 1636 item->set_flag (FLAG_NO_STEAL);
1652int 1637 }
1653special_potion (object *op)
1654{
1655 if (op->attacktype)
1656 return 1;
1657
1658 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1659 return 1;
1660
1661 for (int i = 0; i < NROFATTACKS; i++)
1662 if (op->resist[i])
1663 return 1;
1664
1665 return 0;
1666} 1638}
1667 1639
1668void 1640static void
1669free_treasurestruct (treasure *t) 1641free_treasurestruct (treasure *t)
1670{ 1642{
1671 if (t->next) free_treasurestruct (t->next); 1643 if (t->next) free_treasurestruct (t->next);
1672 if (t->next_yes) free_treasurestruct (t->next_yes); 1644 if (t->next_yes) free_treasurestruct (t->next_yes);
1673 if (t->next_no) free_treasurestruct (t->next_no); 1645 if (t->next_no) free_treasurestruct (t->next_no);
1674 1646
1675 delete t; 1647 delete t;
1676} 1648}
1677 1649
1678void 1650static void
1679free_charlinks (linked_char *lc) 1651free_charlinks (linked_char *lc)
1680{ 1652{
1681 if (lc->next) 1653 if (lc->next)
1682 free_charlinks (lc->next); 1654 free_charlinks (lc->next);
1683 1655
1684 delete lc; 1656 delete lc;
1685} 1657}
1686 1658
1687void 1659static void
1688free_artifact (artifact *at) 1660free_artifact (artifact *at)
1689{ 1661{
1690 if (at->next) free_artifact (at->next); 1662 if (at->next) free_artifact (at->next);
1691 if (at->allowed) free_charlinks (at->allowed); 1663 if (at->allowed) free_charlinks (at->allowed);
1692 1664
1693 at->item->destroy (1); 1665 at->item->destroy ();
1694 1666
1695 sfree (at); 1667 sfree (at);
1696} 1668}
1697 1669
1698void
1699free_artifactlist (artifactlist *al)
1700{
1701 artifactlist *nextal;
1702
1703 for (al = first_artifactlist; al; al = nextal)
1704 {
1705 nextal = al->next;
1706
1707 if (al->items)
1708 free_artifact (al->items);
1709
1710 sfree (al);
1711 }
1712}
1713
1714void
1715free_all_treasures (void)
1716{
1717 treasurelist *tl, *next;
1718
1719 for (tl = first_treasurelist; tl; tl = next)
1720 {
1721 clear (tl);
1722
1723 next = tl->next;
1724 delete tl;
1725 }
1726
1727 free_artifactlist (first_artifactlist);
1728}

Diff Legend

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