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

Diff Legend

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