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.47 by root, Tue Apr 17 18:24:30 2007 UTC vs.
Revision 1.79 by root, Tue Jul 29 02:00:55 2008 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* TREASURE_DEBUG does some checking on the treasurelists after loading. 24/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26 * It is useful for finding bugs in the treasures file. Since it only 25 * 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 26 * slows the startup some (and not actual game play), it is by default
… …
33 32
34//#define TREASURE_VERBOSE 33//#define TREASURE_VERBOSE
35 34
36#include <global.h> 35#include <global.h>
37#include <treasure.h> 36#include <treasure.h>
38#include <funcpoint.h>
39#include <loader.h> 37#include <loader.h>
40 38
41extern char *spell_mapping[]; 39extern char *spell_mapping[];
42 40
43static treasurelist *first_treasurelist; 41static treasurelist *first_treasurelist;
… …
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;
57
58/*
59 * Initialize global archtype pointers:
60 */
61void
62init_archetype_pointers ()
63{
64 int prev_warn = warn_archetypes;
65
66 warn_archetypes = 1;
67
68 if (ring_arch == NULL)
69 ring_arch = archetype::find ("ring");
70 if (amulet_arch == NULL)
71 amulet_arch = archetype::find ("amulet");
72 if (staff_arch == NULL)
73 staff_arch = archetype::find ("staff");
74 if (crown_arch == NULL)
75 crown_arch = archetype::find ("crown");
76
77 warn_archetypes = prev_warn;
78}
79 54
80/* 55/*
81 * Searches for the given treasurelist 56 * Searches for the given treasurelist
82 */ 57 */
83treasurelist * 58treasurelist *
… …
162 137
163 f.next (); 138 f.next ();
164 139
165 for (;;) 140 for (;;)
166 { 141 {
167 coroapi::cede_to_tick_every (10); 142 coroapi::cede_to_tick ();
168 143
169 switch (f.kw) 144 switch (f.kw)
170 { 145 {
171 case KW_arch: 146 case KW_arch:
172 if (!(t->item = archetype::find (f.get_str ()))) 147 t->item = archetype::find (f.get_str ());
173 LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ()); 148
149 if (!t->item)
150 {
151 f.parse_warn ("treasure references unknown archetype");
152 t->item = archetype::empty;
153 }
154
174 break; 155 break;
175 156
176 case KW_list: f.get (t->name); break; 157 case KW_list: f.get (t->name); break;
177 case KW_change_name: f.get (t->change_arch.name); break; 158 case KW_change_name: f.get (t->change_arch.name); break;
178 case KW_change_title: f.get (t->change_arch.title); break; 159 case KW_change_title: f.get (t->change_arch.title); break;
… …
192 t->next = read_treasure (f); 173 t->next = read_treasure (f);
193 return t; 174 return t;
194 175
195 default: 176 default:
196 if (!f.parse_error ("treasurelist", t->name)) 177 if (!f.parse_error ("treasurelist", t->name))
197 return 0; 178 goto error;
198 179
199 return t; 180 return t;
200 } 181 }
201 182
202 f.next (); 183 f.next ();
203 } 184 }
185
186 // not reached
187
188error:
189 delete t;
190 return 0;
204} 191}
205 192
206/* 193/*
207 * Each treasure is parsed with the help of load_treasure(). 194 * Each treasure is parsed with the help of load_treasure().
208 */ 195 */
… …
220 207
221 /* This is a one of the many items on the list should be generated. 208 /* This is a one of the many items on the list should be generated.
222 * Add up the chance total, and check to make sure the yes & no 209 * Add up the chance total, and check to make sure the yes & no
223 * fields of the treasures are not being used. 210 * fields of the treasures are not being used.
224 */ 211 */
225 tl->total_chance = 0;
226
227 if (one) 212 if (one)
228 { 213 {
229 for (treasure *t = tl->items; t; t = t->next) 214 for (treasure *t = tl->items; t; t = t->next)
230 { 215 {
231 if (t->next_yes || t->next_no) 216 if (t->next_yes || t->next_no)
232 { 217 {
233 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 218 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
234 LOG (llevError, " the next_yes or next_no field is set\n"); 219 LOG (llevError, " the next_yes or next_no field is set\n");
235 } 220 }
236 221
237 tl->total_chance += t->chance; 222 tl->total_chance += t->chance;
238 } 223 }
… …
253 * start with equipment, but only their abilities). 238 * start with equipment, but only their abilities).
254 */ 239 */
255static void 240static void
256put_treasure (object *op, object *creator, int flags) 241put_treasure (object *op, object *creator, int flags)
257{ 242{
258 object *tmp; 243 if (flags & GT_ENVIRONMENT)
259 244 {
260 /* Bit of a hack - spells should never be put onto the map. The entire 245 /* Bit of a hack - spells should never be put onto the map. The entire
261 * treasure stuff is a problem - there is no clear idea of knowing 246 * treasure stuff is a problem - there is no clear idea of knowing
262 * this is the original object, or if this is an object that should be created 247 * this is the original object, or if this is an object that should be created
263 * by another object. 248 * by another object.
264 */ 249 */
265 if (flags & GT_ENVIRONMENT && op->type != SPELL) 250 //TODO: flag such as objects... as such (no drop, anybody?)
266 { 251 if (op->type == SPELL)
252 {
253 op->destroy ();
254 return;
255 }
256
257 op->expand_tail ();
258
259 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
260 op->destroy ();
261 else
262 {
267 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 263 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
268 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 264 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
265 }
269 } 266 }
270 else 267 else
271 { 268 {
272 op = creator->insert (op); 269 op = creator->insert (op);
273 270
274 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 271 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
275 monster_check_apply (creator, op); 272 monster_check_apply (creator, op);
276
277 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
278 esrv_send_item (tmp, op);
279 } 273 }
280} 274}
281 275
282/* if there are change_xxx commands in the treasure, we include the changes 276/* if there are change_xxx commands in the treasure, we include the changes
283 * in the generated object 277 * in the generated object
… …
312 else 306 else
313 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); 307 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
314 } 308 }
315 else 309 else
316 { 310 {
317 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 311 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
318 { 312 {
319 object *tmp = arch_to_object (t->item); 313 object *tmp = arch_to_object (t->item);
320 314
321 if (t->nrof && tmp->nrof <= 1) 315 if (t->nrof && tmp->nrof <= 1)
322 tmp->nrof = rndm (t->nrof) + 1; 316 tmp->nrof = rndm (t->nrof) + 1;
… …
369 create_treasure (tl, op, flag, difficulty, tries); 363 create_treasure (tl, op, flag, difficulty, tries);
370 } 364 }
371 else if (t->nrof) 365 else if (t->nrof)
372 create_one_treasure (tl, op, flag, difficulty, tries); 366 create_one_treasure (tl, op, flag, difficulty, tries);
373 } 367 }
374 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 368 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
375 { 369 {
376 if (object *tmp = arch_to_object (t->item)) 370 if (object *tmp = arch_to_object (t->item))
377 { 371 {
378 if (t->nrof && tmp->nrof <= 1) 372 if (t->nrof && tmp->nrof <= 1)
379 tmp->nrof = rndm (t->nrof) + 1; 373 tmp->nrof = rndm (t->nrof) + 1;
… …
381 fix_generated_item (tmp, op, difficulty, t->magic, flag); 375 fix_generated_item (tmp, op, difficulty, t->magic, flag);
382 change_treasure (t, tmp); 376 change_treasure (t, tmp);
383 put_treasure (tmp, op, flag); 377 put_treasure (tmp, op, flag);
384 } 378 }
385 } 379 }
380}
381
382void
383object::create_treasure (treasurelist *tl, int flags)
384{
385 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
386} 386}
387 387
388/* This calls the appropriate treasure creation function. tries is passed 388/* This calls the appropriate treasure creation function. tries is passed
389 * to determine how many list transitions or attempts to create treasure 389 * to determine how many list transitions or attempts to create treasure
390 * have been made. It is really in place to prevent infinite loops with 390 * have been made. It is really in place to prevent infinite loops with
… …
403 { 403 {
404 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 404 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
405 return; 405 return;
406 } 406 }
407 407
408 if (op->flag [FLAG_TREASURE_ENV])
409 {
410 // do not generate items when there already is something above the object
411 if (op->flag [FLAG_IS_FLOOR] && op->above)
412 return;
413
414 flag |= GT_ENVIRONMENT;
415 }
416
408 if (tl->total_chance) 417 if (tl->total_chance)
409 create_one_treasure (tl, op, flag, difficulty, tries); 418 create_one_treasure (tl, op, flag, difficulty, tries);
410 else 419 else
411 create_all_treasures (tl->items, op, flag, difficulty, tries); 420 create_all_treasures (tl->items, op, flag, difficulty, tries);
412} 421}
… …
419object * 428object *
420generate_treasure (treasurelist *tl, int difficulty) 429generate_treasure (treasurelist *tl, int difficulty)
421{ 430{
422 difficulty = clamp (difficulty, 1, settings.max_level); 431 difficulty = clamp (difficulty, 1, settings.max_level);
423 432
424 object *ob = object::create (), *tmp; 433 object *ob = object::create ();
425 434
426 create_treasure (tl, ob, 0, difficulty, 0); 435 create_treasure (tl, ob, 0, difficulty, 0);
427 436
428 /* Don't want to free the object we are about to return */ 437 /* Don't want to free the object we are about to return */
429 tmp = ob->inv; 438 object *tmp = ob->inv;
430 if (tmp != NULL) 439 if (tmp)
431 tmp->remove (); 440 tmp->remove ();
432 441
433 if (ob->inv) 442 if (ob->inv)
434 LOG (llevError, "In generate treasure, created multiple objects.\n"); 443 LOG (llevError, "In generate treasure, created multiple objects.\n");
435 444
… …
443 * The array has two arguments, the difficulty of the level, and the 452 * The array has two arguments, the difficulty of the level, and the
444 * magical bonus "wanted". 453 * magical bonus "wanted".
445 */ 454 */
446 455
447static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 456static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
448
449// chance of magic difficulty 457// chance of magic difficulty
450// +0 +1 +2 +3 +4 458// +0 +1 +2 +3 +4
451 {95, 2, 2, 1, 0}, // 1 459 {95, 2, 2, 1, 0}, // 1
452 {92, 5, 2, 1, 0}, // 2 460 {92, 5, 2, 1, 0}, // 2
453 {85, 10, 4, 1, 0}, // 3 461 {85, 10, 4, 1, 0}, // 3
… …
479 { 0, 0, 0, 3, 97}, // 29 487 { 0, 0, 0, 3, 97}, // 29
480 { 0, 0, 0, 0, 100}, // 30 488 { 0, 0, 0, 0, 100}, // 30
481 { 0, 0, 0, 0, 100}, // 31 489 { 0, 0, 0, 0, 100}, // 31
482}; 490};
483 491
484
485/* calculate the appropriate level for wands staves and scrolls. 492/* calculate the appropriate level for wands staves and scrolls.
486 * This code presumes that op has had its spell object created (in op->inv) 493 * This code presumes that op has had its spell object created (in op->inv)
487 * 494 *
488 * elmex Wed Aug 9 17:44:59 CEST 2006: 495 * elmex Wed Aug 9 17:44:59 CEST 2006:
489 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 496 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
490 */ 497 */
491
492int 498int
493level_for_item (const object *op, int difficulty) 499level_for_item (const object *op, int difficulty)
494{ 500{
495 int olevel = 0;
496
497 if (!op->inv) 501 if (!op->inv)
498 { 502 {
499 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 503 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
500 return 0; 504 return 0;
501 } 505 }
502 506
503 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 507 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
504 508
505 if (olevel <= 0) 509 if (olevel <= 0)
506 olevel = rndm (1, MIN (op->inv->level, 1)); 510 olevel = rndm (1, op->inv->level);
507 511
508 if (olevel > MAXLEVEL) 512 return min (olevel, MAXLEVEL);
509 olevel = MAXLEVEL;
510
511 return olevel;
512} 513}
513 514
514/* 515/*
515 * Based upon the specified difficulty and upon the difftomagic_list array, 516 * Based upon the specified difficulty and upon the difftomagic_list array,
516 * a random magical bonus is returned. This is used when determine 517 * a random magical bonus is returned. This is used when determine
… …
572 573
573 op->magic = magic; 574 op->magic = magic;
574 if (op->arch) 575 if (op->arch)
575 { 576 {
576 if (op->type == ARMOUR) 577 if (op->type == ARMOUR)
577 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 578 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
578 579
579 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 580 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
580 magic = (-magic); 581 magic = (-magic);
582
581 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 583 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
582 } 584 }
583 else 585 else
584 { 586 {
585 if (op->type == ARMOUR) 587 if (op->type == ARMOUR)
586 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 588 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
589
587 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 590 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
588 magic = (-magic); 591 magic = (-magic);
592
589 op->weight = (op->weight * (100 - magic * 10)) / 100; 593 op->weight = (op->weight * (100 - magic * 10)) / 100;
590 } 594 }
591} 595}
592 596
593/* 597/*
… …
648 case 2: 652 case 2:
649 case 3: 653 case 3:
650 case 4: 654 case 4:
651 case 5: 655 case 5:
652 case 6: 656 case 6:
653 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 657 op->stats.stat (r) += bonus;
654 break; 658 break;
655 659
656 case 7: 660 case 7:
657 op->stats.dam += bonus; 661 op->stats.dam += bonus;
658 break; 662 break;
… …
806 save_item_power = op->item_power; 810 save_item_power = op->item_power;
807 op->item_power = 0; 811 op->item_power = 0;
808 812
809 if (op->randomitems && op->type != SPELL) 813 if (op->randomitems && op->type != SPELL)
810 { 814 {
811 create_treasure (op->randomitems, op, flags, difficulty, 0); 815 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
812 if (!op->inv)
813 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
814
815 /* So the treasure doesn't get created again */ 816 /* So the treasure doesn't get created again */
816 op->randomitems = 0; 817 op->randomitems = 0;
817 } 818 }
818 819
819 if (difficulty < 1) 820 if (difficulty < 1)
… …
825 ARG_INT (flags))) 826 ARG_INT (flags)))
826 return; 827 return;
827 828
828 if (!(flags & GT_MINIMAL)) 829 if (!(flags & GT_MINIMAL))
829 { 830 {
830 if (op->arch == crown_arch) 831 if (IS_ARCH (op->arch, crown))
831 { 832 {
832 set_magic (difficulty, op, max_magic, flags); 833 set_magic (difficulty, op, max_magic, flags);
833 num_enchantments = calc_item_power (op, 1); 834 num_enchantments = calc_item_power (op, 1);
834 generate_artifact (op, difficulty); 835 generate_artifact (op, difficulty);
835 } 836 }
… …
840 841
841 num_enchantments = calc_item_power (op, 1); 842 num_enchantments = calc_item_power (op, 1);
842 843
843 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 844 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
844 || op->type == HORN 845 || op->type == HORN
845 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 846 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
846 * used for shop_floors or treasures */
847 generate_artifact (op, difficulty); 847 generate_artifact (op, difficulty);
848 } 848 }
849 849
850 /* Object was made an artifact. Calculate its item_power rating. 850 /* Object was made an artifact. Calculate its item_power rating.
851 * the item_power in the object is what the artfiact adds. 851 * the item_power in the object is what the artfiact adds.
… …
893 { 893 {
894 if (op->type == POTION) 894 if (op->type == POTION)
895 /* Handle healing and magic power potions */ 895 /* Handle healing and magic power potions */
896 if (op->stats.sp && !op->randomitems) 896 if (op->stats.sp && !op->randomitems)
897 { 897 {
898 object *tmp;
899
900 tmp = get_archetype (spell_mapping[op->stats.sp]); 898 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
901 insert_ob_in_ob (tmp, op); 899 insert_ob_in_ob (tmp, op);
902 op->stats.sp = 0; 900 op->stats.sp = 0;
903 } 901 }
904 } 902 }
905 else if (!op->title) /* Only modify object if not special */ 903 else if (!op->title) /* Only modify object if not special */
… …
963 SET_FLAG (op, FLAG_CURSED); 961 SET_FLAG (op, FLAG_CURSED);
964 break; 962 break;
965 } 963 }
966 964
967 case AMULET: 965 case AMULET:
968 if (op->arch == amulet_arch) 966 if (IS_ARCH (op->arch, amulet))
969 op->value *= 5; /* Since it's not just decoration */ 967 op->value *= 5; /* Since it's not just decoration */
970 968
971 case RING: 969 case RING:
972 if (op->arch == NULL) 970 if (!op->arch) // wtf? schmorp
973 { 971 {
974 op->destroy (); 972 op->destroy ();
975 op = 0; 973 op = 0;
976 break; 974 break;
977 } 975 }
978 976
979 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 977 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
980 break; 978 break;
981 979
982 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 980 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
983 SET_FLAG (op, FLAG_CURSED); 981 SET_FLAG (op, FLAG_CURSED);
984 982
… …
1137 * Allocate and return the pointer to an empty artifactlist structure. 1135 * Allocate and return the pointer to an empty artifactlist structure.
1138 */ 1136 */
1139static artifactlist * 1137static artifactlist *
1140get_empty_artifactlist (void) 1138get_empty_artifactlist (void)
1141{ 1139{
1142 return salloc0 <artifactlist> (); 1140 return salloc0<artifactlist> ();
1143} 1141}
1144 1142
1145/* 1143/*
1146 * Allocate and return the pointer to an empty artifact structure. 1144 * Allocate and return the pointer to an empty artifact structure.
1147 */ 1145 */
1148static artifact * 1146static artifact *
1149get_empty_artifact (void) 1147get_empty_artifact (void)
1150{ 1148{
1151 return salloc0 <artifact> (); 1149 return salloc0<artifact> ();
1152} 1150}
1153 1151
1154/* 1152/*
1155 * Searches the artifact lists and returns one that has the same type 1153 * Searches the artifact lists and returns one that has the same type
1156 * of objects on it. 1154 * of objects on it.
… …
1161 for (artifactlist *al = first_artifactlist; al; al = al->next) 1159 for (artifactlist *al = first_artifactlist; al; al = al->next)
1162 if (al->type == type) 1160 if (al->type == type)
1163 return al; 1161 return al;
1164 1162
1165 return 0; 1163 return 0;
1166}
1167
1168/*
1169 * For debugging purposes. Dumps all tables.
1170 */
1171void
1172dump_artifacts (void)
1173{
1174 artifactlist *al;
1175 artifact *art;
1176 linked_char *next;
1177
1178 fprintf (logfile, "\n");
1179 for (al = first_artifactlist; al != NULL; al = al->next)
1180 {
1181 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1182 for (art = al->items; art != NULL; art = art->next)
1183 {
1184 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1185 if (art->allowed != NULL)
1186 {
1187 fprintf (logfile, "\tallowed combinations:");
1188 for (next = art->allowed; next != NULL; next = next->next)
1189 fprintf (logfile, "%s,", &next->name);
1190 fprintf (logfile, "\n");
1191 }
1192 }
1193 }
1194 fprintf (logfile, "\n");
1195}
1196
1197/*
1198 * For debugging purposes. Dumps all treasures recursively (see below).
1199 */
1200void
1201dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1202{
1203 treasurelist *tl;
1204 int i;
1205
1206 if (depth > 100)
1207 return;
1208
1209 while (t)
1210 {
1211 if (t->name)
1212 {
1213 for (i = 0; i < depth; i++)
1214 fprintf (logfile, " ");
1215
1216 fprintf (logfile, "{ (list: %s)\n", &t->name);
1217
1218 tl = treasurelist::find (t->name);
1219 if (tl)
1220 dump_monster_treasure_rec (name, tl->items, depth + 2);
1221
1222 for (i = 0; i < depth; i++)
1223 fprintf (logfile, " ");
1224
1225 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1226 }
1227 else
1228 {
1229 for (i = 0; i < depth; i++)
1230 fprintf (logfile, " ");
1231
1232 if (t->item && t->item->clone.type == FLESH)
1233 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1234 else
1235 fprintf (logfile, "%s\n", &t->item->clone.name);
1236 }
1237
1238 if (t->next_yes)
1239 {
1240 for (i = 0; i < depth; i++)
1241 fprintf (logfile, " ");
1242
1243 fprintf (logfile, " (if yes)\n");
1244 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1245 }
1246
1247 if (t->next_no)
1248 {
1249 for (i = 0; i < depth; i++)
1250 fprintf (logfile, " ");
1251
1252 fprintf (logfile, " (if no)\n");
1253 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1254 }
1255
1256 t = t->next;
1257 }
1258}
1259
1260/*
1261 * For debugging purposes. Dumps all treasures for a given monster.
1262 * Created originally by Raphael Quinet for debugging the alchemy code.
1263 */
1264void
1265dump_monster_treasure (const char *name)
1266{
1267 archetype *at;
1268 int found;
1269
1270 found = 0;
1271 fprintf (logfile, "\n");
1272
1273 for (at = first_archetype; at != NULL; at = at->next)
1274 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1275 {
1276 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1277 if (at->clone.randomitems != NULL)
1278 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1279 else
1280 fprintf (logfile, "(nothing)\n");
1281
1282 fprintf (logfile, "\n");
1283 found++;
1284 }
1285
1286 if (found == 0)
1287 fprintf (logfile, "No objects have the name %s!\n\n", name);
1288} 1164}
1289 1165
1290/* 1166/*
1291 * Builds up the lists of artifacts from the file in the libdir. 1167 * Builds up the lists of artifacts from the file in the libdir.
1292 */ 1168 */
… …
1306 sprintf (filename, "%s/artifacts", settings.datadir); 1182 sprintf (filename, "%s/artifacts", settings.datadir);
1307 object_thawer f (filename); 1183 object_thawer f (filename);
1308 1184
1309 if (!f) 1185 if (!f)
1310 return; 1186 return;
1311
1312 f.next ();
1313 1187
1314 for (;;) 1188 for (;;)
1315 { 1189 {
1316 switch (f.kw) 1190 switch (f.kw)
1317 { 1191 {
… …
1349 break; 1223 break;
1350 1224
1351 case KW_object: 1225 case KW_object:
1352 { 1226 {
1353 art->item = object::create (); 1227 art->item = object::create ();
1228 f.get (art->item->name);
1229 f.next ();
1354 1230
1355 if (!art->item->parse_kv (f)) 1231 if (!art->item->parse_kv (f))
1356 LOG (llevError, "Init_Artifacts: Could not load object.\n"); 1232 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1357 1233
1358 al = find_artifactlist (art->item->type); 1234 al = find_artifactlist (art->item->type);
… …
1419#endif 1295#endif
1420 op->face = change->face; 1296 op->face = change->face;
1421 } 1297 }
1422 1298
1423 for (i = 0; i < NUM_STATS; i++) 1299 for (i = 0; i < NUM_STATS; i++)
1424 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1300 change_attr_value (&(op->stats), i, change->stats.stat (i));
1425 1301
1426 op->attacktype |= change->attacktype; 1302 op->attacktype |= change->attacktype;
1427 op->path_attuned |= change->path_attuned; 1303 op->path_attuned |= change->path_attuned;
1428 op->path_repelled |= change->path_repelled; 1304 op->path_repelled |= change->path_repelled;
1429 op->path_denied |= change->path_denied; 1305 op->path_denied |= change->path_denied;
… …
1593 if (change->msg) 1469 if (change->msg)
1594 op->msg = change->msg; 1470 op->msg = change->msg;
1595} 1471}
1596 1472
1597static int 1473static int
1598legal_artifact_combination (object *op, artifact * art) 1474legal_artifact_combination (object *op, artifact *art)
1599{ 1475{
1600 int neg, success = 0; 1476 int neg, success = 0;
1601 linked_char *tmp; 1477 linked_char *tmp;
1602 const char *name; 1478 const char *name;
1603 1479
1604 if (art->allowed == (linked_char *) NULL) 1480 if (!art->allowed)
1605 return 1; /* Ie, "all" */ 1481 return 1; /* Ie, "all" */
1482
1606 for (tmp = art->allowed; tmp; tmp = tmp->next) 1483 for (tmp = art->allowed; tmp; tmp = tmp->next)
1607 { 1484 {
1608#ifdef TREASURE_VERBOSE 1485#ifdef TREASURE_VERBOSE
1609 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1486 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1610#endif 1487#endif
… …
1612 name = tmp->name + 1, neg = 1; 1489 name = tmp->name + 1, neg = 1;
1613 else 1490 else
1614 name = tmp->name, neg = 0; 1491 name = tmp->name, neg = 0;
1615 1492
1616 /* If we match name, then return the opposite of 'neg' */ 1493 /* If we match name, then return the opposite of 'neg' */
1617 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1494 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1618 return !neg; 1495 return !neg;
1619 1496
1620 /* Set success as true, since if the match was an inverse, it means 1497 /* Set success as true, since if the match was an inverse, it means
1621 * everything is allowed except what we match 1498 * everything is allowed except what we match
1622 */ 1499 */
1623 else if (neg) 1500 else if (neg)
1624 success = 1; 1501 success = 1;
1625 } 1502 }
1503
1626 return success; 1504 return success;
1627} 1505}
1628 1506
1629/* 1507/*
1630 * Fixes the given object, giving it the abilities and titles 1508 * Fixes the given object, giving it the abilities and titles

Diff Legend

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