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.57 by root, Tue Apr 24 00:42:02 2007 UTC vs.
Revision 1.90 by root, Fri Nov 6 13:31:47 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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> 38#include <loader.h>
40 39
41extern char *spell_mapping[]; 40extern char *spell_mapping[];
42 41
43static treasurelist *first_treasurelist; 42static treasurelist *first_treasurelist;
… …
47typedef std::tr1::unordered_map< 46typedef std::tr1::unordered_map<
48 const char *, 47 const char *,
49 treasurelist *, 48 treasurelist *,
50 str_hash, 49 str_hash,
51 str_equal, 50 str_equal,
52 slice_allocator< std::pair<const char *const, treasurelist *> >, 51 slice_allocator< std::pair<const char *const, treasurelist *> >
53 true
54> tl_map_t; 52> tl_map_t;
55 53
56static tl_map_t tl_map; 54static tl_map_t tl_map;
55
56//TODO: class method
57static void free_treasurestruct (treasure *t); // bleh desu
58static void
59clear (treasurelist *tl)
60{
61 if (tl->items)
62 {
63 free_treasurestruct (tl->items);
64 tl->items = 0;
65 }
66
67 tl->total_chance = 0;
68}
57 69
58/* 70/*
59 * Searches for the given treasurelist 71 * Searches for the given treasurelist
60 */ 72 */
61treasurelist * 73treasurelist *
… …
93 } 105 }
94 106
95 return tl; 107 return tl;
96} 108}
97 109
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 110#ifdef TREASURE_DEBUG
112/* recursived checks the linked list. Treasurelist is passed only 111/* recursived checks the linked list. Treasurelist is passed only
113 * so that the treasure name can be printed out 112 * so that the treasure name can be printed out
114 */ 113 */
115static void 114static void
… …
140 139
141 f.next (); 140 f.next ();
142 141
143 for (;;) 142 for (;;)
144 { 143 {
145 coroapi::cede_to_tick_every (10); 144 coroapi::cede_to_tick ();
146 145
147 switch (f.kw) 146 switch (f.kw)
148 { 147 {
149 case KW_arch: 148 case KW_arch:
150 t->item = archetype::get (f.get_str ()); 149 t->item = archetype::find (f.get_str ());
150
151 if (!t->item)
152 {
153 f.parse_warn ("treasure references unknown archetype");
154 t->item = archetype::empty;
155 }
156
151 break; 157 break;
152 158
153 case KW_list: f.get (t->name); break; 159 case KW_list: f.get (t->name); break;
154 case KW_change_name: f.get (t->change_arch.name); break; 160 case KW_change_name: f.get (t->change_arch.name); break;
155 case KW_change_title: f.get (t->change_arch.title); break; 161 case KW_change_title: f.get (t->change_arch.title); break;
… …
169 t->next = read_treasure (f); 175 t->next = read_treasure (f);
170 return t; 176 return t;
171 177
172 default: 178 default:
173 if (!f.parse_error ("treasurelist", t->name)) 179 if (!f.parse_error ("treasurelist", t->name))
174 return 0; 180 goto error;
175 181
176 return t; 182 return t;
177 } 183 }
178 184
179 f.next (); 185 f.next ();
180 } 186 }
187
188 // not reached
189
190error:
191 delete t;
192 return 0;
181} 193}
182 194
183/* 195/*
184 * Each treasure is parsed with the help of load_treasure(). 196 * Each treasure is parsed with the help of load_treasure().
185 */ 197 */
… …
197 209
198 /* This is a one of the many items on the list should be generated. 210 /* 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 211 * Add up the chance total, and check to make sure the yes & no
200 * fields of the treasures are not being used. 212 * fields of the treasures are not being used.
201 */ 213 */
202 tl->total_chance = 0;
203
204 if (one) 214 if (one)
205 { 215 {
206 for (treasure *t = tl->items; t; t = t->next) 216 for (treasure *t = tl->items; t; t = t->next)
207 { 217 {
208 if (t->next_yes || t->next_no) 218 if (t->next_yes || t->next_no)
209 { 219 {
210 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 220 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"); 221 LOG (llevError, " the next_yes or next_no field is set\n");
212 } 222 }
213 223
214 tl->total_chance += t->chance; 224 tl->total_chance += t->chance;
215 } 225 }
… …
246 return; 256 return;
247 } 257 }
248 258
249 op->expand_tail (); 259 op->expand_tail ();
250 260
251 if (ob_blocked (op, creator->map, creator->x, creator->y)) 261 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
252 op->destroy (); 262 op->destroy ();
253 else 263 else
254 { 264 {
255 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 265 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
256 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);
… …
260 { 270 {
261 op = creator->insert (op); 271 op = creator->insert (op);
262 272
263 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 273 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
264 monster_check_apply (creator, op); 274 monster_check_apply (creator, op);
265
266 if (flags & GT_UPDATE_INV)
267 if (object *tmp = creator->in_player ())
268 esrv_send_item (tmp, op);
269 } 275 }
270} 276}
271 277
272/* 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
273 * in the generated object 279 * in the generated object
… …
302 else 308 else
303 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);
304 } 310 }
305 else 311 else
306 { 312 {
307 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 313 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
308 { 314 {
309 object *tmp = arch_to_object (t->item); 315 object *tmp = arch_to_object (t->item);
310 316
311 if (t->nrof && tmp->nrof <= 1) 317 if (t->nrof && tmp->nrof <= 1)
312 tmp->nrof = rndm (t->nrof) + 1; 318 tmp->nrof = rndm (t->nrof) + 1;
… …
359 create_treasure (tl, op, flag, difficulty, tries); 365 create_treasure (tl, op, flag, difficulty, tries);
360 } 366 }
361 else if (t->nrof) 367 else if (t->nrof)
362 create_one_treasure (tl, op, flag, difficulty, tries); 368 create_one_treasure (tl, op, flag, difficulty, tries);
363 } 369 }
364 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 370 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
365 { 371 {
366 if (object *tmp = arch_to_object (t->item)) 372 if (object *tmp = arch_to_object (t->item))
367 { 373 {
368 if (t->nrof && tmp->nrof <= 1) 374 if (t->nrof && tmp->nrof <= 1)
369 tmp->nrof = rndm (t->nrof) + 1; 375 tmp->nrof = rndm (t->nrof) + 1;
… …
399 { 405 {
400 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 406 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
401 return; 407 return;
402 } 408 }
403 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
404 if (tl->total_chance) 419 if (tl->total_chance)
405 create_one_treasure (tl, op, flag, difficulty, tries); 420 create_one_treasure (tl, op, flag, difficulty, tries);
406 else 421 else
407 create_all_treasures (tl->items, op, flag, difficulty, tries); 422 create_all_treasures (tl->items, op, flag, difficulty, tries);
408} 423}
… …
428 443
429 if (ob->inv) 444 if (ob->inv)
430 LOG (llevError, "In generate treasure, created multiple objects.\n"); 445 LOG (llevError, "In generate treasure, created multiple objects.\n");
431 446
432 ob->destroy (); 447 ob->destroy ();
448
433 return tmp; 449 return tmp;
434} 450}
435 451
436/* 452/*
437 * 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
… …
480 * 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)
481 * 497 *
482 * elmex Wed Aug 9 17:44:59 CEST 2006: 498 * elmex Wed Aug 9 17:44:59 CEST 2006:
483 * 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.
484 */ 500 */
485int 501static int
486level_for_item (const object *op, int difficulty) 502level_for_item (const object *op, int difficulty)
487{ 503{
488 int olevel = 0;
489
490 if (!op->inv) 504 if (!op->inv)
491 { 505 {
492 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);
493 return 0; 507 return 0;
494 } 508 }
495 509
496 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
497 511
498 if (olevel <= 0) 512 if (olevel <= 0)
499 olevel = rndm (1, MIN (op->inv->level, 1)); 513 olevel = rndm (1, op->inv->level);
500 514
501 if (olevel > MAXLEVEL) 515 return min (olevel, MAXLEVEL);
502 olevel = MAXLEVEL;
503
504 return olevel;
505} 516}
506 517
507/* 518/*
508 * Based upon the specified difficulty and upon the difftomagic_list array, 519 * Based upon the specified difficulty and upon the difftomagic_list array,
509 * a random magical bonus is returned. This is used when determine 520 * a random magical bonus is returned. This is used when determine
… …
512 * elmex Thu Aug 10 18:45:44 CEST 2006: 523 * elmex Thu Aug 10 18:45:44 CEST 2006:
513 * 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
514 * weird integer between 1-31. 525 * weird integer between 1-31.
515 * 526 *
516 */ 527 */
517int 528static int
518magic_from_difficulty (int difficulty) 529magic_from_difficulty (int difficulty)
519{ 530{
520 int percent = 0, magic = 0; 531 int percent = 0, magic = 0;
521 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 532 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
522 533
… …
565 576
566 op->magic = magic; 577 op->magic = magic;
567 if (op->arch) 578 if (op->arch)
568 { 579 {
569 if (op->type == ARMOUR) 580 if (op->type == ARMOUR)
570 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 581 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
571 582
572 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 */
573 magic = (-magic); 584 magic = (-magic);
585
574 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 586 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
575 } 587 }
576 else 588 else
577 { 589 {
578 if (op->type == ARMOUR) 590 if (op->type == ARMOUR)
579 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 591 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
592
580 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 */
581 magic = (-magic); 594 magic = (-magic);
595
582 op->weight = (op->weight * (100 - magic * 10)) / 100; 596 op->weight = (op->weight * (100 - magic * 10)) / 100;
583 } 597 }
584} 598}
585 599
586/* 600/*
… …
609 * 1) Since rings can have multiple bonuses, if the same bonus 623 * 1) Since rings can have multiple bonuses, if the same bonus
610 * is rolled again, increase it - the bonuses now stack with 624 * is rolled again, increase it - the bonuses now stack with
611 * other bonuses previously rolled and ones the item might natively have. 625 * other bonuses previously rolled and ones the item might natively have.
612 * 2) Add code to deal with new PR method. 626 * 2) Add code to deal with new PR method.
613 */ 627 */
614void 628static void
615set_ring_bonus (object *op, int bonus) 629set_ring_bonus (object *op, int bonus)
616{ 630{
617
618 int r = rndm (bonus > 0 ? 25 : 11); 631 int r = rndm (bonus > 0 ? 25 : 11);
619 632
620 if (op->type == AMULET) 633 if (op->type == AMULET)
621 { 634 {
622 if (!(rndm (21))) 635 if (!(rndm (21)))
… …
641 case 2: 654 case 2:
642 case 3: 655 case 3:
643 case 4: 656 case 4:
644 case 5: 657 case 5:
645 case 6: 658 case 6:
646 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 659 op->stats.stat (r) += bonus;
647 break; 660 break;
648 661
649 case 7: 662 case 7:
650 op->stats.dam += bonus; 663 op->stats.dam += bonus;
651 break; 664 break;
… …
745 * higher is the chance of returning a low number. 758 * higher is the chance of returning a low number.
746 * 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
747 * rings and amulets. 760 * rings and amulets.
748 * 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.
749 */ 762 */
750int 763static int
751get_magic (int diff) 764get_magic (int diff)
752{ 765{
753 int i; 766 int i;
754 767
755 if (diff < 3) 768 if (diff < 3)
… …
758 for (i = 0; i < 4; i++) 771 for (i = 0; i < 4; i++)
759 if (rndm (diff)) 772 if (rndm (diff))
760 return i; 773 return i;
761 774
762 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;
763} 793}
764 794
765#define DICE2 (get_magic(2)==2?2:1) 795#define DICE2 (get_magic(2)==2?2:1)
766#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))
767 797
… …
815 ARG_INT (flags))) 845 ARG_INT (flags)))
816 return; 846 return;
817 847
818 if (!(flags & GT_MINIMAL)) 848 if (!(flags & GT_MINIMAL))
819 { 849 {
820 if (op->arch == crown_arch) 850 if (IS_ARCH (op->arch, crown))
821 { 851 {
822 set_magic (difficulty, op, max_magic, flags); 852 set_magic (difficulty, op, max_magic, flags);
823 num_enchantments = calc_item_power (op, 1); 853 num_enchantments = calc_item_power (op, 1);
824 generate_artifact (op, difficulty); 854 generate_artifact (op, difficulty);
825 } 855 }
… …
830 860
831 num_enchantments = calc_item_power (op, 1); 861 num_enchantments = calc_item_power (op, 1);
832 862
833 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 863 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
834 || op->type == HORN 864 || op->type == HORN
835 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 865 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
836 * used for shop_floors or treasures */
837 generate_artifact (op, difficulty); 866 generate_artifact (op, difficulty);
838 } 867 }
839 868
840 /* Object was made an artifact. Calculate its item_power rating. 869 /* Object was made an artifact. Calculate its item_power rating.
841 * the item_power in the object is what the artfiact adds. 870 * the item_power in the object is what the artfiact adds.
… …
883 { 912 {
884 if (op->type == POTION) 913 if (op->type == POTION)
885 /* Handle healing and magic power potions */ 914 /* Handle healing and magic power potions */
886 if (op->stats.sp && !op->randomitems) 915 if (op->stats.sp && !op->randomitems)
887 { 916 {
888 object *tmp;
889
890 tmp = get_archetype (spell_mapping[op->stats.sp]); 917 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
891 insert_ob_in_ob (tmp, op); 918 insert_ob_in_ob (tmp, op);
892 op->stats.sp = 0; 919 op->stats.sp = 0;
893 } 920 }
894 } 921 }
895 else if (!op->title) /* Only modify object if not special */ 922 else if (!op->title) /* Only modify object if not special */
… …
953 SET_FLAG (op, FLAG_CURSED); 980 SET_FLAG (op, FLAG_CURSED);
954 break; 981 break;
955 } 982 }
956 983
957 case AMULET: 984 case AMULET:
958 if (op->arch == amulet_arch) 985 if (IS_ARCH (op->arch, amulet))
959 op->value *= 5; /* Since it's not just decoration */ 986 op->value *= 5; /* Since it's not just decoration */
960 987
961 case RING: 988 case RING:
962 if (op->arch == NULL)
963 {
964 op->destroy ();
965 op = 0;
966 break;
967 }
968
969 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 989 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
970 break; 990 break;
971 991
972 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 992 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
973 SET_FLAG (op, FLAG_CURSED); 993 SET_FLAG (op, FLAG_CURSED);
974 994
… …
994 op->value *= 5; 1014 op->value *= 5;
995 set_ring_bonus (op, d); 1015 set_ring_bonus (op, d);
996 } 1016 }
997 } 1017 }
998 1018
999 if (GET_ANIM_ID (op)) 1019 if (op->animation_id)
1000 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); 1020 op->set_anim_frame (rndm (op->anim_frames ()));
1001 1021
1002 break; 1022 break;
1003 1023
1004 case BOOK: 1024 case BOOK:
1005 /* Is it an empty book?, if yes lets make a special· 1025 /* Is it an empty book?, if yes lets make a special·
… …
1020 op->level = rndm (creator->level); 1040 op->level = rndm (creator->level);
1021 1041
1022 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1042 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1023 /* books w/ info are worth more! */ 1043 /* books w/ info are worth more! */
1024 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1044 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1025 /* creator related stuff */
1026
1027 /* for library, chained books. Note that some monsters have no_pick
1028 * set - we don't want to set no pick in that case.
1029 */
1030 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1031 SET_FLAG (op, FLAG_NO_PICK);
1032 if (creator->slaying && !op->slaying) /* for check_inv floors */
1033 op->slaying = creator->slaying;
1034 1045
1035 /* add exp so reading it gives xp (once) */ 1046 /* add exp so reading it gives xp (once) */
1036 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1047 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1037 } 1048 }
1049
1050 /* creator related stuff */
1051
1052 /* for library, chained books. Note that some monsters have no_pick
1053 * set - we don't want to set no pick in that case.
1054 */
1055 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1056 SET_FLAG (op, FLAG_NO_PICK);
1057 if (creator->slaying && !op->slaying) /* for check_inv floors */
1058 op->slaying = creator->slaying;
1038 break; 1059 break;
1039 1060
1040 case SPELLBOOK: 1061 case SPELLBOOK:
1041 op->value = op->value * op->inv->value; 1062 op->value = op->value * op->inv->value;
1042 /* add exp so learning gives xp */ 1063 /* add exp so learning gives xp */
… …
1127 * Allocate and return the pointer to an empty artifactlist structure. 1148 * Allocate and return the pointer to an empty artifactlist structure.
1128 */ 1149 */
1129static artifactlist * 1150static artifactlist *
1130get_empty_artifactlist (void) 1151get_empty_artifactlist (void)
1131{ 1152{
1132 return salloc0 <artifactlist> (); 1153 return salloc0<artifactlist> ();
1133} 1154}
1134 1155
1135/* 1156/*
1136 * Allocate and return the pointer to an empty artifact structure. 1157 * Allocate and return the pointer to an empty artifact structure.
1137 */ 1158 */
1138static artifact * 1159static artifact *
1139get_empty_artifact (void) 1160get_empty_artifact (void)
1140{ 1161{
1141 return salloc0 <artifact> (); 1162 return salloc0<artifact> ();
1142} 1163}
1143 1164
1144/* 1165/*
1145 * Searches the artifact lists and returns one that has the same type 1166 * Searches the artifact lists and returns one that has the same type
1146 * of objects on it. 1167 * of objects on it.
… …
1151 for (artifactlist *al = first_artifactlist; al; al = al->next) 1172 for (artifactlist *al = first_artifactlist; al; al = al->next)
1152 if (al->type == type) 1173 if (al->type == type)
1153 return al; 1174 return al;
1154 1175
1155 return 0; 1176 return 0;
1156}
1157
1158/*
1159 * For debugging purposes. Dumps all tables.
1160 */
1161void
1162dump_artifacts (void)
1163{
1164 artifactlist *al;
1165 artifact *art;
1166 linked_char *next;
1167
1168 fprintf (logfile, "\n");
1169 for (al = first_artifactlist; al != NULL; al = al->next)
1170 {
1171 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1172 for (art = al->items; art != NULL; art = art->next)
1173 {
1174 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1175 if (art->allowed != NULL)
1176 {
1177 fprintf (logfile, "\tallowed combinations:");
1178 for (next = art->allowed; next != NULL; next = next->next)
1179 fprintf (logfile, "%s,", &next->name);
1180 fprintf (logfile, "\n");
1181 }
1182 }
1183 }
1184 fprintf (logfile, "\n");
1185}
1186
1187/*
1188 * For debugging purposes. Dumps all treasures recursively (see below).
1189 */
1190void
1191dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1192{
1193 treasurelist *tl;
1194 int i;
1195
1196 if (depth > 100)
1197 return;
1198
1199 while (t)
1200 {
1201 if (t->name)
1202 {
1203 for (i = 0; i < depth; i++)
1204 fprintf (logfile, " ");
1205
1206 fprintf (logfile, "{ (list: %s)\n", &t->name);
1207
1208 tl = treasurelist::find (t->name);
1209 if (tl)
1210 dump_monster_treasure_rec (name, tl->items, depth + 2);
1211
1212 for (i = 0; i < depth; i++)
1213 fprintf (logfile, " ");
1214
1215 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1216 }
1217 else
1218 {
1219 for (i = 0; i < depth; i++)
1220 fprintf (logfile, " ");
1221
1222 if (t->item && t->item->clone.type == FLESH)
1223 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1224 else
1225 fprintf (logfile, "%s\n", &t->item->clone.name);
1226 }
1227
1228 if (t->next_yes)
1229 {
1230 for (i = 0; i < depth; i++)
1231 fprintf (logfile, " ");
1232
1233 fprintf (logfile, " (if yes)\n");
1234 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1235 }
1236
1237 if (t->next_no)
1238 {
1239 for (i = 0; i < depth; i++)
1240 fprintf (logfile, " ");
1241
1242 fprintf (logfile, " (if no)\n");
1243 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1244 }
1245
1246 t = t->next;
1247 }
1248}
1249
1250/*
1251 * For debugging purposes. Dumps all treasures for a given monster.
1252 * Created originally by Raphael Quinet for debugging the alchemy code.
1253 */
1254void
1255dump_monster_treasure (const char *name)
1256{
1257 archetype *at;
1258 int found;
1259
1260 found = 0;
1261 fprintf (logfile, "\n");
1262
1263 for (at = first_archetype; at != NULL; at = at->next)
1264 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1265 {
1266 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1267 if (at->clone.randomitems != NULL)
1268 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1269 else
1270 fprintf (logfile, "(nothing)\n");
1271
1272 fprintf (logfile, "\n");
1273 found++;
1274 }
1275
1276 if (found == 0)
1277 fprintf (logfile, "No objects have the name %s!\n\n", name);
1278} 1177}
1279 1178
1280/* 1179/*
1281 * Builds up the lists of artifacts from the file in the libdir. 1180 * Builds up the lists of artifacts from the file in the libdir.
1282 */ 1181 */
… …
1296 sprintf (filename, "%s/artifacts", settings.datadir); 1195 sprintf (filename, "%s/artifacts", settings.datadir);
1297 object_thawer f (filename); 1196 object_thawer f (filename);
1298 1197
1299 if (!f) 1198 if (!f)
1300 return; 1199 return;
1301
1302 f.next ();
1303 1200
1304 for (;;) 1201 for (;;)
1305 { 1202 {
1306 switch (f.kw) 1203 switch (f.kw)
1307 { 1204 {
… …
1411#endif 1308#endif
1412 op->face = change->face; 1309 op->face = change->face;
1413 } 1310 }
1414 1311
1415 for (i = 0; i < NUM_STATS; i++) 1312 for (i = 0; i < NUM_STATS; i++)
1416 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1313 change_attr_value (&(op->stats), i, change->stats.stat (i));
1417 1314
1418 op->attacktype |= change->attacktype; 1315 op->attacktype |= change->attacktype;
1419 op->path_attuned |= change->path_attuned; 1316 op->path_attuned |= change->path_attuned;
1420 op->path_repelled |= change->path_repelled; 1317 op->path_repelled |= change->path_repelled;
1421 op->path_denied |= change->path_denied; 1318 op->path_denied |= change->path_denied;
… …
1469 * to cast. So convert that to into a spell and put it into 1366 * to cast. So convert that to into a spell and put it into
1470 * this object. 1367 * this object.
1471 */ 1368 */
1472 if (op->type == HORN || op->type == POTION) 1369 if (op->type == HORN || op->type == POTION)
1473 { 1370 {
1474 object *tmp_obj;
1475
1476 /* Remove any spells this object currently has in it */ 1371 /* Remove any spells this object currently has in it */
1477 while (op->inv)
1478 op->inv->destroy (); 1372 op->destroy_inv (false);
1479 1373
1480 tmp_obj = arch_to_object (change->other_arch); 1374 object *tmp = arch_to_object (change->other_arch);
1481 insert_ob_in_ob (tmp_obj, op); 1375 insert_ob_in_ob (tmp, op);
1482 } 1376 }
1483 /* No harm setting this for potions/horns */ 1377 /* No harm setting this for potions/horns */
1484 op->other_arch = change->other_arch; 1378 op->other_arch = change->other_arch;
1485 } 1379 }
1486 1380
… …
1605 name = tmp->name + 1, neg = 1; 1499 name = tmp->name + 1, neg = 1;
1606 else 1500 else
1607 name = tmp->name, neg = 0; 1501 name = tmp->name, neg = 0;
1608 1502
1609 /* If we match name, then return the opposite of 'neg' */ 1503 /* If we match name, then return the opposite of 'neg' */
1610 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1504 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1611 return !neg; 1505 return !neg;
1612 1506
1613 /* Set success as true, since if the match was an inverse, it means 1507 /* Set success as true, since if the match was an inverse, it means
1614 * everything is allowed except what we match 1508 * everything is allowed except what we match
1615 */ 1509 */
… …
1691#if 1 1585#if 1
1692 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1586 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1693#endif 1587#endif
1694 return; 1588 return;
1695 } 1589 }
1696 if (!strcmp (art->item->name, "NONE")) 1590
1591 if (art->item->name == shstr_NONE)
1697 return; 1592 return;
1593
1698 if (FABS (op->magic) < art->item->magic) 1594 if (fabs (op->magic) < art->item->magic)
1699 continue; /* Not magic enough to be this item */ 1595 continue; /* Not magic enough to be this item */
1700 1596
1701 /* Map difficulty not high enough */ 1597 /* Map difficulty not high enough */
1702 if (difficulty < art->difficulty) 1598 if (difficulty < art->difficulty)
1703 continue; 1599 continue;
… …
1754 item->level = donor->level; 1650 item->level = donor->level;
1755 1651
1756 /* if donor has some attacktypes, the flesh is poisonous */ 1652 /* if donor has some attacktypes, the flesh is poisonous */
1757 if (donor->attacktype & AT_POISON) 1653 if (donor->attacktype & AT_POISON)
1758 item->type = POISON; 1654 item->type = POISON;
1655
1759 if (donor->attacktype & AT_ACID) 1656 if (donor->attacktype & AT_ACID)
1760 item->stats.hp = -1 * item->stats.food; 1657 item->stats.hp = -1 * item->stats.food;
1658
1761 SET_FLAG (item, FLAG_NO_STEAL); 1659 SET_FLAG (item, FLAG_NO_STEAL);
1762 } 1660 }
1763} 1661}
1764 1662
1765/* special_potion() - so that old potion code is still done right. */ 1663static void
1766int
1767special_potion (object *op)
1768{
1769 if (op->attacktype)
1770 return 1;
1771
1772 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1773 return 1;
1774
1775 for (int i = 0; i < NROFATTACKS; i++)
1776 if (op->resist[i])
1777 return 1;
1778
1779 return 0;
1780}
1781
1782void
1783free_treasurestruct (treasure *t) 1664free_treasurestruct (treasure *t)
1784{ 1665{
1785 if (t->next) free_treasurestruct (t->next); 1666 if (t->next) free_treasurestruct (t->next);
1786 if (t->next_yes) free_treasurestruct (t->next_yes); 1667 if (t->next_yes) free_treasurestruct (t->next_yes);
1787 if (t->next_no) free_treasurestruct (t->next_no); 1668 if (t->next_no) free_treasurestruct (t->next_no);
1788 1669
1789 delete t; 1670 delete t;
1790} 1671}
1791 1672
1792void 1673static void
1793free_charlinks (linked_char *lc) 1674free_charlinks (linked_char *lc)
1794{ 1675{
1795 if (lc->next) 1676 if (lc->next)
1796 free_charlinks (lc->next); 1677 free_charlinks (lc->next);
1797 1678
1798 delete lc; 1679 delete lc;
1799} 1680}
1800 1681
1801void 1682static void
1802free_artifact (artifact *at) 1683free_artifact (artifact *at)
1803{ 1684{
1804 if (at->next) free_artifact (at->next); 1685 if (at->next) free_artifact (at->next);
1805 if (at->allowed) free_charlinks (at->allowed); 1686 if (at->allowed) free_charlinks (at->allowed);
1806 1687
1807 at->item->destroy (1); 1688 at->item->destroy ();
1808 1689
1809 sfree (at); 1690 sfree (at);
1810} 1691}
1811 1692
1812void 1693static void
1813free_artifactlist (artifactlist *al) 1694free_artifactlist (artifactlist *al)
1814{ 1695{
1815 artifactlist *nextal; 1696 artifactlist *nextal;
1816 1697
1817 for (al = first_artifactlist; al; al = nextal) 1698 for (al = first_artifactlist; al; al = nextal)
… …
1823 1704
1824 sfree (al); 1705 sfree (al);
1825 } 1706 }
1826} 1707}
1827 1708
1828void
1829free_all_treasures (void)
1830{
1831 treasurelist *tl, *next;
1832
1833 for (tl = first_treasurelist; tl; tl = next)
1834 {
1835 clear (tl);
1836
1837 next = tl->next;
1838 delete tl;
1839 }
1840
1841 free_artifactlist (first_artifactlist);
1842}

Diff Legend

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