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.50 by root, Thu Apr 19 16:23:46 2007 UTC vs.
Revision 1.62 by root, Mon Jun 4 12:19:08 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 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 }
… …
230 * start with equipment, but only their abilities). 228 * start with equipment, but only their abilities).
231 */ 229 */
232static void 230static void
233put_treasure (object *op, object *creator, int flags) 231put_treasure (object *op, object *creator, int flags)
234{ 232{
235 object *tmp; 233 if (flags & GT_ENVIRONMENT)
236 234 {
237 /* Bit of a hack - spells should never be put onto the map. The entire 235 /* Bit of a hack - spells should never be put onto the map. The entire
238 * treasure stuff is a problem - there is no clear idea of knowing 236 * treasure stuff is a problem - there is no clear idea of knowing
239 * this is the original object, or if this is an object that should be created 237 * this is the original object, or if this is an object that should be created
240 * by another object. 238 * by another object.
241 */ 239 */
242 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 //TODO: flag such as objects... as such (no drop, anybody?)
243 { 241 if (op->type == SPELL)
242 {
243 op->destroy ();
244 return;
245 }
246
247 op->expand_tail ();
248
249 if (ob_blocked (op, creator->map, creator->x, creator->y))
250 op->destroy ();
251 else
252 {
244 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 253 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
245 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 254 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
255 }
246 } 256 }
247 else 257 else
248 { 258 {
249 op = creator->insert (op); 259 op = creator->insert (op);
250 260
251 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 261 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
252 monster_check_apply (creator, op); 262 monster_check_apply (creator, op);
253 263
254 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 264 if (flags & GT_UPDATE_INV)
265 if (object *tmp = creator->in_player ())
255 esrv_send_item (tmp, op); 266 esrv_send_item (tmp, op);
256 } 267 }
257} 268}
258 269
259/* if there are change_xxx commands in the treasure, we include the changes 270/* if there are change_xxx commands in the treasure, we include the changes
260 * in the generated object 271 * in the generated object
… …
358 fix_generated_item (tmp, op, difficulty, t->magic, flag); 369 fix_generated_item (tmp, op, difficulty, t->magic, flag);
359 change_treasure (t, tmp); 370 change_treasure (t, tmp);
360 put_treasure (tmp, op, flag); 371 put_treasure (tmp, op, flag);
361 } 372 }
362 } 373 }
374}
375
376void
377object::create_treasure (treasurelist *tl, int flags)
378{
379 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
363} 380}
364 381
365/* This calls the appropriate treasure creation function. tries is passed 382/* This calls the appropriate treasure creation function. tries is passed
366 * to determine how many list transitions or attempts to create treasure 383 * to determine how many list transitions or attempts to create treasure
367 * 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
… …
378 395
379 if (tries++ > 100) 396 if (tries++ > 100)
380 { 397 {
381 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 398 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
382 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;
383 } 409 }
384 410
385 if (tl->total_chance) 411 if (tl->total_chance)
386 create_one_treasure (tl, op, flag, difficulty, tries); 412 create_one_treasure (tl, op, flag, difficulty, tries);
387 else 413 else
… …
622 case 2: 648 case 2:
623 case 3: 649 case 3:
624 case 4: 650 case 4:
625 case 5: 651 case 5:
626 case 6: 652 case 6:
627 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 653 op->stats.stat (r) += bonus;
628 break; 654 break;
629 655
630 case 7: 656 case 7:
631 op->stats.dam += bonus; 657 op->stats.dam += bonus;
632 break; 658 break;
… …
1242 fprintf (logfile, "\n"); 1268 fprintf (logfile, "\n");
1243 1269
1244 for (at = first_archetype; at != NULL; at = at->next) 1270 for (at = first_archetype; at != NULL; at = at->next)
1245 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL) 1271 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1246 { 1272 {
1247 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name); 1273 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->archname);
1248 if (at->clone.randomitems != NULL) 1274 if (at->clone.randomitems != NULL)
1249 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1); 1275 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1250 else 1276 else
1251 fprintf (logfile, "(nothing)\n"); 1277 fprintf (logfile, "(nothing)\n");
1252 1278
… …
1392#endif 1418#endif
1393 op->face = change->face; 1419 op->face = change->face;
1394 } 1420 }
1395 1421
1396 for (i = 0; i < NUM_STATS; i++) 1422 for (i = 0; i < NUM_STATS; i++)
1397 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1423 change_attr_value (&(op->stats), i, change->stats.stat (i));
1398 1424
1399 op->attacktype |= change->attacktype; 1425 op->attacktype |= change->attacktype;
1400 op->path_attuned |= change->path_attuned; 1426 op->path_attuned |= change->path_attuned;
1401 op->path_repelled |= change->path_repelled; 1427 op->path_repelled |= change->path_repelled;
1402 op->path_denied |= change->path_denied; 1428 op->path_denied |= change->path_denied;
… …
1566 if (change->msg) 1592 if (change->msg)
1567 op->msg = change->msg; 1593 op->msg = change->msg;
1568} 1594}
1569 1595
1570static int 1596static int
1571legal_artifact_combination (object *op, artifact * art) 1597legal_artifact_combination (object *op, artifact *art)
1572{ 1598{
1573 int neg, success = 0; 1599 int neg, success = 0;
1574 linked_char *tmp; 1600 linked_char *tmp;
1575 const char *name; 1601 const char *name;
1576 1602
1577 if (art->allowed == (linked_char *) NULL) 1603 if (!art->allowed)
1578 return 1; /* Ie, "all" */ 1604 return 1; /* Ie, "all" */
1605
1579 for (tmp = art->allowed; tmp; tmp = tmp->next) 1606 for (tmp = art->allowed; tmp; tmp = tmp->next)
1580 { 1607 {
1581#ifdef TREASURE_VERBOSE 1608#ifdef TREASURE_VERBOSE
1582 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1609 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1583#endif 1610#endif
… …
1585 name = tmp->name + 1, neg = 1; 1612 name = tmp->name + 1, neg = 1;
1586 else 1613 else
1587 name = tmp->name, neg = 0; 1614 name = tmp->name, neg = 0;
1588 1615
1589 /* If we match name, then return the opposite of 'neg' */ 1616 /* If we match name, then return the opposite of 'neg' */
1590 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)))
1591 return !neg; 1618 return !neg;
1592 1619
1593 /* 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
1594 * everything is allowed except what we match 1621 * everything is allowed except what we match
1595 */ 1622 */
1596 else if (neg) 1623 else if (neg)
1597 success = 1; 1624 success = 1;
1598 } 1625 }
1626
1599 return success; 1627 return success;
1600} 1628}
1601 1629
1602/* 1630/*
1603 * Fixes the given object, giving it the abilities and titles 1631 * Fixes the given object, giving it the abilities and titles

Diff Legend

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