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.42 by root, Mon Apr 16 10:14:25 2007 UTC vs.
Revision 1.63 by root, Mon Jun 4 13:04:00 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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 <crossfire@schmorp.de>
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
… …
54> tl_map_t; 54> tl_map_t;
55 55
56static tl_map_t tl_map; 56static tl_map_t tl_map;
57 57
58/* 58/*
59 * Initialize global archtype pointers: 59 * Searches for the given treasurelist
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
80/*
81 * Searches for the given treasurelist in the globally linked list
82 * of treasurelists which has been built by load_treasures().
83 */ 60 */
84treasurelist * 61treasurelist *
85treasurelist::find (const char *name) 62treasurelist::find (const char *name)
86{ 63{
87 if (!name) 64 if (!name)
88 return 0; 65 return 0;
89 66
90 AUTODECL (i, tl_map.find (name)); 67 auto (i, tl_map.find (name));
91 68
92 if (i == tl_map.end ()) 69 if (i == tl_map.end ())
93 return 0; 70 return 0;
94 71
95 return i->second; 72 return i->second;
… …
125 if (tl->items) 102 if (tl->items)
126 { 103 {
127 free_treasurestruct (tl->items); 104 free_treasurestruct (tl->items);
128 tl->items = 0; 105 tl->items = 0;
129 } 106 }
107
108 tl->total_chance = 0;
130} 109}
110
111#ifdef TREASURE_DEBUG
112/* recursived checks the linked list. Treasurelist is passed only
113 * so that the treasure name can be printed out
114 */
115static void
116check_treasurelist (const treasure *t, const treasurelist * tl)
117{
118 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
119 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
120
121 if (t->next)
122 check_treasurelist (t->next, tl);
123
124 if (t->next_yes)
125 check_treasurelist (t->next_yes, tl);
126
127 if (t->next_no)
128 check_treasurelist (t->next_no, tl);
129}
130#endif
131 131
132/* 132/*
133 * Reads the lib/treasure file from disk, and parses the contents 133 * Reads the lib/treasure file from disk, and parses the contents
134 * into an internal treasure structure (very linked lists) 134 * into an internal treasure structure (very linked lists)
135 */ 135 */
136static treasure * 136static treasure *
137load_treasure (object_thawer &f) 137read_treasure (object_thawer &f)
138{ 138{
139 treasure *t = new treasure; 139 treasure *t = new treasure;
140 int value;
141 140
142 nroftreasures++; 141 f.next ();
143 142
144 for (;;) 143 for (;;)
145 { 144 {
146 coroapi::cede_every (10); 145 coroapi::cede_to_tick_every (10);
147
148 f.next ();
149 146
150 switch (f.kw) 147 switch (f.kw)
151 { 148 {
152 case KW_arch: 149 case KW_arch:
153 if (!(t->item = archetype::find (f.get_str ()))) 150 t->item = archetype::get (f.get_str ());
154 LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
155 break; 151 break;
156 152
157 case KW_list: f.get (t->name); break; 153 case KW_list: f.get (t->name); break;
158 case KW_change_name: f.get (t->change_arch.name); break; 154 case KW_change_name: f.get (t->change_arch.name); break;
159 case KW_change_title: f.get (t->change_arch.title); break; 155 case KW_change_title: f.get (t->change_arch.title); break;
160 case KW_change_slaying: f.get (t->change_arch.slaying); break; 156 case KW_change_slaying: f.get (t->change_arch.slaying); break;
161 case KW_chance: f.get (t->chance); break; 157 case KW_chance: f.get (t->chance); break;
162 case KW_nrof: f.get (t->nrof); break; 158 case KW_nrof: f.get (t->nrof); break;
163 case KW_magic: f.get (t->magic); break; 159 case KW_magic: f.get (t->magic); break;
164 160
165 case KW_yes: t->next_yes = load_treasure (f); break; 161 case KW_yes: t->next_yes = read_treasure (f); continue;
166 case KW_no: t->next_no = load_treasure (f); break; 162 case KW_no: t->next_no = read_treasure (f); continue;
167 163
168 case KW_end: 164 case KW_end:
165 f.next ();
169 return t; 166 return t;
170 167
171 case KW_more: 168 case KW_more:
172 t->next = load_treasure (f); 169 t->next = read_treasure (f);
173 return t; 170 return t;
174 171
175 default: 172 default:
176 if (!f.parse_error ("treasure list")) 173 if (!f.parse_error ("treasurelist", t->name))
177 return t; // error 174 return 0;
178 175
179 return t; 176 return t;
180 } 177 }
181 }
182}
183 178
184#ifdef TREASURE_DEBUG 179 f.next ();
185/* recursived checks the linked list. Treasurelist is passed only 180 }
186 * so that the treasure name can be printed out
187 */
188static void
189check_treasurelist (const treasure *t, const treasurelist * tl)
190{
191 if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
192 LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
193
194 if (t->next)
195 check_treasurelist (t->next, tl);
196
197 if (t->next_yes)
198 check_treasurelist (t->next_yes, tl);
199
200 if (t->next_no)
201 check_treasurelist (t->next_no, tl);
202} 181}
203#endif
204 182
205/* 183/*
206 * Opens LIBDIR/treasure and reads all treasure-declarations from it.
207 * Each treasure is parsed with the help of load_treasure(). 184 * Each treasure is parsed with the help of load_treasure().
208 */ 185 */
209bool 186treasurelist *
210load_treasures () 187treasurelist::read (object_thawer &f)
211{ 188{
212 treasure *t; 189 assert (f.kw == KW_treasure || f.kw == KW_treasureone);
213 int comp, line = 0;
214 190
215 char filename[MAX_BUF]; 191 bool one = f.kw == KW_treasureone;
216 sprintf (filename, "%s/%s", settings.datadir, settings.treasures); 192 treasurelist *tl = treasurelist::get (f.get_str ());
217 193 clear (tl);
218 object_thawer f (filename); 194 tl->items = read_treasure (f);
219 195 if (!tl->items)
220 if (!f)
221 {
222 LOG (llevError, "Can't open treasure file.\n");
223 return false; 196 return 0;
197
198 /* 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
200 * fields of the treasures are not being used.
201 */
202 if (one)
224 } 203 {
225 204 for (treasure *t = tl->items; t; t = t->next)
226 f.next ();
227
228 for (;;)
229 {
230 switch (f.kw)
231 { 205 {
232 case KW_treasure: 206 if (t->next_yes || t->next_no)
233 case KW_treasureone:
234 { 207 {
235 bool one = f.kw == KW_treasureone;
236 treasurelist *tl = treasurelist::get (f.get_str ());
237
238 clear (tl);
239 tl->items = load_treasure (f);
240
241 if (!tl->items)
242 return false;
243
244 /* This is a one of the many items on the list should be generated.
245 * Add up the chance total, and check to make sure the yes & no
246 * fields of the treasures are not being used.
247 */
248 if (one)
249 {
250 for (t = tl->items; t; t = t->next)
251 {
252#ifdef TREASURE_DEBUG
253 if (t->next_yes || t->next_no)
254 {
255 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 208 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
256 LOG (llevError, " the next_yes or next_no field is set\n"); 209 LOG (llevError, " the next_yes or next_no field is set\n");
257 }
258#endif
259 tl->total_chance += t->chance;
260 }
261 }
262 } 210 }
263 break;
264 211
265 case KW_EOF: 212 tl->total_chance += t->chance;
266#ifdef TREASURE_DEBUG
267 /* Perform some checks on how valid the treasure data actually is.
268 * verify that list transitions work (ie, the list that it is supposed
269 * to transition to exists). Also, verify that at least the name
270 * or archetype is set for each treasure element.
271 */
272 for (treasurelist *tl = first_treasurelist; tl; tl = tl->next)
273 check_treasurelist (tl->items, tl);
274#endif
275 return true;
276
277 default:
278 if (!f.parse_error ("treasure lists"))
279 return false;
280
281 break;
282 } 213 }
283
284 f.next ();
285 } 214 }
215
216 return tl;
286} 217}
287 218
288/* 219/*
289 * Generates the objects specified by the given treasure. 220 * Generates the objects specified by the given treasure.
290 * It goes recursively through the rest of the linked list. 221 * It goes recursively through the rest of the linked list.
… …
297 * start with equipment, but only their abilities). 228 * start with equipment, but only their abilities).
298 */ 229 */
299static void 230static void
300put_treasure (object *op, object *creator, int flags) 231put_treasure (object *op, object *creator, int flags)
301{ 232{
302 object *tmp; 233 if (flags & GT_ENVIRONMENT)
303 234 {
304 /* Bit of a hack - spells should never be put onto the map. The entire 235 /* Bit of a hack - spells should never be put onto the map. The entire
305 * treasure stuff is a problem - there is no clear idea of knowing 236 * treasure stuff is a problem - there is no clear idea of knowing
306 * this is the original object, or if this is an object that should be created 237 * this is the original object, or if this is an object that should be created
307 * by another object. 238 * by another object.
308 */ 239 */
309 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 //TODO: flag such as objects... as such (no drop, anybody?)
310 { 241 if (op->type == SPELL)
242 {
243 op->destroy ();
244 return;
245 }
246
247 op->expand_tail ();
248
249 if (ob_blocked (op, creator->map, creator->x, creator->y))
250 op->destroy ();
251 else
252 {
311 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 253 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
312 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 254 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
255 }
313 } 256 }
314 else 257 else
315 { 258 {
316 op = creator->insert (op); 259 op = creator->insert (op);
317 260
318 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 261 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
319 monster_check_apply (creator, op); 262 monster_check_apply (creator, op);
320 263
321 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 264 if (flags & GT_UPDATE_INV)
265 if (object *tmp = creator->in_player ())
322 esrv_send_item (tmp, op); 266 esrv_send_item (tmp, op);
323 } 267 }
324} 268}
325 269
326/* if there are change_xxx commands in the treasure, we include the changes 270/* if there are change_xxx commands in the treasure, we include the changes
327 * in the generated object 271 * in the generated object
… …
349 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance) 293 if ((int) t->chance >= 100 || (rndm (100) + 1) < (int) t->chance)
350 { 294 {
351 if (t->name) 295 if (t->name)
352 { 296 {
353 if (difficulty >= t->magic) 297 if (difficulty >= t->magic)
298 if (treasurelist *tl = treasurelist::find (t->name))
354 create_treasure (treasurelist::find (t->name), op, flag, difficulty, tries); 299 create_treasure (tl, op, flag, difficulty, tries);
300 else
301 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
355 } 302 }
356 else 303 else
357 { 304 {
358 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 305 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
359 { 306 {
360 object *tmp = arch_to_object (t->item); 307 object *tmp = arch_to_object (t->item);
361 308
362 if (t->nrof && tmp->nrof <= 1) 309 if (t->nrof && tmp->nrof <= 1)
363 tmp->nrof = rndm (t->nrof) + 1; 310 tmp->nrof = rndm (t->nrof) + 1;
… …
410 create_treasure (tl, op, flag, difficulty, tries); 357 create_treasure (tl, op, flag, difficulty, tries);
411 } 358 }
412 else if (t->nrof) 359 else if (t->nrof)
413 create_one_treasure (tl, op, flag, difficulty, tries); 360 create_one_treasure (tl, op, flag, difficulty, tries);
414 } 361 }
415 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 362 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
416 { 363 {
417 if (object *tmp = arch_to_object (t->item)) 364 if (object *tmp = arch_to_object (t->item))
418 { 365 {
419 if (t->nrof && tmp->nrof <= 1) 366 if (t->nrof && tmp->nrof <= 1)
420 tmp->nrof = rndm (t->nrof) + 1; 367 tmp->nrof = rndm (t->nrof) + 1;
… …
422 fix_generated_item (tmp, op, difficulty, t->magic, flag); 369 fix_generated_item (tmp, op, difficulty, t->magic, flag);
423 change_treasure (t, tmp); 370 change_treasure (t, tmp);
424 put_treasure (tmp, op, flag); 371 put_treasure (tmp, op, flag);
425 } 372 }
426 } 373 }
374}
375
376void
377object::create_treasure (treasurelist *tl, int flags)
378{
379 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
427} 380}
428 381
429/* This calls the appropriate treasure creation function. tries is passed 382/* This calls the appropriate treasure creation function. tries is passed
430 * to determine how many list transitions or attempts to create treasure 383 * to determine how many list transitions or attempts to create treasure
431 * have been made. It is really in place to prevent infinite loops with 384 * have been made. It is really in place to prevent infinite loops with
… …
444 { 397 {
445 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 398 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
446 return; 399 return;
447 } 400 }
448 401
402 if (op->flag [FLAG_TREASURE_ENV])
403 {
404 // do not generate items when there already is something above the object
405 if (op->flag [FLAG_IS_FLOOR] && op->above)
406 return;
407
408 flag |= GT_ENVIRONMENT;
409 }
410
449 if (tl->total_chance) 411 if (tl->total_chance)
450 create_one_treasure (tl, op, flag, difficulty, tries); 412 create_one_treasure (tl, op, flag, difficulty, tries);
451 else 413 else
452 create_all_treasures (tl->items, op, flag, difficulty, tries); 414 create_all_treasures (tl->items, op, flag, difficulty, tries);
453} 415}
… …
460object * 422object *
461generate_treasure (treasurelist *tl, int difficulty) 423generate_treasure (treasurelist *tl, int difficulty)
462{ 424{
463 difficulty = clamp (difficulty, 1, settings.max_level); 425 difficulty = clamp (difficulty, 1, settings.max_level);
464 426
465 object *ob = object::create (), *tmp; 427 object *ob = object::create ();
466 428
467 create_treasure (tl, ob, 0, difficulty, 0); 429 create_treasure (tl, ob, 0, difficulty, 0);
468 430
469 /* Don't want to free the object we are about to return */ 431 /* Don't want to free the object we are about to return */
470 tmp = ob->inv; 432 object *tmp = ob->inv;
471 if (tmp != NULL) 433 if (tmp)
472 tmp->remove (); 434 tmp->remove ();
473 435
474 if (ob->inv) 436 if (ob->inv)
475 LOG (llevError, "In generate treasure, created multiple objects.\n"); 437 LOG (llevError, "In generate treasure, created multiple objects.\n");
476 438
… …
484 * The array has two arguments, the difficulty of the level, and the 446 * The array has two arguments, the difficulty of the level, and the
485 * magical bonus "wanted". 447 * magical bonus "wanted".
486 */ 448 */
487 449
488static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 450static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
489
490// chance of magic difficulty 451// chance of magic difficulty
491// +0 +1 +2 +3 +4 452// +0 +1 +2 +3 +4
492 {95, 2, 2, 1, 0}, // 1 453 {95, 2, 2, 1, 0}, // 1
493 {92, 5, 2, 1, 0}, // 2 454 {92, 5, 2, 1, 0}, // 2
494 {85, 10, 4, 1, 0}, // 3 455 {85, 10, 4, 1, 0}, // 3
… …
520 { 0, 0, 0, 3, 97}, // 29 481 { 0, 0, 0, 3, 97}, // 29
521 { 0, 0, 0, 0, 100}, // 30 482 { 0, 0, 0, 0, 100}, // 30
522 { 0, 0, 0, 0, 100}, // 31 483 { 0, 0, 0, 0, 100}, // 31
523}; 484};
524 485
525
526/* calculate the appropriate level for wands staves and scrolls. 486/* calculate the appropriate level for wands staves and scrolls.
527 * This code presumes that op has had its spell object created (in op->inv) 487 * This code presumes that op has had its spell object created (in op->inv)
528 * 488 *
529 * elmex Wed Aug 9 17:44:59 CEST 2006: 489 * elmex Wed Aug 9 17:44:59 CEST 2006:
530 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 490 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
531 */ 491 */
532
533int 492int
534level_for_item (const object *op, int difficulty) 493level_for_item (const object *op, int difficulty)
535{ 494{
536 int olevel = 0; 495 int olevel = 0;
537 496
… …
613 572
614 op->magic = magic; 573 op->magic = magic;
615 if (op->arch) 574 if (op->arch)
616 { 575 {
617 if (op->type == ARMOUR) 576 if (op->type == ARMOUR)
618 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 577 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
619 578
620 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 579 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
621 magic = (-magic); 580 magic = (-magic);
622 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 581 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
623 } 582 }
624 else 583 else
625 { 584 {
626 if (op->type == ARMOUR) 585 if (op->type == ARMOUR)
627 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 586 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
… …
689 case 2: 648 case 2:
690 case 3: 649 case 3:
691 case 4: 650 case 4:
692 case 5: 651 case 5:
693 case 6: 652 case 6:
694 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 653 op->stats.stat (r) += bonus;
695 break; 654 break;
696 655
697 case 7: 656 case 7:
698 op->stats.dam += bonus; 657 op->stats.dam += bonus;
699 break; 658 break;
… …
847 save_item_power = op->item_power; 806 save_item_power = op->item_power;
848 op->item_power = 0; 807 op->item_power = 0;
849 808
850 if (op->randomitems && op->type != SPELL) 809 if (op->randomitems && op->type != SPELL)
851 { 810 {
852 create_treasure (op->randomitems, op, flags, difficulty, 0); 811 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
853 if (!op->inv)
854 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
855
856 /* So the treasure doesn't get created again */ 812 /* So the treasure doesn't get created again */
857 op->randomitems = 0; 813 op->randomitems = 0;
858 } 814 }
859 815
860 if (difficulty < 1) 816 if (difficulty < 1)
… …
1268 else 1224 else
1269 { 1225 {
1270 for (i = 0; i < depth; i++) 1226 for (i = 0; i < depth; i++)
1271 fprintf (logfile, " "); 1227 fprintf (logfile, " ");
1272 1228
1273 if (t->item && t->item->clone.type == FLESH) 1229 if (t->item && t->item->type == FLESH)
1274 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1230 fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1275 else 1231 else
1276 fprintf (logfile, "%s\n", &t->item->clone.name); 1232 fprintf (logfile, "%s\n", &t->item->object::name);
1277 } 1233 }
1278 1234
1279 if (t->next_yes) 1235 if (t->next_yes)
1280 { 1236 {
1281 for (i = 0; i < depth; i++) 1237 for (i = 0; i < depth; i++)
… …
1309 int found; 1265 int found;
1310 1266
1311 found = 0; 1267 found = 0;
1312 fprintf (logfile, "\n"); 1268 fprintf (logfile, "\n");
1313 1269
1314 for (at = first_archetype; at != NULL; at = at->next) 1270 for_all_archetypes (at)
1315 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1271 if (!strcasecmp (at->object::name, name) && at->title == NULL)
1316 { 1272 {
1317 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1273 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
1318 if (at->clone.randomitems != NULL) 1274 if (at->randomitems != NULL)
1319 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1275 dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1320 else 1276 else
1321 fprintf (logfile, "(nothing)\n"); 1277 fprintf (logfile, "(nothing)\n");
1322 1278
1323 fprintf (logfile, "\n"); 1279 fprintf (logfile, "\n");
1324 found++; 1280 found++;
… …
1356 { 1312 {
1357 switch (f.kw) 1313 switch (f.kw)
1358 { 1314 {
1359 case KW_allowed: 1315 case KW_allowed:
1360 if (!art) 1316 if (!art)
1361 {
1362 art = get_empty_artifact (); 1317 art = get_empty_artifact ();
1363 nrofartifacts++;
1364 }
1365 1318
1366 { 1319 {
1367 if (!strcmp (f.get_str (), "all")) 1320 if (!strcmp (f.get_str (), "all"))
1368 break; 1321 break;
1369 1322
1370 char *next, *cp = f.get_str (); 1323 char *next, *cp = f.get_str ();
1371 1324
1372 do 1325 do
1373 { 1326 {
1374 nrofallowedstr++;
1375
1376 if ((next = strchr (cp, ','))) 1327 if ((next = strchr (cp, ',')))
1377 *next++ = '\0'; 1328 *next++ = '\0';
1378 1329
1379 linked_char *tmp = new linked_char; 1330 linked_char *tmp = new linked_char;
1380 1331
… …
1395 break; 1346 break;
1396 1347
1397 case KW_object: 1348 case KW_object:
1398 { 1349 {
1399 art->item = object::create (); 1350 art->item = object::create ();
1351 f.get (art->item->name);
1352 f.next ();
1400 1353
1401 if (!art->item->parse_kv (f)) 1354 if (!art->item->parse_kv (f))
1402 LOG (llevError, "Init_Artifacts: Could not load object.\n"); 1355 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1403 1356
1404 al = find_artifactlist (art->item->type); 1357 al = find_artifactlist (art->item->type);
… …
1430 } 1383 }
1431 1384
1432done: 1385done:
1433 for (al = first_artifactlist; al; al = al->next) 1386 for (al = first_artifactlist; al; al = al->next)
1434 { 1387 {
1388 al->total_chance = 0;
1389
1435 for (art = al->items; art; art = art->next) 1390 for (art = al->items; art; art = art->next)
1436 { 1391 {
1437 if (!art->chance) 1392 if (!art->chance)
1438 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name); 1393 LOG (llevError, "Warning: artifact with no chance: %s\n", &art->item->name);
1439 else 1394 else
… …
1445 } 1400 }
1446 1401
1447 LOG (llevDebug, "done.\n"); 1402 LOG (llevDebug, "done.\n");
1448} 1403}
1449 1404
1450
1451/* 1405/*
1452 * Used in artifact generation. The bonuses of the first object 1406 * Used in artifact generation. The bonuses of the first object
1453 * is modified by the bonuses of the second object. 1407 * is modified by the bonuses of the second object.
1454 */ 1408 */
1455
1456void 1409void
1457add_abilities (object *op, object *change) 1410add_abilities (object *op, object *change)
1458{ 1411{
1459 int i, tmp; 1412 int i, tmp;
1460 1413
… …
1465#endif 1418#endif
1466 op->face = change->face; 1419 op->face = change->face;
1467 } 1420 }
1468 1421
1469 for (i = 0; i < NUM_STATS; i++) 1422 for (i = 0; i < NUM_STATS; i++)
1470 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1423 change_attr_value (&(op->stats), i, change->stats.stat (i));
1471 1424
1472 op->attacktype |= change->attacktype; 1425 op->attacktype |= change->attacktype;
1473 op->path_attuned |= change->path_attuned; 1426 op->path_attuned |= change->path_attuned;
1474 op->path_repelled |= change->path_repelled; 1427 op->path_repelled |= change->path_repelled;
1475 op->path_denied |= change->path_denied; 1428 op->path_denied |= change->path_denied;
… …
1639 if (change->msg) 1592 if (change->msg)
1640 op->msg = change->msg; 1593 op->msg = change->msg;
1641} 1594}
1642 1595
1643static int 1596static int
1644legal_artifact_combination (object *op, artifact * art) 1597legal_artifact_combination (object *op, artifact *art)
1645{ 1598{
1646 int neg, success = 0; 1599 int neg, success = 0;
1647 linked_char *tmp; 1600 linked_char *tmp;
1648 const char *name; 1601 const char *name;
1649 1602
1650 if (art->allowed == (linked_char *) NULL) 1603 if (!art->allowed)
1651 return 1; /* Ie, "all" */ 1604 return 1; /* Ie, "all" */
1605
1652 for (tmp = art->allowed; tmp; tmp = tmp->next) 1606 for (tmp = art->allowed; tmp; tmp = tmp->next)
1653 { 1607 {
1654#ifdef TREASURE_VERBOSE 1608#ifdef TREASURE_VERBOSE
1655 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1609 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1656#endif 1610#endif
… …
1658 name = tmp->name + 1, neg = 1; 1612 name = tmp->name + 1, neg = 1;
1659 else 1613 else
1660 name = tmp->name, neg = 0; 1614 name = tmp->name, neg = 0;
1661 1615
1662 /* If we match name, then return the opposite of 'neg' */ 1616 /* If we match name, then return the opposite of 'neg' */
1663 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1617 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1664 return !neg; 1618 return !neg;
1665 1619
1666 /* Set success as true, since if the match was an inverse, it means 1620 /* Set success as true, since if the match was an inverse, it means
1667 * everything is allowed except what we match 1621 * everything is allowed except what we match
1668 */ 1622 */
1669 else if (neg) 1623 else if (neg)
1670 success = 1; 1624 success = 1;
1671 } 1625 }
1626
1672 return success; 1627 return success;
1673} 1628}
1674 1629
1675/* 1630/*
1676 * Fixes the given object, giving it the abilities and titles 1631 * Fixes the given object, giving it the abilities and titles
… …
1813 SET_FLAG (item, FLAG_NO_STEAL); 1768 SET_FLAG (item, FLAG_NO_STEAL);
1814 } 1769 }
1815} 1770}
1816 1771
1817/* special_potion() - so that old potion code is still done right. */ 1772/* special_potion() - so that old potion code is still done right. */
1818
1819int 1773int
1820special_potion (object *op) 1774special_potion (object *op)
1821{ 1775{
1822 if (op->attacktype) 1776 if (op->attacktype)
1823 return 1; 1777 return 1;

Diff Legend

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