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.76 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.96 by root, Mon May 14 21:32:27 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <cmath>
26
25#include <global.h> 27#include <global.h>
26#include <living.h> 28#include <living.h>
27#include <spells.h> 29#include <spells.h>
28#include <skills.h> 30#include <skills.h>
29#include <tod.h> 31#include <tod.h>
30 32
31#include <sproto.h> 33#include <sproto.h>
32 34
33/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
34#include <sounds.h> 36#include <sounds.h>
35
36/* need math lib for double-precision and pow() in dragon_eat_flesh() */
37#include <math.h>
38 37
39/** 38/**
40 * Check if op should abort moving victim because of it's race or slaying. 39 * Check if op should abort moving victim because of it's race or slaying.
41 * Returns 1 if it should abort, returns 0 if it should continue. 40 * Returns 1 if it should abort, returns 0 if it should continue.
42 */ 41 */
… …
233 depl = present_arch_in_ob (at, op); 232 depl = present_arch_in_ob (at, op);
234 233
235 if (depl) 234 if (depl)
236 { 235 {
237 for (i = 0; i < NUM_STATS; i++) 236 for (i = 0; i < NUM_STATS; i++)
238 if (get_attr_value (&depl->stats, i)) 237 if (depl->stats.stat (i))
239 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 238 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
240 239
241 depl->destroy (); 240 depl->destroy ();
242 op->update_stats (); 241 op->update_stats ();
243 } 242 }
… …
375 force->stats.food *= 10; 374 force->stats.food *= 10;
376 for (i = 0; i < NROFATTACKS; i++) 375 for (i = 0; i < NROFATTACKS; i++)
377 if (force->resist[i] > 0) 376 if (force->resist[i] > 0)
378 force->resist[i] = -force->resist[i]; /* prot => vuln */ 377 force->resist[i] = -force->resist[i]; /* prot => vuln */
379 } 378 }
379
380 force->speed_left = -1; 380 force->speed_left = -1;
381 force = insert_ob_in_ob (force, op); 381 force = insert_ob_in_ob (force, op);
382 CLEAR_FLAG (tmp, FLAG_APPLIED); 382 CLEAR_FLAG (tmp, FLAG_APPLIED);
383 SET_FLAG (force, FLAG_APPLIED); 383 SET_FLAG (force, FLAG_APPLIED);
384 change_abil (op, force); 384 change_abil (op, force);
… …
765{ 765{
766 object *otmp; 766 object *otmp;
767 767
768 if (op->type != PLAYER) 768 if (op->type != PLAYER)
769 return 0; 769 return 0;
770
770 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 771 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
771 { 772 {
772 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 773 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
773 return 0; 774 return 0;
774 } 775 }
776
775 otmp = find_marked_object (op); 777 otmp = find_marked_object (op);
776 if (!otmp) 778 if (!otmp)
777 { 779 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 780 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
779 return 0; 781 return 0;
780 } 782 }
783
781 if (otmp->type != WEAPON && otmp->type != BOW) 784 if (otmp->type != WEAPON && otmp->type != BOW)
782 { 785 {
783 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 786 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow");
784 return 0; 787 return 0;
785 } 788 }
789
786 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
787 improve_weapon (op, tmp, otmp); 791 improve_weapon (op, tmp, otmp);
788 esrv_send_item (op, otmp); 792 esrv_send_item (op, otmp);
789 return 1; 793 return 1;
790} 794}
… …
1334 1338
1335 /* Just put in some sanity check. I think there is a bug in the 1339 /* Just put in some sanity check. I think there is a bug in the
1336 * above with some objects have zero speed, and thus the player 1340 * above with some objects have zero speed, and thus the player
1337 * getting permanently paralyzed. 1341 * getting permanently paralyzed.
1338 */ 1342 */
1339 if (victim->speed_left < -50.0) 1343 if (victim->speed_left < -50.f)
1340 victim->speed_left = -50.0; 1344 victim->speed_left = -50.f;
1341 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */ 1345 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1342 } 1346 }
1343 goto leave; 1347 goto leave;
1344 1348
1345 case SPINNER: 1349 case SPINNER:
… …
2292 } 2296 }
2293 2297
2294 return 0; 2298 return 0;
2295} 2299}
2296 2300
2297
2298/** 2301/**
2299 * Main apply handler. 2302 * Main apply handler.
2300 * 2303 *
2301 * Checks for unpaid items before applying. 2304 * Checks for unpaid items before applying.
2302 * 2305 *
… …
2309 * being applied. 2312 * being applied.
2310 * 2313 *
2311 * aflag is special (always apply/unapply) flags. Nothing is done with 2314 * aflag is special (always apply/unapply) flags. Nothing is done with
2312 * them in this function - they are passed to apply_special 2315 * them in this function - they are passed to apply_special
2313 */ 2316 */
2314
2315int 2317int
2316manual_apply (object *op, object *tmp, int aflag) 2318manual_apply (object *op, object *tmp, int aflag)
2317{ 2319{
2318 if (tmp->head) 2320 if (tmp->head)
2319 tmp = tmp->head; 2321 tmp = tmp->head;
… …
2357 case EXIT: 2359 case EXIT:
2358 if (op->type != PLAYER) 2360 if (op->type != PLAYER)
2359 return 0; 2361 return 0;
2360 2362
2361 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2363 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2362 {
2363 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2364 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2364 }
2365 else 2365 else
2366 { 2366 {
2367 /* Don't display messages for random maps. */ 2367 /* Don't display messages for random maps. */
2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2370 2370
2371 op->enter_exit (tmp); 2371 op->enter_exit (tmp);
2372 } 2372 }
2373
2373 return 1; 2374 return 1;
2374 2375
2375 case SIGN: 2376 case SIGN:
2376 apply_sign (op, tmp, 0); 2377 apply_sign (op, tmp, 0);
2377 return 1; 2378 return 1;
… …
2381 { 2382 {
2382 apply_book (op, tmp); 2383 apply_book (op, tmp);
2383 return 1; 2384 return 1;
2384 } 2385 }
2385 else 2386 else
2386 {
2387 return 0; 2387 return 0;
2388 }
2389 2388
2390 case SKILLSCROLL: 2389 case SKILLSCROLL:
2391 if (op->type == PLAYER) 2390 if (op->type == PLAYER)
2392 { 2391 {
2393 apply_skillscroll (op, tmp); 2392 apply_skillscroll (op, tmp);
2394 return 1; 2393 return 1;
2395 } 2394 }
2395 else
2396 return 0; 2396 return 0;
2397 2397
2398 case SPELLBOOK: 2398 case SPELLBOOK:
2399 if (op->type == PLAYER) 2399 if (op->type == PLAYER)
2400 { 2400 {
2401 apply_spellbook (op, tmp); 2401 apply_spellbook (op, tmp);
2402 return 1; 2402 return 1;
2403 } 2403 }
2404 else
2404 return 0; 2405 return 0;
2405 2406
2406 case SCROLL: 2407 case SCROLL:
2407 apply_scroll (op, tmp, 0); 2408 apply_scroll (op, tmp, 0);
2408 return 1; 2409 return 1;
2409 2410
2410 case POTION: 2411 case POTION:
2411 (void) apply_potion (op, tmp); 2412 apply_potion (op, tmp);
2412 return 1; 2413 return 1;
2413 2414
2414 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2415 /* Eneq(@csd.uu.se): Handle apply on containers. */
2415 //TODO: remove, as it is unsed? 2416 //TODO: remove, as it is unsed?
2416 case CLOSE_CON: 2417 case CLOSE_CON:
… …
2449 case LAMP: 2450 case LAMP:
2450 case BUILDER: 2451 case BUILDER:
2451 case SKILL_TOOL: 2452 case SKILL_TOOL:
2452 if (tmp->env != op) 2453 if (tmp->env != op)
2453 return 2; /* not in inventory */ 2454 return 2; /* not in inventory */
2455
2454 (void) apply_special (op, tmp, aflag); 2456 apply_special (op, tmp, aflag);
2455 return 1; 2457 return 1;
2456 2458
2457 case DRINK: 2459 case DRINK:
2458 case FOOD: 2460 case FOOD:
2459 case FLESH: 2461 case FLESH:
… …
2475 } 2477 }
2476 else 2478 else
2477 return 0; 2479 return 0;
2478 2480
2479 case WEAPON_IMPROVER: 2481 case WEAPON_IMPROVER:
2480 (void) check_improve_weapon (op, tmp); 2482 check_improve_weapon (op, tmp);
2481 return 1; 2483 return 1;
2482 2484
2483 case CLOCK: 2485 case CLOCK:
2484 if (op->type == PLAYER) 2486 if (op->type == PLAYER)
2485 { 2487 {
… …
2493 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2495 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2494 new_draw_info (NDI_UNIQUE, 0, op, buf); 2496 new_draw_info (NDI_UNIQUE, 0, op, buf);
2495 return 1; 2497 return 1;
2496 } 2498 }
2497 else 2499 else
2498 {
2499 return 0; 2500 return 0;
2500 }
2501 2501
2502 case MENU: 2502 case MENU:
2503 if (op->type == PLAYER) 2503 if (op->type == PLAYER)
2504 { 2504 {
2505 shop_listing (tmp, op); 2505 shop_listing (tmp, op);
2506 return 1; 2506 return 1;
2507 } 2507 }
2508 else 2508 else
2509 {
2510 return 0; 2509 return 0;
2511 }
2512 2510
2513 case POWER_CRYSTAL: 2511 case POWER_CRYSTAL:
2514 apply_power_crystal (op, tmp); /* see egoitem.c */ 2512 apply_power_crystal (op, tmp); /* see egoitem.c */
2515 return 1; 2513 return 1;
2516 2514
… …
2519 { 2517 {
2520 apply_lighter (op, tmp); 2518 apply_lighter (op, tmp);
2521 return 1; 2519 return 1;
2522 } 2520 }
2523 else 2521 else
2524 {
2525 return 0; 2522 return 0;
2526 }
2527 2523
2528 case ITEM_TRANSFORMER: 2524 case ITEM_TRANSFORMER:
2529 apply_item_transformer (op, tmp); 2525 apply_item_transformer (op, tmp);
2530 return 1; 2526 return 1;
2531 2527
… …
2584/** 2580/**
2585 * player_apply_below attempts to apply the object 'below' the player. 2581 * player_apply_below attempts to apply the object 'below' the player.
2586 * If the player has an open container, we use that for below, otherwise 2582 * If the player has an open container, we use that for below, otherwise
2587 * we use the ground. 2583 * we use the ground.
2588 */ 2584 */
2589
2590void 2585void
2591player_apply_below (object *pl) 2586player_apply_below (object *pl)
2592{ 2587{
2593 int floors = 0; 2588 int floors = 0;
2594 2589
… …
2631 * to keep the size of apply_special to a more managable size. 2626 * to keep the size of apply_special to a more managable size.
2632 */ 2627 */
2633static int 2628static int
2634unapply_special (object *who, object *op, int aflags) 2629unapply_special (object *who, object *op, int aflags)
2635{ 2630{
2636 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2631 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2632 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2637 return RESULT_INT (0); 2633 return RESULT_INT (0);
2638 2634
2639 object *tmp2; 2635 object *tmp2;
2640 2636
2641 CLEAR_FLAG (op, FLAG_APPLIED); 2637 CLEAR_FLAG (op, FLAG_APPLIED);
2642 2638
2639 if (player *pl = who->contr)
2640 {
2641 if (op == pl->ranged_ob) pl->ranged_ob = 0;
2642 if (op == pl->combat_ob) pl->combat_ob = 0;
2643 }
2644
2643 switch (op->type) 2645 switch (op->type)
2644 { 2646 {
2647 case SKILL_TOOL:
2648 // unapplying a skill tool should also unapply the skill it governs
2649 // but this is hard, as it shouldn't do so when the skill can
2650 // be used for other reasons
2651 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2652 if (tmp->skill == op->skill
2653 && tmp->type == SKILL
2654 && tmp->flag [FLAG_APPLIED]
2655 && !tmp->flag [FLAG_CAN_USE_SKILL])
2656 unapply_special (who, tmp, 0);
2657
2658 change_abil (who, op);
2659 break;
2660
2645 case WEAPON: 2661 case WEAPON:
2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2662 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2647 2663
2648 (void) change_abil (who, op); 2664 change_abil (who, op);
2649 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2650 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2665 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2651 clear_skill (who); 2666 clear_skill (who);
2652 break; 2667 break;
2653 2668
2654 case SKILL: /* allows objects to impart skills */
2655 case SKILL_TOOL: 2669 case SKILL:
2656 if (op != who->chosen_skill) 2670 if (op != who->chosen_skill)
2657 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2671 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2658 2672
2659 if (who->type == PLAYER) 2673 if (who->contr)
2660 {
2661 if (who->contr->ranged_ob == op)
2662 { 2674 {
2663 who->contr->ranged_skill = 0;
2664 who->contr->ranged_ob = 0;
2665 }
2666
2667 if (!op->invisible) 2675 if (!op->invisible)
2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2676 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2669 else 2677 else
2670 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2678 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2671 } 2679 }
… …
2684 case AMULET: 2692 case AMULET:
2685 case GIRDLE: 2693 case GIRDLE:
2686 case BRACERS: 2694 case BRACERS:
2687 case CLOAK: 2695 case CLOAK:
2688 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2696 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2689 (void) change_abil (who, op); 2697 change_abil (who, op);
2690 break; 2698 break;
2699
2691 case LAMP: 2700 case LAMP:
2692 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2701 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2693 tmp2 = arch_to_object (op->other_arch); 2702 tmp2 = arch_to_object (op->other_arch);
2694 tmp2->x = op->x; 2703 tmp2->x = op->x;
2695 tmp2->y = op->y; 2704 tmp2->y = op->y;
… …
2700 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2709 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2701 2710
2702 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2711 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2703 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2712 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2704 2713
2705 if (who->type == PLAYER) 2714 if (who->contr)
2706 esrv_del_item (who->contr, op->count); 2715 esrv_del_item (who->contr, op->count);
2707 2716
2708 op->destroy (); 2717 op->destroy ();
2709 insert_ob_in_ob (tmp2, who); 2718 insert_ob_in_ob (tmp2, who);
2710 who->update_stats (); 2719 who->update_stats ();
2720
2711 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2721 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2712 { 2722 {
2713 if (who->type == PLAYER) 2723 if (who->contr)
2714 { 2724 {
2715 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2725 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2716 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2726 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2717 } 2727 }
2718 } 2728 }
2719 if (who->type == PLAYER) 2729
2730 if (who->contr)
2720 esrv_send_item (who, tmp2); 2731 esrv_send_item (who, tmp2);
2732
2721 return 1; /* otherwise, an attempt to drop causes problems */ 2733 return 1; /* otherwise, an attempt to drop causes problems */
2722 break;
2723 2734
2724 case BOW: 2735 case BOW:
2725 case WAND: 2736 case WAND:
2726 case ROD: 2737 case ROD:
2727 case HORN: 2738 case HORN:
2728 clear_skill (who); 2739 clear_skill (who);
2729 if (who->type == PLAYER) 2740
2741 if (who->contr)
2730 { 2742 {
2731 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2743 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2732 2744
2733 who->contr->ranged_skill = 0; 2745 if (who->contr->ranged_ob == op)
2734 who->contr->ranged_ob = 0; 2746 who->contr->ranged_ob = 0;
2747
2748 if (who->current_weapon == op)
2749 who->current_weapon = 0;
2735 } 2750 }
2736 else 2751 else
2737 { 2752 {
2738 if (op->type == BOW) 2753 if (op->type == BOW)
2739 CLEAR_FLAG (who, FLAG_READY_BOW); 2754 CLEAR_FLAG (who, FLAG_READY_BOW);
… …
2742 } 2757 }
2743 2758
2744 break; 2759 break;
2745 2760
2746 case BUILDER: 2761 case BUILDER:
2747 if (who->type == PLAYER) 2762 if (who->contr)
2748 { 2763 {
2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2764 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2750 2765
2751 who->contr->ranged_skill = 0; 2766 if (who->contr->ranged_ob == op)
2752 who->contr->ranged_ob = 0; 2767 who->contr->ranged_ob = 0;
2753 } 2768 }
2754 break; 2769 break;
2755 2770
2756 default: 2771 default:
2757 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2772 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
… …
2760 2775
2761 who->update_stats (); 2776 who->update_stats ();
2762 2777
2763 if (!(aflags & AP_NO_MERGE)) 2778 if (!(aflags & AP_NO_MERGE))
2764 { 2779 {
2765 object *tmp;
2766
2767 tmp = merge_ob (op, NULL); 2780 object *tmp = merge_ob (op, 0);
2768 if (who->type == PLAYER) 2781
2782 if (who->contr)
2769 { 2783 {
2770 if (tmp) 2784 if (tmp)
2771 { /* it was merged */ 2785 { /* it was merged */
2772 esrv_del_item (who->contr, op->count); 2786 esrv_del_item (who->contr, op->count);
2773 op = tmp; 2787 op = tmp;
2774 } 2788 }
2775 2789
2776 esrv_send_item (who, op); 2790 esrv_send_item (who, op);
2777 } 2791 }
2778 } 2792 }
2793
2779 return 0; 2794 return 0;
2780} 2795}
2781 2796
2782/** 2797/**
2783 * Returns the object that is using location 'loc'. 2798 * Returns the object that is using location 'loc'.
2784 * Note that 'start' is the first object to start examing - we 2799 * Note that 'start' is the first object to start examing - we
2785 * then go through the below of this. In this way, you can do 2800 * then go through the below of this. In this way, you can do
2786 * something like: 2801 * something like:
2787 * tmp = get_item_from_body_location(who->inv, 1); 2802 * tmp = get_next_item_from_body_location(who->inv, 1);
2788 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2803 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
2789 * to find the second object that may use this location, etc. 2804 * to find the second object that may use this location, etc.
2790 * Returns NULL if no match is found. 2805 * Returns NULL if no match is found.
2791 * loc is the index into the array we are looking for a match. 2806 * loc is the index into the array we are looking for a match.
2792 * don't return invisible objects unless they are skill objects 2807 * don't return invisible objects unless they are skill objects
2793 * invisible other objects that use 2808 * invisible other objects that use
2794 * up body locations can be used as restrictions. 2809 * up body locations can be used as restrictions.
2795 */ 2810 */
2796object * 2811static object *
2797get_item_from_body_location (object *start, int loc) 2812get_next_item_from_body_location (int loc, object *start)
2798{ 2813{
2799 object *tmp;
2800
2801 if (!start) 2814 if (start)
2802 return NULL;
2803
2804 for (tmp = start; tmp; tmp = tmp->below) 2815 for (object *tmp = start; tmp; tmp = tmp->below)
2805 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2816 if (tmp->flag [FLAG_APPLIED]
2817 && tmp->slot[loc].info
2818 && !tmp->invisible)
2806 return tmp; 2819 return tmp;
2807 2820
2808 return NULL; 2821 return 0;
2809} 2822}
2810
2811
2812 2823
2813/** 2824/**
2814 * 'op' wants to apply an object, but can't because of other equipment. 2825 * 'op' wants to apply an object, but can't because of other equipment.
2815 * This should only be called when it is known 2826 * This should only be called when it is known
2816 * that there are objects to unapply. This makes pretty heavy 2827 * that there are objects to unapply. This makes pretty heavy
… …
2822 * another function that does just that. 2833 * another function that does just that.
2823 */ 2834 */
2824int 2835int
2825unapply_for_ob (object *who, object *op, int aflags) 2836unapply_for_ob (object *who, object *op, int aflags)
2826{ 2837{
2827 int i; 2838 if (op->is_range ())
2828 object *tmp = NULL, *last;
2829
2830 /* If we are applying a shield or weapon, unapply any equipped shield
2831 * or weapons first - only allowed to use one weapon/shield at a time.
2832 */
2833 if (op->type == WEAPON || op->type == SHIELD)
2834 {
2835 for (tmp = who->inv; tmp; tmp = tmp->below) 2839 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2836 {
2837 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2840 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2838 {
2839 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2841 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2840 { 2842 {
2841 if (aflags & AP_PRINT) 2843 if (aflags & AP_PRINT)
2842 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2844 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
2843 else 2845 else
2844 unapply_special (who, tmp, aflags); 2846 unapply_special (who, tmp, aflags);
2845 } 2847 }
2846 else 2848 else
2847 { 2849 {
2848 /* In this case, we want to try and remove a cursed item. 2850 /* In this case, we want to try and remove a cursed item.
2849 * While we know it won't work, we want unapply_special to 2851 * While we know it won't work, we want unapply_special to
2850 * at least generate the message. 2852 * at least generate the message.
2851 */ 2853 */
2852 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2854 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
2853 return 1; 2855 return 1;
2854 }
2855
2856 } 2856 }
2857 }
2858 }
2859 2857
2860 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2858 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2861 { 2859 {
2862 /* this used up a slot that we need to free */ 2860 /* this used up a slot that we need to free */
2863 if (op->body_info[i]) 2861 if (op->slot[i].info)
2864 { 2862 {
2865 last = who->inv; 2863 object *last = who->inv;
2866 2864
2867 /* We do a while loop - may need to remove several items in order 2865 /* We do a while loop - may need to remove several items in order
2868 * to free up enough slots. 2866 * to free up enough slots.
2869 */ 2867 */
2870 while ((who->body_used[i] + op->body_info[i]) < 0) 2868 while ((who->slot[i].used + op->slot[i].info) < 0)
2871 { 2869 {
2872 tmp = get_item_from_body_location (last, i); 2870 object *tmp = get_next_item_from_body_location (i, last);
2871
2873 if (!tmp) 2872 if (!tmp)
2874 { 2873 {
2875#if 0 2874#if 0
2876 /* Not a bug - we'll get this if the player has cursed items 2875 /* Not a bug - we'll get this if the player has cursed items
2877 * equipped. 2876 * equipped.
2878 */ 2877 */
2879 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2878 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
2880#endif 2879#endif
2881 return 1; 2880 return 1;
2882 } 2881 }
2882
2883 /* If we are just printing, we don't care about cursed status */ 2883 /* If we are just printing, we don't care about cursed status */
2884 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2884 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2885 { 2885 {
2886 if (aflags & AP_PRINT) 2886 if (aflags & AP_PRINT)
2887 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2887 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
2895 * so it may not be critical (eg, putting on a ring and you have 2895 * so it may not be critical (eg, putting on a ring and you have
2896 * one cursed ring.) 2896 * one cursed ring.)
2897 */ 2897 */
2898 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2898 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
2899 } 2899 }
2900
2900 last = tmp->below; 2901 last = tmp->below;
2901 } 2902 }
2902 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2903 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
2903 * return in the !tmp would have kicked in. 2904 * return in the !tmp would have kicked in.
2904 */ 2905 */
2905 } /* if op is using this body location */ 2906 } /* if op is using this body location */
2906 } /* for body lcoations */ 2907 } /* for body lcoations */
2908
2907 return 0; 2909 return 0;
2908} 2910}
2909 2911
2910/** 2912/**
2911 * Checks to see if 'who' can apply object 'op'. 2913 * Checks to see if 'who' can apply object 'op'.
2912 * Returns 0 if apply can be done without anything special. 2914 * Returns 0 if apply can be done without anything special.
2913 * Otherwise returns a bitmask - potentially several of these may be 2915 * Otherwise returns a bitmask - potentially several of these may be
2914 * set, but largely depends on circumstance - in the future, processing 2916 * set, but largely depends on circumstance - in the future, processing
2915 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2917 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
2916 * is set, do we really are what the other flags may be?) 2918 * is set, do we really care what the other flags may be?)
2917 * 2919 *
2918 * See include/define.h for detailed description of the meaning of 2920 * See include/define.h for detailed description of the meaning of
2919 * these return values. 2921 * these return values.
2920 */ 2922 */
2921int 2923int
2922can_apply_object (object *who, object *op) 2924can_apply_object (object *who, object *op)
2923{ 2925{
2924 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2926 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
2925 return RESULT_INT (0); 2927 return RESULT_INT (0);
2926 2928
2927 int i, retval = 0; 2929 int retval = 0;
2928 object *tmp = NULL, *ws = NULL; 2930 object *tmp = 0, *ws = 0;
2929 2931
2930 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2932 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2931 * 2 weapons, but we don't want to let them do that. So if they are
2932 * trying to equip a weapon or shield, see if they already have one
2933 * in place and store that way.
2934 */
2935 if (op->type == WEAPON || op->type == SHIELD)
2936 { 2933 {
2937 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2934 if (op->slot[i].info)
2938 { 2935 {
2939 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2936 /* Item uses more slots than we have */
2937 if (who->slot[i].info + op->slot [i].info < 0)
2940 { 2938 {
2941 retval = CAN_APPLY_UNAPPLY;
2942 ws = tmp;
2943 }
2944 }
2945 }
2946
2947 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
2948 {
2949 if (op->body_info[i])
2950 {
2951 /* Item uses more slots than we have */
2952 if (FABS (op->body_info[i]) > who->body_info[i])
2953 {
2954 /* Could return now for efficiently - rest of info below isn' 2939 /* Could return now for efficiency - rest of info below isn't
2955 * really needed. 2940 * really needed.
2956 */ 2941 */
2957 retval |= CAN_APPLY_NEVER; 2942 retval |= CAN_APPLY_NEVER;
2958 } 2943 }
2959 else if ((who->body_used[i] + op->body_info[i]) < 0) 2944 else if (who->slot[i].used + op->slot[i].info < 0)
2960 { 2945 {
2961 /* in this case, equipping this would use more free spots than 2946 /* in this case, equipping this would use more free spots than
2962 * we have. 2947 * we have.
2963 */ 2948 */
2964 object *tmp1;
2965
2966 2949
2967 /* if we have an applied weapon/shield, and unapply it would free 2950 /* if we have an applied weapon/shield, and unapply it would free
2968 * enough slots to equip the new item, then just set this can 2951 * enough slots to equip the new item, then just set "can
2969 * continue. We don't care about the logic below - if you have 2952 * apply unapply". We don't care about the logic below - if you have a
2970 * shield equipped and try to equip another shield, there is only 2953 * shield equipped and try to equip another shield, there is only
2971 * one choice. However, the check for the number of body locations 2954 * one choice. However, the check for the number of body locations
2972 * does take into the account cases where what is being applied 2955 * does take into the account cases where what is being applied
2973 * may be two handed for example. 2956 * may be two handed for example.
2974 */ 2957 */
2975 if (ws) 2958 if (ws)
2976 { 2959 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
2977 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
2978 { 2960 {
2979 retval |= CAN_APPLY_UNAPPLY; 2961 retval |= CAN_APPLY_UNAPPLY;
2980 continue; 2962 continue;
2981 } 2963 }
2982 }
2983 2964
2984 tmp1 = get_item_from_body_location (who->inv, i); 2965 object *tmp1 = get_next_item_from_body_location (i, who->inv);
2985 if (!tmp1) 2966 if (!tmp1)
2986 { 2967 {
2987#if 0 2968#if 0
2988 /* This is sort of an error, but happens a lot when old players 2969 /* This is sort of an error, but happens a lot when old players
2989 * join in with more stuff equipped than they are now allowed. 2970 * join in with more stuff equipped than they are now allowed.
… …
2997 /* need to unapply something. However, if this something 2978 /* need to unapply something. However, if this something
2998 * is different than we had found before, it means they need 2979 * is different than we had found before, it means they need
2999 * to apply multiple objects 2980 * to apply multiple objects
3000 */ 2981 */
3001 retval |= CAN_APPLY_UNAPPLY; 2982 retval |= CAN_APPLY_UNAPPLY;
2983
3002 if (!tmp) 2984 if (!tmp)
3003 tmp = tmp1; 2985 tmp = tmp1;
3004 else if (tmp != tmp1) 2986 else if (tmp != tmp1)
3005 {
3006 retval |= CAN_APPLY_UNAPPLY_MULT; 2987 retval |= CAN_APPLY_UNAPPLY_MULT;
3007 } 2988
3008 /* This object isn't using up all the slots, so there must 2989 /* This object isn't using up all the slots, so there must
3009 * be another. If so, and it the new item doesn't need all 2990 * be another. If so, and it the new item doesn't need all
3010 * the slots, the player then has a choice. 2991 * the slots, the player then has a choice.
3011 */ 2992 */
3012 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2993 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2994 && abs (op->slot[i].info) < who->slot[i].info)
3013 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2995 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3014 2996
3015 /* Does unequippint 'tmp1' free up enough slots for this to be 2997 /* Does unequippint 'tmp1' free up enough slots for this to be
3016 * equipped? If not, there must be something else to unapply. 2998 * equipped? If not, there must be something else to unapply.
3017 */ 2999 */
3018 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3000 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3019 retval |= CAN_APPLY_UNAPPLY_MULT; 3001 retval |= CAN_APPLY_UNAPPLY_MULT;
3020
3021 } 3002 }
3022 } /* if not enough free slots */ 3003 } /* if not enough free slots */
3023 } /* if this object uses location i */ 3004 } /* if this object uses location i */
3024 } /* for i -> num_body_locations loop */ 3005 } /* for i -> num_body_locations loop */
3025 3006
… …
3038 3019
3039 if (who->type != PLAYER) 3020 if (who->type != PLAYER)
3040 { 3021 {
3041 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3022 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3042 retval |= CAN_APPLY_RESTRICTION; 3023 retval |= CAN_APPLY_RESTRICTION;
3024
3043 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3025 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3044 retval |= CAN_APPLY_RESTRICTION; 3026 retval |= CAN_APPLY_RESTRICTION;
3027
3045 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3028 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3046 retval |= CAN_APPLY_RESTRICTION; 3029 retval |= CAN_APPLY_RESTRICTION;
3030
3047 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3031 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3048 retval |= CAN_APPLY_RESTRICTION; 3032 retval |= CAN_APPLY_RESTRICTION;
3049 } 3033 }
3050 3034
3051 return retval; 3035 return retval;
… …
3076int 3060int
3077apply_special (object *who, object *op, int aflags) 3061apply_special (object *who, object *op, int aflags)
3078{ 3062{
3079 int basic_flag = aflags & AP_BASIC_FLAGS; 3063 int basic_flag = aflags & AP_BASIC_FLAGS;
3080 object *tmp, *tmp2, *skop = NULL; 3064 object *tmp, *tmp2, *skop = NULL;
3081 int i;
3082 3065
3083 if (who == NULL) 3066 if (who == NULL)
3084 { 3067 {
3085 LOG (llevError, "apply_special() from object without environment.\n"); 3068 LOG (llevError, "apply_special() from object without environment.\n");
3086 return 1; 3069 return 1;
… …
3096 if (basic_flag == AP_APPLY) 3079 if (basic_flag == AP_APPLY)
3097 return 0; 3080 return 0;
3098 3081
3099 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3082 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3100 { 3083 {
3101 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3084 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op));
3102 return 1; 3085 return 1;
3103 } 3086 }
3087
3104 return unapply_special (who, op, aflags); 3088 return unapply_special (who, op, aflags);
3105 } 3089 }
3106 3090
3107 if (basic_flag == AP_UNAPPLY) 3091 if (basic_flag == AP_UNAPPLY)
3108 return 0; 3092 return 0;
3109 3093
3110 i = can_apply_object (who, op); 3094 // if the item is combat/ranged, wield the relevant slot first
3095 // to resolve conflicts.
3096 if (player *pl = who->contr)
3097 switch (op->slottype ())
3098 {
3099 case slot_combat: who->change_weapon (pl->combat_ob); break;
3100 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3101 }
3111 3102
3112 /* Can't just apply this object. Lets see what not and what to do */ 3103 /* Can't just apply this object. Lets see what not and what to do */
3113 if (i) 3104 if (int i = can_apply_object (who, op))
3114 { 3105 {
3115 if (i & CAN_APPLY_NEVER) 3106 if (i & CAN_APPLY_NEVER)
3116 { 3107 {
3117 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3108 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3118 return 1; 3109 return 1;
… …
3120 else if (i & CAN_APPLY_RESTRICTION) 3111 else if (i & CAN_APPLY_RESTRICTION)
3121 { 3112 {
3122 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3113 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3123 return 1; 3114 return 1;
3124 } 3115 }
3116
3125 if (who->type != PLAYER) 3117 if (who->type != PLAYER)
3126 { 3118 {
3127 /* Some error, so don't try to equip something more */ 3119 /* Some error, so don't try to equip something more */
3128 if (unapply_for_ob (who, op, aflags)) 3120 if (unapply_for_ob (who, op, aflags))
3129 return 1; 3121 return 1;
… …
3135 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3127 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3136 unapply_for_ob (who, op, AP_PRINT); 3128 unapply_for_ob (who, op, AP_PRINT);
3137 return 1; 3129 return 1;
3138 } 3130 }
3139 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3131 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3140 {
3141 i = unapply_for_ob (who, op, aflags); 3132 if (unapply_for_ob (who, op, aflags))
3142 if (i)
3143 return 1; 3133 return 1;
3144 }
3145 } 3134 }
3146 } 3135 }
3147 3136
3148 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3137 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3149 { 3138 {
3150 skop = find_skill_by_name (who, op->skill); 3139 skop = find_skill_by_name (who, op->skill);
3140
3151 if (!skop) 3141 if (!skop)
3152 { 3142 {
3153 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3143 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3154 return 1; 3144 return 1;
3155 } 3145 }
… …
3158 * skill so that the dam and wc get updated 3148 * skill so that the dam and wc get updated
3159 */ 3149 */
3160 change_skill (who, skop, 0); 3150 change_skill (who, skop, 0);
3161 } 3151 }
3162 3152
3153 if (who->type == PLAYER
3154 && op->item_power
3163 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) 3155 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3164 { 3156 {
3165 new_draw_info (NDI_UNIQUE, 0, who, 3157 new_draw_info (NDI_UNIQUE, 0, who,
3166 "Equipping that combined with other items would consume your soul! " 3158 "Equipping that combined with other items would consume your soul! "
3167 "[use the skills command to check your available item power]"); 3159 "[use the skills command to check your available item power]");
3168 return 1; 3160 return 1;
3169 } 3161 }
3170 3162
3171
3172 /* Ok. We are now at the state where we can apply the new object. 3163 /* Ok. We are now at the state where we can apply the new object.
3173 * Note that we don't have the checks for can_use_... 3164 * Note that we don't have the checks for can_use_...
3174 * below - that is already taken care of by can_apply_object. 3165 * below - that is already taken care of by can_apply_object.
3175 */ 3166 */
3176
3177 if (op->nrof > 1) 3167 if (op->nrof > 1)
3178 tmp = get_split_ob (op, op->nrof - 1); 3168 tmp = get_split_ob (op, op->nrof - 1);
3179 else 3169 else
3180 tmp = NULL; 3170 tmp = 0;
3181 3171
3182 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3172 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3183 return RESULT_INT (0); 3173 return RESULT_INT (0);
3184 3174
3185 switch (op->type) 3175 switch (op->type)
3186 { 3176 {
3187 case WEAPON: 3177 case WEAPON:
3188 if (!check_weapon_power (who, op->last_eat)) 3178 if (!check_weapon_power (who, op->last_eat))
3189 { 3179 {
3190 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3180 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.\n"
3191 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3181 "It would consume your soul!.");
3182
3192 if (tmp != NULL) 3183 if (tmp)
3193 (void) insert_ob_in_ob (tmp, who); 3184 insert_ob_in_ob (tmp, who);
3185
3194 return 1; 3186 return 1;
3195 } 3187 }
3196 3188
3197 //TODO: this obviously fails for players using a shiorter prefix 3189 //TODO: this obviously fails for players using a shorter prefix
3198 // i.e. "R" can use Ragnarok's swors. 3190 // i.e. "R" can use Ragnarok's sword.
3199 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3191 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3200 { 3192 {
3201 /* if the weapon does not have the name as the character, can't use it. */ 3193 /* if the weapon does not have the name as the character, can't use it. */
3202 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3194 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3203 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3195 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
… …
3206 insert_ob_in_ob (tmp, who); 3198 insert_ob_in_ob (tmp, who);
3207 3199
3208 return 1; 3200 return 1;
3209 } 3201 }
3210 3202
3203 if (!skop)
3204 {
3205 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3206 return 1;
3207 }
3208
3211 SET_FLAG (op, FLAG_APPLIED); 3209 SET_FLAG (op, FLAG_APPLIED);
3212
3213 if (skop)
3214 change_skill (who, skop, 1); 3210 change_skill (who, skop, 1);
3211
3212 if (who->contr)
3213 who->change_weapon (who->contr->combat_ob = op);
3215 3214
3216 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3215 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3217 SET_FLAG (who, FLAG_READY_WEAPON); 3216 SET_FLAG (who, FLAG_READY_WEAPON);
3218 3217
3219 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3218 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
… …
3237 break; 3236 break;
3238 3237
3239 case LAMP: 3238 case LAMP:
3240 if (op->stats.food < 1) 3239 if (op->stats.food < 1)
3241 { 3240 {
3242 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3241 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3243 return 1; 3242 return 1;
3244 } 3243 }
3245 3244
3246 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3245 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3247 tmp2 = arch_to_object (op->other_arch); 3246 tmp2 = arch_to_object (op->other_arch);
… …
3268 } 3267 }
3269 3268
3270 who->update_stats (); 3269 who->update_stats ();
3271 3270
3272 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3271 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3273 {
3274 if (who->type == PLAYER) 3272 if (who->type == PLAYER)
3275 { 3273 {
3276 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3274 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3277 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3275 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3278 } 3276 }
3279 }
3280 3277
3281 if (who->type == PLAYER) 3278 if (who->type == PLAYER)
3282 esrv_send_item (who, tmp2); 3279 esrv_send_item (who, tmp2);
3283 3280
3284 return 0; 3281 return 0;
3285 3282
3286 /* this part is needed for skill-tools */ 3283 case SKILL_TOOL:
3284 // applying a skill tool also readies the skill
3285 SET_FLAG (op, FLAG_APPLIED);
3286 skop = find_skill_by_name (who, op->skill);
3287 if (!skop->flag [FLAG_APPLIED])
3288 apply_special (who, skop, AP_APPLY);
3289 break;
3290
3287 case SKILL: 3291 case SKILL:
3288 case SKILL_TOOL:
3289 if (who->chosen_skill) 3292 if (who->chosen_skill)
3290 { 3293 {
3291 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3294 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3292 return 1; 3295 return 1;
3293 } 3296 }
3294 3297
3295 if (who->type == PLAYER) 3298 if (player *pl = who->contr)
3299 {
3300 if (IS_COMBAT_SKILL (op->subtype))
3296 { 3301 {
3297 who->contr->ranged_skill = who; 3302 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3298 who->contr->ranged_ob = op; 3303 {
3304 for (object *item = who->inv; item; item = item->below)
3305 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3306 {
3307 who->change_weapon (pl->combat_ob = item);
3308 goto found_weapon;
3309 }
3310
3311 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a melee weapon before readying this skill");
3312 return 1;
3313
3314 found_weapon:;
3315 }
3316 else
3317 who->change_weapon (pl->combat_ob = op);
3318 }
3319 else if (IS_RANGED_SKILL (op->subtype))
3320 {
3321 if (skill_flags [op->subtype] & SF_NEED_BOW)
3322 {
3323 for (object *item = who->inv; item; item = item->below)
3324 if (item->type == BOW && item->flag [FLAG_APPLIED])
3325 {
3326 who->change_weapon (pl->ranged_ob = item);
3327 goto found_bow;
3328 }
3329
3330 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3331 return 1;
3332
3333 found_bow:;
3334 }
3335 else if (skill_flags [op->subtype] & SF_NEED_ITEM)
3336 {
3337 for (object *item = who->inv; item; item = item->below)
3338 if (item->flag [FLAG_APPLIED]
3339 && (item->type == WAND || item->type == ROD || item->type == HORN))
3340 {
3341 who->change_weapon (pl->ranged_ob = item);
3342 goto found_item;
3343 }
3344
3345 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a magic item before readying this skill");
3346 return 1;
3347
3348 found_item:;
3349 }
3350 else
3351 who->change_weapon (pl->ranged_ob = op);
3352 }
3299 3353
3300 if (!op->invisible) 3354 if (!op->invisible)
3301 { 3355 {
3302 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3356 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3303 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3357 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
… …
3313 break; 3367 break;
3314 3368
3315 case BOW: 3369 case BOW:
3316 if (!check_weapon_power (who, op->last_eat)) 3370 if (!check_weapon_power (who, op->last_eat))
3317 { 3371 {
3318 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3372 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3319 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3373 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3320 3374
3321 if (tmp) 3375 if (tmp)
3322 insert_ob_in_ob (tmp, who); 3376 insert_ob_in_ob (tmp, who);
3323 3377
… …
3325 } 3379 }
3326 3380
3327 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3381 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3328 { 3382 {
3329 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3383 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3330 if (tmp != NULL) 3384 if (tmp)
3331 insert_ob_in_ob (tmp, who); 3385 insert_ob_in_ob (tmp, who);
3332 3386
3333 return 1; 3387 return 1;
3334 } 3388 }
3335 3389
3336 /*FALLTHROUGH*/ 3390 /*FALLTHROUGH*/
3337 case WAND: 3391 case WAND:
3338 case ROD: 3392 case ROD:
3339 case HORN: 3393 case HORN:
3340 /* check for skill, alter player status */ 3394 /* check for skill, alter player status */
3395
3396 if (!skop)
3397 {
3398 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3399 return 1;
3400 }
3401
3341 SET_FLAG (op, FLAG_APPLIED); 3402 SET_FLAG (op, FLAG_APPLIED);
3342 if (skop)
3343 change_skill (who, skop, 0); 3403 change_skill (who, skop, 0);
3344 3404
3345 if (who->type == PLAYER) 3405 if (who->contr)
3346 { 3406 {
3407 who->contr->ranged_ob = op;
3408
3347 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3409 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3348 3410
3349 if (op->type == BOW) 3411 if (op->type == BOW)
3350 { 3412 {
3413 who->current_weapon = op;
3351 change_abil (who, op); 3414 change_abil (who, op);
3352 new_draw_info_format (NDI_UNIQUE, 0, who, 3415 new_draw_info_format (NDI_UNIQUE, 0, who,
3353 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3416 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3354 } 3417 }
3355
3356 who->contr->ranged_skill = find_skill_by_name (who, op->skill);//TODO
3357 who->contr->ranged_ob = op;
3358 } 3418 }
3359 else 3419 else
3360 { 3420 {
3361 if (op->type == BOW) 3421 if (op->type == BOW)
3362 SET_FLAG (who, FLAG_READY_BOW); 3422 SET_FLAG (who, FLAG_READY_BOW);
… …
3372 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER) 3432 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3373 unapply_special (who, who->contr->ranged_ob, 0); 3433 unapply_special (who, who->contr->ranged_ob, 0);
3374 3434
3375 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3435 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3376 3436
3377 who->contr->ranged_skill = who;
3378 who->contr->ranged_ob = op; 3437 who->contr->ranged_ob = op;
3379 } 3438 }
3380 break; 3439 break;
3381 3440
3382 default: 3441 default:
3383 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3442 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3384 } /* end of switch op->type */ 3443 } /* end of switch op->type */
3385 3444
3386 SET_FLAG (op, FLAG_APPLIED); 3445 SET_FLAG (op, FLAG_APPLIED);
3387 3446
3388 if (tmp != NULL) 3447 if (tmp)
3389 tmp = insert_ob_in_ob (tmp, who); 3448 tmp = insert_ob_in_ob (tmp, who);
3390 3449
3391 who->update_stats (); 3450 who->update_stats ();
3392 3451
3393 /* We exclude spell casting objects. The fire code will set the 3452 /* We exclude spell casting objects. The fire code will set the
… …
3583 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3642 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3584 { 3643 {
3585 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0); 3644 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3586 tmp->randomitems = NULL; 3645 tmp->randomitems = NULL;
3587 } 3646 }
3647
3588 // close all containers 3648 // close all containers
3589 else if (tmp->type == CONTAINER) 3649 else if (tmp->type == CONTAINER)
3590 tmp->flag [FLAG_APPLIED] = 0; 3650 tmp->flag [FLAG_APPLIED] = 0;
3591 3651
3592 tmp = above; 3652 tmp = above;
… …
3602 * Handles player eating food that temporarily changes status (resistances, stats). 3662 * Handles player eating food that temporarily changes status (resistances, stats).
3603 * This used to call cast_change_attr(), but 3663 * This used to call cast_change_attr(), but
3604 * that doesn't work with the new spell code. Since we know what 3664 * that doesn't work with the new spell code. Since we know what
3605 * the food changes, just grab a force and use that instead. 3665 * the food changes, just grab a force and use that instead.
3606 */ 3666 */
3607
3608void 3667void
3609eat_special_food (object *who, object *food) 3668eat_special_food (object *who, object *food)
3610{ 3669{
3611 object *force; 3670 object *force;
3612 int i, did_one = 0; 3671 int i, did_one = 0;
3613 sint8 k;
3614 3672
3615 force = get_archetype (FORCE_NAME); 3673 force = get_archetype (FORCE_NAME);
3616 3674
3617 for (i = 0; i < NUM_STATS; i++) 3675 for (i = 0; i < NUM_STATS; i++)
3618 { 3676 if (sint8 k = food->stats.stat (i))
3619 k = get_attr_value (&food->stats, i);
3620 if (k)
3621 { 3677 {
3622 set_attr_value (&force->stats, i, k); 3678 force->stats.stat (i) = k;
3623 did_one = 1; 3679 did_one = 1;
3624 } 3680 }
3625 }
3626 3681
3627 /* check if we can protect the eater */ 3682 /* check if we can protect the eater */
3628 for (i = 0; i < NROFATTACKS; i++) 3683 for (i = 0; i < NROFATTACKS; i++)
3629 { 3684 {
3630 if (food->resist[i] > 0) 3685 if (food->resist[i] > 0)
… …
3791 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3846 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
3792 blind_player (op, op, power); 3847 blind_player (op, op, power);
3793 } 3848 }
3794 else if (failure <= -80) 3849 else if (failure <= -80)
3795 { /* blast the immediate area */ 3850 { /* blast the immediate area */
3796 object *tmp;
3797
3798 tmp = get_archetype (LOOSE_MANA); 3851 object *tmp = get_archetype (LOOSE_MANA);
3799 cast_magic_storm (op, tmp, power); 3852 cast_magic_storm (op, tmp, power);
3800 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3853 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
3801 tmp->destroy (); 3854 tmp->destroy ();
3802 } 3855 }
3803 } 3856 }
3804} 3857}
3805 3858
… …
3825 */ 3878 */
3826 int i, j; 3879 int i, j;
3827 3880
3828 for (i = 0; i < NUM_STATS; i++) 3881 for (i = 0; i < NUM_STATS; i++)
3829 { 3882 {
3830 sint8 stat = get_attr_value (stats, i);
3831 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3883 int race_bonus = pl->arch->clone.stats.stat (i);
3884 sint8 stat = stats->stat (i) + ns->stat (i);
3832 3885
3833 stat += get_attr_value (ns, i);
3834 if (stat > 20 + race_bonus) 3886 if (stat > 20 + race_bonus)
3835 { 3887 {
3836 excess_stat++; 3888 excess_stat++;
3837 stat = 20 + race_bonus; 3889 stat = 20 + race_bonus;
3838 } 3890 }
3839 set_attr_value (stats, i, stat); 3891
3892 stats->stat (i) = stat;
3840 } 3893 }
3841 3894
3842 for (j = 0; excess_stat > 0 && j < 100; j++) 3895 for (j = 0; excess_stat > 0 && j < 100; j++)
3843 { /* try 100 times to assign excess stats */ 3896 { /* try 100 times to assign excess stats */
3844 int i = rndm (0, 6); 3897 int i = rndm (0, 6);
3845 int stat = get_attr_value (stats, i);
3846 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
3847 3898
3848 if (i == CHA) 3899 if (i == CHA)
3849 continue; /* exclude cha from this */ 3900 continue; /* exclude cha from this */
3901
3902 int stat = stats->stat (i);
3903 int race_bonus = pl->arch->clone.stats.stat (i);
3850 if (stat < 20 + race_bonus) 3904 if (stat < 20 + race_bonus)
3851 { 3905 {
3852 change_attr_value (stats, i, 1); 3906 change_attr_value (stats, i, 1);
3853 excess_stat--; 3907 excess_stat--;
3854 } 3908 }
… …
3857 /* insert the randomitems from the change's treasurelist into 3911 /* insert the randomitems from the change's treasurelist into
3858 * the player ref: player.c 3912 * the player ref: player.c
3859 */ 3913 */
3860 if (change->randomitems != NULL) 3914 if (change->randomitems != NULL)
3861 give_initial_items (pl, change->randomitems); 3915 give_initial_items (pl, change->randomitems);
3862
3863 3916
3864 /* set up the face, for some races. */ 3917 /* set up the face, for some races. */
3865 3918
3866 /* first, look for the force object banning 3919 /* first, look for the force object banning
3867 * changing the face. Certain races never change face with class. 3920 * changing the face. Certain races never change face with class.

Diff Legend

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