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.53 by root, Sat Apr 21 16:56:30 2007 UTC vs.
Revision 1.105 by root, Thu Apr 15 04:56:47 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26 * It is useful for finding bugs in the treasures file. Since it only 26 * It is useful for finding bugs in the treasures file. Since it only
27 * slows the startup some (and not actual game play), it is by default 27 * slows the startup some (and not actual game play), it is by default
… …
33 33
34//#define TREASURE_VERBOSE 34//#define TREASURE_VERBOSE
35 35
36#include <global.h> 36#include <global.h>
37#include <treasure.h> 37#include <treasure.h>
38#include <funcpoint.h>
39#include <loader.h>
40 38
41extern char *spell_mapping[]; 39extern char *spell_mapping[];
42 40
43static treasurelist *first_treasurelist; 41static treasurelist *first_treasurelist;
44 42
… …
47typedef std::tr1::unordered_map< 45typedef std::tr1::unordered_map<
48 const char *, 46 const char *,
49 treasurelist *, 47 treasurelist *,
50 str_hash, 48 str_hash,
51 str_equal, 49 str_equal,
52 slice_allocator< std::pair<const char *const, treasurelist *> >, 50 slice_allocator< std::pair<const char *const, treasurelist *> >
53 true
54> tl_map_t; 51> tl_map_t;
55 52
56static 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}
57 68
58/* 69/*
59 * Searches for the given treasurelist 70 * Searches for the given treasurelist
60 */ 71 */
61treasurelist * 72treasurelist *
… …
93 } 104 }
94 105
95 return tl; 106 return tl;
96} 107}
97 108
98//TODO: class method
99void
100clear (treasurelist *tl)
101{
102 if (tl->items)
103 {
104 free_treasurestruct (tl->items);
105 tl->items = 0;
106 }
107
108 tl->total_chance = 0;
109}
110
111#ifdef TREASURE_DEBUG 109#ifdef TREASURE_DEBUG
112/* recursived checks the linked list. Treasurelist is passed only 110/* recursived checks the linked list. Treasurelist is passed only
113 * so that the treasure name can be printed out 111 * so that the treasure name can be printed out
114 */ 112 */
115static void 113static void
… …
140 138
141 f.next (); 139 f.next ();
142 140
143 for (;;) 141 for (;;)
144 { 142 {
145 coroapi::cede_to_tick_every (10); 143 coroapi::cede_to_tick ();
146 144
147 switch (f.kw) 145 switch (f.kw)
148 { 146 {
149 case KW_arch: 147 case KW_arch:
150 t->item = archetype::get (f.get_str ()); 148 t->item = archetype::find (f.get_str ());
149
150 if (!t->item)
151 {
152 f.parse_warn ("treasure references unknown archetype");
153 t->item = archetype::empty;
154 }
155
151 break; 156 break;
152 157
153 case KW_list: f.get (t->name); break; 158 case KW_list: f.get (t->name); break;
154 case KW_change_name: f.get (t->change_arch.name); break; 159 case KW_change_name: f.get (t->change_arch.name); break;
155 case KW_change_title: f.get (t->change_arch.title); break; 160 case KW_change_title: f.get (t->change_arch.title); break;
… …
169 t->next = read_treasure (f); 174 t->next = read_treasure (f);
170 return t; 175 return t;
171 176
172 default: 177 default:
173 if (!f.parse_error ("treasurelist", t->name)) 178 if (!f.parse_error ("treasurelist", t->name))
174 return 0; 179 goto error;
175 180
176 return t; 181 return t;
177 } 182 }
178 183
179 f.next (); 184 f.next ();
180 } 185 }
186
187 // not reached
188
189error:
190 delete t;
191 return 0;
181} 192}
182 193
183/* 194/*
184 * Each treasure is parsed with the help of load_treasure(). 195 * Each treasure is parsed with the help of load_treasure().
185 */ 196 */
… …
197 208
198 /* This is a one of the many items on the list should be generated. 209 /* This is a one of the many items on the list should be generated.
199 * Add up the chance total, and check to make sure the yes & no 210 * Add up the chance total, and check to make sure the yes & no
200 * fields of the treasures are not being used. 211 * fields of the treasures are not being used.
201 */ 212 */
202 tl->total_chance = 0;
203
204 if (one) 213 if (one)
205 { 214 {
206 for (treasure *t = tl->items; t; t = t->next) 215 for (treasure *t = tl->items; t; t = t->next)
207 { 216 {
208 if (t->next_yes || t->next_no) 217 if (t->next_yes || t->next_no)
209 { 218 {
210 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 219 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
211 LOG (llevError, " the next_yes or next_no field is set\n"); 220 LOG (llevError, " the next_yes or next_no field is set\n");
212 } 221 }
213 222
214 tl->total_chance += t->chance; 223 tl->total_chance += t->chance;
215 } 224 }
… …
230 * start with equipment, but only their abilities). 239 * start with equipment, but only their abilities).
231 */ 240 */
232static void 241static void
233put_treasure (object *op, object *creator, int flags) 242put_treasure (object *op, object *creator, int flags)
234{ 243{
244 if (flags & GT_ENVIRONMENT)
245 {
235 /* Bit of a hack - spells should never be put onto the map. The entire 246 /* Bit of a hack - spells should never be put onto the map. The entire
236 * treasure stuff is a problem - there is no clear idea of knowing 247 * treasure stuff is a problem - there is no clear idea of knowing
237 * this is the original object, or if this is an object that should be created 248 * this is the original object, or if this is an object that should be created
238 * by another object. 249 * by another object.
239 */ 250 */
240 if (flags & GT_ENVIRONMENT && op->type != SPELL) 251 //TODO: flag such as objects... as such (no drop, anybody?)
241 { 252 if (op->type == SPELL)
242 op->deactivate_recursive (); 253 {
254 op->destroy ();
255 return;
256 }
257
243 op->expand_tail (); 258 op->expand_tail ();
244 259
260 if (!creator->is_on_map ()
245 if (ob_blocked (op, creator->map, creator->x, creator->y)) 261 || (op->weight && op->blocked (creator->map, creator->x, creator->y)))
246 op->destroy (); 262 op->destroy ();
247 else 263 else
248 { 264 {
249 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 265 op->flag [FLAG_OBJ_ORIGINAL] = true;
250 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);
251 } 267 }
252 } 268 }
253 else 269 else
254 { 270 {
255 op = creator->insert (op); 271 op = creator->insert (op);
256 272
257 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 273 if ((flags & GT_APPLY) && creator->flag [FLAG_MONSTER])
258 monster_check_apply (creator, op); 274 monster_check_apply (creator, op);
259
260 if (flags & GT_UPDATE_INV)
261 if (object *tmp = creator->in_player ())
262 esrv_send_item (tmp, op);
263 } 275 }
264} 276}
265 277
266/* 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
267 * in the generated object 279 * in the generated object
… …
296 else 308 else
297 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); 309 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
298 } 310 }
299 else 311 else
300 { 312 {
301 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 313 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
302 { 314 {
303 object *tmp = arch_to_object (t->item); 315 object *tmp = t->item->instance ();
304 316
305 if (t->nrof && tmp->nrof <= 1) 317 if (t->nrof && tmp->nrof <= 1)
306 tmp->nrof = rndm (t->nrof) + 1; 318 tmp->nrof = rndm (t->nrof) + 1;
307 319
308 fix_generated_item (tmp, op, difficulty, t->magic, flag); 320 fix_generated_item (tmp, op, difficulty, t->magic, flag);
… …
353 create_treasure (tl, op, flag, difficulty, tries); 365 create_treasure (tl, op, flag, difficulty, tries);
354 } 366 }
355 else if (t->nrof) 367 else if (t->nrof)
356 create_one_treasure (tl, op, flag, difficulty, tries); 368 create_one_treasure (tl, op, flag, difficulty, tries);
357 } 369 }
358 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 370 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
359 { 371 {
360 if (object *tmp = arch_to_object (t->item)) 372 if (object *tmp = t->item->instance ())
361 { 373 {
362 if (t->nrof && tmp->nrof <= 1) 374 if (t->nrof && tmp->nrof <= 1)
363 tmp->nrof = rndm (t->nrof) + 1; 375 tmp->nrof = rndm (t->nrof) + 1;
364 376
365 fix_generated_item (tmp, op, difficulty, t->magic, flag); 377 fix_generated_item (tmp, op, difficulty, t->magic, flag);
366 change_treasure (t, tmp); 378 change_treasure (t, tmp);
367 put_treasure (tmp, op, flag); 379 put_treasure (tmp, op, flag);
368 } 380 }
369 } 381 }
382}
383
384void
385object::create_treasure (treasurelist *tl, int flags)
386{
387 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
370} 388}
371 389
372/* This calls the appropriate treasure creation function. tries is passed 390/* This calls the appropriate treasure creation function. tries is passed
373 * to determine how many list transitions or attempts to create treasure 391 * to determine how many list transitions or attempts to create treasure
374 * have been made. It is really in place to prevent infinite loops with 392 * have been made. It is really in place to prevent infinite loops with
… …
387 { 405 {
388 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 406 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
389 return; 407 return;
390 } 408 }
391 409
410 if (op->flag [FLAG_TREASURE_ENV])
411 {
412 // do not generate items when there already is something above the object
413 if (op->flag [FLAG_IS_FLOOR] && op->above)
414 return;
415
416 flag |= GT_ENVIRONMENT;
417 }
418
392 if (tl->total_chance) 419 if (tl->total_chance)
393 create_one_treasure (tl, op, flag, difficulty, tries); 420 create_one_treasure (tl, op, flag, difficulty, tries);
394 else 421 else
395 create_all_treasures (tl->items, op, flag, difficulty, tries); 422 create_all_treasures (tl->items, op, flag, difficulty, tries);
396} 423}
… …
416 443
417 if (ob->inv) 444 if (ob->inv)
418 LOG (llevError, "In generate treasure, created multiple objects.\n"); 445 LOG (llevError, "In generate treasure, created multiple objects.\n");
419 446
420 ob->destroy (); 447 ob->destroy ();
448
421 return tmp; 449 return tmp;
422} 450}
423 451
424/* 452/*
425 * 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
… …
468 * 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)
469 * 497 *
470 * elmex Wed Aug 9 17:44:59 CEST 2006: 498 * elmex Wed Aug 9 17:44:59 CEST 2006:
471 * 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.
472 */ 500 */
473int 501static int
474level_for_item (const object *op, int difficulty) 502level_for_item (const object *op, int difficulty)
475{ 503{
476 int olevel = 0;
477
478 if (!op->inv) 504 if (!op->inv)
479 { 505 {
480 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);
481 return 0; 507 return 0;
482 } 508 }
483 509
484 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
485 511
486 if (olevel <= 0) 512 if (olevel <= 0)
487 olevel = rndm (1, MIN (op->inv->level, 1)); 513 olevel = rndm (1, op->inv->level);
488 514
489 if (olevel > MAXLEVEL) 515 return min (olevel, MAXLEVEL_TREASURE);
490 olevel = MAXLEVEL;
491
492 return olevel;
493} 516}
494 517
495/* 518/*
496 * Based upon the specified difficulty and upon the difftomagic_list array, 519 * Based upon the specified difficulty and upon the difftomagic_list array,
497 * a random magical bonus is returned. This is used when determine 520 * a random magical bonus is returned. This is used when determine
… …
500 * elmex Thu Aug 10 18:45:44 CEST 2006: 523 * elmex Thu Aug 10 18:45:44 CEST 2006:
501 * 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
502 * weird integer between 1-31. 525 * weird integer between 1-31.
503 * 526 *
504 */ 527 */
505int 528static int
506magic_from_difficulty (int difficulty) 529magic_from_difficulty (int difficulty)
507{ 530{
508 int percent = 0, magic = 0; 531 int percent = 0, magic = 0;
509 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 532 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
510 533
… …
553 576
554 op->magic = magic; 577 op->magic = magic;
555 if (op->arch) 578 if (op->arch)
556 { 579 {
557 if (op->type == ARMOUR) 580 if (op->type == ARMOUR)
558 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 581 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
559 582
560 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 583 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
561 magic = (-magic); 584 magic = (-magic);
585
562 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 586 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
563 } 587 }
564 else 588 else
565 { 589 {
566 if (op->type == ARMOUR) 590 if (op->type == ARMOUR)
567 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 591 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
592
568 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 593 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
569 magic = (-magic); 594 magic = (-magic);
595
570 op->weight = (op->weight * (100 - magic * 10)) / 100; 596 op->weight = (op->weight * (100 - magic * 10)) / 100;
571 } 597 }
572} 598}
573 599
574/* 600/*
… …
586 i = -i; 612 i = -i;
587 if (i > max_magic) 613 if (i > max_magic)
588 i = max_magic; 614 i = max_magic;
589 set_abs_magic (op, i); 615 set_abs_magic (op, i);
590 if (i < 0) 616 if (i < 0)
591 SET_FLAG (op, FLAG_CURSED); 617 op->set_flag (FLAG_CURSED);
592} 618}
593 619
594/* 620/*
595 * Randomly adds one magical ability to the given object. 621 * Randomly adds one magical ability to the given object.
596 * Modified for Partial Resistance in many ways: 622 * Modified for Partial Resistance in many ways:
597 * 1) Since rings can have multiple bonuses, if the same bonus 623 * 1) Since rings can have multiple bonuses, if the same bonus
598 * is rolled again, increase it - the bonuses now stack with 624 * is rolled again, increase it - the bonuses now stack with
599 * other bonuses previously rolled and ones the item might natively have. 625 * other bonuses previously rolled and ones the item might natively have.
600 * 2) Add code to deal with new PR method. 626 * 2) Add code to deal with new PR method.
601 */ 627 */
602void 628static void
603set_ring_bonus (object *op, int bonus) 629set_ring_bonus (object *op, int bonus)
604{ 630{
605
606 int r = rndm (bonus > 0 ? 25 : 11); 631 int r = rndm (bonus > 0 ? 25 : 11);
607 632
608 if (op->type == AMULET) 633 if (op->type == AMULET)
609 { 634 {
610 if (!(rndm (21))) 635 if (!(rndm (21)))
… …
629 case 2: 654 case 2:
630 case 3: 655 case 3:
631 case 4: 656 case 4:
632 case 5: 657 case 5:
633 case 6: 658 case 6:
634 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 659 op->stats.stat (r) += bonus;
635 break; 660 break;
636 661
637 case 7: 662 case 7:
638 op->stats.dam += bonus; 663 op->stats.dam += bonus;
639 break; 664 break;
… …
690 break; 715 break;
691 } 716 }
692 case 20: 717 case 20:
693 if (op->type == AMULET) 718 if (op->type == AMULET)
694 { 719 {
695 SET_FLAG (op, FLAG_REFL_SPELL); 720 op->set_flag (FLAG_REFL_SPELL);
696 op->value *= 11; 721 op->value *= 11;
697 } 722 }
698 else 723 else
699 { 724 {
700 op->stats.hp = 1; /* regenerate hit points */ 725 op->stats.hp = 1; /* regenerate hit points */
… …
703 break; 728 break;
704 729
705 case 21: 730 case 21:
706 if (op->type == AMULET) 731 if (op->type == AMULET)
707 { 732 {
708 SET_FLAG (op, FLAG_REFL_MISSILE); 733 op->set_flag (FLAG_REFL_MISSILE);
709 op->value *= 9; 734 op->value *= 9;
710 } 735 }
711 else 736 else
712 { 737 {
713 op->stats.sp = 1; /* regenerate spell points */ 738 op->stats.sp = 1; /* regenerate spell points */
… …
733 * higher is the chance of returning a low number. 758 * higher is the chance of returning a low number.
734 * It is only used in fix_generated_treasure() to set bonuses on 759 * It is only used in fix_generated_treasure() to set bonuses on
735 * rings and amulets. 760 * rings and amulets.
736 * Another scheme is used to calculate the magic of weapons and armours. 761 * Another scheme is used to calculate the magic of weapons and armours.
737 */ 762 */
738int 763static int
739get_magic (int diff) 764get_magic (int diff)
740{ 765{
741 int i; 766 int i;
742 767
743 if (diff < 3) 768 if (diff < 3)
… …
746 for (i = 0; i < 4; i++) 771 for (i = 0; i < 4; i++)
747 if (rndm (diff)) 772 if (rndm (diff))
748 return i; 773 return i;
749 774
750 return 4; 775 return 4;
776}
777
778/* special_potion() - so that old potion code is still done right. */
779static int
780special_potion (object *op)
781{
782 if (op->attacktype)
783 return 1;
784
785 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
786 return 1;
787
788 for (int i = 0; i < NROFATTACKS; i++)
789 if (op->resist[i])
790 return 1;
791
792 return 0;
751} 793}
752 794
753#define DICE2 (get_magic(2)==2?2:1) 795#define DICE2 (get_magic(2)==2?2:1)
754#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3)) 796#define DICESPELL (rndm (3) + rndm (3) + rndm (3) + rndm (3) + rndm (3))
755 797
… …
792 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0); 834 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
793 /* So the treasure doesn't get created again */ 835 /* So the treasure doesn't get created again */
794 op->randomitems = 0; 836 op->randomitems = 0;
795 } 837 }
796 838
797 if (difficulty < 1) 839 max_it (difficulty, 1);
798 difficulty = 1;
799 840
800 if (INVOKE_OBJECT (ADD_BONUS, op, 841 if (INVOKE_OBJECT (ADD_BONUS, op,
801 ARG_OBJECT (creator != op ? creator : 0), 842 ARG_OBJECT (creator != op ? creator : 0),
802 ARG_INT (difficulty), ARG_INT (max_magic), 843 ARG_INT (difficulty), ARG_INT (max_magic),
803 ARG_INT (flags))) 844 ARG_INT (flags)))
804 return; 845 return;
805 846
806 if (!(flags & GT_MINIMAL)) 847 if (!(flags & GT_MINIMAL))
807 { 848 {
808 if (op->arch == crown_arch) 849 if (IS_ARCH (op->arch, crown))
809 { 850 {
810 set_magic (difficulty, op, max_magic, flags); 851 set_magic (difficulty, op, max_magic, flags);
811 num_enchantments = calc_item_power (op, 1); 852 num_enchantments = calc_item_power (op, 1);
812 generate_artifact (op, difficulty); 853 generate_artifact (op, difficulty);
813 } 854 }
… …
818 859
819 num_enchantments = calc_item_power (op, 1); 860 num_enchantments = calc_item_power (op, 1);
820 861
821 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 862 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
822 || op->type == HORN 863 || op->type == HORN
823 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 864 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
824 * used for shop_floors or treasures */
825 generate_artifact (op, difficulty); 865 generate_artifact (op, difficulty);
826 } 866 }
827 867
828 /* Object was made an artifact. Calculate its item_power rating. 868 /* Object was made an artifact. Calculate its item_power rating.
829 * the item_power in the object is what the artfiact adds. 869 * the item_power in the object is what the artfiact adds.
… …
863 * again below */ 903 * again below */
864 } 904 }
865 } 905 }
866 906
867 /* materialtype modifications. Note we allow this on artifacts. */ 907 /* materialtype modifications. Note we allow this on artifacts. */
868 set_materialname (op, difficulty, NULL); 908 select_material (op, difficulty);
869 909
870 if (flags & GT_MINIMAL) 910 if (flags & GT_MINIMAL)
871 { 911 {
872 if (op->type == POTION) 912 if (op->type == POTION)
873 /* Handle healing and magic power potions */ 913 /* Handle healing and magic power potions */
874 if (op->stats.sp && !op->randomitems) 914 if (op->stats.sp && !op->randomitems)
875 { 915 {
876 object *tmp;
877
878 tmp = get_archetype (spell_mapping[op->stats.sp]); 916 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
879 insert_ob_in_ob (tmp, op); 917 insert_ob_in_ob (tmp, op);
880 op->stats.sp = 0; 918 op->stats.sp = 0;
881 } 919 }
882 } 920 }
883 else if (!op->title) /* Only modify object if not special */ 921 else if (!op->title) /* Only modify object if not special */
… …
886 case WEAPON: 924 case WEAPON:
887 case ARMOUR: 925 case ARMOUR:
888 case SHIELD: 926 case SHIELD:
889 case HELMET: 927 case HELMET:
890 case CLOAK: 928 case CLOAK:
891 if (QUERY_FLAG (op, FLAG_CURSED) && !(rndm (4))) 929 if (op->flag [FLAG_CURSED] && !(rndm (4)))
892 set_ring_bonus (op, -DICE2); 930 set_ring_bonus (op, -DICE2);
893 break; 931 break;
894 932
895 case BRACERS: 933 case BRACERS:
896 if (!rndm (QUERY_FLAG (op, FLAG_CURSED) ? 5 : 20)) 934 if (!rndm (op->flag [FLAG_CURSED] ? 5 : 20))
897 { 935 {
898 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 936 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
899 if (!QUERY_FLAG (op, FLAG_CURSED)) 937 if (!op->flag [FLAG_CURSED])
900 op->value *= 3; 938 op->value *= 3;
901 } 939 }
902 break; 940 break;
903 941
904 case POTION: 942 case POTION:
… …
906 int too_many_tries = 0, is_special = 0; 944 int too_many_tries = 0, is_special = 0;
907 945
908 /* Handle healing and magic power potions */ 946 /* Handle healing and magic power potions */
909 if (op->stats.sp && !op->randomitems) 947 if (op->stats.sp && !op->randomitems)
910 { 948 {
911 object *tmp;
912
913 tmp = get_archetype (spell_mapping[op->stats.sp]); 949 object *tmp = get_archetype (spell_mapping[op->stats.sp]);
914 insert_ob_in_ob (tmp, op); 950 insert_ob_in_ob (tmp, op);
915 op->stats.sp = 0; 951 op->stats.sp = 0;
916 } 952 }
917 953
918 while (!(is_special = special_potion (op)) && !op->inv) 954 while (!(is_special = special_potion (op)) && !op->inv)
… …
926 * since the value set on those is already correct. 962 * since the value set on those is already correct.
927 */ 963 */
928 if (op->inv && op->randomitems) 964 if (op->inv && op->randomitems)
929 { 965 {
930 /* value multiplier is same as for scrolls */ 966 /* value multiplier is same as for scrolls */
931 op->value = (op->value * op->inv->value); 967 op->value *= op->inv->value;
932 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty); 968 op->level = op->inv->level / 2 + rndm (difficulty) + rndm (difficulty);
933 } 969 }
934 else 970 else
935 { 971 {
936 op->name = "potion"; 972 op->name = "potion";
937 op->name_pl = "potions"; 973 op->name_pl = "potions";
938 } 974 }
939 975
940 if (!(flags & GT_ONLY_GOOD) && rndm (2)) 976 if (!(flags & GT_ONLY_GOOD) && rndm (2))
941 SET_FLAG (op, FLAG_CURSED); 977 op->set_flag (FLAG_CURSED);
978
942 break; 979 break;
943 } 980 }
944 981
945 case AMULET: 982 case AMULET:
946 if (op->arch == amulet_arch) 983 if (IS_ARCH (op->arch, amulet))
947 op->value *= 5; /* Since it's not just decoration */ 984 op->value *= 5; /* Since it's not just decoration */
948 985
949 case RING: 986 case RING:
950 if (op->arch == NULL)
951 {
952 op->destroy ();
953 op = 0;
954 break;
955 }
956
957 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 987 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
958 break; 988 break;
959 989
960 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 990 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
961 SET_FLAG (op, FLAG_CURSED); 991 op->set_flag (FLAG_CURSED);
962 992
963 set_ring_bonus (op, QUERY_FLAG (op, FLAG_CURSED) ? -DICE2 : DICE2); 993 set_ring_bonus (op, op->flag [FLAG_CURSED] ? -DICE2 : DICE2);
964 994
965 if (op->type != RING) /* Amulets have only one ability */ 995 if (op->type != RING) /* Amulets have only one ability */
966 break; 996 break;
967 997
968 if (!(rndm (4))) 998 if (!(rndm (4)))
969 { 999 {
970 int d = (rndm (2) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1000 int d = (rndm (2) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
971 1001
972 if (d > 0) 1002 if (d > 0)
973 op->value *= 3; 1003 op->value *= 3;
974 1004
975 set_ring_bonus (op, d); 1005 set_ring_bonus (op, d);
976 1006
977 if (!(rndm (4))) 1007 if (!(rndm (4)))
978 { 1008 {
979 int d = (rndm (3) || QUERY_FLAG (op, FLAG_CURSED)) ? -DICE2 : DICE2; 1009 int d = (rndm (3) || op->flag [FLAG_CURSED]) ? -DICE2 : DICE2;
980 1010
981 if (d > 0) 1011 if (d > 0)
982 op->value *= 5; 1012 op->value *= 5;
983 set_ring_bonus (op, d); 1013 set_ring_bonus (op, d);
984 } 1014 }
985 } 1015 }
986 1016
987 if (GET_ANIM_ID (op)) 1017 if (op->animation_id)
988 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); 1018 op->set_anim_frame (rndm (op->anim_frames ()));
989 1019
990 break; 1020 break;
991 1021
992 case BOOK: 1022 case BOOK:
993 /* Is it an empty book?, if yes lets make a special· 1023 /* Is it an empty book?, if yes lets make a special·
… …
995 * creator and/or map level we found it on. 1025 * creator and/or map level we found it on.
996 */ 1026 */
997 if (!op->msg && rndm (10)) 1027 if (!op->msg && rndm (10))
998 { 1028 {
999 /* set the book level properly */ 1029 /* set the book level properly */
1000 if (creator->level == 0 || QUERY_FLAG (creator, FLAG_ALIVE)) 1030 if (creator->level == 0 || creator->flag [FLAG_ALIVE])
1001 { 1031 {
1002 if (op->map && op->map->difficulty) 1032 if (op->map && op->map->difficulty)
1003 op->level = rndm (op->map->difficulty) + rndm (10) + 1; 1033 op->level = rndm (op->map->difficulty) + rndm (10) + 1;
1004 else 1034 else
1005 op->level = rndm (20) + 1; 1035 op->level = rndm (20) + 1;
… …
1008 op->level = rndm (creator->level); 1038 op->level = rndm (creator->level);
1009 1039
1010 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1040 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1011 /* books w/ info are worth more! */ 1041 /* books w/ info are worth more! */
1012 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1042 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1013 /* creator related stuff */
1014
1015 /* for library, chained books. Note that some monsters have no_pick
1016 * set - we don't want to set no pick in that case.
1017 */
1018 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1019 SET_FLAG (op, FLAG_NO_PICK);
1020 if (creator->slaying && !op->slaying) /* for check_inv floors */
1021 op->slaying = creator->slaying;
1022 1043
1023 /* add exp so reading it gives xp (once) */ 1044 /* add exp so reading it gives xp (once) */
1024 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1045 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1025 } 1046 }
1047
1048 /* creator related stuff */
1049
1050 /* for library, chained books. Note that some monsters have no_pick
1051 * set - we don't want to set no pick in that case.
1052 */
1053 if (creator->flag [FLAG_NO_PICK] && !creator->flag [FLAG_MONSTER])
1054 op->set_flag (FLAG_NO_PICK);
1055 if (creator->slaying && !op->slaying) /* for check_inv floors */
1056 op->slaying = creator->slaying;
1026 break; 1057 break;
1027 1058
1028 case SPELLBOOK: 1059 case SPELLBOOK:
1029 op->value = op->value * op->inv->value; 1060 op->value = op->value * op->inv->value;
1030 /* add exp so learning gives xp */ 1061 /* add exp so learning gives xp */
… …
1064 * 10 time multiplier). This way, the value are a bit more reasonable. 1095 * 10 time multiplier). This way, the value are a bit more reasonable.
1065 */ 1096 */
1066 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1097 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1067 /* maxhp is used to denote how many 'charges' the rod holds before */ 1098 /* maxhp is used to denote how many 'charges' the rod holds before */
1068 if (op->stats.maxhp) 1099 if (op->stats.maxhp)
1069 op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace); 1100 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1070 else 1101 else
1071 op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace); 1102 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1072 1103
1073 op->stats.hp = op->stats.maxhp; 1104 op->stats.hp = op->stats.maxhp;
1074 break; 1105 break;
1075 1106
1076 case SCROLL: 1107 case SCROLL:
… …
1091 break; 1122 break;
1092 } /* switch type */ 1123 } /* switch type */
1093 1124
1094 if (flags & GT_STARTEQUIP) 1125 if (flags & GT_STARTEQUIP)
1095 { 1126 {
1096 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !QUERY_FLAG (op, FLAG_IS_THROWN)) 1127 if (op->nrof < 2 && op->type != CONTAINER && op->type != MONEY && !op->flag [FLAG_IS_THROWN])
1097 SET_FLAG (op, FLAG_STARTEQUIP); 1128 op->set_flag (FLAG_STARTEQUIP);
1098 else if (op->type != MONEY) 1129 else if (op->type != MONEY)
1099 op->value = 0; 1130 op->value = 0;
1100 } 1131 }
1101 1132
1102 if (!(flags & GT_ENVIRONMENT)) 1133 if (!(flags & GT_ENVIRONMENT))
… …
1113 1144
1114/* 1145/*
1115 * Allocate and return the pointer to an empty artifactlist structure. 1146 * Allocate and return the pointer to an empty artifactlist structure.
1116 */ 1147 */
1117static artifactlist * 1148static artifactlist *
1118get_empty_artifactlist (void) 1149get_empty_artifactlist ()
1119{ 1150{
1120 return salloc0 <artifactlist> (); 1151 return salloc0<artifactlist> ();
1121} 1152}
1122 1153
1123/* 1154/*
1124 * Allocate and return the pointer to an empty artifact structure. 1155 * Allocate and return the pointer to an empty artifact structure.
1125 */ 1156 */
1126static artifact * 1157static artifact *
1127get_empty_artifact (void) 1158get_empty_artifact ()
1128{ 1159{
1129 return salloc0 <artifact> (); 1160 return salloc0<artifact> ();
1130} 1161}
1131 1162
1132/* 1163/*
1133 * Searches the artifact lists and returns one that has the same type 1164 * Searches the artifact lists and returns one that has the same type
1134 * of objects on it. 1165 * of objects on it.
… …
1142 1173
1143 return 0; 1174 return 0;
1144} 1175}
1145 1176
1146/* 1177/*
1147 * For debugging purposes. Dumps all tables. 1178 * Builds up the lists of artifacts from the file in the libdir.
1148 */ 1179 */
1149void 1180void
1150dump_artifacts (void)
1151{
1152 artifactlist *al;
1153 artifact *art;
1154 linked_char *next;
1155
1156 fprintf (logfile, "\n");
1157 for (al = first_artifactlist; al != NULL; al = al->next)
1158 {
1159 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1160 for (art = al->items; art != NULL; art = art->next)
1161 {
1162 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1163 if (art->allowed != NULL)
1164 {
1165 fprintf (logfile, "\tallowed combinations:");
1166 for (next = art->allowed; next != NULL; next = next->next)
1167 fprintf (logfile, "%s,", &next->name);
1168 fprintf (logfile, "\n");
1169 }
1170 }
1171 }
1172 fprintf (logfile, "\n");
1173}
1174
1175/*
1176 * For debugging purposes. Dumps all treasures recursively (see below).
1177 */
1178void
1179dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1180{
1181 treasurelist *tl;
1182 int i;
1183
1184 if (depth > 100)
1185 return;
1186
1187 while (t)
1188 {
1189 if (t->name)
1190 {
1191 for (i = 0; i < depth; i++)
1192 fprintf (logfile, " ");
1193
1194 fprintf (logfile, "{ (list: %s)\n", &t->name);
1195
1196 tl = treasurelist::find (t->name);
1197 if (tl)
1198 dump_monster_treasure_rec (name, tl->items, depth + 2);
1199
1200 for (i = 0; i < depth; i++)
1201 fprintf (logfile, " ");
1202
1203 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1204 }
1205 else
1206 {
1207 for (i = 0; i < depth; i++)
1208 fprintf (logfile, " ");
1209
1210 if (t->item && t->item->clone.type == FLESH)
1211 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1212 else
1213 fprintf (logfile, "%s\n", &t->item->clone.name);
1214 }
1215
1216 if (t->next_yes)
1217 {
1218 for (i = 0; i < depth; i++)
1219 fprintf (logfile, " ");
1220
1221 fprintf (logfile, " (if yes)\n");
1222 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1223 }
1224
1225 if (t->next_no)
1226 {
1227 for (i = 0; i < depth; i++)
1228 fprintf (logfile, " ");
1229
1230 fprintf (logfile, " (if no)\n");
1231 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1232 }
1233
1234 t = t->next;
1235 }
1236}
1237
1238/*
1239 * For debugging purposes. Dumps all treasures for a given monster.
1240 * Created originally by Raphael Quinet for debugging the alchemy code.
1241 */
1242void
1243dump_monster_treasure (const char *name)
1244{
1245 archetype *at;
1246 int found;
1247
1248 found = 0;
1249 fprintf (logfile, "\n");
1250
1251 for (at = first_archetype; at != NULL; at = at->next)
1252 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1253 {
1254 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1255 if (at->clone.randomitems != NULL)
1256 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1257 else
1258 fprintf (logfile, "(nothing)\n");
1259
1260 fprintf (logfile, "\n");
1261 found++;
1262 }
1263
1264 if (found == 0)
1265 fprintf (logfile, "No objects have the name %s!\n\n", name);
1266}
1267
1268/*
1269 * Builds up the lists of artifacts from the file in the libdir.
1270 */
1271void
1272init_artifacts (void) 1181init_artifacts ()
1273{ 1182{
1274 static int has_been_inited = 0; 1183 static int has_been_inited = 0;
1275 char filename[MAX_BUF]; 1184 char filename[MAX_BUF];
1276 artifact *art = NULL; 1185 artifact *art = NULL;
1277 artifactlist *al; 1186 artifactlist *al;
… …
1285 object_thawer f (filename); 1194 object_thawer f (filename);
1286 1195
1287 if (!f) 1196 if (!f)
1288 return; 1197 return;
1289 1198
1290 f.next ();
1291
1292 for (;;) 1199 for (;;)
1293 { 1200 {
1294 switch (f.kw) 1201 switch (f.kw)
1295 { 1202 {
1296 case KW_allowed: 1203 case KW_allowed:
… …
1299 1206
1300 { 1207 {
1301 if (!strcmp (f.get_str (), "all")) 1208 if (!strcmp (f.get_str (), "all"))
1302 break; 1209 break;
1303 1210
1304 char *next, *cp = f.get_str (); 1211 const char *cp = f.get_str ();
1305 1212 char *next;
1306 do 1213 do
1307 { 1214 {
1308 if ((next = strchr (cp, ','))) 1215 if ((next = (char *)strchr (cp, ',')))
1309 *next++ = '\0'; 1216 *next++ = '\0';
1310 1217
1311 linked_char *tmp = new linked_char; 1218 linked_char *tmp = new linked_char;
1312 1219
1313 tmp->name = cp; 1220 tmp->name = cp;
… …
1399#endif 1306#endif
1400 op->face = change->face; 1307 op->face = change->face;
1401 } 1308 }
1402 1309
1403 for (i = 0; i < NUM_STATS; i++) 1310 for (i = 0; i < NUM_STATS; i++)
1404 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1311 change_attr_value (&(op->stats), i, change->stats.stat (i));
1405 1312
1406 op->attacktype |= change->attacktype; 1313 op->attacktype |= change->attacktype;
1407 op->path_attuned |= change->path_attuned; 1314 op->path_attuned |= change->path_attuned;
1408 op->path_repelled |= change->path_repelled; 1315 op->path_repelled |= change->path_repelled;
1409 op->path_denied |= change->path_denied; 1316 op->path_denied |= change->path_denied;
1410 op->move_type |= change->move_type; 1317 op->move_type |= change->move_type;
1411 op->stats.luck += change->stats.luck; 1318 op->stats.luck += change->stats.luck;
1412 1319
1413 if (QUERY_FLAG (change, FLAG_CURSED)) 1320 if (change->flag [FLAG_CURSED])
1414 SET_FLAG (op, FLAG_CURSED); 1321 op->set_flag (FLAG_CURSED);
1415 if (QUERY_FLAG (change, FLAG_DAMNED)) 1322 if (change->flag [FLAG_DAMNED])
1416 SET_FLAG (op, FLAG_DAMNED); 1323 op->set_flag (FLAG_DAMNED);
1417 if ((QUERY_FLAG (change, FLAG_CURSED) || QUERY_FLAG (change, FLAG_DAMNED)) && op->magic > 0) 1324 if ((change->flag [FLAG_CURSED] || change->flag [FLAG_DAMNED]) && op->magic > 0)
1418 set_abs_magic (op, -op->magic); 1325 set_abs_magic (op, -op->magic);
1419 1326
1420 if (QUERY_FLAG (change, FLAG_LIFESAVE)) 1327 if (change->flag [FLAG_LIFESAVE])
1421 SET_FLAG (op, FLAG_LIFESAVE); 1328 op->set_flag (FLAG_LIFESAVE);
1422 if (QUERY_FLAG (change, FLAG_REFL_SPELL)) 1329 if (change->flag [FLAG_REFL_SPELL])
1423 SET_FLAG (op, FLAG_REFL_SPELL); 1330 op->set_flag (FLAG_REFL_SPELL);
1424 if (QUERY_FLAG (change, FLAG_STEALTH)) 1331 if (change->flag [FLAG_STEALTH])
1425 SET_FLAG (op, FLAG_STEALTH); 1332 op->set_flag (FLAG_STEALTH);
1426 if (QUERY_FLAG (change, FLAG_XRAYS)) 1333 if (change->flag [FLAG_XRAYS])
1427 SET_FLAG (op, FLAG_XRAYS); 1334 op->set_flag (FLAG_XRAYS);
1428 if (QUERY_FLAG (change, FLAG_BLIND)) 1335 if (change->flag [FLAG_BLIND])
1429 SET_FLAG (op, FLAG_BLIND); 1336 op->set_flag (FLAG_BLIND);
1430 if (QUERY_FLAG (change, FLAG_SEE_IN_DARK)) 1337 if (change->flag [FLAG_SEE_IN_DARK])
1431 SET_FLAG (op, FLAG_SEE_IN_DARK); 1338 op->set_flag (FLAG_SEE_IN_DARK);
1432 if (QUERY_FLAG (change, FLAG_REFL_MISSILE)) 1339 if (change->flag [FLAG_REFL_MISSILE])
1433 SET_FLAG (op, FLAG_REFL_MISSILE); 1340 op->set_flag (FLAG_REFL_MISSILE);
1434 if (QUERY_FLAG (change, FLAG_MAKE_INVIS)) 1341 if (change->flag [FLAG_MAKE_INVIS])
1435 SET_FLAG (op, FLAG_MAKE_INVIS); 1342 op->set_flag (FLAG_MAKE_INVIS);
1436 1343
1437 if (QUERY_FLAG (change, FLAG_STAND_STILL)) 1344 if (change->flag [FLAG_STAND_STILL])
1438 { 1345 {
1439 CLEAR_FLAG (op, FLAG_ANIMATE); 1346 op->clr_flag (FLAG_ANIMATE);
1440 /* so artifacts will join */ 1347 /* so artifacts will join */
1441 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1348 if (!op->flag [FLAG_ALIVE])
1442 op->speed = 0.0; 1349 op->speed = 0.0;
1443 1350
1444 op->set_speed (op->speed); 1351 op->set_speed (op->speed);
1445 } 1352 }
1446 1353
… …
1457 * to cast. So convert that to into a spell and put it into 1364 * to cast. So convert that to into a spell and put it into
1458 * this object. 1365 * this object.
1459 */ 1366 */
1460 if (op->type == HORN || op->type == POTION) 1367 if (op->type == HORN || op->type == POTION)
1461 { 1368 {
1462 object *tmp_obj;
1463
1464 /* Remove any spells this object currently has in it */ 1369 /* Remove any spells this object currently has in it */
1465 while (op->inv)
1466 op->inv->destroy (); 1370 op->destroy_inv (false);
1467 1371
1468 tmp_obj = arch_to_object (change->other_arch); 1372 object *tmp = change->other_arch->instance ();
1469 insert_ob_in_ob (tmp_obj, op); 1373 insert_ob_in_ob (tmp, op);
1470 } 1374 }
1375
1471 /* No harm setting this for potions/horns */ 1376 /* No harm setting this for potions/horns */
1472 op->other_arch = change->other_arch; 1377 op->other_arch = change->other_arch;
1473 } 1378 }
1474 1379
1475 if (change->stats.hp < 0) 1380 if (change->stats.hp < 0)
… …
1559 op->value *= change->value; 1464 op->value *= change->value;
1560 1465
1561 if (change->materials) 1466 if (change->materials)
1562 op->materials = change->materials; 1467 op->materials = change->materials;
1563 1468
1564 if (change->materialname) 1469 if (change->material != MATERIAL_NULL)
1565 op->materialname = change->materialname; 1470 op->material = change->material;
1566 1471
1567 if (change->slaying) 1472 if (change->slaying)
1568 op->slaying = change->slaying; 1473 op->slaying = change->slaying;
1569 1474
1570 if (change->race) 1475 if (change->race)
… …
1593 name = tmp->name + 1, neg = 1; 1498 name = tmp->name + 1, neg = 1;
1594 else 1499 else
1595 name = tmp->name, neg = 0; 1500 name = tmp->name, neg = 0;
1596 1501
1597 /* If we match name, then return the opposite of 'neg' */ 1502 /* If we match name, then return the opposite of 'neg' */
1598 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1503 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1599 return !neg; 1504 return !neg;
1600 1505
1601 /* Set success as true, since if the match was an inverse, it means 1506 /* Set success as true, since if the match was an inverse, it means
1602 * everything is allowed except what we match 1507 * everything is allowed except what we match
1603 */ 1508 */
… …
1622 op->title = new_name; 1527 op->title = new_name;
1623 add_abilities (op, artifct); /* Give out the bonuses */ 1528 add_abilities (op, artifct); /* Give out the bonuses */
1624 1529
1625#if 0 /* Bit verbose, but keep it here until next time I need it... */ 1530#if 0 /* Bit verbose, but keep it here until next time I need it... */
1626 { 1531 {
1627 char identified = QUERY_FLAG (op, FLAG_IDENTIFIED); 1532 char identified = op->flag [FLAG_IDENTIFIED];
1628 1533
1629 SET_FLAG (op, FLAG_IDENTIFIED); 1534 op->set_flag (FLAG_IDENTIFIED);
1630 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL)); 1535 LOG (llevDebug, "Generated artifact %s %s [%s]\n", op->name, op->title, describe_item (op, NULL));
1631 if (!identified) 1536 if (!identified)
1632 CLEAR_FLAG (op, FLAG_IDENTIFIED); 1537 op->clr_flag (FLAG_IDENTIFIED);
1633 } 1538 }
1634#endif 1539#endif
1635 return; 1540 return;
1636} 1541}
1637 1542
… …
1679#if 1 1584#if 1
1680 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1585 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1681#endif 1586#endif
1682 return; 1587 return;
1683 } 1588 }
1684 if (!strcmp (art->item->name, "NONE")) 1589
1590 if (art->item->name == shstr_NONE)
1685 return; 1591 return;
1592
1686 if (FABS (op->magic) < art->item->magic) 1593 if (fabs (op->magic) < art->item->magic)
1687 continue; /* Not magic enough to be this item */ 1594 continue; /* Not magic enough to be this item */
1688 1595
1689 /* Map difficulty not high enough */ 1596 /* Map difficulty not high enough */
1690 if (difficulty < art->difficulty) 1597 if (difficulty < art->difficulty)
1691 continue; 1598 continue;
… …
1742 item->level = donor->level; 1649 item->level = donor->level;
1743 1650
1744 /* if donor has some attacktypes, the flesh is poisonous */ 1651 /* if donor has some attacktypes, the flesh is poisonous */
1745 if (donor->attacktype & AT_POISON) 1652 if (donor->attacktype & AT_POISON)
1746 item->type = POISON; 1653 item->type = POISON;
1654
1747 if (donor->attacktype & AT_ACID) 1655 if (donor->attacktype & AT_ACID)
1748 item->stats.hp = -1 * item->stats.food; 1656 item->stats.hp = -1 * item->stats.food;
1749 SET_FLAG (item, FLAG_NO_STEAL);
1750 }
1751}
1752 1657
1753/* special_potion() - so that old potion code is still done right. */ 1658 item->set_flag (FLAG_NO_STEAL);
1754int 1659 }
1755special_potion (object *op)
1756{
1757 if (op->attacktype)
1758 return 1;
1759
1760 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1761 return 1;
1762
1763 for (int i = 0; i < NROFATTACKS; i++)
1764 if (op->resist[i])
1765 return 1;
1766
1767 return 0;
1768} 1660}
1769 1661
1770void 1662static void
1771free_treasurestruct (treasure *t) 1663free_treasurestruct (treasure *t)
1772{ 1664{
1773 if (t->next) free_treasurestruct (t->next); 1665 if (t->next) free_treasurestruct (t->next);
1774 if (t->next_yes) free_treasurestruct (t->next_yes); 1666 if (t->next_yes) free_treasurestruct (t->next_yes);
1775 if (t->next_no) free_treasurestruct (t->next_no); 1667 if (t->next_no) free_treasurestruct (t->next_no);
1776 1668
1777 delete t; 1669 delete t;
1778} 1670}
1779 1671
1780void 1672static void
1781free_charlinks (linked_char *lc) 1673free_charlinks (linked_char *lc)
1782{ 1674{
1783 if (lc->next) 1675 if (lc->next)
1784 free_charlinks (lc->next); 1676 free_charlinks (lc->next);
1785 1677
1786 delete lc; 1678 delete lc;
1787} 1679}
1788 1680
1789void 1681static void
1790free_artifact (artifact *at) 1682free_artifact (artifact *at)
1791{ 1683{
1792 if (at->next) free_artifact (at->next); 1684 if (at->next) free_artifact (at->next);
1793 if (at->allowed) free_charlinks (at->allowed); 1685 if (at->allowed) free_charlinks (at->allowed);
1794 1686
1795 at->item->destroy (1); 1687 at->item->destroy ();
1796 1688
1797 sfree (at); 1689 sfree (at);
1798} 1690}
1799 1691
1800void
1801free_artifactlist (artifactlist *al)
1802{
1803 artifactlist *nextal;
1804
1805 for (al = first_artifactlist; al; al = nextal)
1806 {
1807 nextal = al->next;
1808
1809 if (al->items)
1810 free_artifact (al->items);
1811
1812 sfree (al);
1813 }
1814}
1815
1816void
1817free_all_treasures (void)
1818{
1819 treasurelist *tl, *next;
1820
1821 for (tl = first_treasurelist; tl; tl = next)
1822 {
1823 clear (tl);
1824
1825 next = tl->next;
1826 delete tl;
1827 }
1828
1829 free_artifactlist (first_artifactlist);
1830}

Diff Legend

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