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.125 by root, Thu Aug 16 11:34:29 2007 UTC vs.
Revision 1.213 by elmex, Mon Nov 9 13:38:36 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <cmath> 25#include <cmath>
25 26
26#include <global.h> 27#include <global.h>
… …
53 * subtype 5: arch or race 54 * subtype 5: arch or race
54 * subtype 7: all three 55 * subtype 7: all three
55 */ 56 */
56 if (op->subtype) 57 if (op->subtype)
57 { 58 {
58 arch_flag = (op->subtype & 1); 59 arch_flag = op->subtype & 1;
59 name_flag = (op->subtype & 2); 60 name_flag = op->subtype & 2;
60 race_flag = (op->subtype & 4); 61 race_flag = op->subtype & 4;
61 } 62 }
62 else 63 else
63 { 64 {
64 arch_flag = 1; 65 arch_flag = 1;
65 name_flag = 1; 66 name_flag = 1;
… …
92 * Return value: 1 if money was destroyed, 0 if not. 93 * Return value: 1 if money was destroyed, 0 if not.
93 */ 94 */
94static int 95static int
95apply_id_altar (object *money, object *altar, object *pl) 96apply_id_altar (object *money, object *altar, object *pl)
96{ 97{
97 dynbuf_text buf; 98 dynbuf_text &buf = msg_dynbuf; buf.clear ();
98 99
99 object *id, *marked;
100
101 if (pl == NULL || pl->type != PLAYER) 100 if (!pl || pl->type != PLAYER)
102 return 0; 101 return 0;
103 102
104 /* Check for MONEY type is a special hack - it prevents 'nothing needs 103 /* Check for MONEY type is a special hack - it prevents 'nothing needs
105 * identifying' from being printed out more than it needs to be. 104 * identifying' from being printed out more than it needs to be.
106 */ 105 */
107 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 106 if (!check_altar_sacrifice (altar, money, pl) || money->type != MONEY)
108 return 0; 107 return 0;
109 108
110 marked = find_marked_object (pl);
111 /* if the player has a marked item, identify that if it needs to be 109 /* if the player has a marked item, identify that if it needs to be
112 * identified. If it doesn't, then go through the player inventory. 110 * identified. If it doesn't, then go through the player inventory.
113 */ 111 */
112 if (object *marked = find_marked_object (pl))
114 if (marked && !QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 113 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
115 { 114 {
116 if (operate_altar (altar, &money)) 115 if (operate_altar (altar, &money, pl))
117 { 116 {
118 identify (marked); 117 identify (marked);
119 118
120 buf.printf ("You have %s.", long_desc (marked, pl)); 119 buf.printf ("You have %s.\r", long_desc (marked, pl));
121 if (marked->msg) 120 if (marked->msg)
122 buf << "The item has a story:\n" << marked->msg; 121 buf << "The item has a story:\r" << marked->msg << "\n\n";
123 122
124 return money == NULL; 123 return !money;
125 } 124 }
126 } 125 }
127 126
128 for (id = pl->inv; id; id = id->below) 127 for (object *id = pl->inv; id; id = id->below)
129 { 128 {
130 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 129 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
131 { 130 {
132 if (operate_altar (altar, &money)) 131 if (operate_altar (altar, &money, pl))
133 { 132 {
134 identify (id); 133 identify (id);
135 134
136 buf.printf ("You have %s.", long_desc (id, pl)); 135 buf.printf ("You have %s.\r", long_desc (id, pl));
137 if (marked->msg) 136 if (id->msg)
138 buf << "The item has a story:\n" << marked->msg; 137 buf << "The item has a story:\r" << id->msg << "\n\n";
139 138
140 /* If no more money, might as well quit now */ 139 /* If no more money, might as well quit now */
141 if (money == NULL || !check_altar_sacrifice (altar, money)) 140 if (!money || !check_altar_sacrifice (altar, money))
142 break; 141 break;
143 } 142 }
144 else 143 else
145 { 144 {
146 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n"); 145 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n");
… …
148 } 147 }
149 } 148 }
150 } 149 }
151 150
152 if (buf.empty ()) 151 if (buf.empty ())
153 buf << ("You have nothing that needs identifying"); 152 pl->failmsg ("You have nothing that needs identifying");
154 153 else
155 pl->contr->infobox (buf); 154 pl->contr->infobox (MSG_CHANNEL ("identify"), buf);
156 155
157 return !money; 156 return !money;
158} 157}
159 158
160/** 159/**
… …
162 * matching item. 161 * matching item.
163 **/ 162 **/
164void 163void
165handle_apply_yield (object *tmp) 164handle_apply_yield (object *tmp)
166{ 165{
167 const char *yield; 166 if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
168 167 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
169 yield = get_ob_key_value (tmp, "on_use_yield");
170 if (yield != NULL)
171 {
172 object *drop = get_archetype (yield);
173
174 if (tmp->env)
175 {
176 drop = insert_ob_in_ob (drop, tmp->env);
177 if (tmp->env->type == PLAYER)
178 esrv_send_item (tmp->env, drop);
179 }
180 else
181 {
182 drop->x = tmp->x;
183 drop->y = tmp->y;
184 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
185 }
186 }
187} 168}
188 169
189/** 170/**
190 * Handles applying a potion. 171 * Handles applying a potion.
191 */ 172 */
… …
219 200
220 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 201 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
221 { 202 {
222 op->drain_stat (); 203 op->drain_stat ();
223 op->update_stats (); 204 op->update_stats ();
224 decrease_ob (tmp); 205 tmp->decrease ();
225 return 1; 206 return 1;
226 } 207 }
227 208
228 if (!(at = archetype::find (ARCH_DEPLETION))) 209 if (!(at = archetype::find (shstr_depletion)))
229 { 210 {
230 LOG (llevError, "Could not find archetype depletion\n"); 211 LOG (llevError, "Could not find archetype depletion\n");
231 return 0; 212 return 0;
232 } 213 }
214
233 depl = present_arch_in_ob (at, op); 215 depl = present_arch_in_ob (at, op);
234 216
235 if (depl) 217 if (depl)
236 { 218 {
237 for (i = 0; i < NUM_STATS; i++) 219 for (i = 0; i < NUM_STATS; i++)
… …
242 op->update_stats (); 224 op->update_stats ();
243 } 225 }
244 else 226 else
245 op->statusmsg ("Your potion had no effect."); 227 op->statusmsg ("Your potion had no effect.");
246 228
247 decrease_ob (tmp); 229 tmp->decrease ();
248 return 1; 230 return 1;
249 } 231 }
250 232
251 /* improvement potion - only for players */ 233 /* improvement potion - only for players */
252 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER)) 234 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
253 { 235 {
254 for (i = 1; i < MIN (11, op->level); i++) 236 for (i = 1; i < min (11, op->level); i++)
255 { 237 {
256 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 238 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
257 { 239 {
258 if (op->contr->levhp[i] != 1) 240 if (op->contr->levhp[i] != 1)
259 { 241 {
… …
294 } 276 }
295 } 277 }
296 } 278 }
297 279
298 /* Just makes checking easier */ 280 /* Just makes checking easier */
299 if (i < MIN (11, op->level)) 281 if (i < min (11, op->level))
300 got_one = 1; 282 got_one = 1;
301 283
302 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 284 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
303 { 285 {
304 if (got_one) 286 if (got_one)
… …
320 } 302 }
321 else 303 else
322 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE); 304 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
323 } 305 }
324 306
325 decrease_ob (tmp); 307 tmp->decrease ();
326 return 1; 308 return 1;
327 } 309 }
328 310
329 311
330 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 312 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
334 */ 316 */
335 if (tmp->inv) 317 if (tmp->inv)
336 { 318 {
337 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 319 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
338 { 320 {
339 object *fball;
340
341 op->failmsg ("Yech! Your lungs are on fire!"); 321 op->failmsg ("Yech! Your lungs are on fire!");
342 322 create_exploding_ball_at (op, op->level);
343 /* Explodes a fireball centered at player */
344 fball = get_archetype (EXPLODING_FIREBALL);
345 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
346 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
347 fball->x = op->x;
348 fball->y = op->y;
349 insert_ob_in_map (fball, op->map, NULL, 0);
350 } 323 }
351 else 324 else
352 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 325 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
353 326
354 decrease_ob (tmp); 327 tmp->decrease ();
355 328
356 /* if youre dead, no point in doing this... */ 329 /* if youre dead, no point in doing this... */
357 if (!QUERY_FLAG (op, FLAG_REMOVED)) 330 if (!QUERY_FLAG (op, FLAG_REMOVED))
358 op->update_stats (); 331 op->update_stats ();
359 332
… …
390 force->speed_left = -1; 363 force->speed_left = -1;
391 force = insert_ob_in_ob (force, op); 364 force = insert_ob_in_ob (force, op);
392 CLEAR_FLAG (tmp, FLAG_APPLIED); 365 CLEAR_FLAG (tmp, FLAG_APPLIED);
393 SET_FLAG (force, FLAG_APPLIED); 366 SET_FLAG (force, FLAG_APPLIED);
394 change_abil (op, force); 367 change_abil (op, force);
395 decrease_ob (tmp); 368 tmp->decrease ();
396 return 1; 369 return 1;
397 } 370 }
398 371
399 /* Only thing left are the stat potions */ 372 /* Only thing left are the stat potions */
400 if (op->type == PLAYER) 373 if (op->type == PLAYER)
401 { /* only for players */ 374 { /* only for players */
402 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 375 if ((QUERY_FLAG (tmp, FLAG_CURSED)
376 || QUERY_FLAG (tmp, FLAG_DAMNED))
377 && tmp->value != 0)
403 CLEAR_FLAG (tmp, FLAG_APPLIED); 378 CLEAR_FLAG (tmp, FLAG_APPLIED);
404 else 379 else
405 SET_FLAG (tmp, FLAG_APPLIED); 380 SET_FLAG (tmp, FLAG_APPLIED);
406 381
407 if (!change_abil (op, tmp)) 382 if (!change_abil (op, tmp))
… …
413 * stat will not be raised by them. fix_player just clears 388 * stat will not be raised by them. fix_player just clears
414 * up all the stats. 389 * up all the stats.
415 */ 390 */
416 CLEAR_FLAG (tmp, FLAG_APPLIED); 391 CLEAR_FLAG (tmp, FLAG_APPLIED);
417 op->update_stats (); 392 op->update_stats ();
418 decrease_ob (tmp); 393 tmp->decrease ();
419 return 1; 394 return 1;
420} 395}
421 396
422/**************************************************************************** 397/****************************************************************************
423 * Weapon improvement code follows 398 * Weapon improvement code follows
424 ****************************************************************************/ 399 ****************************************************************************/
425 400
426/** 401/**
402 * This function just checks whether who can handle equipping an item
403 * with item_power.
404 */
405static bool
406check_item_power (object *who, int item_power)
407{
408 if (who->type == PLAYER
409 && item_power
410 && item_power + who->contr->item_power > settings.item_power_factor * who->level)
411 return false;
412 else
413 return true;
414}
415
416/**
427 * This returns the sum of nrof of item (arch name). 417 * This returns the sum of nrof of item (arch name).
428 */ 418 */
429static int 419static int
430check_item (object *op, const char *item) 420check_item (object *op, shstr_cmp item)
431{ 421{
432 int count = 0; 422 int count = 0;
433 423
434 if (!item) 424 if (!item)
435 return 0; 425 return 0;
436 426
437 for (op = op->below; op; op = op->below) 427 for (op = op->below; op; op = op->below)
438 {
439 if (strcmp (op->arch->archname, item) == 0) 428 if (op->arch->archname == item)
440 {
441 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 429 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
442 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 430 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
443 {
444 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
445 count++;
446 else
447 count += op->nrof; 431 count += op->number_of ();
448 }
449 }
450 }
451 432
452 return count; 433 return count;
453} 434}
454 435
455/** 436/**
… …
457 * op is typically the player, which is only 438 * op is typically the player, which is only
458 * really used to determine what space to look at. 439 * really used to determine what space to look at.
459 * Modified to only eat 'nrof' of objects. 440 * Modified to only eat 'nrof' of objects.
460 */ 441 */
461static void 442static void
462eat_item (object *op, const char *item, uint32 nrof) 443eat_item (object *op, shstr_cmp item, uint32 nrof)
463{ 444{
464 object *prev; 445 object *prev;
465 446
466 prev = op; 447 prev = op;
467 op = op->below; 448 op = op->below;
468 449
469 while (op) 450 while (op)
470 { 451 {
471 if (strcmp (op->arch->archname, item) == 0) 452 if (op->arch->archname == item)
472 { 453 {
473 if (op->nrof >= nrof) 454 if (op->nrof >= nrof)
474 { 455 {
475 decrease_ob_nr (op, nrof); 456 op->decrease (nrof);
476 return; 457 return;
477 } 458 }
478 else 459 else
479 { 460 {
480 decrease_ob_nr (op, op->nrof); 461 op->decrease (nrof);
481 nrof -= op->nrof; 462 nrof -= op->nrof;
482 } 463 }
483 464
484 op = prev; 465 op = prev;
485 } 466 }
… …
488 op = op->below; 469 op = op->below;
489 } 470 }
490} 471}
491 472
492/** 473/**
493 * This checks to see of the player (who) is sufficient level to use a weapon
494 * with improvs improvements (typically last_eat). We take an int here
495 * instead of the object so that the improvement code can pass along the
496 * increased value to see if the object is usuable.
497 * we return 1 (true) if the player can use the weapon.
498 */
499static int
500check_weapon_power (const object *who, int improvs)
501{
502/* Old code is below (commented out). Basically, since weapons are the only
503 * object players really have any control to improve, it's a bit harsh to
504 * require high level in some combat skill, so we just use overall level.
505 */
506#if 1
507 if (((who->level / 5) + 5) >= improvs)
508 return 1;
509 else
510 return 0;
511
512#else
513 int level = 0;
514
515 /* The skill system hands out wc and dam bonuses to fighters
516 * more generously than the old system (see fix_player). Thus
517 * we need to curtail the power of player enchanted weapons.
518 * I changed this to 1 improvement per "fighter" level/5 -b.t.
519 * Note: Nothing should break by allowing this ratio to be different or
520 * using normal level - it is just a matter of play balance.
521 */
522 if (who->type == PLAYER)
523 {
524 object *wc_obj = NULL;
525
526 for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
527 if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
528 level = wc_obj->level;
529
530 if (!level)
531 {
532 LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
533 level = who->level;
534 }
535 }
536 else
537 level = who->level;
538
539 return (improvs <= ((level / 5) + 5));
540#endif
541}
542
543/**
544 * Returns how many items of type improver->slaying there are under op. 474 * Returns how many items of type improver->slaying there are under op.
545 * Will display a message if none found, and 1 if improver->slaying is NULL. 475 * Will display a message if none found, and 1 if improver->slaying is NULL.
546 */ 476 */
547static int 477static int
548check_sacrifice (object *op, const object *improver) 478check_sacrifice (object *op, const object *improver)
… …
570static int 500static int
571improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname) 501improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
572{ 502{
573 stat += sacrifice_count; 503 stat += sacrifice_count;
574 weapon->last_eat++; 504 weapon->last_eat++;
575 decrease_ob (improver); 505 improver->decrease ();
576 506
577 /* So it updates the players stats and the window */ 507 /* So it updates the players stats and the window */
578 op->update_stats (); 508 op->update_stats ();
579 509
580 op->statusmsg (format ( 510 op->statusmsg (format (
… …
601 531
602/** 532/**
603 * This does the prepare weapon scroll. 533 * This does the prepare weapon scroll.
604 * Checks for sacrifice, and so on. 534 * Checks for sacrifice, and so on.
605 */ 535 */
606int 536static int
607prepare_weapon (object *op, object *improver, object *weapon) 537prepare_weapon (object *op, object *improver, object *weapon)
608{ 538{
609 int sacrifice_count, i; 539 int sacrifice_count, i;
610 char buf[MAX_BUF]; 540 char buf[MAX_BUF];
611 541
… …
625 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 555 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
626 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 556 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
627 weapon->stats.exp || /* speed */ 557 weapon->stats.exp || /* speed */
628 weapon->stats.ac) /* AC - only taifu's I think */ 558 weapon->stats.ac) /* AC - only taifu's I think */
629 { 559 {
630 op->failmsg ("You cannot prepare magic weapons."); 560 op->failmsg ("You cannot prepare magic weapons. "
561 "H<A weapon is considered magical if it changes regeneration, "
562 "speed or ac, or has other protections.>");
631 return 0; 563 return 0;
632 } 564 }
633 565
634 sacrifice_count = check_sacrifice (op, improver); 566 sacrifice_count = check_sacrifice (op, improver);
635 if (sacrifice_count <= 0) 567 if (sacrifice_count <= 0)
… …
646 578
647 sprintf (buf, "%s's %s", &op->name, &weapon->name); 579 sprintf (buf, "%s's %s", &op->name, &weapon->name);
648 weapon->name = weapon->name_pl = buf; 580 weapon->name = weapon->name_pl = buf;
649 weapon->nrof = 0; /* prevents preparing n weapons in the same 581 weapon->nrof = 0; /* prevents preparing n weapons in the same
650 slot at once! */ 582 slot at once! */
651 decrease_ob (improver); 583 improver->decrease ();
652 weapon->last_eat = 0; 584 weapon->last_eat = 0;
653 return 1; 585 return 1;
654} 586}
655
656 587
657/** 588/**
658 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 589 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
659 * This is the new improve weapon code. 590 * This is the new improve weapon code.
660 * Returns 0 if it was not able to work for some reason. 591 * Returns 0 if it was not able to work for some reason.
… …
663 * 594 *
664 * We are hiding extra information about the weapon in the level and 595 * We are hiding extra information about the weapon in the level and
665 * last_eat numbers for an object. Hopefully this won't break anything ?? 596 * last_eat numbers for an object. Hopefully this won't break anything ??
666 * level == max improve last_eat == current improve 597 * level == max improve last_eat == current improve
667 */ 598 */
668int 599static int
669improve_weapon (object *op, object *improver, object *weapon) 600improve_weapon (object *op, object *improver, object *weapon)
670{ 601{
671 int sacrifice_count, sacrifice_needed = 0; 602 int sacrifice_count, sacrifice_needed = 0;
672 603
673 if (improver->stats.sp == IMPROVE_PREPARE) 604 if (improver->stats.sp == IMPROVE_PREPARE)
674 return prepare_weapon (op, improver, weapon); 605 return prepare_weapon (op, improver, weapon);
675 606
676 if (weapon->level == 0) 607 if (weapon->level == 0)
677 { 608 {
678 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>"); 609 op->failmsg (
610 "This weapon has not been prepared."
611 " H<You first have to prepare a weapon with a prepare weapon scroll.>");
679 return 0; 612 return 0;
680 } 613 }
681 614
682 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 615 if (weapon->last_eat >= weapon->level // improvements used up
616 || weapon->item_power >= 100) // or item_power >= arbitrary limit of 100
683 { 617 {
684 op->failmsg ("This weapon cannot be improved any more."); 618 op->failmsg ("This weapon cannot be improved any more.");
685 return 0; 619 return 0;
686 } 620 }
687 621
688 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 622 if (QUERY_FLAG (weapon, FLAG_APPLIED)
623 && !check_item_power (op, weapon->item_power + 1))
689 { 624 {
690 op->failmsg ("Improving the weapon will make it too " 625 op->failmsg ("Improving the weapon will make it too "
691 "powerful for you to use. Unready it if you " 626 "powerful for you to use. Unready it if you "
692 "really want to improve it."); 627 "really want to improve it.");
693 return 0; 628 return 0;
… …
704 weapon->weight += 5000; /* 5 KG's */ 639 weapon->weight += 5000; /* 5 KG's */
705 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam)); 640 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
706 weapon->last_eat++; 641 weapon->last_eat++;
707 642
708 weapon->item_power++; 643 weapon->item_power++;
709 decrease_ob (improver); 644 improver->decrease ();
710 return 1; 645 return 1;
711 } 646 }
712 647
713 if (improver->stats.sp == IMPROVE_WEIGHT) 648 if (improver->stats.sp == IMPROVE_WEIGHT)
714 { 649 {
… …
718 weapon->weight = 1; 653 weapon->weight = 1;
719 654
720 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0)); 655 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
721 weapon->last_eat++; 656 weapon->last_eat++;
722 weapon->item_power++; 657 weapon->item_power++;
723 decrease_ob (improver); 658 improver->decrease ();
724 return 1; 659 return 1;
725 } 660 }
661
726 if (improver->stats.sp == IMPROVE_ENCHANT) 662 if (improver->stats.sp == IMPROVE_ENCHANT)
727 { 663 {
728 weapon->magic++; 664 weapon->magic++;
729 weapon->last_eat++; 665 weapon->last_eat++;
730 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 666 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
731 decrease_ob (improver); 667 improver->decrease ();
732 weapon->item_power++; 668 weapon->item_power++;
733 return 1; 669 return 1;
734 } 670 }
735 671
736 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 672 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
770/** 706/**
771 * Handles the applying of improve/prepare/enchant weapon scroll. 707 * Handles the applying of improve/prepare/enchant weapon scroll.
772 * Checks a few things (not on a non-magic square, marked weapon, ...), 708 * Checks a few things (not on a non-magic square, marked weapon, ...),
773 * then calls improve_weapon to do the dirty work. 709 * then calls improve_weapon to do the dirty work.
774 */ 710 */
775int 711static int
776check_improve_weapon (object *op, object *tmp) 712check_improve_weapon (object *op, object *tmp)
777{ 713{
778 object *otmp; 714 object *otmp;
779 715
780 if (op->type != PLAYER) 716 if (op->type != PLAYER)
… …
785 op->failmsg ("Something blocks the magic of the scroll!"); 721 op->failmsg ("Something blocks the magic of the scroll!");
786 return 0; 722 return 0;
787 } 723 }
788 724
789 otmp = find_marked_object (op); 725 otmp = find_marked_object (op);
726
790 if (!otmp) 727 if (!otmp)
791 { 728 {
792 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>"); 729 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
793 return 0; 730 return 0;
794 } 731 }
… …
826 * the armour value of the piece of equipment exceed either 763 * the armour value of the piece of equipment exceed either
827 * the users level or 90) 764 * the users level or 90)
828 * Modified by MSW for partial resistance. Only support 765 * Modified by MSW for partial resistance. Only support
829 * changing of physical area right now. 766 * changing of physical area right now.
830 */ 767 */
831int 768static int
832improve_armour (object *op, object *improver, object *armour) 769improve_armour (object *op, object *improver, object *armour)
833{ 770{
834 object *tmp; 771 object *tmp;
835 772
836 if (armour->magic >= settings.armor_max_enchant) 773 if (armour->magic >= settings.armor_max_enchant)
837 { 774 {
838 op->failmsg ("This armour can not be enchanted any further!"); 775 op->failmsg ("This armour can not be enchanted any further!");
839 return 0; 776 return 0;
840 } 777 }
778
841 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 779 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
842 * etc), so take the easy way out and don't worry about it. 780 * etc), so take the easy way out and don't worry about it.
843 * Note - maybe add scrolls which make the random artifact versions (eg, armour 781 * Note - maybe add scrolls which make the random artifact versions (eg, armour
844 * of gnarg and what not?) 782 * of gnarg and what not?)
845 */ 783 */
… …
847 { 785 {
848 op->failmsg ("This armour will not accept further enchantment."); 786 op->failmsg ("This armour will not accept further enchantment.");
849 return 0; 787 return 0;
850 } 788 }
851 789
852 /* Split objects if needed. Can't insert tmp until the 790 /* Split objects if needed. Can't insert tmp until the
853 * end of this function - otherwise it will just re-merge. 791 * end of this function - otherwise it will just re-merge.
854 */ 792 */
855 if (armour->nrof > 1) 793 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
856 tmp = get_split_ob (armour, armour->nrof - 1);
857 else
858 tmp = NULL;
859 794
860 armour->magic++; 795 armour->magic++;
861 796
862 if (!settings.armor_speed_linear) 797 if (!settings.armor_speed_linear)
863 { 798 {
… …
900 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 835 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
901 836
902 if (op->type == PLAYER) 837 if (op->type == PLAYER)
903 { 838 {
904 esrv_send_item (op, armour); 839 esrv_send_item (op, armour);
840
905 if (QUERY_FLAG (armour, FLAG_APPLIED)) 841 if (QUERY_FLAG (armour, FLAG_APPLIED))
906 op->update_stats (); 842 op->update_stats ();
907 } 843 }
908 844
909 decrease_ob (improver); 845 improver->decrease ();
910 846
911 if (tmp) 847 if (tmp)
912 { 848 op->insert (tmp);
913 insert_ob_in_ob (tmp, op);
914 esrv_send_item (op, tmp);
915 }
916 849
917 return 1; 850 return 1;
918} 851}
919 852
920/* 853/*
921 * convert_item() returns 1 if anything was converted, 0 if the item was not 854 * convert_item() returns 1 if anything was converted, 0 if the item was not
922 * what the converter wants, -1 if the converter is broken. 855 * what the converter wants, -1 if the converter is broken.
923 */ 856 *
924#define CONV_FROM(xyz) xyz->slaying
925#define CONV_TO(xyz) xyz->other_arch
926#define CONV_NR(xyz) xyz->stats.sp
927#define CONV_NEED(xyz) xyz->stats.food
928
929/* Takes one items and makes another. 857 * Takes one type of items and makes another.
930 * converter is the object that is doing the conversion. 858 * converter is the object that is doing the conversion.
931 * item is the object that triggered the converter - if it is not 859 * item is the object that triggered the converter - if it is not
932 * what the converter wants, this will not do anything. 860 * what the converter wants, this will not do anything.
933 */ 861 */
934int 862int
935convert_item (object *item, object *converter) 863convert_item (object *item, object *converter)
936{ 864{
937 int nr = 0; 865 sint64 nr = 0, price_in;
938 uint32 price_in; 866
867 if (item->flag [FLAG_UNPAID])
868 return 0;
869
870 shstr conv_from = converter->slaying;
871 archetype *conv_to = converter->other_arch;
872 sint64 need = converter->stats.food;
873 sint64 give = converter->stats.sp;
939 874
940 /* We make some assumptions - we assume if it takes money as it type, 875 /* We make some assumptions - we assume if it takes money as it type,
941 * it wants some amount. We don't make change (ie, if something costs 876 * it wants some amount. We don't make change (ie, if something costs
942 * 3 gp and player drops a platinum, tough luck) 877 * 3 gp and player drops a platinum, tough luck)
943 */ 878 */
944 if (CONV_FROM (converter) == shstr_money) 879 if (conv_from == shstr_money)
945 { 880 {
946 if (item->type != MONEY) 881 if (item->type != MONEY)
947 return 0; 882 return 0;
948 883
949 nr = (item->nrof * item->value) / CONV_NEED (converter); 884 nr = sint64 (item->nrof) * item->value / need;
950 if (!nr) 885 if (!nr)
951 return 0; 886 return 0;
952 887
953 converter->play_sound (sound_find ("shop_buy")); 888 converter->play_sound (sound_find ("shop_buy"));
954 889
955 int cost = nr * CONV_NEED (converter) / item->value; 890 sint64 cost = (nr * need + item->value - 1) / item->value;
956 /* take into account rounding errors */
957 if (nr * CONV_NEED (converter) % item->value)
958 cost++;
959 891
960 decrease_ob_nr (item, cost); 892 item->decrease (cost);
961 893
962 price_in = cost * item->value; 894 price_in = cost * item->value;
963 } 895 }
964 else 896 else
965 { 897 {
966 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 898 if (item->type == PLAYER
967 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 899 || conv_from != item->arch->archname
900 || (need && need > (uint16) item->nrof))
968 return 0; 901 return 0;
969 902
970 converter->play_sound (sound_find ("convert_item")); 903 converter->play_sound (sound_find ("convert_item"));
971 904
972 if (CONV_NEED (converter)) 905 if (need)
973 { 906 {
974 nr = item->nrof / CONV_NEED (converter); 907 nr = sint64 (item->nrof) / need;
975 decrease_ob_nr (item, nr * CONV_NEED (converter)); 908 item->decrease (nr * need);
976 price_in = nr * CONV_NEED (converter) * item->value; 909 price_in = nr * need * item->value;
977 } 910 }
978 else 911 else
979 { 912 {
980 price_in = item->value; 913 price_in = item->value;
981 item->destroy (); 914 item->destroy ();
… …
992 ob_to_copy = converter->inv; 925 ob_to_copy = converter->inv;
993 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++) 926 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
994 if (rndm (0, i) == 0) 927 if (rndm (0, i) == 0)
995 ob_to_copy = ob; 928 ob_to_copy = ob;
996 929
997 item = object_create_clone (ob_to_copy); 930 item = ob_to_copy->deep_clone ();
998 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 931 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
999 unflag_inv (item, FLAG_IS_A_TEMPLATE); 932 unflag_inv (item, FLAG_IS_A_TEMPLATE);
1000 } 933 }
1001 else 934 else
1002 { 935 {
1003 if (converter->other_arch == NULL) 936 if (!conv_to)
1004 { 937 {
1005 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 938 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
1006 &converter->name, &converter->map->path, converter->x, converter->y); 939 &converter->name, &converter->map->path, converter->x, converter->y);
1007 return -1; 940 return -1;
1008 } 941 }
1009 942
1010 item = object_create_arch (converter->other_arch); 943 item = object_create_arch (conv_to);
1011 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 944 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1012 } 945 }
1013 946
1014 if (CONV_NR (converter)) 947 if (give)
1015 item->nrof = CONV_NR (converter); 948 item->nrof = give;
1016 949
1017 if (nr) 950 if (nr)
1018 item->nrof *= nr; 951 item->nrof *= nr;
1019 952
1020 if (is_in_shop (converter)) 953 if (converter->flag [FLAG_PRECIOUS])
1021 SET_FLAG (item, FLAG_UNPAID); 954 SET_FLAG (item, FLAG_UNPAID);
955
956 if (is_in_shop (converter))
957 {
958 // converters on shop floors don't work anymore, bug lets check for it
959 // and report in case someone still does it.
960 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
961 converter->debug_desc ());
962 SET_FLAG (item, FLAG_UNPAID);
963 }
1022 else if (price_in < item->nrof * item->value) 964 else if (price_in < sint64 (item->nrof) * item->value)
1023 { 965 {
1024 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 966 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1025 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 967 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1026 /** 968 /**
1027 * elmex: we are going to let the game continue, as the mapcreator 969 * elmex: we are going to let the game continue, as the mapcreator
1028 * hopefully had something in mind when doing this. 970 * hopefully had something in mind when doing this.
1029 */ 971 */
1030 } 972 }
1031 973
1032 SET_FLAG (item, FLAG_IDENTIFIED); 974 // elmex: only identify if we need to, for example so that generated money doesn't
975 // get an 'identified' flag so easily.
976 if (need_identify (item))
977 identify (item);
978
1033 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 979 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1034 return 1; 980 return 1;
1035} 981}
1036 982
1037/** 983/**
1038 * Handle apply on containers. 984 * Handle apply on containers.
1039 * By Eneq(@csd.uu.se). 985 * By Eneq(@csd.uu.se).
1040 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 986 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1041 * added the alchemical cauldron to the code -b.t. 987 * added the alchemical cauldron to the code -b.t.
1042 */ 988 */
1043int 989static int
1044apply_container (object *op, object *sack) 990apply_container (object *op, object *sack)
1045{ 991{
1046 if (op->type != PLAYER || !op->contr->ns) 992 if (op->type != PLAYER || !op->contr->ns)
1047 return 0; /* This might change */ 993 return 0; /* This might change */
1048 994
… …
1061 } 1007 }
1062 1008
1063 // already applied == open on ground, or open in inv, or active in inv 1009 // already applied == open on ground, or open in inv, or active in inv
1064 if (sack->flag [FLAG_APPLIED]) 1010 if (sack->flag [FLAG_APPLIED])
1065 { 1011 {
1066 if (op->container == sack) 1012 if (op->container_ () == sack)
1067 { 1013 {
1068 // open on ground or inv, so close 1014 // open on ground or inv, so close
1069 op->close_container (); 1015 op->close_container ();
1070 return 1; 1016 return 1;
1071 } 1017 }
… …
1114{ 1060{
1115 /* Only players can make sacrifices on spell casting altars. */ 1061 /* Only players can make sacrifices on spell casting altars. */
1116 if (altar->inv && (!originator || originator->type != PLAYER)) 1062 if (altar->inv && (!originator || originator->type != PLAYER))
1117 return 0; 1063 return 0;
1118 1064
1119 if (operate_altar (altar, &sacrifice)) 1065 if (operate_altar (altar, &sacrifice, originator))
1120 { 1066 {
1121 /* Simple check. Unfortunately, it means you can't cast magic bullet 1067 /* Simple check. Unfortunately, it means you can't cast magic bullet
1122 * with an altar. We call it a Potion - altars are stationary - it 1068 * with an altar. We call it a Potion - altars are stationary - it
1123 * is up to map designers to use them properly. 1069 * is up to map designers to use them properly.
1124 */ 1070 */
… …
1133/* push_button (altar);*/ 1079/* push_button (altar);*/
1134 } 1080 }
1135 else 1081 else
1136 { 1082 {
1137 altar->value = 1; /* works only once */ 1083 altar->value = 1; /* works only once */
1138 push_button (altar); 1084 push_button (altar, originator);
1139 } 1085 }
1140 1086
1141 return !sacrifice; 1087 return !sacrifice;
1142 } 1088 }
1143 else 1089 else
… …
1160 1106
1161 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1107 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1162 1108
1163 bool has_unpaid = false; 1109 bool has_unpaid = false;
1164 1110
1165 // quite inefficient to do this here twice, but the api doesn'T lend itself to 1111 // quite inefficient to do this here twice, but the api doesn't lend itself to
1166 // a quick and small change :( 1112 // a quick and small change :(
1167 for (object::depth_iterator item = op->begin (); item != op->end (); ++item) 1113 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1168 if (item->flag [FLAG_UNPAID]) 1114 if (item->flag [FLAG_UNPAID])
1169 { 1115 {
1170 has_unpaid = true; 1116 has_unpaid = true;
1171 break; 1117 break;
1172 } 1118 }
1173 1119
1174 if (op->type != PLAYER) 1120 if (!op->is_player ())
1175 { 1121 {
1176 /* Remove all the unpaid objects that may be carried here. 1122 /* Remove all the unpaid objects that may be carried here.
1177 * This could be pets or monsters that are somehow in 1123 * This could be pets or monsters that are somehow in
1178 * the shop. 1124 * the shop.
1179 */ 1125 */
… …
1183 1129
1184 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1130 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1185 { 1131 {
1186 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1132 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1187 1133
1134 if (i >= 0)
1188 tmp->remove (); 1135 tmp->move (i);
1189
1190 if (i == -1)
1191 i = 0;
1192
1193 tmp->map = op->map;
1194 tmp->x = op->x + freearr_x[i];
1195 tmp->y = op->y + freearr_y[i];
1196 insert_ob_in_map (tmp, op->map, op, 0);
1197 } 1136 }
1198 } 1137 }
1199 1138
1200 /* Don't teleport things like spell effects */ 1139 /* Don't teleport things like spell effects */
1201 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1140 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1212 if (i != -1) 1151 if (i != -1)
1213 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1152 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1214 1153
1215 return 0; 1154 return 0;
1216 } 1155 }
1156
1217 /* Removed code that checked for multipart objects - it appears that 1157 /* Removed code that checked for multipart objects - it appears that
1218 * the teleport function should be able to handle this just fine. 1158 * the teleport function should be able to handle this just fine.
1219 */ 1159 */
1220 rv = teleport (shop_mat, SHOP_MAT, op); 1160 rv = teleport (shop_mat, SHOP_MAT, op);
1221 } 1161 }
… …
1276 * Handles applying a sign. 1216 * Handles applying a sign.
1277 */ 1217 */
1278static void 1218static void
1279apply_sign (object *op, object *sign, int autoapply) 1219apply_sign (object *op, object *sign, int autoapply)
1280{ 1220{
1281 readable_message_type *msgType; 1221 if (!op->is_player())
1222 return;
1223
1224 if (sign->has_dialogue ())
1225 {
1226 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1227 return;
1228 }
1282 1229
1283 if (!sign->msg) 1230 if (!sign->msg)
1284 { 1231 {
1285 op->statusmsg ("Nothing is written on it."); 1232 op->contr->infobox (MSG_CHANNEL ("examine"),
1233 format ("T<%s>\n\n Nothing %sis written on it.",
1234 &sign->name,
1235 sign->name == sign->arch->name ? "" : "else "));
1286 return; 1236 return;
1287 } 1237 }
1288 1238
1289 if (sign->stats.food) 1239 if (sign->stats.food)
1290 { 1240 {
1291 if (sign->last_eat >= sign->stats.food) 1241 if (sign->last_eat >= sign->stats.food)
1292 { 1242 {
1293 if (!sign->move_on) 1243 if (!sign->move_on)
1294 op->statusmsg ("You cannot read it anymore."); 1244 op->failmsg ("You cannot read it anymore.");
1295 1245
1296 return; 1246 return;
1297 } 1247 }
1298 1248
1299 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1249 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1312 } 1262 }
1313 1263
1314 if (op->contr) 1264 if (op->contr)
1315 if (client *ns = op->contr->ns) 1265 if (client *ns = op->contr->ns)
1316 { 1266 {
1267 if (sign->sound)
1317 ns->play_sound (sign->sound); 1268 ns->play_sound (sign->sound);
1318 msgType = get_readable_message_type (sign); 1269 else if (autoapply)
1270 ns->play_sound (sound_find ("msg_voice"));
1319 1271
1320 if (ns->can_msg) 1272 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1321 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg);
1322 else
1323 {
1324 char newbuf[HUGE_BUF];
1325 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1326 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1327 }
1328 } 1273 }
1274}
1275
1276static void
1277move_apply_hole (object *trap, object *victim)
1278{
1279 /* Hole not open? */
1280 if (trap->stats.wc > 0)
1281 return;
1282
1283 /* Is this a multipart monster and not the head? If so, return.
1284 * Processing will happen if the head runs into the pit
1285 */
1286 if (victim->head)
1287 return;
1288
1289 // now find all possible locations and randomly pick one
1290 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1291 trap->range >= 3 ? SIZEOFFREE3 + 1
1292 : trap->range >= 2 ? SIZEOFFREE2 + 1
1293 : trap->range >= 1 ? SIZEOFFREE1 + 1
1294 : SIZEOFFREE0 + 1);
1295
1296 if (dir < 0)
1297 return;
1298
1299 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1300 victim->statusmsg ("You fall through the hole!", NDI_RED);
1301
1302 transfer_ob (victim,
1303 EXIT_X (trap) + freearr_x[dir],
1304 EXIT_Y (trap) + freearr_y[dir],
1305 0, victim);
1329} 1306}
1330 1307
1331/** 1308/**
1332 * 'victim' moves onto 'trap' 1309 * 'victim' moves onto 'trap'
1333 * 'victim' leaves 'trap' 1310 * 'victim' leaves 'trap'
… …
1347 return; 1324 return;
1348 1325
1349 /* move_apply() is the most likely candidate for causing unwanted and 1326 /* move_apply() is the most likely candidate for causing unwanted and
1350 * possibly unlimited recursion. 1327 * possibly unlimited recursion.
1351 */ 1328 */
1352 /* The following was changed because it was causing perfeclty correct 1329 /* The following was changed because it was causing perfectly correct
1353 * maps to fail. 1) it's not an error to recurse: 1330 * maps to fail. 1) it's not an error to recurse:
1354 * rune detonates, summoning monster. monster lands on nearby rune. 1331 * rune detonates, summoning monster. monster lands on nearby rune.
1355 * nearby rune detonates. This sort of recursion is expected and 1332 * nearby rune detonates. This sort of recursion is expected and
1356 * proper. This code was causing needless crashes. 1333 * proper. This code was causing needless crashes.
1357 */ 1334 */
… …
1364 1341
1365 recursion_depth++; 1342 recursion_depth++;
1366 if (trap->head) 1343 if (trap->head)
1367 trap = trap->head; 1344 trap = trap->head;
1368 1345
1369 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1346 if (!INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1370 goto leave;
1371
1372 switch (trap->type) 1347 switch (trap->type)
1373 { 1348 {
1374 case PLAYERMOVER: 1349 case PLAYERMOVER:
1375 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim)) 1350 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))
1351 {
1352 if (!trap->stats.maxsp)
1353 trap->stats.maxsp = 2;
1354
1355 /* Is this correct? From the docs, it doesn't look like it
1356 * should be divided by trap->speed
1357 */
1358 victim->speed_left = -fabs (trap->stats.maxsp * victim->speed / trap->speed);
1359
1360 /* Just put in some sanity check. I think there is a bug in the
1361 * above with some objects have zero speed, and thus the player
1362 * getting permanently paralyzed.
1363 */
1364 if (victim->speed_left < -50.f)
1365 victim->speed_left = -50.f;
1366 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1367 }
1368 break;
1369
1370 case SPINNER:
1371 if (victim->direction)
1372 {
1373 victim->direction = absdir (victim->direction - trap->stats.sp);
1374 update_turn_face (victim);
1375 }
1376 break;
1377
1378 case DIRECTOR:
1379 if (victim->direction && !should_director_abort (trap, victim))
1380 {
1381 victim->direction = trap->stats.sp;
1382 update_turn_face (victim);
1383 }
1384 break;
1385
1386 case BUTTON:
1387 case PEDESTAL:
1388 case T_MATCH:
1389 update_button (trap, originator);
1390 break;
1391
1392 case ALTAR:
1393 /* sacrifice victim on trap */
1394 apply_altar (trap, victim, originator);
1395 break;
1396
1397 case THROWN_OBJ:
1398 if (trap->inv == NULL)
1399 break;
1400 /* fallthrough */
1401
1402 case ARROW:
1403 /* bad bug: monster throw a object, make a step forwards, step on object ,
1404 * trigger this here and get hit by own missile - and will be own enemy.
1405 * Victim then is his own enemy and will start to kill herself (this is
1406 * removed) but we have not synced victim and his missile. To avoid senseless
1407 * action, we avoid hits here
1408 */
1409 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->has_active_speed ())
1410 && trap->owner != victim)
1411 hit_with_arrow (trap, victim);
1412 break;
1413
1414 case SPELL_EFFECT:
1415 apply_spell_effect (trap, victim);
1416 break;
1417
1418 case TRAPDOOR:
1376 { 1419 {
1420 int max, sound_was_played;
1421 object *ab, *ab_next;
1422
1377 if (!trap->stats.maxsp) 1423 if (!trap->value)
1378 trap->stats.maxsp = 2; 1424 {
1425 int tot;
1379 1426
1380 /* Is this correct? From the docs, it doesn't look like it 1427 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1381 * should be divided by trap->speed 1428 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1429 tot += ab->head_ ()->total_weight ();
1430
1431 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1432 break;
1433
1434 SET_ANIMATION (trap, trap->value);
1435 update_object (trap, UP_OBJ_FACE);
1436 }
1437
1438 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
1439 {
1440 /* need to set this up, since if we do transfer the object,
1441 * ab->above would be bogus
1382 */ 1442 */
1383 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1443 ab_next = ab->above;
1384 1444
1385 /* Just put in some sanity check. I think there is a bug in the 1445 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1386 * above with some objects have zero speed, and thus the player 1446 {
1387 * getting permanently paralyzed. 1447 if (!sound_was_played)
1448 {
1449 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1450 sound_was_played = 1;
1451 }
1452
1453 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1454 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1455 }
1388 */ 1456 }
1389 if (victim->speed_left < -50.f) 1457 break;
1390 victim->speed_left = -50.f;
1391 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1392 } 1458 }
1393 goto leave;
1394 1459
1395 case SPINNER: 1460 case CONVERTER:
1396 if (victim->direction) 1461 if (convert_item (victim, trap) < 0)
1397 {
1398 victim->direction = absdir (victim->direction - trap->stats.sp);
1399 update_turn_face (victim);
1400 }
1401 goto leave;
1402
1403 case DIRECTOR:
1404 if (victim->direction && !should_director_abort (trap, victim))
1405 {
1406 victim->direction = trap->stats.sp;
1407 update_turn_face (victim);
1408 }
1409 goto leave;
1410
1411 case BUTTON:
1412 case PEDESTAL:
1413 update_button (trap);
1414 goto leave;
1415
1416 case ALTAR:
1417 /* sacrifice victim on trap */
1418 apply_altar (trap, victim, originator);
1419 goto leave;
1420
1421 case THROWN_OBJ:
1422 if (trap->inv == NULL)
1423 goto leave;
1424 /* fallthrough */
1425
1426 case ARROW:
1427 /* bad bug: monster throw a object, make a step forwards, step on object ,
1428 * trigger this here and get hit by own missile - and will be own enemy.
1429 * Victim then is his own enemy and will start to kill herself (this is
1430 * removed) but we have not synced victim and his missile. To avoid senseless
1431 * action, we avoid hits here
1432 */
1433 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1434 hit_with_arrow (trap, victim);
1435 goto leave;
1436
1437 case SPELL_EFFECT:
1438 apply_spell_effect (trap, victim);
1439 goto leave;
1440
1441 case TRAPDOOR:
1442 {
1443 int max, sound_was_played;
1444 object *ab, *ab_next;
1445
1446 if (!trap->value)
1447 { 1462 {
1448 int tot; 1463 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1449 1464 archetype::get (shstr_burnout)->insert_at (trap, trap);
1450 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above)
1451 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1452 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying;
1453
1454 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1455 goto leave;
1456
1457 SET_ANIMATION (trap, trap->value);
1458 update_object (trap, UP_OBJ_FACE);
1459 } 1465 }
1460 1466
1461 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next) 1467 break;
1468
1469 case TRIGGER_BUTTON:
1470 case TRIGGER_PEDESTAL:
1471 case TRIGGER_ALTAR:
1472 check_trigger (trap, victim, originator);
1473 break;
1474
1475 case DEEP_SWAMP:
1476 walk_on_deep_swamp (trap, victim);
1477 break;
1478
1479 case CHECK_INV:
1480 check_inv (victim, trap);
1481 break;
1482
1483 case HOLE:
1484 move_apply_hole (trap, victim);
1485 break;
1486
1487 case EXIT:
1488 if (victim->type == PLAYER && EXIT_PATH (trap))
1462 { 1489 {
1463 /* need to set this up, since if we do transfer the object, 1490 /* Basically, don't show exits leading to random maps the
1464 * ab->above would be bogus 1491 * players output.
1465 */ 1492 */
1466 ab_next = ab->above; 1493 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1494 victim->statusmsg (trap->msg, NDI_NAVY);
1467 1495
1468 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1496 trap->play_sound (trap->sound);
1469 { 1497 victim->enter_exit (trap);
1470 if (!sound_was_played)
1471 {
1472 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1473 sound_was_played = 1;
1474 }
1475
1476 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1477 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1478 }
1479 } 1498 }
1480 goto leave; 1499 break;
1481 }
1482 1500
1483 case CONVERTER:
1484 if (convert_item (victim, trap) < 0)
1485 {
1486 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1487 get_archetype ("burnout")->insert_at (trap, trap);
1488 }
1489
1490 goto leave;
1491
1492 case TRIGGER_BUTTON:
1493 case TRIGGER_PEDESTAL:
1494 case TRIGGER_ALTAR:
1495 check_trigger (trap, victim);
1496 goto leave;
1497
1498 case DEEP_SWAMP:
1499 walk_on_deep_swamp (trap, victim);
1500 goto leave;
1501
1502 case CHECK_INV:
1503 check_inv (victim, trap);
1504 goto leave;
1505
1506 case HOLE:
1507 /* Hole not open? */
1508 if (trap->stats.wc > 0)
1509 goto leave;
1510
1511 /* Is this a multipart monster and not the head? If so, return.
1512 * Processing will happen if the head runs into the pit
1513 */
1514 if (victim->head)
1515 goto leave;
1516
1517 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1518 victim->statusmsg ("You fall through the hole!", NDI_RED);
1519 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1520 goto leave;
1521
1522 case EXIT:
1523 if (victim->type == PLAYER && EXIT_PATH (trap))
1524 {
1525 /* Basically, don't show exits leading to random maps the
1526 * players output.
1527 */
1528 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1529 victim->statusmsg (trap->msg, NDI_NAVY);
1530
1531 victim->enter_exit (trap);
1532 }
1533 goto leave;
1534
1535 case ENCOUNTER: 1501 case ENCOUNTER:
1536 /* may be some leftovers on this */ 1502 /* may be some leftovers on this */
1537 goto leave; 1503 break;
1538 1504
1539 case SHOP_MAT: 1505 case SHOP_MAT:
1540 apply_shop_mat (trap, victim); 1506 apply_shop_mat (trap, victim);
1541 goto leave; 1507 break;
1542 1508
1543 /* Drop a certain amount of gold, and have one item identified */ 1509 /* Drop a certain amount of gold, and have one item identified */
1544 case IDENTIFY_ALTAR: 1510 case IDENTIFY_ALTAR:
1545 apply_id_altar (victim, trap, originator); 1511 apply_id_altar (victim, trap, originator);
1546 goto leave; 1512 break;
1547 1513
1548 case SIGN: 1514 case SIGN:
1549 if (victim->type != PLAYER && trap->stats.food > 0) 1515 if (victim->type != PLAYER && trap->stats.food > 0)
1550 goto leave; /* monsters musn't apply magic_mouths with counters */ 1516 break; /* monsters musn't apply magic_mouths with counters */
1551 1517
1552 apply_sign (victim, trap, 1); 1518 apply_sign (victim, trap, 1);
1553 goto leave; 1519 break;
1554 1520
1555 case CONTAINER: 1521 case CONTAINER:
1556 apply_container (victim, trap); 1522 apply_container (victim, trap);
1557 goto leave; 1523 break;
1558 1524
1559 case RUNE: 1525 case RUNE:
1560 case TRAP: 1526 case TRAP:
1561 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1527 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1562 {
1563 spring_trap (trap, victim); 1528 spring_trap (trap, victim);
1564 } 1529 break;
1565 goto leave;
1566 1530
1567 default: 1531 default:
1568 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1532 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1569 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type); 1533 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1570 goto leave; 1534 break;
1571 } 1535 }
1572 1536
1573leave:
1574 recursion_depth--; 1537 recursion_depth--;
1575} 1538}
1576 1539
1577/** 1540/**
1578 * Handles reading a regular (ie not containing a spell) book. 1541 * Handles reading a regular (ie not containing a spell) book.
… …
1589 return; 1552 return;
1590 } 1553 }
1591 1554
1592 if (!tmp->msg) 1555 if (!tmp->msg)
1593 { 1556 {
1594 op->failmsg (format ("You open the %s and find it empty.", &tmp->name)); 1557 op->failmsg (format ("The %s contains nothing but meaningless gibberish. H<There is nothing interesting to read here.>", &tmp->name));
1595 return; 1558 return;
1596 } 1559 }
1597 1560
1598 /* need a literacy skill to read stuff! */ 1561 /* need a literacy skill to read stuff! */
1599 skill_ob = find_skill_by_name (op, tmp->skill); 1562 skill_ob = find_skill_by_name (op, tmp->skill);
… …
1604 } 1567 }
1605 1568
1606 lev_diff = tmp->level - (skill_ob->level + 5); 1569 lev_diff = tmp->level - (skill_ob->level + 5);
1607 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1570 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1608 { 1571 {
1609 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension." 1572 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1610 : lev_diff < 3 ? "This book is slightly beyond your comprehension." 1573 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1611 : lev_diff < 5 ? "This book is beyond your comprehension." 1574 : lev_diff < 5 ? "This book is beyond your comprehension."
1612 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension." 1575 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1613 : lev_diff < 15 ? "This book is way beyond your comprehension." 1576 : lev_diff < 15 ? "This book is way beyond your comprehension."
1614 : "This book is totally beyond your comprehension."); 1577 : "This book is totally beyond your comprehension.");
… …
1617 1580
1618 readable_message_type *msgType = get_readable_message_type (tmp); 1581 readable_message_type *msgType = get_readable_message_type (tmp);
1619 1582
1620 if (player *pl = op->contr) 1583 if (player *pl = op->contr)
1621 if (client *ns = pl->ns) 1584 if (client *ns = pl->ns)
1622 if (ns->can_msg) 1585 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1623 {
1624 dynbuf_text buf;
1625 buf << long_desc (tmp, op)
1626 << "\n\n"
1627 << tmp->msg
1628 << '\0';
1629 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1630 }
1631 else
1632 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1633 msgType->message_type, msgType->message_subtype,
1634 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1635 long_desc (tmp, op), &tmp->msg);
1636 1586
1637 /* gain xp from reading */ 1587 /* gain xp from reading */
1638 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1588 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1639 { /* only if not read before */ 1589 { /* only if not read before */
1640 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1590 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1642 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1592 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1643 { 1593 {
1644 /*exp_gain *= 2; because they just identified it too */ 1594 /*exp_gain *= 2; because they just identified it too */
1645 SET_FLAG (tmp, FLAG_IDENTIFIED); 1595 SET_FLAG (tmp, FLAG_IDENTIFIED);
1646 1596
1647 /* If in a container, update how it looks */ 1597 if (object *pl = tmp->visible_to ())
1648 if (tmp->env)
1649 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1598 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1650 else
1651 op->contr->ns->floorbox_update ();
1652 } 1599 }
1653 1600
1654 change_exp (op, exp_gain, skill_ob->skill, 0); 1601 change_exp (op, exp_gain, skill_ob->skill, 0);
1655 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1602 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1603 }
1604}
1605
1606/**
1607 * op made some mistake with a scroll, this takes care of punishment.
1608 * scroll_failure()- hacked directly from spell_failure
1609 */
1610static void
1611scroll_failure (object *op, int failure, int power)
1612{
1613 if (abs (failure / 4) > power)
1614 power = abs (failure / 4); /* set minimum effect */
1615
1616 if (failure <= -1 && failure > -15)
1617 { /* wonder */
1618 object *tmp;
1619
1620 op->failmsg ("Your spell warps!");
1621 tmp = get_archetype (SPELL_WONDER);
1622 cast_wonder (op, op, 0, tmp);
1623 tmp->destroy ();
1624 }
1625 else if (failure <= -15 && failure > -35)
1626 { /* drain mana */
1627 op->failmsg ("Your mana is drained!");
1628 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
1629 if (op->stats.sp < 0)
1630 op->stats.sp = 0;
1631 }
1632 else if (settings.spell_failure_effects == TRUE)
1633 {
1634 if (failure <= -35 && failure > -60)
1635 { /* confusion */
1636 op->failmsg ("The magic recoils on you!");
1637 confuse_player (op, op, power);
1638 }
1639 else if (failure <= -60 && failure > -70)
1640 { /* paralysis */
1641 op->failmsg ("The magic recoils and paralyzes you!");
1642 paralyze_player (op, op, power);
1643 }
1644 else if (failure <= -70 && failure > -80)
1645 { /* blind */
1646 op->failmsg ("The magic recoils on you!");
1647 blind_player (op, op, power);
1648 }
1649 else if (failure <= -80)
1650 { /* blast the immediate area */
1651 object *tmp = get_archetype (LOOSE_MANA);
1652 cast_magic_storm (op, tmp, power);
1653 op->failmsg ("You unleash uncontrolled mana!");
1654 tmp->destroy ();
1655 }
1656 } 1656 }
1657} 1657}
1658 1658
1659/** 1659/**
1660 * Handles the applying of a skill scroll, calling learn_skill straight. 1660 * Handles the applying of a skill scroll, calling learn_skill straight.
… …
1669 op->play_sound (sound_find ("generic_fail")); 1669 op->play_sound (sound_find ("generic_fail"));
1670 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1670 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1671 break; 1671 break;
1672 1672
1673 case 1: 1673 case 1:
1674 decrease_ob (tmp); 1674 tmp->decrease ();
1675 op->play_sound (sound_find ("skill_learn")); 1675 op->play_sound (sound_find ("skill_learn"));
1676 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1676 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1677 break; 1677 break;
1678 1678
1679 default: 1679 default:
1680 decrease_ob (tmp); 1680 tmp->decrease ();
1681 op->play_sound (sound_find ("generic_fail")); 1681 op->play_sound (sound_find ("generic_fail"));
1682 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1682 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1683 break; 1683 break;
1684 } 1684 }
1685} 1685}
… …
1797 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1797 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1798 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!"); 1798 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1799 return; 1799 return;
1800 } 1800 }
1801 1801
1802 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1802 int learn_level = sqrtf (spell->level) * 1.5f;
1803 if (skop->level < learn_level)
1803 { 1804 {
1804 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill)); 1805 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1806 &tmp->skill, learn_level));
1805 return; 1807 return;
1806 } 1808 }
1807 1809
1808 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1810 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1809 1811
1810 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1812 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1811 {
1812 identify (tmp); 1813 identify (tmp);
1813
1814 if (tmp->env)
1815 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1816 else
1817 op->contr->ns->floorbox_update ();
1818 }
1819 1814
1820 /* I removed the check for special_prayer_mark here - it didn't make 1815 /* I removed the check for special_prayer_mark here - it didn't make
1821 * a lot of sense - special prayers are not found in spellbooks, and 1816 * a lot of sense - special prayers are not found in spellbooks, and
1822 * if the player doesn't know the spell, doesn't make a lot of sense that 1817 * if the player doesn't know the spell, doesn't make a lot of sense that
1823 * they would have a special prayer mark. 1818 * they would have a special prayer mark.
… …
1858 * literacy rate very useful! -b.t. 1853 * literacy rate very useful! -b.t.
1859 */ 1854 */
1860 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1855 if (QUERY_FLAG (op, FLAG_CONFUSED))
1861 { 1856 {
1862 op->failmsg ("In your confused state you flub the wording of the text!"); 1857 op->failmsg ("In your confused state you flub the wording of the text!");
1863 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1858 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), max (spell->stats.sp, spell->stats.grace));
1864 } 1859 }
1865 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1860 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
1866 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1861 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
1867 { 1862 {
1868 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN); 1863 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
… …
1876 { 1871 {
1877 op->contr->play_sound (sound_find ("fumble_spell")); 1872 op->contr->play_sound (sound_find ("fumble_spell"));
1878 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n"); 1873 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1879 } 1874 }
1880 1875
1881 decrease_ob (tmp); 1876 tmp->decrease ();
1882} 1877}
1883 1878
1884/** 1879/**
1885 * Handles applying a spell scroll. 1880 * Handles applying a spell scroll.
1886 */ 1881 */
… …
1925 identify (tmp); 1920 identify (tmp);
1926 1921
1927 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1922 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1928 1923
1929 cast_spell (op, tmp, dir, tmp->inv, NULL); 1924 cast_spell (op, tmp, dir, tmp->inv, NULL);
1930 decrease_ob (tmp); 1925 tmp->decrease ();
1931} 1926}
1932 1927
1933/** 1928/**
1934 * Applies a treasure object - by default, chest. op 1929 * Applies a treasure object - by default, chest. op
1935 * is the person doing the applying, tmp is the treasure 1930 * is the person doing the applying, tmp is the treasure
… …
1947 object *treas = tmp->inv; 1942 object *treas = tmp->inv;
1948 1943
1949 if (!treas) 1944 if (!treas)
1950 { 1945 {
1951 op->statusmsg ("The chest was empty."); 1946 op->statusmsg ("The chest was empty.");
1952 decrease_ob (tmp); 1947 tmp->decrease ();
1953 return; 1948 return;
1954 } 1949 }
1955 1950
1956 while (tmp->inv) 1951 while (tmp->inv)
1957 { 1952 {
… …
1973 if (op->destroyed () || tmp->destroyed ()) 1968 if (op->destroyed () || tmp->destroyed ())
1974 break; 1969 break;
1975 } 1970 }
1976 1971
1977 if (!tmp->destroyed () && !tmp->inv) 1972 if (!tmp->destroyed () && !tmp->inv)
1978 decrease_ob (tmp); 1973 tmp->decrease (true);
1979}
1980
1981/**
1982 * op eats food.
1983 * If player, takes care of messages and dragon special food.
1984 */
1985static void
1986apply_food (object *op, object *tmp)
1987{
1988 int capacity_remaining;
1989
1990 if (op->type != PLAYER)
1991 op->stats.hp = op->stats.maxhp;
1992 else
1993 {
1994 /* check if this is a dragon (player), eating some flesh */
1995 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
1996 ;
1997 else
1998 {
1999 /* usual case - no dragon meal: */
2000 if (op->stats.food + tmp->stats.food > 999)
2001 {
2002 if (tmp->type == FOOD || tmp->type == FLESH)
2003 op->failmsg ("You feel full, but what a waste of food!");
2004 else
2005 op->statusmsg ("Most of the drink goes down your face not your throat!");
2006 }
2007
2008 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2009 {
2010 const char *buf;
2011
2012 if (!is_dragon_pl (op))
2013 {
2014 /* eating message for normal players */
2015 if (tmp->type == DRINK)
2016 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2017 else
2018 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2019 }
2020 else
2021 /* eating message for dragon players */
2022 buf = format ("The %s tasted terrible!", &tmp->name);
2023
2024 op->statusmsg (buf);
2025
2026 capacity_remaining = 999 - op->stats.food;
2027 op->stats.food += tmp->stats.food;
2028 if (capacity_remaining < tmp->stats.food)
2029 op->stats.hp += capacity_remaining / 50;
2030 else
2031 op->stats.hp += tmp->stats.food / 50;
2032
2033 if (op->stats.hp > op->stats.maxhp)
2034 op->stats.hp = op->stats.maxhp;
2035 if (op->stats.food > 999)
2036 op->stats.food = 999;
2037 }
2038
2039 /* special food hack -b.t. */
2040 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2041 eat_special_food (op, tmp);
2042 }
2043 }
2044
2045 handle_apply_yield (tmp);
2046 decrease_ob (tmp);
2047} 1974}
2048 1975
2049/** 1976/**
2050 * A dragon is eating some flesh. If the flesh contains resistances, 1977 * A dragon is eating some flesh. If the flesh contains resistances,
2051 * there is a chance for the dragon's skin to get improved. 1978 * there is a chance for the dragon's skin to get improved.
… …
2054 * object *op the object (dragon player) eating the flesh 1981 * object *op the object (dragon player) eating the flesh
2055 * object *meal the flesh item, getting chewed in dragon's mouth 1982 * object *meal the flesh item, getting chewed in dragon's mouth
2056 * return: 1983 * return:
2057 * int 1 if eating successful, 0 if it doesn't work 1984 * int 1 if eating successful, 0 if it doesn't work
2058 */ 1985 */
2059int 1986static int
2060dragon_eat_flesh (object *op, object *meal) 1987dragon_eat_flesh (object *op, object *meal)
2061{ 1988{
2062 object *skin = NULL; /* pointer to dragon skin force */ 1989 object *skin = NULL; /* pointer to dragon skin force */
2063 object *abil = NULL; /* pointer to dragon ability force */ 1990 object *abil = NULL; /* pointer to dragon ability force */
2064 object *tmp = NULL; /* tmp. object */ 1991 object *tmp = NULL; /* tmp. object */
… …
2096 op->stats.hp += meal->stats.food / 50; 2023 op->stats.hp += meal->stats.food / 50;
2097 2024
2098 if (op->stats.hp > op->stats.maxhp) 2025 if (op->stats.hp > op->stats.maxhp)
2099 op->stats.hp = op->stats.maxhp; 2026 op->stats.hp = op->stats.maxhp;
2100 2027
2101 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2028 op->stats.food = min (999, op->stats.food + meal->stats.food);
2102 2029
2103 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */ 2030 /*LOG(llevDebug, "-> player: %d, flesh: %d\n", op->level, meal->level); */
2104 2031
2105 /* on to the interesting part: chances for adding resistance */ 2032 /* on to the interesting part: chances for adding resistance */
2106 for (i = 0; i < NROFATTACKS; i++) 2033 for (i = 0; i < NROFATTACKS; i++)
… …
2116 2043
2117 /* monster bonus increases with level, because high-level 2044 /* monster bonus increases with level, because high-level
2118 flesh is too rare */ 2045 flesh is too rare */
2119 mbonus = op->level * 20. / ((double) settings.max_level); 2046 mbonus = op->level * 20. / ((double) settings.max_level);
2120 2047
2121 chance = (((double) MIN (op->level + bonus, meal->level + bonus + mbonus)) * 100. / 2048 chance = (((double)min (op->level + bonus, meal->level + bonus + mbonus)) * 100. /
2122 ((double) settings.max_level)) - skin->resist[i]; 2049 ((double)settings.max_level)) - skin->resist[i];
2123 2050
2124 if (chance >= 0.) 2051 if (chance >= 0.)
2125 chance += 1.; 2052 chance += 1.;
2126 else 2053 else
2127 chance = (chance < -12) ? 0. : 1. / pow (2., -chance); 2054 chance = (chance < -12) ? 0. : 1. / pow (2., -chance);
2128 2055
2129 /* chance is proportional to amount of resistance (max. 50) */ 2056 /* chance is proportional to amount of resistance (max. 50) */
2130 chance *= ((double) (MIN (meal->resist[i], 50))) / 50.; 2057 chance *= ((double)(min (meal->resist[i], 50))) / 50.;
2131 2058
2132 /* doubled chance for resistance of ability-focus */ 2059 /* doubled chance for resistance of ability-focus */
2133 if (i == abil->stats.exp) 2060 if (i == abil->stats.exp)
2134 chance = MIN (100., chance * 2.); 2061 chance = min (100., chance * 2.);
2135 2062
2136 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2063 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2137 if (rndm (10000) < (unsigned int) (chance * 100)) 2064 if (rndm (10000) < (unsigned int)(chance * 100))
2138 { 2065 {
2139 atnr_winner[winners] = i; 2066 atnr_winner[winners] = i;
2140 winners++; 2067 winners++;
2141 } 2068 }
2142 2069
… …
2170 op->statusmsg (buf); 2097 op->statusmsg (buf);
2171 2098
2172 /* now choose a winner if we have any */ 2099 /* now choose a winner if we have any */
2173 i = -1; 2100 i = -1;
2174 if (winners > 0) 2101 if (winners > 0)
2175 i = atnr_winner[RANDOM () % winners]; 2102 i = atnr_winner [rndm (winners)];
2176 2103
2177 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2104 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2178 { 2105 {
2179 /* resistance increased! */ 2106 /* resistance increased! */
2180 skin->resist[i]++; 2107 skin->resist[i]++;
… …
2205 2132
2206 return 1; 2133 return 1;
2207} 2134}
2208 2135
2209/** 2136/**
2137 * op eats food.
2138 * If player, takes care of messages and dragon special food.
2139 */
2140static void
2141apply_food (object *op, object *tmp)
2142{
2143 int capacity_remaining;
2144
2145 if (op->type != PLAYER)
2146 op->stats.hp = op->stats.maxhp;
2147 else
2148 {
2149 /* check if this is a dragon (player), eating some flesh */
2150 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
2151 ;
2152 else
2153 {
2154 /* usual case - no dragon meal: */
2155 if (op->stats.food + tmp->stats.food > 999)
2156 {
2157 if (tmp->type == FOOD || tmp->type == FLESH)
2158 op->failmsg ("You feel full, but what a waste of food!");
2159 else
2160 op->statusmsg ("Most of the drink goes down your face not your throat!");
2161 }
2162
2163 tmp->play_sound (
2164 tmp->sound
2165 ? tmp->sound
2166 : tmp->type == DRINK
2167 ? sound_find ("eat_drink")
2168 : sound_find ("eat_food")
2169 );
2170
2171 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2172 {
2173 const char *buf;
2174
2175 if (!is_dragon_pl (op))
2176 {
2177 /* eating message for normal players */
2178 if (tmp->type == DRINK)
2179 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2180 else
2181 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2182 }
2183 else
2184 /* eating message for dragon players */
2185 buf = format ("The %s tasted terrible!", &tmp->name);
2186
2187 op->statusmsg (buf);
2188
2189 capacity_remaining = 999 - op->stats.food;
2190 op->stats.food += tmp->stats.food;
2191 if (capacity_remaining < tmp->stats.food)
2192 op->stats.hp += capacity_remaining / 50;
2193 else
2194 op->stats.hp += tmp->stats.food / 50;
2195
2196 if (op->stats.hp > op->stats.maxhp)
2197 op->stats.hp = op->stats.maxhp;
2198 if (op->stats.food > 999)
2199 op->stats.food = 999;
2200 }
2201
2202 /* special food hack -b.t. */
2203 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2204 eat_special_food (op, tmp);
2205 }
2206 }
2207
2208 handle_apply_yield (tmp);
2209 tmp->decrease ();
2210}
2211
2212/**
2210 * Handles applying an improve armor scroll. 2213 * Handles applying an improve armor scroll.
2211 * Does some sanity checks, then calls improve_armour. 2214 * Does some sanity checks, then calls improve_armour.
2212 */ 2215 */
2213static void 2216static void
2214apply_armour_improver (object *op, object *tmp) 2217apply_armour_improver (object *op, object *tmp)
… …
2239 2242
2240 op->statusmsg ("Applying armour enchantment."); 2243 op->statusmsg ("Applying armour enchantment.");
2241 improve_armour (op, tmp, armor); 2244 improve_armour (op, tmp, armor);
2242} 2245}
2243 2246
2244extern void 2247void
2245apply_poison (object *op, object *tmp) 2248apply_poison (object *op, object *tmp)
2246{ 2249{
2250 // need to do it now when it is still on the map
2251 handle_apply_yield (tmp);
2252
2253 object *poison = tmp->split (1);
2254
2247 if (op->type == PLAYER) 2255 if (op->type == PLAYER)
2248 { 2256 {
2249 op->contr->play_sound (sound_find ("drink_poison")); 2257 op->contr->play_sound (sound_find ("drink_poison"));
2250 op->failmsg ("Yech! That tasted poisonous!"); 2258 op->failmsg ("Yech! That tasted poisonous!");
2251 strcpy (op->contr->killer, "poisonous booze"); 2259 op->contr->killer = poison;
2252 } 2260 }
2253 2261
2254 if (tmp->stats.hp > 0) 2262 if (poison->stats.hp > 0)
2255 { 2263 {
2256 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2264 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2257 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2265 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2258 } 2266 }
2259 2267
2260 op->stats.food -= op->stats.food / 4; 2268 op->stats.food -= op->stats.food / 4;
2261 handle_apply_yield (tmp); 2269 poison->destroy ();
2262 decrease_ob (tmp);
2263} 2270}
2264 2271
2265/** 2272/**
2266 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2273 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2267 * A valid 2 way exit means: 2274 * A valid 2 way exit means:
… …
2272 * 2279 *
2273 * Note: a owner in a 2 way exit is saved as the owner's name 2280 * Note: a owner in a 2 way exit is saved as the owner's name
2274 * in the field exit->name cause the field exit->owner doesn't 2281 * in the field exit->name cause the field exit->owner doesn't
2275 * survive in the swapping (in fact the whole exit doesn't survive). 2282 * survive in the swapping (in fact the whole exit doesn't survive).
2276 */ 2283 */
2277int 2284static int
2278is_legal_2ways_exit (object *op, object *exit) 2285is_legal_2ways_exit (object *op, object *exit)
2279{ 2286{
2280 if (exit->stats.exp != 1) 2287 if (exit->stats.exp != 1)
2281 return 1; /*This is not a 2 way, so it is legal */ 2288 return 1; /*This is not a 2 way, so it is legal */
2282 2289
2283#if 0 //TODO 2290#if 0 //TODO
2284 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2291 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2285 return 0; /* This is a reset town portal */ 2292 return 0; /* This is a reset town portal */
2286#endif 2293#endif
2294
2295 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2287 2296
2288 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2297 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2289 2298
2290 if (exitmap) 2299 if (exitmap)
2291 { 2300 {
… …
2346 return 1; 2355 return 1;
2347 } 2356 }
2348 } 2357 }
2349 2358
2350 return 0; 2359 return 0;
2360}
2361
2362/**
2363 * This function will try to apply a lighter and in case no lighter
2364 * is specified it will try to find a lighter in the players inventory,
2365 * and inform him about this requirement.
2366 *
2367 * who - the player
2368 * op - the item we want to light
2369 * lighter - the lighter or 0 if a lighter has yet to be found
2370 */
2371static object *
2372auto_apply_lighter (object *who, object *op, object *lighter)
2373{
2374 if (lighter == 0)
2375 {
2376 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2377 {
2378 if (tmp->type == LIGHTER)
2379 {
2380 lighter = tmp;
2381 break;
2382 }
2383 }
2384
2385 if (!lighter)
2386 {
2387 who->failmsg (format (
2388 "You can't light up the %s with your bare hands! "
2389 "H<You need a lighter in your inventory, for example a flint and steel.>",
2390 &op->name));
2391 return 0;
2392 }
2393 }
2394
2395 // last_eat == 0 means the lighter is not being used up!
2396 if (lighter->last_eat && lighter->stats.food)
2397 {
2398 /* lighter gets used up */
2399 lighter = lighter->split ();
2400 lighter->stats.food--;
2401 who->insert (lighter);
2402 }
2403 else if (lighter->last_eat)
2404 {
2405 /* no charges left in lighter */
2406 who->failmsg (format (
2407 "You attempt to light the %s with a used up %s.",
2408 &op->name, &lighter->name));
2409 return 0;
2410 }
2411
2412 return lighter;
2413}
2414
2415/**
2416 * Designed primarily to light torches/lanterns/etc.
2417 * Also burns up burnable material too. First object in the inventory is
2418 * the selected object to "burn". -b.t.
2419 */
2420static void
2421apply_lighter (object *who, object *lighter)
2422{
2423 object *item;
2424 int is_player_env = 0;
2425
2426 item = find_marked_object (who);
2427 if (item)
2428 {
2429 if (!auto_apply_lighter (who, item, lighter))
2430 return;
2431
2432 /* Perhaps we should split what we are trying to light on fire?
2433 * I can't see many times when you would want to light multiple
2434 * objects at once.
2435 */
2436
2437 save_throw_object (item, AT_FIRE, who);
2438
2439 if (item->destroyed ()
2440 || ((item->type == LAMP || item->type == TORCH)
2441 && item->glow_radius > 0))
2442 who->statusmsg (format (
2443 "You light the %s with the %s.",
2444 &item->name, &lighter->name));
2445 else
2446 who->failmsg (format (
2447 "You attempt to light the %s with the %s and fail.",
2448 &item->name, &lighter->name));
2449 }
2450 else
2451 who->failmsg ("You need to mark a lightable object.");
2452}
2453
2454/**
2455 * This function generates a cursed effect for cursed lamps and torches.
2456 */
2457static void
2458player_apply_lamp_cursed_effect (object *who, object *op)
2459{
2460 if (op->level)
2461 {
2462 who->failmsg (format (
2463 "The %s was cursed, it explodes in a big fireball!",
2464 &op->name));
2465 create_exploding_ball_at (who, op->level);
2466 }
2467 else
2468 {
2469 who->failmsg (format (
2470 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2471 &op->name));
2472 }
2473
2474 op->destroy ();
2475}
2476
2477/**
2478 * Apply for players and lamps
2479 *
2480 * who - the player
2481 * op - the lamp
2482 */
2483static void
2484player_apply_lamp (object *who, object *op)
2485{
2486 bool switch_on = op->glow_radius ? false : true;
2487
2488 if (switch_on)
2489 {
2490 object *lighter = 0;
2491
2492 if (op->flag [FLAG_IS_LIGHTABLE]
2493 && !(lighter = auto_apply_lighter (who, op, 0)))
2494 return;
2495
2496 if (op->stats.food < 1)
2497 {
2498 if (op->type == LAMP)
2499 who->failmsg (format (
2500 "The %s is out of fuel! "
2501 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2502 &op->name));
2503 else
2504 who->failmsg (format (
2505 "The %s is burnt out! "
2506 "H<Torches and similar items burn out and become worthless.>",
2507 &op->name));
2508 return;
2509 }
2510
2511 if (op->flag [FLAG_CURSED])
2512 {
2513 player_apply_lamp_cursed_effect (who, op);
2514 return;
2515 }
2516
2517 if (lighter)
2518 who->statusmsg (format (
2519 "You light up the %s with the %s.", &op->name, &lighter->name));
2520 else
2521 who->statusmsg (format ("You light up the %s.", &op->name));
2522 }
2523 else
2524 {
2525 if (op->flag [FLAG_CURSED])
2526 {
2527 player_apply_lamp_cursed_effect (who, op);
2528 return;
2529 }
2530
2531 if (op->type == TORCH)
2532 {
2533 if (!op->flag [FLAG_IS_LIGHTABLE])
2534 {
2535 who->statusmsg (format (
2536 "You put out the %s. "
2537 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2538 &op->name, &op->name));
2539 }
2540 else
2541 who->statusmsg (format (
2542 "You put out the %s."
2543 "H<Torches wear out if you put them out.>",
2544 &op->name));
2545 }
2546 else
2547 who->statusmsg (format ("You turn off the %s.", &op->name));
2548 }
2549
2550 apply_lamp (op, switch_on);
2551}
2552
2553void get_animation_from_arch (object *op, arch_ptr a)
2554{
2555 op->animation_id = a->animation_id;
2556 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2557 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2558 op->anim_speed = a->anim_speed;
2559 op->last_anim = 0;
2560 op->state = 0;
2561 op->face = a->face;
2562
2563 if (NUM_ANIMATIONS(op) > 1)
2564 {
2565 SET_ANIMATION(op, 0);
2566 animate_object (op, op->direction);
2567 }
2568 else
2569 update_object (op, UP_OBJ_FACE);
2570}
2571
2572/**
2573 * Apply for LAMPs and TORCHes.
2574 *
2575 * op - the lamp
2576 * switch_on - a flag which says whether the lamp should be switched on or off
2577 */
2578void apply_lamp (object *op, bool switch_on)
2579{
2580 op->set_glow_radius (switch_on ? op->range : 0);
2581 op->set_speed (switch_on ? op->arch->speed : 0);
2582
2583 // torches wear out if you put them out
2584 if (op->type == TORCH && !switch_on)
2585 {
2586 if (op->flag [FLAG_IS_LIGHTABLE])
2587 {
2588 op->stats.food -= (double) op->arch->stats.food / 15;
2589 if (op->stats.food < 0)
2590 op->stats.food = 0;
2591 }
2592 else
2593 op->stats.food = 0;
2594 }
2595
2596 // lamps and torched get worthless when used up
2597 if (op->stats.food <= 0)
2598 op->value = 0;
2599
2600 // FIXME: This is a hack to make the more sane torches and lamps
2601 // still animated ;-/
2602 if (op->other_arch)
2603 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2604
2605 if (object *pl = op->visible_to ())
2606 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2607}
2608
2609/**
2610 * This handles items of type 'transformer'.
2611 * Basically those items, used with a marked item, transform both items into something
2612 * else.
2613 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
2614 * Change information is contained in the 'slaying' field of the marked item.
2615 * The format is as follow: transformer:[number ]yield[;transformer:...].
2616 * This way an item can be transformed in many things, and/or many objects.
2617 * The 'slaying' field for transformer is used as verb for the action.
2618 */
2619static void
2620apply_item_transformer (object *pl, object *transformer)
2621{
2622 object *marked;
2623 object *new_item;
2624 char *find;
2625 char *separator;
2626 int yield;
2627 char got[MAX_BUF];
2628 int len;
2629
2630 if (!pl || !transformer)
2631 return;
2632
2633 marked = find_marked_object (pl);
2634
2635 if (!marked)
2636 {
2637 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
2638 return;
2639 }
2640
2641 if (!marked->slaying)
2642 {
2643 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2644 return;
2645 }
2646
2647 /* check whether they are compatible or not */
2648 find = strstr (&marked->slaying, transformer->arch->archname);
2649 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
2650 {
2651 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2652 return;
2653 }
2654
2655 find += strlen (transformer->arch->archname) + 1;
2656 /* Item can be used, now find how many and what it yields */
2657 if (isdigit (*(find)))
2658 {
2659 yield = atoi (find);
2660 if (yield < 1)
2661 {
2662 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
2663 yield = 1;
2664 }
2665 }
2666 else
2667 yield = 1;
2668
2669 while (isdigit (*find))
2670 find++;
2671
2672 while (*find == ' ')
2673 find++;
2674
2675 memset (got, 0, MAX_BUF);
2676
2677 if ((separator = strchr (find, ';')) != NULL)
2678 len = separator - find;
2679 else
2680 len = strlen (find);
2681
2682 if (len > MAX_BUF - 1)
2683 len = MAX_BUF - 1;
2684
2685 strcpy (got, find);
2686 got[len] = '\0';
2687
2688 /* Now create new item, remove used ones when required. */
2689 new_item = get_archetype (got);
2690 if (!new_item)
2691 {
2692 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
2693 return;
2694 }
2695
2696 new_item->nrof = yield;
2697
2698 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
2699
2700 pl->insert (new_item);
2701 /* Eat up one item */
2702 marked->decrease ();
2703
2704 /* Eat one transformer if needed */
2705 if (transformer->stats.food)
2706 if (--transformer->stats.food == 0)
2707 transformer->decrease ();
2351} 2708}
2352 2709
2353/** 2710/**
2354 * Main apply handler. 2711 * Main apply handler.
2355 * 2712 *
… …
2358 * Return value: 2715 * Return value:
2359 * 0: player or monster can't apply objects of that type 2716 * 0: player or monster can't apply objects of that type
2360 * 1: has been applied, or there was an error applying the object 2717 * 1: has been applied, or there was an error applying the object
2361 * 2: objects of that type can't be applied if not in inventory 2718 * 2: objects of that type can't be applied if not in inventory
2362 * 2719 *
2363 * op is the object that is causing object to be applied, tmp is the object 2720 * who is the object that is causing object to be applied, op is the object
2364 * being applied. 2721 * being applied.
2365 * 2722 *
2366 * aflag is special (always apply/unapply) flags. Nothing is done with 2723 * aflag is special (always apply/unapply) flags. Nothing is done with
2367 * them in this function - they are passed to apply_special 2724 * them in this function - they are passed to apply_special
2368 */ 2725 */
2369int 2726int
2370manual_apply (object *op, object *tmp, int aflag) 2727manual_apply (object *who, object *op, int aflag)
2371{ 2728{
2372 if (tmp->head) 2729 op = op->head_ ();
2373 tmp = tmp->head;
2374 2730
2375 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2731 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2376 { 2732 {
2377 if (op->type == PLAYER) 2733 if (who->type == PLAYER)
2378 { 2734 {
2735 examine (who, op);
2379 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2736 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2380 return 1; 2737 return 1;
2381 } 2738 }
2382 else 2739 else
2383 return 0; /* monsters just skip unpaid items */ 2740 return 0; /* monsters just skip unpaid items */
2384 } 2741 }
2385 2742
2386 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2743 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2387 return RESULT_INT (0); 2744 return RESULT_INT (0);
2388 2745
2389 switch (tmp->type) 2746 switch (op->type)
2390 { 2747 {
2391 case CF_HANDLE: 2748 case T_HANDLE:
2392 op->play_sound (sound_find ("turn_handle")); 2749 who->play_sound (sound_find ("turn_handle"));
2393 op->statusmsg ("You turn the handle."); 2750 who->statusmsg ("You turn the handle.");
2394 tmp->value = tmp->value ? 0 : 1; 2751 op->value = op->value ? 0 : 1;
2395 SET_ANIMATION (tmp, tmp->value); 2752 SET_ANIMATION (op, op->value);
2396 update_object (tmp, UP_OBJ_FACE); 2753 update_object (op, UP_OBJ_FACE);
2397 push_button (tmp); 2754 push_button (op, who);
2398 return 1; 2755 return 1;
2399 2756
2400 case TRIGGER: 2757 case TRIGGER:
2401 if (check_trigger (tmp, op)) 2758 if (check_trigger (op, who, who))
2402 { 2759 {
2403 op->statusmsg ("You turn the handle."); 2760 who->statusmsg ("You turn the handle.");
2404 op->play_sound (sound_find ("turn_handle")); 2761 who->play_sound (sound_find ("turn_handle"));
2405 } 2762 }
2406 else 2763 else
2407 op->failmsg ("The handle doesn't move."); 2764 who->failmsg ("The handle doesn't move.");
2408 2765
2409 return 1; 2766 return 1;
2410 2767
2411 case EXIT: 2768 case EXIT:
2412 if (op->type != PLAYER) 2769 if (who->type != PLAYER)
2413 return 0; 2770 return 0;
2414 2771
2415 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2772 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2416 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2773 who->failmsg (format ("The %s is closed. H<And will stay closed, until somebody fires up the map editor and adds it.>", query_name (op)));
2417 else 2774 else
2418 { 2775 {
2419 /* Don't display messages for random maps. */ 2776 /* Don't display messages for random maps. */
2420 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2777 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2421 op->statusmsg (tmp->msg, NDI_NAVY); 2778 who->statusmsg (op->msg, NDI_NAVY);
2422 2779
2423 op->enter_exit (tmp); 2780 who->enter_exit (op);
2424 } 2781 }
2425 2782
2426 return 1; 2783 return 1;
2427 2784
2428 case INSCRIBABLE: 2785 case INSCRIBABLE:
2429 op->statusmsg (tmp->msg); 2786 who->statusmsg (op->msg);
2430 // maybe show a spell menu to chose from or something like that 2787 // maybe show a spell menu to chose from or something like that
2431 return 1; 2788 return 1;
2432 2789
2433 case SIGN: 2790 case SIGN:
2434 apply_sign (op, tmp, 0); 2791 apply_sign (who, op, 0);
2435 return 1; 2792 return 1;
2436 2793
2437 case BOOK: 2794 case BOOK:
2438 if (op->type == PLAYER) 2795 if (who->type == PLAYER)
2439 { 2796 {
2440 apply_book (op, tmp); 2797 apply_book (who, op);
2441 return 1; 2798 return 1;
2442 } 2799 }
2443 else 2800 else
2444 return 0; 2801 return 0;
2445 2802
2446 case SKILLSCROLL: 2803 case SKILLSCROLL:
2447 if (op->type == PLAYER) 2804 if (who->type == PLAYER)
2448 { 2805 {
2449 apply_skillscroll (op, tmp); 2806 apply_skillscroll (who, op);
2450 return 1; 2807 return 1;
2451 } 2808 }
2452 else 2809 else
2453 return 0; 2810 return 0;
2454 2811
2455 case SPELLBOOK: 2812 case SPELLBOOK:
2456 if (op->type == PLAYER) 2813 if (who->type == PLAYER)
2457 { 2814 {
2458 apply_spellbook (op, tmp); 2815 apply_spellbook (who, op);
2459 return 1; 2816 return 1;
2460 } 2817 }
2461 else 2818 else
2462 return 0; 2819 return 0;
2463 2820
2464 case SCROLL: 2821 case SCROLL:
2465 apply_scroll (op, tmp, 0); 2822 apply_scroll (who, op, 0);
2466 return 1; 2823 return 1;
2467 2824
2468 case POTION: 2825 case POTION:
2469 apply_potion (op, tmp); 2826 apply_potion (who, op);
2470 return 1; 2827 return 1;
2471 2828
2472 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2829 /* Eneq(@csd.uu.se): Handle apply on containers. */
2473 //TODO: remove, as it is unsed? 2830 //TODO: remove, as it is unsed?
2474 case CLOSE_CON: 2831 case CLOSE_CON:
2475 apply_container (op, tmp->env); 2832 apply_container (who, op->env);
2476 return 1; 2833 return 1;
2477 2834
2478 case CONTAINER: 2835 case CONTAINER:
2479 apply_container (op, tmp); 2836 apply_container (who, op);
2480 return 1; 2837 return 1;
2481 2838
2482 case TREASURE: 2839 case TREASURE:
2483 if (op->type == PLAYER) 2840 if (who->type == PLAYER)
2484 { 2841 {
2485 apply_treasure (op, tmp); 2842 apply_treasure (who, op);
2486 return 1; 2843 return 1;
2487 } 2844 }
2488 else 2845 else
2489 return 0; 2846 return 0;
2847
2848 case LAMP:
2849 case TORCH:
2850 player_apply_lamp (who, op);
2851 return 1;
2490 2852
2491 case WEAPON: 2853 case WEAPON:
2492 case ARMOUR: 2854 case ARMOUR:
2493 case BOOTS: 2855 case BOOTS:
2494 case GLOVES: 2856 case GLOVES:
… …
2502 case WAND: 2864 case WAND:
2503 case ROD: 2865 case ROD:
2504 case HORN: 2866 case HORN:
2505 case SKILL: 2867 case SKILL:
2506 case BOW: 2868 case BOW:
2507 case LAMP:
2508 case BUILDER: 2869 case BUILDER:
2509 case SKILL_TOOL: 2870 case SKILL_TOOL:
2510 if (tmp->env != op) 2871 if (op->env != who)
2511 return 2; /* not in inventory */ 2872 return 2; /* not in inventory */
2512 2873
2513 apply_special (op, tmp, aflag); 2874 apply_special (who, op, aflag);
2514 return 1; 2875 return 1;
2515 2876
2516 case DRINK: 2877 case DRINK:
2517 case FOOD: 2878 case FOOD:
2518 case FLESH: 2879 case FLESH:
2519 apply_food (op, tmp); 2880 apply_food (who, op);
2520 return 1; 2881 return 1;
2521 2882
2522 case POISON: 2883 case POISON:
2523 apply_poison (op, tmp); 2884 apply_poison (who, op);
2524 return 1; 2885 return 1;
2525 2886
2526 case SAVEBED: 2887 case SAVEBED:
2527 return 1; 2888 return 1;
2528 2889
2529 case ARMOUR_IMPROVER: 2890 case ARMOUR_IMPROVER:
2530 if (op->type == PLAYER) 2891 if (who->type == PLAYER)
2531 { 2892 {
2532 apply_armour_improver (op, tmp); 2893 apply_armour_improver (who, op);
2533 return 1; 2894 return 1;
2534 } 2895 }
2535 else 2896 else
2536 return 0; 2897 return 0;
2537 2898
2538 case WEAPON_IMPROVER: 2899 case WEAPON_IMPROVER:
2539 check_improve_weapon (op, tmp); 2900 check_improve_weapon (who, op);
2540 return 1; 2901 return 1;
2541 2902
2542 case CLOCK: 2903 case CLOCK:
2543 if (op->type == PLAYER) 2904 if (who->type == PLAYER)
2544 { 2905 {
2545 char buf[MAX_BUF]; 2906 char buf[MAX_BUF];
2546 timeofday_t tod; 2907 timeofday_t tod;
2547 2908
2548 get_tod (&tod); 2909 get_tod (&tod);
2549 op->play_sound (sound_find ("sound_clock")); 2910 who->play_sound (sound_find ("sound_clock"));
2550 op->statusmsg (format ( 2911 who->statusmsg (format (
2551 "It is %d minute%s past %d o'clock %s", 2912 "It is %d minute%s past %d o'clock %s",
2552 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2913 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2553 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2914 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2554 )); 2915 ));
2555 return 1; 2916 return 1;
2556 } 2917 }
2557 else 2918 else
2558 return 0; 2919 return 0;
2559 2920
2560 case MENU: 2921 case MENU:
2561 if (op->type == PLAYER) 2922 if (who->type == PLAYER)
2562 { 2923 {
2563 shop_listing (tmp, op); 2924 shop_listing (op, who);
2564 return 1; 2925 return 1;
2565 } 2926 }
2566 else 2927 else
2567 return 0; 2928 return 0;
2568 2929
2569 case POWER_CRYSTAL: 2930 case POWER_CRYSTAL:
2570 apply_power_crystal (op, tmp); /* see egoitem.c */ 2931 apply_power_crystal (who, op); /* see egoitem.c */
2571 return 1; 2932 return 1;
2572 2933
2573 case LIGHTER: /* for lighting torches/lanterns/etc */ 2934 case LIGHTER: /* for lighting torches/lanterns/etc */
2574 if (op->type == PLAYER) 2935 if (who->type == PLAYER)
2575 { 2936 {
2576 apply_lighter (op, tmp); 2937 apply_lighter (who, op);
2577 return 1; 2938 return 1;
2578 } 2939 }
2579 else 2940 else
2580 return 0; 2941 return 0;
2581 2942
2582 case ITEM_TRANSFORMER: 2943 case ITEM_TRANSFORMER:
2583 apply_item_transformer (op, tmp); 2944 apply_item_transformer (who, op);
2584 return 1; 2945 return 1;
2585 2946
2586 default: 2947 default:
2587 return 0; 2948 return 0;
2588 } 2949 }
2589} 2950}
2590
2591 2951
2592/* quiet suppresses the "don't know how to apply" and "you must get it first" 2952/* quiet suppresses the "don't know how to apply" and "you must get it first"
2593 * messages as needed by player_apply_below(). But there can still be 2953 * messages as needed by player_apply_below(). But there can still be
2594 * "but you are floating high above the ground" messages. 2954 * "but you are floating high above the ground" messages.
2595 * 2955 *
2596 * Same return value as apply() function. 2956 * Same return value as apply() function.
2597 */ 2957 */
2598int 2958int
2599player_apply (object *pl, object *op, int aflag, int quiet) 2959player_apply (object *pl, object *op, int aflag, int quiet)
2600{ 2960{
2601 int tmp;
2602
2603 if (op->env && (pl->move_type & MOVE_FLYING)) 2961 if (!op->env && (pl->move_type & MOVE_FLYING))
2604 { 2962 {
2605 /* player is flying and applying object not in inventory */ 2963 /* player is flying and applying object not in inventory */
2606 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2964 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2607 { 2965 {
2608 op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2966 pl->failmsg ("But you are floating high above the ground! "
2967 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2968 "or waiting till the levitation effect wears off.>");
2609 return 0; 2969 return 0;
2610 } 2970 }
2611 } 2971 }
2612 2972
2613 pl->contr->last_used = op; 2973 pl->contr->last_used = op;
2614 2974
2615 tmp = manual_apply (pl, op, aflag); 2975 int tmp = manual_apply (pl, op, aflag);
2976
2616 if (!quiet) 2977 if (!quiet)
2617 { 2978 {
2618 if (tmp == 0) 2979 if (tmp == 0)
2619 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2980 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2620 else if (tmp == 2) 2981 else if (tmp == 2)
2621 op->failmsg ("You must get it first!\n"); 2982 pl->failmsg ("You must get it first!\n");
2622 } 2983 }
2623 2984
2624 return tmp; 2985 return tmp;
2625} 2986}
2626 2987
… …
2640 * we don't use a corrupt pointer for the next object, so we get the 3001 * we don't use a corrupt pointer for the next object, so we get the
2641 * next object in the stack before applying. This is can only be a 3002 * next object in the stack before applying. This is can only be a
2642 * problem if player_apply() has a bug in that it uses the object but does 3003 * problem if player_apply() has a bug in that it uses the object but does
2643 * not return a proper value. 3004 * not return a proper value.
2644 */ 3005 */
2645 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next) 3006 for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
2646 { 3007 {
2647 next = tmp->below; 3008 next = tmp->below;
2648 3009
2649 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3010 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2650 floors++; 3011 floors++;
… …
2655 * person moving on it, also activate. Added code to make it 3016 * person moving on it, also activate. Added code to make it
2656 * so that at least one of players movement types be that which 3017 * so that at least one of players movement types be that which
2657 * the item needs. 3018 * the item needs.
2658 */ 3019 */
2659 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 3020 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2660 {
2661 if (player_apply (pl, tmp, 0, 1) == 1) 3021 if (player_apply (pl, tmp, 0, 1) == 1)
2662 return; 3022 return;
2663 } 3023
2664 if (floors >= 2) 3024 if (floors >= 2)
2665 return; /* process at most two floor objects */ 3025 return; /* process at most two floor objects */
2666 } 3026 }
2667} 3027}
2668 3028
… …
2712 break; 3072 break;
2713 3073
2714 case SKILL: 3074 case SKILL:
2715 if (who->contr) 3075 if (who->contr)
2716 { 3076 {
3077 if (IS_COMBAT_SKILL (op->subtype))
3078 who->change_weapon (who->contr->combat_ob = 0);
3079 else if (IS_RANGED_SKILL (op->subtype))
3080 who->change_weapon (who->contr->ranged_ob = 0);
3081
2717 if (!op->invisible) 3082 if (op->invisible)
3083 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
3084 else
2718 who->statusmsg (format ("You stop using the %s.", query_name (op))); 3085 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2719 else
2720 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2721 } 3086 }
2722 3087
2723 change_abil (who, op); 3088 change_abil (who, op);
2724 CLEAR_FLAG (who, FLAG_READY_SKILL); 3089 CLEAR_FLAG (who, FLAG_READY_SKILL);
2725 break; 3090 break;
… …
2736 case CLOAK: 3101 case CLOAK:
2737 who->statusmsg (format ("You unwear %s.", query_name (op))); 3102 who->statusmsg (format ("You unwear %s.", query_name (op)));
2738 change_abil (who, op); 3103 change_abil (who, op);
2739 break; 3104 break;
2740 3105
2741 case LAMP:
2742 {
2743 who->statusmsg (format ("You turn off your %s.", &op->name));
2744
2745 object *tmp2 = arch_to_object (op->other_arch);
2746 tmp2->x = op->x;
2747 tmp2->y = op->y;
2748 tmp2->map = op->map;
2749 tmp2->below = op->below;
2750 tmp2->above = op->above;
2751 tmp2->stats.food = op->stats.food;
2752 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2753
2754 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2755 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2756
2757 if (who->contr)
2758 esrv_del_item (who->contr, op->count);
2759
2760 op->destroy ();
2761 insert_ob_in_ob (tmp2, who);
2762 who->update_stats ();
2763
2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2765 {
2766 if (who->contr)
2767 {
2768 who->failmsg ("Oops, it feels deadly cold!");
2769 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2770 }
2771 }
2772
2773 if (who->contr)
2774 esrv_send_item (who, tmp2);
2775 }
2776
2777 return 1; /* otherwise, an attempt to drop causes problems */
2778
2779 case BOW: 3106 case BOW:
2780 case WAND: 3107 case WAND:
2781 case ROD: 3108 case ROD:
2782 case HORN: 3109 case HORN:
2783 if (player *pl = who->contr) 3110 if (player *pl = who->contr)
… …
2810 default: 3137 default:
2811 who->statusmsg (format ("You unapply %s.", query_name (op))); 3138 who->statusmsg (format ("You unapply %s.", query_name (op)));
2812 break; 3139 break;
2813 } 3140 }
2814 3141
3142 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
3143 if (object *pl = op->visible_to ())
3144 esrv_send_item (pl, op);
3145
2815 who->update_stats (); 3146 who->update_stats ();
2816
2817 if (!(aflags & AP_NO_MERGE))
2818 {
2819 object *tmp = merge_ob (op, 0);
2820
2821 if (who->contr)
2822 {
2823 if (tmp)
2824 { /* it was merged */
2825 esrv_del_item (who->contr, op->count);
2826 op = tmp;
2827 }
2828
2829 esrv_send_item (who, op);
2830 }
2831 }
2832 3147
2833 return 0; 3148 return 0;
2834} 3149}
2835 3150
2836/** 3151/**
… …
2874#define CANNOT_REMOVE_CURSED \ 3189#define CANNOT_REMOVE_CURSED \
2875 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \ 3190 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2876 "Praying over an altar, scrolls of remove curse/damnation, " \ 3191 "Praying over an altar, scrolls of remove curse/damnation, " \
2877 "priests or even other players might help.>" 3192 "priests or even other players might help.>"
2878 3193
2879int 3194static int
2880unapply_for_ob (object *who, object *op, int aflags) 3195unapply_for_ob (object *who, object *op, int aflags)
2881{ 3196{
2882 if (op->is_range ()) 3197 if (op->is_range ())
2883 for (object *tmp = who->inv; tmp; tmp = tmp->below) 3198 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2884 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ()) 3199 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
… …
3134 return 1; 3449 return 1;
3135 } 3450 }
3136 3451
3137 return unapply_special (who, op, aflags); 3452 return unapply_special (who, op, aflags);
3138 } 3453 }
3139
3140 if (basic_flag == AP_UNAPPLY) 3454 else if (basic_flag == AP_UNAPPLY)
3141 return 0; 3455 return 0;
3142 3456
3143 // if the item is combat/ranged, wield the relevant slot first 3457 // if the item is combat/ranged, wield the relevant slot first
3144 // to resolve conflicts. 3458 // to resolve conflicts.
3145 if (player *pl = who->contr) 3459 if (player *pl = who->contr)
… …
3203 * skill so that the dam and wc get updated 3517 * skill so that the dam and wc get updated
3204 */ 3518 */
3205 who->change_skill (skop); 3519 who->change_skill (skop);
3206 } 3520 }
3207 3521
3208 if (who->type == PLAYER 3522 if (!check_item_power (who, op->item_power))
3209 && op->item_power
3210 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3211 { 3523 {
3212 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3524 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3213 return 1; 3525 return 1;
3214 } 3526 }
3215 3527
3216 /* Ok. We are now at the state where we can apply the new object. 3528 /* Ok. We are now at the state where we can apply the new object.
3217 * Note that we don't have the checks for can_use_... 3529 * Note that we don't have the checks for can_use_...
3218 * below - that is already taken care of by can_apply_object. 3530 * below - that is already taken care of by can_apply_object.
3219 */ 3531 */
3220 if (op->nrof > 1) 3532 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3221 tmp = get_split_ob (op, op->nrof - 1);
3222 else
3223 tmp = 0;
3224 3533
3225 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3534 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3226 return RESULT_INT (0); 3535 return RESULT_INT (0);
3227 3536
3228 switch (op->type) 3537 switch (op->type)
3229 { 3538 {
3230 case WEAPON: 3539 case WEAPON:
3231 if (!check_weapon_power (who, op->last_eat))
3232 {
3233 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER);
3234
3235 if (tmp)
3236 insert_ob_in_ob (tmp, who);
3237
3238 return 1;
3239 }
3240
3241 //TODO: this obviously fails for players using a shorter prefix 3540 //TODO: this obviously fails for players using a shorter prefix
3242 // i.e. "R" can use Ragnarok's sword. 3541 // i.e. "R" can use Ragnarok's sword.
3243 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3542 if (op->level && !op->name.starts_with (who->name))
3244 { 3543 {
3245 /* if the weapon does not have the name as the character, can't use it. */ 3544 /* if the weapon does not have the name as the character, can't use it. */
3246 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3545 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3247 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3546 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3248 3547
… …
3282 case AMULET: 3581 case AMULET:
3283 SET_FLAG (op, FLAG_APPLIED); 3582 SET_FLAG (op, FLAG_APPLIED);
3284 who->statusmsg (format ("You wear %s.", query_name (op))); 3583 who->statusmsg (format ("You wear %s.", query_name (op)));
3285 change_abil (who, op); 3584 change_abil (who, op);
3286 break; 3585 break;
3287
3288 case LAMP:
3289 if (op->stats.food < 1)
3290 {
3291 who->failmsg (format (
3292 "Your %s is out of fuel! "
3293 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3294 &op->name
3295 ));
3296 return 1;
3297 }
3298
3299 who->statusmsg (format ("You turn on your %s.", &op->name));
3300
3301 tmp2 = arch_to_object (op->other_arch);
3302 tmp2->stats.food = op->stats.food;
3303 SET_FLAG (tmp2, FLAG_APPLIED);
3304
3305 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3306 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3307
3308 insert_ob_in_ob (tmp2, who);
3309
3310 /* Remove the old lantern */
3311 if (who->type == PLAYER)
3312 esrv_del_item (who->contr, op->count);
3313
3314 op->destroy ();
3315
3316 /* insert the portion that was split off */
3317 if (tmp)
3318 {
3319 insert_ob_in_ob (tmp, who);
3320 if (who->type == PLAYER)
3321 esrv_send_item (who, tmp);
3322 }
3323
3324 who->update_stats ();
3325
3326 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3327 if (who->type == PLAYER)
3328 {
3329 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3330 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3331 }
3332
3333 if (who->type == PLAYER)
3334 esrv_send_item (who, tmp2);
3335
3336 return 0;
3337 3586
3338 case SKILL_TOOL: 3587 case SKILL_TOOL:
3339 // applying a skill tool also readies the skill 3588 // applying a skill tool also readies the skill
3340 SET_FLAG (op, FLAG_APPLIED); 3589 SET_FLAG (op, FLAG_APPLIED);
3341 3590
… …
3421 } 3670 }
3422 3671
3423 break; 3672 break;
3424 3673
3425 case BOW: 3674 case BOW:
3426 if (!check_weapon_power (who, op->last_eat)) 3675 if (op->level && !op->name.starts_with (who->name))
3427 {
3428 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3429
3430 if (tmp)
3431 insert_ob_in_ob (tmp, who);
3432
3433 return 1;
3434 }
3435
3436 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3437 { 3676 {
3438 who->failmsg ("The weapon does not recognize you as its owner. " 3677 who->failmsg ("The weapon does not recognize you as its owner. "
3439 "H<Its name indicates that it belongs to somebody else.>"); 3678 "H<Its name indicates that it belongs to somebody else.>");
3440 if (tmp) 3679 if (tmp)
3441 insert_ob_in_ob (tmp, who); 3680 insert_ob_in_ob (tmp, who);
… …
3499 } 3738 }
3500 3739
3501 SET_FLAG (op, FLAG_APPLIED); 3740 SET_FLAG (op, FLAG_APPLIED);
3502 3741
3503 if (tmp) 3742 if (tmp)
3504 tmp = insert_ob_in_ob (tmp, who); 3743 who->insert (tmp);
3505 3744
3506 who->update_stats (); 3745 who->update_stats ();
3507 3746
3508 /* We exclude spell casting objects. The fire code will set the 3747 /* We exclude spell casting objects. The fire code will set the
3509 * been applied flag when they are used - until that point, 3748 * been applied flag when they are used - until that point,
… …
3515 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3754 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3516 if (who->type == PLAYER) 3755 if (who->type == PLAYER)
3517 { 3756 {
3518 who->failmsg ( 3757 who->failmsg (
3519 "Oops, it feels deadly cold! " 3758 "Oops, it feels deadly cold! "
3520 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3759 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3521 ); 3760 );
3522 SET_FLAG (op, FLAG_KNOWN_CURSED); 3761 SET_FLAG (op, FLAG_KNOWN_CURSED);
3523 } 3762 }
3524 3763
3525 if (who->type == PLAYER) 3764 if (object *pl = op->visible_to ())
3526 {
3527 /* if multiple objects were applied, update both slots */
3528 if (tmp)
3529 esrv_send_item (who, tmp);
3530
3531 esrv_send_item (who, op); 3765 esrv_send_item (pl, op);
3532 }
3533 3766
3534 return 0; 3767 return 0;
3535}
3536
3537int
3538monster_apply_special (object *who, object *op, int aflags)
3539{
3540 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3541 return 1;
3542
3543 return apply_special (who, op, aflags);
3544} 3768}
3545 3769
3546/** 3770/**
3547 * Map was just loaded, handle op's initialisation. 3771 * Map was just loaded, handle op's initialisation.
3548 * 3772 *
… …
3551int 3775int
3552auto_apply (object *op) 3776auto_apply (object *op)
3553{ 3777{
3554 object *tmp = NULL, *tmp2; 3778 object *tmp = NULL, *tmp2;
3555 int i; 3779 int i;
3780
3781 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3556 3782
3557 switch (op->type) 3783 switch (op->type)
3558 { 3784 {
3559 case SHOP_FLOOR: 3785 case SHOP_FLOOR:
3560 if (!op->has_random_items ()) 3786 if (!op->has_random_items ())
… …
3562 3788
3563 do 3789 do
3564 { 3790 {
3565 i = 10; /* let's give it 10 tries */ 3791 i = 10; /* let's give it 10 tries */
3566 while ((tmp = generate_treasure (op->randomitems, 3792 while ((tmp = generate_treasure (op->randomitems,
3567 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3793 op->stats.exp
3794 ? (int) op->stats.exp
3795 : max (op->map->difficulty, 5)))
3796 == NULL && --i);
3797
3568 if (tmp == NULL) 3798 if (tmp == NULL)
3569 return 0; 3799 return 0;
3800
3570 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3801 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3571 { 3802 {
3572 tmp->destroy (); 3803 tmp->destroy ();
3573 tmp = NULL; 3804 tmp = NULL;
3574 } 3805 }
… …
3577 3808
3578 tmp->x = op->x; 3809 tmp->x = op->x;
3579 tmp->y = op->y; 3810 tmp->y = op->y;
3580 SET_FLAG (tmp, FLAG_UNPAID); 3811 SET_FLAG (tmp, FLAG_UNPAID);
3581 insert_ob_in_map (tmp, op->map, NULL, 0); 3812 insert_ob_in_map (tmp, op->map, NULL, 0);
3582 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3583 identify (tmp); 3813 identify (tmp);
3584 break; 3814 break;
3585 3815
3586 case TREASURE: 3816 case TREASURE:
3587 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3817 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3594 /* If we generated an object and put it in this object inventory, 3824 /* If we generated an object and put it in this object inventory,
3595 * move it to the parent object as the current object is about 3825 * move it to the parent object as the current object is about
3596 * to disappear. An example of this item is the random_* stuff 3826 * to disappear. An example of this item is the random_* stuff
3597 * that is put inside other objects. 3827 * that is put inside other objects.
3598 */ 3828 */
3599 for (tmp = op->inv; tmp; tmp = tmp2)
3600 {
3601 tmp2 = tmp->below;
3602 tmp->remove ();
3603
3604 if (op->env) 3829 if (op->env)
3605 insert_ob_in_ob (tmp, op->env); 3830 while (op->inv)
3606 else 3831 op->env->insert (op->inv);
3607 tmp->destroy ();
3608 }
3609 3832
3610 op->destroy (); 3833 op->destroy ();
3611 break; 3834 break;
3612 } 3835 }
3613 return tmp ? 1 : 0; 3836
3837 return !!tmp;
3614} 3838}
3615 3839
3616/** 3840/**
3617 * fix_auto_apply goes through the entire map every time a map 3841 * fix_auto_apply goes through the entire map every time a map
3618 * is loaded or swapped in and performs special actions for 3842 * is loaded or swapped in and performs special actions for
… …
3632 3856
3633 if (tmp->inv) 3857 if (tmp->inv)
3634 { 3858 {
3635 object *invtmp, *invnext; 3859 object *invtmp, *invnext;
3636 3860
3637 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3861 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3638 { 3862 {
3639 invnext = invtmp->below; 3863 invnext = invtmp->below;
3640 3864
3641 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3865 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3642 auto_apply (invtmp); 3866 auto_apply (invtmp);
3643 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3867 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3644 { 3868 {
3645 while ((invtmp->stats.hp--) > 0) 3869 while (invtmp->stats.hp-- > 0)
3646 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3870 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3647 3871
3648 invtmp->randomitems = NULL; 3872 invtmp->randomitems = NULL;
3649 } 3873 }
3650 else if (invtmp && invtmp->arch 3874 else if (invtmp && invtmp->arch
… …
3711 } 3935 }
3712 3936
3713 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3937 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3714 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3938 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3715 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3939 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3716 check_trigger (tmp, tmp->above); 3940 check_trigger (tmp, tmp->above, tmp->above);
3717} 3941}
3718 3942
3719/** 3943/**
3720 * Handles player eating food that temporarily changes status (resistances, stats). 3944 * Handles player eating food that temporarily changes status (resistances, stats).
3721 * This used to call cast_change_attr(), but 3945 * This used to call cast_change_attr(), but
… …
3726eat_special_food (object *who, object *food) 3950eat_special_food (object *who, object *food)
3727{ 3951{
3728 object *force; 3952 object *force;
3729 int i, did_one = 0; 3953 int i, did_one = 0;
3730 3954
3731 force = get_archetype (FORCE_NAME); 3955 char buf[64];
3956 snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
3957 shstr key (buf);
3732 3958
3733 for (i = 0; i < NUM_STATS; i++)
3734 if (sint8 k = food->stats.stat (i))
3735 {
3736 force->stats.stat (i) = k;
3737 did_one = 1;
3738 }
3739
3740 /* check if we can protect the eater */
3741 for (i = 0; i < NROFATTACKS; i++)
3742 {
3743 if (food->resist[i] > 0)
3744 {
3745 force->resist[i] = food->resist[i] / 2;
3746 did_one = 1;
3747 }
3748 }
3749
3750 if (did_one)
3751 {
3752 force->set_speed (0.1);
3753 /* bigger morsel of food = longer effect time */ 3959 /* bigger morsel of food = longer effect time */
3754 force->duration = food->stats.food / 5; 3960 int duration = TIME2TICK (food->stats.food);
3755 SET_FLAG (force, FLAG_APPLIED); 3961
3756 change_abil (who, force); 3962 if (force = who->force_find (key))
3757 insert_ob_in_ob (force, who); 3963 {
3964 if (duration > abs (force->speed_left / force->speed))
3965 {
3966 new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration));
3967 force->force_set_timer (duration);
3968 }
3969 else
3970 new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
3971
3972 return;
3758 } 3973 }
3759 else 3974 else
3975 {
3976 force = who->force_add (key, duration);
3977 force->name = key;
3978
3979 /* check if the food affects a stat */
3980 for (i = 0; i < NUM_STATS; i++)
3981 if (sint8 k = food->stats.stat (i))
3982 {
3983 force->stats.stat (i) = k;
3984 did_one = 1;
3985 }
3986
3987 /* check if we can protect the eater */
3988 for (i = 0; i < NROFATTACKS; i++)
3989 {
3990 if (food->resist[i] > 0)
3991 {
3992 force->resist[i] = food->resist[i];
3993 did_one = 1;
3994 }
3995 }
3996
3997 if (did_one)
3998 {
3999 new_draw_info_format (NDI_UNIQUE, 0, who, "You are suffused with magical force. H<The effect will last for about %.10g seconds.>", TICK2TIME (duration));
4000
4001 /* make the force take effect and report effects to user */
4002 change_abil (who, force);
4003 }
4004 else
3760 force->destroy (); 4005 force->destroy ();
4006 }
3761 4007
3762 /* check for hp, sp change */ 4008 /* check for hp, sp change */
3763 if (food->stats.hp != 0) 4009 if (food->stats.hp != 0)
3764 { 4010 {
3765 if (QUERY_FLAG (food, FLAG_CURSED)) 4011 if (QUERY_FLAG (food, FLAG_CURSED))
3766 { 4012 {
3767 assign (who->contr->killer, food->name); 4013 who->contr->killer = food;
3768 hit_player (who, food->stats.hp, food, AT_POISON, 1); 4014 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3769 who->failmsg ("Eck!...that was poisonous!"); 4015 who->failmsg ("Eck!...that was poisonous!");
3770 } 4016 }
3771 else 4017 else
3772 { 4018 {
… …
3776 who->failmsg ("Eck!...that was poisonous!"); 4022 who->failmsg ("Eck!...that was poisonous!");
3777 4023
3778 who->stats.hp += food->stats.hp; 4024 who->stats.hp += food->stats.hp;
3779 } 4025 }
3780 } 4026 }
4027
3781 if (food->stats.sp != 0) 4028 if (food->stats.sp != 0)
3782 { 4029 {
3783 if (QUERY_FLAG (food, FLAG_CURSED)) 4030 if (QUERY_FLAG (food, FLAG_CURSED))
3784 { 4031 {
3785 who->failmsg ("You are drained of mana!"); 4032 who->failmsg ("You are drained of mana!");
… …
3794 /* place limit on max sp from food? */ 4041 /* place limit on max sp from food? */
3795 } 4042 }
3796 } 4043 }
3797 4044
3798 who->update_stats (); 4045 who->update_stats ();
3799}
3800
3801/**
3802 * Designed primarily to light torches/lanterns/etc.
3803 * Also burns up burnable material too. First object in the inventory is
3804 * the selected object to "burn". -b.t.
3805 */
3806void
3807apply_lighter (object *who, object *lighter)
3808{
3809 object *item;
3810 int is_player_env = 0;
3811
3812 item = find_marked_object (who);
3813 if (item)
3814 {
3815 if (lighter->last_eat && lighter->stats.food)
3816 { /* lighter gets used up */
3817 /* Split multiple lighters if they're being used up. Otherwise *
3818 * one charge from each would be used up. --DAMN */
3819 if (lighter->nrof > 1)
3820 {
3821 object *oneLighter = lighter->clone ();
3822
3823 lighter->nrof -= 1;
3824 oneLighter->nrof = 1;
3825 oneLighter->stats.food--;
3826 esrv_send_item (who, lighter);
3827 oneLighter = insert_ob_in_ob (oneLighter, who);
3828 esrv_send_item (who, oneLighter);
3829 }
3830 else
3831 lighter->stats.food--;
3832 }
3833 else if (lighter->last_eat)
3834 {
3835 /* no charges left in lighter */
3836 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3837 return;
3838 }
3839
3840 /* Perhaps we should split what we are trying to light on fire?
3841 * I can't see many times when you would want to light multiple
3842 * objects at once.
3843 */
3844
3845 if (who == item->in_player ())
3846 is_player_env = 1;
3847
3848 save_throw_object (item, AT_FIRE, who);
3849
3850 if (item->destroyed ())
3851 {
3852 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3853 /* Need to update the player so that the players glow radius
3854 * gets changed.
3855 */
3856 if (is_player_env)
3857 who->update_stats ();
3858 }
3859 else
3860 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3861 }
3862 else
3863 who->failmsg ("You need to mark a lightable object.");
3864
3865}
3866
3867/**
3868 * op made some mistake with a scroll, this takes care of punishment.
3869 * scroll_failure()- hacked directly from spell_failure
3870 */
3871void
3872scroll_failure (object *op, int failure, int power)
3873{
3874 if (abs (failure / 4) > power)
3875 power = abs (failure / 4); /* set minimum effect */
3876
3877 if (failure <= -1 && failure > -15)
3878 { /* wonder */
3879 object *tmp;
3880
3881 op->failmsg ("Your spell warps!");
3882 tmp = get_archetype (SPELL_WONDER);
3883 cast_wonder (op, op, 0, tmp);
3884 tmp->destroy ();
3885 }
3886 else if (failure <= -15 && failure > -35)
3887 { /* drain mana */
3888 op->failmsg ("Your mana is drained!");
3889 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
3890 if (op->stats.sp < 0)
3891 op->stats.sp = 0;
3892 }
3893 else if (settings.spell_failure_effects == TRUE)
3894 {
3895 if (failure <= -35 && failure > -60)
3896 { /* confusion */
3897 op->failmsg ("The magic recoils on you!");
3898 confuse_player (op, op, power);
3899 }
3900 else if (failure <= -60 && failure > -70)
3901 { /* paralysis */
3902 op->failmsg ("The magic recoils and paralyzes you!");
3903 paralyze_player (op, op, power);
3904 }
3905 else if (failure <= -70 && failure > -80)
3906 { /* blind */
3907 op->failmsg ("The magic recoils on you!");
3908 blind_player (op, op, power);
3909 }
3910 else if (failure <= -80)
3911 { /* blast the immediate area */
3912 object *tmp = get_archetype (LOOSE_MANA);
3913 cast_magic_storm (op, tmp, power);
3914 op->failmsg ("You unleash uncontrolled mana!");
3915 tmp->destroy ();
3916 }
3917 }
3918} 4046}
3919 4047
3920void 4048void
3921apply_changes_to_player (object *pl, object *change) 4049apply_changes_to_player (object *pl, object *change)
3922{ 4050{
… …
3970 } 4098 }
3971 4099
3972 /* insert the randomitems from the change's treasurelist into 4100 /* insert the randomitems from the change's treasurelist into
3973 * the player ref: player.c 4101 * the player ref: player.c
3974 */ 4102 */
3975 if (change->randomitems != NULL) 4103 if (change->randomitems)
3976 give_initial_items (pl, change->randomitems); 4104 give_initial_items (pl, change->randomitems);
3977 4105
3978 /* set up the face, for some races. */ 4106 /* set up the face, for some races. */
3979 4107
3980 /* first, look for the force object banning 4108 /* first, look for the force object banning
3981 * changing the face. Certain races never change face with class. 4109 * changing the face. Certain races never change face with class.
3982 */ 4110 */
3983 for (walk = pl->inv; walk != NULL; walk = walk->below) 4111 for (walk = pl->inv; walk; walk = walk->below)
3984 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4112 if (walk->name == shstr_NOCLASSFACECHANGE)
3985 flag_change_face = 0; 4113 flag_change_face = 0;
3986 4114
3987 if (flag_change_face) 4115 if (flag_change_face)
3988 { 4116 {
3989 pl->animation_id = GET_ANIM_ID (change);
3990 pl->face = change->face; 4117 pl->face = change->face;
3991 4118 pl->animation_id = change->animation_id;
3992 if (QUERY_FLAG (change, FLAG_ANIMATE)) 4119 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3993 SET_FLAG (pl, FLAG_ANIMATE);
3994 else
3995 CLEAR_FLAG (pl, FLAG_ANIMATE);
3996 } 4120 }
3997 4121
3998 /* check the special case of can't use weapons */ 4122 /* check the special case of can't use weapons */
3999 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4123 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
4000 if (!strcmp (change->name, "monk")) 4124 if (change->name == shstr_monk)
4001 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4125 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
4002 4126
4003 break; 4127 break;
4004 } 4128 }
4005 } 4129 }
4006} 4130}
4007 4131
4008/**
4009 * This handles items of type 'transformer'.
4010 * Basically those items, used with a marked item, transform both items into something
4011 * else.
4012 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
4013 * Change information is contained in the 'slaying' field of the marked item.
4014 * The format is as follow: transformer:[number ]yield[;transformer:...].
4015 * This way an item can be transformed in many things, and/or many objects.
4016 * The 'slaying' field for transformer is used as verb for the action.
4017 */
4018void
4019apply_item_transformer (object *pl, object *transformer)
4020{
4021 object *marked;
4022 object *new_item;
4023 char *find;
4024 char *separator;
4025 int yield;
4026 char got[MAX_BUF];
4027 int len;
4028
4029 if (!pl || !transformer)
4030 return;
4031
4032 marked = find_marked_object (pl);
4033
4034 if (!marked)
4035 {
4036 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
4037 return;
4038 }
4039
4040 if (!marked->slaying)
4041 {
4042 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4043 return;
4044 }
4045
4046 /* check whether they are compatible or not */
4047 find = strstr (marked->slaying, transformer->arch->archname);
4048 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4049 {
4050 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4051 return;
4052 }
4053
4054 find += strlen (transformer->arch->archname) + 1;
4055 /* Item can be used, now find how many and what it yields */
4056 if (isdigit (*(find)))
4057 {
4058 yield = atoi (find);
4059 if (yield < 1)
4060 {
4061 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
4062 yield = 1;
4063 }
4064 }
4065 else
4066 yield = 1;
4067
4068 while (isdigit (*find))
4069 find++;
4070
4071 while (*find == ' ')
4072 find++;
4073
4074 memset (got, 0, MAX_BUF);
4075
4076 if ((separator = strchr (find, ';')) != NULL)
4077 len = separator - find;
4078 else
4079 len = strlen (find);
4080
4081 if (len > MAX_BUF - 1)
4082 len = MAX_BUF - 1;
4083
4084 strcpy (got, find);
4085 got[len] = '\0';
4086
4087 /* Now create new item, remove used ones when required. */
4088 new_item = get_archetype (got);
4089 if (!new_item)
4090 {
4091 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
4092 return;
4093 }
4094
4095 new_item->nrof = yield;
4096
4097 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4098
4099 insert_ob_in_ob (new_item, pl);
4100 esrv_send_inventory (pl, pl);
4101 /* Eat up one item */
4102 decrease_ob_nr (marked, 1);
4103
4104 /* Eat one transformer if needed */
4105 if (transformer->stats.food)
4106 if (--transformer->stats.food == 0)
4107 decrease_ob_nr (transformer, 1);
4108}
4109

Diff Legend

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