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.56 by root, Sat Apr 21 22:12:59 2007 UTC vs.
Revision 1.61 by root, Mon May 28 21:21:40 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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
… …
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)
… …
373 put_treasure (tmp, op, flag); 371 put_treasure (tmp, op, flag);
374 } 372 }
375 } 373 }
376} 374}
377 375
376void
377object::create_treasure (treasurelist *tl, int flags)
378{
379 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
380}
381
378/* This calls the appropriate treasure creation function. tries is passed 382/* This calls the appropriate treasure creation function. tries is passed
379 * to determine how many list transitions or attempts to create treasure 383 * to determine how many list transitions or attempts to create treasure
380 * 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
381 * list transitions, or so that excessively good treasure will not be 385 * list transitions, or so that excessively good treasure will not be
382 * created on weak maps, because it will exceed the number of allowed tries 386 * created on weak maps, because it will exceed the number of allowed tries
… …
391 395
392 if (tries++ > 100) 396 if (tries++ > 100)
393 { 397 {
394 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 398 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
395 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;
396 } 409 }
397 410
398 if (tl->total_chance) 411 if (tl->total_chance)
399 create_one_treasure (tl, op, flag, difficulty, tries); 412 create_one_treasure (tl, op, flag, difficulty, tries);
400 else 413 else
… …
635 case 2: 648 case 2:
636 case 3: 649 case 3:
637 case 4: 650 case 4:
638 case 5: 651 case 5:
639 case 6: 652 case 6:
640 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 653 op->stats.stat (r) += bonus;
641 break; 654 break;
642 655
643 case 7: 656 case 7:
644 op->stats.dam += bonus; 657 op->stats.dam += bonus;
645 break; 658 break;
… …
1405#endif 1418#endif
1406 op->face = change->face; 1419 op->face = change->face;
1407 } 1420 }
1408 1421
1409 for (i = 0; i < NUM_STATS; i++) 1422 for (i = 0; i < NUM_STATS; i++)
1410 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1423 change_attr_value (&(op->stats), i, change->stats.stat (i));
1411 1424
1412 op->attacktype |= change->attacktype; 1425 op->attacktype |= change->attacktype;
1413 op->path_attuned |= change->path_attuned; 1426 op->path_attuned |= change->path_attuned;
1414 op->path_repelled |= change->path_repelled; 1427 op->path_repelled |= change->path_repelled;
1415 op->path_denied |= change->path_denied; 1428 op->path_denied |= change->path_denied;

Diff Legend

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