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.55 by root, Sat Apr 21 22:05:52 2007 UTC vs.
Revision 1.87 by sf-marcmagus, Thu Oct 15 16:00:37 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;
57 55
58/* 56/*
… …
140 138
141 f.next (); 139 f.next ();
142 140
143 for (;;) 141 for (;;)
144 { 142 {
145 coroapi::cede_to_tick_every (10); 143 coroapi::cede_to_tick ();
146 144
147 switch (f.kw) 145 switch (f.kw)
148 { 146 {
149 case KW_arch: 147 case KW_arch:
150 t->item = archetype::get (f.get_str ()); 148 t->item = archetype::find (f.get_str ());
149
150 if (!t->item)
151 {
152 f.parse_warn ("treasure references unknown archetype");
153 t->item = archetype::empty;
154 }
155
151 break; 156 break;
152 157
153 case KW_list: f.get (t->name); break; 158 case KW_list: f.get (t->name); break;
154 case KW_change_name: f.get (t->change_arch.name); break; 159 case KW_change_name: f.get (t->change_arch.name); break;
155 case KW_change_title: f.get (t->change_arch.title); break; 160 case KW_change_title: f.get (t->change_arch.title); break;
… …
169 t->next = read_treasure (f); 174 t->next = read_treasure (f);
170 return t; 175 return t;
171 176
172 default: 177 default:
173 if (!f.parse_error ("treasurelist", t->name)) 178 if (!f.parse_error ("treasurelist", t->name))
174 return 0; 179 goto error;
175 180
176 return t; 181 return t;
177 } 182 }
178 183
179 f.next (); 184 f.next ();
180 } 185 }
186
187 // not reached
188
189error:
190 delete t;
191 return 0;
181} 192}
182 193
183/* 194/*
184 * Each treasure is parsed with the help of load_treasure(). 195 * Each treasure is parsed with the help of load_treasure().
185 */ 196 */
… …
197 208
198 /* This is a one of the many items on the list should be generated. 209 /* This is a one of the many items on the list should be generated.
199 * Add up the chance total, and check to make sure the yes & no 210 * Add up the chance total, and check to make sure the yes & no
200 * fields of the treasures are not being used. 211 * fields of the treasures are not being used.
201 */ 212 */
202 tl->total_chance = 0;
203
204 if (one) 213 if (one)
205 { 214 {
206 for (treasure *t = tl->items; t; t = t->next) 215 for (treasure *t = tl->items; t; t = t->next)
207 { 216 {
208 if (t->next_yes || t->next_no) 217 if (t->next_yes || t->next_no)
209 { 218 {
210 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 219 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
211 LOG (llevError, " the next_yes or next_no field is set\n"); 220 LOG (llevError, " the next_yes or next_no field is set\n");
212 } 221 }
213 222
214 tl->total_chance += t->chance; 223 tl->total_chance += t->chance;
215 } 224 }
… …
230 * start with equipment, but only their abilities). 239 * start with equipment, but only their abilities).
231 */ 240 */
232static void 241static void
233put_treasure (object *op, object *creator, int flags) 242put_treasure (object *op, object *creator, int flags)
234{ 243{
244 if (flags & GT_ENVIRONMENT)
245 {
235 /* Bit of a hack - spells should never be put onto the map. The entire 246 /* Bit of a hack - spells should never be put onto the map. The entire
236 * treasure stuff is a problem - there is no clear idea of knowing 247 * treasure stuff is a problem - there is no clear idea of knowing
237 * this is the original object, or if this is an object that should be created 248 * this is the original object, or if this is an object that should be created
238 * by another object. 249 * by another object.
239 */ 250 */
240 if (flags & GT_ENVIRONMENT && op->type != SPELL) 251 //TODO: flag such as objects... as such (no drop, anybody?)
241 { 252 if (op->type == SPELL)
253 {
254 op->destroy ();
255 return;
256 }
257
242 op->expand_tail (); 258 op->expand_tail ();
243 259
244 if (ob_blocked (op, creator->map, creator->x, creator->y)) 260 if (!creator->is_on_map () || op->blocked (creator->map, creator->x, creator->y))
245 op->destroy (); 261 op->destroy ();
246 else 262 else
247 { 263 {
248 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 264 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
249 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 265 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
… …
253 { 269 {
254 op = creator->insert (op); 270 op = creator->insert (op);
255 271
256 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 272 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
257 monster_check_apply (creator, op); 273 monster_check_apply (creator, op);
258
259 if (flags & GT_UPDATE_INV)
260 if (object *tmp = creator->in_player ())
261 esrv_send_item (tmp, op);
262 } 274 }
263} 275}
264 276
265/* if there are change_xxx commands in the treasure, we include the changes 277/* if there are change_xxx commands in the treasure, we include the changes
266 * in the generated object 278 * in the generated object
… …
295 else 307 else
296 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); 308 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
297 } 309 }
298 else 310 else
299 { 311 {
300 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 312 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
301 { 313 {
302 object *tmp = arch_to_object (t->item); 314 object *tmp = arch_to_object (t->item);
303 315
304 if (t->nrof && tmp->nrof <= 1) 316 if (t->nrof && tmp->nrof <= 1)
305 tmp->nrof = rndm (t->nrof) + 1; 317 tmp->nrof = rndm (t->nrof) + 1;
… …
352 create_treasure (tl, op, flag, difficulty, tries); 364 create_treasure (tl, op, flag, difficulty, tries);
353 } 365 }
354 else if (t->nrof) 366 else if (t->nrof)
355 create_one_treasure (tl, op, flag, difficulty, tries); 367 create_one_treasure (tl, op, flag, difficulty, tries);
356 } 368 }
357 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 369 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
358 { 370 {
359 if (object *tmp = arch_to_object (t->item)) 371 if (object *tmp = arch_to_object (t->item))
360 { 372 {
361 if (t->nrof && tmp->nrof <= 1) 373 if (t->nrof && tmp->nrof <= 1)
362 tmp->nrof = rndm (t->nrof) + 1; 374 tmp->nrof = rndm (t->nrof) + 1;
… …
364 fix_generated_item (tmp, op, difficulty, t->magic, flag); 376 fix_generated_item (tmp, op, difficulty, t->magic, flag);
365 change_treasure (t, tmp); 377 change_treasure (t, tmp);
366 put_treasure (tmp, op, flag); 378 put_treasure (tmp, op, flag);
367 } 379 }
368 } 380 }
381}
382
383void
384object::create_treasure (treasurelist *tl, int flags)
385{
386 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
369} 387}
370 388
371/* This calls the appropriate treasure creation function. tries is passed 389/* This calls the appropriate treasure creation function. tries is passed
372 * to determine how many list transitions or attempts to create treasure 390 * to determine how many list transitions or attempts to create treasure
373 * have been made. It is really in place to prevent infinite loops with 391 * have been made. It is really in place to prevent infinite loops with
… …
386 { 404 {
387 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 405 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
388 return; 406 return;
389 } 407 }
390 408
409 if (op->flag [FLAG_TREASURE_ENV])
410 {
411 // do not generate items when there already is something above the object
412 if (op->flag [FLAG_IS_FLOOR] && op->above)
413 return;
414
415 flag |= GT_ENVIRONMENT;
416 }
417
391 if (tl->total_chance) 418 if (tl->total_chance)
392 create_one_treasure (tl, op, flag, difficulty, tries); 419 create_one_treasure (tl, op, flag, difficulty, tries);
393 else 420 else
394 create_all_treasures (tl->items, op, flag, difficulty, tries); 421 create_all_treasures (tl->items, op, flag, difficulty, tries);
395} 422}
… …
415 442
416 if (ob->inv) 443 if (ob->inv)
417 LOG (llevError, "In generate treasure, created multiple objects.\n"); 444 LOG (llevError, "In generate treasure, created multiple objects.\n");
418 445
419 ob->destroy (); 446 ob->destroy ();
447
420 return tmp; 448 return tmp;
421} 449}
422 450
423/* 451/*
424 * This is a new way of calculating the chance for an item to have 452 * This is a new way of calculating the chance for an item to have
… …
470 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 498 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
471 */ 499 */
472int 500int
473level_for_item (const object *op, int difficulty) 501level_for_item (const object *op, int difficulty)
474{ 502{
475 int olevel = 0;
476
477 if (!op->inv) 503 if (!op->inv)
478 { 504 {
479 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 505 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
480 return 0; 506 return 0;
481 } 507 }
482 508
483 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 509 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
484 510
485 if (olevel <= 0) 511 if (olevel <= 0)
486 olevel = rndm (1, MIN (op->inv->level, 1)); 512 olevel = rndm (1, op->inv->level);
487 513
488 if (olevel > MAXLEVEL) 514 return min (olevel, MAXLEVEL);
489 olevel = MAXLEVEL;
490
491 return olevel;
492} 515}
493 516
494/* 517/*
495 * Based upon the specified difficulty and upon the difftomagic_list array, 518 * Based upon the specified difficulty and upon the difftomagic_list array,
496 * a random magical bonus is returned. This is used when determine 519 * a random magical bonus is returned. This is used when determine
… …
552 575
553 op->magic = magic; 576 op->magic = magic;
554 if (op->arch) 577 if (op->arch)
555 { 578 {
556 if (op->type == ARMOUR) 579 if (op->type == ARMOUR)
557 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 580 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
558 581
559 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 582 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
560 magic = (-magic); 583 magic = (-magic);
584
561 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 585 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
562 } 586 }
563 else 587 else
564 { 588 {
565 if (op->type == ARMOUR) 589 if (op->type == ARMOUR)
566 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 590 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
591
567 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 592 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
568 magic = (-magic); 593 magic = (-magic);
594
569 op->weight = (op->weight * (100 - magic * 10)) / 100; 595 op->weight = (op->weight * (100 - magic * 10)) / 100;
570 } 596 }
571} 597}
572 598
573/* 599/*
… …
628 case 2: 654 case 2:
629 case 3: 655 case 3:
630 case 4: 656 case 4:
631 case 5: 657 case 5:
632 case 6: 658 case 6:
633 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 659 op->stats.stat (r) += bonus;
634 break; 660 break;
635 661
636 case 7: 662 case 7:
637 op->stats.dam += bonus; 663 op->stats.dam += bonus;
638 break; 664 break;
… …
802 ARG_INT (flags))) 828 ARG_INT (flags)))
803 return; 829 return;
804 830
805 if (!(flags & GT_MINIMAL)) 831 if (!(flags & GT_MINIMAL))
806 { 832 {
807 if (op->arch == crown_arch) 833 if (IS_ARCH (op->arch, crown))
808 { 834 {
809 set_magic (difficulty, op, max_magic, flags); 835 set_magic (difficulty, op, max_magic, flags);
810 num_enchantments = calc_item_power (op, 1); 836 num_enchantments = calc_item_power (op, 1);
811 generate_artifact (op, difficulty); 837 generate_artifact (op, difficulty);
812 } 838 }
… …
817 843
818 num_enchantments = calc_item_power (op, 1); 844 num_enchantments = calc_item_power (op, 1);
819 845
820 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 846 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
821 || op->type == HORN 847 || op->type == HORN
822 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 848 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
823 * used for shop_floors or treasures */
824 generate_artifact (op, difficulty); 849 generate_artifact (op, difficulty);
825 } 850 }
826 851
827 /* Object was made an artifact. Calculate its item_power rating. 852 /* Object was made an artifact. Calculate its item_power rating.
828 * the item_power in the object is what the artfiact adds. 853 * the item_power in the object is what the artfiact adds.
… …
870 { 895 {
871 if (op->type == POTION) 896 if (op->type == POTION)
872 /* Handle healing and magic power potions */ 897 /* Handle healing and magic power potions */
873 if (op->stats.sp && !op->randomitems) 898 if (op->stats.sp && !op->randomitems)
874 { 899 {
875 object *tmp;
876
877 tmp = get_archetype (spell_mapping[op->stats.sp]); 900 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
878 insert_ob_in_ob (tmp, op); 901 insert_ob_in_ob (tmp, op);
879 op->stats.sp = 0; 902 op->stats.sp = 0;
880 } 903 }
881 } 904 }
882 else if (!op->title) /* Only modify object if not special */ 905 else if (!op->title) /* Only modify object if not special */
… …
940 SET_FLAG (op, FLAG_CURSED); 963 SET_FLAG (op, FLAG_CURSED);
941 break; 964 break;
942 } 965 }
943 966
944 case AMULET: 967 case AMULET:
945 if (op->arch == amulet_arch) 968 if (IS_ARCH (op->arch, amulet))
946 op->value *= 5; /* Since it's not just decoration */ 969 op->value *= 5; /* Since it's not just decoration */
947 970
948 case RING: 971 case RING:
949 if (op->arch == NULL)
950 {
951 op->destroy ();
952 op = 0;
953 break;
954 }
955
956 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 972 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
957 break; 973 break;
958 974
959 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 975 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
960 SET_FLAG (op, FLAG_CURSED); 976 SET_FLAG (op, FLAG_CURSED);
961 977
… …
981 op->value *= 5; 997 op->value *= 5;
982 set_ring_bonus (op, d); 998 set_ring_bonus (op, d);
983 } 999 }
984 } 1000 }
985 1001
986 if (GET_ANIM_ID (op)) 1002 if (op->animation_id)
987 SET_ANIMATION (op, rndm (NUM_ANIMATIONS (op))); 1003 op->set_anim_frame (rndm (op->anim_frames ()));
988 1004
989 break; 1005 break;
990 1006
991 case BOOK: 1007 case BOOK:
992 /* Is it an empty book?, if yes lets make a special· 1008 /* Is it an empty book?, if yes lets make a special·
… …
1007 op->level = rndm (creator->level); 1023 op->level = rndm (creator->level);
1008 1024
1009 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1); 1025 tailor_readable_ob (op, (creator && creator->stats.sp) ? creator->stats.sp : -1);
1010 /* books w/ info are worth more! */ 1026 /* books w/ info are worth more! */
1011 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1)); 1027 op->value *= ((op->level > 10 ? op->level : (op->level + 1) / 2) * ((strlen (op->msg) / 250) + 1));
1012 /* creator related stuff */
1013
1014 /* for library, chained books. Note that some monsters have no_pick
1015 * set - we don't want to set no pick in that case.
1016 */
1017 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1018 SET_FLAG (op, FLAG_NO_PICK);
1019 if (creator->slaying && !op->slaying) /* for check_inv floors */
1020 op->slaying = creator->slaying;
1021 1028
1022 /* add exp so reading it gives xp (once) */ 1029 /* add exp so reading it gives xp (once) */
1023 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10; 1030 op->stats.exp = op->value > 10000 ? op->value / 5 : op->value / 10;
1024 } 1031 }
1032
1033 /* creator related stuff */
1034
1035 /* for library, chained books. Note that some monsters have no_pick
1036 * set - we don't want to set no pick in that case.
1037 */
1038 if (QUERY_FLAG (creator, FLAG_NO_PICK) && !QUERY_FLAG (creator, FLAG_MONSTER))
1039 SET_FLAG (op, FLAG_NO_PICK);
1040 if (creator->slaying && !op->slaying) /* for check_inv floors */
1041 op->slaying = creator->slaying;
1025 break; 1042 break;
1026 1043
1027 case SPELLBOOK: 1044 case SPELLBOOK:
1028 op->value = op->value * op->inv->value; 1045 op->value = op->value * op->inv->value;
1029 /* add exp so learning gives xp */ 1046 /* add exp so learning gives xp */
… …
1114 * Allocate and return the pointer to an empty artifactlist structure. 1131 * Allocate and return the pointer to an empty artifactlist structure.
1115 */ 1132 */
1116static artifactlist * 1133static artifactlist *
1117get_empty_artifactlist (void) 1134get_empty_artifactlist (void)
1118{ 1135{
1119 return salloc0 <artifactlist> (); 1136 return salloc0<artifactlist> ();
1120} 1137}
1121 1138
1122/* 1139/*
1123 * Allocate and return the pointer to an empty artifact structure. 1140 * Allocate and return the pointer to an empty artifact structure.
1124 */ 1141 */
1125static artifact * 1142static artifact *
1126get_empty_artifact (void) 1143get_empty_artifact (void)
1127{ 1144{
1128 return salloc0 <artifact> (); 1145 return salloc0<artifact> ();
1129} 1146}
1130 1147
1131/* 1148/*
1132 * Searches the artifact lists and returns one that has the same type 1149 * Searches the artifact lists and returns one that has the same type
1133 * of objects on it. 1150 * of objects on it.
… …
1138 for (artifactlist *al = first_artifactlist; al; al = al->next) 1155 for (artifactlist *al = first_artifactlist; al; al = al->next)
1139 if (al->type == type) 1156 if (al->type == type)
1140 return al; 1157 return al;
1141 1158
1142 return 0; 1159 return 0;
1143}
1144
1145/*
1146 * For debugging purposes. Dumps all tables.
1147 */
1148void
1149dump_artifacts (void)
1150{
1151 artifactlist *al;
1152 artifact *art;
1153 linked_char *next;
1154
1155 fprintf (logfile, "\n");
1156 for (al = first_artifactlist; al != NULL; al = al->next)
1157 {
1158 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1159 for (art = al->items; art != NULL; art = art->next)
1160 {
1161 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1162 if (art->allowed != NULL)
1163 {
1164 fprintf (logfile, "\tallowed combinations:");
1165 for (next = art->allowed; next != NULL; next = next->next)
1166 fprintf (logfile, "%s,", &next->name);
1167 fprintf (logfile, "\n");
1168 }
1169 }
1170 }
1171 fprintf (logfile, "\n");
1172}
1173
1174/*
1175 * For debugging purposes. Dumps all treasures recursively (see below).
1176 */
1177void
1178dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1179{
1180 treasurelist *tl;
1181 int i;
1182
1183 if (depth > 100)
1184 return;
1185
1186 while (t)
1187 {
1188 if (t->name)
1189 {
1190 for (i = 0; i < depth; i++)
1191 fprintf (logfile, " ");
1192
1193 fprintf (logfile, "{ (list: %s)\n", &t->name);
1194
1195 tl = treasurelist::find (t->name);
1196 if (tl)
1197 dump_monster_treasure_rec (name, tl->items, depth + 2);
1198
1199 for (i = 0; i < depth; i++)
1200 fprintf (logfile, " ");
1201
1202 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1203 }
1204 else
1205 {
1206 for (i = 0; i < depth; i++)
1207 fprintf (logfile, " ");
1208
1209 if (t->item && t->item->clone.type == FLESH)
1210 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1211 else
1212 fprintf (logfile, "%s\n", &t->item->clone.name);
1213 }
1214
1215 if (t->next_yes)
1216 {
1217 for (i = 0; i < depth; i++)
1218 fprintf (logfile, " ");
1219
1220 fprintf (logfile, " (if yes)\n");
1221 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1222 }
1223
1224 if (t->next_no)
1225 {
1226 for (i = 0; i < depth; i++)
1227 fprintf (logfile, " ");
1228
1229 fprintf (logfile, " (if no)\n");
1230 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1231 }
1232
1233 t = t->next;
1234 }
1235}
1236
1237/*
1238 * For debugging purposes. Dumps all treasures for a given monster.
1239 * Created originally by Raphael Quinet for debugging the alchemy code.
1240 */
1241void
1242dump_monster_treasure (const char *name)
1243{
1244 archetype *at;
1245 int found;
1246
1247 found = 0;
1248 fprintf (logfile, "\n");
1249
1250 for (at = first_archetype; at != NULL; at = at->next)
1251 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1252 {
1253 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1254 if (at->clone.randomitems != NULL)
1255 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1256 else
1257 fprintf (logfile, "(nothing)\n");
1258
1259 fprintf (logfile, "\n");
1260 found++;
1261 }
1262
1263 if (found == 0)
1264 fprintf (logfile, "No objects have the name %s!\n\n", name);
1265} 1160}
1266 1161
1267/* 1162/*
1268 * Builds up the lists of artifacts from the file in the libdir. 1163 * Builds up the lists of artifacts from the file in the libdir.
1269 */ 1164 */
… …
1283 sprintf (filename, "%s/artifacts", settings.datadir); 1178 sprintf (filename, "%s/artifacts", settings.datadir);
1284 object_thawer f (filename); 1179 object_thawer f (filename);
1285 1180
1286 if (!f) 1181 if (!f)
1287 return; 1182 return;
1288
1289 f.next ();
1290 1183
1291 for (;;) 1184 for (;;)
1292 { 1185 {
1293 switch (f.kw) 1186 switch (f.kw)
1294 { 1187 {
… …
1398#endif 1291#endif
1399 op->face = change->face; 1292 op->face = change->face;
1400 } 1293 }
1401 1294
1402 for (i = 0; i < NUM_STATS; i++) 1295 for (i = 0; i < NUM_STATS; i++)
1403 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1296 change_attr_value (&(op->stats), i, change->stats.stat (i));
1404 1297
1405 op->attacktype |= change->attacktype; 1298 op->attacktype |= change->attacktype;
1406 op->path_attuned |= change->path_attuned; 1299 op->path_attuned |= change->path_attuned;
1407 op->path_repelled |= change->path_repelled; 1300 op->path_repelled |= change->path_repelled;
1408 op->path_denied |= change->path_denied; 1301 op->path_denied |= change->path_denied;
… …
1456 * to cast. So convert that to into a spell and put it into 1349 * to cast. So convert that to into a spell and put it into
1457 * this object. 1350 * this object.
1458 */ 1351 */
1459 if (op->type == HORN || op->type == POTION) 1352 if (op->type == HORN || op->type == POTION)
1460 { 1353 {
1461 object *tmp_obj;
1462
1463 /* Remove any spells this object currently has in it */ 1354 /* Remove any spells this object currently has in it */
1464 while (op->inv)
1465 op->inv->destroy (); 1355 op->destroy_inv (false);
1466 1356
1467 tmp_obj = arch_to_object (change->other_arch); 1357 object *tmp = arch_to_object (change->other_arch);
1468 insert_ob_in_ob (tmp_obj, op); 1358 insert_ob_in_ob (tmp, op);
1469 } 1359 }
1470 /* No harm setting this for potions/horns */ 1360 /* No harm setting this for potions/horns */
1471 op->other_arch = change->other_arch; 1361 op->other_arch = change->other_arch;
1472 } 1362 }
1473 1363
… …
1592 name = tmp->name + 1, neg = 1; 1482 name = tmp->name + 1, neg = 1;
1593 else 1483 else
1594 name = tmp->name, neg = 0; 1484 name = tmp->name, neg = 0;
1595 1485
1596 /* If we match name, then return the opposite of 'neg' */ 1486 /* If we match name, then return the opposite of 'neg' */
1597 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1487 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1598 return !neg; 1488 return !neg;
1599 1489
1600 /* Set success as true, since if the match was an inverse, it means 1490 /* Set success as true, since if the match was an inverse, it means
1601 * everything is allowed except what we match 1491 * everything is allowed except what we match
1602 */ 1492 */
… …
1678#if 1 1568#if 1
1679 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type); 1569 LOG (llevError, "Got null entry and non zero roll in generate_artifact, type %d\n", op->type);
1680#endif 1570#endif
1681 return; 1571 return;
1682 } 1572 }
1683 if (!strcmp (art->item->name, "NONE")) 1573
1574 if (art->item->name == shstr_NONE)
1684 return; 1575 return;
1576
1685 if (FABS (op->magic) < art->item->magic) 1577 if (fabs (op->magic) < art->item->magic)
1686 continue; /* Not magic enough to be this item */ 1578 continue; /* Not magic enough to be this item */
1687 1579
1688 /* Map difficulty not high enough */ 1580 /* Map difficulty not high enough */
1689 if (difficulty < art->difficulty) 1581 if (difficulty < art->difficulty)
1690 continue; 1582 continue;
… …
1741 item->level = donor->level; 1633 item->level = donor->level;
1742 1634
1743 /* if donor has some attacktypes, the flesh is poisonous */ 1635 /* if donor has some attacktypes, the flesh is poisonous */
1744 if (donor->attacktype & AT_POISON) 1636 if (donor->attacktype & AT_POISON)
1745 item->type = POISON; 1637 item->type = POISON;
1638
1746 if (donor->attacktype & AT_ACID) 1639 if (donor->attacktype & AT_ACID)
1747 item->stats.hp = -1 * item->stats.food; 1640 item->stats.hp = -1 * item->stats.food;
1641
1748 SET_FLAG (item, FLAG_NO_STEAL); 1642 SET_FLAG (item, FLAG_NO_STEAL);
1749 } 1643 }
1750} 1644}
1751 1645
1752/* special_potion() - so that old potion code is still done right. */ 1646/* special_potion() - so that old potion code is still done right. */
… …
1789free_artifact (artifact *at) 1683free_artifact (artifact *at)
1790{ 1684{
1791 if (at->next) free_artifact (at->next); 1685 if (at->next) free_artifact (at->next);
1792 if (at->allowed) free_charlinks (at->allowed); 1686 if (at->allowed) free_charlinks (at->allowed);
1793 1687
1794 at->item->destroy (1); 1688 at->item->destroy ();
1795 1689
1796 sfree (at); 1690 sfree (at);
1797} 1691}
1798 1692
1799void 1693void

Diff Legend

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