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.57 by root, Tue Apr 24 00:42:02 2007 UTC vs.
Revision 1.63 by root, Mon Jun 4 13:04:00 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)
209 { 207 {
210 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);
211 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");
212 } 210 }
213 211
214 tl->total_chance += t->chance; 212 tl->total_chance += t->chance;
215 } 213 }
… …
302 else 300 else
303 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); 301 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
304 } 302 }
305 else 303 else
306 { 304 {
307 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 305 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
308 { 306 {
309 object *tmp = arch_to_object (t->item); 307 object *tmp = arch_to_object (t->item);
310 308
311 if (t->nrof && tmp->nrof <= 1) 309 if (t->nrof && tmp->nrof <= 1)
312 tmp->nrof = rndm (t->nrof) + 1; 310 tmp->nrof = rndm (t->nrof) + 1;
… …
359 create_treasure (tl, op, flag, difficulty, tries); 357 create_treasure (tl, op, flag, difficulty, tries);
360 } 358 }
361 else if (t->nrof) 359 else if (t->nrof)
362 create_one_treasure (tl, op, flag, difficulty, tries); 360 create_one_treasure (tl, op, flag, difficulty, tries);
363 } 361 }
364 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 362 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
365 { 363 {
366 if (object *tmp = arch_to_object (t->item)) 364 if (object *tmp = arch_to_object (t->item))
367 { 365 {
368 if (t->nrof && tmp->nrof <= 1) 366 if (t->nrof && tmp->nrof <= 1)
369 tmp->nrof = rndm (t->nrof) + 1; 367 tmp->nrof = rndm (t->nrof) + 1;
… …
397 395
398 if (tries++ > 100) 396 if (tries++ > 100)
399 { 397 {
400 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 398 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
401 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;
402 } 409 }
403 410
404 if (tl->total_chance) 411 if (tl->total_chance)
405 create_one_treasure (tl, op, flag, difficulty, tries); 412 create_one_treasure (tl, op, flag, difficulty, tries);
406 else 413 else
… …
565 572
566 op->magic = magic; 573 op->magic = magic;
567 if (op->arch) 574 if (op->arch)
568 { 575 {
569 if (op->type == ARMOUR) 576 if (op->type == ARMOUR)
570 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 577 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
571 578
572 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 */
573 magic = (-magic); 580 magic = (-magic);
574 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 581 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
575 } 582 }
576 else 583 else
577 { 584 {
578 if (op->type == ARMOUR) 585 if (op->type == ARMOUR)
579 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 586 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
… …
641 case 2: 648 case 2:
642 case 3: 649 case 3:
643 case 4: 650 case 4:
644 case 5: 651 case 5:
645 case 6: 652 case 6:
646 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 653 op->stats.stat (r) += bonus;
647 break; 654 break;
648 655
649 case 7: 656 case 7:
650 op->stats.dam += bonus; 657 op->stats.dam += bonus;
651 break; 658 break;
… …
1217 else 1224 else
1218 { 1225 {
1219 for (i = 0; i < depth; i++) 1226 for (i = 0; i < depth; i++)
1220 fprintf (logfile, " "); 1227 fprintf (logfile, " ");
1221 1228
1222 if (t->item && t->item->clone.type == FLESH) 1229 if (t->item && t->item->type == FLESH)
1223 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1230 fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1224 else 1231 else
1225 fprintf (logfile, "%s\n", &t->item->clone.name); 1232 fprintf (logfile, "%s\n", &t->item->object::name);
1226 } 1233 }
1227 1234
1228 if (t->next_yes) 1235 if (t->next_yes)
1229 { 1236 {
1230 for (i = 0; i < depth; i++) 1237 for (i = 0; i < depth; i++)
… …
1258 int found; 1265 int found;
1259 1266
1260 found = 0; 1267 found = 0;
1261 fprintf (logfile, "\n"); 1268 fprintf (logfile, "\n");
1262 1269
1263 for (at = first_archetype; at != NULL; at = at->next) 1270 for_all_archetypes (at)
1264 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1271 if (!strcasecmp (at->object::name, name) && at->title == NULL)
1265 { 1272 {
1266 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);
1267 if (at->clone.randomitems != NULL) 1274 if (at->randomitems != NULL)
1268 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1275 dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1269 else 1276 else
1270 fprintf (logfile, "(nothing)\n"); 1277 fprintf (logfile, "(nothing)\n");
1271 1278
1272 fprintf (logfile, "\n"); 1279 fprintf (logfile, "\n");
1273 found++; 1280 found++;
… …
1411#endif 1418#endif
1412 op->face = change->face; 1419 op->face = change->face;
1413 } 1420 }
1414 1421
1415 for (i = 0; i < NUM_STATS; i++) 1422 for (i = 0; i < NUM_STATS; i++)
1416 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1423 change_attr_value (&(op->stats), i, change->stats.stat (i));
1417 1424
1418 op->attacktype |= change->attacktype; 1425 op->attacktype |= change->attacktype;
1419 op->path_attuned |= change->path_attuned; 1426 op->path_attuned |= change->path_attuned;
1420 op->path_repelled |= change->path_repelled; 1427 op->path_repelled |= change->path_repelled;
1421 op->path_denied |= change->path_denied; 1428 op->path_denied |= change->path_denied;
… …
1605 name = tmp->name + 1, neg = 1; 1612 name = tmp->name + 1, neg = 1;
1606 else 1613 else
1607 name = tmp->name, neg = 0; 1614 name = tmp->name, neg = 0;
1608 1615
1609 /* If we match name, then return the opposite of 'neg' */ 1616 /* If we match name, then return the opposite of 'neg' */
1610 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)))
1611 return !neg; 1618 return !neg;
1612 1619
1613 /* 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
1614 * everything is allowed except what we match 1621 * everything is allowed except what we match
1615 */ 1622 */

Diff Legend

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