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.201 by root, Mon Oct 12 14:00:58 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 (ARCH_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))
… …
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 */
405
406bool
407check_item_power (object *who, int item_power)
408{
409 if (who->type == PLAYER
410 && item_power
411 && item_power + who->contr->item_power > settings.item_power_factor * who->level)
412 return false;
413 else
414 return true;
415}
416
417/**
427 * This returns the sum of nrof of item (arch name). 418 * This returns the sum of nrof of item (arch name).
428 */ 419 */
429static int 420static int
430check_item (object *op, const char *item) 421check_item (object *op, shstr_cmp item)
431{ 422{
432 int count = 0; 423 int count = 0;
433 424
434 if (!item) 425 if (!item)
435 return 0; 426 return 0;
436 427
437 for (op = op->below; op; op = op->below) 428 for (op = op->below; op; op = op->below)
438 {
439 if (strcmp (op->arch->archname, item) == 0) 429 if (op->arch->archname == item)
440 {
441 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 430 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
442 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 431 && /* 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; 432 count += op->number_of ();
448 }
449 }
450 }
451 433
452 return count; 434 return count;
453} 435}
454 436
455/** 437/**
… …
457 * op is typically the player, which is only 439 * op is typically the player, which is only
458 * really used to determine what space to look at. 440 * really used to determine what space to look at.
459 * Modified to only eat 'nrof' of objects. 441 * Modified to only eat 'nrof' of objects.
460 */ 442 */
461static void 443static void
462eat_item (object *op, const char *item, uint32 nrof) 444eat_item (object *op, shstr_cmp item, uint32 nrof)
463{ 445{
464 object *prev; 446 object *prev;
465 447
466 prev = op; 448 prev = op;
467 op = op->below; 449 op = op->below;
468 450
469 while (op) 451 while (op)
470 { 452 {
471 if (strcmp (op->arch->archname, item) == 0) 453 if (op->arch->archname == item)
472 { 454 {
473 if (op->nrof >= nrof) 455 if (op->nrof >= nrof)
474 { 456 {
475 decrease_ob_nr (op, nrof); 457 op->decrease (nrof);
476 return; 458 return;
477 } 459 }
478 else 460 else
479 { 461 {
480 decrease_ob_nr (op, op->nrof); 462 op->decrease (nrof);
481 nrof -= op->nrof; 463 nrof -= op->nrof;
482 } 464 }
483 465
484 op = prev; 466 op = prev;
485 } 467 }
… …
488 op = op->below; 470 op = op->below;
489 } 471 }
490} 472}
491 473
492/** 474/**
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. 475 * 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. 476 * Will display a message if none found, and 1 if improver->slaying is NULL.
546 */ 477 */
547static int 478static int
548check_sacrifice (object *op, const object *improver) 479check_sacrifice (object *op, const object *improver)
… …
570static int 501static int
571improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname) 502improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
572{ 503{
573 stat += sacrifice_count; 504 stat += sacrifice_count;
574 weapon->last_eat++; 505 weapon->last_eat++;
575 decrease_ob (improver); 506 improver->decrease ();
576 507
577 /* So it updates the players stats and the window */ 508 /* So it updates the players stats and the window */
578 op->update_stats (); 509 op->update_stats ();
579 510
580 op->statusmsg (format ( 511 op->statusmsg (format (
… …
625 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 556 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
626 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 557 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
627 weapon->stats.exp || /* speed */ 558 weapon->stats.exp || /* speed */
628 weapon->stats.ac) /* AC - only taifu's I think */ 559 weapon->stats.ac) /* AC - only taifu's I think */
629 { 560 {
630 op->failmsg ("You cannot prepare magic weapons."); 561 op->failmsg ("You cannot prepare magic weapons. "
562 "H<A weapon is considered magical if it changes regeneration, "
563 "speed or ac, or has other protections.>");
631 return 0; 564 return 0;
632 } 565 }
633 566
634 sacrifice_count = check_sacrifice (op, improver); 567 sacrifice_count = check_sacrifice (op, improver);
635 if (sacrifice_count <= 0) 568 if (sacrifice_count <= 0)
… …
646 579
647 sprintf (buf, "%s's %s", &op->name, &weapon->name); 580 sprintf (buf, "%s's %s", &op->name, &weapon->name);
648 weapon->name = weapon->name_pl = buf; 581 weapon->name = weapon->name_pl = buf;
649 weapon->nrof = 0; /* prevents preparing n weapons in the same 582 weapon->nrof = 0; /* prevents preparing n weapons in the same
650 slot at once! */ 583 slot at once! */
651 decrease_ob (improver); 584 improver->decrease ();
652 weapon->last_eat = 0; 585 weapon->last_eat = 0;
653 return 1; 586 return 1;
654} 587}
655
656 588
657/** 589/**
658 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 590 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
659 * This is the new improve weapon code. 591 * This is the new improve weapon code.
660 * Returns 0 if it was not able to work for some reason. 592 * Returns 0 if it was not able to work for some reason.
… …
673 if (improver->stats.sp == IMPROVE_PREPARE) 605 if (improver->stats.sp == IMPROVE_PREPARE)
674 return prepare_weapon (op, improver, weapon); 606 return prepare_weapon (op, improver, weapon);
675 607
676 if (weapon->level == 0) 608 if (weapon->level == 0)
677 { 609 {
678 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>"); 610 op->failmsg (
611 "This weapon has not been prepared."
612 " H<You first have to prepare a weapon with a prepare weapon scroll.>");
679 return 0; 613 return 0;
680 } 614 }
681 615
682 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 616 if (weapon->last_eat >= weapon->level // improvements used up
617 || weapon->item_power >= 100) // or item_power >= arbitrary limit of 100
683 { 618 {
684 op->failmsg ("This weapon cannot be improved any more."); 619 op->failmsg ("This weapon cannot be improved any more.");
685 return 0; 620 return 0;
686 } 621 }
687 622
688 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 623 if (QUERY_FLAG (weapon, FLAG_APPLIED)
624 && !check_item_power (op, weapon->item_power + 1))
689 { 625 {
690 op->failmsg ("Improving the weapon will make it too " 626 op->failmsg ("Improving the weapon will make it too "
691 "powerful for you to use. Unready it if you " 627 "powerful for you to use. Unready it if you "
692 "really want to improve it."); 628 "really want to improve it.");
693 return 0; 629 return 0;
… …
704 weapon->weight += 5000; /* 5 KG's */ 640 weapon->weight += 5000; /* 5 KG's */
705 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam)); 641 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
706 weapon->last_eat++; 642 weapon->last_eat++;
707 643
708 weapon->item_power++; 644 weapon->item_power++;
709 decrease_ob (improver); 645 improver->decrease ();
710 return 1; 646 return 1;
711 } 647 }
712 648
713 if (improver->stats.sp == IMPROVE_WEIGHT) 649 if (improver->stats.sp == IMPROVE_WEIGHT)
714 { 650 {
… …
718 weapon->weight = 1; 654 weapon->weight = 1;
719 655
720 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0)); 656 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
721 weapon->last_eat++; 657 weapon->last_eat++;
722 weapon->item_power++; 658 weapon->item_power++;
723 decrease_ob (improver); 659 improver->decrease ();
724 return 1; 660 return 1;
725 } 661 }
662
726 if (improver->stats.sp == IMPROVE_ENCHANT) 663 if (improver->stats.sp == IMPROVE_ENCHANT)
727 { 664 {
728 weapon->magic++; 665 weapon->magic++;
729 weapon->last_eat++; 666 weapon->last_eat++;
730 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic)); 667 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
731 decrease_ob (improver); 668 improver->decrease ();
732 weapon->item_power++; 669 weapon->item_power++;
733 return 1; 670 return 1;
734 } 671 }
735 672
736 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 673 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
785 op->failmsg ("Something blocks the magic of the scroll!"); 722 op->failmsg ("Something blocks the magic of the scroll!");
786 return 0; 723 return 0;
787 } 724 }
788 725
789 otmp = find_marked_object (op); 726 otmp = find_marked_object (op);
727
790 if (!otmp) 728 if (!otmp)
791 { 729 {
792 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>"); 730 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; 731 return 0;
794 } 732 }
… …
836 if (armour->magic >= settings.armor_max_enchant) 774 if (armour->magic >= settings.armor_max_enchant)
837 { 775 {
838 op->failmsg ("This armour can not be enchanted any further!"); 776 op->failmsg ("This armour can not be enchanted any further!");
839 return 0; 777 return 0;
840 } 778 }
779
841 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 780 /* 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. 781 * 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 782 * Note - maybe add scrolls which make the random artifact versions (eg, armour
844 * of gnarg and what not?) 783 * of gnarg and what not?)
845 */ 784 */
… …
847 { 786 {
848 op->failmsg ("This armour will not accept further enchantment."); 787 op->failmsg ("This armour will not accept further enchantment.");
849 return 0; 788 return 0;
850 } 789 }
851 790
852 /* Split objects if needed. Can't insert tmp until the 791 /* Split objects if needed. Can't insert tmp until the
853 * end of this function - otherwise it will just re-merge. 792 * end of this function - otherwise it will just re-merge.
854 */ 793 */
855 if (armour->nrof > 1) 794 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 795
860 armour->magic++; 796 armour->magic++;
861 797
862 if (!settings.armor_speed_linear) 798 if (!settings.armor_speed_linear)
863 { 799 {
… …
900 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic); 836 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
901 837
902 if (op->type == PLAYER) 838 if (op->type == PLAYER)
903 { 839 {
904 esrv_send_item (op, armour); 840 esrv_send_item (op, armour);
841
905 if (QUERY_FLAG (armour, FLAG_APPLIED)) 842 if (QUERY_FLAG (armour, FLAG_APPLIED))
906 op->update_stats (); 843 op->update_stats ();
907 } 844 }
908 845
909 decrease_ob (improver); 846 improver->decrease ();
910 847
911 if (tmp) 848 if (tmp)
912 { 849 op->insert (tmp);
913 insert_ob_in_ob (tmp, op);
914 esrv_send_item (op, tmp);
915 }
916 850
917 return 1; 851 return 1;
918} 852}
919 853
920/* 854/*
921 * convert_item() returns 1 if anything was converted, 0 if the item was not 855 * 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. 856 * what the converter wants, -1 if the converter is broken.
923 */ 857 *
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. 858 * Takes one type of items and makes another.
930 * converter is the object that is doing the conversion. 859 * converter is the object that is doing the conversion.
931 * item is the object that triggered the converter - if it is not 860 * item is the object that triggered the converter - if it is not
932 * what the converter wants, this will not do anything. 861 * what the converter wants, this will not do anything.
933 */ 862 */
934int 863int
935convert_item (object *item, object *converter) 864convert_item (object *item, object *converter)
936{ 865{
937 int nr = 0;
938 uint32 price_in; 866 sint64 nr, price_in;
867
868 if (item->flag [FLAG_UNPAID])
869 return 0;
870
871 shstr conv_from = converter->slaying;
872 archetype *conv_to = converter->other_arch;
873 sint64 need = converter->stats.food;
874 sint64 give = converter->stats.sp;
939 875
940 /* We make some assumptions - we assume if it takes money as it type, 876 /* 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 877 * it wants some amount. We don't make change (ie, if something costs
942 * 3 gp and player drops a platinum, tough luck) 878 * 3 gp and player drops a platinum, tough luck)
943 */ 879 */
944 if (CONV_FROM (converter) == shstr_money) 880 if (conv_from == shstr_money)
945 { 881 {
946 if (item->type != MONEY) 882 if (item->type != MONEY)
947 return 0; 883 return 0;
948 884
949 nr = (item->nrof * item->value) / CONV_NEED (converter); 885 nr = sint64 (item->nrof) * item->value / need;
950 if (!nr) 886 if (!nr)
951 return 0; 887 return 0;
952 888
953 converter->play_sound (sound_find ("shop_buy")); 889 converter->play_sound (sound_find ("shop_buy"));
954 890
955 int cost = nr * CONV_NEED (converter) / item->value; 891 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 892
960 decrease_ob_nr (item, cost); 893 item->decrease (cost);
961 894
962 price_in = cost * item->value; 895 price_in = cost * item->value;
963 } 896 }
964 else 897 else
965 { 898 {
966 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname || 899 if (item->type == PLAYER
967 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 900 || conv_from != item->arch->archname
901 || (need && need > (uint16) item->nrof))
968 return 0; 902 return 0;
969 903
970 converter->play_sound (sound_find ("convert_item")); 904 converter->play_sound (sound_find ("convert_item"));
971 905
972 if (CONV_NEED (converter)) 906 if (need)
973 { 907 {
974 nr = item->nrof / CONV_NEED (converter); 908 nr = sint64 (item->nrof) / need;
975 decrease_ob_nr (item, nr * CONV_NEED (converter)); 909 item->decrease (nr * need);
976 price_in = nr * CONV_NEED (converter) * item->value; 910 price_in = nr * need * item->value;
977 } 911 }
978 else 912 else
979 { 913 {
980 price_in = item->value; 914 price_in = item->value;
981 item->destroy (); 915 item->destroy ();
… …
992 ob_to_copy = converter->inv; 926 ob_to_copy = converter->inv;
993 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++) 927 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
994 if (rndm (0, i) == 0) 928 if (rndm (0, i) == 0)
995 ob_to_copy = ob; 929 ob_to_copy = ob;
996 930
997 item = object_create_clone (ob_to_copy); 931 item = ob_to_copy->deep_clone ();
998 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 932 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
999 unflag_inv (item, FLAG_IS_A_TEMPLATE); 933 unflag_inv (item, FLAG_IS_A_TEMPLATE);
1000 } 934 }
1001 else 935 else
1002 { 936 {
1003 if (converter->other_arch == NULL) 937 if (!conv_to)
1004 { 938 {
1005 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 939 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); 940 &converter->name, &converter->map->path, converter->x, converter->y);
1007 return -1; 941 return -1;
1008 } 942 }
1009 943
1010 item = object_create_arch (converter->other_arch); 944 item = object_create_arch (conv_to);
1011 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 945 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
1012 } 946 }
1013 947
1014 if (CONV_NR (converter)) 948 if (give)
1015 item->nrof = CONV_NR (converter); 949 item->nrof = give;
1016 950
1017 if (nr) 951 if (nr)
1018 item->nrof *= nr; 952 item->nrof *= nr;
1019 953
1020 if (is_in_shop (converter)) 954 if (converter->flag [FLAG_PRECIOUS])
1021 SET_FLAG (item, FLAG_UNPAID); 955 SET_FLAG (item, FLAG_UNPAID);
956
957 if (is_in_shop (converter))
958 {
959 // converters on shop floors don't work anymore, bug lets check for it
960 // and report in case someone still does it.
961 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
962 converter->debug_desc ());
963 SET_FLAG (item, FLAG_UNPAID);
964 }
1022 else if (price_in < item->nrof * item->value) 965 else if (price_in < sint64 (item->nrof) * item->value)
1023 { 966 {
1024 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 967 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); 968 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1026 /** 969 /**
1027 * elmex: we are going to let the game continue, as the mapcreator 970 * elmex: we are going to let the game continue, as the mapcreator
1028 * hopefully had something in mind when doing this. 971 * hopefully had something in mind when doing this.
1029 */ 972 */
1030 } 973 }
1031 974
1032 SET_FLAG (item, FLAG_IDENTIFIED); 975 // elmex: only identify if we need to, for example so that generated money doesn't
976 // get an 'identified' flag so easily.
977 if (need_identify (item))
978 identify (item);
979
1033 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 980 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1034 return 1; 981 return 1;
1035} 982}
1036 983
1037/** 984/**
… …
1114{ 1061{
1115 /* Only players can make sacrifices on spell casting altars. */ 1062 /* Only players can make sacrifices on spell casting altars. */
1116 if (altar->inv && (!originator || originator->type != PLAYER)) 1063 if (altar->inv && (!originator || originator->type != PLAYER))
1117 return 0; 1064 return 0;
1118 1065
1119 if (operate_altar (altar, &sacrifice)) 1066 if (operate_altar (altar, &sacrifice, originator))
1120 { 1067 {
1121 /* Simple check. Unfortunately, it means you can't cast magic bullet 1068 /* Simple check. Unfortunately, it means you can't cast magic bullet
1122 * with an altar. We call it a Potion - altars are stationary - it 1069 * with an altar. We call it a Potion - altars are stationary - it
1123 * is up to map designers to use them properly. 1070 * is up to map designers to use them properly.
1124 */ 1071 */
… …
1133/* push_button (altar);*/ 1080/* push_button (altar);*/
1134 } 1081 }
1135 else 1082 else
1136 { 1083 {
1137 altar->value = 1; /* works only once */ 1084 altar->value = 1; /* works only once */
1138 push_button (altar); 1085 push_button (altar, originator);
1139 } 1086 }
1140 1087
1141 return !sacrifice; 1088 return !sacrifice;
1142 } 1089 }
1143 else 1090 else
… …
1160 1107
1161 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1108 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1162 1109
1163 bool has_unpaid = false; 1110 bool has_unpaid = false;
1164 1111
1165 // quite inefficient to do this here twice, but the api doesn'T lend itself to 1112 // quite inefficient to do this here twice, but the api doesn't lend itself to
1166 // a quick and small change :( 1113 // a quick and small change :(
1167 for (object::depth_iterator item = op->begin (); item != op->end (); ++item) 1114 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1168 if (item->flag [FLAG_UNPAID]) 1115 if (item->flag [FLAG_UNPAID])
1169 { 1116 {
1170 has_unpaid = true; 1117 has_unpaid = true;
1171 break; 1118 break;
1172 } 1119 }
1173 1120
1174 if (op->type != PLAYER) 1121 if (!op->is_player ())
1175 { 1122 {
1176 /* Remove all the unpaid objects that may be carried here. 1123 /* Remove all the unpaid objects that may be carried here.
1177 * This could be pets or monsters that are somehow in 1124 * This could be pets or monsters that are somehow in
1178 * the shop. 1125 * the shop.
1179 */ 1126 */
… …
1183 1130
1184 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1131 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1185 { 1132 {
1186 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1133 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1187 1134
1135 if (i >= 0)
1188 tmp->remove (); 1136 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 } 1137 }
1198 } 1138 }
1199 1139
1200 /* Don't teleport things like spell effects */ 1140 /* Don't teleport things like spell effects */
1201 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1141 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1212 if (i != -1) 1152 if (i != -1)
1213 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1153 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1214 1154
1215 return 0; 1155 return 0;
1216 } 1156 }
1157
1217 /* Removed code that checked for multipart objects - it appears that 1158 /* Removed code that checked for multipart objects - it appears that
1218 * the teleport function should be able to handle this just fine. 1159 * the teleport function should be able to handle this just fine.
1219 */ 1160 */
1220 rv = teleport (shop_mat, SHOP_MAT, op); 1161 rv = teleport (shop_mat, SHOP_MAT, op);
1221 } 1162 }
… …
1276 * Handles applying a sign. 1217 * Handles applying a sign.
1277 */ 1218 */
1278static void 1219static void
1279apply_sign (object *op, object *sign, int autoapply) 1220apply_sign (object *op, object *sign, int autoapply)
1280{ 1221{
1281 readable_message_type *msgType; 1222 if (!op->is_player())
1223 return;
1224
1225 if (sign->has_dialogue ())
1226 {
1227 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1228 return;
1229 }
1282 1230
1283 if (!sign->msg) 1231 if (!sign->msg)
1284 { 1232 {
1285 op->statusmsg ("Nothing is written on it."); 1233 op->contr->infobox (MSG_CHANNEL ("examine"),
1234 format ("T<%s>\n\n Nothing %sis written on it.",
1235 &sign->name,
1236 sign->name == sign->arch->name ? "" : "else "));
1286 return; 1237 return;
1287 } 1238 }
1288 1239
1289 if (sign->stats.food) 1240 if (sign->stats.food)
1290 { 1241 {
1291 if (sign->last_eat >= sign->stats.food) 1242 if (sign->last_eat >= sign->stats.food)
1292 { 1243 {
1293 if (!sign->move_on) 1244 if (!sign->move_on)
1294 op->statusmsg ("You cannot read it anymore."); 1245 op->failmsg ("You cannot read it anymore.");
1295 1246
1296 return; 1247 return;
1297 } 1248 }
1298 1249
1299 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1250 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1312 } 1263 }
1313 1264
1314 if (op->contr) 1265 if (op->contr)
1315 if (client *ns = op->contr->ns) 1266 if (client *ns = op->contr->ns)
1316 { 1267 {
1268 if (sign->sound)
1317 ns->play_sound (sign->sound); 1269 ns->play_sound (sign->sound);
1318 msgType = get_readable_message_type (sign); 1270 else if (autoapply)
1271 ns->play_sound (sound_find ("msg_voice"));
1319 1272
1320 if (ns->can_msg) 1273 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 } 1274 }
1275}
1276
1277static void
1278move_apply_hole (object *trap, object *victim)
1279{
1280 /* Hole not open? */
1281 if (trap->stats.wc > 0)
1282 return;
1283
1284 /* Is this a multipart monster and not the head? If so, return.
1285 * Processing will happen if the head runs into the pit
1286 */
1287 if (victim->head)
1288 return;
1289
1290 // now find all possible locations and randomly pick one
1291 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1292 trap->range >= 3 ? SIZEOFFREE3 + 1
1293 : trap->range >= 2 ? SIZEOFFREE2 + 1
1294 : trap->range >= 1 ? SIZEOFFREE1 + 1
1295 : SIZEOFFREE0 + 1);
1296
1297 if (dir < 0)
1298 return;
1299
1300 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1301 victim->statusmsg ("You fall through the hole!", NDI_RED);
1302
1303 transfer_ob (victim,
1304 EXIT_X (trap) + freearr_x[dir],
1305 EXIT_Y (trap) + freearr_y[dir],
1306 0, victim);
1329} 1307}
1330 1308
1331/** 1309/**
1332 * 'victim' moves onto 'trap' 1310 * 'victim' moves onto 'trap'
1333 * 'victim' leaves 'trap' 1311 * 'victim' leaves 'trap'
… …
1364 1342
1365 recursion_depth++; 1343 recursion_depth++;
1366 if (trap->head) 1344 if (trap->head)
1367 trap = trap->head; 1345 trap = trap->head;
1368 1346
1369 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1347 if (!INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1370 goto leave;
1371
1372 switch (trap->type) 1348 switch (trap->type)
1373 { 1349 {
1374 case PLAYERMOVER: 1350 case PLAYERMOVER:
1375 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim)) 1351 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))
1352 {
1353 if (!trap->stats.maxsp)
1354 trap->stats.maxsp = 2;
1355
1356 /* Is this correct? From the docs, it doesn't look like it
1357 * should be divided by trap->speed
1358 */
1359 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed);
1360
1361 /* Just put in some sanity check. I think there is a bug in the
1362 * above with some objects have zero speed, and thus the player
1363 * getting permanently paralyzed.
1364 */
1365 if (victim->speed_left < -50.f)
1366 victim->speed_left = -50.f;
1367 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1368 }
1369 break;
1370
1371 case SPINNER:
1372 if (victim->direction)
1373 {
1374 victim->direction = absdir (victim->direction - trap->stats.sp);
1375 update_turn_face (victim);
1376 }
1377 break;
1378
1379 case DIRECTOR:
1380 if (victim->direction && !should_director_abort (trap, victim))
1381 {
1382 victim->direction = trap->stats.sp;
1383 update_turn_face (victim);
1384 }
1385 break;
1386
1387 case BUTTON:
1388 case PEDESTAL:
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->speed) && trap->owner != victim)
1410 hit_with_arrow (trap, victim);
1411 break;
1412
1413 case SPELL_EFFECT:
1414 apply_spell_effect (trap, victim);
1415 break;
1416
1417 case TRAPDOOR:
1376 { 1418 {
1419 int max, sound_was_played;
1420 object *ab, *ab_next;
1421
1377 if (!trap->stats.maxsp) 1422 if (!trap->value)
1378 trap->stats.maxsp = 2; 1423 {
1424 int tot;
1379 1425
1380 /* Is this correct? From the docs, it doesn't look like it 1426 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1381 * should be divided by trap->speed 1427 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1428 tot += ab->head_ ()->total_weight ();
1429
1430 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1431 break;
1432
1433 SET_ANIMATION (trap, trap->value);
1434 update_object (trap, UP_OBJ_FACE);
1435 }
1436
1437 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
1438 {
1439 /* need to set this up, since if we do transfer the object,
1440 * ab->above would be bogus
1382 */ 1441 */
1383 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1442 ab_next = ab->above;
1384 1443
1385 /* Just put in some sanity check. I think there is a bug in the 1444 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1386 * above with some objects have zero speed, and thus the player 1445 {
1387 * getting permanently paralyzed. 1446 if (!sound_was_played)
1447 {
1448 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1449 sound_was_played = 1;
1450 }
1451
1452 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1453 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1454 }
1388 */ 1455 }
1389 if (victim->speed_left < -50.f) 1456 break;
1390 victim->speed_left = -50.f;
1391 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1392 } 1457 }
1393 goto leave;
1394 1458
1395 case SPINNER: 1459 case CONVERTER:
1396 if (victim->direction) 1460 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 { 1461 {
1448 int tot; 1462 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1449 1463 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 } 1464 }
1460 1465
1461 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next) 1466 break;
1467
1468 case TRIGGER_BUTTON:
1469 case TRIGGER_PEDESTAL:
1470 case TRIGGER_ALTAR:
1471 check_trigger (trap, victim, originator);
1472 break;
1473
1474 case DEEP_SWAMP:
1475 walk_on_deep_swamp (trap, victim);
1476 break;
1477
1478 case CHECK_INV:
1479 check_inv (victim, trap);
1480 break;
1481
1482 case HOLE:
1483 move_apply_hole (trap, victim);
1484 break;
1485
1486 case EXIT:
1487 if (victim->type == PLAYER && EXIT_PATH (trap))
1462 { 1488 {
1463 /* need to set this up, since if we do transfer the object, 1489 /* Basically, don't show exits leading to random maps the
1464 * ab->above would be bogus 1490 * players output.
1465 */ 1491 */
1466 ab_next = ab->above; 1492 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1493 victim->statusmsg (trap->msg, NDI_NAVY);
1467 1494
1468 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1495 trap->play_sound (trap->sound);
1469 { 1496 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 } 1497 }
1480 goto leave; 1498 break;
1481 }
1482 1499
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: 1500 case ENCOUNTER:
1536 /* may be some leftovers on this */ 1501 /* may be some leftovers on this */
1537 goto leave; 1502 break;
1538 1503
1539 case SHOP_MAT: 1504 case SHOP_MAT:
1540 apply_shop_mat (trap, victim); 1505 apply_shop_mat (trap, victim);
1541 goto leave; 1506 break;
1542 1507
1543 /* Drop a certain amount of gold, and have one item identified */ 1508 /* Drop a certain amount of gold, and have one item identified */
1544 case IDENTIFY_ALTAR: 1509 case IDENTIFY_ALTAR:
1545 apply_id_altar (victim, trap, originator); 1510 apply_id_altar (victim, trap, originator);
1546 goto leave; 1511 break;
1547 1512
1548 case SIGN: 1513 case SIGN:
1549 if (victim->type != PLAYER && trap->stats.food > 0) 1514 if (victim->type != PLAYER && trap->stats.food > 0)
1550 goto leave; /* monsters musn't apply magic_mouths with counters */ 1515 break; /* monsters musn't apply magic_mouths with counters */
1551 1516
1552 apply_sign (victim, trap, 1); 1517 apply_sign (victim, trap, 1);
1553 goto leave; 1518 break;
1554 1519
1555 case CONTAINER: 1520 case CONTAINER:
1556 apply_container (victim, trap); 1521 apply_container (victim, trap);
1557 goto leave; 1522 break;
1558 1523
1559 case RUNE: 1524 case RUNE:
1560 case TRAP: 1525 case TRAP:
1561 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1526 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1562 {
1563 spring_trap (trap, victim); 1527 spring_trap (trap, victim);
1564 } 1528 break;
1565 goto leave;
1566 1529
1567 default: 1530 default:
1568 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1531 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); 1532 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1570 goto leave; 1533 break;
1571 } 1534 }
1572 1535
1573leave:
1574 recursion_depth--; 1536 recursion_depth--;
1575} 1537}
1576 1538
1577/** 1539/**
1578 * Handles reading a regular (ie not containing a spell) book. 1540 * Handles reading a regular (ie not containing a spell) book.
… …
1604 } 1566 }
1605 1567
1606 lev_diff = tmp->level - (skill_ob->level + 5); 1568 lev_diff = tmp->level - (skill_ob->level + 5);
1607 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1569 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1608 { 1570 {
1609 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension." 1571 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1610 : lev_diff < 3 ? "This book is slightly beyond your comprehension." 1572 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1611 : lev_diff < 5 ? "This book is beyond your comprehension." 1573 : lev_diff < 5 ? "This book is beyond your comprehension."
1612 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension." 1574 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1613 : lev_diff < 15 ? "This book is way beyond your comprehension." 1575 : lev_diff < 15 ? "This book is way beyond your comprehension."
1614 : "This book is totally beyond your comprehension."); 1576 : "This book is totally beyond your comprehension.");
… …
1617 1579
1618 readable_message_type *msgType = get_readable_message_type (tmp); 1580 readable_message_type *msgType = get_readable_message_type (tmp);
1619 1581
1620 if (player *pl = op->contr) 1582 if (player *pl = op->contr)
1621 if (client *ns = pl->ns) 1583 if (client *ns = pl->ns)
1622 if (ns->can_msg) 1584 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 1585
1637 /* gain xp from reading */ 1586 /* gain xp from reading */
1638 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1587 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1639 { /* only if not read before */ 1588 { /* only if not read before */
1640 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1589 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1642 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1591 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1643 { 1592 {
1644 /*exp_gain *= 2; because they just identified it too */ 1593 /*exp_gain *= 2; because they just identified it too */
1645 SET_FLAG (tmp, FLAG_IDENTIFIED); 1594 SET_FLAG (tmp, FLAG_IDENTIFIED);
1646 1595
1647 /* If in a container, update how it looks */ 1596 if (object *pl = tmp->visible_to ())
1648 if (tmp->env)
1649 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1597 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1650 else
1651 op->contr->ns->floorbox_update ();
1652 } 1598 }
1653 1599
1654 change_exp (op, exp_gain, skill_ob->skill, 0); 1600 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 */ 1601 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1656 } 1602 }
… …
1669 op->play_sound (sound_find ("generic_fail")); 1615 op->play_sound (sound_find ("generic_fail"));
1670 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp))); 1616 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1671 break; 1617 break;
1672 1618
1673 case 1: 1619 case 1:
1674 decrease_ob (tmp); 1620 tmp->decrease ();
1675 op->play_sound (sound_find ("skill_learn")); 1621 op->play_sound (sound_find ("skill_learn"));
1676 op->statusmsg (format ("You succeed in learning %s", &tmp->skill)); 1622 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1677 break; 1623 break;
1678 1624
1679 default: 1625 default:
1680 decrease_ob (tmp); 1626 tmp->decrease ();
1681 op->play_sound (sound_find ("generic_fail")); 1627 op->play_sound (sound_find ("generic_fail"));
1682 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp))); 1628 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1683 break; 1629 break;
1684 } 1630 }
1685} 1631}
… …
1797 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1743 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!"); 1744 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1799 return; 1745 return;
1800 } 1746 }
1801 1747
1802 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1748 int learn_level = sqrtf (spell->level) * 1.5f;
1749 if (skop->level < learn_level)
1803 { 1750 {
1804 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill)); 1751 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1752 &tmp->skill, learn_level));
1805 return; 1753 return;
1806 } 1754 }
1807 1755
1808 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1756 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1809 1757
1810 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1758 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1811 {
1812 identify (tmp); 1759 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 1760
1820 /* I removed the check for special_prayer_mark here - it didn't make 1761 /* 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 1762 * 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 1763 * if the player doesn't know the spell, doesn't make a lot of sense that
1823 * they would have a special prayer mark. 1764 * they would have a special prayer mark.
… …
1876 { 1817 {
1877 op->contr->play_sound (sound_find ("fumble_spell")); 1818 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"); 1819 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 } 1820 }
1880 1821
1881 decrease_ob (tmp); 1822 tmp->decrease ();
1882} 1823}
1883 1824
1884/** 1825/**
1885 * Handles applying a spell scroll. 1826 * Handles applying a spell scroll.
1886 */ 1827 */
… …
1925 identify (tmp); 1866 identify (tmp);
1926 1867
1927 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name)); 1868 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
1928 1869
1929 cast_spell (op, tmp, dir, tmp->inv, NULL); 1870 cast_spell (op, tmp, dir, tmp->inv, NULL);
1930 decrease_ob (tmp); 1871 tmp->decrease ();
1931} 1872}
1932 1873
1933/** 1874/**
1934 * Applies a treasure object - by default, chest. op 1875 * Applies a treasure object - by default, chest. op
1935 * is the person doing the applying, tmp is the treasure 1876 * is the person doing the applying, tmp is the treasure
… …
1947 object *treas = tmp->inv; 1888 object *treas = tmp->inv;
1948 1889
1949 if (!treas) 1890 if (!treas)
1950 { 1891 {
1951 op->statusmsg ("The chest was empty."); 1892 op->statusmsg ("The chest was empty.");
1952 decrease_ob (tmp); 1893 tmp->decrease ();
1953 return; 1894 return;
1954 } 1895 }
1955 1896
1956 while (tmp->inv) 1897 while (tmp->inv)
1957 { 1898 {
… …
1973 if (op->destroyed () || tmp->destroyed ()) 1914 if (op->destroyed () || tmp->destroyed ())
1974 break; 1915 break;
1975 } 1916 }
1976 1917
1977 if (!tmp->destroyed () && !tmp->inv) 1918 if (!tmp->destroyed () && !tmp->inv)
1978 decrease_ob (tmp); 1919 tmp->decrease (true);
1979} 1920}
1980 1921
1981/** 1922/**
1982 * op eats food. 1923 * op eats food.
1983 * If player, takes care of messages and dragon special food. 1924 * If player, takes care of messages and dragon special food.
… …
2002 if (tmp->type == FOOD || tmp->type == FLESH) 1943 if (tmp->type == FOOD || tmp->type == FLESH)
2003 op->failmsg ("You feel full, but what a waste of food!"); 1944 op->failmsg ("You feel full, but what a waste of food!");
2004 else 1945 else
2005 op->statusmsg ("Most of the drink goes down your face not your throat!"); 1946 op->statusmsg ("Most of the drink goes down your face not your throat!");
2006 } 1947 }
1948
1949 tmp->play_sound (
1950 tmp->sound
1951 ? tmp->sound
1952 : tmp->type == DRINK
1953 ? sound_find ("eat_drink")
1954 : sound_find ("eat_food")
1955 );
2007 1956
2008 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 1957 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2009 { 1958 {
2010 const char *buf; 1959 const char *buf;
2011 1960
… …
2041 eat_special_food (op, tmp); 1990 eat_special_food (op, tmp);
2042 } 1991 }
2043 } 1992 }
2044 1993
2045 handle_apply_yield (tmp); 1994 handle_apply_yield (tmp);
2046 decrease_ob (tmp); 1995 tmp->decrease ();
2047} 1996}
2048 1997
2049/** 1998/**
2050 * A dragon is eating some flesh. If the flesh contains resistances, 1999 * A dragon is eating some flesh. If the flesh contains resistances,
2051 * there is a chance for the dragon's skin to get improved. 2000 * there is a chance for the dragon's skin to get improved.
… …
2170 op->statusmsg (buf); 2119 op->statusmsg (buf);
2171 2120
2172 /* now choose a winner if we have any */ 2121 /* now choose a winner if we have any */
2173 i = -1; 2122 i = -1;
2174 if (winners > 0) 2123 if (winners > 0)
2175 i = atnr_winner[RANDOM () % winners]; 2124 i = atnr_winner [rndm (winners)];
2176 2125
2177 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2126 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2178 { 2127 {
2179 /* resistance increased! */ 2128 /* resistance increased! */
2180 skin->resist[i]++; 2129 skin->resist[i]++;
… …
2239 2188
2240 op->statusmsg ("Applying armour enchantment."); 2189 op->statusmsg ("Applying armour enchantment.");
2241 improve_armour (op, tmp, armor); 2190 improve_armour (op, tmp, armor);
2242} 2191}
2243 2192
2244extern void 2193void
2245apply_poison (object *op, object *tmp) 2194apply_poison (object *op, object *tmp)
2246{ 2195{
2196 // need to do it now when it is still on the map
2197 handle_apply_yield (tmp);
2198
2199 object *poison = tmp->split (1);
2200
2247 if (op->type == PLAYER) 2201 if (op->type == PLAYER)
2248 { 2202 {
2249 op->contr->play_sound (sound_find ("drink_poison")); 2203 op->contr->play_sound (sound_find ("drink_poison"));
2250 op->failmsg ("Yech! That tasted poisonous!"); 2204 op->failmsg ("Yech! That tasted poisonous!");
2251 strcpy (op->contr->killer, "poisonous booze"); 2205 op->contr->killer = poison;
2252 } 2206 }
2253 2207
2254 if (tmp->stats.hp > 0) 2208 if (poison->stats.hp > 0)
2255 { 2209 {
2256 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2210 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); 2211 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2258 } 2212 }
2259 2213
2260 op->stats.food -= op->stats.food / 4; 2214 op->stats.food -= op->stats.food / 4;
2261 handle_apply_yield (tmp); 2215 poison->destroy ();
2262 decrease_ob (tmp);
2263} 2216}
2264 2217
2265/** 2218/**
2266 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2219 * 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: 2220 * A valid 2 way exit means:
… …
2283#if 0 //TODO 2236#if 0 //TODO
2284 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2237 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2285 return 0; /* This is a reset town portal */ 2238 return 0; /* This is a reset town portal */
2286#endif 2239#endif
2287 2240
2241 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2242
2288 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map); 2243 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2289 2244
2290 if (exitmap) 2245 if (exitmap)
2291 { 2246 {
2292 exitmap->load_sync (); 2247 exitmap->load_sync ();
… …
2346 return 1; 2301 return 1;
2347 } 2302 }
2348 } 2303 }
2349 2304
2350 return 0; 2305 return 0;
2306}
2307
2308/**
2309 * This function will try to apply a lighter and in case no lighter
2310 * is specified it will try to find a lighter in the players inventory,
2311 * and inform him about this requirement.
2312 *
2313 * who - the player
2314 * op - the item we want to light
2315 * lighter - the lighter or 0 if a lighter has yet to be found
2316 */
2317static object *
2318auto_apply_lighter (object *who, object *op, object *lighter)
2319{
2320 if (lighter == 0)
2321 {
2322 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2323 {
2324 if (tmp->type == LIGHTER)
2325 {
2326 lighter = tmp;
2327 break;
2328 }
2329 }
2330
2331 if (!lighter)
2332 {
2333 who->failmsg (format (
2334 "You can't light up the %s with your bare hands! "
2335 "H<You need a lighter in your inventory, for example a flint and steel.>",
2336 &op->name));
2337 return 0;
2338 }
2339 }
2340
2341 // last_eat == 0 means the lighter is not being used up!
2342 if (lighter->last_eat && lighter->stats.food)
2343 {
2344 /* lighter gets used up */
2345 lighter = lighter->split ();
2346 lighter->stats.food--;
2347 who->insert (lighter);
2348 }
2349 else if (lighter->last_eat)
2350 {
2351 /* no charges left in lighter */
2352 who->failmsg (format (
2353 "You attempt to light the %s with a used up %s.",
2354 &op->name, &lighter->name));
2355 return 0;
2356 }
2357
2358 return lighter;
2359}
2360
2361/**
2362 * Designed primarily to light torches/lanterns/etc.
2363 * Also burns up burnable material too. First object in the inventory is
2364 * the selected object to "burn". -b.t.
2365 */
2366void
2367apply_lighter (object *who, object *lighter)
2368{
2369 object *item;
2370 int is_player_env = 0;
2371
2372 item = find_marked_object (who);
2373 if (item)
2374 {
2375 if (!auto_apply_lighter (who, item, lighter))
2376 return;
2377
2378 /* Perhaps we should split what we are trying to light on fire?
2379 * I can't see many times when you would want to light multiple
2380 * objects at once.
2381 */
2382
2383 save_throw_object (item, AT_FIRE, who);
2384
2385 if (item->destroyed ()
2386 || ((item->type == LAMP || item->type == TORCH)
2387 && item->glow_radius > 0))
2388 who->statusmsg (format (
2389 "You light the %s with the %s.",
2390 &item->name, &lighter->name));
2391 else
2392 who->failmsg (format (
2393 "You attempt to light the %s with the %s and fail.",
2394 &item->name, &lighter->name));
2395 }
2396 else
2397 who->failmsg ("You need to mark a lightable object.");
2398}
2399
2400/**
2401 * This function generates a cursed effect for cursed lamps and torches.
2402 */
2403void player_apply_lamp_cursed_effect (object *who, object *op)
2404{
2405 if (op->level)
2406 {
2407 who->failmsg (format (
2408 "The %s was cursed, it explodes in a big fireball!",
2409 &op->name));
2410 create_exploding_ball_at (who, op->level);
2411 }
2412 else
2413 {
2414 who->failmsg (format (
2415 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2416 &op->name));
2417 }
2418
2419 op->destroy ();
2420}
2421
2422/**
2423 * Apply for players and lamps
2424 *
2425 * who - the player
2426 * op - the lamp
2427 */
2428void player_apply_lamp (object *who, object *op)
2429{
2430 bool switch_on = op->glow_radius ? false : true;
2431
2432 if (switch_on)
2433 {
2434 object *lighter = 0;
2435
2436 if (op->flag [FLAG_IS_LIGHTABLE]
2437 && !(lighter = auto_apply_lighter (who, op, 0)))
2438 return;
2439
2440 if (op->stats.food < 1)
2441 {
2442 if (op->type == LAMP)
2443 who->failmsg (format (
2444 "The %s is out of fuel! "
2445 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2446 &op->name));
2447 else
2448 who->failmsg (format (
2449 "The %s is burnt out! "
2450 "H<Torches and similar items burn out and become worthless.>",
2451 &op->name));
2452 return;
2453 }
2454
2455 if (op->flag [FLAG_CURSED])
2456 {
2457 player_apply_lamp_cursed_effect (who, op);
2458 return;
2459 }
2460
2461 if (lighter)
2462 who->statusmsg (format (
2463 "You light up the %s with the %s.", &op->name, &lighter->name));
2464 else
2465 who->statusmsg (format ("You light up the %s.", &op->name));
2466 }
2467 else
2468 {
2469 if (op->flag [FLAG_CURSED])
2470 {
2471 player_apply_lamp_cursed_effect (who, op);
2472 return;
2473 }
2474
2475 if (op->type == TORCH)
2476 {
2477 if (!op->flag [FLAG_IS_LIGHTABLE])
2478 {
2479 who->statusmsg (format (
2480 "You put out the %s. "
2481 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2482 &op->name, &op->name));
2483 }
2484 else
2485 who->statusmsg (format (
2486 "You put out the %s."
2487 "H<Torches wear out if you put them out.>",
2488 &op->name));
2489 }
2490 else
2491 who->statusmsg (format ("You turn off the %s.", &op->name));
2492 }
2493
2494 apply_lamp (op, switch_on);
2495}
2496
2497void get_animation_from_arch (object *op, arch_ptr a)
2498{
2499 op->animation_id = a->animation_id;
2500 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2501 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2502 op->anim_speed = a->anim_speed;
2503 op->last_anim = 0;
2504 op->state = 0;
2505 op->face = a->face;
2506
2507 if (NUM_ANIMATIONS(op) > 1)
2508 {
2509 SET_ANIMATION(op, 0);
2510 animate_object (op, op->direction);
2511 }
2512 else
2513 update_object (op, UP_OBJ_FACE);
2514}
2515
2516/**
2517 * Apply for LAMPs and TORCHes.
2518 *
2519 * op - the lamp
2520 * switch_on - a flag which says whether the lamp should be switched on or off
2521 */
2522void apply_lamp (object *op, bool switch_on)
2523{
2524 op->set_glow_radius (switch_on ? op->range : 0);
2525 op->set_speed (switch_on ? op->arch->speed : 0);
2526
2527 // torches wear out if you put them out
2528 if (op->type == TORCH && !switch_on)
2529 {
2530 if (op->flag [FLAG_IS_LIGHTABLE])
2531 {
2532 op->stats.food -= (double) op->arch->stats.food / 15;
2533 if (op->stats.food < 0)
2534 op->stats.food = 0;
2535 }
2536 else
2537 op->stats.food = 0;
2538 }
2539
2540 // lamps and torched get worthless when used up
2541 if (op->stats.food <= 0)
2542 op->value = 0;
2543
2544 // FIXME: This is a hack to make the more sane torches and lamps
2545 // still animated ;-/
2546 if (op->other_arch)
2547 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2548
2549 if (object *pl = op->visible_to ())
2550 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2351} 2551}
2352 2552
2353/** 2553/**
2354 * Main apply handler. 2554 * Main apply handler.
2355 * 2555 *
… …
2358 * Return value: 2558 * Return value:
2359 * 0: player or monster can't apply objects of that type 2559 * 0: player or monster can't apply objects of that type
2360 * 1: has been applied, or there was an error applying the object 2560 * 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 2561 * 2: objects of that type can't be applied if not in inventory
2362 * 2562 *
2363 * op is the object that is causing object to be applied, tmp is the object 2563 * who is the object that is causing object to be applied, op is the object
2364 * being applied. 2564 * being applied.
2365 * 2565 *
2366 * aflag is special (always apply/unapply) flags. Nothing is done with 2566 * aflag is special (always apply/unapply) flags. Nothing is done with
2367 * them in this function - they are passed to apply_special 2567 * them in this function - they are passed to apply_special
2368 */ 2568 */
2369int 2569int
2370manual_apply (object *op, object *tmp, int aflag) 2570manual_apply (object *who, object *op, int aflag)
2371{ 2571{
2372 if (tmp->head) 2572 op = op->head_ ();
2373 tmp = tmp->head;
2374 2573
2375 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2574 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2376 { 2575 {
2377 if (op->type == PLAYER) 2576 if (who->type == PLAYER)
2378 { 2577 {
2578 examine (who, op);
2379 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2579 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2380 return 1; 2580 return 1;
2381 } 2581 }
2382 else 2582 else
2383 return 0; /* monsters just skip unpaid items */ 2583 return 0; /* monsters just skip unpaid items */
2384 } 2584 }
2385 2585
2386 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2586 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2387 return RESULT_INT (0); 2587 return RESULT_INT (0);
2388 2588
2389 switch (tmp->type) 2589 switch (op->type)
2390 { 2590 {
2391 case CF_HANDLE: 2591 case CF_HANDLE:
2392 op->play_sound (sound_find ("turn_handle")); 2592 who->play_sound (sound_find ("turn_handle"));
2393 op->statusmsg ("You turn the handle."); 2593 who->statusmsg ("You turn the handle.");
2394 tmp->value = tmp->value ? 0 : 1; 2594 op->value = op->value ? 0 : 1;
2395 SET_ANIMATION (tmp, tmp->value); 2595 SET_ANIMATION (op, op->value);
2396 update_object (tmp, UP_OBJ_FACE); 2596 update_object (op, UP_OBJ_FACE);
2397 push_button (tmp); 2597 push_button (op, who);
2398 return 1; 2598 return 1;
2399 2599
2400 case TRIGGER: 2600 case TRIGGER:
2401 if (check_trigger (tmp, op)) 2601 if (check_trigger (op, who, who))
2402 { 2602 {
2403 op->statusmsg ("You turn the handle."); 2603 who->statusmsg ("You turn the handle.");
2404 op->play_sound (sound_find ("turn_handle")); 2604 who->play_sound (sound_find ("turn_handle"));
2405 } 2605 }
2406 else 2606 else
2407 op->failmsg ("The handle doesn't move."); 2607 who->failmsg ("The handle doesn't move.");
2408 2608
2409 return 1; 2609 return 1;
2410 2610
2411 case EXIT: 2611 case EXIT:
2412 if (op->type != PLAYER) 2612 if (who->type != PLAYER)
2413 return 0; 2613 return 0;
2414 2614
2415 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2615 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2416 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2616 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 2617 else
2418 { 2618 {
2419 /* Don't display messages for random maps. */ 2619 /* Don't display messages for random maps. */
2420 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2620 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2421 op->statusmsg (tmp->msg, NDI_NAVY); 2621 who->statusmsg (op->msg, NDI_NAVY);
2422 2622
2423 op->enter_exit (tmp); 2623 who->enter_exit (op);
2424 } 2624 }
2425 2625
2426 return 1; 2626 return 1;
2427 2627
2428 case INSCRIBABLE: 2628 case INSCRIBABLE:
2429 op->statusmsg (tmp->msg); 2629 who->statusmsg (op->msg);
2430 // maybe show a spell menu to chose from or something like that 2630 // maybe show a spell menu to chose from or something like that
2431 return 1; 2631 return 1;
2432 2632
2433 case SIGN: 2633 case SIGN:
2434 apply_sign (op, tmp, 0); 2634 apply_sign (who, op, 0);
2435 return 1; 2635 return 1;
2436 2636
2437 case BOOK: 2637 case BOOK:
2438 if (op->type == PLAYER) 2638 if (who->type == PLAYER)
2439 { 2639 {
2440 apply_book (op, tmp); 2640 apply_book (who, op);
2441 return 1; 2641 return 1;
2442 } 2642 }
2443 else 2643 else
2444 return 0; 2644 return 0;
2445 2645
2446 case SKILLSCROLL: 2646 case SKILLSCROLL:
2447 if (op->type == PLAYER) 2647 if (who->type == PLAYER)
2448 { 2648 {
2449 apply_skillscroll (op, tmp); 2649 apply_skillscroll (who, op);
2450 return 1; 2650 return 1;
2451 } 2651 }
2452 else 2652 else
2453 return 0; 2653 return 0;
2454 2654
2455 case SPELLBOOK: 2655 case SPELLBOOK:
2456 if (op->type == PLAYER) 2656 if (who->type == PLAYER)
2457 { 2657 {
2458 apply_spellbook (op, tmp); 2658 apply_spellbook (who, op);
2459 return 1; 2659 return 1;
2460 } 2660 }
2461 else 2661 else
2462 return 0; 2662 return 0;
2463 2663
2464 case SCROLL: 2664 case SCROLL:
2465 apply_scroll (op, tmp, 0); 2665 apply_scroll (who, op, 0);
2466 return 1; 2666 return 1;
2467 2667
2468 case POTION: 2668 case POTION:
2469 apply_potion (op, tmp); 2669 apply_potion (who, op);
2470 return 1; 2670 return 1;
2471 2671
2472 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2672 /* Eneq(@csd.uu.se): Handle apply on containers. */
2473 //TODO: remove, as it is unsed? 2673 //TODO: remove, as it is unsed?
2474 case CLOSE_CON: 2674 case CLOSE_CON:
2475 apply_container (op, tmp->env); 2675 apply_container (who, op->env);
2476 return 1; 2676 return 1;
2477 2677
2478 case CONTAINER: 2678 case CONTAINER:
2479 apply_container (op, tmp); 2679 apply_container (who, op);
2480 return 1; 2680 return 1;
2481 2681
2482 case TREASURE: 2682 case TREASURE:
2483 if (op->type == PLAYER) 2683 if (who->type == PLAYER)
2484 { 2684 {
2485 apply_treasure (op, tmp); 2685 apply_treasure (who, op);
2486 return 1; 2686 return 1;
2487 } 2687 }
2488 else 2688 else
2489 return 0; 2689 return 0;
2690
2691 case LAMP:
2692 case TORCH:
2693 player_apply_lamp (who, op);
2694 return 1;
2490 2695
2491 case WEAPON: 2696 case WEAPON:
2492 case ARMOUR: 2697 case ARMOUR:
2493 case BOOTS: 2698 case BOOTS:
2494 case GLOVES: 2699 case GLOVES:
… …
2502 case WAND: 2707 case WAND:
2503 case ROD: 2708 case ROD:
2504 case HORN: 2709 case HORN:
2505 case SKILL: 2710 case SKILL:
2506 case BOW: 2711 case BOW:
2507 case LAMP:
2508 case BUILDER: 2712 case BUILDER:
2509 case SKILL_TOOL: 2713 case SKILL_TOOL:
2510 if (tmp->env != op) 2714 if (op->env != who)
2511 return 2; /* not in inventory */ 2715 return 2; /* not in inventory */
2512 2716
2513 apply_special (op, tmp, aflag); 2717 apply_special (who, op, aflag);
2514 return 1; 2718 return 1;
2515 2719
2516 case DRINK: 2720 case DRINK:
2517 case FOOD: 2721 case FOOD:
2518 case FLESH: 2722 case FLESH:
2519 apply_food (op, tmp); 2723 apply_food (who, op);
2520 return 1; 2724 return 1;
2521 2725
2522 case POISON: 2726 case POISON:
2523 apply_poison (op, tmp); 2727 apply_poison (who, op);
2524 return 1; 2728 return 1;
2525 2729
2526 case SAVEBED: 2730 case SAVEBED:
2527 return 1; 2731 return 1;
2528 2732
2529 case ARMOUR_IMPROVER: 2733 case ARMOUR_IMPROVER:
2530 if (op->type == PLAYER) 2734 if (who->type == PLAYER)
2531 { 2735 {
2532 apply_armour_improver (op, tmp); 2736 apply_armour_improver (who, op);
2533 return 1; 2737 return 1;
2534 } 2738 }
2535 else 2739 else
2536 return 0; 2740 return 0;
2537 2741
2538 case WEAPON_IMPROVER: 2742 case WEAPON_IMPROVER:
2539 check_improve_weapon (op, tmp); 2743 check_improve_weapon (who, op);
2540 return 1; 2744 return 1;
2541 2745
2542 case CLOCK: 2746 case CLOCK:
2543 if (op->type == PLAYER) 2747 if (who->type == PLAYER)
2544 { 2748 {
2545 char buf[MAX_BUF]; 2749 char buf[MAX_BUF];
2546 timeofday_t tod; 2750 timeofday_t tod;
2547 2751
2548 get_tod (&tod); 2752 get_tod (&tod);
2549 op->play_sound (sound_find ("sound_clock")); 2753 who->play_sound (sound_find ("sound_clock"));
2550 op->statusmsg (format ( 2754 who->statusmsg (format (
2551 "It is %d minute%s past %d o'clock %s", 2755 "It is %d minute%s past %d o'clock %s",
2552 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2756 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2553 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2757 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2554 )); 2758 ));
2555 return 1; 2759 return 1;
2556 } 2760 }
2557 else 2761 else
2558 return 0; 2762 return 0;
2559 2763
2560 case MENU: 2764 case MENU:
2561 if (op->type == PLAYER) 2765 if (who->type == PLAYER)
2562 { 2766 {
2563 shop_listing (tmp, op); 2767 shop_listing (op, who);
2564 return 1; 2768 return 1;
2565 } 2769 }
2566 else 2770 else
2567 return 0; 2771 return 0;
2568 2772
2569 case POWER_CRYSTAL: 2773 case POWER_CRYSTAL:
2570 apply_power_crystal (op, tmp); /* see egoitem.c */ 2774 apply_power_crystal (who, op); /* see egoitem.c */
2571 return 1; 2775 return 1;
2572 2776
2573 case LIGHTER: /* for lighting torches/lanterns/etc */ 2777 case LIGHTER: /* for lighting torches/lanterns/etc */
2574 if (op->type == PLAYER) 2778 if (who->type == PLAYER)
2575 { 2779 {
2576 apply_lighter (op, tmp); 2780 apply_lighter (who, op);
2577 return 1; 2781 return 1;
2578 } 2782 }
2579 else 2783 else
2580 return 0; 2784 return 0;
2581 2785
2582 case ITEM_TRANSFORMER: 2786 case ITEM_TRANSFORMER:
2583 apply_item_transformer (op, tmp); 2787 apply_item_transformer (who, op);
2584 return 1; 2788 return 1;
2585 2789
2586 default: 2790 default:
2587 return 0; 2791 return 0;
2588 } 2792 }
2589} 2793}
2590
2591 2794
2592/* quiet suppresses the "don't know how to apply" and "you must get it first" 2795/* 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 2796 * messages as needed by player_apply_below(). But there can still be
2594 * "but you are floating high above the ground" messages. 2797 * "but you are floating high above the ground" messages.
2595 * 2798 *
2596 * Same return value as apply() function. 2799 * Same return value as apply() function.
2597 */ 2800 */
2598int 2801int
2599player_apply (object *pl, object *op, int aflag, int quiet) 2802player_apply (object *pl, object *op, int aflag, int quiet)
2600{ 2803{
2601 int tmp;
2602
2603 if (op->env && (pl->move_type & MOVE_FLYING)) 2804 if (!op->env && (pl->move_type & MOVE_FLYING))
2604 { 2805 {
2605 /* player is flying and applying object not in inventory */ 2806 /* player is flying and applying object not in inventory */
2606 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2807 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2607 { 2808 {
2608 op->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>"); 2809 pl->failmsg ("But you are floating high above the ground! "
2810 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2811 "or waiting till the levitation effect wears off.>");
2609 return 0; 2812 return 0;
2610 } 2813 }
2611 } 2814 }
2612 2815
2613 pl->contr->last_used = op; 2816 pl->contr->last_used = op;
2614 2817
2615 tmp = manual_apply (pl, op, aflag); 2818 int tmp = manual_apply (pl, op, aflag);
2819
2616 if (!quiet) 2820 if (!quiet)
2617 { 2821 {
2618 if (tmp == 0) 2822 if (tmp == 0)
2619 op->statusmsg (format ("I don't know how to apply the %s.", query_name (op))); 2823 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2620 else if (tmp == 2) 2824 else if (tmp == 2)
2621 op->failmsg ("You must get it first!\n"); 2825 pl->failmsg ("You must get it first!\n");
2622 } 2826 }
2623 2827
2624 return tmp; 2828 return tmp;
2625} 2829}
2626 2830
… …
2655 * person moving on it, also activate. Added code to make it 2859 * person moving on it, also activate. Added code to make it
2656 * so that at least one of players movement types be that which 2860 * so that at least one of players movement types be that which
2657 * the item needs. 2861 * the item needs.
2658 */ 2862 */
2659 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2863 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2660 {
2661 if (player_apply (pl, tmp, 0, 1) == 1) 2864 if (player_apply (pl, tmp, 0, 1) == 1)
2662 return; 2865 return;
2663 } 2866
2664 if (floors >= 2) 2867 if (floors >= 2)
2665 return; /* process at most two floor objects */ 2868 return; /* process at most two floor objects */
2666 } 2869 }
2667} 2870}
2668 2871
… …
2712 break; 2915 break;
2713 2916
2714 case SKILL: 2917 case SKILL:
2715 if (who->contr) 2918 if (who->contr)
2716 { 2919 {
2920 if (IS_COMBAT_SKILL (op->subtype))
2921 who->change_weapon (who->contr->combat_ob = 0);
2922 else if (IS_RANGED_SKILL (op->subtype))
2923 who->change_weapon (who->contr->ranged_ob = 0);
2924
2717 if (!op->invisible) 2925 if (op->invisible)
2926 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2927 else
2718 who->statusmsg (format ("You stop using the %s.", query_name (op))); 2928 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 } 2929 }
2722 2930
2723 change_abil (who, op); 2931 change_abil (who, op);
2724 CLEAR_FLAG (who, FLAG_READY_SKILL); 2932 CLEAR_FLAG (who, FLAG_READY_SKILL);
2725 break; 2933 break;
… …
2736 case CLOAK: 2944 case CLOAK:
2737 who->statusmsg (format ("You unwear %s.", query_name (op))); 2945 who->statusmsg (format ("You unwear %s.", query_name (op)));
2738 change_abil (who, op); 2946 change_abil (who, op);
2739 break; 2947 break;
2740 2948
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: 2949 case BOW:
2780 case WAND: 2950 case WAND:
2781 case ROD: 2951 case ROD:
2782 case HORN: 2952 case HORN:
2783 if (player *pl = who->contr) 2953 if (player *pl = who->contr)
… …
2810 default: 2980 default:
2811 who->statusmsg (format ("You unapply %s.", query_name (op))); 2981 who->statusmsg (format ("You unapply %s.", query_name (op)));
2812 break; 2982 break;
2813 } 2983 }
2814 2984
2985 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
2986 if (object *pl = op->visible_to ())
2987 esrv_send_item (pl, op);
2988
2815 who->update_stats (); 2989 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 2990
2833 return 0; 2991 return 0;
2834} 2992}
2835 2993
2836/** 2994/**
… …
3134 return 1; 3292 return 1;
3135 } 3293 }
3136 3294
3137 return unapply_special (who, op, aflags); 3295 return unapply_special (who, op, aflags);
3138 } 3296 }
3139
3140 if (basic_flag == AP_UNAPPLY) 3297 else if (basic_flag == AP_UNAPPLY)
3141 return 0; 3298 return 0;
3142 3299
3143 // if the item is combat/ranged, wield the relevant slot first 3300 // if the item is combat/ranged, wield the relevant slot first
3144 // to resolve conflicts. 3301 // to resolve conflicts.
3145 if (player *pl = who->contr) 3302 if (player *pl = who->contr)
… …
3203 * skill so that the dam and wc get updated 3360 * skill so that the dam and wc get updated
3204 */ 3361 */
3205 who->change_skill (skop); 3362 who->change_skill (skop);
3206 } 3363 }
3207 3364
3208 if (who->type == PLAYER 3365 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 { 3366 {
3212 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3367 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3213 return 1; 3368 return 1;
3214 } 3369 }
3215 3370
3216 /* Ok. We are now at the state where we can apply the new object. 3371 /* 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_... 3372 * Note that we don't have the checks for can_use_...
3218 * below - that is already taken care of by can_apply_object. 3373 * below - that is already taken care of by can_apply_object.
3219 */ 3374 */
3220 if (op->nrof > 1) 3375 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 3376
3225 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3377 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3226 return RESULT_INT (0); 3378 return RESULT_INT (0);
3227 3379
3228 switch (op->type) 3380 switch (op->type)
3229 { 3381 {
3230 case WEAPON: 3382 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 3383 //TODO: this obviously fails for players using a shorter prefix
3242 // i.e. "R" can use Ragnarok's sword. 3384 // i.e. "R" can use Ragnarok's sword.
3243 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3385 if (op->level && !op->name.starts_with (who->name))
3244 { 3386 {
3245 /* if the weapon does not have the name as the character, can't use it. */ 3387 /* 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) */ 3388 /* (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.>"); 3389 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3248 3390
… …
3282 case AMULET: 3424 case AMULET:
3283 SET_FLAG (op, FLAG_APPLIED); 3425 SET_FLAG (op, FLAG_APPLIED);
3284 who->statusmsg (format ("You wear %s.", query_name (op))); 3426 who->statusmsg (format ("You wear %s.", query_name (op)));
3285 change_abil (who, op); 3427 change_abil (who, op);
3286 break; 3428 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 3429
3338 case SKILL_TOOL: 3430 case SKILL_TOOL:
3339 // applying a skill tool also readies the skill 3431 // applying a skill tool also readies the skill
3340 SET_FLAG (op, FLAG_APPLIED); 3432 SET_FLAG (op, FLAG_APPLIED);
3341 3433
… …
3421 } 3513 }
3422 3514
3423 break; 3515 break;
3424 3516
3425 case BOW: 3517 case BOW:
3426 if (!check_weapon_power (who, op->last_eat)) 3518 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 { 3519 {
3438 who->failmsg ("The weapon does not recognize you as its owner. " 3520 who->failmsg ("The weapon does not recognize you as its owner. "
3439 "H<Its name indicates that it belongs to somebody else.>"); 3521 "H<Its name indicates that it belongs to somebody else.>");
3440 if (tmp) 3522 if (tmp)
3441 insert_ob_in_ob (tmp, who); 3523 insert_ob_in_ob (tmp, who);
… …
3499 } 3581 }
3500 3582
3501 SET_FLAG (op, FLAG_APPLIED); 3583 SET_FLAG (op, FLAG_APPLIED);
3502 3584
3503 if (tmp) 3585 if (tmp)
3504 tmp = insert_ob_in_ob (tmp, who); 3586 who->insert (tmp);
3505 3587
3506 who->update_stats (); 3588 who->update_stats ();
3507 3589
3508 /* We exclude spell casting objects. The fire code will set the 3590 /* We exclude spell casting objects. The fire code will set the
3509 * been applied flag when they are used - until that point, 3591 * been applied flag when they are used - until that point,
… …
3515 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3597 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3516 if (who->type == PLAYER) 3598 if (who->type == PLAYER)
3517 { 3599 {
3518 who->failmsg ( 3600 who->failmsg (
3519 "Oops, it feels deadly cold! " 3601 "Oops, it feels deadly cold! "
3520 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3602 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3521 ); 3603 );
3522 SET_FLAG (op, FLAG_KNOWN_CURSED); 3604 SET_FLAG (op, FLAG_KNOWN_CURSED);
3523 } 3605 }
3524 3606
3525 if (who->type == PLAYER) 3607 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); 3608 esrv_send_item (pl, op);
3532 }
3533 3609
3534 return 0; 3610 return 0;
3535} 3611}
3536 3612
3537int 3613int
… …
3551int 3627int
3552auto_apply (object *op) 3628auto_apply (object *op)
3553{ 3629{
3554 object *tmp = NULL, *tmp2; 3630 object *tmp = NULL, *tmp2;
3555 int i; 3631 int i;
3632
3633 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3556 3634
3557 switch (op->type) 3635 switch (op->type)
3558 { 3636 {
3559 case SHOP_FLOOR: 3637 case SHOP_FLOOR:
3560 if (!op->has_random_items ()) 3638 if (!op->has_random_items ())
… …
3562 3640
3563 do 3641 do
3564 { 3642 {
3565 i = 10; /* let's give it 10 tries */ 3643 i = 10; /* let's give it 10 tries */
3566 while ((tmp = generate_treasure (op->randomitems, 3644 while ((tmp = generate_treasure (op->randomitems,
3567 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3645 op->stats.exp
3646 ? (int) op->stats.exp
3647 : max (op->map->difficulty, 5)))
3648 == NULL && --i);
3649
3568 if (tmp == NULL) 3650 if (tmp == NULL)
3569 return 0; 3651 return 0;
3652
3570 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3653 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3571 { 3654 {
3572 tmp->destroy (); 3655 tmp->destroy ();
3573 tmp = NULL; 3656 tmp = NULL;
3574 } 3657 }
… …
3577 3660
3578 tmp->x = op->x; 3661 tmp->x = op->x;
3579 tmp->y = op->y; 3662 tmp->y = op->y;
3580 SET_FLAG (tmp, FLAG_UNPAID); 3663 SET_FLAG (tmp, FLAG_UNPAID);
3581 insert_ob_in_map (tmp, op->map, NULL, 0); 3664 insert_ob_in_map (tmp, op->map, NULL, 0);
3582 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3583 identify (tmp); 3665 identify (tmp);
3584 break; 3666 break;
3585 3667
3586 case TREASURE: 3668 case TREASURE:
3587 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3669 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
3594 /* If we generated an object and put it in this object inventory, 3676 /* 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 3677 * move it to the parent object as the current object is about
3596 * to disappear. An example of this item is the random_* stuff 3678 * to disappear. An example of this item is the random_* stuff
3597 * that is put inside other objects. 3679 * that is put inside other objects.
3598 */ 3680 */
3599 for (tmp = op->inv; tmp; tmp = tmp2)
3600 {
3601 tmp2 = tmp->below;
3602 tmp->remove ();
3603
3604 if (op->env) 3681 if (op->env)
3605 insert_ob_in_ob (tmp, op->env); 3682 while (op->inv)
3606 else 3683 op->env->insert (op->inv);
3607 tmp->destroy ();
3608 }
3609 3684
3610 op->destroy (); 3685 op->destroy ();
3611 break; 3686 break;
3612 } 3687 }
3613 return tmp ? 1 : 0; 3688
3689 return !!tmp;
3614} 3690}
3615 3691
3616/** 3692/**
3617 * fix_auto_apply goes through the entire map every time a map 3693 * fix_auto_apply goes through the entire map every time a map
3618 * is loaded or swapped in and performs special actions for 3694 * is loaded or swapped in and performs special actions for
… …
3632 3708
3633 if (tmp->inv) 3709 if (tmp->inv)
3634 { 3710 {
3635 object *invtmp, *invnext; 3711 object *invtmp, *invnext;
3636 3712
3637 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3713 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3638 { 3714 {
3639 invnext = invtmp->below; 3715 invnext = invtmp->below;
3640 3716
3641 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3717 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3642 auto_apply (invtmp); 3718 auto_apply (invtmp);
3643 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3719 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3644 { 3720 {
3645 while ((invtmp->stats.hp--) > 0) 3721 while (invtmp->stats.hp-- > 0)
3646 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0); 3722 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3647 3723
3648 invtmp->randomitems = NULL; 3724 invtmp->randomitems = NULL;
3649 } 3725 }
3650 else if (invtmp && invtmp->arch 3726 else if (invtmp && invtmp->arch
… …
3711 } 3787 }
3712 3788
3713 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3789 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3714 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3790 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3715 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3791 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3716 check_trigger (tmp, tmp->above); 3792 check_trigger (tmp, tmp->above, tmp->above);
3717} 3793}
3718 3794
3719/** 3795/**
3720 * Handles player eating food that temporarily changes status (resistances, stats). 3796 * Handles player eating food that temporarily changes status (resistances, stats).
3721 * This used to call cast_change_attr(), but 3797 * This used to call cast_change_attr(), but
… …
3726eat_special_food (object *who, object *food) 3802eat_special_food (object *who, object *food)
3727{ 3803{
3728 object *force; 3804 object *force;
3729 int i, did_one = 0; 3805 int i, did_one = 0;
3730 3806
3731 force = get_archetype (FORCE_NAME); 3807 char buf[64];
3808 snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
3809 shstr key (buf);
3732 3810
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 */ 3811 /* bigger morsel of food = longer effect time */
3754 force->duration = food->stats.food / 5; 3812 int duration = TIME2TICK (food->stats.food);
3755 SET_FLAG (force, FLAG_APPLIED); 3813
3756 change_abil (who, force); 3814 if (force = who->force_find (key))
3757 insert_ob_in_ob (force, who); 3815 {
3816 if (duration > abs (force->speed_left / force->speed))
3817 {
3818 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));
3819 force->force_set_timer (duration);
3820 }
3821 else
3822 new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
3823
3824 return;
3758 } 3825 }
3759 else 3826 else
3827 {
3828 force = who->force_add (key, duration);
3829 force->name = key;
3830
3831 /* check if the food affects a stat */
3832 for (i = 0; i < NUM_STATS; i++)
3833 if (sint8 k = food->stats.stat (i))
3834 {
3835 force->stats.stat (i) = k;
3836 did_one = 1;
3837 }
3838
3839 /* check if we can protect the eater */
3840 for (i = 0; i < NROFATTACKS; i++)
3841 {
3842 if (food->resist[i] > 0)
3843 {
3844 force->resist[i] = food->resist[i];
3845 did_one = 1;
3846 }
3847 }
3848
3849 if (did_one)
3850 {
3851 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));
3852
3853 /* make the force take effect and report effects to user */
3854 change_abil (who, force);
3855 }
3856 else
3760 force->destroy (); 3857 force->destroy ();
3858 }
3761 3859
3762 /* check for hp, sp change */ 3860 /* check for hp, sp change */
3763 if (food->stats.hp != 0) 3861 if (food->stats.hp != 0)
3764 { 3862 {
3765 if (QUERY_FLAG (food, FLAG_CURSED)) 3863 if (QUERY_FLAG (food, FLAG_CURSED))
3766 { 3864 {
3767 assign (who->contr->killer, food->name); 3865 who->contr->killer = food;
3768 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3866 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3769 who->failmsg ("Eck!...that was poisonous!"); 3867 who->failmsg ("Eck!...that was poisonous!");
3770 } 3868 }
3771 else 3869 else
3772 { 3870 {
… …
3776 who->failmsg ("Eck!...that was poisonous!"); 3874 who->failmsg ("Eck!...that was poisonous!");
3777 3875
3778 who->stats.hp += food->stats.hp; 3876 who->stats.hp += food->stats.hp;
3779 } 3877 }
3780 } 3878 }
3879
3781 if (food->stats.sp != 0) 3880 if (food->stats.sp != 0)
3782 { 3881 {
3783 if (QUERY_FLAG (food, FLAG_CURSED)) 3882 if (QUERY_FLAG (food, FLAG_CURSED))
3784 { 3883 {
3785 who->failmsg ("You are drained of mana!"); 3884 who->failmsg ("You are drained of mana!");
… …
3796 } 3895 }
3797 3896
3798 who->update_stats (); 3897 who->update_stats ();
3799} 3898}
3800 3899
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 3900
3867/** 3901/**
3868 * op made some mistake with a scroll, this takes care of punishment. 3902 * op made some mistake with a scroll, this takes care of punishment.
3869 * scroll_failure()- hacked directly from spell_failure 3903 * scroll_failure()- hacked directly from spell_failure
3870 */ 3904 */
… …
3970 } 4004 }
3971 4005
3972 /* insert the randomitems from the change's treasurelist into 4006 /* insert the randomitems from the change's treasurelist into
3973 * the player ref: player.c 4007 * the player ref: player.c
3974 */ 4008 */
3975 if (change->randomitems != NULL) 4009 if (change->randomitems)
3976 give_initial_items (pl, change->randomitems); 4010 give_initial_items (pl, change->randomitems);
3977 4011
3978 /* set up the face, for some races. */ 4012 /* set up the face, for some races. */
3979 4013
3980 /* first, look for the force object banning 4014 /* first, look for the force object banning
3981 * changing the face. Certain races never change face with class. 4015 * changing the face. Certain races never change face with class.
3982 */ 4016 */
3983 for (walk = pl->inv; walk != NULL; walk = walk->below) 4017 for (walk = pl->inv; walk; walk = walk->below)
3984 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4018 if (walk->name == shstr_NOCLASSFACECHANGE)
3985 flag_change_face = 0; 4019 flag_change_face = 0;
3986 4020
3987 if (flag_change_face) 4021 if (flag_change_face)
3988 { 4022 {
3989 pl->animation_id = GET_ANIM_ID (change);
3990 pl->face = change->face; 4023 pl->face = change->face;
3991 4024 pl->animation_id = change->animation_id;
3992 if (QUERY_FLAG (change, FLAG_ANIMATE)) 4025 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3993 SET_FLAG (pl, FLAG_ANIMATE);
3994 else
3995 CLEAR_FLAG (pl, FLAG_ANIMATE);
3996 } 4026 }
3997 4027
3998 /* check the special case of can't use weapons */ 4028 /* check the special case of can't use weapons */
3999 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4029 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
4000 if (!strcmp (change->name, "monk")) 4030 if (change->name == shstr_monk)
4001 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4031 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
4002 4032
4003 break; 4033 break;
4004 } 4034 }
4005 } 4035 }
… …
4042 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4072 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4043 return; 4073 return;
4044 } 4074 }
4045 4075
4046 /* check whether they are compatible or not */ 4076 /* check whether they are compatible or not */
4047 find = strstr (marked->slaying, transformer->arch->archname); 4077 find = strstr (&marked->slaying, transformer->arch->archname);
4048 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 4078 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4049 { 4079 {
4050 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4080 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4051 return; 4081 return;
4052 } 4082 }
… …
4094 4124
4095 new_item->nrof = yield; 4125 new_item->nrof = yield;
4096 4126
4097 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0))); 4127 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4098 4128
4099 insert_ob_in_ob (new_item, pl); 4129 pl->insert (new_item);
4100 esrv_send_inventory (pl, pl);
4101 /* Eat up one item */ 4130 /* Eat up one item */
4102 decrease_ob_nr (marked, 1); 4131 marked->decrease ();
4103 4132
4104 /* Eat one transformer if needed */ 4133 /* Eat one transformer if needed */
4105 if (transformer->stats.food) 4134 if (transformer->stats.food)
4106 if (--transformer->stats.food == 0) 4135 if (--transformer->stats.food == 0)
4107 decrease_ob_nr (transformer, 1); 4136 transformer->decrease ();
4108} 4137}
4109 4138

Diff Legend

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