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.108 by root, Mon Jun 4 12:19:09 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
25#include <cmath>
24 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>
… …
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 */
… …
70 69
71 /* If the director has race set, only affect objects with a arch, 70 /* If the director has race set, only affect objects with a arch,
72 * name or race that matches. 71 * name or race that matches.
73 */ 72 */
74 if ((op->race) && 73 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) && 74 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
76 ((!(victim->name && name_flag) || op->race != victim->name)) && 75 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || op->race != victim->race))) 76 ((!(victim->race && race_flag) || op->race != victim->race)))
78 return 1; 77 return 1;
79 78
80 /* If the director has slaying set, only affect objects where none 79 /* If the director has slaying set, only affect objects where none
81 * of arch, name, or race match. 80 * of arch, name, or race match.
82 */ 81 */
83 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) || 82 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
84 ((victim->name && name_flag && op->slaying == victim->name)) || 83 ((victim->name && name_flag && op->slaying == victim->name)) ||
85 ((victim->race && race_flag && op->slaying == victim->race))) 84 ((victim->race && race_flag && op->slaying == victim->race)))
86 return 1; 85 return 1;
87 86
88 return 0; 87 return 0;
… …
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);
… …
425 return 0; 425 return 0;
426 426
427 op = op->below; 427 op = op->below;
428 while (op != NULL) 428 while (op != NULL)
429 { 429 {
430 if (strcmp (op->arch->name, item) == 0) 430 if (strcmp (op->arch->archname, item) == 0)
431 { 431 {
432 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 432 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
433 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 433 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
434 { 434 {
435 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */ 435 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
… …
459 prev = op; 459 prev = op;
460 op = op->below; 460 op = op->below;
461 461
462 while (op != NULL) 462 while (op != NULL)
463 { 463 {
464 if (strcmp (op->arch->name, item) == 0) 464 if (strcmp (op->arch->archname, item) == 0)
465 { 465 {
466 if (op->nrof >= nrof) 466 if (op->nrof >= nrof)
467 { 467 {
468 decrease_ob_nr (op, nrof); 468 decrease_ob_nr (op, nrof);
469 return; 469 return;
… …
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}
… …
940 944
941 price_in = cost * item->value; 945 price_in = cost * item->value;
942 } 946 }
943 else 947 else
944 { 948 {
945 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
946 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
947 return 0; 951 return 0;
948 952
949 if (CONV_NEED (converter)) 953 if (CONV_NEED (converter))
950 { 954 {
… …
1002 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1003 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1004 1008
1005 /** 1009 /**
1006 * elmex: we are going to let the game continue, as the mapcreator 1010 * elmex: we are going to let the game continue, as the mapcreator
1007 * propably had something in mind when doing this 1011 * probably had something in mind when doing this
1008 */ 1012 */
1009 } 1013 }
1010 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1014 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1011 return 1; 1015 return 1;
1012} 1016}
… …
1307 * proper. This code was causing needless crashes. 1311 * proper. This code was causing needless crashes.
1308 */ 1312 */
1309 if (recursion_depth >= 500) 1313 if (recursion_depth >= 500)
1310 { 1314 {
1311 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1315 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1312 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1316 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1313 return; 1317 return;
1314 } 1318 }
1315 recursion_depth++; 1319 recursion_depth++;
1316 if (trap->head) 1320 if (trap->head)
1317 trap = trap->head; 1321 trap = trap->head;
… …
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:
… …
1514 } 1518 }
1515 goto leave; 1519 goto leave;
1516 1520
1517 default: 1521 default:
1518 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1522 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1519 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1523 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1520 goto leave; 1524 goto leave;
1521 } 1525 }
1522 1526
1523leave: 1527leave:
1524 recursion_depth--; 1528 recursion_depth--;
… …
1864 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1868 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1865 identify (tmp); 1869 identify (tmp);
1866 1870
1867 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1871 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name);
1868 1872
1869
1870 cast_spell (op, tmp, dir, tmp->inv, NULL); 1873 cast_spell (op, tmp, dir, tmp->inv, NULL);
1871 decrease_ob (tmp); 1874 decrease_ob (tmp);
1872} 1875}
1873 1876
1874/** 1877/**
… …
1877 * chest. 1880 * chest.
1878 */ 1881 */
1879static void 1882static void
1880apply_treasure (object *op, object *tmp) 1883apply_treasure (object *op, object *tmp)
1881{ 1884{
1882 object *treas;
1883
1884
1885 /* Nice side effect of new treasure creation method is that the treasure 1885 /* Nice side effect of new treasure creation method is that the treasure
1886 * for the chest is done when the chest is created, and put into the chest 1886 * for the chest is done when the chest is created, and put into the chest
1887 * inventory. So that when the chest burns up, the items still exist. Also 1887 * inventory. So that when the chest burns up, the items still exist. Also
1888 * prevents people fromt moving chests to more difficult maps to get better 1888 * prevents people fromt moving chests to more difficult maps to get better
1889 * treasure 1889 * treasure
1890 */ 1890 */
1891
1892 treas = tmp->inv; 1891 object *treas = tmp->inv;
1893 if (treas == NULL) 1892
1893 if (!treas)
1894 { 1894 {
1895 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1895 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty.");
1896 decrease_ob (tmp); 1896 decrease_ob (tmp);
1897 return; 1897 return;
1898 } 1898 }
1899
1899 while (tmp->inv) 1900 while (tmp->inv)
1900 { 1901 {
1901 treas = tmp->inv; 1902 treas = tmp->inv;
1902 1903
1903 treas->remove (); 1904 treas->remove ();
… …
2026 shstr_cmp dragon_ability_force ("dragon_ability_force"); 2027 shstr_cmp dragon_ability_force ("dragon_ability_force");
2027 shstr_cmp dragon_skin_force ("dragon_skin_force"); 2028 shstr_cmp dragon_skin_force ("dragon_skin_force");
2028 2029
2029 for (tmp = op->inv; tmp; tmp = tmp->below) 2030 for (tmp = op->inv; tmp; tmp = tmp->below)
2030 if (tmp->type == FORCE) 2031 if (tmp->type == FORCE)
2031 if (tmp->arch->name == dragon_skin_force) 2032 if (tmp->arch->archname == dragon_skin_force)
2032 skin = tmp; 2033 skin = tmp;
2033 else if (tmp->arch->name == dragon_ability_force) 2034 else if (tmp->arch->archname == dragon_ability_force)
2034 abil = tmp; 2035 abil = tmp;
2035 2036
2036 /* if either skin or ability are missing, this is an old player 2037 /* if either skin or ability are missing, this is an old player
2037 which is not to be considered a dragon -> bail out */ 2038 which is not to be considered a dragon -> bail out */
2038 if (skin == NULL || abil == NULL) 2039 if (skin == NULL || abil == NULL)
… …
2292 } 2293 }
2293 2294
2294 return 0; 2295 return 0;
2295} 2296}
2296 2297
2297
2298/** 2298/**
2299 * Main apply handler. 2299 * Main apply handler.
2300 * 2300 *
2301 * Checks for unpaid items before applying. 2301 * Checks for unpaid items before applying.
2302 * 2302 *
… …
2309 * being applied. 2309 * being applied.
2310 * 2310 *
2311 * aflag is special (always apply/unapply) flags. Nothing is done with 2311 * aflag is special (always apply/unapply) flags. Nothing is done with
2312 * them in this function - they are passed to apply_special 2312 * them in this function - they are passed to apply_special
2313 */ 2313 */
2314
2315int 2314int
2316manual_apply (object *op, object *tmp, int aflag) 2315manual_apply (object *op, object *tmp, int aflag)
2317{ 2316{
2318 if (tmp->head) 2317 if (tmp->head)
2319 tmp = tmp->head; 2318 tmp = tmp->head;
… …
2357 case EXIT: 2356 case EXIT:
2358 if (op->type != PLAYER) 2357 if (op->type != PLAYER)
2359 return 0; 2358 return 0;
2360 2359
2361 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2360 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)); 2361 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2364 }
2365 else 2362 else
2366 { 2363 {
2367 /* Don't display messages for random maps. */ 2364 /* Don't display messages for random maps. */
2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2365 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2366 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2370 2367
2371 op->enter_exit (tmp); 2368 op->enter_exit (tmp);
2372 } 2369 }
2370
2373 return 1; 2371 return 1;
2374 2372
2375 case SIGN: 2373 case SIGN:
2376 apply_sign (op, tmp, 0); 2374 apply_sign (op, tmp, 0);
2377 return 1; 2375 return 1;
… …
2381 { 2379 {
2382 apply_book (op, tmp); 2380 apply_book (op, tmp);
2383 return 1; 2381 return 1;
2384 } 2382 }
2385 else 2383 else
2386 {
2387 return 0; 2384 return 0;
2388 }
2389 2385
2390 case SKILLSCROLL: 2386 case SKILLSCROLL:
2391 if (op->type == PLAYER) 2387 if (op->type == PLAYER)
2392 { 2388 {
2393 apply_skillscroll (op, tmp); 2389 apply_skillscroll (op, tmp);
2394 return 1; 2390 return 1;
2395 } 2391 }
2392 else
2396 return 0; 2393 return 0;
2397 2394
2398 case SPELLBOOK: 2395 case SPELLBOOK:
2399 if (op->type == PLAYER) 2396 if (op->type == PLAYER)
2400 { 2397 {
2401 apply_spellbook (op, tmp); 2398 apply_spellbook (op, tmp);
2402 return 1; 2399 return 1;
2403 } 2400 }
2401 else
2404 return 0; 2402 return 0;
2405 2403
2406 case SCROLL: 2404 case SCROLL:
2407 apply_scroll (op, tmp, 0); 2405 apply_scroll (op, tmp, 0);
2408 return 1; 2406 return 1;
2409 2407
2410 case POTION: 2408 case POTION:
2411 (void) apply_potion (op, tmp); 2409 apply_potion (op, tmp);
2412 return 1; 2410 return 1;
2413 2411
2414 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2412 /* Eneq(@csd.uu.se): Handle apply on containers. */
2415 //TODO: remove, as it is unsed? 2413 //TODO: remove, as it is unsed?
2416 case CLOSE_CON: 2414 case CLOSE_CON:
… …
2449 case LAMP: 2447 case LAMP:
2450 case BUILDER: 2448 case BUILDER:
2451 case SKILL_TOOL: 2449 case SKILL_TOOL:
2452 if (tmp->env != op) 2450 if (tmp->env != op)
2453 return 2; /* not in inventory */ 2451 return 2; /* not in inventory */
2452
2454 (void) apply_special (op, tmp, aflag); 2453 apply_special (op, tmp, aflag);
2455 return 1; 2454 return 1;
2456 2455
2457 case DRINK: 2456 case DRINK:
2458 case FOOD: 2457 case FOOD:
2459 case FLESH: 2458 case FLESH:
… …
2475 } 2474 }
2476 else 2475 else
2477 return 0; 2476 return 0;
2478 2477
2479 case WEAPON_IMPROVER: 2478 case WEAPON_IMPROVER:
2480 (void) check_improve_weapon (op, tmp); 2479 check_improve_weapon (op, tmp);
2481 return 1; 2480 return 1;
2482 2481
2483 case CLOCK: 2482 case CLOCK:
2484 if (op->type == PLAYER) 2483 if (op->type == PLAYER)
2485 { 2484 {
… …
2493 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2492 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2494 new_draw_info (NDI_UNIQUE, 0, op, buf); 2493 new_draw_info (NDI_UNIQUE, 0, op, buf);
2495 return 1; 2494 return 1;
2496 } 2495 }
2497 else 2496 else
2498 {
2499 return 0; 2497 return 0;
2500 }
2501 2498
2502 case MENU: 2499 case MENU:
2503 if (op->type == PLAYER) 2500 if (op->type == PLAYER)
2504 { 2501 {
2505 shop_listing (tmp, op); 2502 shop_listing (tmp, op);
2506 return 1; 2503 return 1;
2507 } 2504 }
2508 else 2505 else
2509 {
2510 return 0; 2506 return 0;
2511 }
2512 2507
2513 case POWER_CRYSTAL: 2508 case POWER_CRYSTAL:
2514 apply_power_crystal (op, tmp); /* see egoitem.c */ 2509 apply_power_crystal (op, tmp); /* see egoitem.c */
2515 return 1; 2510 return 1;
2516 2511
… …
2519 { 2514 {
2520 apply_lighter (op, tmp); 2515 apply_lighter (op, tmp);
2521 return 1; 2516 return 1;
2522 } 2517 }
2523 else 2518 else
2524 {
2525 return 0; 2519 return 0;
2526 }
2527 2520
2528 case ITEM_TRANSFORMER: 2521 case ITEM_TRANSFORMER:
2529 apply_item_transformer (op, tmp); 2522 apply_item_transformer (op, tmp);
2530 return 1; 2523 return 1;
2531 2524
… …
2554 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2547 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!");
2555 return 0; 2548 return 0;
2556 } 2549 }
2557 } 2550 }
2558 2551
2559 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2560 * applied.
2561 */
2562 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2563 {
2564 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2565 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2566 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2567 op->destroy ();
2568 return 1;
2569 }
2570
2571 pl->contr->last_used = op; 2552 pl->contr->last_used = op;
2572 2553
2573 tmp = manual_apply (pl, op, aflag); 2554 tmp = manual_apply (pl, op, aflag);
2574 if (!quiet) 2555 if (!quiet)
2575 { 2556 {
… …
2584/** 2565/**
2585 * player_apply_below attempts to apply the object 'below' the player. 2566 * 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 2567 * If the player has an open container, we use that for below, otherwise
2587 * we use the ground. 2568 * we use the ground.
2588 */ 2569 */
2589
2590void 2570void
2591player_apply_below (object *pl) 2571player_apply_below (object *pl)
2592{ 2572{
2593 int floors = 0; 2573 int floors = 0;
2594 2574
… …
2631 * to keep the size of apply_special to a more managable size. 2611 * to keep the size of apply_special to a more managable size.
2632 */ 2612 */
2633static int 2613static int
2634unapply_special (object *who, object *op, int aflags) 2614unapply_special (object *who, object *op, int aflags)
2635{ 2615{
2636 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2616 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2617 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2637 return RESULT_INT (0); 2618 return RESULT_INT (0);
2638 2619
2639 object *tmp2;
2640
2641 CLEAR_FLAG (op, FLAG_APPLIED); 2620 CLEAR_FLAG (op, FLAG_APPLIED);
2642 2621
2643 switch (op->type) 2622 switch (op->type)
2644 { 2623 {
2624 case SKILL_TOOL:
2625 // unapplying a skill tool should also unapply the skill it governs
2626 // but this is hard, as it shouldn't do so when the skill can
2627 // be used for other reasons
2628 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2629 if (tmp->skill == op->skill
2630 && tmp->type == SKILL
2631 && tmp->flag [FLAG_APPLIED]
2632 && !tmp->flag [FLAG_CAN_USE_SKILL])
2633 unapply_special (who, tmp, 0);
2634
2635 change_abil (who, op);
2636 break;
2637
2645 case WEAPON: 2638 case WEAPON:
2639 if (player *pl = who->contr)
2640 if (op == pl->combat_ob)
2641 {
2642 pl->combat_ob = 0;
2643 who->change_weapon (pl->ranged_ob);
2644 }
2645
2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2647 2647
2648 (void) change_abil (who, op); 2648 change_abil (who, op);
2649 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2650 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2649 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2651 clear_skill (who);
2652 break; 2650 break;
2653 2651
2654 case SKILL: /* allows objects to impart skills */
2655 case SKILL_TOOL: 2652 case SKILL:
2656 if (op != who->chosen_skill) 2653 if (who->contr)
2657 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2658
2659 if (who->type == PLAYER)
2660 { 2654 {
2661 if (who->contr->ranged_ob == op)
2662 {
2663 who->contr->ranged_skill = 0;
2664 who->contr->ranged_ob = 0;
2665 }
2666
2667 if (!op->invisible) 2655 if (!op->invisible)
2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2656 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2669 else 2657 else
2670 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2658 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2671 } 2659 }
2672 2660
2673 change_abil (who, op); 2661 change_abil (who, op);
2674 who->chosen_skill = 0;
2675 CLEAR_FLAG (who, FLAG_READY_SKILL); 2662 CLEAR_FLAG (who, FLAG_READY_SKILL);
2676 break; 2663 break;
2677 2664
2678 case ARMOUR: 2665 case ARMOUR:
2679 case HELMET: 2666 case HELMET:
… …
2684 case AMULET: 2671 case AMULET:
2685 case GIRDLE: 2672 case GIRDLE:
2686 case BRACERS: 2673 case BRACERS:
2687 case CLOAK: 2674 case CLOAK:
2688 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2675 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2689 (void) change_abil (who, op); 2676 change_abil (who, op);
2690 break; 2677 break;
2678
2691 case LAMP: 2679 case LAMP:
2680 {
2692 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2681 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2682
2693 tmp2 = arch_to_object (op->other_arch); 2683 object *tmp2 = arch_to_object (op->other_arch);
2694 tmp2->x = op->x; 2684 tmp2->x = op->x;
2695 tmp2->y = op->y; 2685 tmp2->y = op->y;
2696 tmp2->map = op->map; 2686 tmp2->map = op->map;
2697 tmp2->below = op->below; 2687 tmp2->below = op->below;
2698 tmp2->above = op->above; 2688 tmp2->above = op->above;
2699 tmp2->stats.food = op->stats.food; 2689 tmp2->stats.food = op->stats.food;
2700 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2690 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2701 2691
2702 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2692 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2703 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2693 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2704 2694
2705 if (who->type == PLAYER) 2695 if (who->contr)
2706 esrv_del_item (who->contr, op->count); 2696 esrv_del_item (who->contr, op->count);
2707 2697
2708 op->destroy (); 2698 op->destroy ();
2709 insert_ob_in_ob (tmp2, who); 2699 insert_ob_in_ob (tmp2, who);
2710 who->update_stats (); 2700 who->update_stats ();
2701
2711 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2702 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2712 { 2703 {
2713 if (who->type == PLAYER) 2704 if (who->contr)
2714 { 2705 {
2715 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2706 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2716 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2707 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2717 } 2708 }
2718 } 2709 }
2719 if (who->type == PLAYER) 2710
2711 if (who->contr)
2720 esrv_send_item (who, tmp2); 2712 esrv_send_item (who, tmp2);
2713 }
2714
2721 return 1; /* otherwise, an attempt to drop causes problems */ 2715 return 1; /* otherwise, an attempt to drop causes problems */
2722 break;
2723 2716
2724 case BOW: 2717 case BOW:
2725 case WAND: 2718 case WAND:
2726 case ROD: 2719 case ROD:
2727 case HORN: 2720 case HORN:
2728 clear_skill (who); 2721 if (player *pl = who->contr)
2729 if (who->type == PLAYER)
2730 { 2722 {
2723 if (op == pl->ranged_ob)
2724 {
2725 pl->ranged_ob = 0;
2726 who->change_weapon (pl->combat_ob);
2727 }
2728
2731 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2729 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2732
2733 who->contr->ranged_skill = 0;
2734 who->contr->ranged_ob = 0;
2735 } 2730 }
2736 else 2731 else
2737 { 2732 {
2733 who->change_skill (0);
2734
2738 if (op->type == BOW) 2735 if (op->type == BOW)
2739 CLEAR_FLAG (who, FLAG_READY_BOW); 2736 CLEAR_FLAG (who, FLAG_READY_BOW);
2740 else 2737 else
2741 CLEAR_FLAG (who, FLAG_READY_RANGE); 2738 CLEAR_FLAG (who, FLAG_READY_RANGE);
2742 } 2739 }
2743 2740
2744 break; 2741 break;
2745 2742
2746 case BUILDER: 2743 case BUILDER:
2747 if (who->type == PLAYER) 2744 if (who->contr)
2748 {
2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2745 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2750
2751 who->contr->ranged_skill = 0;
2752 who->contr->ranged_ob = 0;
2753 }
2754 break; 2746 break;
2755 2747
2756 default: 2748 default:
2757 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2758 break; 2750 break;
… …
2760 2752
2761 who->update_stats (); 2753 who->update_stats ();
2762 2754
2763 if (!(aflags & AP_NO_MERGE)) 2755 if (!(aflags & AP_NO_MERGE))
2764 { 2756 {
2765 object *tmp;
2766
2767 tmp = merge_ob (op, NULL); 2757 object *tmp = merge_ob (op, 0);
2768 if (who->type == PLAYER) 2758
2759 if (who->contr)
2769 { 2760 {
2770 if (tmp) 2761 if (tmp)
2771 { /* it was merged */ 2762 { /* it was merged */
2772 esrv_del_item (who->contr, op->count); 2763 esrv_del_item (who->contr, op->count);
2773 op = tmp; 2764 op = tmp;
2774 } 2765 }
2775 2766
2776 esrv_send_item (who, op); 2767 esrv_send_item (who, op);
2777 } 2768 }
2778 } 2769 }
2770
2779 return 0; 2771 return 0;
2780} 2772}
2781 2773
2782/** 2774/**
2783 * Returns the object that is using location 'loc'. 2775 * Returns the object that is using location 'loc'.
2784 * Note that 'start' is the first object to start examing - we 2776 * 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 2777 * then go through the below of this. In this way, you can do
2786 * something like: 2778 * something like:
2787 * tmp = get_item_from_body_location(who->inv, 1); 2779 * tmp = get_next_item_from_body_location(who->inv, 1);
2788 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2780 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
2789 * to find the second object that may use this location, etc. 2781 * to find the second object that may use this location, etc.
2790 * Returns NULL if no match is found. 2782 * Returns NULL if no match is found.
2791 * loc is the index into the array we are looking for a match. 2783 * loc is the index into the array we are looking for a match.
2792 * don't return invisible objects unless they are skill objects 2784 * don't return invisible objects unless they are skill objects
2793 * invisible other objects that use 2785 * invisible other objects that use
2794 * up body locations can be used as restrictions. 2786 * up body locations can be used as restrictions.
2795 */ 2787 */
2796object * 2788static object *
2797get_item_from_body_location (object *start, int loc) 2789get_next_item_from_body_location (int loc, object *start)
2798{ 2790{
2799 object *tmp;
2800
2801 if (!start)
2802 return NULL;
2803
2804 for (tmp = start; tmp; tmp = tmp->below) 2791 for (object *tmp = start; tmp; tmp = tmp->below)
2805 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2792 if (tmp->flag [FLAG_APPLIED]
2793 && tmp->slot[loc].info
2794 && (!tmp->invisible || tmp->type == SKILL))
2806 return tmp; 2795 return tmp;
2807 2796
2808 return NULL; 2797 return 0;
2809} 2798}
2810
2811
2812 2799
2813/** 2800/**
2814 * 'op' wants to apply an object, but can't because of other equipment. 2801 * 'op' wants to apply an object, but can't because of other equipment.
2815 * This should only be called when it is known 2802 * This should only be called when it is known
2816 * that there are objects to unapply. This makes pretty heavy 2803 * that there are objects to unapply. This makes pretty heavy
… …
2822 * another function that does just that. 2809 * another function that does just that.
2823 */ 2810 */
2824int 2811int
2825unapply_for_ob (object *who, object *op, int aflags) 2812unapply_for_ob (object *who, object *op, int aflags)
2826{ 2813{
2827 int i; 2814 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) 2815 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2836 {
2837 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2816 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))) 2817 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2840 { 2818 {
2841 if (aflags & AP_PRINT) 2819 if (aflags & AP_PRINT)
2842 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2820 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
2843 else 2821 else
2844 unapply_special (who, tmp, aflags); 2822 unapply_special (who, tmp, aflags);
2845 } 2823 }
2846 else 2824 else
2847 { 2825 {
2848 /* In this case, we want to try and remove a cursed item. 2826 /* 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 2827 * While we know it won't work, we want unapply_special to
2850 * at least generate the message. 2828 * at least generate the message.
2851 */ 2829 */
2852 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2830 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; 2831 return 1;
2854 }
2855
2856 } 2832 }
2857 }
2858 }
2859 2833
2860 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2834 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2861 { 2835 {
2862 /* this used up a slot that we need to free */ 2836 /* this used up a slot that we need to free */
2863 if (op->body_info[i]) 2837 if (op->slot[i].info)
2864 { 2838 {
2865 last = who->inv; 2839 object *last = who->inv;
2866 2840
2867 /* We do a while loop - may need to remove several items in order 2841 /* We do a while loop - may need to remove several items in order
2868 * to free up enough slots. 2842 * to free up enough slots.
2869 */ 2843 */
2870 while ((who->body_used[i] + op->body_info[i]) < 0) 2844 while ((who->slot[i].used + op->slot[i].info) < 0)
2871 { 2845 {
2872 tmp = get_item_from_body_location (last, i); 2846 object *tmp = get_next_item_from_body_location (i, last);
2847
2873 if (!tmp) 2848 if (!tmp)
2874 { 2849 {
2875#if 0 2850#if 0
2876 /* Not a bug - we'll get this if the player has cursed items 2851 /* Not a bug - we'll get this if the player has cursed items
2877 * equipped. 2852 * equipped.
2878 */ 2853 */
2879 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2854 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
2880#endif 2855#endif
2881 return 1; 2856 return 1;
2882 } 2857 }
2858
2883 /* If we are just printing, we don't care about cursed status */ 2859 /* 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)))) 2860 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2885 { 2861 {
2886 if (aflags & AP_PRINT) 2862 if (aflags & AP_PRINT)
2887 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2863 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 2871 * so it may not be critical (eg, putting on a ring and you have
2896 * one cursed ring.) 2872 * one cursed ring.)
2897 */ 2873 */
2898 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2874 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
2899 } 2875 }
2876
2900 last = tmp->below; 2877 last = tmp->below;
2901 } 2878 }
2902 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2879 /* 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. 2880 * return in the !tmp would have kicked in.
2904 */ 2881 */
2905 } /* if op is using this body location */ 2882 } /* if op is using this body location */
2906 } /* for body lcoations */ 2883 } /* for body lcoations */
2884
2907 return 0; 2885 return 0;
2908} 2886}
2909 2887
2910/** 2888/**
2911 * Checks to see if 'who' can apply object 'op'. 2889 * Checks to see if 'who' can apply object 'op'.
2912 * Returns 0 if apply can be done without anything special. 2890 * Returns 0 if apply can be done without anything special.
2913 * Otherwise returns a bitmask - potentially several of these may be 2891 * Otherwise returns a bitmask - potentially several of these may be
2914 * set, but largely depends on circumstance - in the future, processing 2892 * set, but largely depends on circumstance - in the future, processing
2915 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2893 * 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?) 2894 * is set, do we really care what the other flags may be?)
2917 * 2895 *
2918 * See include/define.h for detailed description of the meaning of 2896 * See include/define.h for detailed description of the meaning of
2919 * these return values. 2897 * these return values.
2920 */ 2898 */
2921int 2899int
2922can_apply_object (object *who, object *op) 2900can_apply_object (object *who, object *op)
2923{ 2901{
2924 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2902 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
2925 return RESULT_INT (0); 2903 return RESULT_INT (0);
2926 2904
2927 int i, retval = 0; 2905 int retval = 0;
2928 object *tmp = NULL, *ws = NULL; 2906 object *tmp = 0, *ws = 0;
2929 2907
2930 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2908 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 { 2909 {
2937 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2910 if (op->slot[i].info)
2938 { 2911 {
2939 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2912 /* Item uses more slots than we have */
2913 if (who->slot[i].info + op->slot [i].info < 0)
2940 { 2914 {
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' 2915 /* Could return now for efficiency - rest of info below isn't
2955 * really needed. 2916 * really needed.
2956 */ 2917 */
2957 retval |= CAN_APPLY_NEVER; 2918 retval |= CAN_APPLY_NEVER;
2958 } 2919 }
2959 else if ((who->body_used[i] + op->body_info[i]) < 0) 2920 else if (who->slot[i].used + op->slot[i].info < 0)
2960 { 2921 {
2961 /* in this case, equipping this would use more free spots than 2922 /* in this case, equipping this would use more free spots than
2962 * we have. 2923 * we have.
2963 */ 2924 */
2964 object *tmp1;
2965
2966 2925
2967 /* if we have an applied weapon/shield, and unapply it would free 2926 /* 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 2927 * enough slots to equip the new item, then just set "can
2969 * continue. We don't care about the logic below - if you have 2928 * 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 2929 * shield equipped and try to equip another shield, there is only
2971 * one choice. However, the check for the number of body locations 2930 * one choice. However, the check for the number of body locations
2972 * does take into the account cases where what is being applied 2931 * does take into the account cases where what is being applied
2973 * may be two handed for example. 2932 * may be two handed for example.
2974 */ 2933 */
2975 if (ws) 2934 if (ws)
2976 { 2935 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 { 2936 {
2979 retval |= CAN_APPLY_UNAPPLY; 2937 retval |= CAN_APPLY_UNAPPLY;
2980 continue; 2938 continue;
2981 } 2939 }
2982 }
2983 2940
2984 tmp1 = get_item_from_body_location (who->inv, i); 2941 object *tmp1 = get_next_item_from_body_location (i, who->inv);
2985 if (!tmp1) 2942 if (!tmp1)
2986 { 2943 {
2987#if 0 2944#if 0
2988 /* This is sort of an error, but happens a lot when old players 2945 /* 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. 2946 * join in with more stuff equipped than they are now allowed.
… …
2997 /* need to unapply something. However, if this something 2954 /* need to unapply something. However, if this something
2998 * is different than we had found before, it means they need 2955 * is different than we had found before, it means they need
2999 * to apply multiple objects 2956 * to apply multiple objects
3000 */ 2957 */
3001 retval |= CAN_APPLY_UNAPPLY; 2958 retval |= CAN_APPLY_UNAPPLY;
2959
3002 if (!tmp) 2960 if (!tmp)
3003 tmp = tmp1; 2961 tmp = tmp1;
3004 else if (tmp != tmp1) 2962 else if (tmp != tmp1)
3005 {
3006 retval |= CAN_APPLY_UNAPPLY_MULT; 2963 retval |= CAN_APPLY_UNAPPLY_MULT;
3007 } 2964
3008 /* This object isn't using up all the slots, so there must 2965 /* 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 2966 * be another. If so, and it the new item doesn't need all
3010 * the slots, the player then has a choice. 2967 * the slots, the player then has a choice.
3011 */ 2968 */
3012 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2969 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2970 && abs (op->slot[i].info) < who->slot[i].info)
3013 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2971 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3014 2972
3015 /* Does unequippint 'tmp1' free up enough slots for this to be 2973 /* Does unequippint 'tmp1' free up enough slots for this to be
3016 * equipped? If not, there must be something else to unapply. 2974 * equipped? If not, there must be something else to unapply.
3017 */ 2975 */
3018 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 2976 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3019 retval |= CAN_APPLY_UNAPPLY_MULT; 2977 retval |= CAN_APPLY_UNAPPLY_MULT;
3020
3021 } 2978 }
3022 } /* if not enough free slots */ 2979 } /* if not enough free slots */
3023 } /* if this object uses location i */ 2980 } /* if this object uses location i */
3024 } /* for i -> num_body_locations loop */ 2981 } /* for i -> num_body_locations loop */
3025 2982
… …
3038 2995
3039 if (who->type != PLAYER) 2996 if (who->type != PLAYER)
3040 { 2997 {
3041 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 2998 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3042 retval |= CAN_APPLY_RESTRICTION; 2999 retval |= CAN_APPLY_RESTRICTION;
3000
3043 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3001 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3044 retval |= CAN_APPLY_RESTRICTION; 3002 retval |= CAN_APPLY_RESTRICTION;
3003
3045 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3004 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3046 retval |= CAN_APPLY_RESTRICTION; 3005 retval |= CAN_APPLY_RESTRICTION;
3006
3047 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3007 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3048 retval |= CAN_APPLY_RESTRICTION; 3008 retval |= CAN_APPLY_RESTRICTION;
3049 } 3009 }
3050 3010
3051 return retval; 3011 return retval;
… …
3066 * AP_UNAPPLY=always unapply). 3026 * AP_UNAPPLY=always unapply).
3067 * 3027 *
3068 * Optional flags: 3028 * Optional flags:
3069 * AP_NO_MERGE: don't merge an unapplied object with other objects 3029 * AP_NO_MERGE: don't merge an unapplied object with other objects
3070 * AP_IGNORE_CURSE: unapply cursed items 3030 * AP_IGNORE_CURSE: unapply cursed items
3031 * AP_NO_READY: do not ready skills when applying skill tools
3071 * 3032 *
3072 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3033 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3073 * 3034 *
3074 * apply_special() doesn't check for unpaid items. 3035 * apply_special() doesn't check for unpaid items.
3075 */ 3036 */
3076int 3037int
3077apply_special (object *who, object *op, int aflags) 3038apply_special (object *who, object *op, int aflags)
3078{ 3039{
3079 int basic_flag = aflags & AP_BASIC_FLAGS; 3040 int basic_flag = aflags & AP_BASIC_FLAGS;
3080 object *tmp, *tmp2, *skop = NULL; 3041 object *tmp, *tmp2, *skop = NULL;
3081 int i;
3082 3042
3083 if (who == NULL) 3043 if (who == NULL)
3084 { 3044 {
3085 LOG (llevError, "apply_special() from object without environment.\n"); 3045 LOG (llevError, "apply_special() from object without environment.\n");
3086 return 1; 3046 return 1;
… …
3096 if (basic_flag == AP_APPLY) 3056 if (basic_flag == AP_APPLY)
3097 return 0; 3057 return 0;
3098 3058
3099 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3059 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3100 { 3060 {
3101 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3061 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; 3062 return 1;
3103 } 3063 }
3064
3104 return unapply_special (who, op, aflags); 3065 return unapply_special (who, op, aflags);
3105 } 3066 }
3106 3067
3107 if (basic_flag == AP_UNAPPLY) 3068 if (basic_flag == AP_UNAPPLY)
3108 return 0; 3069 return 0;
3109 3070
3110 i = can_apply_object (who, op); 3071 // if the item is combat/ranged, wield the relevant slot first
3072 // to resolve conflicts.
3073 if (player *pl = who->contr)
3074 switch (op->slottype ())
3075 {
3076 case slot_combat: who->change_weapon (pl->combat_ob); break;
3077 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3078 }
3079
3080 splay (op);
3111 3081
3112 /* Can't just apply this object. Lets see what not and what to do */ 3082 /* Can't just apply this object. Lets see what not and what to do */
3113 if (i) 3083 if (int i = can_apply_object (who, op))
3114 { 3084 {
3115 if (i & CAN_APPLY_NEVER) 3085 if (i & CAN_APPLY_NEVER)
3116 { 3086 {
3117 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3087 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; 3088 return 1;
… …
3120 else if (i & CAN_APPLY_RESTRICTION) 3090 else if (i & CAN_APPLY_RESTRICTION)
3121 { 3091 {
3122 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3092 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3123 return 1; 3093 return 1;
3124 } 3094 }
3095
3125 if (who->type != PLAYER) 3096 if (who->type != PLAYER)
3126 { 3097 {
3127 /* Some error, so don't try to equip something more */ 3098 /* Some error, so don't try to equip something more */
3128 if (unapply_for_ob (who, op, aflags)) 3099 if (unapply_for_ob (who, op, aflags))
3129 return 1; 3100 return 1;
… …
3135 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3106 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); 3107 unapply_for_ob (who, op, AP_PRINT);
3137 return 1; 3108 return 1;
3138 } 3109 }
3139 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3110 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3140 {
3141 i = unapply_for_ob (who, op, aflags); 3111 if (unapply_for_ob (who, op, aflags))
3142 if (i)
3143 return 1; 3112 return 1;
3144 }
3145 } 3113 }
3146 } 3114 }
3147 3115
3148 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3116 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3149 { 3117 {
3150 skop = find_skill_by_name (who, op->skill); 3118 skop = find_skill_by_name (who, op->skill);
3119
3151 if (!skop) 3120 if (!skop)
3152 { 3121 {
3153 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3122 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3154 return 1; 3123 return 1;
3155 } 3124 }
3156 else 3125 else
3157 /* While experience will be credited properly, we want to change the 3126 /* While experience will be credited properly, we want to change the
3158 * skill so that the dam and wc get updated 3127 * skill so that the dam and wc get updated
3159 */ 3128 */
3160 change_skill (who, skop, 0); 3129 who->change_skill (skop);
3161 } 3130 }
3162 3131
3132 if (who->type == PLAYER
3133 && op->item_power
3163 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) 3134 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3164 { 3135 {
3165 new_draw_info (NDI_UNIQUE, 0, who, 3136 new_draw_info (NDI_UNIQUE, 0, who,
3166 "Equipping that combined with other items would consume your soul! " 3137 "Equipping that combined with other items would consume your soul! "
3167 "[use the skills command to check your available item power]"); 3138 "[use the skills command to check your available item power]");
3168 return 1; 3139 return 1;
3169 } 3140 }
3170 3141
3171
3172 /* Ok. We are now at the state where we can apply the new object. 3142 /* 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_... 3143 * Note that we don't have the checks for can_use_...
3174 * below - that is already taken care of by can_apply_object. 3144 * below - that is already taken care of by can_apply_object.
3175 */ 3145 */
3176
3177 if (op->nrof > 1) 3146 if (op->nrof > 1)
3178 tmp = get_split_ob (op, op->nrof - 1); 3147 tmp = get_split_ob (op, op->nrof - 1);
3179 else 3148 else
3180 tmp = NULL; 3149 tmp = 0;
3181 3150
3182 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3151 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3183 return RESULT_INT (0); 3152 return RESULT_INT (0);
3184 3153
3185 switch (op->type) 3154 switch (op->type)
3186 { 3155 {
3187 case WEAPON: 3156 case WEAPON:
3188 if (!check_weapon_power (who, op->last_eat)) 3157 if (!check_weapon_power (who, op->last_eat))
3189 { 3158 {
3190 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3159 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. "
3191 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3160 "It would consume your soul!.");
3161
3192 if (tmp != NULL) 3162 if (tmp)
3193 (void) insert_ob_in_ob (tmp, who); 3163 insert_ob_in_ob (tmp, who);
3164
3194 return 1; 3165 return 1;
3195 } 3166 }
3196 3167
3197 //TODO: this obviously fails for players using a shiorter prefix 3168 //TODO: this obviously fails for players using a shorter prefix
3198 // i.e. "R" can use Ragnarok's swors. 3169 // i.e. "R" can use Ragnarok's sword.
3199 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3170 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3200 { 3171 {
3201 /* if the weapon does not have the name as the character, can't use it. */ 3172 /* 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) */ 3173 /* (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."); 3174 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
… …
3206 insert_ob_in_ob (tmp, who); 3177 insert_ob_in_ob (tmp, who);
3207 3178
3208 return 1; 3179 return 1;
3209 } 3180 }
3210 3181
3182 if (!skop)
3183 {
3184 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3185 return 1;
3186 }
3187
3211 SET_FLAG (op, FLAG_APPLIED); 3188 SET_FLAG (op, FLAG_APPLIED);
3212
3213 if (skop)
3214 change_skill (who, skop, 1); 3189 who->change_skill (skop);
3215 3190
3216 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3191 if (who->contr)
3217 SET_FLAG (who, FLAG_READY_WEAPON); 3192 who->change_weapon (who->contr->combat_ob = op);
3218 3193
3219 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3194 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3220 3195
3196 SET_FLAG (who, FLAG_READY_WEAPON);
3221 change_abil (who, op); 3197 change_abil (who, op);
3222 break; 3198 break;
3223 3199
3224 case ARMOUR: 3200 case ARMOUR:
3225 case HELMET: 3201 case HELMET:
… …
3237 break; 3213 break;
3238 3214
3239 case LAMP: 3215 case LAMP:
3240 if (op->stats.food < 1) 3216 if (op->stats.food < 1)
3241 { 3217 {
3242 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3218 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3243 return 1; 3219 return 1;
3244 } 3220 }
3245 3221
3246 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3247 tmp2 = arch_to_object (op->other_arch); 3223 tmp2 = arch_to_object (op->other_arch);
… …
3268 } 3244 }
3269 3245
3270 who->update_stats (); 3246 who->update_stats ();
3271 3247
3272 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3248 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3273 {
3274 if (who->type == PLAYER) 3249 if (who->type == PLAYER)
3275 { 3250 {
3276 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3251 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3277 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3252 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3278 } 3253 }
3279 }
3280 3254
3281 if (who->type == PLAYER) 3255 if (who->type == PLAYER)
3282 esrv_send_item (who, tmp2); 3256 esrv_send_item (who, tmp2);
3283 3257
3284 return 0; 3258 return 0;
3285 3259
3286 /* this part is needed for skill-tools */ 3260 case SKILL_TOOL:
3261 // applying a skill tool also readies the skill
3262 SET_FLAG (op, FLAG_APPLIED);
3263
3264 if (!(aflags & AP_NO_READY))
3265 {
3266 skop = find_skill_by_name (who, op->skill);
3267 if (!skop->flag [FLAG_APPLIED])
3268 apply_special (who, skop, AP_APPLY);
3269 }
3270 break;
3271
3287 case SKILL: 3272 case SKILL:
3288 case SKILL_TOOL: 3273 if (player *pl = who->contr)
3289 if (who->chosen_skill)
3290 { 3274 {
3291 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3275 if (IS_COMBAT_SKILL (op->subtype))
3292 return 1;
3293 }
3294
3295 if (who->type == PLAYER)
3296 { 3276 {
3297 who->contr->ranged_skill = who; 3277 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3298 who->contr->ranged_ob = op; 3278 {
3279 for (object *item = who->inv; item; item = item->below)
3280 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3281 {
3282 if (item->skill == op->skill)
3283 {
3284 who->change_weapon (pl->combat_ob = item);
3285 goto found_weapon;
3286 }
3287 }
3288
3289 new_draw_info_format (NDI_UNIQUE, 0, who, "You need to apply a '%s' melee weapon before readying this skill", &op->skill);
3290 return 1;
3291
3292 found_weapon:;
3293 }
3294 else
3295 who->change_weapon (pl->combat_ob = op);
3296 }
3297 else if (IS_RANGED_SKILL (op->subtype))
3298 {
3299 if (skill_flags [op->subtype] & SF_NEED_BOW)
3300 {
3301 for (object *item = who->inv; item; item = item->below)
3302 if (item->type == BOW && item->flag [FLAG_APPLIED])
3303 {
3304 //TODO: bows should/must all have skill missile weapon right now
3305 who->change_weapon (pl->ranged_ob = item);
3306 goto found_bow;
3307 }
3308
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3310 return 1;
3311
3312 found_bow:;
3313 }
3314 else
3315 who->change_weapon (pl->ranged_ob = op);
3316 }
3299 3317
3300 if (!op->invisible) 3318 if (!op->invisible)
3301 { 3319 {
3302 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3320 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); 3321 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3304 } 3322 }
3305 else 3323 else
3306 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3324 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3307 } 3325 }
3308 3326 else
3327 {
3309 SET_FLAG (op, FLAG_APPLIED); 3328 SET_FLAG (op, FLAG_APPLIED);
3310 change_abil (who, op); 3329 change_abil (who, op);
3311 who->chosen_skill = op; 3330 who->chosen_skill = op;
3312 SET_FLAG (who, FLAG_READY_SKILL); 3331 SET_FLAG (who, FLAG_READY_SKILL);
3332 }
3333
3313 break; 3334 break;
3314 3335
3315 case BOW: 3336 case BOW:
3316 if (!check_weapon_power (who, op->last_eat)) 3337 if (!check_weapon_power (who, op->last_eat))
3317 { 3338 {
3318 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3339 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!."); 3340 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3320 3341
3321 if (tmp) 3342 if (tmp)
3322 insert_ob_in_ob (tmp, who); 3343 insert_ob_in_ob (tmp, who);
3323 3344
… …
3325 } 3346 }
3326 3347
3327 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3348 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3328 { 3349 {
3329 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3350 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3330 if (tmp != NULL) 3351 if (tmp)
3331 insert_ob_in_ob (tmp, who); 3352 insert_ob_in_ob (tmp, who);
3332 3353
3333 return 1; 3354 return 1;
3334 } 3355 }
3335 3356
3336 /*FALLTHROUGH*/ 3357 /*FALLTHROUGH*/
3337 case WAND: 3358 case WAND:
3338 case ROD: 3359 case ROD:
3339 case HORN: 3360 case HORN:
3340 /* check for skill, alter player status */ 3361 /* check for skill, alter player status */
3362
3363 if (!skop)
3364 {
3365 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3366 return 1;
3367 }
3368
3341 SET_FLAG (op, FLAG_APPLIED); 3369 SET_FLAG (op, FLAG_APPLIED);
3342 if (skop)
3343 change_skill (who, skop, 0); 3370 who->change_skill (skop);
3344 3371
3345 if (who->type == PLAYER) 3372 if (who->contr)
3346 { 3373 {
3374 who->contr->ranged_ob = op;
3375
3347 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3376 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3348 3377
3349 if (op->type == BOW) 3378 if (op->type == BOW)
3350 { 3379 {
3380 who->current_weapon = op;
3351 change_abil (who, op); 3381 change_abil (who, op);
3352 new_draw_info_format (NDI_UNIQUE, 0, who, 3382 new_draw_info_format (NDI_UNIQUE, 0, who,
3353 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3383 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3354 } 3384 }
3355
3356 who->contr->ranged_skill = find_skill_by_name (who, op->skill);//TODO
3357 who->contr->ranged_ob = op;
3358 } 3385 }
3359 else 3386 else
3360 { 3387 {
3361 if (op->type == BOW) 3388 if (op->type == BOW)
3362 SET_FLAG (who, FLAG_READY_BOW); 3389 SET_FLAG (who, FLAG_READY_BOW);
… …
3367 break; 3394 break;
3368 3395
3369 case BUILDER: 3396 case BUILDER:
3370 if (who->type == PLAYER) 3397 if (who->type == PLAYER)
3371 { 3398 {
3399 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3372 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER) 3400 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3373 unapply_special (who, who->contr->ranged_ob, 0); 3401 unapply_special (who, who->contr->ranged_ob, 0);
3374 3402
3375 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3403 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3376 3404
3377 who->contr->ranged_skill = who;
3378 who->contr->ranged_ob = op; 3405 who->contr->ranged_ob = op;
3379 } 3406 }
3380 break; 3407 break;
3381 3408
3382 default: 3409 default:
3383 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3410 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3384 } /* end of switch op->type */ 3411 } /* end of switch op->type */
3385 3412
3386 SET_FLAG (op, FLAG_APPLIED); 3413 SET_FLAG (op, FLAG_APPLIED);
3387 3414
3388 if (tmp != NULL) 3415 if (tmp)
3389 tmp = insert_ob_in_ob (tmp, who); 3416 tmp = insert_ob_in_ob (tmp, who);
3390 3417
3391 who->update_stats (); 3418 who->update_stats ();
3392 3419
3393 /* We exclude spell casting objects. The fire code will set the 3420 /* We exclude spell casting objects. The fire code will set the
… …
3583 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3610 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3584 { 3611 {
3585 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0); 3612 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3586 tmp->randomitems = NULL; 3613 tmp->randomitems = NULL;
3587 } 3614 }
3615
3588 // close all containers 3616 // close all containers
3589 else if (tmp->type == CONTAINER) 3617 else if (tmp->type == CONTAINER)
3590 tmp->flag [FLAG_APPLIED] = 0; 3618 tmp->flag [FLAG_APPLIED] = 0;
3591 3619
3592 tmp = above; 3620 tmp = above;
… …
3602 * Handles player eating food that temporarily changes status (resistances, stats). 3630 * Handles player eating food that temporarily changes status (resistances, stats).
3603 * This used to call cast_change_attr(), but 3631 * This used to call cast_change_attr(), but
3604 * that doesn't work with the new spell code. Since we know what 3632 * 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. 3633 * the food changes, just grab a force and use that instead.
3606 */ 3634 */
3607
3608void 3635void
3609eat_special_food (object *who, object *food) 3636eat_special_food (object *who, object *food)
3610{ 3637{
3611 object *force; 3638 object *force;
3612 int i, did_one = 0; 3639 int i, did_one = 0;
3613 sint8 k;
3614 3640
3615 force = get_archetype (FORCE_NAME); 3641 force = get_archetype (FORCE_NAME);
3616 3642
3617 for (i = 0; i < NUM_STATS; i++) 3643 for (i = 0; i < NUM_STATS; i++)
3618 { 3644 if (sint8 k = food->stats.stat (i))
3619 k = get_attr_value (&food->stats, i);
3620 if (k)
3621 { 3645 {
3622 set_attr_value (&force->stats, i, k); 3646 force->stats.stat (i) = k;
3623 did_one = 1; 3647 did_one = 1;
3624 } 3648 }
3625 }
3626 3649
3627 /* check if we can protect the eater */ 3650 /* check if we can protect the eater */
3628 for (i = 0; i < NROFATTACKS; i++) 3651 for (i = 0; i < NROFATTACKS; i++)
3629 { 3652 {
3630 if (food->resist[i] > 0) 3653 if (food->resist[i] > 0)
… …
3791 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3814 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
3792 blind_player (op, op, power); 3815 blind_player (op, op, power);
3793 } 3816 }
3794 else if (failure <= -80) 3817 else if (failure <= -80)
3795 { /* blast the immediate area */ 3818 { /* blast the immediate area */
3796 object *tmp;
3797
3798 tmp = get_archetype (LOOSE_MANA); 3819 object *tmp = get_archetype (LOOSE_MANA);
3799 cast_magic_storm (op, tmp, power); 3820 cast_magic_storm (op, tmp, power);
3800 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3821 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
3801 tmp->destroy (); 3822 tmp->destroy ();
3802 } 3823 }
3803 } 3824 }
3804} 3825}
3805 3826
… …
3825 */ 3846 */
3826 int i, j; 3847 int i, j;
3827 3848
3828 for (i = 0; i < NUM_STATS; i++) 3849 for (i = 0; i < NUM_STATS; i++)
3829 { 3850 {
3830 sint8 stat = get_attr_value (stats, i);
3831 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3851 int race_bonus = pl->arch->clone.stats.stat (i);
3852 sint8 stat = stats->stat (i) + ns->stat (i);
3832 3853
3833 stat += get_attr_value (ns, i);
3834 if (stat > 20 + race_bonus) 3854 if (stat > 20 + race_bonus)
3835 { 3855 {
3836 excess_stat++; 3856 excess_stat++;
3837 stat = 20 + race_bonus; 3857 stat = 20 + race_bonus;
3838 } 3858 }
3839 set_attr_value (stats, i, stat); 3859
3860 stats->stat (i) = stat;
3840 } 3861 }
3841 3862
3842 for (j = 0; excess_stat > 0 && j < 100; j++) 3863 for (j = 0; excess_stat > 0 && j < 100; j++)
3843 { /* try 100 times to assign excess stats */ 3864 { /* try 100 times to assign excess stats */
3844 int i = rndm (0, 6); 3865 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 3866
3848 if (i == CHA) 3867 if (i == CHA)
3849 continue; /* exclude cha from this */ 3868 continue; /* exclude cha from this */
3869
3870 int stat = stats->stat (i);
3871 int race_bonus = pl->arch->clone.stats.stat (i);
3850 if (stat < 20 + race_bonus) 3872 if (stat < 20 + race_bonus)
3851 { 3873 {
3852 change_attr_value (stats, i, 1); 3874 change_attr_value (stats, i, 1);
3853 excess_stat--; 3875 excess_stat--;
3854 } 3876 }
… …
3857 /* insert the randomitems from the change's treasurelist into 3879 /* insert the randomitems from the change's treasurelist into
3858 * the player ref: player.c 3880 * the player ref: player.c
3859 */ 3881 */
3860 if (change->randomitems != NULL) 3882 if (change->randomitems != NULL)
3861 give_initial_items (pl, change->randomitems); 3883 give_initial_items (pl, change->randomitems);
3862
3863 3884
3864 /* set up the face, for some races. */ 3885 /* set up the face, for some races. */
3865 3886
3866 /* first, look for the force object banning 3887 /* first, look for the force object banning
3867 * changing the face. Certain races never change face with class. 3888 * changing the face. Certain races never change face with class.
… …
3924 { 3945 {
3925 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3946 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3926 return; 3947 return;
3927 } 3948 }
3928 /* check whether they are compatible or not */ 3949 /* check whether they are compatible or not */
3929 find = strstr (marked->slaying, transformer->arch->name); 3950 find = strstr (marked->slaying, transformer->arch->archname);
3930 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 3951 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3931 { 3952 {
3932 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3953 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3933 return; 3954 return;
3934 } 3955 }
3935 find += strlen (transformer->arch->name) + 1; 3956 find += strlen (transformer->arch->archname) + 1;
3936 /* Item can be used, now find how many and what it yields */ 3957 /* Item can be used, now find how many and what it yields */
3937 if (isdigit (*(find))) 3958 if (isdigit (*(find)))
3938 { 3959 {
3939 yield = atoi (find); 3960 yield = atoi (find);
3940 if (yield < 1) 3961 if (yield < 1)

Diff Legend

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