… | |
… | |
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 | */ |
233 | static void |
232 | static void |
234 | put_treasure (object *op, object *creator, int flags) |
233 | put_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 | op->deactivate_recursive (); |
|
|
243 | op->expand_tail (); |
|
|
244 | |
|
|
245 | if (ob_blocked (op, creator->map, creator->x, creator->y)) |
|
|
246 | op->destroy (); |
|
|
247 | else |
|
|
248 | { |
245 | SET_FLAG (op, FLAG_OBJ_ORIGINAL); |
249 | SET_FLAG (op, FLAG_OBJ_ORIGINAL); |
246 | op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); |
250 | op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); |
|
|
251 | } |
247 | } |
252 | } |
248 | else |
253 | else |
249 | { |
254 | { |
250 | op = creator->insert (op); |
255 | op = creator->insert (op); |
251 | |
256 | |
252 | if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) |
257 | if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) |
253 | monster_check_apply (creator, op); |
258 | monster_check_apply (creator, op); |
254 | |
259 | |
255 | if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) |
260 | if (flags & GT_UPDATE_INV) |
|
|
261 | if (object *tmp = creator->in_player ()) |
256 | esrv_send_item (tmp, op); |
262 | esrv_send_item (tmp, op); |
257 | } |
263 | } |
258 | } |
264 | } |
259 | |
265 | |
260 | /* if there are change_xxx commands in the treasure, we include the changes |
266 | /* if there are change_xxx commands in the treasure, we include the changes |
261 | * in the generated object |
267 | * in the generated object |
… | |
… | |
397 | object * |
403 | object * |
398 | generate_treasure (treasurelist *tl, int difficulty) |
404 | generate_treasure (treasurelist *tl, int difficulty) |
399 | { |
405 | { |
400 | difficulty = clamp (difficulty, 1, settings.max_level); |
406 | difficulty = clamp (difficulty, 1, settings.max_level); |
401 | |
407 | |
402 | object *ob = object::create (), *tmp; |
408 | object *ob = object::create (); |
403 | |
409 | |
404 | create_treasure (tl, ob, 0, difficulty, 0); |
410 | create_treasure (tl, ob, 0, difficulty, 0); |
405 | |
411 | |
406 | /* Don't want to free the object we are about to return */ |
412 | /* Don't want to free the object we are about to return */ |
407 | tmp = ob->inv; |
413 | object *tmp = ob->inv; |
408 | if (tmp != NULL) |
414 | if (tmp) |
409 | tmp->remove (); |
415 | tmp->remove (); |
410 | |
416 | |
411 | if (ob->inv) |
417 | if (ob->inv) |
412 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
418 | LOG (llevError, "In generate treasure, created multiple objects.\n"); |
413 | |
419 | |
… | |
… | |
421 | * The array has two arguments, the difficulty of the level, and the |
427 | * The array has two arguments, the difficulty of the level, and the |
422 | * magical bonus "wanted". |
428 | * magical bonus "wanted". |
423 | */ |
429 | */ |
424 | |
430 | |
425 | static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { |
431 | static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = { |
426 | |
|
|
427 | // chance of magic difficulty |
432 | // chance of magic difficulty |
428 | // +0 +1 +2 +3 +4 |
433 | // +0 +1 +2 +3 +4 |
429 | {95, 2, 2, 1, 0}, // 1 |
434 | {95, 2, 2, 1, 0}, // 1 |
430 | {92, 5, 2, 1, 0}, // 2 |
435 | {92, 5, 2, 1, 0}, // 2 |
431 | {85, 10, 4, 1, 0}, // 3 |
436 | {85, 10, 4, 1, 0}, // 3 |
… | |
… | |
457 | { 0, 0, 0, 3, 97}, // 29 |
462 | { 0, 0, 0, 3, 97}, // 29 |
458 | { 0, 0, 0, 0, 100}, // 30 |
463 | { 0, 0, 0, 0, 100}, // 30 |
459 | { 0, 0, 0, 0, 100}, // 31 |
464 | { 0, 0, 0, 0, 100}, // 31 |
460 | }; |
465 | }; |
461 | |
466 | |
462 | |
|
|
463 | /* calculate the appropriate level for wands staves and scrolls. |
467 | /* calculate the appropriate level for wands staves and scrolls. |
464 | * This code presumes that op has had its spell object created (in op->inv) |
468 | * This code presumes that op has had its spell object created (in op->inv) |
465 | * |
469 | * |
466 | * elmex Wed Aug 9 17:44:59 CEST 2006: |
470 | * elmex Wed Aug 9 17:44:59 CEST 2006: |
467 | * Removed multiplicator, too many high-level items were generated on low-difficulty maps. |
471 | * Removed multiplicator, too many high-level items were generated on low-difficulty maps. |
468 | */ |
472 | */ |
469 | |
|
|
470 | int |
473 | int |
471 | level_for_item (const object *op, int difficulty) |
474 | level_for_item (const object *op, int difficulty) |
472 | { |
475 | { |
473 | int olevel = 0; |
476 | int olevel = 0; |
474 | |
477 | |
… | |
… | |
784 | save_item_power = op->item_power; |
787 | save_item_power = op->item_power; |
785 | op->item_power = 0; |
788 | op->item_power = 0; |
786 | |
789 | |
787 | if (op->randomitems && op->type != SPELL) |
790 | if (op->randomitems && op->type != SPELL) |
788 | { |
791 | { |
789 | create_treasure (op->randomitems, op, flags, difficulty, 0); |
792 | 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 */ |
793 | /* So the treasure doesn't get created again */ |
794 | op->randomitems = 0; |
794 | op->randomitems = 0; |
795 | } |
795 | } |
796 | |
796 | |
797 | if (difficulty < 1) |
797 | if (difficulty < 1) |
… | |
… | |
1327 | break; |
1327 | break; |
1328 | |
1328 | |
1329 | case KW_object: |
1329 | case KW_object: |
1330 | { |
1330 | { |
1331 | art->item = object::create (); |
1331 | art->item = object::create (); |
|
|
1332 | f.get (art->item->name); |
|
|
1333 | f.next (); |
1332 | |
1334 | |
1333 | if (!art->item->parse_kv (f)) |
1335 | if (!art->item->parse_kv (f)) |
1334 | LOG (llevError, "Init_Artifacts: Could not load object.\n"); |
1336 | LOG (llevError, "Init_Artifacts: Could not load object.\n"); |
1335 | |
1337 | |
1336 | al = find_artifactlist (art->item->type); |
1338 | al = find_artifactlist (art->item->type); |
… | |
… | |
1571 | if (change->msg) |
1573 | if (change->msg) |
1572 | op->msg = change->msg; |
1574 | op->msg = change->msg; |
1573 | } |
1575 | } |
1574 | |
1576 | |
1575 | static int |
1577 | static int |
1576 | legal_artifact_combination (object *op, artifact * art) |
1578 | legal_artifact_combination (object *op, artifact *art) |
1577 | { |
1579 | { |
1578 | int neg, success = 0; |
1580 | int neg, success = 0; |
1579 | linked_char *tmp; |
1581 | linked_char *tmp; |
1580 | const char *name; |
1582 | const char *name; |
1581 | |
1583 | |
1582 | if (art->allowed == (linked_char *) NULL) |
1584 | if (!art->allowed) |
1583 | return 1; /* Ie, "all" */ |
1585 | return 1; /* Ie, "all" */ |
|
|
1586 | |
1584 | for (tmp = art->allowed; tmp; tmp = tmp->next) |
1587 | for (tmp = art->allowed; tmp; tmp = tmp->next) |
1585 | { |
1588 | { |
1586 | #ifdef TREASURE_VERBOSE |
1589 | #ifdef TREASURE_VERBOSE |
1587 | LOG (llevDebug, "legal_art: %s\n", &tmp->name); |
1590 | LOG (llevDebug, "legal_art: %s\n", &tmp->name); |
1588 | #endif |
1591 | #endif |
… | |
… | |
1599 | * everything is allowed except what we match |
1602 | * everything is allowed except what we match |
1600 | */ |
1603 | */ |
1601 | else if (neg) |
1604 | else if (neg) |
1602 | success = 1; |
1605 | success = 1; |
1603 | } |
1606 | } |
|
|
1607 | |
1604 | return success; |
1608 | return success; |
1605 | } |
1609 | } |
1606 | |
1610 | |
1607 | /* |
1611 | /* |
1608 | * Fixes the given object, giving it the abilities and titles |
1612 | * Fixes the given object, giving it the abilities and titles |