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.51 by root, Thu Apr 19 16:36:00 2007 UTC vs.
Revision 1.66 by root, Wed Sep 12 11:10:10 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
246 op->expand_tail ();
247
242 if (ob_blocked (op, creator->map, creator->x, creator->y)) 248 if (op->blocked (creator->map, creator->x, creator->y))
243 op->destroy (); 249 op->destroy ();
244 else 250 else
245 { 251 {
246 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 252 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
247 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);
… …
293 else 299 else
294 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);
295 } 301 }
296 else 302 else
297 { 303 {
298 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 304 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
299 { 305 {
300 object *tmp = arch_to_object (t->item); 306 object *tmp = arch_to_object (t->item);
301 307
302 if (t->nrof && tmp->nrof <= 1) 308 if (t->nrof && tmp->nrof <= 1)
303 tmp->nrof = rndm (t->nrof) + 1; 309 tmp->nrof = rndm (t->nrof) + 1;
… …
350 create_treasure (tl, op, flag, difficulty, tries); 356 create_treasure (tl, op, flag, difficulty, tries);
351 } 357 }
352 else if (t->nrof) 358 else if (t->nrof)
353 create_one_treasure (tl, op, flag, difficulty, tries); 359 create_one_treasure (tl, op, flag, difficulty, tries);
354 } 360 }
355 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 361 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
356 { 362 {
357 if (object *tmp = arch_to_object (t->item)) 363 if (object *tmp = arch_to_object (t->item))
358 { 364 {
359 if (t->nrof && tmp->nrof <= 1) 365 if (t->nrof && tmp->nrof <= 1)
360 tmp->nrof = rndm (t->nrof) + 1; 366 tmp->nrof = rndm (t->nrof) + 1;
… …
362 fix_generated_item (tmp, op, difficulty, t->magic, flag); 368 fix_generated_item (tmp, op, difficulty, t->magic, flag);
363 change_treasure (t, tmp); 369 change_treasure (t, tmp);
364 put_treasure (tmp, op, flag); 370 put_treasure (tmp, op, flag);
365 } 371 }
366 } 372 }
373}
374
375void
376object::create_treasure (treasurelist *tl, int flags)
377{
378 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
367} 379}
368 380
369/* This calls the appropriate treasure creation function. tries is passed 381/* This calls the appropriate treasure creation function. tries is passed
370 * to determine how many list transitions or attempts to create treasure 382 * to determine how many list transitions or attempts to create treasure
371 * 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
… …
382 394
383 if (tries++ > 100) 395 if (tries++ > 100)
384 { 396 {
385 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 397 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
386 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;
387 } 408 }
388 409
389 if (tl->total_chance) 410 if (tl->total_chance)
390 create_one_treasure (tl, op, flag, difficulty, tries); 411 create_one_treasure (tl, op, flag, difficulty, tries);
391 else 412 else
… …
550 571
551 op->magic = magic; 572 op->magic = magic;
552 if (op->arch) 573 if (op->arch)
553 { 574 {
554 if (op->type == ARMOUR) 575 if (op->type == ARMOUR)
555 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 576 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
556 577
557 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 578 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
558 magic = (-magic); 579 magic = (-magic);
559 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 580 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
560 } 581 }
561 else 582 else
562 { 583 {
563 if (op->type == ARMOUR) 584 if (op->type == ARMOUR)
564 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 585 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
… …
626 case 2: 647 case 2:
627 case 3: 648 case 3:
628 case 4: 649 case 4:
629 case 5: 650 case 5:
630 case 6: 651 case 6:
631 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 652 op->stats.stat (r) += bonus;
632 break; 653 break;
633 654
634 case 7: 655 case 7:
635 op->stats.dam += bonus; 656 op->stats.dam += bonus;
636 break; 657 break;
… …
1202 else 1223 else
1203 { 1224 {
1204 for (i = 0; i < depth; i++) 1225 for (i = 0; i < depth; i++)
1205 fprintf (logfile, " "); 1226 fprintf (logfile, " ");
1206 1227
1207 if (t->item && t->item->clone.type == FLESH) 1228 if (t->item && t->item->type == FLESH)
1208 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name); 1229 fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
1209 else 1230 else
1210 fprintf (logfile, "%s\n", &t->item->clone.name); 1231 fprintf (logfile, "%s\n", &t->item->object::name);
1211 } 1232 }
1212 1233
1213 if (t->next_yes) 1234 if (t->next_yes)
1214 { 1235 {
1215 for (i = 0; i < depth; i++) 1236 for (i = 0; i < depth; i++)
… …
1243 int found; 1264 int found;
1244 1265
1245 found = 0; 1266 found = 0;
1246 fprintf (logfile, "\n"); 1267 fprintf (logfile, "\n");
1247 1268
1248 for (at = first_archetype; at != NULL; at = at->next) 1269 for_all_archetypes (at)
1249 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1270 if (!strcasecmp (at->object::name, name) && at->title == NULL)
1250 { 1271 {
1251 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1272 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
1252 if (at->clone.randomitems != NULL) 1273 if (at->randomitems != NULL)
1253 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1274 dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
1254 else 1275 else
1255 fprintf (logfile, "(nothing)\n"); 1276 fprintf (logfile, "(nothing)\n");
1256 1277
1257 fprintf (logfile, "\n"); 1278 fprintf (logfile, "\n");
1258 found++; 1279 found++;
… …
1281 sprintf (filename, "%s/artifacts", settings.datadir); 1302 sprintf (filename, "%s/artifacts", settings.datadir);
1282 object_thawer f (filename); 1303 object_thawer f (filename);
1283 1304
1284 if (!f) 1305 if (!f)
1285 return; 1306 return;
1286
1287 f.next ();
1288 1307
1289 for (;;) 1308 for (;;)
1290 { 1309 {
1291 switch (f.kw) 1310 switch (f.kw)
1292 { 1311 {
… …
1396#endif 1415#endif
1397 op->face = change->face; 1416 op->face = change->face;
1398 } 1417 }
1399 1418
1400 for (i = 0; i < NUM_STATS; i++) 1419 for (i = 0; i < NUM_STATS; i++)
1401 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1420 change_attr_value (&(op->stats), i, change->stats.stat (i));
1402 1421
1403 op->attacktype |= change->attacktype; 1422 op->attacktype |= change->attacktype;
1404 op->path_attuned |= change->path_attuned; 1423 op->path_attuned |= change->path_attuned;
1405 op->path_repelled |= change->path_repelled; 1424 op->path_repelled |= change->path_repelled;
1406 op->path_denied |= change->path_denied; 1425 op->path_denied |= change->path_denied;
… …
1570 if (change->msg) 1589 if (change->msg)
1571 op->msg = change->msg; 1590 op->msg = change->msg;
1572} 1591}
1573 1592
1574static int 1593static int
1575legal_artifact_combination (object *op, artifact * art) 1594legal_artifact_combination (object *op, artifact *art)
1576{ 1595{
1577 int neg, success = 0; 1596 int neg, success = 0;
1578 linked_char *tmp; 1597 linked_char *tmp;
1579 const char *name; 1598 const char *name;
1580 1599
1581 if (art->allowed == (linked_char *) NULL) 1600 if (!art->allowed)
1582 return 1; /* Ie, "all" */ 1601 return 1; /* Ie, "all" */
1602
1583 for (tmp = art->allowed; tmp; tmp = tmp->next) 1603 for (tmp = art->allowed; tmp; tmp = tmp->next)
1584 { 1604 {
1585#ifdef TREASURE_VERBOSE 1605#ifdef TREASURE_VERBOSE
1586 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1606 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1587#endif 1607#endif
… …
1589 name = tmp->name + 1, neg = 1; 1609 name = tmp->name + 1, neg = 1;
1590 else 1610 else
1591 name = tmp->name, neg = 0; 1611 name = tmp->name, neg = 0;
1592 1612
1593 /* If we match name, then return the opposite of 'neg' */ 1613 /* If we match name, then return the opposite of 'neg' */
1594 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1614 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1595 return !neg; 1615 return !neg;
1596 1616
1597 /* Set success as true, since if the match was an inverse, it means 1617 /* Set success as true, since if the match was an inverse, it means
1598 * everything is allowed except what we match 1618 * everything is allowed except what we match
1599 */ 1619 */
1600 else if (neg) 1620 else if (neg)
1601 success = 1; 1621 success = 1;
1602 } 1622 }
1623
1603 return success; 1624 return success;
1604} 1625}
1605 1626
1606/* 1627/*
1607 * Fixes the given object, giving it the abilities and titles 1628 * Fixes the given object, giving it the abilities and titles

Diff Legend

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