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.69 by root, Tue Jan 22 15:53:01 2008 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your 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 GNU General Public License 19 * 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/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * 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>
22 */ 24 */
23 25
24/* TREASURE_DEBUG does some checking on the treasurelists after loading. 26/* TREASURE_DEBUG does some checking on the treasurelists after loading.
25 * 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
32 34
33//#define TREASURE_VERBOSE 35//#define TREASURE_VERBOSE
34 36
35#include <global.h> 37#include <global.h>
36#include <treasure.h> 38#include <treasure.h>
37#include <funcpoint.h> 39
38#include <loader.h> 40#include <flat_hash_map.hpp>
41
42// used only by treasure.C, does not handle null arch ptrs
43#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)
39 44
40extern char *spell_mapping[]; 45extern char *spell_mapping[];
41 46
42static treasurelist *first_treasurelist; 47static treasurelist *first_treasurelist;
43 48
44static void change_treasure (treasure *t, object *op); /* overrule default values */ 49static void change_treasure (treasure *t, object *op); /* overrule default values */
45 50
46typedef std::tr1::unordered_map< 51typedef ska::flat_hash_map
52 <
47 const char *, 53 const char *,
48 treasurelist *, 54 treasurelist *,
49 str_hash, 55 str_hash,
50 str_equal, 56 str_equal,
51 slice_allocator< std::pair<const char *const, treasurelist *> >, 57 slice_allocator< std::pair<const char *const, treasurelist *> >
52 true
53> tl_map_t; 58 > tl_map_t;
54 59
55static tl_map_t tl_map; 60static tl_map_t tl_map;
61
62//TODO: class method
63static void free_treasurestruct (treasure *t); // bleh desu
64static void
65clear (treasurelist *tl)
66{
67 if (tl->items)
68 {
69 free_treasurestruct (tl->items);
70 tl->items = 0;
71 }
72
73 tl->total_chance = 0;
74}
56 75
57/* 76/*
58 * Searches for the given treasurelist 77 * Searches for the given treasurelist
59 */ 78 */
60treasurelist * 79treasurelist *
61treasurelist::find (const char *name) 80treasurelist::find (const char *name)
62{ 81{
63 if (!name) 82 if (!name)
64 return 0; 83 return 0;
65 84
66 auto (i, tl_map.find (name)); 85 auto i = tl_map.find (name);
67 86
68 if (i == tl_map.end ()) 87 if (i == tl_map.end ())
69 return 0; 88 return 0;
70 89
71 return i->second; 90 return i->second;
92 } 111 }
93 112
94 return tl; 113 return tl;
95} 114}
96 115
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 116#ifdef TREASURE_DEBUG
111/* recursived checks the linked list. Treasurelist is passed only 117/* recursived checks the linked list. Treasurelist is passed only
112 * so that the treasure name can be printed out 118 * so that the treasure name can be printed out
113 */ 119 */
114static void 120static void
139 145
140 f.next (); 146 f.next ();
141 147
142 for (;;) 148 for (;;)
143 { 149 {
144 coroapi::cede_to_tick_every (10); 150 coroapi::cede_to_tick ();
145 151
146 switch (f.kw) 152 switch (f.kw)
147 { 153 {
148 case KW_arch: 154 case KW_arch:
149 t->item = archetype::get (f.get_str ()); 155 t->item = archetype::find (f.get_str ());
156
157 if (!t->item)
158 {
159 f.parse_warn ("treasure references unknown archetype");
160 t->item = archetype::empty;
161 }
162
150 break; 163 break;
151 164
152 case KW_list: f.get (t->name); break; 165 case KW_list: f.get (t->name); break;
153 case KW_change_name: f.get (t->change_arch.name); break; 166 case KW_change_name: f.get (t->change_arch.name); break;
154 case KW_change_title: f.get (t->change_arch.title); break; 167 case KW_change_title: f.get (t->change_arch.title); break;
168 t->next = read_treasure (f); 181 t->next = read_treasure (f);
169 return t; 182 return t;
170 183
171 default: 184 default:
172 if (!f.parse_error ("treasurelist", t->name)) 185 if (!f.parse_error ("treasurelist", t->name))
173 return 0; 186 goto error;
174 187
175 return t; 188 return t;
176 } 189 }
177 190
178 f.next (); 191 f.next ();
179 } 192 }
193
194 // not reached
195
196error:
197 delete t;
198 return 0;
180} 199}
181 200
182/* 201/*
183 * Each treasure is parsed with the help of load_treasure(). 202 * Each treasure is parsed with the help of load_treasure().
184 */ 203 */
243 return; 262 return;
244 } 263 }
245 264
246 op->expand_tail (); 265 op->expand_tail ();
247 266
267 if (!creator->is_on_map ()
248 if (op->blocked (creator->map, creator->x, creator->y)) 268 || (op->weight && op->blocked (creator->map, creator->x, creator->y)))
249 op->destroy (); 269 op->destroy ();
250 else 270 else
251 { 271 {
252 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 272 op->flag [FLAG_OBJ_ORIGINAL] = true;
253 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 273 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
254 } 274 }
255 } 275 }
256 else 276 else
257 { 277 {
258 op = creator->insert (op); 278 op = creator->insert (op);
259 279
260 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 280 if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
261 monster_check_apply (creator, op); 281 monster_check_apply (creator, op);
262
263 if (flags & GT_UPDATE_INV)
264 if (object *tmp = creator->in_player ())
265 esrv_send_item (tmp, op);
266 } 282 }
267} 283}
268 284
269/* if there are change_xxx commands in the treasure, we include the changes 285/* if there are change_xxx commands in the treasure, we include the changes
270 * in the generated object 286 * in the generated object
301 } 317 }
302 else 318 else
303 { 319 {
304 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE))) 320 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
305 { 321 {
306 object *tmp = arch_to_object (t->item); 322 object *tmp = t->item->instance ();
307 323
308 if (t->nrof && tmp->nrof <= 1) 324 if (t->nrof && tmp->nrof <= 1)
309 tmp->nrof = rndm (t->nrof) + 1; 325 tmp->nrof = rndm (t->nrof) + 1;
310 326
311 fix_generated_item (tmp, op, difficulty, t->magic, flag); 327 fix_generated_item (tmp, op, difficulty, t->magic, flag);
358 else if (t->nrof) 374 else if (t->nrof)
359 create_one_treasure (tl, op, flag, difficulty, tries); 375 create_one_treasure (tl, op, flag, difficulty, tries);
360 } 376 }
361 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE)) 377 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
362 { 378 {
363 if (object *tmp = arch_to_object (t->item)) 379 if (object *tmp = t->item->instance ())
364 { 380 {
365 if (t->nrof && tmp->nrof <= 1) 381 if (t->nrof && tmp->nrof <= 1)
366 tmp->nrof = rndm (t->nrof) + 1; 382 tmp->nrof = rndm (t->nrof) + 1;
367 383
368 fix_generated_item (tmp, op, difficulty, t->magic, flag); 384 fix_generated_item (tmp, op, difficulty, t->magic, flag);
434 450
435 if (ob->inv) 451 if (ob->inv)
436 LOG (llevError, "In generate treasure, created multiple objects.\n"); 452 LOG (llevError, "In generate treasure, created multiple objects.\n");
437 453
438 ob->destroy (); 454 ob->destroy ();
455
439 return tmp; 456 return tmp;
440} 457}
441 458
442/* 459/*
443 * This is a new way of calculating the chance for an item to have 460 * This is a new way of calculating the chance for an item to have
480 { 0, 0, 0, 3, 97}, // 29 497 { 0, 0, 0, 3, 97}, // 29
481 { 0, 0, 0, 0, 100}, // 30 498 { 0, 0, 0, 0, 100}, // 30
482 { 0, 0, 0, 0, 100}, // 31 499 { 0, 0, 0, 0, 100}, // 31
483}; 500};
484 501
485/* calculate the appropriate level for wands staves and scrolls. 502/* calculate the appropriate level for wands staves and scrolls.
486 * 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)
487 * 504 *
488 * elmex Wed Aug 9 17:44:59 CEST 2006: 505 * elmex Wed Aug 9 17:44:59 CEST 2006:
489 * 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.
490 */ 507 */
491int 508static int
492level_for_item (const object *op, int difficulty) 509level_for_item (const object *op, int difficulty)
493{ 510{
494 if (!op->inv) 511 if (!op->inv)
495 { 512 {
496 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 513 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
500 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.)); 517 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
501 518
502 if (olevel <= 0) 519 if (olevel <= 0)
503 olevel = rndm (1, op->inv->level); 520 olevel = rndm (1, op->inv->level);
504 521
505 return min (olevel, MAXLEVEL); 522 return min (olevel, MAXLEVEL_TREASURE);
506} 523}
507 524
508/* 525/*
509 * Based upon the specified difficulty and upon the difftomagic_list array, 526 * Based upon the specified difficulty and upon the difftomagic_list array,
510 * a random magical bonus is returned. This is used when determine 527 * a random magical bonus is returned. This is used when determine
513 * elmex Thu Aug 10 18:45:44 CEST 2006: 530 * elmex Thu Aug 10 18:45:44 CEST 2006:
514 * Scaling difficulty by max_level, as difficulty is a level and not some 531 * Scaling difficulty by max_level, as difficulty is a level and not some
515 * weird integer between 1-31. 532 * weird integer between 1-31.
516 * 533 *
517 */ 534 */
518int 535static int
519magic_from_difficulty (int difficulty) 536magic_from_difficulty (int difficulty)
520{ 537{
521 int percent = 0, magic = 0;
522 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);
523 540
524 scaled_diff--;
525
526 if (scaled_diff < 0)
527 scaled_diff = 0;
528
529 if (scaled_diff >= DIFFLEVELS)
530 scaled_diff = DIFFLEVELS - 1;
531
532 percent = rndm (100); 541 int percent = rndm (100);
542 int magic;
533 543
534 for (magic = 0; magic < (MAXMAGIC + 1); magic++) 544 for (magic = 0; magic <= MAXMAGIC; magic++)
535 { 545 {
536 percent -= difftomagic_list[scaled_diff][magic]; 546 percent -= difftomagic_list[scaled_diff][magic];
537 547
538 if (percent < 0) 548 if (percent < 0)
539 break; 549 break;
540 } 550 }
541 551
542 if (magic == (MAXMAGIC + 1)) 552 if (magic > MAXMAGIC)
543 { 553 {
544 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);
545 magic = 0; 555 magic = 0;
546 } 556 }
547 557
555 * Sets magical bonus in an object, and recalculates the effect on 565 * Sets magical bonus in an object, and recalculates the effect on
556 * the armour variable, and the effect on speed of armour. 566 * the armour variable, and the effect on speed of armour.
557 * This function doesn't work properly, should add use of archetypes 567 * This function doesn't work properly, should add use of archetypes
558 * to make it truly absolute. 568 * to make it truly absolute.
559 */ 569 */
560
561void 570void
562set_abs_magic (object *op, int magic) 571set_abs_magic (object *op, int magic)
563{ 572{
564 if (!magic) 573 if (!magic)
565 return; 574 return;
570 if (op->type == ARMOUR) 579 if (op->type == ARMOUR)
571 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100; 580 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
572 581
573 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 582 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
574 magic = (-magic); 583 magic = (-magic);
584
575 op->weight = (op->arch->weight * (100 - magic * 10)) / 100; 585 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
576 } 586 }
577 else 587 else
578 { 588 {
579 if (op->type == ARMOUR) 589 if (op->type == ARMOUR)
580 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 590 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
591
581 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 592 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
582 magic = (-magic); 593 magic = (-magic);
594
583 op->weight = (op->weight * (100 - magic * 10)) / 100; 595 op->weight = (op->weight * (100 - magic * 10)) / 100;
584 } 596 }
585} 597}
586 598
587/* 599/*
590 */ 602 */
591 603
592static void 604static void
593set_magic (int difficulty, object *op, int max_magic, int flags) 605set_magic (int difficulty, object *op, int max_magic, int flags)
594{ 606{
595 int i;
596
597 i = magic_from_difficulty (difficulty); 607 int i = magic_from_difficulty (difficulty);
608
598 if ((flags & GT_ONLY_GOOD) && i < 0) 609 if ((flags & GT_ONLY_GOOD) && i < 0)
599 i = -i; 610 i = -i;
611
600 if (i > max_magic) 612 i = min (i, max_magic);
601 i = max_magic; 613
602 set_abs_magic (op, i); 614 set_abs_magic (op, i);
603 if (i < 0) 615 if (i < 0)
604 SET_FLAG (op, FLAG_CURSED); 616 op->set_flag (FLAG_CURSED);
605} 617}
606 618
607/* 619/*
608 * Randomly adds one magical ability to the given object. 620 * Randomly adds one magical ability to the given object.
609 * Modified for Partial Resistance in many ways: 621 * Modified for Partial Resistance in many ways:
610 * 1) Since rings can have multiple bonuses, if the same bonus 622 * 1) Since rings can have multiple bonuses, if the same bonus
611 * is rolled again, increase it - the bonuses now stack with 623 * is rolled again, increase it - the bonuses now stack with
612 * other bonuses previously rolled and ones the item might natively have. 624 * other bonuses previously rolled and ones the item might natively have.
613 * 2) Add code to deal with new PR method. 625 * 2) Add code to deal with new PR method.
614 */ 626 */
615void 627static void
616set_ring_bonus (object *op, int bonus) 628set_ring_bonus (object *op, int bonus)
617{ 629{
618
619 int r = rndm (bonus > 0 ? 25 : 11); 630 int r = rndm (bonus > 0 ? 25 : 11);
620 631
621 if (op->type == AMULET) 632 if (op->type == AMULET)
622 {
623 if (!(rndm (21))) 633 if (!rndm (21))
624 r = 20 + rndm (2); 634 r = 20 + rndm (2);
635 else if (rndm (2))
636 r = 10;
625 else 637 else
626 {
627 if (rndm (2))
628 r = 10;
629 else
630 r = 11 + rndm (9); 638 r = 11 + rndm (9);
631 }
632 }
633 639
634 switch (r) 640 switch (r)
635 { 641 {
636 /* 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,
637 * bonuses and penalties will stack and add to existing values. 643 * bonuses and penalties will stack and add to existing values.
638 * of the item. 644 * of the item.
639 */ 645 */
640 case 0: 646 case 0:
641 case 1: 647 case 1:
642 case 2: 648 case 2:
643 case 3: 649 case 3:
644 case 4: 650 case 4:
684 * 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
685 * even values. 691 * even values.
686 */ 692 */
687 if (bonus < 0) 693 if (bonus < 0)
688 val = 2 * -val - rndm (b); 694 val = 2 * -val - rndm (b);
689 if (val > 35) 695
690 val = 35; /* Upper limit */ 696 val = min (35, val); /* Upper limit */
697
691 b = 0; 698 b = 0;
692 699
693 while (op->resist[resist_table[resist]] != 0 && b < 4) 700 while (op->resist[resist_table[resist]] != 0 && b < 4)
694 resist = rndm (num_resist_table); 701 resist = rndm (num_resist_table);
695 702
703 break; 710 break;
704 } 711 }
705 case 20: 712 case 20:
706 if (op->type == AMULET) 713 if (op->type == AMULET)
707 { 714 {
708 SET_FLAG (op, FLAG_REFL_SPELL); 715 op->set_flag (FLAG_REFL_SPELL);
709 op->value *= 11; 716 op->value *= 11;
710 } 717 }
711 else 718 else
712 { 719 {
713 op->stats.hp = 1; /* regenerate hit points */ 720 op->stats.hp = 1; /* regenerate hit points */
716 break; 723 break;
717 724
718 case 21: 725 case 21:
719 if (op->type == AMULET) 726 if (op->type == AMULET)
720 { 727 {
721 SET_FLAG (op, FLAG_REFL_MISSILE); 728 op->set_flag (FLAG_REFL_MISSILE);
722 op->value *= 9; 729 op->value *= 9;
723 } 730 }
724 else 731 else
725 { 732 {
726 op->stats.sp = 1; /* regenerate spell points */ 733 op->stats.sp = 1; /* regenerate spell points */
728 } 735 }
729 break; 736 break;
730 737
731 case 22: 738 case 22:
732 op->stats.exp += bonus; /* Speed! */ 739 op->stats.exp += bonus; /* Speed! */
733 op->value = (op->value * 2) / 3; 740 op->value = op->value * 2 / 3;
734 break; 741 break;
735 } 742 }
736 743
737 if (bonus > 0) 744 if (bonus > 0)
738 op->value *= 2 * bonus; 745 op->value = 2 * op->value * bonus;
739 else 746 else
740 op->value = -(op->value * 2 * bonus) / 3; 747 op->value = -2 * op->value * bonus / 3;
741} 748}
742 749
743/* 750/*
744 * 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.
745 * 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
746 * higher is the chance of returning a low number. 753 * higher is the chance of returning a low number.
747 * It is only used in fix_generated_treasure() to set bonuses on 754 * It is only used in fix_generated_treasure() to set bonuses on
748 * rings and amulets. 755 * rings and amulets.
749 * 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.
750 */ 757 */
751int 758static int
752get_magic (int diff) 759get_magic (int diff)
753{ 760{
754 int i; 761 diff = min (3, diff);
755 762
756 if (diff < 3)
757 diff = 3;
758
759 for (i = 0; i < 4; i++) 763 for (int i = 0; i < 4; i++)
760 if (rndm (diff)) 764 if (rndm (diff))
761 return i; 765 return i;
762 766
763 return 4; 767 return 4;
764} 768}
765 769
770/* special_potion() - so that old potion code is still done right. */
771static int
772special_potion (object *op)
773{
774 if (op->attacktype)
775 return 1;
776
777 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
778 return 1;
779
780 for (int i = 0; i < NROFATTACKS; i++)
781 if (op->resist[i])
782 return 1;
783
784 return 0;
785}
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
766#define DICE2 (get_magic(2)==2?2:1) 810#define DICE2 (get_magic(2) == 2 ? 2 : 1)
767#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))
768 812
769/* 813/*
770 * 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
771 * 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
772 * into scrolls/books/wands, makes it unidentified, hides the value, etc. 816 * into scrolls/books/wands, makes it unidentified, hides the value, etc.
773 */ 817 */
774 818
775/* 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
776 * 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
777 * 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
778 * way to do this? b.t. */ 822 * way to do this? b.t. */
779 823
780/* 824/*
781 * ! (flags & GT_ENVIRONMENT): 825 * ! (flags & GT_ENVIRONMENT):
782 * Automatically calls fix_flesh_item(). 826 * Automatically calls fix_flesh_item().
805 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0); 849 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
806 /* So the treasure doesn't get created again */ 850 /* So the treasure doesn't get created again */
807 op->randomitems = 0; 851 op->randomitems = 0;
808 } 852 }
809 853
810 if (difficulty < 1) 854 max_it (difficulty, 1);
811 difficulty = 1;
812 855
813 if (INVOKE_OBJECT (ADD_BONUS, op, 856 if (INVOKE_OBJECT (ADD_BONUS, op,
814 ARG_OBJECT (creator != op ? creator : 0), 857 ARG_OBJECT (creator != op ? creator : 0),
815 ARG_INT (difficulty), ARG_INT (max_magic), 858 ARG_INT (difficulty), ARG_INT (max_magic),
816 ARG_INT (flags))) 859 ARG_INT (flags)))
817 return; 860 return;
818 861
819 if (!(flags & GT_MINIMAL)) 862 if (!(flags & GT_MINIMAL))
820 { 863 {
821 if (op->arch == crown_arch) 864 if (IS_ARCH (op->arch, crown))
822 { 865 {
823 set_magic (difficulty, op, max_magic, flags); 866 set_magic (difficulty, op, max_magic, flags);
824 num_enchantments = calc_item_power (op, 1); 867 num_enchantments = calc_item_power (op, 1);
825 generate_artifact (op, difficulty); 868 generate_artifact (op, difficulty);
826 } 869 }
831 874
832 num_enchantments = calc_item_power (op, 1); 875 num_enchantments = calc_item_power (op, 1);
833 876
834 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 877 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
835 || op->type == HORN 878 || op->type == HORN
836 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 879 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
837 * used for shop_floors or treasures */
838 generate_artifact (op, difficulty); 880 generate_artifact (op, difficulty);
839 } 881 }
840 882
841 /* Object was made an artifact. Calculate its item_power rating. 883 /* Object was made an artifact. Calculate its item_power rating.
842 * the item_power in the object is what the artfiact adds. 884 * the item_power in the object is what the artfiact adds.
876 * again below */ 918 * again below */
877 } 919 }
878 } 920 }
879 921
880 /* materialtype modifications. Note we allow this on artifacts. */ 922 /* materialtype modifications. Note we allow this on artifacts. */
881 set_materialname (op, difficulty, NULL); 923 select_material (op, difficulty);
882 924
883 if (flags & GT_MINIMAL) 925 if (flags & GT_MINIMAL)
884 { 926 {
885 if (op->type == POTION) 927 if (op->type == POTION)
886 /* Handle healing and magic power potions */ 928 /* Handle healing and magic power potions */
887 if (op->stats.sp && !op->randomitems) 929 if (op->stats.sp && !op->randomitems)
888 { 930 {
889 object *tmp;
890
891 tmp = get_archetype (spell_mapping[op->stats.sp]); 931 object *tmp = archetype::get (spell_mapping [op->stats.sp]);
892 insert_ob_in_ob (tmp, op); 932 insert_ob_in_ob (tmp, op);
893 op->stats.sp = 0; 933 op->stats.sp = 0;
894 } 934 }
895 } 935 }
896 else if (!op->title) /* Only modify object if not special */ 936 else if (!op->title) /* Only modify object if not special */
899 case WEAPON: 939 case WEAPON:
900 case ARMOUR: 940 case ARMOUR:
901 case SHIELD: 941 case SHIELD:
902 case HELMET: 942 case HELMET:
903 case CLOAK: 943 case CLOAK:
904 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) 944 if (op->flag [FLAG_CURSED] && !(rndm (4)))
905 set_ring_bonus (op, -DICE2); 945 set_ring_bonus (op, -DICE2);
906 break; 946 break;
907 947
908 case BRACERS: 948 case BRACERS:
909 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)) 949 if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
910 { 950 {
911 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 951 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
912 if (!QUERY_FLAG (op, FLAG_CURSED)) 952 if (!op->flag [FLAG_CURSED])
913 op->value *= 3; 953 op->value *= 3;
914 } 954 }
915 break; 955 break;
916 956
917 case POTION: 957 case POTION:
918 { 958 {
919 int too_many_tries = 0, is_special = 0; 959 int too_many_tries = 0;
920 960
921 /* Handle healing and magic power potions */ 961 /* Handle healing and magic power potions */
922 if (op->stats.sp && !op->randomitems) 962 if (op->stats.sp && !op->randomitems)
923 { 963 {
924 object *tmp;
925
926 tmp = get_archetype (spell_mapping[op->stats.sp]); 964 object *tmp = archetype::get (spell_mapping[op->stats.sp]);
927 insert_ob_in_ob (tmp, op); 965 insert_ob_in_ob (tmp, op);
928 op->stats.sp = 0; 966 op->stats.sp = 0;
929 } 967 }
930 968
931 while (!(is_special = special_potion (op)) && !op->inv) 969 while (!special_potion (op) && !op->inv)
932 { 970 {
933 generate_artifact (op, difficulty); 971 generate_artifact (op, difficulty);
934 if (too_many_tries++ > 10) 972 if (too_many_tries++ > 10)
935 break; 973 break;
936 } 974 }
939 * since the value set on those is already correct. 977 * since the value set on those is already correct.
940 */ 978 */
941 if (op->inv && op->randomitems) 979 if (op->inv && op->randomitems)
942 { 980 {
943 /* value multiplier is same as for scrolls */ 981 /* value multiplier is same as for scrolls */
944 op->value = (op->value * op->inv->value); 982 op->value *= op->inv->value;
945 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); 983 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
946 } 984 }
947 else 985 else
948 { 986 {
949 op->name = "potion"; 987 op->name = shstr_potion;
950 op->name_pl = "potions"; 988 op->name_pl = shstr_potions;
951 } 989 }
952 990
953 if (!(flags & GT_ONLY_GOOD) && rndm (2)) 991 if (!(flags & GT_ONLY_GOOD) && rndm (2))
954 SET_FLAG (op, FLAG_CURSED); 992 op->set_flag (FLAG_CURSED);
993
955 break; 994 break;
956 } 995 }
957 996
958 case AMULET: 997 case AMULET:
959 if (op->arch == amulet_arch) 998 if (IS_ARCH (op->arch, amulet))
960 op->value *= 5; /* Since it's not just decoration */ 999 op->value *= 5; /* Since it's not just decoration */
961 1000
962 case RING: 1001 case RING:
963 if (op->arch == NULL)
964 {
965 op->destroy ();
966 op = 0;
967 break;
968 }
969
970 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 1002 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
971 break; 1003 break;
972 1004
973 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 1005 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
974 SET_FLAG (op, FLAG_CURSED); 1006 op->set_flag (FLAG_CURSED);
975 1007
976 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 1008 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
977 1009
978 if (op->type != RING) /* Amulets have only one ability */ 1010 if (op->type != RING) /* Amulets have only one ability */
979 break; 1011 break;
980 1012
981 if (!(rndm (4))) 1013 if (!rndm (4))
982 { 1014 {
983 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1015 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
984 1016
985 if (d > 0) 1017 if (d > 0)
986 op->value *= 3; 1018 op->value *= 3;
987 1019
988 set_ring_bonus (op, d); 1020 set_ring_bonus (op, d);
989 1021
990 if (!(rndm (4))) 1022 if (!rndm (4))
991 { 1023 {
992 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1024 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
993 1025
994 if (d > 0) 1026 if (d > 0)
995 op->value *= 5; 1027 op->value *= 5;
1028
996 set_ring_bonus (op, d); 1029 set_ring_bonus (op, d);
997 } 1030 }
998 } 1031 }
999 1032
1000 if (GET_ANIM_ID (op)) 1033 if (op->animation_id)
1001 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); 1034 op->set_anim_frame (rndm (op->anim_frames ()));
1002 1035
1003 break; 1036 break;
1004 1037
1005 case BOOK: 1038 case BOOK:
1006 /* Is it an empty book?, if yes lets make a special· 1039 /* Is it an empty book?, if yes lets make a special·
1008 * creator and/or map level we found it on. 1041 * creator and/or map level we found it on.
1009 */ 1042 */
1010 if (!op->msg && rndm (10)) 1043 if (!op->msg && rndm (10))
1011 { 1044 {
1012 /* set the book level properly */ 1045 /* set the book level properly */
1013 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1046 if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1014 { 1047 {
1015 if (op->map && op->map->difficulty) 1048 if (op->map && op->map->difficulty)
1016 op->level = rndm (op->map->difficulty) + rndm (10) + 1; 1049 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1017 else 1050 else
1018 op->level = rndm (20) + 1; 1051 op->level = rndm (20) + 1;
1021 op->level = rndm (creator->level); 1054 op->level = rndm (creator->level);
1022 1055
1023 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1056 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1024 /* books w/ info are worth more! */ 1057 /* books w/ info are worth more! */
1025 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1058 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1026 /* creator related stuff */
1027
1028 /* for library, chained books. Note that some monsters have no_pick
1029 * set - we don't want to set no pick in that case.
1030 */
1031 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1032 SET_FLAG (op, FLAG_NO_PICK);
1033 if (creator->slaying && !op->slaying) /* for check_inv floors */
1034 op->slaying = creator->slaying;
1035 1059
1036 /* add exp so reading it gives xp (once) */ 1060 /* add exp so reading it gives xp (once) */
1037 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1061 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1038 } 1062 }
1063
1064 /* creator related stuff */
1065
1066 /* for library, chained books. Note that some monsters have no_pick
1067 * set - we don't want to set no pick in that case.
1068 */
1069 if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1070 op->set_flag (FLAG_NO_PICK);
1071 if (creator->slaying && !op->slaying) /* for check_inv floors */
1072 op->slaying = creator->slaying;
1039 break; 1073 break;
1040 1074
1041 case SPELLBOOK: 1075 case SPELLBOOK:
1042 op->value = op->value * op->inv->value; 1076 op->value *= value_factor_from_spell_item (op->inv, 0);
1077
1043 /* add exp so learning gives xp */ 1078 /* add exp so learning gives xp */
1044 op->level = op->inv->level; 1079 op->level = op->inv->level;
1045 op->stats.exp = op->value; 1080 op->stats.exp = op->value;
1046 break; 1081 break;
1047 1082
1051 * and reset nrof. 1086 * and reset nrof.
1052 */ 1087 */
1053 op->stats.food = op->inv->nrof; 1088 op->stats.food = op->inv->nrof;
1054 op->nrof = 1; 1089 op->nrof = 1;
1055 /* If the spell changes by level, choose a random level 1090 /* If the spell changes by level, choose a random level
1056 * for it, and adjust price. If the spell doesn't 1091 * for it.
1057 * change by level, just set the wand to the level of
1058 * the spell, and value calculation is simpler.
1059 */ 1092 */
1060 if (op->inv->duration_modifier || op->inv->dam_modifier || op->inv->range_modifier) 1093 if (op->inv->duration_modifier
1061 { 1094 || op->inv->dam_modifier
1095 || op->inv->range_modifier)
1062 op->level = level_for_item (op, difficulty); 1096 op->level = level_for_item (op, difficulty);
1063 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1064 }
1065 else 1097 else
1066 {
1067 op->level = op->inv->level; 1098 op->level = op->inv->level;
1068 op->value = op->value * op->inv->value; 1099
1069 } 1100 op->value *= value_factor_from_spell_item (op->inv, op);
1070 break; 1101 break;
1071 1102
1072 case ROD: 1103 case ROD:
1073 op->level = level_for_item (op, difficulty); 1104 op->level = level_for_item (op, difficulty);
1074 /* Add 50 to both level an divisor to keep prices a little more 1105 op->value *= value_factor_from_spell_item (op->inv, op);
1075 * reasonable. Otherwise, a high level version of a low level 1106
1076 * spell can be worth tons a money (eg, level 20 rod, level 2 spell =
1077 * 10 time multiplier). This way, the value are a bit more reasonable.
1078 */
1079 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1080 /* 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 */
1081 if (op->stats.maxhp) 1108 if (op->stats.maxhp)
1082 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);
1083 else 1110 else
1084 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);
1085 1112
1086 op->stats.hp = op->stats.maxhp; 1113 op->stats.hp = op->stats.maxhp;
1087 break; 1114 break;
1088 1115
1089 case SCROLL: 1116 case SCROLL:
1090 op->level = level_for_item (op, difficulty); 1117 op->level = level_for_item (op, difficulty);
1091 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);
1092 1119
1093 /* add exp so reading them properly gives xp */ 1120 /* add exp so reading them properly gives xp */
1094 op->stats.exp = op->value / 5; 1121 op->stats.exp = op->value / 5;
1095 op->nrof = op->inv->nrof; 1122 op->nrof = op->inv->nrof;
1096 break; 1123 break;
1104 break; 1131 break;
1105 } /* switch type */ 1132 } /* switch type */
1106 1133
1107 if (flags & GT_STARTEQUIP) 1134 if (flags & GT_STARTEQUIP)
1108 { 1135 {
1109 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN)) 1136 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1110 SET_FLAG (op, FLAG_STARTEQUIP); 1137 op->set_flag (FLAG_STARTEQUIP);
1111 else if (op->type != MONEY) 1138 else if (op->type != MONEY)
1112 op->value = 0; 1139 op->value = 0;
1113 } 1140 }
1114 1141
1115 if (!(flags & GT_ENVIRONMENT)) 1142 if (!(flags & GT_ENVIRONMENT))
1126 1153
1127/* 1154/*
1128 * Allocate and return the pointer to an empty artifactlist structure. 1155 * Allocate and return the pointer to an empty artifactlist structure.
1129 */ 1156 */
1130static artifactlist * 1157static artifactlist *
1131get_empty_artifactlist (void) 1158get_empty_artifactlist ()
1132{ 1159{
1133 return salloc0<artifactlist> (); 1160 return salloc0<artifactlist> ();
1134} 1161}
1135 1162
1136/* 1163/*
1137 * Allocate and return the pointer to an empty artifact structure. 1164 * Allocate and return the pointer to an empty artifact structure.
1138 */ 1165 */
1139static artifact * 1166static artifact *
1140get_empty_artifact (void) 1167get_empty_artifact ()
1141{ 1168{
1142 return salloc0<artifact> (); 1169 return salloc0<artifact> ();
1143} 1170}
1144 1171
1145/* 1172/*
1155 1182
1156 return 0; 1183 return 0;
1157} 1184}
1158 1185
1159/* 1186/*
1160 * For debugging purposes. Dumps all tables. 1187 * Builds up the lists of artifacts from the file in the libdir.
1161 */ 1188 */
1162void 1189void
1163dump_artifacts (void)
1164{
1165 artifactlist *al;
1166 artifact *art;
1167 linked_char *next;
1168
1169 fprintf (logfile, "\n");
1170 for (al = first_artifactlist; al != NULL; al = al->next)
1171 {
1172 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1173 for (art = al->items; art != NULL; art = art->next)
1174 {
1175 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1176 if (art->allowed != NULL)
1177 {
1178 fprintf (logfile, "\tallowed combinations:");
1179 for (next = art->allowed; next != NULL; next = next->next)
1180 fprintf (logfile, "%s,", &next->name);
1181 fprintf (logfile, "\n");
1182 }
1183 }
1184 }
1185 fprintf (logfile, "\n");
1186}
1187
1188/*
1189 * For debugging purposes. Dumps all treasures recursively (see below).
1190 */
1191void
1192dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1193{
1194 treasurelist *tl;
1195 int i;
1196
1197 if (depth > 100)
1198 return;
1199
1200 while (t)
1201 {
1202 if (t->name)
1203 {
1204 for (i = 0; i < depth; i++)
1205 fprintf (logfile, " ");
1206
1207 fprintf (logfile, "{ (list: %s)\n", &t->name);
1208
1209 tl = treasurelist::find (t->name);
1210 if (tl)
1211 dump_monster_treasure_rec (name, tl->items, depth + 2);
1212
1213 for (i = 0; i < depth; i++)
1214 fprintf (logfile, " ");
1215
1216 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1217 }
1218 else
1219 {
1220 for (i = 0; i < depth; i++)
1221 fprintf (logfile, " ");
1222
1223 if (t->item && t->item->type == FLESH)
1224 fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1225 else
1226 fprintf (logfile, "%s\n", &t->item->object::name);
1227 }
1228
1229 if (t->next_yes)
1230 {
1231 for (i = 0; i < depth; i++)
1232 fprintf (logfile, " ");
1233
1234 fprintf (logfile, " (if yes)\n");
1235 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1236 }
1237
1238 if (t->next_no)
1239 {
1240 for (i = 0; i < depth; i++)
1241 fprintf (logfile, " ");
1242
1243 fprintf (logfile, " (if no)\n");
1244 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1245 }
1246
1247 t = t->next;
1248 }
1249}
1250
1251/*
1252 * For debugging purposes. Dumps all treasures for a given monster.
1253 * Created originally by Raphael Quinet for debugging the alchemy code.
1254 */
1255void
1256dump_monster_treasure (const char *name)
1257{
1258 archetype *at;
1259 int found;
1260
1261 found = 0;
1262 fprintf (logfile, "\n");
1263
1264 for_all_archetypes (at)
1265 if (!strcasecmp (at->object::name, name) && at->title == NULL)
1266 {
1267 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
1268 if (at->randomitems != NULL)
1269 dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1270 else
1271 fprintf (logfile, "(nothing)\n");
1272
1273 fprintf (logfile, "\n");
1274 found++;
1275 }
1276
1277 if (found == 0)
1278 fprintf (logfile, "No objects have the name %s!\n\n", name);
1279}
1280
1281/*
1282 * Builds up the lists of artifacts from the file in the libdir.
1283 */
1284void
1285init_artifacts (void) 1190init_artifacts ()
1286{ 1191{
1287 static int has_been_inited = 0; 1192 static int has_been_inited = 0;
1288 char filename[MAX_BUF];
1289 artifact *art = NULL; 1193 artifact *art = NULL;
1290 artifactlist *al; 1194 artifactlist *al;
1291 1195
1292 if (has_been_inited) 1196 if (has_been_inited)
1293 return; 1197 return;
1294 else 1198 else
1295 has_been_inited = 1; 1199 has_been_inited = 1;
1296 1200
1297 sprintf (filename, "%s/artifacts", settings.datadir); 1201 object_thawer f (settings.datadir, "artifacts");
1298 object_thawer f (filename);
1299 1202
1300 if (!f) 1203 if (!f)
1301 return; 1204 return;
1302 1205
1303 for (;;) 1206 for (;;)
1310 1213
1311 { 1214 {
1312 if (!strcmp (f.get_str (), "all")) 1215 if (!strcmp (f.get_str (), "all"))
1313 break; 1216 break;
1314 1217
1315 char *next, *cp = f.get_str (); 1218 const char *cp = f.get_str ();
1316 1219 char *next;
1317 do 1220 do
1318 { 1221 {
1319 if ((next = strchr (cp, ','))) 1222 if ((next = (char *)strchr (cp, ',')))
1320 *next++ = '\0'; 1223 *next++ = '\0';
1321 1224
1322 linked_char *tmp = new linked_char; 1225 linked_char *tmp = new linked_char;
1323 1226
1324 tmp->name = cp; 1227 tmp->name = cp;
1388 } 1291 }
1389#if 0 1292#if 0
1390 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);
1391#endif 1294#endif
1392 } 1295 }
1393
1394 LOG (llevDebug, "done.\n");
1395} 1296}
1396 1297
1397/* 1298/*
1398 * Used in artifact generation. The bonuses of the first object 1299 * Used in artifact generation. The bonuses of the first object
1399 * is modified by the bonuses of the second object. 1300 * is modified by the bonuses of the second object.
1400 */ 1301 */
1401void 1302void
1402add_abilities (object *op, object *change) 1303add_abilities (object *op, object *change)
1403{ 1304{
1404 int i, tmp;
1405
1406 if (change->face != blank_face) 1305 if (change->face != blank_face)
1407 {
1408#ifdef TREASURE_VERBOSE
1409 LOG (llevDebug, "add_abilities change face: %d\n", change->face);
1410#endif
1411 op->face = change->face; 1306 op->face = change->face;
1412 }
1413 1307
1414 for (i = 0; i < NUM_STATS; i++) 1308 for (int i = 0; i < NUM_STATS; i++)
1415 change_attr_value (&(op->stats), i, change->stats.stat (i)); 1309 change_attr_value (&(op->stats), i, change->stats.stat (i));
1416 1310
1417 op->attacktype |= change->attacktype; 1311 op->attacktype |= change->attacktype;
1418 op->path_attuned |= change->path_attuned; 1312 op->path_attuned |= change->path_attuned;
1419 op->path_repelled |= change->path_repelled; 1313 op->path_repelled |= change->path_repelled;
1420 op->path_denied |= change->path_denied; 1314 op->path_denied |= change->path_denied;
1421 op->move_type |= change->move_type; 1315 op->move_type |= change->move_type;
1422 op->stats.luck += change->stats.luck; 1316 op->stats.luck += change->stats.luck;
1423 1317
1424 if (QUERY_FLAG (change, FLAG_CURSED)) 1318 static const struct copyflags : object::flags_t
1425 SET_FLAG (op, FLAG_CURSED); 1319 {
1426 if (QUERY_FLAG (change, FLAG_DAMNED)) 1320 copyflags ()
1427 SET_FLAG (op, FLAG_DAMNED); 1321 {
1428 if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0) 1322 set (FLAG_CURSED);
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
1338 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1429 set_abs_magic (op, -op->magic); 1339 set_abs_magic (op, -op->magic);
1430 1340
1431 if (QUERY_FLAG (change, FLAG_LIFESAVE)) 1341 if (change->flag [FLAG_STAND_STILL])
1432 SET_FLAG (op, FLAG_LIFESAVE);
1433 if (QUERY_FLAG (change, FLAG_REFL_SPELL))
1434 SET_FLAG (op, FLAG_REFL_SPELL);
1435 if (QUERY_FLAG (change, FLAG_STEALTH))
1436 SET_FLAG (op, FLAG_STEALTH);
1437 if (QUERY_FLAG (change, FLAG_XRAYS))
1438 SET_FLAG (op, FLAG_XRAYS);
1439 if (QUERY_FLAG (change, FLAG_BLIND))
1440 SET_FLAG (op, FLAG_BLIND);
1441 if (QUERY_FLAG (change, FLAG_SEE_IN_DARK))
1442 SET_FLAG (op, FLAG_SEE_IN_DARK);
1443 if (QUERY_FLAG (change, FLAG_REFL_MISSILE))
1444 SET_FLAG (op, FLAG_REFL_MISSILE);
1445 if (QUERY_FLAG (change, FLAG_MAKE_INVIS))
1446 SET_FLAG (op, FLAG_MAKE_INVIS);
1447
1448 if (QUERY_FLAG (change, FLAG_STAND_STILL))
1449 { 1342 {
1450 CLEAR_FLAG (op, FLAG_ANIMATE); 1343 op->clr_flag (FLAG_ANIMATE);
1344
1451 /* so artifacts will join */ 1345 /* so artifacts will join */
1452 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1346 if (!op->flag [FLAG_ALIVE])
1453 op->speed = 0.0; 1347 op->speed = 0.;
1454 1348
1455 op->set_speed (op->speed); 1349 op->set_speed (op->speed);
1456 } 1350 }
1457 1351
1458 if (change->nrof) 1352 if (change->nrof)
1459 op->nrof = rndm (change->nrof) + 1; 1353 op->nrof = rndm (change->nrof) + 1;
1460 1354
1461 op->stats.exp += change->stats.exp; /* Speed modifier */ 1355 op->stats.exp += change->stats.exp; /* Speed modifier */
1462 op->stats.wc += change->stats.wc; 1356 op->stats.wc += change->stats.wc;
1463 op->stats.ac += change->stats.ac; 1357 op->stats.ac += change->stats.ac;
1464 1358
1465 if (change->other_arch) 1359 if (change->other_arch)
1466 { 1360 {
1467 /* Basically, for horns & potions, the other_arch field is the spell 1361 /* Basically, for horns & potions, the other_arch field is the spell
1468 * 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
1469 * this object. 1363 * this object.
1470 */ 1364 */
1471 if (op->type == HORN || op->type == POTION) 1365 if (op->type == HORN || op->type == POTION)
1472 { 1366 {
1473 object *tmp_obj;
1474
1475 /* Remove any spells this object currently has in it */ 1367 /* Remove any spells this object currently has in it */
1476 while (op->inv)
1477 op->inv->destroy (); 1368 op->destroy_inv (false);
1478 1369
1479 tmp_obj = arch_to_object (change->other_arch); 1370 object *tmp = change->other_arch->instance ();
1480 insert_ob_in_ob (tmp_obj, op); 1371 insert_ob_in_ob (tmp, op);
1481 } 1372 }
1373
1482 /* No harm setting this for potions/horns */ 1374 /* No harm setting this for potions/horns */
1483 op->other_arch = change->other_arch; 1375 op->other_arch = change->other_arch;
1484 } 1376 }
1485 1377
1486 if (change->stats.hp < 0) 1378 if (change->stats.hp < 0)
1502 op->stats.maxsp = -change->stats.maxsp; 1394 op->stats.maxsp = -change->stats.maxsp;
1503 else 1395 else
1504 op->stats.maxsp += change->stats.maxsp; 1396 op->stats.maxsp += change->stats.maxsp;
1505 1397
1506 if (change->stats.food < 0) 1398 if (change->stats.food < 0)
1507 op->stats.food = -(change->stats.food); 1399 op->stats.food = -change->stats.food;
1508 else 1400 else
1509 op->stats.food += change->stats.food; 1401 op->stats.food += change->stats.food;
1510 1402
1511 if (change->level < 0) 1403 if (change->level < 0)
1512 op->level = -(change->level); 1404 op->level = -change->level;
1513 else 1405 else
1514 op->level += change->level; 1406 op->level += change->level;
1515 1407
1516 if (change->gen_sp_armour < 0) 1408 if (change->gen_sp_armour < 0)
1517 op->gen_sp_armour = -(change->gen_sp_armour); 1409 op->gen_sp_armour = -change->gen_sp_armour;
1518 else 1410 else
1519 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;
1520 1412
1521 op->item_power = change->item_power; 1413 op->item_power = change->item_power;
1522 1414
1523 for (i = 0; i < NROFATTACKS; i++) 1415 for (int i = 0; i < NROFATTACKS; i++)
1524 if (change->resist[i])
1525 op->resist[i] += change->resist[i]; 1416 op->resist[i] += change->resist[i];
1526 1417
1527 if (change->stats.dam) 1418 if (change->stats.dam)
1528 { 1419 {
1529 if (change->stats.dam < 0) 1420 if (change->stats.dam < 0)
1530 op->stats.dam = (-change->stats.dam); 1421 op->stats.dam = -change->stats.dam;
1531 else if (op->stats.dam) 1422 else if (op->stats.dam)
1532 { 1423 {
1533 tmp = (signed char) (((int) op->stats.dam * (int) change->stats.dam) / 10); 1424 int tmp = op->stats.dam * change->stats.dam / 10;
1425
1534 if (tmp == op->stats.dam) 1426 if (tmp == op->stats.dam)
1535 { 1427 {
1536 if (change->stats.dam < 10) 1428 if (change->stats.dam < 10)
1537 op->stats.dam--; 1429 op->stats.dam--;
1538 else 1430 else
1544 } 1436 }
1545 1437
1546 if (change->weight) 1438 if (change->weight)
1547 { 1439 {
1548 if (change->weight < 0) 1440 if (change->weight < 0)
1549 op->weight = (-change->weight); 1441 op->weight = -change->weight;
1550 else 1442 else
1551 op->weight = (op->weight * (change->weight)) / 100; 1443 op->weight = op->weight * change->weight / 100;
1552 } 1444 }
1553 1445
1554 if (change->last_sp) 1446 if (change->last_sp)
1555 { 1447 {
1556 if (change->last_sp < 0) 1448 if (change->last_sp < 0)
1557 op->last_sp = (-change->last_sp); 1449 op->last_sp = -change->last_sp;
1558 else 1450 else
1559 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;
1560 } 1452 }
1561 1453
1562 if (change->gen_sp_armour) 1454 if (change->gen_sp_armour)
1563 { 1455 {
1564 if (change->gen_sp_armour < 0) 1456 if (change->gen_sp_armour < 0)
1565 op->gen_sp_armour = (-change->gen_sp_armour); 1457 op->gen_sp_armour = -change->gen_sp_armour;
1566 else 1458 else
1567 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;
1568 } 1460 }
1569 1461
1570 op->value *= change->value; 1462 op->value *= change->value;
1571 1463
1572 if (change->materials) 1464 if (change->materials)
1573 op->materials = change->materials; 1465 op->materials = change->materials;
1574 1466
1575 if (change->materialname) 1467 if (change->material != MATERIAL_NULL)
1576 op->materialname = change->materialname; 1468 op->material = change->material;
1577 1469
1578 if (change->slaying) 1470 if (change->slaying)
1579 op->slaying = change->slaying; 1471 op->slaying = change->slaying;
1580 1472
1581 if (change->race) 1473 if (change->race)
1604 name = tmp->name + 1, neg = 1; 1496 name = tmp->name + 1, neg = 1;
1605 else 1497 else
1606 name = tmp->name, neg = 0; 1498 name = tmp->name, neg = 0;
1607 1499
1608 /* If we match name, then return the opposite of 'neg' */ 1500 /* If we match name, then return the opposite of 'neg' */
1609 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname))) 1501 if (!strcmp (name, op->arch->archname))
1610 return !neg; 1502 return !neg;
1611 1503
1612 /* 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
1613 * everything is allowed except what we match 1505 * everything is allowed except what we match
1614 */ 1506 */
1625 */ 1517 */
1626 1518
1627void 1519void
1628give_artifact_abilities (object *op, object *artifct) 1520give_artifact_abilities (object *op, object *artifct)
1629{ 1521{
1630 char new_name[MAX_BUF]; 1522 op->title = format ("of %s", &artifct->name);
1631 1523
1632 sprintf (new_name, "of %s", &artifct->name);
1633 op->title = new_name;
1634 add_abilities (op, artifct); /* Give out the bonuses */ 1524 add_abilities (op, artifct); /* Give out the bonuses */
1635 1525
1636#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... */
1637 { 1527 {
1638 char identified = QUERY_FLAG (op, FLAG_IDENTIFIED); 1528 char identified = op->flag [FLAG_IDENTIFIED];
1639 1529
1640 SET_FLAG (op, FLAG_IDENTIFIED); 1530 op->set_flag (FLAG_IDENTIFIED);
1641 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL)); 1531 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1642 if (!identified) 1532 if (!identified)
1643 CLEAR_FLAG (op, FLAG_IDENTIFIED); 1533 op->clr_flag (FLAG_IDENTIFIED);
1644 } 1534 }
1645#endif 1535#endif
1646 return; 1536 return;
1647} 1537}
1648 1538
1658#define ARTIFACT_TRIES 2 1548#define ARTIFACT_TRIES 2
1659 1549
1660void 1550void
1661generate_artifact (object *op, int difficulty) 1551generate_artifact (object *op, int difficulty)
1662{ 1552{
1663 artifactlist *al;
1664 artifact *art; 1553 artifact *art;
1665 int i;
1666 1554
1667 al = find_artifactlist (op->type); 1555 artifactlist *al = find_artifactlist (op->type);
1668 1556
1669 if (al == NULL) 1557 if (al == NULL)
1670 { 1558 {
1671#if 0 /* This is too verbose, usually */ 1559#if 0 /* This is too verbose, usually */
1672 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);
1673#endif 1561#endif
1674 return; 1562 return;
1675 } 1563 }
1676 1564
1677 for (i = 0; i < ARTIFACT_TRIES; i++) 1565 for (int i = 0; i < ARTIFACT_TRIES; i++)
1678 { 1566 {
1679 int roll = rndm (al->total_chance); 1567 int roll = rndm (al->total_chance);
1680 1568
1681 for (art = al->items; art; art = art->next) 1569 for (art = al->items; art; art = art->next)
1682 { 1570 {
1690#if 1 1578#if 1
1691 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1579 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1692#endif 1580#endif
1693 return; 1581 return;
1694 } 1582 }
1695 if (!strcmp (art->item->name, "NONE")) 1583
1584 if (art->item->name == shstr_NONE)
1696 return; 1585 return;
1586
1697 if (FABS (op->magic) < art->item->magic) 1587 if (fabs (op->magic) < art->item->magic)
1698 continue; /* Not magic enough to be this item */ 1588 continue; /* Not magic enough to be this item */
1699 1589
1700 /* Map difficulty not high enough */ 1590 /* Map difficulty not high enough */
1701 if (difficulty < art->difficulty) 1591 if (difficulty < art->difficulty)
1702 continue; 1592 continue;
1720 */ 1610 */
1721 1611
1722void 1612void
1723fix_flesh_item (object *item, object *donor) 1613fix_flesh_item (object *item, object *donor)
1724{ 1614{
1725 char tmpbuf[MAX_BUF];
1726 int i;
1727
1728 if (item->type == FLESH && donor) 1615 if (item->type == FLESH && donor)
1729 { 1616 {
1730 /* change the name */ 1617 /* change the name */
1731 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name); 1618 item->name = format ("%s's %s", &donor->name, &item->name);
1732 item->name = tmpbuf;
1733 sprintf (tmpbuf, "%s's %s", &donor->name, &item->name_pl); 1619 item->name_pl = format ("%s's %s", &donor->name, &item->name_pl);
1734 item->name_pl = tmpbuf;
1735 1620
1736 /* weight is FLESH weight/100 * donor */ 1621 /* weight is FLESH weight/100 * donor */
1737 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);
1738 item->weight = 1;
1739 1623
1740 /* value is multiplied by level of donor */ 1624 /* value is multiplied by level of donor */
1741 item->value *= isqrt (donor->level * 2); 1625 item->value *= isqrt (donor->level * 2);
1742 1626
1743 /* food value */ 1627 /* food value */
1744 item->stats.food += (donor->stats.hp / 100) + donor->stats.Con; 1628 item->stats.food += donor->stats.hp / 100 + donor->stats.Con;
1745 1629
1746 /* flesh items inherit some abilities of donor, but not 1630 /* flesh items inherit some abilities of donor, but not
1747 * full effect. 1631 * full effect.
1748 */ 1632 */
1749 for (i = 0; i < NROFATTACKS; i++) 1633 for (int i = 0; i < NROFATTACKS; i++)
1750 item->resist[i] = donor->resist[i] / 2; 1634 item->resist[i] = donor->resist[i] / 2;
1751 1635
1752 /* item inherits donor's level (important for quezals) */ 1636 /* item inherits donor's level (important for quezals) */
1753 item->level = donor->level; 1637 item->level = donor->level;
1754 1638
1755 /* if donor has some attacktypes, the flesh is poisonous */ 1639 /* if donor has some attacktypes, the flesh is poisonous */
1756 if (donor->attacktype & AT_POISON) 1640 if (donor->attacktype & AT_POISON)
1757 item->type = POISON; 1641 item->type = POISON;
1642
1758 if (donor->attacktype & AT_ACID) 1643 if (donor->attacktype & AT_ACID)
1759 item->stats.hp = -1 * item->stats.food; 1644 item->stats.hp = -item->stats.food;
1760 SET_FLAG (item, FLAG_NO_STEAL);
1761 }
1762}
1763 1645
1764/* special_potion() - so that old potion code is still done right. */ 1646 item->set_flag (FLAG_NO_STEAL);
1765int 1647 }
1766special_potion (object *op)
1767{
1768 if (op->attacktype)
1769 return 1;
1770
1771 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1772 return 1;
1773
1774 for (int i = 0; i < NROFATTACKS; i++)
1775 if (op->resist[i])
1776 return 1;
1777
1778 return 0;
1779} 1648}
1780 1649
1781void 1650static void
1782free_treasurestruct (treasure *t) 1651free_treasurestruct (treasure *t)
1783{ 1652{
1784 if (t->next) free_treasurestruct (t->next); 1653 if (t->next) free_treasurestruct (t->next);
1785 if (t->next_yes) free_treasurestruct (t->next_yes); 1654 if (t->next_yes) free_treasurestruct (t->next_yes);
1786 if (t->next_no) free_treasurestruct (t->next_no); 1655 if (t->next_no) free_treasurestruct (t->next_no);
1787 1656
1788 delete t; 1657 delete t;
1789} 1658}
1790 1659
1791void 1660static void
1792free_charlinks (linked_char *lc) 1661free_charlinks (linked_char *lc)
1793{ 1662{
1794 if (lc->next) 1663 if (lc->next)
1795 free_charlinks (lc->next); 1664 free_charlinks (lc->next);
1796 1665
1797 delete lc; 1666 delete lc;
1798} 1667}
1799 1668
1800void 1669static void
1801free_artifact (artifact *at) 1670free_artifact (artifact *at)
1802{ 1671{
1803 if (at->next) free_artifact (at->next); 1672 if (at->next) free_artifact (at->next);
1804 if (at->allowed) free_charlinks (at->allowed); 1673 if (at->allowed) free_charlinks (at->allowed);
1805 1674
1806 at->item->destroy (1); 1675 at->item->destroy ();
1807 1676
1808 sfree (at); 1677 sfree (at);
1809} 1678}
1810 1679
1811void
1812free_artifactlist (artifactlist *al)
1813{
1814 artifactlist *nextal;
1815
1816 for (al = first_artifactlist; al; al = nextal)
1817 {
1818 nextal = al->next;
1819
1820 if (al->items)
1821 free_artifact (al->items);
1822
1823 sfree (al);
1824 }
1825}
1826
1827void
1828free_all_treasures (void)
1829{
1830 treasurelist *tl, *next;
1831
1832 for (tl = first_treasurelist; tl; tl = next)
1833 {
1834 clear (tl);
1835
1836 next = tl->next;
1837 delete tl;
1838 }
1839
1840 free_artifactlist (first_artifactlist);
1841}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines