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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.20 by root, Thu Dec 14 04:30:32 2006 UTC vs.
Revision 1.63 by root, Tue Jul 10 07:31:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <object.h> 25#include <object.h>
26#include <living.h> 26#include <living.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 27#include <sproto.h>
29#endif
30#include <spells.h> 28#include <spells.h>
31#include <sounds.h> 29#include <sounds.h>
32 30
33/* cast_magic_storm: This is really used mostly for spell 31/* cast_magic_storm: This is really used mostly for spell
34 * fumbles at the like. tmp is the object to propogate. 32 * fumbles at the like. tmp is the object to propogate.
… …
37void 35void
38cast_magic_storm (object *op, object *tmp, int lvl) 36cast_magic_storm (object *op, object *tmp, int lvl)
39{ 37{
40 if (!tmp) 38 if (!tmp)
41 return; /* error */ 39 return; /* error */
40
42 tmp->level = op->level; 41 tmp->level = op->level;
43 tmp->x = op->x;
44 tmp->y = op->y;
45 tmp->range += lvl / 5; /* increase the area of destruction */ 42 tmp->range += lvl / 5; /* increase the area of destruction */
46 tmp->duration += lvl / 5; 43 tmp->duration += lvl / 5;
47 44
48 /* Put a cap on duration for this - if the player fails in their 45 /* Put a cap on duration for this - if the player fails in their
49 * apartment, don't want it to go on so long that it kills them 46 * apartment, don't want it to go on so long that it kills them
50 * multiple times. Also, damge already increases with level, 47 * multiple times. Also, damge already increases with level,
51 * so don't really need to increase the duration as much either. 48 * so don't really need to increase the duration as much either.
52 */ 49 */
53 if (tmp->duration >= 40) 50 if (tmp->duration >= 40)
54 tmp->duration = 40; 51 tmp->duration = 40;
52
55 tmp->stats.dam = lvl; /* nasty recoils! */ 53 tmp->stats.dam = lvl; /* nasty recoils! */
56 tmp->stats.maxhp = tmp->count; /* tract single parent */ 54 tmp->stats.maxhp = tmp->count; /* tract single parent */
57 insert_ob_in_map (tmp, op->map, op, 0);
58 55
56 tmp->insert_at (op, op);
59} 57}
60
61 58
62int 59int
63recharge (object *op, object *caster, object *spell_ob) 60recharge (object *op, object *caster, object *spell_ob)
64{ 61{
65 object *wand, *tmp; 62 object *wand, *tmp;
… …
77 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE); 74 play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
78 esrv_del_item (op->contr, wand->count); 75 esrv_del_item (op->contr, wand->count);
79 wand->destroy (); 76 wand->destroy ();
80 tmp = get_archetype ("fireball"); 77 tmp = get_archetype ("fireball");
81 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 78 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
79
82 if (!tmp->stats.dam) 80 if (!tmp->stats.dam)
83 tmp->stats.dam = 1; 81 tmp->stats.dam = 1;
82
84 tmp->stats.hp = tmp->stats.dam / 2; 83 tmp->stats.hp = tmp->stats.dam / 2;
84
85 if (tmp->stats.hp < 2) 85 if (tmp->stats.hp < 2)
86 tmp->stats.hp = 2; 86 tmp->stats.hp = 2;
87 tmp->x = op->x; 87
88 tmp->y = op->y; 88 tmp->insert_at (op);
89 insert_ob_in_map (tmp, op->map, NULL, 0);
90 return 1; 89 return 1;
91 } 90 }
92 91
93 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)); 92 ncharges = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob));
93
94 if (wand->inv && wand->inv->level) 94 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 95 ncharges /= wand->inv->level;
96 else 96 else
97 { 97 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand));
99 return 0; 99 return 0;
100 } 100 }
101
101 if (!ncharges) 102 if (!ncharges)
102 ncharges = 1; 103 ncharges = 1;
103 104
104 wand->stats.food += ncharges; 105 wand->stats.food += ncharges;
105 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand)); 106 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s glows with power.", query_name (wand));
107
106 if (wand->arch && QUERY_FLAG (&wand->arch->clone, FLAG_ANIMATE)) 108 if (wand->arch && QUERY_FLAG (wand->arch, FLAG_ANIMATE))
107 { 109 {
108 SET_FLAG (wand, FLAG_ANIMATE); 110 SET_FLAG (wand, FLAG_ANIMATE);
109 wand->speed = wand->arch->clone.speed; 111 wand->set_speed (wand->arch->speed);
110 update_ob_speed (wand);
111 } 112 }
113
112 return 1; 114 return 1;
113} 115}
114 116
115/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows 117/* Create a missile (nonmagic - magic +4). Will either create bolts or arrows
116 * based on whether a crossbow or bow is equiped. If neither, it defaults to 118 * based on whether a crossbow or bow is equiped. If neither, it defaults to
… …
151 /* If it starts with a letter, presume it is a description */ 153 /* If it starts with a letter, presume it is a description */
152 if (isalpha (*stringarg)) 154 if (isalpha (*stringarg))
153 { 155 {
154 artifact *al = find_artifactlist (missile->type)->items; 156 artifact *al = find_artifactlist (missile->type)->items;
155 157
156 for (; al != NULL; al = al->next) 158 for (; al; al = al->next)
157 if (!strcasecmp (al->item->name, stringarg)) 159 if (!strcasecmp (al->item->name, stringarg))
158 break; 160 break;
159 161
160 if (!al) 162 if (!al)
161 { 163 {
… …
221 if (stringarg) 223 if (stringarg)
222 { 224 {
223 at = find_archetype_by_object_type_name (FOOD, stringarg); 225 at = find_archetype_by_object_type_name (FOOD, stringarg);
224 if (at == NULL) 226 if (at == NULL)
225 at = find_archetype_by_object_type_name (DRINK, stringarg); 227 at = find_archetype_by_object_type_name (DRINK, stringarg);
226 if (at == NULL || at->clone.stats.food > food_value) 228 if (at == NULL || at->stats.food > food_value)
227 stringarg = NULL; 229 stringarg = NULL;
228 } 230 }
229 231
230 if (!stringarg) 232 if (!stringarg)
231 { 233 {
… …
237 * We don't use flesh types because the weight values of those need 239 * We don't use flesh types because the weight values of those need
238 * to be altered from the donor. 240 * to be altered from the donor.
239 */ 241 */
240 242
241 /* We assume the food items don't have multiple parts */ 243 /* We assume the food items don't have multiple parts */
242 for (at_tmp = first_archetype; at_tmp != NULL; at_tmp = at_tmp->next) 244 for_all_archetypes (at_tmp)
243 { 245 {
244 if (at_tmp->clone.type == FOOD || at_tmp->clone.type == DRINK) 246 if (at_tmp->type == FOOD || at_tmp->type == DRINK)
245 { 247 {
246 /* Basically, if the food value is something that is creatable 248 /* Basically, if the food value is something that is creatable
247 * under the limits of the spell and it is higher than 249 * under the limits of the spell and it is higher than
248 * the item we have now, take it instead. 250 * the item we have now, take it instead.
249 */ 251 */
250 if (at_tmp->clone.stats.food <= food_value && (!at || at_tmp->clone.stats.food > at->clone.stats.food)) 252 if (at_tmp->stats.food <= food_value
253 && (!at
254 || at_tmp->stats.food > at->stats.food
255 || (at_tmp->stats.food == at->stats.food
256 && at_tmp->weight < at->weight)))
251 at = at_tmp; 257 at = at_tmp;
252 } 258 }
253 } 259 }
254 } 260 }
255 /* Pretty unlikely (there are some very low food items), but you never 261 /* Pretty unlikely (there are some very low food items), but you never
… …
259 { 265 {
260 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food."); 266 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");
261 return 0; 267 return 0;
262 } 268 }
263 269
264 food_value /= at->clone.stats.food; 270 food_value /= at->stats.food;
265 new_op = arch_to_object (at); 271 new_op = arch_to_object (at);
266 new_op->nrof = food_value; 272 new_op->nrof = food_value;
267 273
268 new_op->value = 0; 274 new_op->value = 0;
269 if (new_op->nrof < 1) 275 if (new_op->nrof < 1)
… …
302 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic."); 308 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
303 return 0; 309 return 0;
304 } 310 }
305 if (mflags & P_IS_ALIVE) 311 if (mflags & P_IS_ALIVE)
306 { 312 {
307 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 313 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
308 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 314 if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
309 { 315 {
310 new_draw_info (NDI_UNIQUE, 0, op, "You detect something."); 316 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
311 if (tmp->head != NULL) 317 if (tmp->head != NULL)
312 tmp = tmp->head; 318 tmp = tmp->head;
… …
370 * normal applies. 376 * normal applies.
371 */ 377 */
372int 378int
373cast_invisible (object *op, object *caster, object *spell_ob) 379cast_invisible (object *op, object *caster, object *spell_ob)
374{ 380{
375 object *tmp;
376
377 if (op->invisible > 1000) 381 if (op->invisible > 1000)
378 { 382 {
379 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further"); 383 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further");
380 return 0; 384 return 0;
381 } 385 }
… …
397 else 401 else
398 op->contr->tmp_invis = 1; 402 op->contr->tmp_invis = 1;
399 403
400 op->contr->hidden = 0; 404 op->contr->hidden = 0;
401 } 405 }
406
402 if (makes_invisible_to (op, op)) 407 if (makes_invisible_to (op, op))
403 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!"); 408 new_draw_info (NDI_UNIQUE, 0, op, "You can't see your hands!");
404 else 409 else
405 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!"); 410 new_draw_info (NDI_UNIQUE, 0, op, "You feel more transparent!");
406 411
407 update_object (op, UP_OBJ_FACE); 412 update_object (op, UP_OBJ_CHANGE);
408 413
409 /* Only search the active objects - only these should actually do 414 /* Only search the active objects - only these should actually do
410 * harm to the player. 415 * harm to the player.
411 */ 416 */
412 for (tmp = active_objects; tmp != NULL; tmp = tmp->active_next) 417 for_all_actives (tmp)
413 if (tmp->enemy == op) 418 if (tmp->enemy == op)
414 tmp->enemy = NULL; 419 tmp->enemy = 0;
420
415 return 1; 421 return 1;
416} 422}
417 423
418/* earth to dust spell. Basically destroys earthwalls in the area. 424/* earth to dust spell. Basically destroys earthwalls in the area.
419 */ 425 */
… …
440 446
441 if (mflags & P_OUT_OF_MAP) 447 if (mflags & P_OUT_OF_MAP)
442 continue; 448 continue;
443 449
444 // earth to dust tears down everything that can be teared down 450 // earth to dust tears down everything that can be teared down
445 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 451 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
446 { 452 {
447 next = tmp->above; 453 next = tmp->above;
448 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN)) 454 if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
449 hit_player (tmp, 9998, op, AT_PHYSICAL, 0); 455 hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
450 } 456 }
451 } 457 }
458
452 return 1; 459 return 1;
453} 460}
454
455 461
456void 462void
457execute_word_of_recall (object *op) 463execute_word_of_recall (object *op)
458{ 464{
459 object *wor = op; 465 if (object *pl = op->in_player ())
460 466 {
461 while (op != NULL && op->type != PLAYER) 467 if (pl->ms ().flags () & P_NO_CLERIC && !QUERY_FLAG (pl, FLAG_WIZCAST))
462 op = op->env;
463
464 if (op != NULL && op->map)
465 if ((get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) && (!QUERY_FLAG (op, FLAG_WIZCAST)))
466 new_draw_info (NDI_UNIQUE, 0, op, "You feel something fizzle inside you."); 468 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
467 else 469 else
470 {
471 // remove first so we do not call update_stats
472 op->remove ();
468 enter_exit (op, wor); 473 pl->enter_exit (op);
474 }
475 }
469 476
470 wor->destroy (); 477 op->destroy ();
471} 478}
472 479
473/* Word of recall causes the player to return 'home'. 480/* Word of recall causes the player to return 'home'.
474 * we put a force into the player object, so that there is a 481 * we put a force into the player object, so that there is a
475 * time delay effect. 482 * time delay effect.
… …
494 { 501 {
495 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 502 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
496 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n"); 503 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
497 return 0; 504 return 0;
498 } 505 }
506
499 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 507 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob);
500 if (time < 1) 508 if (time < 1)
501 time = 1; 509 time = 1;
502 510
503 /* value of speed really doesn't make much difference, as long as it is 511 /* value of speed really doesn't make much difference, as long as it is
504 * positive. Lower value may be useful so that the problem doesn't 512 * positive. Lower value may be useful so that the problem doesn't
505 * do anything really odd if it say a -1000 or something. 513 * do anything really odd if it say a -1000 or something.
506 */ 514 */
507 dummy->speed = 0.002; 515 dummy->set_speed (0.002);
508 update_ob_speed (dummy);
509 dummy->speed_left = -dummy->speed * time; 516 dummy->speed_left = -dummy->speed * time;
510 dummy->type = SPELL_EFFECT; 517 dummy->type = SPELL_EFFECT;
511 dummy->subtype = SP_WORD_OF_RECALL; 518 dummy->subtype = SP_WORD_OF_RECALL;
512 519
513 /* If we could take advantage of enter_player_savebed() here, it would be 520 /* If we could take advantage of enter_player_savebed() here, it would be
514 * nice, but until the map load fails, we can't. 521 * nice, but until the map load fails, we can't.
515 */ 522 */
516 EXIT_PATH (dummy) = op->contr->savebed_map; 523 EXIT_PATH (dummy) = op->contr->savebed_map;
517 EXIT_X (dummy) = op->contr->bed_x; 524 EXIT_X (dummy) = op->contr->bed_x;
518 EXIT_Y (dummy) = op->contr->bed_y; 525 EXIT_Y (dummy) = op->contr->bed_y;
519 526
520 (void) insert_ob_in_ob (dummy, op); 527 op->insert (dummy);
528
521 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 529 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
530
522 return 1; 531 return 1;
523} 532}
524 533
525/* cast_wonder 534/* cast_wonder
526 * wonder is really just a spell that will likely cast another 535 * wonder is really just a spell that will likely cast another
… …
556 return cast_spell (op, caster, dir, newspell, NULL); 565 return cast_spell (op, caster, dir, newspell, NULL);
557 } 566 }
558 return 1; 567 return 1;
559} 568}
560 569
561
562int 570int
563perceive_self (object *op) 571perceive_self (object *op)
564{ 572{
565 char *cp = describe_item (op, op), buf[MAX_BUF]; 573 const char *cp = describe_item (op, op);
566 archetype *at = archetype::find (ARCH_DEPLETION); 574 archetype *at = archetype::find (ARCH_DEPLETION);
567 object *tmp;
568 int i;
569 575
576 dynbuf_text buf;
577
578 if (player *pl = op->contr)
579 if (object *race = archetype::find (op->race))
580 buf << "You are a " << (pl->gender ? "female" : "male") << " " << &race->name << ".\n";
581
570 tmp = find_god (determine_god (op)); 582 if (object *god = find_god (determine_god (op)))
571 if (tmp) 583 buf << "You worship " << &god->name << ".\n";
572 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s", &tmp->name);
573 else 584 else
574 new_draw_info (NDI_UNIQUE, 0, op, "You worship no god"); 585 buf << "You worship no god.\n";
575 586
576 tmp = present_arch_in_ob (at, op); 587 object *tmp = present_arch_in_ob (at, op);
577 588
578 if (*cp == '\0' && tmp == NULL) 589 if (*cp == '\0' && tmp == NULL)
579 new_draw_info (NDI_UNIQUE, 0, op, "You feel very mundane"); 590 buf << "You feel very mundane. ";
580 else 591 else
581 { 592 {
582 new_draw_info (NDI_UNIQUE, 0, op, "You have:"); 593 buf << "You have: " << cp << ".\n";
583 new_draw_info (NDI_UNIQUE, 0, op, cp); 594
584 if (tmp != NULL) 595 if (tmp)
585 {
586 for (i = 0; i < NUM_STATS; i++) 596 for (int i = 0; i < NUM_STATS; i++)
587 { 597 if (tmp->stats.stat (i) < 0)
588 if (get_attr_value (&tmp->stats, i) < 0) 598 buf.printf ("Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
589 {
590 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is depleted by %d", statname[i], -(get_attr_value (&tmp->stats, i)));
591 }
592 }
593 }
594 } 599 }
595 600
596 if (is_dragon_pl (op)) 601 if (is_dragon_pl (op))
597 {
598 /* now grab the 'dragon_ability'-force from the player's inventory */ 602 /* now grab the 'dragon_ability'-force from the player's inventory */
599 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 603 for (tmp = op->inv; tmp; tmp = tmp->below)
600 { 604 {
601 if (tmp->type == FORCE && !strcmp (tmp->arch->name, "dragon_ability_force")) 605 if (tmp->type == FORCE && !strcmp (tmp->arch->archname, "dragon_ability_force"))
602 { 606 {
603 if (tmp->stats.exp == 0) 607 if (tmp->stats.exp == 0)
604 {
605 sprintf (buf, "Your metabolism isn't focused on anything."); 608 buf << "Your metabolism isn't focused on anything.\n";
606 }
607 else 609 else
608 {
609 sprintf (buf, "Your metabolism is focused on %s.", change_resist_msg[tmp->stats.exp]); 610 buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
610 } 611
611 new_draw_info (NDI_UNIQUE, 0, op, buf);
612 break; 612 break;
613 } 613 }
614 } 614 }
615 } 615
616 buf << '\0'; // zero-terminate
617
618 new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
619
616 return 1; 620 return 1;
617} 621}
618
619/* int cast_create_town_portal (object *op, object *caster, int dir)
620 *
621 * This function cast the spell of town portal for op
622 *
623 * The spell operates in two passes. During the first one a place
624 * is marked as a destination for the portal. During the second one,
625 * 2 portals are created, one in the position the player cast it and
626 * one in the destination place. The portal are synchronized and 2 forces
627 * are inserted in the player to destruct the portal next time player
628 * creates a new portal pair.
629 * This spell has a side effect that it allows people to meet each other
630 * in a permanent, private, appartements by making a town portal from it
631 * to the town or another public place. So, check if the map is unique and if
632 * so return an error
633 *
634 * Code by Tchize (david.delbecq@usa.net)
635 */
636int
637cast_create_town_portal (object *op, object *caster, object *spell, int dir)
638{
639 object *dummy, *force, *old_force, *tmp;
640 archetype *perm_portal;
641 char portal_name[1024], portal_message[1024];
642 sint16 exitx, exity;
643 maptile *exitmap;
644 int op_level;
645
646
647 /* Check to see if the map the player is currently on is a per player unique
648 * map. This can be determined in that per player unique maps have the
649 * full pathname listed.
650 */
651 if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
652 {
653 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You can't cast that here.\n");
654 return 0;
655 }
656
657 /* The first thing to do is to check if we have a marked destination
658 * dummy is used to make a check inventory for the force
659 */
660 dummy = arch_to_object (spell->other_arch);
661 if (dummy == NULL)
662 {
663 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
664 LOG (llevError, "object::create failed (force in cast_create_town_portal for %s!\n", &op->name);
665 return 0;
666 }
667
668 force = check_inv_recursive (op, dummy);
669
670 if (force == NULL)
671 {
672 /* Here we know there is no destination marked up.
673 * We have 2 things to do:
674 * 1. Mark the destination in the player inventory.
675 * 2. Let the player know it worked.
676 */
677 dummy->name = op->map->path;
678 EXIT_X (dummy) = op->x;
679 EXIT_Y (dummy) = op->y;
680 insert_ob_in_ob (dummy, op);
681 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You fix this place in your mind.\nYou feel you are able to come here from anywhere.");
682 return 1;
683 }
684
685 dummy->destroy ();
686
687 /* Here we know where the town portal should go to
688 * We should kill any existing portal associated with the player.
689 * Than we should create the 2 portals.
690 * For each of them, we need:
691 * - To create the portal with the name of the player+destination map
692 * - set the owner of the town portal
693 * - To mark the position of the portal in the player's inventory
694 * for easier destruction.
695 *
696 * The mark works has follow:
697 * slaying: Existing town portal
698 * hp, sp : x & y of the associated portal
699 * name : name of the portal
700 * race : map the portal is in
701 */
702
703 /* First step: killing existing town portals */
704 dummy = get_archetype (spell->race);
705 if (dummy == NULL)
706 {
707 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
708 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
709 return 0;
710 }
711
712 perm_portal = archetype::find (spell->slaying);
713
714 /* To kill a town portal, we go trough the player's inventory,
715 * for each marked portal in player's inventory,
716 * -We try load the associated map (if impossible, consider the portal destructed)
717 * -We find any portal in the specified location.
718 * If it has the good name, we destruct it.
719 * -We destruct the force indicating that portal.
720 */
721 while ((old_force = check_inv_recursive (op, dummy)))
722 {
723 exitx = EXIT_X (old_force);
724 exity = EXIT_Y (old_force);
725 LOG (llevDebug, "Trying to kill a portal in %s (%d,%d)\n", &old_force->race, exitx, exity);
726
727 if (!strncmp (old_force->race, settings.localdir, strlen (settings.localdir)))
728 exitmap = ready_map_name (old_force->race, MAP_PLAYER_UNIQUE);
729 else
730 exitmap = ready_map_name (old_force->race, 0);
731
732 if (exitmap)
733 {
734 tmp = present_arch (perm_portal, exitmap, exitx, exity);
735 while (tmp)
736 {
737 if (tmp->name == old_force->name)
738 {
739 tmp->destroy ();
740 break;
741 }
742
743 tmp = tmp->above;
744 }
745 }
746
747 old_force->destroy ();
748 LOG (llevDebug, "\n");
749 }
750
751 dummy->destroy ();
752
753 /* Creating the portals.
754 * The very first thing to do is to ensure
755 * access to the destination map.
756 * If we can't, don't fizzle. Simply warn player.
757 * This ensure player pays his mana for the spell
758 * because HE is responsible of forgotting.
759 * 'force' is the destination of the town portal, which we got
760 * from the players inventory above.
761 */
762
763 /* Ensure exit map is loaded */
764 if (!strncmp (force->name, settings.localdir, strlen (settings.localdir)))
765 exitmap = ready_map_name (force->name, MAP_PLAYER_UNIQUE);
766 else
767 exitmap = ready_map_name (force->name, 0);
768
769 /* If we were unable to load (ex. random map deleted), warn player */
770 if (exitmap == NULL)
771 {
772 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Something strange happens.\nYou can't remember where to go!?");
773 force->destroy ();
774 return 1;
775 }
776
777 op_level = caster_level (caster, spell);
778 if (op_level < 15)
779 snprintf (portal_message, 1024,
780 "\nThe air moves around you and\na huge smell of ammonia\nsurounds you as you pass\nthrough %s's tiny portal\nPouah!\n",
781 &op->name);
782 else if (op_level < 30)
783 snprintf (portal_message, 1024,
784 "\n%s's portal smells of ozone.\nYou do a lot of movements and finally pass\nthrough the small hole in the air\n", &op->name);
785 else if (op_level < 60)
786 snprintf (portal_message, 1024, "\nA shining door opens in the air in front of you,\nshowing you the path to another place.\n");
787 else
788 snprintf (portal_message, 1024, "\nAs you walk through %s's portal, flowers come out\nfrom the ground around you.\nYou feel awed.\n",
789 &op->name);
790
791 /* Create a portal in front of player
792 * dummy contain the portal and
793 * force contain the track to kill it later
794 */
795
796 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, &force->name);
797 dummy = get_archetype (spell->slaying); /*The portal */
798 if (dummy == NULL)
799 {
800 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
801 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
802 return 0;
803 }
804
805 EXIT_PATH (dummy) = force->name;
806 EXIT_X (dummy) = EXIT_X (force);
807 EXIT_Y (dummy) = EXIT_Y (force);
808 dummy->name = dummy->name_pl = portal_name;
809 dummy->msg = portal_message;
810 dummy->race = op->name; /*Save the owner of the portal */
811 cast_create_obj (op, caster, dummy, 0);
812
813 /* Now we need to to create a town portal marker inside the player
814 * object, so on future castings, we can know that he has an active
815 * town portal.
816 */
817 tmp = get_archetype (spell->race);
818 if (tmp == NULL)
819 {
820 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
821 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
822 return 0;
823 }
824
825 tmp->race = op->map->path;
826 tmp->name = portal_name;
827 EXIT_X (tmp) = dummy->x;
828 EXIT_Y (tmp) = dummy->y;
829 insert_ob_in_ob (tmp, op);
830
831 /* Create a portal in the destination map
832 * dummy contain the portal and
833 * force the track to kill it later
834 * the 'force' variable still contains the 'reminder' of
835 * where this portal goes to.
836 */
837 snprintf (portal_name, 1024, "%s's portal to %s", &op->name, op->map->path);
838 dummy = get_archetype (spell->slaying); /*The portal */
839 if (dummy == NULL)
840 {
841 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
842 LOG (llevError, "object::create failed (perm_magic_portal) in cast_create_town_portal for %s!\n", &op->name);
843 return 0;
844 }
845
846 EXIT_PATH (dummy) = op->map->path;
847 EXIT_X (dummy) = op->x;
848 EXIT_Y (dummy) = op->y;
849 dummy->name = dummy->name_pl = portal_name;
850 dummy->msg = portal_message;
851 dummy->x = EXIT_X (force);
852 dummy->y = EXIT_Y (force);
853 dummy->race = op->name; /*Save the owner of the portal */
854 insert_ob_in_map (dummy, exitmap, op, 0);
855
856 /* Now we create another town portal marker that
857 * points back to the one we just made
858 */
859 tmp = get_archetype (spell->race);
860 if (tmp == NULL)
861 {
862 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
863 LOG (llevError, "object::create failed (force) in cast_create_town_portal for %s!\n", &op->name);
864 return 0;
865 }
866
867 tmp->race = force->name;
868 tmp->name = portal_name;
869 EXIT_X (tmp) = dummy->x;
870 EXIT_Y (tmp) = dummy->y;
871 insert_ob_in_ob (tmp, op);
872
873 /* Describe the player what happened
874 */
875 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You see air moving and showing you the way home.");
876 force->destroy ();
877
878 return 1;
879}
880
881 622
882/* This creates magic walls. Really, it can create most any object, 623/* This creates magic walls. Really, it can create most any object,
883 * within some reason. 624 * within some reason.
884 */ 625 */
885
886int 626int
887magic_wall (object *op, object *caster, int dir, object *spell_ob) 627magic_wall (object *op, object *caster, int dir, object *spell_ob)
888{ 628{
889 object *tmp, *tmp2; 629 object *tmp;
890 int i, posblocked, negblocked, maxrange; 630 int i, posblocked, negblocked, maxrange;
891 sint16 x, y; 631 sint16 x, y;
892 maptile *m; 632 maptile *m;
893 const char *name; 633 const char *name;
894 archetype *at; 634 archetype *at;
… …
902 else 642 else
903 { 643 {
904 x = op->x + freearr_x[dir]; 644 x = op->x + freearr_x[dir];
905 y = op->y + freearr_y[dir]; 645 y = op->y + freearr_y[dir];
906 } 646 }
647
907 m = op->map; 648 m = op->map;
908 649
909 if ((spell_ob->move_block || x != op->x || y != op->y) && 650 if ((spell_ob->move_block || x != op->x || y != op->y) &&
910 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 651 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
911 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 652 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
912 { 653 {
913 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 654 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
914 return 0; 655 return 0;
915 } 656 }
657
916 if (spell_ob->other_arch) 658 if (spell_ob->other_arch)
917 {
918 tmp = arch_to_object (spell_ob->other_arch); 659 tmp = arch_to_object (spell_ob->other_arch);
919 }
920 else if (spell_ob->race) 660 else if (spell_ob->race)
921 { 661 {
922 char buf1[MAX_BUF]; 662 char buf1[MAX_BUF];
923 663
924 sprintf (buf1, spell_ob->race, dir); 664 sprintf (buf1, spell_ob->race, dir);
… …
927 { 667 {
928 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1); 668 LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
929 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken."); 669 new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
930 return 0; 670 return 0;
931 } 671 }
672
932 tmp = arch_to_object (at); 673 tmp = arch_to_object (at);
933 } 674 }
934 else 675 else
935 { 676 {
936 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name); 677 LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
… …
946 } 687 }
947 else if (QUERY_FLAG (tmp, FLAG_ALIVE)) 688 else if (QUERY_FLAG (tmp, FLAG_ALIVE))
948 { 689 {
949 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 690 tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
950 tmp->stats.maxhp = tmp->stats.hp; 691 tmp->stats.maxhp = tmp->stats.hp;
951 tmp->set_owner (op);
952 set_spell_skill (op, caster, spell_ob, tmp);
953 } 692 }
693
954 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP)) 694 if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
955 { 695 {
956 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 696 tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
957 SET_FLAG (tmp, FLAG_IS_USED_UP); 697 SET_FLAG (tmp, FLAG_IS_USED_UP);
958 } 698 }
699
959 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN)) 700 if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
960 { 701 {
961 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 702 tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
962 tmp->stats.maxhp = tmp->stats.hp; 703 tmp->stats.maxhp = tmp->stats.hp;
963 SET_FLAG (tmp, FLAG_TEAR_DOWN); 704 SET_FLAG (tmp, FLAG_TEAR_DOWN);
964 SET_FLAG (tmp, FLAG_ALIVE); 705 SET_FLAG (tmp, FLAG_ALIVE);
965 } 706 }
966 707
967 /* This can't really hurt - if the object doesn't kill anything, 708 /* This can't really hurt - if the object doesn't kill anything,
968 * these fields just won't be used. 709 * these fields just won't be used. Do not set the owner for
710 * earthwalls, though, so they survive restarts.
969 */ 711 */
712 if (tmp->type != EARTHWALL) //TODO
970 tmp->set_owner (op); 713 tmp->set_owner (op);
714
971 set_spell_skill (op, caster, spell_ob, tmp); 715 set_spell_skill (op, caster, spell_ob, tmp);
972 tmp->x = x;
973 tmp->y = y;
974 tmp->level = caster_level (caster, spell_ob) / 2; 716 tmp->level = caster_level (caster, spell_ob) / 2;
975 717
976 name = tmp->name; 718 name = tmp->name;
977 if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL) 719 if (!(tmp = m->insert (tmp, x, y, op)))
978 { 720 {
979 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name); 721 new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
980 return 0; 722 return 0;
981 } 723 }
724
982 /* If this is a spellcasting wall, need to insert the spell object */ 725 /* If this is a spellcasting wall, need to insert the spell object */
983 if (tmp->other_arch && tmp->other_arch->clone.type == SPELL) 726 if (tmp->other_arch && tmp->other_arch->type == SPELL)
984 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp); 727 insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
985 728
986 /* This code causes the wall to extend some distance in 729 /* This code causes the wall to extend some distance in
987 * each direction, or until an obstruction is encountered. 730 * each direction, or until an obstruction is encountered.
988 * posblocked and negblocked help determine how far the 731 * posblocked and negblocked help determine how far the
… …
1004 m = tmp->map; 747 m = tmp->map;
1005 748
1006 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 749 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1007 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked) 750 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !posblocked)
1008 { 751 {
1009 tmp2 = tmp->clone (); 752 object *tmp2 = tmp->clone ();
1010 tmp2->x = x; 753 m->insert (tmp2, x, y, op);
1011 tmp2->y = y; 754
1012 insert_ob_in_map (tmp2, m, op, 0);
1013 /* If this is a spellcasting wall, need to insert the spell object */ 755 /* If this is a spellcasting wall, need to insert the spell object */
1014 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 756 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1015 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 757 tmp2->insert (arch_to_object (tmp2->other_arch));
1016 758
1017 } 759 }
1018 else 760 else
1019 posblocked = 1; 761 posblocked = 1;
1020 762
… …
1023 m = tmp->map; 765 m = tmp->map;
1024 766
1025 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) && 767 if (!(get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE)) &&
1026 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked) 768 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) != spell_ob->move_block) && !negblocked)
1027 { 769 {
1028 tmp2 = tmp->clone (); 770 object *tmp2 = tmp->clone ();
1029 tmp2->x = x; 771 m->insert (tmp2, x, y, op);
1030 tmp2->y = y; 772
1031 insert_ob_in_map (tmp2, m, op, 0);
1032 if (tmp2->other_arch && tmp2->other_arch->clone.type == SPELL) 773 if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
1033 insert_ob_in_ob (arch_to_object (tmp2->other_arch), tmp2); 774 tmp2->insert (arch_to_object (tmp2->other_arch));
1034 } 775 }
1035 else 776 else
1036 negblocked = 1; 777 negblocked = 1;
1037 } 778 }
1038 779
… …
1087 { 828 {
1088 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n"); 829 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
1089 op->contr->count = 0; 830 op->contr->count = 0;
1090 return 0; 831 return 0;
1091 } 832 }
833
1092 op->contr->count = 0; 834 op->contr->count = 0;
1093 835
1094 /* Remove code that puts player on random space on maps. IMO, 836 /* Remove code that puts player on random space on maps. IMO,
1095 * a lot of maps probably have areas the player should not get to, 837 * a lot of maps probably have areas the player should not get to,
1096 * but may not be marked as NO_MAGIC (as they may be bounded 838 * but may not be marked as NO_MAGIC (as they may be bounded
… …
1145 return 0; 887 return 0;
1146 } 888 }
1147 } 889 }
1148 890
1149 /* Actually move the player now */ 891 /* Actually move the player now */
1150 op->remove (); 892 if (!(op = op->map->insert (op, op->x + freearr_x[dir] * dist, op->y + freearr_y[dir] * dist, op)))
1151 op->x += freearr_x[dir] * dist;
1152 op->y += freearr_y[dir] * dist;
1153 if ((op = insert_ob_in_map (op, op->map, op, 0)) == NULL)
1154 return 1; 893 return 1;
1155 894
1156 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */ 895 op->speed_left = -FABS (op->speed) * 5; /* Freeze them for a short while */
1157 return 1; 896 return 1;
1158} 897}
… …
1171 object *poison; 910 object *poison;
1172 int heal = 0, success = 0; 911 int heal = 0, success = 0;
1173 912
1174 tmp = find_target_for_friendly_spell (op, dir); 913 tmp = find_target_for_friendly_spell (op, dir);
1175 914
1176 if (tmp == NULL) 915 if (!tmp)
1177 return 0; 916 return 0;
1178 917
1179 /* Figure out how many hp this spell might cure. 918 /* Figure out how many hp this spell might cure.
1180 * could be zero if this spell heals effects, not damage. 919 * could be zero if this spell heals effects, not damage.
1181 */ 920 */
… …
1184 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp; 923 heal += random_roll (spell->stats.hp, 6, op, PREFER_HIGH) + spell->stats.hp;
1185 924
1186 if (heal) 925 if (heal)
1187 { 926 {
1188 if (tmp->stats.hp >= tmp->stats.maxhp) 927 if (tmp->stats.hp >= tmp->stats.maxhp)
1189 {
1190 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed."); 928 new_draw_info (NDI_UNIQUE, 0, tmp, "You are already fully healed.");
1191 }
1192 else 929 else
1193 { 930 {
1194 /* See how many points we actually heal. Instead of messages 931 /* See how many points we actually heal. Instead of messages
1195 * based on type of spell, we instead do messages based 932 * based on type of spell, we instead do messages based
1196 * on amount of damage healed. 933 * on amount of damage healed.
… …
1198 if (heal > (tmp->stats.maxhp - tmp->stats.hp)) 935 if (heal > (tmp->stats.maxhp - tmp->stats.hp))
1199 heal = tmp->stats.maxhp - tmp->stats.hp; 936 heal = tmp->stats.maxhp - tmp->stats.hp;
1200 tmp->stats.hp += heal; 937 tmp->stats.hp += heal;
1201 938
1202 if (tmp->stats.hp >= tmp->stats.maxhp) 939 if (tmp->stats.hp >= tmp->stats.maxhp)
1203 {
1204 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!"); 940 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
1205 }
1206 else if (heal > 50) 941 else if (heal > 50)
1207 {
1208 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!"); 942 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds close!");
1209 }
1210 else if (heal > 25) 943 else if (heal > 25)
1211 {
1212 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close."); 944 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds mostly close.");
1213 }
1214 else if (heal > 10) 945 else if (heal > 10)
1215 {
1216 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade."); 946 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to fade.");
1217 }
1218 else 947 else
1219 {
1220 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close."); 948 new_draw_info (NDI_UNIQUE, 0, tmp, "Your wounds start to close.");
1221 } 949
1222 success = 1; 950 success = 1;
1223 } 951 }
1224 } 952 }
953
1225 if (spell->attacktype & AT_DISEASE) 954 if (spell->attacktype & AT_DISEASE)
1226 if (cure_disease (tmp, op)) 955 if (cure_disease (tmp, op))
1227 success = 1; 956 success = 1;
1228 957
1229 if (spell->attacktype & AT_POISON) 958 if (spell->attacktype & AT_POISON)
… …
1235 success = 1; 964 success = 1;
1236 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed"); 965 new_draw_info (NDI_UNIQUE, 0, tmp, "Your body feels cleansed");
1237 poison->stats.food = 1; 966 poison->stats.food = 1;
1238 } 967 }
1239 } 968 }
969
1240 if (spell->attacktype & AT_CONFUSION) 970 if (spell->attacktype & AT_CONFUSION)
1241 { 971 {
1242 poison = present_in_ob_by_name (FORCE, "confusion", tmp); 972 poison = present_in_ob_by_name (FORCE, "confusion", tmp);
1243 if (poison) 973 if (poison)
1244 { 974 {
1245 success = 1; 975 success = 1;
1246 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 976 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
1247 poison->duration = 1; 977 poison->duration = 1;
1248 } 978 }
1249 } 979 }
980
1250 if (spell->attacktype & AT_BLIND) 981 if (spell->attacktype & AT_BLIND)
1251 { 982 {
1252 at = archetype::find ("blindness"); 983 at = archetype::find ("blindness");
1253 poison = present_arch_in_ob (at, tmp); 984 poison = present_arch_in_ob (at, tmp);
1254 if (poison) 985 if (poison)
… …
1256 success = 1; 987 success = 1;
1257 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return."); 988 new_draw_info (NDI_UNIQUE, 0, tmp, "Your vision begins to return.");
1258 poison->stats.food = 1; 989 poison->stats.food = 1;
1259 } 990 }
1260 } 991 }
992
1261 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp) 993 if (spell->last_sp && tmp->stats.sp < tmp->stats.maxsp)
1262 { 994 {
1263 tmp->stats.sp += spell->last_sp; 995 tmp->stats.sp += spell->last_sp;
1264 if (tmp->stats.sp > tmp->stats.maxsp) 996 if (tmp->stats.sp > tmp->stats.maxsp)
1265 tmp->stats.sp = tmp->stats.maxsp; 997 tmp->stats.sp = tmp->stats.maxsp;
1266 success = 1; 998 success = 1;
1267 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!"); 999 new_draw_info (NDI_UNIQUE, 0, tmp, "Magical energy surges through your body!");
1268 } 1000 }
1001
1269 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace) 1002 if (spell->last_grace && tmp->stats.grace < tmp->stats.maxgrace)
1270 { 1003 {
1271 tmp->stats.grace += spell->last_grace; 1004 tmp->stats.grace += spell->last_grace;
1272 if (tmp->stats.grace > tmp->stats.maxgrace) 1005 if (tmp->stats.grace > tmp->stats.maxgrace)
1273 tmp->stats.grace = tmp->stats.maxgrace; 1006 tmp->stats.grace = tmp->stats.maxgrace;
1274 success = 1; 1007 success = 1;
1275 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!"); 1008 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel redeemed with your god!");
1276 } 1009 }
1010
1277 if (spell->stats.food && tmp->stats.food < 999) 1011 if (spell->stats.food && tmp->stats.food < 999)
1278 { 1012 {
1279 tmp->stats.food += spell->stats.food; 1013 tmp->stats.food += spell->stats.food;
1280 if (tmp->stats.food > 999) 1014 if (tmp->stats.food > 999)
1281 tmp->stats.food = 999; 1015 tmp->stats.food = 999;
1282 success = 1; 1016 success = 1;
1283 /* We could do something a bit better like the messages for healing above */ 1017 /* We could do something a bit better like the messages for healing above */
1284 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food"); 1018 new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
1285 } 1019 }
1020
1286 return success; 1021 return success;
1287} 1022}
1288
1289 1023
1290/* This is used for the spells that gain stats. There are no spells 1024/* This is used for the spells that gain stats. There are no spells
1291 * right now that icnrease wis/int/pow on a temp basis, so no 1025 * right now that icnrease wis/int/pow on a temp basis, so no
1292 * good comments for those. 1026 * good comments for those.
1293 */ 1027 */
1294static const char *const no_gain_msgs[NUM_STATS] = { 1028static const char *const no_gain_msgs[NUM_STATS] = {
1295 "You grow no stronger.", 1029 "You grow no stronger.",
1296 "You grow no more agile.", 1030 "You grow no more agile.",
1297 "You don't feel any healthier.", 1031 "You don't feel any healthier.",
1298 "no wis", 1032 "You didn't grow any more intelligent.",
1033 "You do not feel any wiser.",
1034 "You don't feel any more powerful."
1299 "You are no easier to look at.", 1035 "You are no easier to look at.",
1300 "no int",
1301 "no pow"
1302}; 1036};
1303 1037
1304int 1038int
1305cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent) 1039cast_change_ability (object *op, object *caster, object *spell_ob, int dir, int silent)
1306{ 1040{
1307 object *tmp, *tmp2 = NULL;
1308 object *force = NULL; 1041 object *force = NULL;
1309 int i; 1042 int i;
1310 1043
1311 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */ 1044 /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
1312 if (dir != 0) 1045 object *tmp = dir
1313 {
1314 tmp = find_target_for_friendly_spell (op, dir); 1046 ? find_target_for_friendly_spell (op, dir)
1315 } 1047 : op;
1316 else
1317 {
1318 tmp = op;
1319 }
1320 1048
1321 if (tmp == NULL) 1049 if (!tmp)
1322 return 0; 1050 return 0;
1323 1051
1324 /* If we've already got a force of this type, don't add a new one. */ 1052 /* If we've already got a force of this type, don't add a new one. */
1325 for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below) 1053 for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1326 { 1054 {
1327 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY) 1055 if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
1328 { 1056 {
1329 if (tmp2->name == spell_ob->name) 1057 if (tmp2->name == spell_ob->name)
1330 { 1058 {
… …
1363 } 1091 }
1364 else 1092 else
1365 { 1093 {
1366 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1094 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1367 } 1095 }
1096
1368 return 1; 1097 return 1;
1369 } 1098 }
1099
1370 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1100 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1371 force->speed = 1.0; 1101 force->speed = 1.0;
1372 force->speed_left = -1.0; 1102 force->speed_left = -1.0;
1373 SET_FLAG (force, FLAG_APPLIED); 1103 SET_FLAG (force, FLAG_APPLIED);
1374 1104
… …
1380 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob); 1110 force->resist[i] = spell_ob->resist[i] + SP_level_dam_adjust (caster, spell_ob);
1381 if (force->resist[i] > 100) 1111 if (force->resist[i] > 100)
1382 force->resist[i] = 100; 1112 force->resist[i] = 100;
1383 } 1113 }
1384 } 1114 }
1115
1385 if (spell_ob->stats.hp) 1116 if (spell_ob->stats.hp)
1386 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob); 1117 force->stats.hp = spell_ob->stats.hp + SP_level_dam_adjust (caster, spell_ob);
1387 1118
1388 if (tmp->type == PLAYER) 1119 if (tmp->type == PLAYER)
1389 { 1120 {
1390 /* Stat adjustment spells */ 1121 /* Stat adjustment spells */
1391 for (i = 0; i < NUM_STATS; i++) 1122 for (i = 0; i < NUM_STATS; i++)
1392 { 1123 {
1393 sint8 stat = get_attr_value (&spell_ob->stats, i), k, sm; 1124 if (sint8 stat = spell_ob->stats.stat (i))
1394
1395 if (stat)
1396 { 1125 {
1397 sm = 0; 1126 sint8 sm = 0;
1398 for (k = 0; k < stat; k++) 1127 for (sint8 k = 0; k < stat; k++)
1399 sm += rndm (1, 3); 1128 sm += rndm (1, 3);
1400 1129
1401 if ((get_attr_value (&tmp->stats, i) + sm) > (15 + 5 * stat)) 1130 if (tmp->stats.stat (i) + sm > 15 + 5 * stat)
1402 { 1131 sm = max (0, (15 + 5 * stat) - tmp->stats.stat (i));
1403 sm = (15 + 5 * stat) - get_attr_value (&tmp->stats, i); 1132
1404 if (sm < 0) 1133 force->stats.stat (i) = sm;
1405 sm = 0; 1134
1406 }
1407 set_attr_value (&force->stats, i, sm);
1408 if (!sm) 1135 if (!sm)
1409 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]); 1136 new_draw_info (NDI_UNIQUE, 0, op, no_gain_msgs[i]);
1410 } 1137 }
1411 } 1138 }
1412 } 1139 }
… …
1432 force->stats.ac = spell_ob->stats.ac; 1159 force->stats.ac = spell_ob->stats.ac;
1433 force->attacktype = spell_ob->attacktype; 1160 force->attacktype = spell_ob->attacktype;
1434 1161
1435 insert_ob_in_ob (force, tmp); 1162 insert_ob_in_ob (force, tmp);
1436 change_abil (tmp, force); /* Mostly to display any messages */ 1163 change_abil (tmp, force); /* Mostly to display any messages */
1437 fix_player (tmp); 1164 tmp->update_stats ();
1165
1438 return 1; 1166 return 1;
1439} 1167}
1440 1168
1441/* This used to be part of cast_change_ability, but it really didn't make 1169/* This used to be part of cast_change_ability, but it really didn't make
1442 * a lot of sense, since most of the values it derives are from the god 1170 * a lot of sense, since most of the values it derives are from the god
1443 * of the caster. 1171 * of the caster.
1444 */ 1172 */
1445
1446int 1173int
1447cast_bless (object *op, object *caster, object *spell_ob, int dir) 1174cast_bless (object *op, object *caster, object *spell_ob, int dir)
1448{ 1175{
1449 int i; 1176 int i;
1450 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp; 1177 object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;
… …
1541 force->stats.wc = spell_ob->stats.wc; 1268 force->stats.wc = spell_ob->stats.wc;
1542 force->stats.ac = spell_ob->stats.ac; 1269 force->stats.ac = spell_ob->stats.ac;
1543 1270
1544 change_abil (tmp, force); /* Mostly to display any messages */ 1271 change_abil (tmp, force); /* Mostly to display any messages */
1545 insert_ob_in_ob (force, tmp); 1272 insert_ob_in_ob (force, tmp);
1546 fix_player (tmp); 1273 tmp->update_stats ();
1547 return 1; 1274 return 1;
1548} 1275}
1549
1550
1551 1276
1552/* Alchemy code by Mark Wedel 1277/* Alchemy code by Mark Wedel
1553 * 1278 *
1554 * This code adds a new spell, called alchemy. Alchemy will turn 1279 * This code adds a new spell, called alchemy. Alchemy will turn
1555 * objects to gold nuggets, the value of the gold nuggets being 1280 * objects to gold nuggets, the value of the gold nuggets being
… …
1565 * For example, if an item is worth 110 gold, you will get 1290 * For example, if an item is worth 110 gold, you will get
1566 * 4 large nuggets, and from 0-10 small nuggets. 1291 * 4 large nuggets, and from 0-10 small nuggets.
1567 * 1292 *
1568 * There is also a chance (1:30) that you will get nothing at all 1293 * There is also a chance (1:30) that you will get nothing at all
1569 * for the object. There is also a maximum weight that will be 1294 * for the object. There is also a maximum weight that will be
1570 * alchemied. 1295 * alchemised.
1571 */ 1296 */
1572
1573/* I didn't feel like passing these as arguements to the
1574 * two functions that need them. Real values are put in them
1575 * when the spell is cast, and these are freed when the spell
1576 * is finished.
1577 */
1578static object *small, *large;
1579
1580static void 1297static void
1581alchemy_object (object *obj, int *small_nuggets, int *large_nuggets, int *weight) 1298alchemy_object (object *obj, uint64 &total_value, int &total_weight)
1582{ 1299{
1583 uint64 value = query_cost (obj, NULL, F_TRUE); 1300 uint64 value = query_cost (obj, NULL, F_TRUE);
1584 1301
1585 /* Give third price when we alchemy money (This should hopefully 1302 /* Give third price when we alchemy money (This should hopefully
1586 * make it so that it isn't worth it to alchemy money, sell 1303 * make it so that it isn't worth it to alchemy money, sell
1587 * the nuggets, alchemy the gold from that, etc. 1304 * the nuggets, alchemy the gold from that, etc.
1588 * Otherwise, give 9 silver on the gold for other objects, 1305 * Otherwise, give 9 silver on the gold for other objects,
1589 * so that it would still be more affordable to haul 1306 * so that it would still be more affordable to haul
1590 * the stuff back to town. 1307 * the stuff back to town.
1591 */ 1308 */
1592
1593 if (QUERY_FLAG (obj, FLAG_UNPAID)) 1309 if (QUERY_FLAG (obj, FLAG_UNPAID))
1594 value = 0; 1310 value = 0;
1595 else if (obj->type == MONEY || obj->type == GEM) 1311 else if (obj->type == MONEY || obj->type == GEM)
1596 value /= 3; 1312 value /= 3;
1597 else 1313 else
1598 value = (value * 9) / 10; 1314 value = value * 9 / 10;
1599 1315
1600 value /= 4; // fix by GHJ, don't understand, pcg
1601
1602 if ((obj->value > 0) && rndm (0, 29)) 1316 if (obj->value > 0 && rndm (0, 29))
1603 { 1317 total_value += value;
1604 int count;
1605 1318
1606 count = value / large->value;
1607 *large_nuggets += count;
1608 value -= (uint64) count *(uint64) large->value;
1609
1610 count = value / small->value;
1611 *small_nuggets += count;
1612 }
1613
1614 /* Turn 25 small nuggets into 1 large nugget. If the value
1615 * of large nuggets is not evenly divisable by the small nugget
1616 * value, take off an extra small_nugget (Assuming small_nuggets!=0)
1617 */
1618 if (*small_nuggets * small->value >= large->value)
1619 {
1620 (*large_nuggets)++;
1621 *small_nuggets -= large->value / small->value;
1622 if (*small_nuggets && large->value % small->value)
1623 (*small_nuggets)--;
1624 }
1625 weight += obj->weight; 1319 total_weight += obj->total_weight ();
1320
1626 obj->destroy (); 1321 obj->destroy ();
1627} 1322}
1628 1323
1629static void 1324static void
1630update_map (object *op, maptile *m, int small_nuggets, int large_nuggets, int x, int y) 1325update_map (object *op, maptile *m, int small_nuggets, object *small, int large_nuggets, object *large, int x, int y)
1631{ 1326{
1632 object *tmp;
1633 int flag = 0; 1327 int flag = 0;
1634 1328
1635 /* Put any nuggets below the player, but we can only pass this 1329 /* Put any nuggets below the player, but we can only pass this
1636 * flag if we are on the same space as the player 1330 * flag if we are on the same space as the player
1637 */ 1331 */
1638 if (x == op->x && y == op->y && op->map == m) 1332 if (x == op->x && y == op->y && op->map == m)
1639 flag = INS_BELOW_ORIGINATOR; 1333 flag = INS_BELOW_ORIGINATOR;
1640 1334
1641 if (small_nuggets) 1335 if (small_nuggets)
1642 { 1336 {
1643 tmp = small->clone (); 1337 object *tmp = small->clone ();
1644 tmp->nrof = small_nuggets; 1338 tmp->nrof = small_nuggets;
1645 tmp->x = x;
1646 tmp->y = y;
1647 insert_ob_in_map (tmp, m, op, flag); 1339 m->insert (tmp, x, y, op, flag);
1648 } 1340 }
1649 1341
1650 if (large_nuggets) 1342 if (large_nuggets)
1651 { 1343 {
1652 tmp = large->clone (); 1344 object *tmp = large->clone ();
1653 tmp->nrof = large_nuggets; 1345 tmp->nrof = large_nuggets;
1654 tmp->x = x;
1655 tmp->y = y;
1656 insert_ob_in_map (tmp, m, op, flag); 1346 m->insert (tmp, x, y, op, flag);
1657 } 1347 }
1348
1349 if (object *pl = m->at (x, y).player ())
1350 if (pl->contr->ns)
1351 pl->contr->ns->look_position = 0;
1658} 1352}
1659 1353
1660int 1354int
1661alchemy (object *op, object *caster, object *spell_ob) 1355alchemy (object *op, object *caster, object *spell_ob)
1662{ 1356{
1663 int x, y, weight = 0, weight_max, large_nuggets, small_nuggets, mflags;
1664 sint16 nx, ny;
1665 object *next, *tmp;
1666 maptile *mp;
1667
1668 if (op->type != PLAYER) 1357 if (op->type != PLAYER)
1669 return 0; 1358 return 0;
1670 1359
1360 object *large = get_archetype ("largenugget");
1361 object *small = get_archetype ("smallnugget");
1362
1671 /* Put a maximum weight of items that can be alchemied. Limits the power 1363 /* Put a maximum weight of items that can be alchemised. Limits the power
1672 * some, and also prevents people from alcheming every table/chair/clock 1364 * some, and also prevents people from alchemising every table/chair/clock
1673 * in sight 1365 * in sight
1674 */ 1366 */
1675 weight_max = spell_ob->duration + +SP_level_duration_adjust (caster, spell_ob); 1367 int duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1676 weight_max *= 1000; 1368 int weight_max = duration * 1000;
1677 small = get_archetype ("smallnugget"), large = get_archetype ("largenugget"); 1369 uint64 value_max = duration * 1000;
1678 1370
1371 int weight = 0;
1372
1679 for (y = op->y - 1; y <= op->y + 1; y++) 1373 for (int y = op->y - 1; y <= op->y + 1; y++)
1680 { 1374 {
1681 for (x = op->x - 1; x <= op->x + 1; x++) 1375 for (int x = op->x - 1; x <= op->x + 1; x++)
1682 { 1376 {
1377 uint64 value = 0;
1378
1683 nx = x; 1379 sint16 nx = x;
1684 ny = y; 1380 sint16 ny = y;
1685 1381
1686 mp = op->map; 1382 maptile *mp = op->map;
1687 1383
1688 mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny); 1384 int mflags = get_map_flags (mp, &mp, nx, ny, &nx, &ny);
1689 1385
1690 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC)) 1386 if (mflags & (P_OUT_OF_MAP | P_NO_MAGIC))
1691 continue; 1387 continue;
1692 1388
1693 /* Treat alchemy a little differently - most spell effects 1389 /* Treat alchemy a little differently - most spell effects
… …
1695 * ground level effect. 1391 * ground level effect.
1696 */ 1392 */
1697 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK) 1393 if (GET_MAP_MOVE_BLOCK (mp, nx, ny) & MOVE_WALK)
1698 continue; 1394 continue;
1699 1395
1700 small_nuggets = 0; 1396 for (object *next, *tmp = mp->at (nx, ny).bot; tmp; tmp = next)
1701 large_nuggets = 0;
1702
1703 for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next)
1704 { 1397 {
1705 next = tmp->above; 1398 next = tmp->above;
1399
1706 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) && 1400 if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
1707 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 1401 !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
1708 { 1402 {
1709
1710 if (tmp->inv) 1403 if (tmp->inv)
1711 { 1404 {
1712 object *next1, *tmp1; 1405 object *next1, *tmp1;
1713 1406
1714 for (tmp1 = tmp->inv; tmp1 != NULL; tmp1 = next1) 1407 for (tmp1 = tmp->inv; tmp1; tmp1 = next1)
1715 { 1408 {
1716 next1 = tmp1->below; 1409 next1 = tmp1->below;
1717 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) && 1410 if (tmp1->weight > 0 && !QUERY_FLAG (tmp1, FLAG_NO_PICK) &&
1718 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON)) 1411 !QUERY_FLAG (tmp1, FLAG_ALIVE) && !QUERY_FLAG (tmp1, FLAG_IS_CAULDRON))
1719 alchemy_object (tmp1, &small_nuggets, &large_nuggets, &weight); 1412 alchemy_object (tmp1, value, weight);
1720 } 1413 }
1721 } 1414 }
1415
1722 alchemy_object (tmp, &small_nuggets, &large_nuggets, &weight); 1416 alchemy_object (tmp, value, weight);
1723 1417
1724 if (weight > weight_max) 1418 if (weight > weight_max)
1725 { 1419 break;
1726 update_map (op, mp, small_nuggets, large_nuggets, nx, ny);
1727 large->destroy ();
1728 small->destroy ();
1729 return 1;
1730 } 1420 }
1731 } /* is alchemable object */ 1421 }
1732 } /* process all objects on this space */ 1422
1423 value = min (value, value_max);
1424
1425 uint64 count = value / large->value;
1426 int large_nuggets = count;
1427 value -= count * large->value;
1428
1429 count = value / small->value;
1430 int small_nuggets = count;
1733 1431
1734 /* Insert all the nuggets at one time. This probably saves time, but 1432 /* Insert all the nuggets at one time. This probably saves time, but
1735 * it also prevents us from alcheming nuggets that were just created 1433 * it also prevents us from alcheming nuggets that were just created
1736 * with this spell. 1434 * with this spell.
1737 */ 1435 */
1738 update_map (op, mp, small_nuggets, large_nuggets, nx, ny); 1436 update_map (op, mp, small_nuggets, small, large_nuggets, large, nx, ny);
1739 }
1740 }
1741 1437
1438 if (weight > weight_max)
1439 goto bailout;
1440 }
1441 }
1442
1443bailout:
1742 large->destroy (); 1444 large->destroy ();
1743 small->destroy (); 1445 small->destroy ();
1744 /* reset this so that if player standing on a big pile of stuff,
1745 * it is redrawn properly.
1746 */
1747 op->contr->socket->look_position = 0;
1748 return 1; 1446 return 1;
1749} 1447}
1750 1448
1751 1449
1752/* This function removes the cursed/damned status on equipped 1450/* This function removes the cursed/damned status on equipped
… …
1761 for (tmp = op->inv; tmp; tmp = tmp->below) 1459 for (tmp = op->inv; tmp; tmp = tmp->below)
1762 if (QUERY_FLAG (tmp, FLAG_APPLIED) && 1460 if (QUERY_FLAG (tmp, FLAG_APPLIED) &&
1763 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) || 1461 ((QUERY_FLAG (tmp, FLAG_CURSED) && QUERY_FLAG (spell, FLAG_CURSED)) ||
1764 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED)))) 1462 (QUERY_FLAG (tmp, FLAG_DAMNED) && QUERY_FLAG (spell, FLAG_DAMNED))))
1765 { 1463 {
1766
1767 was_one++; 1464 was_one++;
1768 if (tmp->level <= caster_level (caster, spell)) 1465 if (tmp->level <= caster_level (caster, spell))
1769 { 1466 {
1770 success++; 1467 success++;
1771 if (QUERY_FLAG (spell, FLAG_DAMNED)) 1468 if (QUERY_FLAG (spell, FLAG_DAMNED))
… …
1780 } 1477 }
1781 1478
1782 if (op->type == PLAYER) 1479 if (op->type == PLAYER)
1783 { 1480 {
1784 if (success) 1481 if (success)
1785 {
1786 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now."); 1482 new_draw_info (NDI_UNIQUE, 0, op, "You feel like some of your items are looser now.");
1787 }
1788 else 1483 else
1789 { 1484 {
1790 if (was_one) 1485 if (was_one)
1791 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse."); 1486 new_draw_info (NDI_UNIQUE, 0, op, "You failed to remove the curse.");
1792 else 1487 else
1793 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items."); 1488 new_draw_info (NDI_UNIQUE, 0, op, "You are not using any cursed items.");
1794 } 1489 }
1795 } 1490 }
1491
1796 return success; 1492 return success;
1797} 1493}
1798 1494
1799/* Identifies objects in the players inventory/on the ground */ 1495/* Identifies objects in the players inventory/on the ground */
1800 1496
… …
1807 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1503 num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1808 1504
1809 if (num_ident < 1) 1505 if (num_ident < 1)
1810 num_ident = 1; 1506 num_ident = 1;
1811 1507
1812
1813 for (tmp = op->inv; tmp; tmp = tmp->below) 1508 for (tmp = op->inv; tmp; tmp = tmp->below)
1814 { 1509 {
1815 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1510 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1816 { 1511 {
1817 identify (tmp); 1512 identify (tmp);
1513
1818 if (op->type == PLAYER) 1514 if (op->type == PLAYER)
1819 { 1515 {
1820 new_draw_info_format (NDI_UNIQUE, 0, op, "You have %s.", long_desc (tmp, op)); 1516 new_draw_info_format (NDI_UNIQUE, 0, op, "You identified: %s.", long_desc (tmp, op));
1517
1821 if (tmp->msg) 1518 if (tmp->msg)
1822 { 1519 {
1823 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1520 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1824 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1521 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1825 } 1522 }
1826 } 1523 }
1524
1827 num_ident--; 1525 num_ident--;
1828 success = 1; 1526 success = 1;
1829 if (!num_ident) 1527 if (!num_ident)
1830 break; 1528 break;
1831 } 1529 }
1832 } 1530 }
1531
1833 /* If all the power of the spell has been used up, don't go and identify 1532 /* If all the power of the spell has been used up, don't go and identify
1834 * stuff on the floor. Only identify stuff on the floor if the spell 1533 * stuff on the floor. Only identify stuff on the floor if the spell
1835 * was not fully used. 1534 * was not fully used.
1836 */ 1535 */
1837 if (num_ident) 1536 if (num_ident)
1838 { 1537 {
1839 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1538 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1840 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp)) 1539 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
1841 { 1540 {
1842
1843 identify (tmp); 1541 identify (tmp);
1542
1844 if (op->type == PLAYER) 1543 if (op->type == PLAYER)
1845 { 1544 {
1846 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground is %s.", long_desc (tmp, op)); 1545 new_draw_info_format (NDI_UNIQUE, 0, op, "On the ground you identified: %s.", long_desc (tmp, op));
1546
1847 if (tmp->msg) 1547 if (tmp->msg)
1848 { 1548 {
1849 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:"); 1549 new_draw_info (NDI_UNIQUE, 0, op, "The item has a story:");
1850 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg); 1550 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1851 } 1551 }
1552
1852 esrv_send_item (op, tmp); 1553 esrv_send_item (op, tmp);
1853 } 1554 }
1555
1854 num_ident--; 1556 num_ident--;
1855 success = 1; 1557 success = 1;
1856 if (!num_ident) 1558 if (!num_ident)
1857 break; 1559 break;
1858 } 1560 }
1859 } 1561 }
1562
1860 if (!success) 1563 if (!success)
1861 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified."); 1564 new_draw_info (NDI_UNIQUE, 0, op, "You can't reach anything unidentified.");
1862 else 1565 else
1863 {
1864 spell_effect (spell, op->x, op->y, op->map, op); 1566 spell_effect (spell, op->x, op->y, op->map, op);
1865 } 1567
1866 return success; 1568 return success;
1867} 1569}
1868
1869 1570
1870int 1571int
1871cast_detection (object *op, object *caster, object *spell, object *skill) 1572cast_detection (object *op, object *caster, object *spell, object *skill)
1872{ 1573{
1873 object *tmp, *last, *god, *detect; 1574 object *tmp, *last, *god, *detect;
… …
1886 skill = caster; 1587 skill = caster;
1887 1588
1888 for (x = op->x - range; x <= op->x + range; x++) 1589 for (x = op->x - range; x <= op->x + range; x++)
1889 for (y = op->y - range; y <= op->y + range; y++) 1590 for (y = op->y - range; y <= op->y + range; y++)
1890 { 1591 {
1891
1892 m = op->map; 1592 m = op->map;
1893 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1593 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1894 if (mflags & P_OUT_OF_MAP) 1594 if (mflags & P_OUT_OF_MAP)
1895 continue; 1595 continue;
1896 1596
… …
1898 * floor. But this is not true for show invisible. 1598 * floor. But this is not true for show invisible.
1899 * Basically, we just go and find the top object and work 1599 * Basically, we just go and find the top object and work
1900 * down - that is easier than working up. 1600 * down - that is easier than working up.
1901 */ 1601 */
1902 1602
1903 for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1603 for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1904 last = tmp; 1604 last = tmp;
1605
1905 /* Shouldn't happen, but if there are no objects on a space, this 1606 /* Shouldn't happen, but if there are no objects on a space, this
1906 * would happen. 1607 * would happen.
1907 */ 1608 */
1908 if (!last) 1609 if (!last)
1909 continue; 1610 continue;
… …
1911 done_one = 0; 1612 done_one = 0;
1912 floor = 0; 1613 floor = 0;
1913 detect = NULL; 1614 detect = NULL;
1914 for (tmp = last; tmp; tmp = tmp->below) 1615 for (tmp = last; tmp; tmp = tmp->below)
1915 { 1616 {
1916
1917 /* show invisible */ 1617 /* show invisible */
1918 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) && 1618 if (QUERY_FLAG (spell, FLAG_MAKE_INVIS) &&
1919 /* Might there be other objects that we can make visibile? */ 1619 /* Might there be other objects that we can make visible? */
1920 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) || 1620 (tmp->invisible && (QUERY_FLAG (tmp, FLAG_MONSTER) ||
1921 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) || 1621 (tmp->type == PLAYER && !QUERY_FLAG (tmp, FLAG_WIZ)) ||
1922 tmp->type == CF_HANDLE || 1622 tmp->type == CF_HANDLE ||
1923 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE || 1623 tmp->type == TRAPDOOR || tmp->type == EXIT || tmp->type == HOLE ||
1924 tmp->type == BUTTON || tmp->type == TELEPORTER || 1624 tmp->type == BUTTON || tmp->type == TELEPORTER ||
… …
1931 { 1631 {
1932 tmp->invisible = 0; 1632 tmp->invisible = 0;
1933 done_one = 1; 1633 done_one = 1;
1934 } 1634 }
1935 } 1635 }
1636
1936 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1637 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1937 floor = 1; 1638 floor = 1;
1938 1639
1939 /* All detections below this point don't descend beneath the floor, 1640 /* All detections below this point don't descend beneath the floor,
1940 * so just continue on. We could be clever and look at the type of 1641 * so just continue on. We could be clever and look at the type of
… …
1993 */ 1694 */
1994 if (done_one) 1695 if (done_one)
1995 { 1696 {
1996 object *detect_ob = arch_to_object (spell->other_arch); 1697 object *detect_ob = arch_to_object (spell->other_arch);
1997 1698
1998 detect_ob->x = nx;
1999 detect_ob->y = ny;
2000 /* if this is set, we want to copy the face */ 1699 /* if this is set, we want to copy the face */
2001 if (done_one == 2 && detect) 1700 if (done_one == 2 && detect)
2002 { 1701 {
2003 detect_ob->face = detect->face; 1702 detect_ob->face = detect->face;
2004 detect_ob->animation_id = detect->animation_id; 1703 detect_ob->animation_id = detect->animation_id;
… …
2006 detect_ob->last_anim = 0; 1705 detect_ob->last_anim = 0;
2007 /* by default, the detect_ob is already animated */ 1706 /* by default, the detect_ob is already animated */
2008 if (!QUERY_FLAG (detect, FLAG_ANIMATE)) 1707 if (!QUERY_FLAG (detect, FLAG_ANIMATE))
2009 CLEAR_FLAG (detect_ob, FLAG_ANIMATE); 1708 CLEAR_FLAG (detect_ob, FLAG_ANIMATE);
2010 } 1709 }
1710
2011 insert_ob_in_map (detect_ob, m, op, 0); 1711 m->insert (detect_ob, nx, ny, op);
2012 } 1712 }
2013 } /* for processing the surrounding spaces */ 1713 } /* for processing the surrounding spaces */
2014 1714
2015 1715
2016 /* Now process objects in the players inventory if detect curse or magic */ 1716 /* Now process objects in the players inventory if detect curse or magic */
… …
2065 1765
2066 /* Explodes a fireball centered at player */ 1766 /* Explodes a fireball centered at player */
2067 tmp = get_archetype (EXPLODING_FIREBALL); 1767 tmp = get_archetype (EXPLODING_FIREBALL);
2068 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1; 1768 tmp->dam_modifier = random_roll (1, caster_level, victim, PREFER_LOW) / 5 + 1;
2069 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2; 1769 tmp->stats.maxhp = random_roll (1, caster_level, victim, PREFER_LOW) / 10 + 2;
2070 tmp->x = victim->x; 1770
2071 tmp->y = victim->y; 1771 tmp->insert_at (victim);
2072 insert_ob_in_map (tmp, victim->map, NULL, 0);
2073 victim->stats.sp = 2 * victim->stats.maxsp; 1772 victim->stats.sp = 2 * victim->stats.maxsp;
2074 } 1773 }
2075 else if (victim->stats.sp >= victim->stats.maxsp * 1.88) 1774 else if (victim->stats.sp >= victim->stats.maxsp * 1.88)
2076 {
2077 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode."); 1775 new_draw_info (NDI_UNIQUE, NDI_ORANGE, victim, "You feel like your head is going to explode.");
2078 }
2079 else if (victim->stats.sp >= victim->stats.maxsp * 1.66) 1776 else if (victim->stats.sp >= victim->stats.maxsp * 1.66)
2080 {
2081 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!"); 1777 new_draw_info (NDI_UNIQUE, 0, victim, "You get a splitting headache!");
2082 }
2083 else if (victim->stats.sp >= victim->stats.maxsp * 1.5) 1778 else if (victim->stats.sp >= victim->stats.maxsp * 1.5)
2084 { 1779 {
2085 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world."); 1780 new_draw_info (NDI_UNIQUE, 0, victim, "Chaos fills your world.");
2086 confuse_player (victim, victim, 99); 1781 confuse_player (victim, victim, 99);
2087 } 1782 }
2088 else if (victim->stats.sp >= victim->stats.maxsp * 1.25) 1783 else if (victim->stats.sp >= victim->stats.maxsp * 1.25)
2089 {
2090 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices."); 1784 new_draw_info (NDI_UNIQUE, 0, victim, "You start hearing voices.");
2091 }
2092} 1785}
2093 1786
2094/* cast_transfer 1787/* cast_transfer
2095 * This spell transfers sp from the player to another person. 1788 * This spell transfers sp from the player to another person.
2096 * We let the target go above their normal maximum SP. 1789 * We let the target go above their normal maximum SP.
… …
2110 1803
2111 mflags = get_map_flags (m, &m, x, y, &x, &y); 1804 mflags = get_map_flags (m, &m, x, y, &x, &y);
2112 1805
2113 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 1806 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
2114 { 1807 {
2115 for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above) 1808 for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
2116 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 1809 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2117 break; 1810 break;
2118 } 1811 }
2119 1812
2120 1813
2121 /* If we did not find a player in the specified direction, transfer 1814 /* If we did not find a player in the specified direction, transfer
2122 * to anyone on top of us. This is used for the rune of transference mostly. 1815 * to anyone on top of us. This is used for the rune of transference mostly.
2123 */ 1816 */
2124 if (plyr == NULL) 1817 if (plyr == NULL)
2125 for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above) 1818 for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
2126 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE)) 1819 if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
2127 break; 1820 break;
2128 1821
2129 if (!plyr) 1822 if (!plyr)
2130 { 1823 {
… …
2185 m = op->map; 1878 m = op->map;
2186 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1879 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
2187 if (mflags & P_OUT_OF_MAP) 1880 if (mflags & P_OUT_OF_MAP)
2188 return; 1881 return;
2189 1882
2190 for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next) 1883 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
2191 { 1884 {
2192 next = tmp->above; 1885 next = tmp->above;
2193 1886
2194 /* Need to look at the head object - otherwise, if tmp 1887 /* Need to look at the head object - otherwise, if tmp
2195 * points to a monster, we don't have all the necessary 1888 * points to a monster, we don't have all the necessary
… …
2207 /* Basically, if the object is magical and not counterspell, 1900 /* Basically, if the object is magical and not counterspell,
2208 * we will more or less remove the object. Don't counterspell 1901 * we will more or less remove the object. Don't counterspell
2209 * monsters either. 1902 * monsters either.
2210 */ 1903 */
2211 1904
2212 if (head->attacktype & AT_MAGIC && 1905 if (head->attacktype & AT_MAGIC
2213 !(head->attacktype & AT_COUNTERSPELL) && !QUERY_FLAG (head, FLAG_MONSTER) && (op->level > head->level)) 1906 && !(head->attacktype & AT_COUNTERSPELL)
1907 && !QUERY_FLAG (head, FLAG_MONSTER)
1908 && (op->level > head->level))
2214 head->destroy (); 1909 head->destroy ();
2215 else 1910 else
2216 switch (head->type) 1911 switch (head->type)
2217 { 1912 {
2218 case SPELL_EFFECT: 1913 case SPELL_EFFECT:
1914 // XXX: Don't affect floor spelleffects. See also XXX comment
1915 // about sanctuary in spell_util.C
1916 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1917 continue;
1918
2219 if (op->level > head->level) 1919 if (op->level > head->level)
2220 head->destroy (); 1920 head->destroy ();
2221 1921
2222 break; 1922 break;
2223 1923
… …
2290 * This code was very odd - code early on would only let players use the spell, 1990 * This code was very odd - code early on would only let players use the spell,
2291 * yet the code wass full of player checks. I've presumed that the code 1991 * yet the code wass full of player checks. I've presumed that the code
2292 * that only let players use it was correct, and removed all the other 1992 * that only let players use it was correct, and removed all the other
2293 * player checks. MSW 2003-01-06 1993 * player checks. MSW 2003-01-06
2294 */ 1994 */
2295
2296int 1995int
2297animate_weapon (object *op, object *caster, object *spell, int dir) 1996animate_weapon (object *op, object *caster, object *spell, int dir)
2298{ 1997{
2299 object *weapon, *tmp; 1998 object *weapon, *tmp;
2300 char buf[MAX_BUF]; 1999 char buf[MAX_BUF];
2301 int a, i; 2000 int a, i;
2302 sint16 x, y; 2001 sint16 x, y;
2303 maptile *m; 2002 maptile *m;
2304 materialtype_t *mt;
2305 2003
2306 if (!spell->other_arch) 2004 if (!spell->other_arch)
2307 { 2005 {
2308 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!"); 2006 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
2309 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name); 2007 LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
… …
2312 /* exit if it's not a player using this spell. */ 2010 /* exit if it's not a player using this spell. */
2313 if (op->type != PLAYER) 2011 if (op->type != PLAYER)
2314 return 0; 2012 return 0;
2315 2013
2316 /* if player already has a golem, abort */ 2014 /* if player already has a golem, abort */
2317 if (op->contr->ranges[range_golem]) 2015 if (object *golem = op->contr->golem)
2318 { 2016 {
2319 control_golem (op->contr->ranges[range_golem], dir); 2017 control_golem (golem, dir);
2320 return 0; 2018 return 0;
2321 } 2019 }
2322 2020
2323 /* if no direction specified, pick one */ 2021 /* if no direction specified, pick one */
2324 if (!dir) 2022 if (!dir)
… …
2328 x = op->x + freearr_x[dir]; 2026 x = op->x + freearr_x[dir];
2329 y = op->y + freearr_y[dir]; 2027 y = op->y + freearr_y[dir];
2330 2028
2331 /* if there's no place to put the golem, abort */ 2029 /* if there's no place to put the golem, abort */
2332 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) || 2030 if ((dir == -1) || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) ||
2333 ((spell->other_arch->clone.move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->clone.move_type)) 2031 ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2334 { 2032 {
2335 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 2033 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
2336 return 0; 2034 return 0;
2337 } 2035 }
2338 2036
… …
2342 if (!weapon) 2040 if (!weapon)
2343 { 2041 {
2344 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2042 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
2345 return 0; 2043 return 0;
2346 } 2044 }
2347 if (spell->race && strcmp (weapon->arch->name, spell->race)) 2045 if (spell->race && strcmp (weapon->arch->archname, spell->race))
2348 { 2046 {
2349 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2047 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
2350 return 0; 2048 return 0;
2351 } 2049 }
2352 if (weapon->type != WEAPON) 2050 if (weapon->type != WEAPON)
… …
2370 /* create the golem object */ 2068 /* create the golem object */
2371 tmp = arch_to_object (spell->other_arch); 2069 tmp = arch_to_object (spell->other_arch);
2372 2070
2373 /* if animated by a player, give the player control of the golem */ 2071 /* if animated by a player, give the player control of the golem */
2374 CLEAR_FLAG (tmp, FLAG_MONSTER); 2072 CLEAR_FLAG (tmp, FLAG_MONSTER);
2375 SET_FLAG (tmp, FLAG_FRIENDLY);
2376 tmp->stats.exp = 0; 2073 tmp->stats.exp = 0;
2377 add_friendly_object (tmp); 2074 add_friendly_object (tmp);
2378 tmp->type = GOLEM; 2075 tmp->type = GOLEM;
2379 tmp->set_owner (op); 2076 tmp->set_owner (op);
2077 op->contr->golem = tmp;
2380 set_spell_skill (op, caster, spell, tmp); 2078 set_spell_skill (op, caster, spell, tmp);
2381 op->contr->ranges[range_golem] = tmp;
2382 op->contr->shoottype = range_golem;
2383 2079
2384 /* Give the weapon to the golem now. A bit of a hack to check the 2080 /* Give the weapon to the golem now. A bit of a hack to check the
2385 * removed flag - it should only be set if get_split_object was 2081 * removed flag - it should only be set if get_split_object was
2386 * used above. 2082 * used above.
2387 */ 2083 */
2388 if (!QUERY_FLAG (weapon, FLAG_REMOVED)) 2084 if (!QUERY_FLAG (weapon, FLAG_REMOVED))
2389 weapon->remove (); 2085 weapon->remove ();
2086
2390 insert_ob_in_ob (weapon, tmp); 2087 insert_ob_in_ob (weapon, tmp);
2391 esrv_send_item (op, weapon); 2088 esrv_send_item (op, weapon);
2392 /* To do everything necessary to let a golem use the weapon is a pain, 2089 /* To do everything necessary to let a golem use the weapon is a pain,
2393 * so instead, just set it as equipped (otherwise, we need to update 2090 * so instead, just set it as equipped (otherwise, we need to update
2394 * body_info, skills, etc) 2091 * body_info, skills, etc)
2395 */ 2092 */
2396 SET_FLAG (tmp, FLAG_USE_WEAPON); 2093 SET_FLAG (tmp, FLAG_USE_WEAPON);
2397 SET_FLAG (weapon, FLAG_APPLIED); 2094 SET_FLAG (weapon, FLAG_APPLIED);
2398 fix_player (tmp); 2095 tmp->update_stats ();
2399 2096
2400 /* There used to be 'odd' code that basically seemed to take the absolute 2097 /* There used to be 'odd' code that basically seemed to take the absolute
2401 * value of the weapon->magic an use that. IMO, that doesn't make sense - 2098 * value of the weapon->magic an use that. IMO, that doesn't make sense -
2402 * if you're using a crappy weapon, it shouldn't be as good. 2099 * if you're using a crappy weapon, it shouldn't be as good.
2403 */ 2100 */
… …
2422 2119
2423 /* attacktype */ 2120 /* attacktype */
2424 if (!tmp->attacktype) 2121 if (!tmp->attacktype)
2425 tmp->attacktype = AT_PHYSICAL; 2122 tmp->attacktype = AT_PHYSICAL;
2426 2123
2427 mt = NULL;
2428 if (op->materialname != NULL)
2429 mt = name_to_material (op->materialname); 2124 if (materialtype_t *mt = name_to_material (op->materialname))
2430 if (mt != NULL)
2431 { 2125 {
2432 for (i = 0; i < NROFATTACKS; i++) 2126 for (i = 0; i < NROFATTACKS; i++)
2433 tmp->resist[i] = 50 - (mt->save[i] * 5); 2127 tmp->resist[i] = 50 - (mt->save[i] * 5);
2434 a = mt->save[0]; 2128 a = mt->save[0];
2435 } 2129 }
… …
2437 { 2131 {
2438 for (i = 0; i < NROFATTACKS; i++) 2132 for (i = 0; i < NROFATTACKS; i++)
2439 tmp->resist[i] = 5; 2133 tmp->resist[i] = 5;
2440 a = 10; 2134 a = 10;
2441 } 2135 }
2136
2442 /* Set weapon's immunity */ 2137 /* Set weapon's immunity */
2443 tmp->resist[ATNR_CONFUSION] = 100; 2138 tmp->resist[ATNR_CONFUSION] = 100;
2444 tmp->resist[ATNR_POISON] = 100; 2139 tmp->resist[ATNR_POISON] = 100;
2445 tmp->resist[ATNR_SLOW] = 100; 2140 tmp->resist[ATNR_SLOW] = 100;
2446 tmp->resist[ATNR_PARALYZE] = 100; 2141 tmp->resist[ATNR_PARALYZE] = 100;
… …
2452 2147
2453 /* Improve weapon's armour value according to best save vs. physical of its material */ 2148 /* Improve weapon's armour value according to best save vs. physical of its material */
2454 2149
2455 if (a > 14) 2150 if (a > 14)
2456 a = 14; 2151 a = 14;
2152
2457 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a)); 2153 tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
2458 2154
2459 /* Determine golem's speed */ 2155 /* Determine golem's speed */
2460 tmp->speed = 0.4 + 0.1 * SP_level_range_adjust (caster, spell); 2156 tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));
2461
2462 if (tmp->speed > 3.33)
2463 tmp->speed = 3.33;
2464 2157
2465 if (!spell->race) 2158 if (!spell->race)
2466 { 2159 {
2467 sprintf (buf, "animated %s", &weapon->name); 2160 sprintf (buf, "animated %s", &weapon->name);
2468 tmp->name = buf; 2161 tmp->name = buf;
… …
2470 tmp->face = weapon->face; 2163 tmp->face = weapon->face;
2471 tmp->animation_id = weapon->animation_id; 2164 tmp->animation_id = weapon->animation_id;
2472 tmp->anim_speed = weapon->anim_speed; 2165 tmp->anim_speed = weapon->anim_speed;
2473 tmp->last_anim = weapon->last_anim; 2166 tmp->last_anim = weapon->last_anim;
2474 tmp->state = weapon->state; 2167 tmp->state = weapon->state;
2475 if (QUERY_FLAG (weapon, FLAG_ANIMATE)) 2168 tmp->flag [FLAG_ANIMATE] = weapon->flag [FLAG_ANIMATE];
2476 {
2477 SET_FLAG (tmp, FLAG_ANIMATE);
2478 }
2479 else
2480 {
2481 CLEAR_FLAG (tmp, FLAG_ANIMATE);
2482 }
2483 update_ob_speed (tmp);
2484 } 2169 }
2485 2170
2486 /* make experience increase in proportion to the strength of the summoned creature. */ 2171 /* make experience increase in proportion to the strength of the summoned creature. */
2487 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell)); 2172 tmp->stats.exp *= 1 + (MAX (spell->stats.maxgrace, spell->stats.sp) / caster_level (caster, spell));
2488 2173
2489 tmp->speed_left = -1; 2174 tmp->speed_left = -1;
2490 tmp->x = x;
2491 tmp->y = y;
2492 tmp->direction = dir; 2175 tmp->direction = dir;
2493 insert_ob_in_map (tmp, m, op, 0); 2176
2177 m->insert (tmp, x, y, op);
2494 return 1; 2178 return 1;
2495} 2179}
2496 2180
2497/* cast_daylight() - changes the map darkness level *lower* */ 2181/* cast_daylight() - changes the map darkness level *lower* */
2498 2182
… …
2506 int success; 2190 int success;
2507 2191
2508 if (!op->map) 2192 if (!op->map)
2509 return 0; /* shouldnt happen */ 2193 return 0; /* shouldnt happen */
2510 2194
2511 success = change_map_light (op->map, spell->stats.dam); 2195 success = op->map->change_map_light (spell->stats.dam);
2196
2512 if (!success) 2197 if (!success)
2513 { 2198 {
2514 if (spell->stats.dam < 0) 2199 if (spell->stats.dam < 0)
2515 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2200 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here.");
2516 else 2201 else
… …
2593 { 2278 {
2594 aura->destroy (); 2279 aura->destroy ();
2595 return; 2280 return;
2596 } 2281 }
2597 2282
2598 aura->x = env->x;
2599 aura->y = env->y;
2600
2601 /* we need to jump out of the inventory for a bit 2283 /* we need to jump out of the inventory for a bit
2602 * in order to hit the map conveniently. 2284 * in order to hit the map conveniently.
2603 */ 2285 */
2604 insert_ob_in_map (aura, env->map, aura, 0); 2286 aura->insert_at (env, aura);
2605 2287
2606 for (i = 1; i < 9; i++) 2288 for (i = 1; i < 9; i++)
2607 { 2289 {
2608 sint16 nx, ny; 2290 sint16 nx, ny;
2609 2291
… …
2618 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 2300 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
2619 { 2301 {
2620 hit_map (aura, i, aura->attacktype, 0); 2302 hit_map (aura, i, aura->attacktype, 0);
2621 2303
2622 if (aura->other_arch) 2304 if (aura->other_arch)
2623 { 2305 m->insert (arch_to_object (aura->other_arch), nx, ny, aura);
2624 object *new_ob;
2625
2626 new_ob = arch_to_object (aura->other_arch);
2627 new_ob->x = nx;
2628 new_ob->y = ny;
2629 insert_ob_in_map (new_ob, m, aura, 0);
2630 } 2306 }
2631 }
2632 } 2307 }
2308
2633 /* put the aura back in the player's inventory */ 2309 /* put the aura back in the player's inventory */
2634 aura->remove (); 2310 aura->remove ();
2635 insert_ob_in_ob (aura, env); 2311 insert_ob_in_ob (aura, env);
2636} 2312}
2637 2313
… …
2642void 2318void
2643move_peacemaker (object *op) 2319move_peacemaker (object *op)
2644{ 2320{
2645 object *tmp; 2321 object *tmp;
2646 2322
2647 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 2323 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
2648 { 2324 {
2649 int atk_lev, def_lev; 2325 int atk_lev, def_lev;
2650 object *victim = tmp; 2326 object *victim = tmp;
2651 2327
2652 if (tmp->head) 2328 if (tmp->head)
… …
2718 2394
2719 snprintf (rune, sizeof (rune), "%s\n", msg); 2395 snprintf (rune, sizeof (rune), "%s\n", msg);
2720 2396
2721 tmp->race = op->name; /*Save the owner of the rune */ 2397 tmp->race = op->name; /*Save the owner of the rune */
2722 tmp->msg = rune; 2398 tmp->msg = rune;
2723 tmp->x = op->x; 2399
2724 tmp->y = op->y; 2400 tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);
2725 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
2726 return 1; 2401 return 1;
2727} 2402}

Diff Legend

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