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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.65 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.112 by root, Mon Oct 29 23:55:57 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
25 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
… …
36/* this function checks to see if a spell pushes objects as well 37/* this function checks to see if a spell pushes objects as well
37 * as flies over and damages them (only used for cones for now) 38 * as flies over and damages them (only used for cones for now)
38 * but moved here so it could be applied to bolts too 39 * but moved here so it could be applied to bolts too
39 * op is the spell object. 40 * op is the spell object.
40 */ 41 */
41void 42static void
42check_spell_knockback (object *op) 43check_spell_knockback (object *op)
43{ 44{
44 int weight_move; 45 int weight_move;
45 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */ 46 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
46 47
… …
58 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
59 { 60 {
60 int num_sections = 1; 61 int num_sections = 1;
61 62
62 /* don't move DM */ 63 /* don't move DM */
63 if (QUERY_FLAG (tmp, FLAG_WIZ)) 64 if (tmp->flag [FLAG_WIZ])
64 return; 65 return;
65 66
66 /* don't move parts of objects */ 67 /* don't move parts of objects */
67 if (tmp->head) 68 if (tmp->head)
68 continue; 69 continue;
69 70
70 /* don't move floors or immobile objects */ 71 /* don't move floors or immobile objects */
71 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 72 if (tmp->flag [FLAG_IS_FLOOR] || (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
72 continue; 73 continue;
73 74
74 /* count the object's sections */ 75 /* count the object's sections */
75 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more) 76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
76 num_sections++; 77 num_sections++;
… …
92 * also be safe for objects. 93 * also be safe for objects.
93 * This does return if successful or not, but 94 * This does return if successful or not, but
94 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
95 * right now. 96 * right now.
96 */ 97 */
97 move_object (tmp, absdir (op->stats.sp)); 98 tmp->move (absdir (op->stats.sp));
98 } 99 }
99 100
100 } 101 }
101} 102}
102 103
… …
107 ***************************************************************************/ 108 ***************************************************************************/
108 109
109/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
110 * is the first piece of the fork. 111 * is the first piece of the fork.
111 */ 112 */
112void 113static void
113forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
114{ 115{
115 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 116 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
116 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
117 maptile *m; 118 maptile *m;
… …
165 sint16 x, y; 166 sint16 x, y;
166 maptile *m; 167 maptile *m;
167 168
168 if (--op->duration < 0) 169 if (--op->duration < 0)
169 { 170 {
170 op->destroy_inv (true); // be explicit about dropping
171 op->destroy (true); 171 op->drop_and_destroy ();
172 return; 172 return;
173 } 173 }
174 174
175 hit_map (op, 0, op->attacktype, 1); 175 hit_map (op, 0, op->attacktype, 1);
176 176
… …
194 * on the space. So only call reflwall if we think the data it returns 194 * on the space. So only call reflwall if we think the data it returns
195 * will be useful. 195 * will be useful.
196 */ 196 */
197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
198 { 198 {
199 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 199 if (!op->flag [FLAG_REFLECTING])
200 return; 200 return;
201 201
202 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
203 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
204 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
… …
277 int mflags; 277 int mflags;
278 278
279 if (!spob->other_arch) 279 if (!spob->other_arch)
280 return 0; 280 return 0;
281 281
282 tmp = arch_to_object (spob->other_arch); 282 tmp = spob->other_arch->instance ();
283 if (tmp == NULL) 283 if (tmp == NULL)
284 return 0; 284 return 0;
285 285
286 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
287 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 287 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
… …
294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
295 tmp->stats.Dex = spob->stats.Dex; 295 tmp->stats.Dex = spob->stats.Dex;
296 tmp->stats.Con = spob->stats.Con; 296 tmp->stats.Con = spob->stats.Con;
297 297
298 tmp->direction = dir; 298 tmp->direction = dir;
299 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 299 if (tmp->flag [FLAG_IS_TURNABLE])
300 SET_ANIMATION (tmp, dir); 300 SET_ANIMATION (tmp, dir);
301 301
302 tmp->set_owner (op); 302 tmp->set_owner (op);
303 set_spell_skill (op, caster, spob, tmp); 303 set_spell_skill (op, caster, spob, tmp);
304 304
… …
308 308
309 maptile *newmap; 309 maptile *newmap;
310 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 310 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
311 if (mflags & P_OUT_OF_MAP) 311 if (mflags & P_OUT_OF_MAP)
312 { 312 {
313 tmp->destroy_inv (true); // be explicit about dropping
314 tmp->destroy (true); 313 tmp->drop_and_destroy ();
315 return 0; 314 return 0;
316 } 315 }
317 316
318 tmp->map = newmap; 317 tmp->map = newmap;
319 318
320 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 319 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
321 { 320 {
322 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 321 if (!tmp->flag [FLAG_REFLECTING])
323 { 322 {
324 tmp->destroy_inv (true); // be explicit about dropping
325 tmp->destroy (true); 323 tmp->drop_and_destroy ();
326 return 0; 324 return 0;
327 } 325 }
328 326
329 tmp->x = op->x; 327 tmp->x = op->x;
330 tmp->y = op->y; 328 tmp->y = op->y;
… …
354 maptile *m = op->map; 352 maptile *m = op->map;
355 int i; 353 int i;
356 354
357 if (--op->duration < 0) 355 if (--op->duration < 0)
358 { 356 {
359 op->destroy (true); 357 op->destroy ();
360 return; 358 return;
361 } 359 }
362 360
363 hit_map (op, 0, op->attacktype, 0); 361 hit_map (op, 0, op->attacktype, 0);
364 362
… …
391 389
392/* Causes an object to explode, eg, a firebullet, 390/* Causes an object to explode, eg, a firebullet,
393 * poison cloud ball, etc. op is the object to 391 * poison cloud ball, etc. op is the object to
394 * explode. 392 * explode.
395 */ 393 */
396void 394static void
397explode_bullet (object *op) 395explode_bullet (object *op)
398{ 396{
399 object *tmp, *owner; 397 object *tmp, *owner;
400 398
401 if (!op->other_arch) 399 if (!op->other_arch)
402 { 400 {
403 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 401 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
404 op->destroy (true); 402 op->destroy ();
405 return; 403 return;
406 } 404 }
407 405
408 if (op->env) 406 if (op->env)
409 { 407 {
410 object *env = op->outer_env (); 408 object *env = op->outer_env ();
411 409
412 if (!env->map || out_of_map (env->map, env->x, env->y)) 410 if (!env->map || out_of_map (env->map, env->x, env->y))
413 { 411 {
414 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 412 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
415 op->destroy (true); 413 op->destroy ();
416 return; 414 return;
417 } 415 }
418 416
419 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON); 417 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
420 } 418 }
421 else if (out_of_map (op->map, op->x, op->y)) 419 else if (out_of_map (op->map, op->x, op->y))
422 { 420 {
423 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 421 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
424 op->destroy (true); 422 op->destroy ();
425 return; 423 return;
426 } 424 }
427 425
428 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 426 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
429 // NOTE: If this breaks something important: remove this. I can't think of anything 427 // NOTE: If this breaks something important: remove this. I can't think of anything
430 // bad at the moment that might happen from this. 428 // bad at the moment that might happen from this.
431 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 429 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
432 { 430 {
433 op->destroy (true); 431 op->destroy ();
434 return; 432 return;
435 } 433 }
436 434
437 if (op->attacktype) 435 if (op->attacktype)
438 { 436 {
… …
441 if (op->destroyed ()) 439 if (op->destroyed ())
442 return; 440 return;
443 } 441 }
444 442
445 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
446 tmp = arch_to_object (op->other_arch); 444 tmp = op->other_arch->instance ();
447 445
448 tmp->set_owner (op); 446 tmp->set_owner (op);
449 tmp->skill = op->skill; 447 tmp->skill = op->skill;
450 448
451 owner = op->owner; 449 owner = op->owner;
… …
453 if ((tmp->attacktype & AT_HOLYWORD 451 if ((tmp->attacktype & AT_HOLYWORD
454 || tmp->attacktype & AT_GODPOWER) 452 || tmp->attacktype & AT_GODPOWER)
455 && owner 453 && owner
456 && !tailor_god_spell (tmp, owner)) 454 && !tailor_god_spell (tmp, owner))
457 { 455 {
458 op->destroy (true); 456 op->destroy ();
459 return; 457 return;
460 } 458 }
461 459
462 /* special for bombs - it actually has sane values for these */ 460 /* special for bombs - it actually has sane values for these */
463 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 461 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
… …
491 489
492 tmp->insert_at (op, op); 490 tmp->insert_at (op, op);
493 tmp->play_sound (tmp->sound); 491 tmp->play_sound (tmp->sound);
494 492
495 /* remove the firebullet */ 493 /* remove the firebullet */
496 op->destroy (true); 494 op->destroy ();
497} 495}
498 496
499/* checks to see what op should do, given the space it is on 497/* checks to see what op should do, given the space it is on
500 * (eg, explode, damage player, etc) 498 * (eg, explode, damage player, etc)
501 */ 499 */
… …
523 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
524 return; 522 return;
525 523
526 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
527 { 525 {
528 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (tmp->flag [FLAG_ALIVE])
529 { 527 {
530 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
531 529
532 // TODO: can't understand the following if's 530 // TODO: can't understand the following if's
533 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
534 { 532 {
535 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!op->flag [FLAG_REMOVED])
536 { 534 {
537 op->destroy (true); 535 op->destroy ();
538 return; 536 return;
539 } 537 }
540 } 538 }
541 } 539 }
542 } 540 }
… …
548 * fired arches (eg, bolts). 546 * fired arches (eg, bolts).
549 */ 547 */
550void 548void
551move_bullet (object *op) 549move_bullet (object *op)
552{ 550{
553 sint16 new_x, new_y;
554 int mflags;
555 maptile *m;
556
557#if 0 551#if 0
558 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
559 553
560 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
561 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
… …
571 if (--op->range <= 0) 565 if (--op->range <= 0)
572 { 566 {
573 if (op->other_arch) 567 if (op->other_arch)
574 explode_bullet (op); 568 explode_bullet (op);
575 else 569 else
576 op->destroy (true); 570 op->destroy ();
577 571
578 return; 572 return;
579 }
580
581 new_x = op->x + DIRX (op);
582 new_y = op->y + DIRY (op);
583 m = op->map;
584 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
585
586 if (mflags & P_OUT_OF_MAP)
587 { 573 }
574
575 mapxy pos (op);
576 pos.move (op->direction);
577
578 if (!pos.normalise ())
579 {
588 op->destroy (true); 580 op->destroy ();
589 return; 581 return;
590 } 582 }
591 583
592 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 584 mapspace &ms = pos.ms ();
585
586 ms.update ();
587
588 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, ms.move_block))
593 { 589 {
594 if (op->other_arch) 590 if (op->other_arch)
595 explode_bullet (op); 591 explode_bullet (op);
596 else 592 else
597 op->destroy (true); 593 op->destroy ();
598 594
599 return; 595 return;
600 } 596 }
601 597
602 if (!(op = m->insert (op, new_x, new_y, op))) 598 if (!(op = pos.insert (op, op)))
603 return; 599 return;
604 600
605 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
606 { 602 {
607 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
… …
644 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob); 640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
645 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob); 641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
646 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob); 642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
647 643
648 tmp->direction = dir; 644 tmp->direction = dir;
649 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (tmp->flag [FLAG_IS_TURNABLE])
650 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
651 647
652 tmp->set_owner (op); 648 tmp->set_owner (op);
653 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
654 650
… …
658 654
659 maptile *newmap; 655 maptile *newmap;
660 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 656 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
661 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
662 { 658 {
663 tmp->destroy (true); 659 tmp->destroy ();
664 return 0; 660 return 0;
665 } 661 }
666 662
667 tmp->map = newmap; 663 tmp->map = newmap;
668 664
665 // in case the bullet has direction 0 we explode it in place.
666 // direction 0 is possible for instance when a poison cloud trap springs.
667 if (tmp->direction == 0)
668 {
669 if (tmp->other_arch
670 && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
671 explode_bullet (tmp); // explode object will/should remove tmp
672 else
673 tmp->destroy ();
674
675 return 0;
676 }
677
669 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 678 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
670 { 679 {
671 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!tmp->flag [FLAG_REFLECTING])
672 { 681 {
673 tmp->destroy (true); 682 tmp->destroy ();
674 return 0; 683 return 0;
675 } 684 }
676 685
677 tmp->x = op->x; 686 tmp->x = op->x;
678 tmp->y = op->y; 687 tmp->y = op->y;
… …
691 * CONE RELATED FUNCTIONS 700 * CONE RELATED FUNCTIONS
692 * 701 *
693 *****************************************************************************/ 702 *****************************************************************************/
694 703
695/* drops an object based on what is in the cone's "other_arch" */ 704/* drops an object based on what is in the cone's "other_arch" */
696void 705static void
697cone_drop (object *op) 706cone_drop (object *op)
698{ 707{
699 object *new_ob = arch_to_object (op->other_arch); 708 object *new_ob = op->other_arch->instance ();
700 709
701 new_ob->level = op->level; 710 new_ob->level = op->level;
702 new_ob->set_owner (op->owner); 711 new_ob->set_owner (op->owner);
703 712
704 /* preserve skill ownership */ 713 /* preserve skill ownership */
… …
720 op->set_speed (0); 729 op->set_speed (0);
721 return; 730 return;
722 } 731 }
723 732
724 /* lava saves it's life, but not yours :) */ 733 /* lava saves it's life, but not yours :) */
725 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 734 if (op->flag [FLAG_LIFESAVE])
726 { 735 {
727 hit_map (op, 0, op->attacktype, 0); 736 hit_map (op, 0, op->attacktype, 0);
728 return; 737 return;
729 } 738 }
730 739
… …
733 * when their cone dies when they die. 742 * when their cone dies when they die.
734 */ 743 */
735 /* If no owner left, the spell dies out. */ 744 /* If no owner left, the spell dies out. */
736 if (op->owner == NULL) 745 if (op->owner == NULL)
737 { 746 {
738 op->destroy (true); 747 op->destroy ();
739 return; 748 return;
740 } 749 }
741#endif 750#endif
742 751
743 hit_map (op, 0, op->attacktype, 0); 752 hit_map (op, 0, op->attacktype, 0);
753
754 if (!op->is_on_map ())
755 return;
744 756
745 /* Check to see if we should push anything. 757 /* Check to see if we should push anything.
746 * Spell objects with weight push whatever they encounter to some 758 * Spell objects with weight push whatever they encounter to some
747 * degree. 759 * degree.
748 */ 760 */
749 if (op->weight) 761 if (op->weight)
762 {
750 check_spell_knockback (op); 763 check_spell_knockback (op);
751 764
752 if (op->destroyed ()) 765 if (!op->is_on_map ())
753 return; 766 return;
767 }
754 768
755 if (op->duration-- < 0) 769 if (op->duration-- < 0)
756 { 770 {
757 op->destroy (true); 771 op->destroy ();
758 return; 772 return;
759 } 773 }
760 /* Object has hit maximum range, so don't have it move 774 /* Object has hit maximum range, so don't have it move
761 * any further. When the duration above expires, 775 * any further. When the duration above expires,
762 * then the object will get removed. 776 * then the object will get removed.
… …
806 MoveType movetype; 820 MoveType movetype;
807 821
808 if (!spell->other_arch) 822 if (!spell->other_arch)
809 return 0; 823 return 0;
810 824
811 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD) 825 if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
812 { 826 {
813 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!"); 827 op->failmsg ("Your undead nature prevents you from turning undead!");
814 return 0; 828 return 0;
815 } 829 }
816 830
817 if (!dir) 831 if (!dir)
818 { 832 {
… …
826 */ 840 */
827 movetype = spell->other_arch->move_type; 841 movetype = spell->other_arch->move_type;
828 842
829 for (i = range_min; i <= range_max; i++) 843 for (i = range_min; i <= range_max; i++)
830 { 844 {
831 sint16 x, y, d; 845 sint16 x, y;
832 846
833 /* We can't use absdir here, because it never returns 847 /* We can't use absdir here, because it never returns
834 * 0. If this is a rune, we want to hit the person on top 848 * 0. If this is a rune, we want to hit the person on top
835 * of the trap (d==0). If it is not a rune, then we don't want 849 * of the trap (d==0). If it is not a rune, then we don't want
836 * to hit that person. 850 * to hit that person.
837 */ 851 */
838 d = dir + i; 852 int d = dir ? absdir (dir + i) : i;
839 while (d < 0)
840 d += 8;
841 while (d > 8)
842 d -= 8;
843 853
844 /* If it's not a rune, we don't want to blast the caster. 854 /* If it's not a rune, we don't want to blast the caster.
845 * In that case, we have to see - if dir is specified, 855 * In that case, we have to see - if dir is specified,
846 * turn this into direction 8. If dir is not specified (all 856 * turn this into direction 8. If dir is not specified (all
847 * direction) skip - otherwise, one line would do more damage 857 * direction) skip - otherwise, one line would do more damage
… …
864 874
865 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
866 continue; 876 continue;
867 877
868 success = 1; 878 success = 1;
869 tmp = arch_to_object (spell->other_arch); 879 tmp = spell->other_arch->instance ();
870 tmp->set_owner (op); 880 tmp->set_owner (op);
871 set_spell_skill (op, caster, spell, tmp); 881 set_spell_skill (op, caster, spell, tmp);
872 tmp->level = casting_level (caster, spell); 882 tmp->level = casting_level (caster, spell);
873 tmp->attacktype = spell->attacktype; 883 tmp->attacktype = spell->attacktype;
874 884
… …
949 959
950 object *env = op->outer_env (); 960 object *env = op->outer_env ();
951 961
952 if (op->env) 962 if (op->env)
953 { 963 {
954 if (env->map == NULL) 964 if (!env->map)
955 return; 965 return;
956 966
957 if (!(op = op->insert_at (env, op))) 967 if (!(op = op->insert_at (env, op)))
958 return; 968 return;
959 } 969 }
960 970
961 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 971 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
962 // on a safe map. I don't like this special casing, but it seems to be neccessary 972 // on a safe map. I don't like this special casing, but it seems to be neccessary
963 // as bombs can be carried. 973 // as bombs can be carried.
964 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 974 if (op->ms ().flags () & P_SAFE)
965 { 975 {
966 op->destroy (true); 976 op->destroy ();
967 return; 977 return;
968 } 978 }
969 979
970 /* This copies a lot of the code from the fire bullet, 980 /* This copies a lot of the code from the fire bullet,
971 * but using the cast_bullet isn't really feasible, 981 * but using the cast_bullet isn't really feasible,
… …
976 for (int i = 1; i < 9; i++) 986 for (int i = 1; i < 9; i++)
977 { 987 {
978 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 988 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
979 continue; 989 continue;
980 990
981 object *tmp = arch_to_object (at); 991 object *tmp = at->instance ();
982 tmp->direction = i; 992 tmp->direction = i;
983 tmp->range = op->range; 993 tmp->range = op->range;
984 tmp->stats.dam = op->stats.dam; 994 tmp->stats.dam = op->stats.dam;
985 tmp->duration = op->duration; 995 tmp->duration = op->duration;
986 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
987 tmp->set_owner (op); 997 tmp->set_owner (op);
988 if (op->skill && op->skill != tmp->skill) 998 if (op->skill && op->skill != tmp->skill)
989 tmp->skill = op->skill; 999 tmp->skill = op->skill;
990 1000
991 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1001 if (tmp->flag [FLAG_IS_TURNABLE])
992 SET_ANIMATION (tmp, i); 1002 SET_ANIMATION (tmp, i);
993 1003
994 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op); 1004 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
995 move_bullet (tmp); 1005 move_bullet (tmp);
996 } 1006 }
… …
1006 int mflags; 1016 int mflags;
1007 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1017 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1008 maptile *m; 1018 maptile *m;
1009 1019
1010 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1020 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1021
1022 // when creating a bomb below ourself it should always work, even
1023 // when movement is blocked (somehow we got here, somehow we are here,
1024 // so we should also be able to make a bomb here). (originally added
1025 // to fix create bomb traps in doors, which cast with dir=0).
1026 if (dir)
1027 {
1011 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1028 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1012 { 1029 {
1013 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 op->failmsg ("There is something in the way.");
1014 return 0; 1031 return 0;
1032 }
1015 } 1033 }
1016 1034
1017 tmp = arch_to_object (spell->other_arch); 1035 tmp = spell->other_arch->instance ();
1018 1036
1019 /* level dependencies for bomb */ 1037 /* level dependencies for bomb */
1020 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1038 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1021 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1039 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1022 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1040 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
… …
1042 * dir is the direction to look in. 1060 * dir is the direction to look in.
1043 * range is how far out to look. 1061 * range is how far out to look.
1044 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1062 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1045 * this info is used for blocked magic/unholy spaces. 1063 * this info is used for blocked magic/unholy spaces.
1046 */ 1064 */
1047object * 1065static object *
1048get_pointed_target (object *op, int dir, int range, int type) 1066get_pointed_target (object *op, int dir, int range, int type)
1049{ 1067{
1050 object *target; 1068 object *target;
1051 sint16 x, y; 1069 sint16 x, y;
1052 int dist, mflags; 1070 int dist, mflags;
… …
1071 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1072 return NULL; 1090 return NULL;
1073 1091
1074 if (mflags & P_IS_ALIVE) 1092 if (mflags & P_IS_ALIVE)
1075 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1093 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1076 if (QUERY_FLAG (target, FLAG_MONSTER)) 1094 if (target->flag [FLAG_MONSTER])
1077 return target; 1095 return target;
1078 } 1096 }
1079 1097
1080 return NULL; 1098 return NULL;
1081} 1099}
1082 1100
1083/* cast_smite_arch() - the priest points to a creature and causes 1101/* cast_smite_spell() - the priest points to a creature and causes
1084 * a 'godly curse' to decend. 1102 * a 'godly curse' to decend.
1085 * usual params - 1103 * usual params -
1086 * op = player 1104 * op = player
1087 * caster = object casting the spell. 1105 * caster = object casting the spell.
1088 * dir = direction being cast 1106 * dir = direction being cast
… …
1091int 1109int
1092cast_smite_spell (object *op, object *caster, int dir, object *spell) 1110cast_smite_spell (object *op, object *caster, int dir, object *spell)
1093{ 1111{
1094 object *effect, *target; 1112 object *effect, *target;
1095 object *god = find_god (determine_god (op)); 1113 object *god = find_god (determine_god (op));
1096 int range;
1097 1114
1098 range = spell->range + SP_level_range_adjust (caster, spell);
1099 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA); 1115 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA);
1100 1116
1101 /* Bunch of conditions for casting this spell. Note that only 1117 /* Bunch of conditions for casting this spell. Note that only
1102 * require a god if this is a cleric spell (requires grace). 1118 * require a god if this is a cleric spell (requires grace).
1103 * This makes this spell much more general purpose - it can be used 1119 * This makes this spell much more general purpose - it can be used
… …
1105 * interesting spell. 1121 * interesting spell.
1106 * if it is a cleric spell, you need a god, and the creature 1122 * if it is a cleric spell, you need a god, and the creature
1107 * can't be friendly to your god. 1123 * can't be friendly to your god.
1108 */ 1124 */
1109 1125
1110 if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL) 1126 if (!target
1127 || target->flag [FLAG_REFL_SPELL]
1111 || (!god && spell->stats.grace) 1128 || (!god && spell->stats.grace)
1112 || (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race))) 1129 || (god && target->title == god->name)
1130 || (god && target->race.contains (god->race)))
1113 { 1131 {
1114 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1132 op->failmsg ("Your request is unheeded.");
1115 return 0; 1133 return 0;
1116 } 1134 }
1117 1135
1118 if (spell->other_arch) 1136 if (spell->other_arch)
1119 effect = arch_to_object (spell->other_arch); 1137 effect = spell->other_arch->instance ();
1120 else 1138 else
1121 return 0; 1139 return 0;
1122 1140
1123 /* tailor the effect by priest level and worshipped God */ 1141 /* tailor the effect by priest level and worshipped God */
1124 effect->level = casting_level (caster, spell); 1142 effect->level = casting_level (caster, spell);
1125 effect->attacktype = spell->attacktype; 1143 effect->attacktype = spell->attacktype;
1126 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1144 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1127 { 1145 {
1128 if (tailor_god_spell (effect, op)) 1146 if (tailor_god_spell (effect, op))
1129 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1147 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1130 else 1148 else
1131 { 1149 {
1132 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1150 op->failmsg ("Your request is ignored.");
1133 return 0; 1151 return 0;
1134 } 1152 }
1135 } 1153 }
1136 1154
1137 /* size of the area of destruction */ 1155 /* size of the area of destruction */
… …
1141 if (effect->attacktype & AT_DEATH) 1159 if (effect->attacktype & AT_DEATH)
1142 { 1160 {
1143 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1161 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1144 1162
1145 /* casting death spells at undead isn't a good thing */ 1163 /* casting death spells at undead isn't a good thing */
1146 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1164 if (target->flag [FLAG_UNDEAD])
1147 { 1165 {
1148 if (random_roll (0, 2, op, PREFER_LOW)) 1166 if (random_roll (0, 2, op, PREFER_LOW))
1149 { 1167 {
1150 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1168 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1151 effect->x = op->x; 1169 effect->x = op->x;
… …
1153 } 1171 }
1154 else 1172 else
1155 { 1173 {
1156 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1174 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1157 target->stats.hp = target->stats.maxhp * 2; 1175 target->stats.hp = target->stats.maxhp * 2;
1158 effect->destroy (true); 1176 effect->destroy ();
1159 return 0; 1177 return 0;
1160 } 1178 }
1161 } 1179 }
1162 } 1180 }
1163 else 1181 else
… …
1186void 1204void
1187move_missile (object *op) 1205move_missile (object *op)
1188{ 1206{
1189 if (op->range-- <= 0) 1207 if (op->range-- <= 0)
1190 { 1208 {
1191 op->destroy_inv (true); // be explicit about dropping
1192 op->destroy (true); 1209 op->drop_and_destroy ();
1193 return; 1210 return;
1194 } 1211 }
1195 1212
1196 mapxy pos (op); 1213 mapxy pos (op);
1197 pos.move (op->direction); 1214 pos.move (op->direction);
1198 1215
1199 if (!pos.normalise ()) 1216 if (!pos.normalise ())
1200 { 1217 {
1201 op->destroy (true); 1218 op->destroy ();
1202 return; 1219 return;
1203 } 1220 }
1204 1221
1205 mapspace &ms = pos.ms (); 1222 mapspace &ms = pos.ms ();
1206 1223
… …
1208 { 1225 {
1209 hit_map (op, op->direction, AT_MAGIC, 1); 1226 hit_map (op, op->direction, AT_MAGIC, 1);
1210 /* Basically, missile only hits one thing then goes away. 1227 /* Basically, missile only hits one thing then goes away.
1211 * we need to remove it if someone hasn't already done so. 1228 * we need to remove it if someone hasn't already done so.
1212 */ 1229 */
1213 op->destroy (true); 1230 op->destroy ();
1214 return; 1231 return;
1215 } 1232 }
1216 1233
1217 if (!op->direction) 1234 if (!op->direction)
1218 { 1235 {
1219 op->destroy (true); 1236 op->destroy ();
1220 return; 1237 return;
1221 } 1238 }
1222 1239
1223 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner); 1240 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1224 if (i > 0 && i != op->direction) 1241 if (i > 0 && i != op->direction)
… …
1238 * we do this by creating a force and inserting it in the 1255 * we do this by creating a force and inserting it in the
1239 * object. if time is 0, the object glows permanently. To truely 1256 * object. if time is 0, the object glows permanently. To truely
1240 * make this work for non-living objects, we would have to 1257 * make this work for non-living objects, we would have to
1241 * give them the capability to have an inventory. b.t. 1258 * give them the capability to have an inventory. b.t.
1242 */ 1259 */
1243int 1260static int
1244make_object_glow (object *op, int radius, int time) 1261make_object_glow (object *op, int radius, int time)
1245{ 1262{
1246 /* some things are unaffected... */ 1263 /* some things are unaffected... */
1247 if (op->path_denied & PATH_LIGHT) 1264 if (op->path_denied & PATH_LIGHT)
1248 return 0; 1265 return 0;
1249 1266
1250 object *tmp = get_archetype (FORCE_NAME); 1267 object *tmp = archetype::get (FORCE_NAME);
1251 tmp->speed = 0.01; 1268 tmp->set_speed (0.01);
1252 tmp->stats.food = time; 1269 tmp->stats.food = time;
1253 SET_FLAG (tmp, FLAG_IS_USED_UP); 1270 tmp->set_flag (FLAG_IS_USED_UP);
1254 tmp->glow_radius = radius; 1271 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1255 if (tmp->glow_radius > MAX_LIGHT_RADII)
1256 tmp->glow_radius = MAX_LIGHT_RADII;
1257
1258 tmp = insert_ob_in_ob (tmp, op); 1272 tmp = insert_ob_in_ob (tmp, op);
1259 1273
1260 if (tmp->glow_radius > op->glow_radius) 1274 if (tmp->glow_radius > op->glow_radius)
1261 op->glow_radius = tmp->glow_radius; 1275 op->set_glow_radius (tmp->glow_radius);
1262 1276
1263 return 1; 1277 return 1;
1264} 1278}
1265 1279
1266int 1280int
1267cast_destruction (object *op, object *caster, object *spell_ob) 1281cast_destruction (object *op, object *caster, object *spell_ob)
1268{ 1282{
1269 int i, j, range, mflags, friendly = 0, dam, dur;
1270 sint16 sx, sy;
1271 maptile *m;
1272 object *tmp;
1273 const char *skill;
1274
1275 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1283 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1276 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1284 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1277 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1285 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1278 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER)
1279 friendly = 1;
1280 1286
1281 /* destruction doesn't use another spell object, so we need 1287 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1282 * update op's skill pointer so that exp is properly awarded.
1283 * We do some shortcuts here - since this is just temporary
1284 * and we'll reset the values back, we don't need to go through
1285 * the full share string/free_string route.
1286 */
1287 skill = op->skill;
1288 if (caster == op)
1289 op->skill = spell_ob->skill;
1290 else if (caster->skill)
1291 op->skill = caster->skill;
1292 else
1293 op->skill = NULL;
1294 1288
1295 op->change_skill (find_skill_by_name (op, op->skill)); 1289 dynbuf buf;
1296 1290 unordered_mapwalk (buf, op, -range, -range, range, range)
1297 for (i = -range; i <= range; i++)
1298 { 1291 {
1299 for (j = -range; j <= range; j++) 1292 mapspace &ms = m->at (nx, ny);
1300 {
1301 m = op->map;
1302 sx = op->x + i;
1303 sy = op->y + j;
1304 1293
1305 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1306 if (mflags & P_OUT_OF_MAP)
1307 continue;
1308
1309 if (mflags & P_IS_ALIVE) 1294 if (ms.flags () & P_IS_ALIVE)
1295 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1310 { 1296 {
1311 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1297 next = tmp->above;
1312 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1313 break;
1314 1298
1315 if (tmp) 1299 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1316 { 1300 {
1317 if (tmp->head)
1318 tmp = tmp->head; 1301 tmp = tmp->head_ ();
1319 1302
1320 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) || 1303 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1321 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER))) 1304 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1322 { 1305 {
1323 if (spell_ob->subtype == SP_DESTRUCTION) 1306 if (spell_ob->subtype == SP_DESTRUCTION)
1324 { 1307 {
1325 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1308 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1326 1309
1327 if (spell_ob->other_arch) 1310 if (spell_ob->other_arch)
1328 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1311 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1329 } 1312 }
1330 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1313 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1331 { 1314 {
1332 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1315 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1333 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1316 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1334 } 1317 }
1335 } 1318 }
1336 } 1319 }
1337 } 1320 }
1338 }
1339 } 1321 }
1340 1322
1341 op->skill = skill;
1342 return 1; 1323 return 1;
1343} 1324}
1344 1325
1345/*************************************************************************** 1326/***************************************************************************
1346 * 1327 *
1347 * CURSE 1328 * CURSE
1348 * 1329 *
1349 ***************************************************************************/ 1330 ***************************************************************************/
1350
1351int 1331int
1352cast_curse (object *op, object *caster, object *spell_ob, int dir) 1332cast_curse (object *op, object *caster, object *spell_ob, int dir)
1353{ 1333{
1354 object *god = find_god (determine_god (op)); 1334 object *god = find_god (determine_god (op));
1355 object *tmp, *force; 1335 object *tmp, *force;
1356 1336
1357 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE); 1337 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1358 if (!tmp) 1338 if (!tmp)
1359 { 1339 {
1360 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1340 op->failmsg ("There is no one in that direction to curse.");
1361 return 0; 1341 return 0;
1362 } 1342 }
1363 1343
1364 tmp = tmp->head_ (); 1344 tmp = tmp->head_ ();
1365 1345
… …
1380 } 1360 }
1381 } 1361 }
1382 1362
1383 if (!force) 1363 if (!force)
1384 { 1364 {
1385 force = get_archetype (FORCE_NAME); 1365 force = archetype::get (FORCE_NAME);
1386 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1387 1367
1388 if (spell_ob->race) 1368 if (spell_ob->race)
1389 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1390 else 1370 else
… …
1408 1388
1409 return 1; 1389 return 1;
1410 } 1390 }
1411 1391
1412 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1392 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1413 force->speed = 1.f;
1414 force->speed_left = -1.f; 1393 force->speed_left = -1.f;
1415 SET_FLAG (force, FLAG_APPLIED); 1394 force->set_speed (1.f);
1395 force->set_flag (FLAG_APPLIED);
1416 1396
1417 if (god) 1397 if (god)
1418 { 1398 {
1419 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
1420 force->path_repelled = god->path_repelled; 1400 force->path_repelled = god->path_repelled;
… …
1433 force->stats.wc = spell_ob->stats.wc; 1413 force->stats.wc = spell_ob->stats.wc;
1434 1414
1435 change_abil (tmp, force); /* Mostly to display any messages */ 1415 change_abil (tmp, force); /* Mostly to display any messages */
1436 insert_ob_in_ob (force, tmp); 1416 insert_ob_in_ob (force, tmp);
1437 tmp->update_stats (); 1417 tmp->update_stats ();
1418
1438 return 1; 1419 return 1;
1439
1440} 1420}
1441 1421
1442/********************************************************************** 1422/**********************************************************************
1443 * mood change 1423 * mood change
1444 * Arguably, this may or may not be an attack spell. But since it 1424 * Arguably, this may or may not be an attack spell. But since it
… …
1450 */ 1430 */
1451int 1431int
1452mood_change (object *op, object *caster, object *spell) 1432mood_change (object *op, object *caster, object *spell)
1453{ 1433{
1454 object *tmp, *god, *head; 1434 object *tmp, *god, *head;
1455 int done_one, range, mflags, level, at, best_at; 1435 int done_one, range, level, at, best_at;
1456 sint16 x, y, nx, ny;
1457 maptile *m;
1458 const char *race; 1436 const char *race;
1459 1437
1460 /* We precompute some values here so that we don't have to keep 1438 /* We precompute some values here so that we don't have to keep
1461 * doing it over and over again. 1439 * doing it over and over again.
1462 */ 1440 */
… …
1468 * so even if the player doesn't worship a god, if race=GOD_.., it 1446 * so even if the player doesn't worship a god, if race=GOD_.., it
1469 * won't ever match anything. 1447 * won't ever match anything.
1470 */ 1448 */
1471 if (!spell->race) 1449 if (!spell->race)
1472 race = NULL; 1450 race = NULL;
1473 else if (god && !strcmp (spell->race, "GOD_SLAYING")) 1451 else if (god && spell->race == shstr_GOD_SLAYING)
1474 race = god->slaying; 1452 race = god->slaying;
1475 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1476 race = god->race; 1454 race = god->race;
1477 else 1455 else
1478 race = spell->race; 1456 race = spell->race;
1479 1457
1480 for (x = op->x - range; x <= op->x + range; x++) 1458 dynbuf buf;
1481 for (y = op->y - range; y <= op->y + range; y++) 1459 unordered_mapwalk (buf, op, -range, -range, range, range)
1482 { 1460 {
1483 done_one = 0; 1461 mapspace &ms = m->at (nx, ny);
1484 m = op->map;
1485 nx = x;
1486 ny = y;
1487 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1488 if (mflags & P_OUT_OF_MAP)
1489 continue;
1490 1462
1491 /* If there is nothing living on this space, no need to go further */ 1463 /* If there is nothing living on this space, no need to go further */
1492 if (!(mflags & P_IS_ALIVE)) 1464 if (!(ms.flags () & P_IS_ALIVE))
1493 continue; 1465 continue;
1494 1466
1495 // players can only affect spaces that they can actually see 1467 // players can only affect spaces that they can actually see
1468 if (caster
1496 if (caster && caster->contr 1469 && caster->contr
1497 && caster->contr->visibility_at (m, nx, ny) < 70) 1470 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1498 continue; 1471 continue;
1499 1472
1500 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below) 1473 for (tmp = ms.top; tmp; tmp = tmp->below)
1501 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1474 if (tmp->flag [FLAG_MONSTER])
1502 break; 1475 break;
1503 1476
1504 /* There can be living objects that are not monsters */ 1477 /* There can be living objects that are not monsters */
1505 if (!tmp || tmp->type == PLAYER) 1478 if (!tmp)
1506 continue; 1479 continue;
1507 1480
1508 /* Only the head has meaningful data, so resolve to that */ 1481 /* Only the head has meaningful data, so resolve to that */
1509 if (tmp->head)
1510 head = tmp->head; 1482 head = tmp->head_ ();
1511 else
1512 head = tmp;
1513 1483
1514 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1484 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1515 if (race && head->race && !strstr (race, head->race)) 1485 if (race && head->race && !strstr (race, head->race))
1516 continue; 1486 continue;
1517 1487
1518 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1488 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1519 continue; 1489 continue;
1520 1490
1521 /* Now do a bunch of stuff related to saving throws */ 1491 /* Now do a bunch of stuff related to saving throws */
1522 best_at = -1; 1492 best_at = -1;
1523 if (spell->attacktype) 1493 if (spell->attacktype)
1524 { 1494 {
1525 for (at = 0; at < NROFATTACKS; at++) 1495 for (at = 0; at < NROFATTACKS; at++)
1526 if (spell->attacktype & (1 << at)) 1496 if (spell->attacktype & (1 << at))
1527 if (best_at == -1 || head->resist[at] > head->resist[best_at]) 1497 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1528 best_at = at; 1498 best_at = at;
1529 1499
1530 if (best_at == -1) 1500 if (best_at == -1)
1531 at = 0; 1501 at = 0;
1532 else 1502 else
1533 { 1503 {
1534 if (head->resist[best_at] == 100) 1504 if (head->resist[best_at] == 100)
1535 continue; 1505 continue;
1536 else 1506 else
1537 at = head->resist[best_at] / 5; 1507 at = head->resist[best_at] / 5;
1538 } 1508 }
1509
1539 at -= level / 5; 1510 at -= level / 5;
1540 if (did_make_save (head, head->level, at)) 1511 if (did_make_save (head, head->level, at))
1541 continue; 1512 continue;
1542 } 1513 }
1543 else /* spell->attacktype */ 1514 else /* spell->attacktype */
1544 { 1515 {
1545 /* 1516 /*
1546 Spell has no attacktype (charm & such), so we'll have a specific saving: 1517 Spell has no attacktype (charm & such), so we'll have a specific saving:
1547 * if spell level < monster level, no go 1518 * if spell level < monster level, no go
1548 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1519 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1549 1520
1550 The chance will then be in the range [20-70] percent, not too bad. 1521 The chance will then be in the range [20-70] percent, not too bad.
1551 1522
1552 This is required to fix the 'charm monster' abuse, where a player level 1 can 1523 This is required to fix the 'charm monster' abuse, where a player level 1 can
1553 charm a level 125 monster... 1524 charm a level 125 monster...
1554 1525
1555 Ryo, august 14th 1526 Ryo, august 14th
1556 */ 1527 */
1557 if (head->level > level) 1528 if (head->level > level)
1558 continue; 1529 continue;
1559 1530
1560 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1531 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1561 /* Failed, no effect */ 1532 /* Failed, no effect */
1562 continue; 1533 continue;
1563 } 1534 }
1564 1535
1565 /* Done with saving throw. Now start affecting the monster */ 1536 /* Done with saving throw. Now start affecting the monster */
1537 done_one = 0;
1566 1538
1567 /* aggravation */ 1539 /* aggravation */
1568 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1540 if (spell->flag [FLAG_MONSTER])
1569 { 1541 {
1570 CLEAR_FLAG (head, FLAG_SLEEP); 1542 head->clr_flag (FLAG_SLEEP);
1571 remove_friendly_object (head); 1543 remove_friendly_object (head);
1572 done_one = 1; 1544 done_one = 1;
1573 head->enemy = op; 1545 head->enemy = op;
1574 } 1546 }
1575 1547
1576 /* calm monsters */ 1548 /* calm monsters */
1577 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1549 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1578 { 1550 {
1579 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1551 head->set_flag (FLAG_UNAGGRESSIVE);
1580 head->enemy = NULL; 1552 head->enemy = NULL;
1581 done_one = 1; 1553 done_one = 1;
1582 } 1554 }
1583 1555
1584 /* berserk monsters */ 1556 /* berserk monsters */
1585 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1557 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1586 { 1558 {
1587 SET_FLAG (head, FLAG_BERSERK); 1559 head->set_flag (FLAG_BERSERK);
1588 done_one = 1; 1560 done_one = 1;
1589 } 1561 }
1590 1562
1591 /* charm */ 1563 /* charm */
1592 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1564 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1593 { 1565 {
1594 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1595 1567
1596 /* Prevent uncontrolled outbreaks of self replicating monsters. 1568 /* Prevent uncontrolled outbreaks of self replicating monsters.
1597 Typical use case is charm, go somwhere, use aggravation to make hostile. 1569 Typical use case is charm, go somwhere, use aggravation to make hostile.
1598 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1570 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1599 CLEAR_FLAG (head, FLAG_GENERATOR); 1571 head->clr_flag (FLAG_GENERATOR);
1600 head->set_owner (op); 1572 head->set_owner (op);
1601 set_spell_skill (op, caster, spell, head); 1573 set_spell_skill (op, caster, spell, head);
1602 add_friendly_object (head); 1574 add_friendly_object (head);
1603 head->attack_movement = PETMOVE; 1575 head->attack_movement = PETMOVE;
1604 done_one = 1; 1576 done_one = 1;
1605 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1577 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1606 head->stats.exp = 0; 1578 head->stats.exp = 0;
1607 } 1579 }
1608 1580
1609 /* If a monster was effected, put an effect in */ 1581 /* If a monster was effected, put an effect in */
1610 if (done_one && spell->other_arch) 1582 if (done_one && spell->other_arch)
1611 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1583 m->insert (spell->other_arch->instance (), nx, ny, op);
1612 } /* for y */ 1584 }
1613 1585
1614 return 1; 1586 return 1;
1615} 1587}
1616
1617 1588
1618/* Move_ball_spell: This handles ball type spells that just sort of wander 1589/* Move_ball_spell: This handles ball type spells that just sort of wander
1619 * about. was called move_ball_lightning, but since more than the ball 1590 * about. was called move_ball_lightning, but since more than the ball
1620 * lightning spell used it, that seemed misnamed. 1591 * lightning spell used it, that seemed misnamed.
1621 * op is the spell effect. 1592 * op is the spell effect.
… …
1647 for (i = 1; i < 9; i++) 1618 for (i = 1; i < 9; i++)
1648 { 1619 {
1649 /* i bit 0: alters sign of offset 1620 /* i bit 0: alters sign of offset
1650 * other bits (i / 2): absolute value of offset 1621 * other bits (i / 2): absolute value of offset
1651 */ 1622 */
1652
1653 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1623 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1654 int tmpdir = absdir (op->direction + offset); 1624 int tmpdir = absdir (op->direction + offset);
1655 1625
1656 nx = op->x + freearr_x[tmpdir]; 1626 nx = op->x + freearr_x[tmpdir];
1657 ny = op->y + freearr_y[tmpdir]; 1627 ny = op->y + freearr_y[tmpdir];
… …
1659 { 1629 {
1660 dir = tmpdir; 1630 dir = tmpdir;
1661 break; 1631 break;
1662 } 1632 }
1663 } 1633 }
1634
1664 if (dir == 0) 1635 if (dir == 0)
1665 { 1636 {
1666 nx = op->x; 1637 nx = op->x;
1667 ny = op->y; 1638 ny = op->y;
1668 m = op->map; 1639 m = op->map;
… …
1700 hit_map (op, j, op->attacktype, 1); 1671 hit_map (op, j, op->attacktype, 1);
1701 } 1672 }
1702 1673
1703 /* insert the other arch */ 1674 /* insert the other arch */
1704 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1675 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1705 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1676 m->insert (op->other_arch->instance (), hx, hy, op);
1706 } 1677 }
1707 1678
1708 /* restore to the center location and damage */ 1679 /* restore to the center location and damage */
1709 op->stats.dam = dam_save; 1680 op->stats.dam = dam_save;
1710 1681
… …
1741 object *owner = op->env; 1712 object *owner = op->env;
1742 1713
1743 if (!owner) // MUST not happen, remove when true TODO 1714 if (!owner) // MUST not happen, remove when true TODO
1744 { 1715 {
1745 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ()); 1716 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1746 op->destroy (true); 1717 op->destroy ();
1747 return; 1718 return;
1748 } 1719 }
1749 1720
1750 if (!op->duration || !owner->is_on_map ()) 1721 if (!op->duration || !owner->is_on_map ())
1751 { 1722 {
1752 op->destroy_inv (true); // be explicit about dropping
1753 op->destroy (true); 1723 op->drop_and_destroy ();
1754 return; 1724 return;
1755 } 1725 }
1756 1726
1757 op->duration--; 1727 op->duration--;
1758 1728
… …
1890 int dam, mflags; 1860 int dam, mflags;
1891 maptile *m; 1861 maptile *m;
1892 1862
1893 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1863 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1894 1864
1895 if (!dir) 1865 if (dir)
1896 {
1897 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1898 return 0;
1899 } 1866 {
1900
1901 x = op->x + freearr_x[dir]; 1867 x = op->x + freearr_x[dir];
1902 y = op->y + freearr_y[dir]; 1868 y = op->y + freearr_y[dir];
1903 m = op->map; 1869 m = op->map;
1904 1870
1905 mflags = get_map_flags (m, &m, x, y, &x, &y); 1871 mflags = get_map_flags (m, &m, x, y, &x, &y);
1906 1872
1907 if (mflags & P_OUT_OF_MAP) 1873 if (mflags & P_OUT_OF_MAP)
1908 { 1874 {
1909 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1875 op->failmsg ("Nothing is there.");
1910 return 0; 1876 return 0;
1911 } 1877 }
1912 1878
1913 if (mflags & P_IS_ALIVE && spell->attacktype) 1879 if (mflags & P_IS_ALIVE && spell->attacktype)
1914 { 1880 {
1915 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1881 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1916 if (QUERY_FLAG (target, FLAG_MONSTER)) 1882 if (target->flag [FLAG_MONSTER])
1917 { 1883 {
1918 /* oky doky. got a target monster. Lets make a blinding attack */ 1884 /* oky doky. got a target monster. Lets make a blinding attack */
1919 if (target->head) 1885 if (target->head)
1920 target = target->head; 1886 target = target->head;
1921 1887
1922 hit_player (target, dam, op, spell->attacktype, 1); 1888 hit_player (target, dam, op, spell->attacktype, 1);
1923 return 1; /* one success only! */ 1889 return 1; /* one success only! */
1890 }
1924 } 1891 }
1925 }
1926 1892
1927 /* no live target, perhaps a wall is in the way? */ 1893 /* no live target, perhaps a wall is in the way? */
1928 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1894 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1929 { 1895 {
1930 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1896 op->failmsg ("Something is in the way.");
1931 return 0; 1897 return 0;
1898 }
1932 } 1899 }
1933 1900
1934 /* ok, looks groovy to just insert a new light on the map */ 1901 /* ok, looks groovy to just insert a new light on the map */
1935 tmp = arch_to_object (spell->other_arch); 1902 tmp = spell->other_arch->instance ();
1936 if (!tmp) 1903 if (!tmp)
1937 { 1904 {
1938 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1905 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1939 return 0; 1906 return 0;
1940 } 1907 }
1908
1941 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1909 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1910
1942 if (tmp->glow_radius) 1911 if (tmp->glow_radius)
1943 { 1912 tmp->set_glow_radius (
1944 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1913 clamp (spell->range + SP_level_range_adjust (caster, spell), 1, MAX_LIGHT_RADIUS)
1945 if (tmp->glow_radius > MAX_LIGHT_RADII) 1914 );
1946 tmp->glow_radius = MAX_LIGHT_RADII;
1947 }
1948 1915
1916 if (dir)
1949 m->insert (tmp, x, y, op); 1917 m->insert (tmp, x, y, op);
1918 else
1919 caster->outer_env_or_self ()->insert (tmp);
1920
1950 return 1; 1921 return 1;
1951} 1922}
1952 1923
1953/* cast_cause_disease: this spell looks along <dir> from the 1924/* cast_cause_disease: this spell looks along <dir> from the
1954 * player and infects someone. 1925 * player and infects someone.
… …
2000 /* Only bother looking on this space if there is something living here */ 1971 /* Only bother looking on this space if there is something living here */
2001 if (mflags & P_IS_ALIVE) 1972 if (mflags & P_IS_ALIVE)
2002 { 1973 {
2003 /* search this square for a victim */ 1974 /* search this square for a victim */
2004 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1975 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2005 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1976 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
2006 { /* found a victim */ 1977 { /* found a victim */
2007 object *disease = arch_to_object (spell->other_arch); 1978 object *disease = spell->other_arch->instance ();
2008 1979
2009 disease->set_owner (op); 1980 disease->set_owner (op);
2010 set_spell_skill (op, caster, spell, disease); 1981 set_spell_skill (op, caster, spell, disease);
2011 disease->stats.exp = 0; 1982 disease->stats.exp = 0;
2012 disease->level = casting_level (caster, spell); 1983 disease->level = casting_level (caster, spell);
2013 1984
2014 /* do level adjustments */ 1985 /* do level adjustments */
2015 if (disease->stats.wc) 1986 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
2016 disease->stats.wc += dur_mod / 2; 1987 if (disease->magic > 0) disease->magic += dur_mod / 8;
2017 1988 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
2018 if (disease->magic > 0) 1989 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
2019 disease->magic += dur_mod / 8;
2020
2021 if (disease->stats.maxhp > 0)
2022 disease->stats.maxhp += dur_mod;
2023
2024 if (disease->stats.maxgrace > 0)
2025 disease->stats.maxgrace += dur_mod;
2026
2027 if (disease->stats.dam)
2028 {
2029 if (disease->stats.dam > 0)
2030 disease->stats.dam += dam_mod;
2031 else
2032 disease->stats.dam -= dam_mod;
2033 }
2034 1990
2035 if (disease->last_sp) 1991 if (disease->last_sp)
2036 { 1992 {
2037 disease->last_sp -= 2 * dam_mod; 1993 disease->last_sp -= 2 * dam_mod;
1994
2038 if (disease->last_sp < 1) 1995 if (disease->last_sp < 1)
2039 disease->last_sp = 1; 1996 disease->last_sp = 1;
2040 } 1997 }
2041 1998
2042 if (disease->stats.maxsp) 1999 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2043 { 2000 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2044 if (disease->stats.maxsp > 0) 2001 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2045 disease->stats.maxsp += dam_mod; 2002 if (disease->last_eat ) disease->last_eat -= dam_mod;
2046 else 2003 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2047 disease->stats.maxsp -= dam_mod; 2004 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2048 }
2049
2050 if (disease->stats.ac)
2051 disease->stats.ac += dam_mod;
2052
2053 if (disease->last_eat)
2054 disease->last_eat -= dam_mod;
2055
2056 if (disease->stats.hp)
2057 disease->stats.hp -= dam_mod;
2058
2059 if (disease->stats.sp)
2060 disease->stats.sp -= dam_mod;
2061 2005
2062 if (infect_object (walk, disease, 1)) 2006 if (infect_object (walk, disease, 1))
2063 { 2007 {
2064 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2008 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2065 2009
2066 disease->destroy (true); /* don't need this one anymore */ 2010 disease->destroy (); /* don't need this one anymore */
2067 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2011 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2068 return 1; 2012 return 1;
2069 } 2013 }
2070 2014
2071 disease->destroy (true); 2015 disease->destroy ();
2072 } 2016 }
2073 } /* if living creature */ 2017 } /* if living creature */
2074 } /* for range of spaces */ 2018 } /* for range of spaces */
2075 2019
2076 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2020 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");

Diff Legend

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