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

… …
54> tl_map_t; 54> tl_map_t;
55 55
56static tl_map_t tl_map; 56static tl_map_t tl_map;
57 57
58/* 58/*
59 * Initialize global archtype pointers:
60 */
61void
62init_archetype_pointers ()
63{
64 int prev_warn = warn_archetypes;
65
66 warn_archetypes = 1;
67
68 if (ring_arch == NULL)
69 ring_arch = archetype::find ("ring");
70 if (amulet_arch == NULL)
71 amulet_arch = archetype::find ("amulet");
72 if (staff_arch == NULL)
73 staff_arch = archetype::find ("staff");
74 if (crown_arch == NULL)
75 crown_arch = archetype::find ("crown");
76
77 warn_archetypes = prev_warn;
78}
79
80/*
81 * Searches for the given treasurelist 59 * Searches for the given treasurelist
82 */ 60 */
83treasurelist * 61treasurelist *
84treasurelist::find (const char *name) 62treasurelist::find (const char *name)
85{ 63{
… …
167 coroapi::cede_to_tick_every (10); 145 coroapi::cede_to_tick_every (10);
168 146
169 switch (f.kw) 147 switch (f.kw)
170 { 148 {
171 case KW_arch: 149 case KW_arch:
172 if (!(t->item = archetype::find (f.get_str ()))) 150 t->item = archetype::get (f.get_str ());
173 LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
174 break; 151 break;
175 152
176 case KW_list: f.get (t->name); break; 153 case KW_list: f.get (t->name); break;
177 case KW_change_name: f.get (t->change_arch.name); break; 154 case KW_change_name: f.get (t->change_arch.name); break;
178 case KW_change_title: f.get (t->change_arch.title); break; 155 case KW_change_title: f.get (t->change_arch.title); break;
… …
253 * start with equipment, but only their abilities). 230 * start with equipment, but only their abilities).
254 */ 231 */
255static void 232static void
256put_treasure (object *op, object *creator, int flags) 233put_treasure (object *op, object *creator, int flags)
257{ 234{
258 object *tmp;
259
260 /* 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
261 * 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
262 * 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
263 * by another object. 238 * by another object.
264 */ 239 */
265 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 if (flags & GT_ENVIRONMENT && op->type != SPELL)
266 { 241 {
242 if (ob_blocked (op, creator->map, creator->x, creator->y))
243 op->destroy ();
244 else
245 {
267 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 246 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
268 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 }
269 } 249 }
270 else 250 else
271 { 251 {
272 op = creator->insert (op); 252 op = creator->insert (op);
273 253
274 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 254 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
275 monster_check_apply (creator, op); 255 monster_check_apply (creator, op);
276 256
277 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 257 if (flags & GT_UPDATE_INV)
258 if (object *tmp = creator->in_player ())
278 esrv_send_item (tmp, op); 259 esrv_send_item (tmp, op);
279 } 260 }
280} 261}
281 262
282/* 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
283 * in the generated object 264 * in the generated object
… …
419object * 400object *
420generate_treasure (treasurelist *tl, int difficulty) 401generate_treasure (treasurelist *tl, int difficulty)
421{ 402{
422 difficulty = clamp (difficulty, 1, settings.max_level); 403 difficulty = clamp (difficulty, 1, settings.max_level);
423 404
424 object *ob = object::create (), *tmp; 405 object *ob = object::create ();
425 406
426 create_treasure (tl, ob, 0, difficulty, 0); 407 create_treasure (tl, ob, 0, difficulty, 0);
427 408
428 /* 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 */
429 tmp = ob->inv; 410 object *tmp = ob->inv;
430 if (tmp != NULL) 411 if (tmp)
431 tmp->remove (); 412 tmp->remove ();
432 413
433 if (ob->inv) 414 if (ob->inv)
434 LOG (llevError, "In generate treasure, created multiple objects.\n"); 415 LOG (llevError, "In generate treasure, created multiple objects.\n");
435 416
… …
443 * 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
444 * magical bonus "wanted". 425 * magical bonus "wanted".
445 */ 426 */
446 427
447static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { 428static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
448
449// chance of magic difficulty 429// chance of magic difficulty
450// +0 +1 +2 +3 +4 430// +0 +1 +2 +3 +4
451 {95, 2, 2, 1, 0}, // 1 431 {95, 2, 2, 1, 0}, // 1
452 {92, 5, 2, 1, 0}, // 2 432 {92, 5, 2, 1, 0}, // 2
453 {85, 10, 4, 1, 0}, // 3 433 {85, 10, 4, 1, 0}, // 3
… …
479 { 0, 0, 0, 3, 97}, // 29 459 { 0, 0, 0, 3, 97}, // 29
480 { 0, 0, 0, 0, 100}, // 30 460 { 0, 0, 0, 0, 100}, // 30
481 { 0, 0, 0, 0, 100}, // 31 461 { 0, 0, 0, 0, 100}, // 31
482}; 462};
483 463
484
485/* calculate the appropriate level for wands staves and scrolls. 464/* calculate the appropriate level for wands staves and scrolls.
486 * 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)
487 * 466 *
488 * elmex Wed Aug 9 17:44:59 CEST 2006: 467 * elmex Wed Aug 9 17:44:59 CEST 2006:
489 * 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.
490 */ 469 */
491
492int 470int
493level_for_item (const object *op, int difficulty) 471level_for_item (const object *op, int difficulty)
494{ 472{
495 int olevel = 0; 473 int olevel = 0;
496 474
… …
806 save_item_power = op->item_power; 784 save_item_power = op->item_power;
807 op->item_power = 0; 785 op->item_power = 0;
808 786
809 if (op->randomitems && op->type != SPELL) 787 if (op->randomitems && op->type != SPELL)
810 { 788 {
811 create_treasure (op->randomitems, op, flags, difficulty, 0); 789 create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
812 if (!op->inv)
813 LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
814
815 /* So the treasure doesn't get created again */ 790 /* So the treasure doesn't get created again */
816 op->randomitems = 0; 791 op->randomitems = 0;
817 } 792 }
818 793
819 if (difficulty < 1) 794 if (difficulty < 1)
… …
1349 break; 1324 break;
1350 1325
1351 case KW_object: 1326 case KW_object:
1352 { 1327 {
1353 art->item = object::create (); 1328 art->item = object::create ();
1329 f.get (art->item->name);
1330 f.next ();
1354 1331
1355 if (!art->item->parse_kv (f)) 1332 if (!art->item->parse_kv (f))
1356 LOG (llevError, "Init_Artifacts: Could not load object.\n"); 1333 LOG (llevError, "Init_Artifacts: Could not load object.\n");
1357 1334
1358 al = find_artifactlist (art->item->type); 1335 al = find_artifactlist (art->item->type);
… …
1593 if (change->msg) 1570 if (change->msg)
1594 op->msg = change->msg; 1571 op->msg = change->msg;
1595} 1572}
1596 1573
1597static int 1574static int
1598legal_artifact_combination (object *op, artifact * art) 1575legal_artifact_combination (object *op, artifact *art)
1599{ 1576{
1600 int neg, success = 0; 1577 int neg, success = 0;
1601 linked_char *tmp; 1578 linked_char *tmp;
1602 const char *name; 1579 const char *name;
1603 1580
1604 if (art->allowed == (linked_char *) NULL) 1581 if (!art->allowed)
1605 return 1; /* Ie, "all" */ 1582 return 1; /* Ie, "all" */
1583
1606 for (tmp = art->allowed; tmp; tmp = tmp->next) 1584 for (tmp = art->allowed; tmp; tmp = tmp->next)
1607 { 1585 {
1608#ifdef TREASURE_VERBOSE 1586#ifdef TREASURE_VERBOSE
1609 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1587 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1610#endif 1588#endif
… …
1621 * everything is allowed except what we match 1599 * everything is allowed except what we match
1622 */ 1600 */
1623 else if (neg) 1601 else if (neg)
1624 success = 1; 1602 success = 1;
1625 } 1603 }
1604
1626 return success; 1605 return success;
1627} 1606}
1628 1607
1629/* 1608/*
1630 * 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