ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.178 by root, Sun Dec 28 15:28:47 2008 UTC vs.
Revision 1.194 by root, Tue May 5 04:51:56 2009 UTC

… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <cmath> 24#include <cmath>
25 25
… …
92 * Return value: 1 if money was destroyed, 0 if not. 92 * Return value: 1 if money was destroyed, 0 if not.
93 */ 93 */
94static int 94static int
95apply_id_altar (object *money, object *altar, object *pl) 95apply_id_altar (object *money, object *altar, object *pl)
96{ 96{
97 dynbuf_text buf; 97 dynbuf_text &buf = msg_dynbuf; buf.clear ();
98 98
99 if (!pl || pl->type != PLAYER) 99 if (!pl || pl->type != PLAYER)
100 return 0; 100 return 0;
101 101
102 /* Check for MONEY type is a special hack - it prevents 'nothing needs 102 /* Check for MONEY type is a special hack - it prevents 'nothing needs
… …
160 * matching item. 160 * matching item.
161 **/ 161 **/
162void 162void
163handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
164{ 164{
165 if (shstr yield = tmp->kv (shstr_on_use_yield)) 165 if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR); 166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167} 167}
168 168
169/** 169/**
170 * Handles applying a potion. 170 * Handles applying a potion.
… …
315 */ 315 */
316 if (tmp->inv) 316 if (tmp->inv)
317 { 317 {
318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
319 { 319 {
320 object *fball;
321
322 op->failmsg ("Yech! Your lungs are on fire!"); 320 op->failmsg ("Yech! Your lungs are on fire!");
323 321 create_exploding_ball_at (op, op->level);
324 /* Explodes a fireball centered at player */
325 fball = get_archetype (EXPLODING_FIREBALL);
326 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
327 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
328 fball->x = op->x;
329 fball->y = op->y;
330 insert_ob_in_map (fball, op->map, NULL, 0);
331 } 322 }
332 else 323 else
333 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 324 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
334 325
335 tmp->decrease (); 326 tmp->decrease ();
… …
378 } 369 }
379 370
380 /* Only thing left are the stat potions */ 371 /* Only thing left are the stat potions */
381 if (op->type == PLAYER) 372 if (op->type == PLAYER)
382 { /* only for players */ 373 { /* only for players */
383 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 374 if ((QUERY_FLAG (tmp, FLAG_CURSED)
375 || QUERY_FLAG (tmp, FLAG_DAMNED))
376 && tmp->value != 0)
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 377 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 else 378 else
386 SET_FLAG (tmp, FLAG_APPLIED); 379 SET_FLAG (tmp, FLAG_APPLIED);
387 380
388 if (!change_abil (op, tmp)) 381 if (!change_abil (op, tmp))
… …
403/**************************************************************************** 396/****************************************************************************
404 * Weapon improvement code follows 397 * Weapon improvement code follows
405 ****************************************************************************/ 398 ****************************************************************************/
406 399
407/** 400/**
401 * This function just checks whether who can handle equipping an item
402 * with item_power.
403 */
404
405bool
406check_item_power (object *who, int item_power)
407{
408 if (who->type == PLAYER
409 && item_power
410 && item_power + who->contr->item_power > settings.item_power_factor * who->level)
411 return false;
412 else
413 return true;
414}
415
416/**
408 * This returns the sum of nrof of item (arch name). 417 * This returns the sum of nrof of item (arch name).
409 */ 418 */
410static int 419static int
411check_item (object *op, const char *item) 420check_item (object *op, shstr_cmp item)
412{ 421{
413 int count = 0; 422 int count = 0;
414 423
415 if (!item) 424 if (!item)
416 return 0; 425 return 0;
417 426
418 for (op = op->below; op; op = op->below) 427 for (op = op->below; op; op = op->below)
419 {
420 if (strcmp (op->arch->archname, item) == 0) 428 if (op->arch->archname == item)
421 {
422 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 429 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
423 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 430 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
424 {
425 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
426 count++;
427 else
428 count += op->nrof; 431 count += op->number_of ();
429 }
430 }
431 }
432 432
433 return count; 433 return count;
434} 434}
435 435
436/** 436/**
… …
438 * op is typically the player, which is only 438 * op is typically the player, which is only
439 * really used to determine what space to look at. 439 * really used to determine what space to look at.
440 * Modified to only eat 'nrof' of objects. 440 * Modified to only eat 'nrof' of objects.
441 */ 441 */
442static void 442static void
443eat_item (object *op, const char *item, uint32 nrof) 443eat_item (object *op, shstr_cmp item, uint32 nrof)
444{ 444{
445 object *prev; 445 object *prev;
446 446
447 prev = op; 447 prev = op;
448 op = op->below; 448 op = op->below;
449 449
450 while (op) 450 while (op)
451 { 451 {
452 if (strcmp (op->arch->archname, item) == 0) 452 if (op->arch->archname == item)
453 { 453 {
454 if (op->nrof >= nrof) 454 if (op->nrof >= nrof)
455 { 455 {
456 op->decrease (nrof); 456 op->decrease (nrof);
457 return; 457 return;
… …
466 } 466 }
467 467
468 prev = op; 468 prev = op;
469 op = op->below; 469 op = op->below;
470 } 470 }
471}
472
473/**
474 * This checks to see of the player (who) is sufficient level to use a weapon
475 * with improvs improvements (typically last_eat). We take an int here
476 * instead of the object so that the improvement code can pass along the
477 * increased value to see if the object is usuable.
478 * we return 1 (true) if the player can use the weapon.
479 */
480static int
481check_weapon_power (const object *who, int improvs)
482{
483/* Old code is below (commented out). Basically, since weapons are the only
484 * object players really have any control to improve, it's a bit harsh to
485 * require high level in some combat skill, so we just use overall level.
486 */
487#if 1
488 if (((who->level / 5) + 5) >= improvs)
489 return 1;
490 else
491 return 0;
492
493#else
494 int level = 0;
495
496 /* The skill system hands out wc and dam bonuses to fighters
497 * more generously than the old system (see fix_player). Thus
498 * we need to curtail the power of player enchanted weapons.
499 * I changed this to 1 improvement per "fighter" level/5 -b.t.
500 * Note: Nothing should break by allowing this ratio to be different or
501 * using normal level - it is just a matter of play balance.
502 */
503 if (who->type == PLAYER)
504 {
505 object *wc_obj = NULL;
506
507 for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
508 if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
509 level = wc_obj->level;
510
511 if (!level)
512 {
513 LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
514 level = who->level;
515 }
516 }
517 else
518 level = who->level;
519
520 return (improvs <= ((level / 5) + 5));
521#endif
522} 471}
523 472
524/** 473/**
525 * Returns how many items of type improver->slaying there are under op. 474 * Returns how many items of type improver->slaying there are under op.
526 * Will display a message if none found, and 1 if improver->slaying is NULL. 475 * Will display a message if none found, and 1 if improver->slaying is NULL.
… …
655 if (improver->stats.sp == IMPROVE_PREPARE) 604 if (improver->stats.sp == IMPROVE_PREPARE)
656 return prepare_weapon (op, improver, weapon); 605 return prepare_weapon (op, improver, weapon);
657 606
658 if (weapon->level == 0) 607 if (weapon->level == 0)
659 { 608 {
660 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>"); 609 op->failmsg (
610 "This weapon has not been prepared."
611 " H<You first have to prepare a weapon with a prepare weapon scroll.>");
661 return 0; 612 return 0;
662 } 613 }
663 614
664 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 615 if (weapon->last_eat >= weapon->level // improvements used up
616 || weapon->item_power >= 100) // or item_power >= arbitrary limit of 100
665 { 617 {
666 op->failmsg ("This weapon cannot be improved any more."); 618 op->failmsg ("This weapon cannot be improved any more.");
667 return 0; 619 return 0;
668 } 620 }
669 621
670 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 622 if (QUERY_FLAG (weapon, FLAG_APPLIED)
623 && !check_item_power (op, weapon->item_power + 1))
671 { 624 {
672 op->failmsg ("Improving the weapon will make it too " 625 op->failmsg ("Improving the weapon will make it too "
673 "powerful for you to use. Unready it if you " 626 "powerful for you to use. Unready it if you "
674 "really want to improve it."); 627 "really want to improve it.");
675 return 0; 628 return 0;
… …
1126/* push_button (altar);*/ 1079/* push_button (altar);*/
1127 } 1080 }
1128 else 1081 else
1129 { 1082 {
1130 altar->value = 1; /* works only once */ 1083 altar->value = 1; /* works only once */
1131 push_button (altar); 1084 push_button (altar, originator);
1132 } 1085 }
1133 1086
1134 return !sacrifice; 1087 return !sacrifice;
1135 } 1088 }
1136 else 1089 else
… …
1263 * Handles applying a sign. 1216 * Handles applying a sign.
1264 */ 1217 */
1265static void 1218static void
1266apply_sign (object *op, object *sign, int autoapply) 1219apply_sign (object *op, object *sign, int autoapply)
1267{ 1220{
1221 if (!op->is_player())
1222 return;
1223
1268 if (sign->has_dialogue ()) 1224 if (sign->has_dialogue ())
1269 { 1225 {
1270 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name)); 1226 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1271 return; 1227 return;
1272 } 1228 }
… …
1429 } 1385 }
1430 goto leave; 1386 goto leave;
1431 1387
1432 case BUTTON: 1388 case BUTTON:
1433 case PEDESTAL: 1389 case PEDESTAL:
1434 update_button (trap); 1390 update_button (trap, originator);
1435 goto leave; 1391 goto leave;
1436 1392
1437 case ALTAR: 1393 case ALTAR:
1438 /* sacrifice victim on trap */ 1394 /* sacrifice victim on trap */
1439 apply_altar (trap, victim, originator); 1395 apply_altar (trap, victim, originator);
… …
1532 if (victim->type == PLAYER && EXIT_PATH (trap)) 1488 if (victim->type == PLAYER && EXIT_PATH (trap))
1533 { 1489 {
1534 /* Basically, don't show exits leading to random maps the 1490 /* Basically, don't show exits leading to random maps the
1535 * players output. 1491 * players output.
1536 */ 1492 */
1537 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1493 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1538 victim->statusmsg (trap->msg, NDI_NAVY); 1494 victim->statusmsg (trap->msg, NDI_NAVY);
1539 1495
1540 trap->play_sound (trap->sound); 1496 trap->play_sound (trap->sound);
1541 victim->enter_exit (trap); 1497 victim->enter_exit (trap);
1542 } 1498 }
… …
1789 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1745 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1790 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!"); 1746 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1791 return; 1747 return;
1792 } 1748 }
1793 1749
1794 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1750 int learn_level = sqrtf (spell->level) * 1.5f;
1751 if (skop->level < learn_level)
1795 { 1752 {
1796 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill)); 1753 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1754 &tmp->skill, learn_level));
1797 return; 1755 return;
1798 } 1756 }
1799 1757
1800 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1758 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1801 1759
… …
2348 2306
2349 return 0; 2307 return 0;
2350} 2308}
2351 2309
2352/** 2310/**
2311 * This function will try to apply a lighter and in case no lighter
2312 * is specified it will try to find a lighter in the players inventory,
2313 * and inform him about this requirement.
2314 *
2315 * who - the player
2316 * op - the item we want to light
2317 * lighter - the lighter or 0 if a lighter has yet to be found
2318 */
2319static object *
2320auto_apply_lighter (object *who, object *op, object *lighter)
2321{
2322 if (lighter == 0)
2323 {
2324 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2325 {
2326 if (tmp->type == LIGHTER)
2327 {
2328 lighter = tmp;
2329 break;
2330 }
2331 }
2332
2333 if (!lighter)
2334 {
2335 who->failmsg (format (
2336 "You can't light up the %s with your bare hands! "
2337 "H<You need a lighter in your inventory, for example a flint and steel.>",
2338 &op->name));
2339 return 0;
2340 }
2341 }
2342
2343 // last_eat == 0 means the lighter is not being used up!
2344 if (lighter->last_eat && lighter->stats.food)
2345 {
2346 /* lighter gets used up */
2347 lighter = lighter->split ();
2348 lighter->stats.food--;
2349 who->insert (lighter);
2350 }
2351 else if (lighter->last_eat)
2352 {
2353 /* no charges left in lighter */
2354 who->failmsg (format (
2355 "You attempt to light the %s with a used up %s.",
2356 &op->name, &lighter->name));
2357 return 0;
2358 }
2359
2360 return lighter;
2361}
2362
2363/**
2364 * Designed primarily to light torches/lanterns/etc.
2365 * Also burns up burnable material too. First object in the inventory is
2366 * the selected object to "burn". -b.t.
2367 */
2368void
2369apply_lighter (object *who, object *lighter)
2370{
2371 object *item;
2372 int is_player_env = 0;
2373
2374 item = find_marked_object (who);
2375 if (item)
2376 {
2377 if (!auto_apply_lighter (who, item, lighter))
2378 return;
2379
2380 /* Perhaps we should split what we are trying to light on fire?
2381 * I can't see many times when you would want to light multiple
2382 * objects at once.
2383 */
2384
2385 save_throw_object (item, AT_FIRE, who);
2386
2387 if (item->destroyed ()
2388 || ((item->type == LAMP || item->type == TORCH)
2389 && item->glow_radius > 0))
2390 who->statusmsg (format (
2391 "You light the %s with the %s.",
2392 &item->name, &lighter->name));
2393 else
2394 who->failmsg (format (
2395 "You attempt to light the %s with the %s and fail.",
2396 &item->name, &lighter->name));
2397 }
2398 else
2399 who->failmsg ("You need to mark a lightable object.");
2400}
2401
2402/**
2403 * This function generates a cursed effect for cursed lamps and torches.
2404 */
2405void player_apply_lamp_cursed_effect (object *who, object *op)
2406{
2407 if (op->level)
2408 {
2409 who->failmsg (format (
2410 "The %s was cursed, it explodes in a big fireball!",
2411 &op->name));
2412 create_exploding_ball_at (who, op->level);
2413 }
2414 else
2415 {
2416 who->failmsg (format (
2417 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2418 &op->name));
2419 }
2420
2421 op->destroy ();
2422}
2423
2424/**
2425 * Apply for players and lamps
2426 *
2427 * who - the player
2428 * op - the lamp
2429 */
2430void player_apply_lamp (object *who, object *op)
2431{
2432 bool switch_on = op->glow_radius ? false : true;
2433
2434 if (switch_on)
2435 {
2436 object *lighter = 0;
2437
2438 if (op->flag [FLAG_IS_LIGHTABLE]
2439 && !(lighter = auto_apply_lighter (who, op, 0)))
2440 return;
2441
2442 if (op->stats.food < 1)
2443 {
2444 if (op->type == LAMP)
2445 who->failmsg (format (
2446 "The %s is out of fuel! "
2447 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2448 &op->name));
2449 else
2450 who->failmsg (format (
2451 "The %s is burnt out! "
2452 "H<Torches and similar items burn out and become worthless.>",
2453 &op->name));
2454 return;
2455 }
2456
2457 if (op->flag [FLAG_CURSED])
2458 {
2459 player_apply_lamp_cursed_effect (who, op);
2460 return;
2461 }
2462
2463 if (lighter)
2464 who->statusmsg (format (
2465 "You light up the %s with the %s.", &op->name, &lighter->name));
2466 else
2467 who->statusmsg (format ("You light up the %s.", &op->name));
2468 }
2469 else
2470 {
2471 if (op->flag [FLAG_CURSED])
2472 {
2473 player_apply_lamp_cursed_effect (who, op);
2474 return;
2475 }
2476
2477 if (op->type == TORCH)
2478 {
2479 if (!op->flag [FLAG_IS_LIGHTABLE])
2480 {
2481 who->statusmsg (format (
2482 "You put out the %s. "
2483 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2484 &op->name, &op->name));
2485 }
2486 else
2487 who->statusmsg (format (
2488 "You put out the %s."
2489 "H<Torches wear out if you put them out.>",
2490 &op->name));
2491 }
2492 else
2493 who->statusmsg (format ("You turn off the %s.", &op->name));
2494 }
2495
2496 apply_lamp (op, switch_on);
2497}
2498
2499void get_animation_from_arch (object *op, arch_ptr a)
2500{
2501 op->animation_id = a->animation_id;
2502 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2503 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2504 op->anim_speed = a->anim_speed;
2505 op->last_anim = 0;
2506 op->state = 0;
2507 op->face = a->face;
2508
2509 if (NUM_ANIMATIONS(op) > 1)
2510 {
2511 SET_ANIMATION(op, 0);
2512 animate_object (op, op->direction);
2513 }
2514 else
2515 update_object (op, UP_OBJ_FACE);
2516}
2517
2518/**
2519 * Apply for LAMPs and TORCHes.
2520 *
2521 * op - the lamp
2522 * switch_on - a flag which says whether the lamp should be switched on or off
2523 */
2524void apply_lamp (object *op, bool switch_on)
2525{
2526 op->set_glow_radius (switch_on ? op->range : 0);
2527 op->set_speed (switch_on ? op->arch->speed : 0);
2528
2529 // torches wear out if you put them out
2530 if (op->type == TORCH && !switch_on)
2531 {
2532 if (op->flag [FLAG_IS_LIGHTABLE])
2533 {
2534 op->stats.food -= (double) op->arch->stats.food / 15;
2535 if (op->stats.food < 0)
2536 op->stats.food = 0;
2537 }
2538 else
2539 op->stats.food = 0;
2540 }
2541
2542 // lamps and torched get worthless when used up
2543 if (op->stats.food <= 0)
2544 op->value = 0;
2545
2546 // FIXME: This is a hack to make the more sane torches and lamps
2547 // still animated ;-/
2548 if (op->other_arch)
2549 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2550
2551 if (object *pl = op->visible_to ())
2552 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2553}
2554
2555/**
2353 * Main apply handler. 2556 * Main apply handler.
2354 * 2557 *
2355 * Checks for unpaid items before applying. 2558 * Checks for unpaid items before applying.
2356 * 2559 *
2357 * Return value: 2560 * Return value:
2358 * 0: player or monster can't apply objects of that type 2561 * 0: player or monster can't apply objects of that type
2359 * 1: has been applied, or there was an error applying the object 2562 * 1: has been applied, or there was an error applying the object
2360 * 2: objects of that type can't be applied if not in inventory 2563 * 2: objects of that type can't be applied if not in inventory
2361 * 2564 *
2362 * op is the object that is causing object to be applied, tmp is the object 2565 * who is the object that is causing object to be applied, op is the object
2363 * being applied. 2566 * being applied.
2364 * 2567 *
2365 * aflag is special (always apply/unapply) flags. Nothing is done with 2568 * aflag is special (always apply/unapply) flags. Nothing is done with
2366 * them in this function - they are passed to apply_special 2569 * them in this function - they are passed to apply_special
2367 */ 2570 */
2368int 2571int
2369manual_apply (object *op, object *tmp, int aflag) 2572manual_apply (object *who, object *op, int aflag)
2370{ 2573{
2371 tmp = tmp->head_ (); 2574 op = op->head_ ();
2372 2575
2373 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2576 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2374 { 2577 {
2375 if (op->type == PLAYER) 2578 if (who->type == PLAYER)
2376 { 2579 {
2580 examine (who, op);
2377 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2581 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2378 return 1; 2582 return 1;
2379 } 2583 }
2380 else 2584 else
2381 return 0; /* monsters just skip unpaid items */ 2585 return 0; /* monsters just skip unpaid items */
2382 } 2586 }
2383 2587
2384 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2588 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2385 return RESULT_INT (0); 2589 return RESULT_INT (0);
2386 2590
2387 switch (tmp->type) 2591 switch (op->type)
2388 { 2592 {
2389 case CF_HANDLE: 2593 case CF_HANDLE:
2390 op->play_sound (sound_find ("turn_handle")); 2594 who->play_sound (sound_find ("turn_handle"));
2391 op->statusmsg ("You turn the handle."); 2595 who->statusmsg ("You turn the handle.");
2392 tmp->value = tmp->value ? 0 : 1; 2596 op->value = op->value ? 0 : 1;
2393 SET_ANIMATION (tmp, tmp->value); 2597 SET_ANIMATION (op, op->value);
2394 update_object (tmp, UP_OBJ_FACE); 2598 update_object (op, UP_OBJ_FACE);
2395 push_button (tmp); 2599 push_button (op, who);
2396 return 1; 2600 return 1;
2397 2601
2398 case TRIGGER: 2602 case TRIGGER:
2399 if (check_trigger (tmp, op)) 2603 if (check_trigger (op, who))
2400 { 2604 {
2401 op->statusmsg ("You turn the handle."); 2605 who->statusmsg ("You turn the handle.");
2402 op->play_sound (sound_find ("turn_handle")); 2606 who->play_sound (sound_find ("turn_handle"));
2403 } 2607 }
2404 else 2608 else
2405 op->failmsg ("The handle doesn't move."); 2609 who->failmsg ("The handle doesn't move.");
2406 2610
2407 return 1; 2611 return 1;
2408 2612
2409 case EXIT: 2613 case EXIT:
2410 if (op->type != PLAYER) 2614 if (who->type != PLAYER)
2411 return 0; 2615 return 0;
2412 2616
2413 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2617 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2414 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2618 who->failmsg (format ("The %s is closed.", query_name (op)));
2415 else 2619 else
2416 { 2620 {
2417 /* Don't display messages for random maps. */ 2621 /* Don't display messages for random maps. */
2418 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2622 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2419 op->statusmsg (tmp->msg, NDI_NAVY); 2623 who->statusmsg (op->msg, NDI_NAVY);
2420 2624
2421 op->enter_exit (tmp); 2625 who->enter_exit (op);
2422 } 2626 }
2423 2627
2424 return 1; 2628 return 1;
2425 2629
2426 case INSCRIBABLE: 2630 case INSCRIBABLE:
2427 op->statusmsg (tmp->msg); 2631 who->statusmsg (op->msg);
2428 // maybe show a spell menu to chose from or something like that 2632 // maybe show a spell menu to chose from or something like that
2429 return 1; 2633 return 1;
2430 2634
2431 case SIGN: 2635 case SIGN:
2432 apply_sign (op, tmp, 0); 2636 apply_sign (who, op, 0);
2433 return 1; 2637 return 1;
2434 2638
2435 case BOOK: 2639 case BOOK:
2436 if (op->type == PLAYER) 2640 if (who->type == PLAYER)
2437 { 2641 {
2438 apply_book (op, tmp); 2642 apply_book (who, op);
2439 return 1; 2643 return 1;
2440 } 2644 }
2441 else 2645 else
2442 return 0; 2646 return 0;
2443 2647
2444 case SKILLSCROLL: 2648 case SKILLSCROLL:
2445 if (op->type == PLAYER) 2649 if (who->type == PLAYER)
2446 { 2650 {
2447 apply_skillscroll (op, tmp); 2651 apply_skillscroll (who, op);
2448 return 1; 2652 return 1;
2449 } 2653 }
2450 else 2654 else
2451 return 0; 2655 return 0;
2452 2656
2453 case SPELLBOOK: 2657 case SPELLBOOK:
2454 if (op->type == PLAYER) 2658 if (who->type == PLAYER)
2455 { 2659 {
2456 apply_spellbook (op, tmp); 2660 apply_spellbook (who, op);
2457 return 1; 2661 return 1;
2458 } 2662 }
2459 else 2663 else
2460 return 0; 2664 return 0;
2461 2665
2462 case SCROLL: 2666 case SCROLL:
2463 apply_scroll (op, tmp, 0); 2667 apply_scroll (who, op, 0);
2464 return 1; 2668 return 1;
2465 2669
2466 case POTION: 2670 case POTION:
2467 apply_potion (op, tmp); 2671 apply_potion (who, op);
2468 return 1; 2672 return 1;
2469 2673
2470 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2674 /* Eneq(@csd.uu.se): Handle apply on containers. */
2471 //TODO: remove, as it is unsed? 2675 //TODO: remove, as it is unsed?
2472 case CLOSE_CON: 2676 case CLOSE_CON:
2473 apply_container (op, tmp->env); 2677 apply_container (who, op->env);
2474 return 1; 2678 return 1;
2475 2679
2476 case CONTAINER: 2680 case CONTAINER:
2477 apply_container (op, tmp); 2681 apply_container (who, op);
2478 return 1; 2682 return 1;
2479 2683
2480 case TREASURE: 2684 case TREASURE:
2481 if (op->type == PLAYER) 2685 if (who->type == PLAYER)
2482 { 2686 {
2483 apply_treasure (op, tmp); 2687 apply_treasure (who, op);
2484 return 1; 2688 return 1;
2485 } 2689 }
2486 else 2690 else
2487 return 0; 2691 return 0;
2692
2693 case LAMP:
2694 case TORCH:
2695 player_apply_lamp (who, op);
2696 return 1;
2488 2697
2489 case WEAPON: 2698 case WEAPON:
2490 case ARMOUR: 2699 case ARMOUR:
2491 case BOOTS: 2700 case BOOTS:
2492 case GLOVES: 2701 case GLOVES:
… …
2500 case WAND: 2709 case WAND:
2501 case ROD: 2710 case ROD:
2502 case HORN: 2711 case HORN:
2503 case SKILL: 2712 case SKILL:
2504 case BOW: 2713 case BOW:
2505 case LAMP:
2506 case BUILDER: 2714 case BUILDER:
2507 case SKILL_TOOL: 2715 case SKILL_TOOL:
2508 if (tmp->env != op) 2716 if (op->env != who)
2509 return 2; /* not in inventory */ 2717 return 2; /* not in inventory */
2510 2718
2511 apply_special (op, tmp, aflag); 2719 apply_special (who, op, aflag);
2512 return 1; 2720 return 1;
2513 2721
2514 case DRINK: 2722 case DRINK:
2515 case FOOD: 2723 case FOOD:
2516 case FLESH: 2724 case FLESH:
2517 apply_food (op, tmp); 2725 apply_food (who, op);
2518 return 1; 2726 return 1;
2519 2727
2520 case POISON: 2728 case POISON:
2521 apply_poison (op, tmp); 2729 apply_poison (who, op);
2522 return 1; 2730 return 1;
2523 2731
2524 case SAVEBED: 2732 case SAVEBED:
2525 return 1; 2733 return 1;
2526 2734
2527 case ARMOUR_IMPROVER: 2735 case ARMOUR_IMPROVER:
2528 if (op->type == PLAYER) 2736 if (who->type == PLAYER)
2529 { 2737 {
2530 apply_armour_improver (op, tmp); 2738 apply_armour_improver (who, op);
2531 return 1; 2739 return 1;
2532 } 2740 }
2533 else 2741 else
2534 return 0; 2742 return 0;
2535 2743
2536 case WEAPON_IMPROVER: 2744 case WEAPON_IMPROVER:
2537 check_improve_weapon (op, tmp); 2745 check_improve_weapon (who, op);
2538 return 1; 2746 return 1;
2539 2747
2540 case CLOCK: 2748 case CLOCK:
2541 if (op->type == PLAYER) 2749 if (who->type == PLAYER)
2542 { 2750 {
2543 char buf[MAX_BUF]; 2751 char buf[MAX_BUF];
2544 timeofday_t tod; 2752 timeofday_t tod;
2545 2753
2546 get_tod (&tod); 2754 get_tod (&tod);
2547 op->play_sound (sound_find ("sound_clock")); 2755 who->play_sound (sound_find ("sound_clock"));
2548 op->statusmsg (format ( 2756 who->statusmsg (format (
2549 "It is %d minute%s past %d o'clock %s", 2757 "It is %d minute%s past %d o'clock %s",
2550 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2758 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2551 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2759 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2552 )); 2760 ));
2553 return 1; 2761 return 1;
2554 } 2762 }
2555 else 2763 else
2556 return 0; 2764 return 0;
2557 2765
2558 case MENU: 2766 case MENU:
2559 if (op->type == PLAYER) 2767 if (who->type == PLAYER)
2560 { 2768 {
2561 shop_listing (tmp, op); 2769 shop_listing (op, who);
2562 return 1; 2770 return 1;
2563 } 2771 }
2564 else 2772 else
2565 return 0; 2773 return 0;
2566 2774
2567 case POWER_CRYSTAL: 2775 case POWER_CRYSTAL:
2568 apply_power_crystal (op, tmp); /* see egoitem.c */ 2776 apply_power_crystal (who, op); /* see egoitem.c */
2569 return 1; 2777 return 1;
2570 2778
2571 case LIGHTER: /* for lighting torches/lanterns/etc */ 2779 case LIGHTER: /* for lighting torches/lanterns/etc */
2572 if (op->type == PLAYER) 2780 if (who->type == PLAYER)
2573 { 2781 {
2574 apply_lighter (op, tmp); 2782 apply_lighter (who, op);
2575 return 1; 2783 return 1;
2576 } 2784 }
2577 else 2785 else
2578 return 0; 2786 return 0;
2579 2787
2580 case ITEM_TRANSFORMER: 2788 case ITEM_TRANSFORMER:
2581 apply_item_transformer (op, tmp); 2789 apply_item_transformer (who, op);
2582 return 1; 2790 return 1;
2583 2791
2584 default: 2792 default:
2585 return 0; 2793 return 0;
2586 } 2794 }
… …
2737 case BRACERS: 2945 case BRACERS:
2738 case CLOAK: 2946 case CLOAK:
2739 who->statusmsg (format ("You unwear %s.", query_name (op))); 2947 who->statusmsg (format ("You unwear %s.", query_name (op)));
2740 change_abil (who, op); 2948 change_abil (who, op);
2741 break; 2949 break;
2742
2743 case LAMP:
2744 {
2745 who->statusmsg (format ("You turn off your %s.", &op->name));
2746
2747 object *tmp2 = arch_to_object (op->other_arch);
2748 tmp2->x = op->x;
2749 tmp2->y = op->y;
2750 tmp2->map = op->map;
2751 tmp2->below = op->below;
2752 tmp2->above = op->above;
2753 tmp2->stats.food = op->stats.food;
2754 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2755
2756 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2757 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2758
2759 op->destroy ();
2760 who->insert (tmp2);
2761 who->update_stats ();
2762
2763 if (who->contr)
2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2765 {
2766 who->failmsg ("Oops, it feels deadly cold!");
2767 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2768 }
2769 }
2770
2771 return 1; /* otherwise, an attempt to drop causes problems */
2772 2950
2773 case BOW: 2951 case BOW:
2774 case WAND: 2952 case WAND:
2775 case ROD: 2953 case ROD:
2776 case HORN: 2954 case HORN:
… …
3184 * skill so that the dam and wc get updated 3362 * skill so that the dam and wc get updated
3185 */ 3363 */
3186 who->change_skill (skop); 3364 who->change_skill (skop);
3187 } 3365 }
3188 3366
3189 if (who->type == PLAYER 3367 if (!check_item_power (who, op->item_power))
3190 && op->item_power
3191 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3192 { 3368 {
3193 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3369 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3194 return 1; 3370 return 1;
3195 } 3371 }
3196 3372
… …
3204 return RESULT_INT (0); 3380 return RESULT_INT (0);
3205 3381
3206 switch (op->type) 3382 switch (op->type)
3207 { 3383 {
3208 case WEAPON: 3384 case WEAPON:
3209 if (!check_weapon_power (who, op->last_eat))
3210 {
3211 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3212
3213 if (tmp)
3214 insert_ob_in_ob (tmp, who);
3215
3216 return 1;
3217 }
3218
3219 //TODO: this obviously fails for players using a shorter prefix 3385 //TODO: this obviously fails for players using a shorter prefix
3220 // i.e. "R" can use Ragnarok's sword. 3386 // i.e. "R" can use Ragnarok's sword.
3221 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3387 if (op->level && !op->name.starts_with (who->name))
3222 { 3388 {
3223 /* if the weapon does not have the name as the character, can't use it. */ 3389 /* if the weapon does not have the name as the character, can't use it. */
3224 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3390 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3225 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3391 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3226 3392
… …
3260 case AMULET: 3426 case AMULET:
3261 SET_FLAG (op, FLAG_APPLIED); 3427 SET_FLAG (op, FLAG_APPLIED);
3262 who->statusmsg (format ("You wear %s.", query_name (op))); 3428 who->statusmsg (format ("You wear %s.", query_name (op)));
3263 change_abil (who, op); 3429 change_abil (who, op);
3264 break; 3430 break;
3265
3266 case LAMP:
3267 if (op->stats.food < 1)
3268 {
3269 who->failmsg (format (
3270 "Your %s is out of fuel! "
3271 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3272 &op->name
3273 ));
3274 return 1;
3275 }
3276
3277 who->statusmsg (format ("You turn on your %s.", &op->name));
3278
3279 tmp2 = arch_to_object (op->other_arch);
3280 tmp2->stats.food = op->stats.food;
3281 SET_FLAG (tmp2, FLAG_APPLIED);
3282
3283 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3284 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3285
3286 who->insert (tmp2);
3287
3288 /* Remove the old lantern */
3289 op->destroy ();
3290
3291 /* insert the portion that was split off */
3292 if (tmp)
3293 who->insert (tmp);
3294
3295 who->update_stats ();
3296
3297 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3298 if (who->type == PLAYER)
3299 {
3300 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright (hrhrhr) idea to apply this cursed or damned item.>");
3301 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3302 }
3303
3304 return 0;
3305 3431
3306 case SKILL_TOOL: 3432 case SKILL_TOOL:
3307 // applying a skill tool also readies the skill 3433 // applying a skill tool also readies the skill
3308 SET_FLAG (op, FLAG_APPLIED); 3434 SET_FLAG (op, FLAG_APPLIED);
3309 3435
… …
3389 } 3515 }
3390 3516
3391 break; 3517 break;
3392 3518
3393 case BOW: 3519 case BOW:
3394 if (!check_weapon_power (who, op->last_eat)) 3520 if (op->level && !op->name.starts_with (who->name))
3395 {
3396 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3397
3398 if (tmp)
3399 insert_ob_in_ob (tmp, who);
3400
3401 return 1;
3402 }
3403
3404 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3405 { 3521 {
3406 who->failmsg ("The weapon does not recognize you as its owner. " 3522 who->failmsg ("The weapon does not recognize you as its owner. "
3407 "H<Its name indicates that it belongs to somebody else.>"); 3523 "H<Its name indicates that it belongs to somebody else.>");
3408 if (tmp) 3524 if (tmp)
3409 insert_ob_in_ob (tmp, who); 3525 insert_ob_in_ob (tmp, who);
… …
3759 } 3875 }
3760 3876
3761 who->update_stats (); 3877 who->update_stats ();
3762} 3878}
3763 3879
3764/**
3765 * Designed primarily to light torches/lanterns/etc.
3766 * Also burns up burnable material too. First object in the inventory is
3767 * the selected object to "burn". -b.t.
3768 */
3769void
3770apply_lighter (object *who, object *lighter)
3771{
3772 object *item;
3773 int is_player_env = 0;
3774
3775 item = find_marked_object (who);
3776 if (item)
3777 {
3778 if (lighter->last_eat && lighter->stats.food)
3779 { /* lighter gets used up */
3780 object *oneLighter = lighter->split ();
3781 oneLighter->stats.food--;
3782 who->insert (oneLighter);
3783 }
3784 else if (lighter->last_eat)
3785 {
3786 /* no charges left in lighter */
3787 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3788 return;
3789 }
3790
3791 /* Perhaps we should split what we are trying to light on fire?
3792 * I can't see many times when you would want to light multiple
3793 * objects at once.
3794 */
3795
3796 if (who == item->in_player ())
3797 is_player_env = 1;
3798
3799 save_throw_object (item, AT_FIRE, who);
3800
3801 if (item->destroyed ())
3802 {
3803 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3804 /* Need to update the player so that the players glow radius
3805 * gets changed.
3806 */
3807 if (is_player_env)
3808 who->update_stats ();
3809 }
3810 else
3811 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3812 }
3813 else
3814 who->failmsg ("You need to mark a lightable object.");
3815}
3816 3880
3817/** 3881/**
3818 * op made some mistake with a scroll, this takes care of punishment. 3882 * op made some mistake with a scroll, this takes care of punishment.
3819 * scroll_failure()- hacked directly from spell_failure 3883 * scroll_failure()- hacked directly from spell_failure
3820 */ 3884 */
… …
3920 } 3984 }
3921 3985
3922 /* insert the randomitems from the change's treasurelist into 3986 /* insert the randomitems from the change's treasurelist into
3923 * the player ref: player.c 3987 * the player ref: player.c
3924 */ 3988 */
3925 if (change->randomitems != NULL) 3989 if (change->randomitems)
3926 give_initial_items (pl, change->randomitems); 3990 give_initial_items (pl, change->randomitems);
3927 3991
3928 /* set up the face, for some races. */ 3992 /* set up the face, for some races. */
3929 3993
3930 /* first, look for the force object banning 3994 /* first, look for the force object banning
3931 * changing the face. Certain races never change face with class. 3995 * changing the face. Certain races never change face with class.
3932 */ 3996 */
3933 for (walk = pl->inv; walk != NULL; walk = walk->below) 3997 for (walk = pl->inv; walk; walk = walk->below)
3934 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 3998 if (walk->name == shstr_NOCLASSFACECHANGE)
3935 flag_change_face = 0; 3999 flag_change_face = 0;
3936 4000
3937 if (flag_change_face) 4001 if (flag_change_face)
3938 { 4002 {
3939 pl->face = change->face; 4003 pl->face = change->face;
… …
3941 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE]; 4005 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3942 } 4006 }
3943 4007
3944 /* check the special case of can't use weapons */ 4008 /* check the special case of can't use weapons */
3945 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4009 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3946 if (!strcmp (change->name, "monk")) 4010 if (change->name == shstr_monk)
3947 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4011 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3948 4012
3949 break; 4013 break;
3950 } 4014 }
3951 } 4015 }
… …
3988 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4052 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3989 return; 4053 return;
3990 } 4054 }
3991 4055
3992 /* check whether they are compatible or not */ 4056 /* check whether they are compatible or not */
3993 find = strstr (marked->slaying, transformer->arch->archname); 4057 find = strstr (&marked->slaying, transformer->arch->archname);
3994 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 4058 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3995 { 4059 {
3996 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4060 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3997 return; 4061 return;
3998 } 4062 }

Diff Legend

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