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.49 by root, Tue Apr 17 18:59:05 2007 UTC vs.
Revision 1.52 by root, Thu Apr 19 19:24:25 2007 UTC

… …
145 coroapi::cede_to_tick_every (10); 145 coroapi::cede_to_tick_every (10);
146 146
147 switch (f.kw) 147 switch (f.kw)
148 { 148 {
149 case KW_arch: 149 case KW_arch:
150 if (!(t->item = archetype::find (f.get_str ()))) 150 t->item = archetype::get (f.get_str ());
151 LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
152 break; 151 break;
153 152
154 case KW_list: f.get (t->name); break; 153 case KW_list: f.get (t->name); break;
155 case KW_change_name: f.get (t->change_arch.name); break; 154 case KW_change_name: f.get (t->change_arch.name); break;
156 case KW_change_title: f.get (t->change_arch.title); break; 155 case KW_change_title: f.get (t->change_arch.title); break;
… …
231 * start with equipment, but only their abilities). 230 * start with equipment, but only their abilities).
232 */ 231 */
233static void 232static void
234put_treasure (object *op, object *creator, int flags) 233put_treasure (object *op, object *creator, int flags)
235{ 234{
236 object *tmp;
237
238 /* 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
239 * 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
240 * 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
241 * by another object. 238 * by another object.
242 */ 239 */
243 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 if (flags & GT_ENVIRONMENT && op->type != SPELL)
244 { 241 {
242 if (ob_blocked (op, creator->map, creator->x, creator->y))
243 op->destroy ();
244 else
245 {
245 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 246 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
246 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 247 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
248 }
247 } 249 }
248 else 250 else
249 { 251 {
250 op = creator->insert (op); 252 op = creator->insert (op);
251 253
252 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 254 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
253 monster_check_apply (creator, op); 255 monster_check_apply (creator, op);
254 256
255 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 257 if (flags & GT_UPDATE_INV)
258 if (object *tmp = creator->in_player ())
256 esrv_send_item (tmp, op); 259 esrv_send_item (tmp, op);
257 } 260 }
258} 261}
259 262
260/* if there are change_xxx commands in the treasure, we include the changes 263/* if there are change_xxx commands in the treasure, we include the changes
261 * in the generated object 264 * in the generated object
… …
397object * 400object *
398generate_treasure (treasurelist *tl, int difficulty) 401generate_treasure (treasurelist *tl, int difficulty)
399{ 402{
400 difficulty = clamp (difficulty, 1, settings.max_level); 403 difficulty = clamp (difficulty, 1, settings.max_level);
401 404
402 object *ob = object::create (), *tmp; 405 object *ob = object::create ();
403 406
404 create_treasure (tl, ob, 0, difficulty, 0); 407 create_treasure (tl, ob, 0, difficulty, 0);
405 408
406 /* Don't want to free the object we are about to return */ 409 /* Don't want to free the object we are about to return */
407 tmp = ob->inv; 410 object *tmp = ob->inv;
408 if (tmp != NULL) 411 if (tmp)
409 tmp->remove (); 412 tmp->remove ();
410 413
411 if (ob->inv) 414 if (ob->inv)
412 LOG (llevError, "In generate treasure, created multiple objects.\n"); 415 LOG (llevError, "In generate treasure, created multiple objects.\n");
413 416
… …
421 * The array has two arguments, the difficulty of the level, and the 424 * The array has two arguments, the difficulty of the level, and the
422 * magical bonus "wanted". 425 * magical bonus "wanted".
423 */ 426 */
424 427
425static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 428static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
426
427// chance of magic difficulty 429// chance of magic difficulty
428// +0 +1 +2 +3 +4 430// +0 +1 +2 +3 +4
429 {95, 2, 2, 1, 0}, // 1 431 {95, 2, 2, 1, 0}, // 1
430 {92, 5, 2, 1, 0}, // 2 432 {92, 5, 2, 1, 0}, // 2
431 {85, 10, 4, 1, 0}, // 3 433 {85, 10, 4, 1, 0}, // 3
… …
457 { 0, 0, 0, 3, 97}, // 29 459 { 0, 0, 0, 3, 97}, // 29
458 { 0, 0, 0, 0, 100}, // 30 460 { 0, 0, 0, 0, 100}, // 30
459 { 0, 0, 0, 0, 100}, // 31 461 { 0, 0, 0, 0, 100}, // 31
460}; 462};
461 463
462
463/* calculate the appropriate level for wands staves and scrolls. 464/* calculate the appropriate level for wands staves and scrolls.
464 * This code presumes that op has had its spell object created (in op->inv) 465 * This code presumes that op has had its spell object created (in op->inv)
465 * 466 *
466 * elmex Wed Aug 9 17:44:59 CEST 2006: 467 * elmex Wed Aug 9 17:44:59 CEST 2006:
467 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 468 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
468 */ 469 */
469
470int 470int
471level_for_item (const object *op, int difficulty) 471level_for_item (const object *op, int difficulty)
472{ 472{
473 int olevel = 0; 473 int olevel = 0;
474 474
… …
784 save_item_power = op->item_power; 784 save_item_power = op->item_power;
785 op->item_power = 0; 785 op->item_power = 0;
786 786
787 if (op->randomitems && op->type != SPELL) 787 if (op->randomitems && op->type != SPELL)
788 { 788 {
789 create_treasure (op->randomitems, op, flags, difficulty, 0); 789 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
790 if (!op->inv)
791 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
792
793 /* So the treasure doesn't get created again */ 790 /* So the treasure doesn't get created again */
794 op->randomitems = 0; 791 op->randomitems = 0;
795 } 792 }
796 793
797 if (difficulty < 1) 794 if (difficulty < 1)
… …
1573 if (change->msg) 1570 if (change->msg)
1574 op->msg = change->msg; 1571 op->msg = change->msg;
1575} 1572}
1576 1573
1577static int 1574static int
1578legal_artifact_combination (object *op, artifact * art) 1575legal_artifact_combination (object *op, artifact *art)
1579{ 1576{
1580 int neg, success = 0; 1577 int neg, success = 0;
1581 linked_char *tmp; 1578 linked_char *tmp;
1582 const char *name; 1579 const char *name;
1583 1580
1584 if (art->allowed == (linked_char *) NULL) 1581 if (!art->allowed)
1585 return 1; /* Ie, "all" */ 1582 return 1; /* Ie, "all" */
1583
1586 for (tmp = art->allowed; tmp; tmp = tmp->next) 1584 for (tmp = art->allowed; tmp; tmp = tmp->next)
1587 { 1585 {
1588#ifdef TREASURE_VERBOSE 1586#ifdef TREASURE_VERBOSE
1589 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1587 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1590#endif 1588#endif
… …
1601 * everything is allowed except what we match 1599 * everything is allowed except what we match
1602 */ 1600 */
1603 else if (neg) 1601 else if (neg)
1604 success = 1; 1602 success = 1;
1605 } 1603 }
1604
1606 return success; 1605 return success;
1607} 1606}
1608 1607
1609/* 1608/*
1610 * Fixes the given object, giving it the abilities and titles 1609 * Fixes the given object, giving it the abilities and titles

Diff Legend

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