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.67 by root, Tue Oct 16 00:30:24 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
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 <crossfire@schmorp.de>
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
… …
197 196
198 /* This is a one of the many items on the list should be generated. 197 /* 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 198 * Add up the chance total, and check to make sure the yes & no
200 * fields of the treasures are not being used. 199 * fields of the treasures are not being used.
201 */ 200 */
202 tl->total_chance = 0;
203
204 if (one) 201 if (one)
205 { 202 {
206 for (treasure *t = tl->items; t; t = t->next) 203 for (treasure *t = tl->items; t; t = t->next)
207 { 204 {
208 if (t->next_yes || t->next_no) 205 if (t->next_yes || t->next_no)
209 { 206 {
210 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);
211 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");
212 } 209 }
213 210
214 tl->total_chance += t->chance; 211 tl->total_chance += t->chance;
215 } 212 }
… …
230 * start with equipment, but only their abilities). 227 * start with equipment, but only their abilities).
231 */ 228 */
232static void 229static void
233put_treasure (object *op, object *creator, int flags) 230put_treasure (object *op, object *creator, int flags)
234{ 231{
232 if (flags & GT_ENVIRONMENT)
233 {
235 /* Bit of a hack - spells should never be put onto the map. The entire 234 /* 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 235 * 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 236 * this is the original object, or if this is an object that should be created
238 * by another object. 237 * by another object.
239 */ 238 */
240 if (flags & GT_ENVIRONMENT && op->type != SPELL) 239 //TODO: flag such as objects... as such (no drop, anybody?)
241 { 240 if (op->type == SPELL)
241 {
242 op->destroy ();
243 return;
244 }
245
242 op->expand_tail (); 246 op->expand_tail ();
243 247
244 if (ob_blocked (op, creator->map, creator->x, creator->y)) 248 if (op->blocked (creator->map, creator->x, creator->y))
245 op->destroy (); 249 op->destroy ();
246 else 250 else
247 { 251 {
248 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 252 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
249 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);
… …
295 else 299 else
296 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);
297 } 301 }
298 else 302 else
299 { 303 {
300 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 304 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
301 { 305 {
302 object *tmp = arch_to_object (t->item); 306 object *tmp = arch_to_object (t->item);
303 307
304 if (t->nrof && tmp->nrof <= 1) 308 if (t->nrof && tmp->nrof <= 1)
305 tmp->nrof = rndm (t->nrof) + 1; 309 tmp->nrof = rndm (t->nrof) + 1;
… …
352 create_treasure (tl, op, flag, difficulty, tries); 356 create_treasure (tl, op, flag, difficulty, tries);
353 } 357 }
354 else if (t->nrof) 358 else if (t->nrof)
355 create_one_treasure (tl, op, flag, difficulty, tries); 359 create_one_treasure (tl, op, flag, difficulty, tries);
356 } 360 }
357 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 361 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
358 { 362 {
359 if (object *tmp = arch_to_object (t->item)) 363 if (object *tmp = arch_to_object (t->item))
360 { 364 {
361 if (t->nrof && tmp->nrof <= 1) 365 if (t->nrof && tmp->nrof <= 1)
362 tmp->nrof = rndm (t->nrof) + 1; 366 tmp->nrof = rndm (t->nrof) + 1;
… …
364 fix_generated_item (tmp, op, difficulty, t->magic, flag); 368 fix_generated_item (tmp, op, difficulty, t->magic, flag);
365 change_treasure (t, tmp); 369 change_treasure (t, tmp);
366 put_treasure (tmp, op, flag); 370 put_treasure (tmp, op, flag);
367 } 371 }
368 } 372 }
373}
374
375void
376object::create_treasure (treasurelist *tl, int flags)
377{
378 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
369} 379}
370 380
371/* This calls the appropriate treasure creation function. tries is passed 381/* This calls the appropriate treasure creation function. tries is passed
372 * to determine how many list transitions or attempts to create treasure 382 * 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 383 * have been made. It is really in place to prevent infinite loops with
… …
384 394
385 if (tries++ > 100) 395 if (tries++ > 100)
386 { 396 {
387 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 397 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
388 return; 398 return;
399 }
400
401 if (op->flag [FLAG_TREASURE_ENV])
402 {
403 // do not generate items when there already is something above the object
404 if (op->flag [FLAG_IS_FLOOR] && op->above)
405 return;
406
407 flag |= GT_ENVIRONMENT;
389 } 408 }
390 409
391 if (tl->total_chance) 410 if (tl->total_chance)
392 create_one_treasure (tl, op, flag, difficulty, tries); 411 create_one_treasure (tl, op, flag, difficulty, tries);
393 else 412 else
… …
470 * 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.
471 */ 490 */
472int 491int
473level_for_item (const object *op, int difficulty) 492level_for_item (const object *op, int difficulty)
474{ 493{
475 int olevel = 0;
476
477 if (!op->inv) 494 if (!op->inv)
478 { 495 {
479 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);
480 return 0; 497 return 0;
481 } 498 }
482 499
483 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 500 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
484 501
485 if (olevel <= 0) 502 if (olevel <= 0)
486 olevel = rndm (1, MIN (op->inv->level, 1)); 503 olevel = rndm (1, op->inv->level);
487 504
488 if (olevel > MAXLEVEL) 505 return min (olevel, MAXLEVEL);
489 olevel = MAXLEVEL;
490
491 return olevel;
492} 506}
493 507
494/* 508/*
495 * Based upon the specified difficulty and upon the difftomagic_list array, 509 * Based upon the specified difficulty and upon the difftomagic_list array,
496 * a random magical bonus is returned. This is used when determine 510 * a random magical bonus is returned. This is used when determine
… …
552 566
553 op->magic = magic; 567 op->magic = magic;
554 if (op->arch) 568 if (op->arch)
555 { 569 {
556 if (op->type == ARMOUR) 570 if (op->type == ARMOUR)
557 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 571 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
558 572
559 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 */
560 magic = (-magic); 574 magic = (-magic);
561 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 575 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
562 } 576 }
563 else 577 else
564 { 578 {
565 if (op->type == ARMOUR) 579 if (op->type == ARMOUR)
566 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 580 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
… …
628 case 2: 642 case 2:
629 case 3: 643 case 3:
630 case 4: 644 case 4:
631 case 5: 645 case 5:
632 case 6: 646 case 6:
633 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 647 op->stats.stat (r) += bonus;
634 break; 648 break;
635 649
636 case 7: 650 case 7:
637 op->stats.dam += bonus; 651 op->stats.dam += bonus;
638 break; 652 break;
… …
1204 else 1218 else
1205 { 1219 {
1206 for (i = 0; i < depth; i++) 1220 for (i = 0; i < depth; i++)
1207 fprintf (logfile, " "); 1221 fprintf (logfile, " ");
1208 1222
1209 if (t->item && t->item->clone.type == FLESH) 1223 if (t->item && t->item->type == FLESH)
1210 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1224 fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1211 else 1225 else
1212 fprintf (logfile, "%s\n", &t->item->clone.name); 1226 fprintf (logfile, "%s\n", &t->item->object::name);
1213 } 1227 }
1214 1228
1215 if (t->next_yes) 1229 if (t->next_yes)
1216 { 1230 {
1217 for (i = 0; i < depth; i++) 1231 for (i = 0; i < depth; i++)
… …
1245 int found; 1259 int found;
1246 1260
1247 found = 0; 1261 found = 0;
1248 fprintf (logfile, "\n"); 1262 fprintf (logfile, "\n");
1249 1263
1250 for (at = first_archetype; at != NULL; at = at->next) 1264 for_all_archetypes (at)
1251 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1265 if (!strcasecmp (at->object::name, name) && at->title == NULL)
1252 { 1266 {
1253 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);
1254 if (at->clone.randomitems != NULL) 1268 if (at->randomitems != NULL)
1255 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1269 dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1256 else 1270 else
1257 fprintf (logfile, "(nothing)\n"); 1271 fprintf (logfile, "(nothing)\n");
1258 1272
1259 fprintf (logfile, "\n"); 1273 fprintf (logfile, "\n");
1260 found++; 1274 found++;
… …
1283 sprintf (filename, "%s/artifacts", settings.datadir); 1297 sprintf (filename, "%s/artifacts", settings.datadir);
1284 object_thawer f (filename); 1298 object_thawer f (filename);
1285 1299
1286 if (!f) 1300 if (!f)
1287 return; 1301 return;
1288
1289 f.next ();
1290 1302
1291 for (;;) 1303 for (;;)
1292 { 1304 {
1293 switch (f.kw) 1305 switch (f.kw)
1294 { 1306 {
… …
1398#endif 1410#endif
1399 op->face = change->face; 1411 op->face = change->face;
1400 } 1412 }
1401 1413
1402 for (i = 0; i < NUM_STATS; i++) 1414 for (i = 0; i < NUM_STATS; i++)
1403 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1415 change_attr_value (&(op->stats), i, change->stats.stat (i));
1404 1416
1405 op->attacktype |= change->attacktype; 1417 op->attacktype |= change->attacktype;
1406 op->path_attuned |= change->path_attuned; 1418 op->path_attuned |= change->path_attuned;
1407 op->path_repelled |= change->path_repelled; 1419 op->path_repelled |= change->path_repelled;
1408 op->path_denied |= change->path_denied; 1420 op->path_denied |= change->path_denied;
… …
1592 name = tmp->name + 1, neg = 1; 1604 name = tmp->name + 1, neg = 1;
1593 else 1605 else
1594 name = tmp->name, neg = 0; 1606 name = tmp->name, neg = 0;
1595 1607
1596 /* If we match name, then return the opposite of 'neg' */ 1608 /* If we match name, then return the opposite of 'neg' */
1597 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)))
1598 return !neg; 1610 return !neg;
1599 1611
1600 /* 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
1601 * everything is allowed except what we match 1613 * everything is allowed except what we match
1602 */ 1614 */

Diff Legend

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