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.50 by root, Thu Apr 19 16:23:46 2007 UTC vs.
Revision 1.95 by root, Mon Nov 16 22:31:13 2009 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 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 }
230 * start with equipment, but only their abilities). 240 * start with equipment, but only their abilities).
231 */ 241 */
232static void 242static void
233put_treasure (object *op, object *creator, int flags) 243put_treasure (object *op, object *creator, int flags)
234{ 244{
235 object *tmp; 245 if (flags & GT_ENVIRONMENT)
236 246 {
237 /* Bit of a hack - spells should never be put onto the map. The entire 247 /* Bit of a hack - spells should never be put onto the map. The entire
238 * treasure stuff is a problem - there is no clear idea of knowing 248 * treasure stuff is a problem - there is no clear idea of knowing
239 * this is the original object, or if this is an object that should be created 249 * this is the original object, or if this is an object that should be created
240 * by another object. 250 * by another object.
241 */ 251 */
242 if (flags & GT_ENVIRONMENT && op->type != SPELL) 252 //TODO: flag such as objects... as such (no drop, anybody?)
243 { 253 if (op->type == SPELL)
254 {
255 op->destroy ();
256 return;
257 }
258
259 op->expand_tail ();
260
261 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
262 op->destroy ();
263 else
264 {
244 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 265 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
245 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);
267 }
246 } 268 }
247 else 269 else
248 { 270 {
249 op = creator->insert (op); 271 op = creator->insert (op);
250 272
251 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 273 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
252 monster_check_apply (creator, op); 274 monster_check_apply (creator, op);
253
254 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
255 esrv_send_item (tmp, op);
256 } 275 }
257} 276}
258 277
259/* 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
260 * in the generated object 279 * in the generated object
289 else 308 else
290 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);
291 } 310 }
292 else 311 else
293 { 312 {
294 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 313 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
295 { 314 {
296 object *tmp = arch_to_object (t->item); 315 object *tmp = arch_to_object (t->item);
297 316
298 if (t->nrof && tmp->nrof <= 1) 317 if (t->nrof && tmp->nrof <= 1)
299 tmp->nrof = rndm (t->nrof) + 1; 318 tmp->nrof = rndm (t->nrof) + 1;
346 create_treasure (tl, op, flag, difficulty, tries); 365 create_treasure (tl, op, flag, difficulty, tries);
347 } 366 }
348 else if (t->nrof) 367 else if (t->nrof)
349 create_one_treasure (tl, op, flag, difficulty, tries); 368 create_one_treasure (tl, op, flag, difficulty, tries);
350 } 369 }
351 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 370 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
352 { 371 {
353 if (object *tmp = arch_to_object (t->item)) 372 if (object *tmp = arch_to_object (t->item))
354 { 373 {
355 if (t->nrof && tmp->nrof <= 1) 374 if (t->nrof && tmp->nrof <= 1)
356 tmp->nrof = rndm (t->nrof) + 1; 375 tmp->nrof = rndm (t->nrof) + 1;
358 fix_generated_item (tmp, op, difficulty, t->magic, flag); 377 fix_generated_item (tmp, op, difficulty, t->magic, flag);
359 change_treasure (t, tmp); 378 change_treasure (t, tmp);
360 put_treasure (tmp, op, flag); 379 put_treasure (tmp, op, flag);
361 } 380 }
362 } 381 }
382}
383
384void
385object::create_treasure (treasurelist *tl, int flags)
386{
387 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
363} 388}
364 389
365/* This calls the appropriate treasure creation function. tries is passed 390/* This calls the appropriate treasure creation function. tries is passed
366 * to determine how many list transitions or attempts to create treasure 391 * to determine how many list transitions or attempts to create treasure
367 * 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
380 { 405 {
381 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 406 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
382 return; 407 return;
383 } 408 }
384 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
385 if (tl->total_chance) 419 if (tl->total_chance)
386 create_one_treasure (tl, op, flag, difficulty, tries); 420 create_one_treasure (tl, op, flag, difficulty, tries);
387 else 421 else
388 create_all_treasures (tl->items, op, flag, difficulty, tries); 422 create_all_treasures (tl->items, op, flag, difficulty, tries);
389} 423}
409 443
410 if (ob->inv) 444 if (ob->inv)
411 LOG (llevError, "In generate treasure, created multiple objects.\n"); 445 LOG (llevError, "In generate treasure, created multiple objects.\n");
412 446
413 ob->destroy (); 447 ob->destroy ();
448
414 return tmp; 449 return tmp;
415} 450}
416 451
417/* 452/*
418 * 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
461 * 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)
462 * 497 *
463 * elmex Wed Aug 9 17:44:59 CEST 2006: 498 * elmex Wed Aug 9 17:44:59 CEST 2006:
464 * 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.
465 */ 500 */
466int 501static int
467level_for_item (const object *op, int difficulty) 502level_for_item (const object *op, int difficulty)
468{ 503{
469 int olevel = 0;
470
471 if (!op->inv) 504 if (!op->inv)
472 { 505 {
473 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);
474 return 0; 507 return 0;
475 } 508 }
476 509
477 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 510 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
478 511
479 if (olevel <= 0) 512 if (olevel <= 0)
480 olevel = rndm (1, MIN (op->inv->level, 1)); 513 olevel = rndm (1, op->inv->level);
481 514
482 if (olevel > MAXLEVEL) 515 return min (olevel, MAXLEVEL);
483 olevel = MAXLEVEL;
484
485 return olevel;
486} 516}
487 517
488/* 518/*
489 * Based upon the specified difficulty and upon the difftomagic_list array, 519 * Based upon the specified difficulty and upon the difftomagic_list array,
490 * a random magical bonus is returned. This is used when determine 520 * a random magical bonus is returned. This is used when determine
493 * elmex Thu Aug 10 18:45:44 CEST 2006: 523 * elmex Thu Aug 10 18:45:44 CEST 2006:
494 * 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
495 * weird integer between 1-31. 525 * weird integer between 1-31.
496 * 526 *
497 */ 527 */
498int 528static int
499magic_from_difficulty (int difficulty) 529magic_from_difficulty (int difficulty)
500{ 530{
501 int percent = 0, magic = 0; 531 int percent = 0, magic = 0;
502 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS); 532 int scaled_diff = (int) (((double) difficulty / settings.max_level) * DIFFLEVELS);
503 533
546 576
547 op->magic = magic; 577 op->magic = magic;
548 if (op->arch) 578 if (op->arch)
549 { 579 {
550 if (op->type == ARMOUR) 580 if (op->type == ARMOUR)
551 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 581 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
552 582
553 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 */
554 magic = (-magic); 584 magic = (-magic);
585
555 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 586 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
556 } 587 }
557 else 588 else
558 { 589 {
559 if (op->type == ARMOUR) 590 if (op->type == ARMOUR)
560 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 591 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
592
561 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 */
562 magic = (-magic); 594 magic = (-magic);
595
563 op->weight = (op->weight * (100 - magic * 10)) / 100; 596 op->weight = (op->weight * (100 - magic * 10)) / 100;
564 } 597 }
565} 598}
566 599
567/* 600/*
590 * 1) Since rings can have multiple bonuses, if the same bonus 623 * 1) Since rings can have multiple bonuses, if the same bonus
591 * is rolled again, increase it - the bonuses now stack with 624 * is rolled again, increase it - the bonuses now stack with
592 * other bonuses previously rolled and ones the item might natively have. 625 * other bonuses previously rolled and ones the item might natively have.
593 * 2) Add code to deal with new PR method. 626 * 2) Add code to deal with new PR method.
594 */ 627 */
595void 628static void
596set_ring_bonus (object *op, int bonus) 629set_ring_bonus (object *op, int bonus)
597{ 630{
598
599 int r = rndm (bonus > 0 ? 25 : 11); 631 int r = rndm (bonus > 0 ? 25 : 11);
600 632
601 if (op->type == AMULET) 633 if (op->type == AMULET)
602 { 634 {
603 if (!(rndm (21))) 635 if (!(rndm (21)))
622 case 2: 654 case 2:
623 case 3: 655 case 3:
624 case 4: 656 case 4:
625 case 5: 657 case 5:
626 case 6: 658 case 6:
627 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 659 op->stats.stat (r) += bonus;
628 break; 660 break;
629 661
630 case 7: 662 case 7:
631 op->stats.dam += bonus; 663 op->stats.dam += bonus;
632 break; 664 break;
726 * higher is the chance of returning a low number. 758 * higher is the chance of returning a low number.
727 * 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
728 * rings and amulets. 760 * rings and amulets.
729 * 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.
730 */ 762 */
731int 763static int
732get_magic (int diff) 764get_magic (int diff)
733{ 765{
734 int i; 766 int i;
735 767
736 if (diff < 3) 768 if (diff < 3)
739 for (i = 0; i < 4; i++) 771 for (i = 0; i < 4; i++)
740 if (rndm (diff)) 772 if (rndm (diff))
741 return i; 773 return i;
742 774
743 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;
744} 793}
745 794
746#define DICE2 (get_magic(2)==2?2:1) 795#define DICE2 (get_magic(2)==2?2:1)
747#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))
748 797
796 ARG_INT (flags))) 845 ARG_INT (flags)))
797 return; 846 return;
798 847
799 if (!(flags & GT_MINIMAL)) 848 if (!(flags & GT_MINIMAL))
800 { 849 {
801 if (op->arch == crown_arch) 850 if (IS_ARCH (op->arch, crown))
802 { 851 {
803 set_magic (difficulty, op, max_magic, flags); 852 set_magic (difficulty, op, max_magic, flags);
804 num_enchantments = calc_item_power (op, 1); 853 num_enchantments = calc_item_power (op, 1);
805 generate_artifact (op, difficulty); 854 generate_artifact (op, difficulty);
806 } 855 }
811 860
812 num_enchantments = calc_item_power (op, 1); 861 num_enchantments = calc_item_power (op, 1);
813 862
814 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 863 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
815 || op->type == HORN 864 || op->type == HORN
816 || 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 */
817 * used for shop_floors or treasures */
818 generate_artifact (op, difficulty); 866 generate_artifact (op, difficulty);
819 } 867 }
820 868
821 /* Object was made an artifact. Calculate its item_power rating. 869 /* Object was made an artifact. Calculate its item_power rating.
822 * the item_power in the object is what the artfiact adds. 870 * the item_power in the object is what the artfiact adds.
856 * again below */ 904 * again below */
857 } 905 }
858 } 906 }
859 907
860 /* materialtype modifications. Note we allow this on artifacts. */ 908 /* materialtype modifications. Note we allow this on artifacts. */
861 set_materialname (op, difficulty, NULL); 909 select_material (op, difficulty);
862 910
863 if (flags & GT_MINIMAL) 911 if (flags & GT_MINIMAL)
864 { 912 {
865 if (op->type == POTION) 913 if (op->type == POTION)
866 /* Handle healing and magic power potions */ 914 /* Handle healing and magic power potions */
867 if (op->stats.sp && !op->randomitems) 915 if (op->stats.sp && !op->randomitems)
868 { 916 {
869 object *tmp;
870
871 tmp = get_archetype (spell_mapping[op->stats.sp]); 917 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
872 insert_ob_in_ob (tmp, op); 918 insert_ob_in_ob (tmp, op);
873 op->stats.sp = 0; 919 op->stats.sp = 0;
874 } 920 }
875 } 921 }
876 else if (!op->title) /* Only modify object if not special */ 922 else if (!op->title) /* Only modify object if not special */
934 SET_FLAG (op, FLAG_CURSED); 980 SET_FLAG (op, FLAG_CURSED);
935 break; 981 break;
936 } 982 }
937 983
938 case AMULET: 984 case AMULET:
939 if (op->arch == amulet_arch) 985 if (IS_ARCH (op->arch, amulet))
940 op->value *= 5; /* Since it's not just decoration */ 986 op->value *= 5; /* Since it's not just decoration */
941 987
942 case RING: 988 case RING:
943 if (op->arch == NULL)
944 {
945 op->destroy ();
946 op = 0;
947 break;
948 }
949
950 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! */
951 break; 990 break;
952 991
953 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 992 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
954 SET_FLAG (op, FLAG_CURSED); 993 SET_FLAG (op, FLAG_CURSED);
955 994
975 op->value *= 5; 1014 op->value *= 5;
976 set_ring_bonus (op, d); 1015 set_ring_bonus (op, d);
977 } 1016 }
978 } 1017 }
979 1018
980 if (GET_ANIM_ID (op)) 1019 if (op->animation_id)
981 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); 1020 op->set_anim_frame (rndm (op->anim_frames ()));
982 1021
983 break; 1022 break;
984 1023
985 case BOOK: 1024 case BOOK:
986 /* Is it an empty book?, if yes lets make a special· 1025 /* Is it an empty book?, if yes lets make a special·
1001 op->level = rndm (creator->level); 1040 op->level = rndm (creator->level);
1002 1041
1003 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);
1004 /* books w/ info are worth more! */ 1043 /* books w/ info are worth more! */
1005 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));
1006 /* creator related stuff */
1007
1008 /* for library, chained books. Note that some monsters have no_pick
1009 * set - we don't want to set no pick in that case.
1010 */
1011 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1012 SET_FLAG (op, FLAG_NO_PICK);
1013 if (creator->slaying && !op->slaying) /* for check_inv floors */
1014 op->slaying = creator->slaying;
1015 1045
1016 /* add exp so reading it gives xp (once) */ 1046 /* add exp so reading it gives xp (once) */
1017 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;
1018 } 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;
1019 break; 1059 break;
1020 1060
1021 case SPELLBOOK: 1061 case SPELLBOOK:
1022 op->value = op->value * op->inv->value; 1062 op->value = op->value * op->inv->value;
1023 /* add exp so learning gives xp */ 1063 /* add exp so learning gives xp */
1057 * 10 time multiplier). This way, the value are a bit more reasonable. 1097 * 10 time multiplier). This way, the value are a bit more reasonable.
1058 */ 1098 */
1059 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50); 1099 op->value = op->value * op->inv->value * (op->level + 50) / (op->inv->level + 50);
1060 /* maxhp is used to denote how many 'charges' the rod holds before */ 1100 /* maxhp is used to denote how many 'charges' the rod holds before */
1061 if (op->stats.maxhp) 1101 if (op->stats.maxhp)
1062 op->stats.maxhp *= MAX (op->inv->stats.sp, op->inv->stats.grace); 1102 op->stats.maxhp *= max (op->inv->stats.sp, op->inv->stats.grace);
1063 else 1103 else
1064 op->stats.maxhp = 2 * MAX (op->inv->stats.sp, op->inv->stats.grace); 1104 op->stats.maxhp = 2 * max (op->inv->stats.sp, op->inv->stats.grace);
1065 1105
1066 op->stats.hp = op->stats.maxhp; 1106 op->stats.hp = op->stats.maxhp;
1067 break; 1107 break;
1068 1108
1069 case SCROLL: 1109 case SCROLL:
1108 * Allocate and return the pointer to an empty artifactlist structure. 1148 * Allocate and return the pointer to an empty artifactlist structure.
1109 */ 1149 */
1110static artifactlist * 1150static artifactlist *
1111get_empty_artifactlist (void) 1151get_empty_artifactlist (void)
1112{ 1152{
1113 return salloc0 <artifactlist> (); 1153 return salloc0<artifactlist> ();
1114} 1154}
1115 1155
1116/* 1156/*
1117 * Allocate and return the pointer to an empty artifact structure. 1157 * Allocate and return the pointer to an empty artifact structure.
1118 */ 1158 */
1119static artifact * 1159static artifact *
1120get_empty_artifact (void) 1160get_empty_artifact (void)
1121{ 1161{
1122 return salloc0 <artifact> (); 1162 return salloc0<artifact> ();
1123} 1163}
1124 1164
1125/* 1165/*
1126 * 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
1127 * of objects on it. 1167 * of objects on it.
1132 for (artifactlist *al = first_artifactlist; al; al = al->next) 1172 for (artifactlist *al = first_artifactlist; al; al = al->next)
1133 if (al->type == type) 1173 if (al->type == type)
1134 return al; 1174 return al;
1135 1175
1136 return 0; 1176 return 0;
1137}
1138
1139/*
1140 * For debugging purposes. Dumps all tables.
1141 */
1142void
1143dump_artifacts (void)
1144{
1145 artifactlist *al;
1146 artifact *art;
1147 linked_char *next;
1148
1149 fprintf (logfile, "\n");
1150 for (al = first_artifactlist; al != NULL; al = al->next)
1151 {
1152 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1153 for (art = al->items; art != NULL; art = art->next)
1154 {
1155 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1156 if (art->allowed != NULL)
1157 {
1158 fprintf (logfile, "\tallowed combinations:");
1159 for (next = art->allowed; next != NULL; next = next->next)
1160 fprintf (logfile, "%s,", &next->name);
1161 fprintf (logfile, "\n");
1162 }
1163 }
1164 }
1165 fprintf (logfile, "\n");
1166}
1167
1168/*
1169 * For debugging purposes. Dumps all treasures recursively (see below).
1170 */
1171void
1172dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1173{
1174 treasurelist *tl;
1175 int i;
1176
1177 if (depth > 100)
1178 return;
1179
1180 while (t)
1181 {
1182 if (t->name)
1183 {
1184 for (i = 0; i < depth; i++)
1185 fprintf (logfile, " ");
1186
1187 fprintf (logfile, "{ (list: %s)\n", &t->name);
1188
1189 tl = treasurelist::find (t->name);
1190 if (tl)
1191 dump_monster_treasure_rec (name, tl->items, depth + 2);
1192
1193 for (i = 0; i < depth; i++)
1194 fprintf (logfile, " ");
1195
1196 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1197 }
1198 else
1199 {
1200 for (i = 0; i < depth; i++)
1201 fprintf (logfile, " ");
1202
1203 if (t->item && t->item->clone.type == FLESH)
1204 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1205 else
1206 fprintf (logfile, "%s\n", &t->item->clone.name);
1207 }
1208
1209 if (t->next_yes)
1210 {
1211 for (i = 0; i < depth; i++)
1212 fprintf (logfile, " ");
1213
1214 fprintf (logfile, " (if yes)\n");
1215 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1216 }
1217
1218 if (t->next_no)
1219 {
1220 for (i = 0; i < depth; i++)
1221 fprintf (logfile, " ");
1222
1223 fprintf (logfile, " (if no)\n");
1224 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1225 }
1226
1227 t = t->next;
1228 }
1229}
1230
1231/*
1232 * For debugging purposes. Dumps all treasures for a given monster.
1233 * Created originally by Raphael Quinet for debugging the alchemy code.
1234 */
1235void
1236dump_monster_treasure (const char *name)
1237{
1238 archetype *at;
1239 int found;
1240
1241 found = 0;
1242 fprintf (logfile, "\n");
1243
1244 for (at = first_archetype; at != NULL; at = at->next)
1245 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1246 {
1247 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1248 if (at->clone.randomitems != NULL)
1249 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1250 else
1251 fprintf (logfile, "(nothing)\n");
1252
1253 fprintf (logfile, "\n");
1254 found++;
1255 }
1256
1257 if (found == 0)
1258 fprintf (logfile, "No objects have the name %s!\n\n", name);
1259} 1177}
1260 1178
1261/* 1179/*
1262 * 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.
1263 */ 1181 */
1278 object_thawer f (filename); 1196 object_thawer f (filename);
1279 1197
1280 if (!f) 1198 if (!f)
1281 return; 1199 return;
1282 1200
1283 f.next ();
1284
1285 for (;;) 1201 for (;;)
1286 { 1202 {
1287 switch (f.kw) 1203 switch (f.kw)
1288 { 1204 {
1289 case KW_allowed: 1205 case KW_allowed:
1292 1208
1293 { 1209 {
1294 if (!strcmp (f.get_str (), "all")) 1210 if (!strcmp (f.get_str (), "all"))
1295 break; 1211 break;
1296 1212
1297 char *next, *cp = f.get_str (); 1213 const char *cp = f.get_str ();
1298 1214 char *next;
1299 do 1215 do
1300 { 1216 {
1301 if ((next = strchr (cp, ','))) 1217 if ((next = strchr (cp, ',')))
1302 *next++ = '\0'; 1218 *next++ = '\0';
1303 1219
1392#endif 1308#endif
1393 op->face = change->face; 1309 op->face = change->face;
1394 } 1310 }
1395 1311
1396 for (i = 0; i < NUM_STATS; i++) 1312 for (i = 0; i < NUM_STATS; i++)
1397 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1313 change_attr_value (&(op->stats), i, change->stats.stat (i));
1398 1314
1399 op->attacktype |= change->attacktype; 1315 op->attacktype |= change->attacktype;
1400 op->path_attuned |= change->path_attuned; 1316 op->path_attuned |= change->path_attuned;
1401 op->path_repelled |= change->path_repelled; 1317 op->path_repelled |= change->path_repelled;
1402 op->path_denied |= change->path_denied; 1318 op->path_denied |= change->path_denied;
1450 * 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
1451 * this object. 1367 * this object.
1452 */ 1368 */
1453 if (op->type == HORN || op->type == POTION) 1369 if (op->type == HORN || op->type == POTION)
1454 { 1370 {
1455 object *tmp_obj;
1456
1457 /* Remove any spells this object currently has in it */ 1371 /* Remove any spells this object currently has in it */
1458 while (op->inv)
1459 op->inv->destroy (); 1372 op->destroy_inv (false);
1460 1373
1461 tmp_obj = arch_to_object (change->other_arch); 1374 object *tmp = arch_to_object (change->other_arch);
1462 insert_ob_in_ob (tmp_obj, op); 1375 insert_ob_in_ob (tmp, op);
1463 } 1376 }
1464 /* No harm setting this for potions/horns */ 1377 /* No harm setting this for potions/horns */
1465 op->other_arch = change->other_arch; 1378 op->other_arch = change->other_arch;
1466 } 1379 }
1467 1380
1552 op->value *= change->value; 1465 op->value *= change->value;
1553 1466
1554 if (change->materials) 1467 if (change->materials)
1555 op->materials = change->materials; 1468 op->materials = change->materials;
1556 1469
1557 if (change->materialname) 1470 if (change->material != MATERIAL_NULL)
1558 op->materialname = change->materialname; 1471 op->material = change->material;
1559 1472
1560 if (change->slaying) 1473 if (change->slaying)
1561 op->slaying = change->slaying; 1474 op->slaying = change->slaying;
1562 1475
1563 if (change->race) 1476 if (change->race)
1566 if (change->msg) 1479 if (change->msg)
1567 op->msg = change->msg; 1480 op->msg = change->msg;
1568} 1481}
1569 1482
1570static int 1483static int
1571legal_artifact_combination (object *op, artifact * art) 1484legal_artifact_combination (object *op, artifact *art)
1572{ 1485{
1573 int neg, success = 0; 1486 int neg, success = 0;
1574 linked_char *tmp; 1487 linked_char *tmp;
1575 const char *name; 1488 const char *name;
1576 1489
1577 if (art->allowed == (linked_char *) NULL) 1490 if (!art->allowed)
1578 return 1; /* Ie, "all" */ 1491 return 1; /* Ie, "all" */
1492
1579 for (tmp = art->allowed; tmp; tmp = tmp->next) 1493 for (tmp = art->allowed; tmp; tmp = tmp->next)
1580 { 1494 {
1581#ifdef TREASURE_VERBOSE 1495#ifdef TREASURE_VERBOSE
1582 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1496 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1583#endif 1497#endif
1585 name = tmp->name + 1, neg = 1; 1499 name = tmp->name + 1, neg = 1;
1586 else 1500 else
1587 name = tmp->name, neg = 0; 1501 name = tmp->name, neg = 0;
1588 1502
1589 /* If we match name, then return the opposite of 'neg' */ 1503 /* If we match name, then return the opposite of 'neg' */
1590 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)))
1591 return !neg; 1505 return !neg;
1592 1506
1593 /* 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
1594 * everything is allowed except what we match 1508 * everything is allowed except what we match
1595 */ 1509 */
1596 else if (neg) 1510 else if (neg)
1597 success = 1; 1511 success = 1;
1598 } 1512 }
1513
1599 return success; 1514 return success;
1600} 1515}
1601 1516
1602/* 1517/*
1603 * Fixes the given object, giving it the abilities and titles 1518 * Fixes the given object, giving it the abilities and titles
1670#if 1 1585#if 1
1671 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);
1672#endif 1587#endif
1673 return; 1588 return;
1674 } 1589 }
1675 if (!strcmp (art->item->name, "NONE")) 1590
1591 if (art->item->name == shstr_NONE)
1676 return; 1592 return;
1593
1677 if (FABS (op->magic) < art->item->magic) 1594 if (fabs (op->magic) < art->item->magic)
1678 continue; /* Not magic enough to be this item */ 1595 continue; /* Not magic enough to be this item */
1679 1596
1680 /* Map difficulty not high enough */ 1597 /* Map difficulty not high enough */
1681 if (difficulty < art->difficulty) 1598 if (difficulty < art->difficulty)
1682 continue; 1599 continue;
1733 item->level = donor->level; 1650 item->level = donor->level;
1734 1651
1735 /* if donor has some attacktypes, the flesh is poisonous */ 1652 /* if donor has some attacktypes, the flesh is poisonous */
1736 if (donor->attacktype & AT_POISON) 1653 if (donor->attacktype & AT_POISON)
1737 item->type = POISON; 1654 item->type = POISON;
1655
1738 if (donor->attacktype & AT_ACID) 1656 if (donor->attacktype & AT_ACID)
1739 item->stats.hp = -1 * item->stats.food; 1657 item->stats.hp = -1 * item->stats.food;
1658
1740 SET_FLAG (item, FLAG_NO_STEAL); 1659 SET_FLAG (item, FLAG_NO_STEAL);
1741 } 1660 }
1742} 1661}
1743 1662
1744/* special_potion() - so that old potion code is still done right. */ 1663static void
1745int
1746special_potion (object *op)
1747{
1748 if (op->attacktype)
1749 return 1;
1750
1751 if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
1752 return 1;
1753
1754 for (int i = 0; i < NROFATTACKS; i++)
1755 if (op->resist[i])
1756 return 1;
1757
1758 return 0;
1759}
1760
1761void
1762free_treasurestruct (treasure *t) 1664free_treasurestruct (treasure *t)
1763{ 1665{
1764 if (t->next) free_treasurestruct (t->next); 1666 if (t->next) free_treasurestruct (t->next);
1765 if (t->next_yes) free_treasurestruct (t->next_yes); 1667 if (t->next_yes) free_treasurestruct (t->next_yes);
1766 if (t->next_no) free_treasurestruct (t->next_no); 1668 if (t->next_no) free_treasurestruct (t->next_no);
1767 1669
1768 delete t; 1670 delete t;
1769} 1671}
1770 1672
1771void 1673static void
1772free_charlinks (linked_char *lc) 1674free_charlinks (linked_char *lc)
1773{ 1675{
1774 if (lc->next) 1676 if (lc->next)
1775 free_charlinks (lc->next); 1677 free_charlinks (lc->next);
1776 1678
1777 delete lc; 1679 delete lc;
1778} 1680}
1779 1681
1780void 1682static void
1781free_artifact (artifact *at) 1683free_artifact (artifact *at)
1782{ 1684{
1783 if (at->next) free_artifact (at->next); 1685 if (at->next) free_artifact (at->next);
1784 if (at->allowed) free_charlinks (at->allowed); 1686 if (at->allowed) free_charlinks (at->allowed);
1785 1687
1786 at->item->destroy (1); 1688 at->item->destroy ();
1787 1689
1788 sfree (at); 1690 sfree (at);
1789} 1691}
1790 1692
1791void
1792free_artifactlist (artifactlist *al)
1793{
1794 artifactlist *nextal;
1795
1796 for (al = first_artifactlist; al; al = nextal)
1797 {
1798 nextal = al->next;
1799
1800 if (al->items)
1801 free_artifact (al->items);
1802
1803 sfree (al);
1804 }
1805}
1806
1807void
1808free_all_treasures (void)
1809{
1810 treasurelist *tl, *next;
1811
1812 for (tl = first_treasurelist; tl; tl = next)
1813 {
1814 clear (tl);
1815
1816 next = tl->next;
1817 delete tl;
1818 }
1819
1820 free_artifactlist (first_artifactlist);
1821}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines