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.59 by root, Sun Apr 29 00:19:16 2007 UTC vs.
Revision 1.68 by root, Thu Nov 8 19:43:23 2007 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 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
… …
203 { 202 {
204 for (treasure *t = tl->items; t; t = t->next) 203 for (treasure *t = tl->items; t; t = t->next)
205 { 204 {
206 if (t->next_yes || t->next_no) 205 if (t->next_yes || t->next_no)
207 { 206 {
208 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 207 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
209 LOG (llevError, " the next_yes or next_no field is set\n"); 208 LOG (llevError, " the next_yes or next_no field is set\n");
210 } 209 }
211 210
212 tl->total_chance += t->chance; 211 tl->total_chance += t->chance;
213 } 212 }
… …
244 return; 243 return;
245 } 244 }
246 245
247 op->expand_tail (); 246 op->expand_tail ();
248 247
249 if (ob_blocked (op, creator->map, creator->x, creator->y)) 248 if (op->blocked (creator->map, creator->x, creator->y))
250 op->destroy (); 249 op->destroy ();
251 else 250 else
252 { 251 {
253 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 252 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
254 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 253 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
… …
300 else 299 else
301 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); 300 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
302 } 301 }
303 else 302 else
304 { 303 {
305 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 304 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
306 { 305 {
307 object *tmp = arch_to_object (t->item); 306 object *tmp = arch_to_object (t->item);
308 307
309 if (t->nrof && tmp->nrof <= 1) 308 if (t->nrof && tmp->nrof <= 1)
310 tmp->nrof = rndm (t->nrof) + 1; 309 tmp->nrof = rndm (t->nrof) + 1;
… …
357 create_treasure (tl, op, flag, difficulty, tries); 356 create_treasure (tl, op, flag, difficulty, tries);
358 } 357 }
359 else if (t->nrof) 358 else if (t->nrof)
360 create_one_treasure (tl, op, flag, difficulty, tries); 359 create_one_treasure (tl, op, flag, difficulty, tries);
361 } 360 }
362 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 361 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
363 { 362 {
364 if (object *tmp = arch_to_object (t->item)) 363 if (object *tmp = arch_to_object (t->item))
365 { 364 {
366 if (t->nrof && tmp->nrof <= 1) 365 if (t->nrof && tmp->nrof <= 1)
367 tmp->nrof = rndm (t->nrof) + 1; 366 tmp->nrof = rndm (t->nrof) + 1;
… …
490 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 489 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
491 */ 490 */
492int 491int
493level_for_item (const object *op, int difficulty) 492level_for_item (const object *op, int difficulty)
494{ 493{
495 int olevel = 0;
496
497 if (!op->inv) 494 if (!op->inv)
498 { 495 {
499 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 496 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
500 return 0; 497 return 0;
501 } 498 }
502 499
503 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 500 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
504 501
505 if (olevel <= 0) 502 if (olevel <= 0)
506 olevel = rndm (1, MIN (op->inv->level, 1)); 503 olevel = rndm (1, op->inv->level);
507 504
508 if (olevel > MAXLEVEL) 505 return min (olevel, MAXLEVEL);
509 olevel = MAXLEVEL;
510
511 return olevel;
512} 506}
513 507
514/* 508/*
515 * Based upon the specified difficulty and upon the difftomagic_list array, 509 * Based upon the specified difficulty and upon the difftomagic_list array,
516 * a random magical bonus is returned. This is used when determine 510 * a random magical bonus is returned. This is used when determine
… …
572 566
573 op->magic = magic; 567 op->magic = magic;
574 if (op->arch) 568 if (op->arch)
575 { 569 {
576 if (op->type == ARMOUR) 570 if (op->type == ARMOUR)
577 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 571 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
578 572
579 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 573 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
580 magic = (-magic); 574 magic = (-magic);
581 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 575 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
582 } 576 }
583 else 577 else
584 { 578 {
585 if (op->type == ARMOUR) 579 if (op->type == ARMOUR)
586 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 580 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
… …
648 case 2: 642 case 2:
649 case 3: 643 case 3:
650 case 4: 644 case 4:
651 case 5: 645 case 5:
652 case 6: 646 case 6:
653 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 647 op->stats.stat (r) += bonus;
654 break; 648 break;
655 649
656 case 7: 650 case 7:
657 op->stats.dam += bonus; 651 op->stats.dam += bonus;
658 break; 652 break;
… …
1224 else 1218 else
1225 { 1219 {
1226 for (i = 0; i < depth; i++) 1220 for (i = 0; i < depth; i++)
1227 fprintf (logfile, " "); 1221 fprintf (logfile, " ");
1228 1222
1229 if (t->item && t->item->clone.type == FLESH) 1223 if (t->item && t->item->type == FLESH)
1230 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1224 fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1231 else 1225 else
1232 fprintf (logfile, "%s\n", &t->item->clone.name); 1226 fprintf (logfile, "%s\n", &t->item->object::name);
1233 } 1227 }
1234 1228
1235 if (t->next_yes) 1229 if (t->next_yes)
1236 { 1230 {
1237 for (i = 0; i < depth; i++) 1231 for (i = 0; i < depth; i++)
… …
1265 int found; 1259 int found;
1266 1260
1267 found = 0; 1261 found = 0;
1268 fprintf (logfile, "\n"); 1262 fprintf (logfile, "\n");
1269 1263
1270 for (at = first_archetype; at != NULL; at = at->next) 1264 for_all_archetypes (at)
1271 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1265 if (!strcasecmp (at->object::name, name) && at->title == NULL)
1272 { 1266 {
1273 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1267 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
1274 if (at->clone.randomitems != NULL) 1268 if (at->randomitems != NULL)
1275 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1269 dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1276 else 1270 else
1277 fprintf (logfile, "(nothing)\n"); 1271 fprintf (logfile, "(nothing)\n");
1278 1272
1279 fprintf (logfile, "\n"); 1273 fprintf (logfile, "\n");
1280 found++; 1274 found++;
… …
1303 sprintf (filename, "%s/artifacts", settings.datadir); 1297 sprintf (filename, "%s/artifacts", settings.datadir);
1304 object_thawer f (filename); 1298 object_thawer f (filename);
1305 1299
1306 if (!f) 1300 if (!f)
1307 return; 1301 return;
1308
1309 f.next ();
1310 1302
1311 for (;;) 1303 for (;;)
1312 { 1304 {
1313 switch (f.kw) 1305 switch (f.kw)
1314 { 1306 {
… …
1418#endif 1410#endif
1419 op->face = change->face; 1411 op->face = change->face;
1420 } 1412 }
1421 1413
1422 for (i = 0; i < NUM_STATS; i++) 1414 for (i = 0; i < NUM_STATS; i++)
1423 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1415 change_attr_value (&(op->stats), i, change->stats.stat (i));
1424 1416
1425 op->attacktype |= change->attacktype; 1417 op->attacktype |= change->attacktype;
1426 op->path_attuned |= change->path_attuned; 1418 op->path_attuned |= change->path_attuned;
1427 op->path_repelled |= change->path_repelled; 1419 op->path_repelled |= change->path_repelled;
1428 op->path_denied |= change->path_denied; 1420 op->path_denied |= change->path_denied;
… …
1612 name = tmp->name + 1, neg = 1; 1604 name = tmp->name + 1, neg = 1;
1613 else 1605 else
1614 name = tmp->name, neg = 0; 1606 name = tmp->name, neg = 0;
1615 1607
1616 /* If we match name, then return the opposite of 'neg' */ 1608 /* If we match name, then return the opposite of 'neg' */
1617 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1609 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1618 return !neg; 1610 return !neg;
1619 1611
1620 /* Set success as true, since if the match was an inverse, it means 1612 /* Set success as true, since if the match was an inverse, it means
1621 * everything is allowed except what we match 1613 * everything is allowed except what we match
1622 */ 1614 */

Diff Legend

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