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.54 by root, Sat Apr 21 17:34:23 2007 UTC vs.
Revision 1.60 by root, Sat May 12 18:14:47 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
197 197
198 /* This is a one of the many items on the list should be generated. 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 199 * Add up the chance total, and check to make sure the yes & no
200 * fields of the treasures are not being used. 200 * fields of the treasures are not being used.
201 */ 201 */
202 tl->total_chance = 0;
203
204 if (one) 202 if (one)
205 { 203 {
206 for (treasure *t = tl->items; t; t = t->next) 204 for (treasure *t = tl->items; t; t = t->next)
207 { 205 {
208 if (t->next_yes || t->next_no) 206 if (t->next_yes || t->next_no)
… …
230 * start with equipment, but only their abilities). 228 * start with equipment, but only their abilities).
231 */ 229 */
232static void 230static void
233put_treasure (object *op, object *creator, int flags) 231put_treasure (object *op, object *creator, int flags)
234{ 232{
233 if (flags & GT_ENVIRONMENT)
234 {
235 /* 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
236 * 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
237 * 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
238 * by another object. 238 * by another object.
239 */ 239 */
240 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 //TODO: flag such as objects... as such (no drop, anybody?)
241 { 241 if (op->type == SPELL)
242 {
243 op->destroy ();
244 return;
245 }
246
242 op->expand_tail (); 247 op->expand_tail ();
243 248
244 if (ob_blocked (op, creator->map, creator->x, creator->y)) 249 if (ob_blocked (op, creator->map, creator->x, creator->y))
245 op->destroy (); 250 op->destroy ();
246 else 251 else
… …
364 fix_generated_item (tmp, op, difficulty, t->magic, flag); 369 fix_generated_item (tmp, op, difficulty, t->magic, flag);
365 change_treasure (t, tmp); 370 change_treasure (t, tmp);
366 put_treasure (tmp, op, flag); 371 put_treasure (tmp, op, flag);
367 } 372 }
368 } 373 }
374}
375
376void
377object::create_treasure (treasurelist *tl, int flags)
378{
379 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
369} 380}
370 381
371/* This calls the appropriate treasure creation function. tries is passed 382/* This calls the appropriate treasure creation function. tries is passed
372 * to determine how many list transitions or attempts to create treasure 383 * 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 384 * have been made. It is really in place to prevent infinite loops with
… …
384 395
385 if (tries++ > 100) 396 if (tries++ > 100)
386 { 397 {
387 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 398 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
388 return; 399 return;
400 }
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;
389 } 409 }
390 410
391 if (tl->total_chance) 411 if (tl->total_chance)
392 create_one_treasure (tl, op, flag, difficulty, tries); 412 create_one_treasure (tl, op, flag, difficulty, tries);
393 else 413 else
… …
628 case 2: 648 case 2:
629 case 3: 649 case 3:
630 case 4: 650 case 4:
631 case 5: 651 case 5:
632 case 6: 652 case 6:
633 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 653 op->stats.stat (r) += bonus;
634 break; 654 break;
635 655
636 case 7: 656 case 7:
637 op->stats.dam += bonus; 657 op->stats.dam += bonus;
638 break; 658 break;
… …
1398#endif 1418#endif
1399 op->face = change->face; 1419 op->face = change->face;
1400 } 1420 }
1401 1421
1402 for (i = 0; i < NUM_STATS; i++) 1422 for (i = 0; i < NUM_STATS; i++)
1403 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1423 change_attr_value (&(op->stats), i, change->stats.stat (i));
1404 1424
1405 op->attacktype |= change->attacktype; 1425 op->attacktype |= change->attacktype;
1406 op->path_attuned |= change->path_attuned; 1426 op->path_attuned |= change->path_attuned;
1407 op->path_repelled |= change->path_repelled; 1427 op->path_repelled |= change->path_repelled;
1408 op->path_denied |= change->path_denied; 1428 op->path_denied |= change->path_denied;

Diff Legend

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