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.43 by root, Thu Jul 5 08:10:30 2007 UTC vs.
Revision 1.92 by root, Wed Nov 11 04:45:23 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 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
26 * of code 27 * of code
… …
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 */
41 42static void
42void
43check_spell_knockback (object *op) 43check_spell_knockback (object *op)
44{ 44{
45 object *tmp, *tmp2; /* object on the map */
46 int weight_move; 45 int weight_move;
47 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 */
48 47
49 if (!op->weight) 48 if (!op->weight)
50 { /*shouldn't happen but if cone object has no weight drop out */ 49 { /*shouldn't happen but if cone object has no weight drop out */
… …
55 { 54 {
56 weight_move = op->weight + (op->weight * op->level) / 3; 55 weight_move = op->weight + (op->weight * op->level) / 3;
57 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 56 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
58 } 57 }
59 58
60 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
61 { 60 {
62 int num_sections = 1; 61 int num_sections = 1;
63 62
64 /* don't move DM */ 63 /* don't move DM */
65 if (QUERY_FLAG (tmp, FLAG_WIZ)) 64 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
72 /* don't move floors or immobile objects */ 71 /* don't move floors or immobile objects */
73 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 72 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))
74 continue; 73 continue;
75 74
76 /* count the object's sections */ 75 /* count the object's sections */
77 for (tmp2 = tmp; tmp2 != NULL; tmp2 = tmp2->more) 76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
78 num_sections++; 77 num_sections++;
79 78
80 /* I'm not sure if it makes sense to divide by num_sections - bigger 79 /* I'm not sure if it makes sense to divide by num_sections - bigger
81 * objects should be harder to move, and we are moving the entire 80 * objects should be harder to move, and we are moving the entire
82 * object, not just the head, so the total weight should be relevant. 81 * object, not just the head, so the total weight should be relevant.
… …
106 * 105 *
107 * BOLT CODE 106 * BOLT CODE
108 * 107 *
109 ***************************************************************************/ 108 ***************************************************************************/
110 109
111/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
112 * is the first piece of the fork. 111 * is the first piece of the fork.
113 */ 112 */
114 113static void
115void
116forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
117{ 115{
118 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 */
119 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
120 maptile *m; 118 maptile *m;
… …
151 new_bolt->duration++; 149 new_bolt->duration++;
152 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 150 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
153 new_bolt->stats.dam++; 151 new_bolt->stats.dam++;
154 tmp->stats.dam /= 2; /* reduce father bolt damage */ 152 tmp->stats.dam /= 2; /* reduce father bolt damage */
155 tmp->stats.dam++; 153 tmp->stats.dam++;
154
156 if ((new_bolt = m->insert (new_bolt, sx, sy, op))) 155 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
157 update_turn_face (new_bolt); 156 update_turn_face (new_bolt);
158} 157}
159 158
160/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 159/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
161 * and checks for various things that may stop it. 160 * and checks for various things that may stop it.
162 */ 161 */
163
164void 162void
165move_bolt (object *op) 163move_bolt (object *op)
166{ 164{
167 int mflags; 165 int mflags;
168 sint16 x, y; 166 sint16 x, y;
169 maptile *m; 167 maptile *m;
170 168
171 if (--op->duration < 0) 169 if (--op->duration < 0)
172 { 170 {
173 op->destroy (); 171 op->drop_and_destroy ();
174 return; 172 return;
175 } 173 }
176 174
177 hit_map (op, 0, op->attacktype, 1); 175 hit_map (op, 0, op->attacktype, 1);
178 176
… …
251 tmp->duration++; 249 tmp->duration++;
252 250
253 /* New forking code. Possibly create forks of this object 251 /* New forking code. Possibly create forks of this object
254 * going off in other directions. 252 * going off in other directions.
255 */ 253 */
256 if (rndm (0, 99) < tmp->stats.Dex) 254 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
257 { /* stats.Dex % of forking */ 255 forklightning (op, tmp); /* stats.Dex % of forking */
258 forklightning (op, tmp);
259 }
260 256
261 /* In this way, the object left behind sticks on the space, but 257 /* In this way, the object left behind sticks on the space, but
262 * doesn't create any bolts that continue to move onward. 258 * doesn't create any bolts that continue to move onward.
263 */ 259 */
264 op->range = 0; 260 op->range = 0;
… …
288 return 0; 284 return 0;
289 285
290 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
291 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);
292 tmp->attacktype = spob->attacktype; 288 tmp->attacktype = spob->attacktype;
289
293 if (spob->slaying) 290 if (spob->slaying)
294 tmp->slaying = spob->slaying; 291 tmp->slaying = spob->slaying;
292
295 tmp->range = spob->range + SP_level_range_adjust (caster, spob); 293 tmp->range = spob->range + SP_level_range_adjust (caster, spob);
296 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
297 tmp->stats.Dex = spob->stats.Dex; 295 tmp->stats.Dex = spob->stats.Dex;
298 tmp->stats.Con = spob->stats.Con; 296 tmp->stats.Con = spob->stats.Con;
299 297
… …
310 308
311 maptile *newmap; 309 maptile *newmap;
312 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);
313 if (mflags & P_OUT_OF_MAP) 311 if (mflags & P_OUT_OF_MAP)
314 { 312 {
315 tmp->destroy (); 313 tmp->drop_and_destroy ();
316 return 0; 314 return 0;
317 } 315 }
318 316
319 tmp->map = newmap; 317 tmp->map = newmap;
320 318
321 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)))
322 { 320 {
323 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 321 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
324 { 322 {
325 tmp->destroy (); 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;
… …
343 * BULLET/BALL CODE 341 * BULLET/BALL CODE
344 * 342 *
345 ***************************************************************************/ 343 ***************************************************************************/
346 344
347/* expands an explosion. op is a piece of the 345/* expands an explosion. op is a piece of the
348 * explosion - this expans it in the different directions. 346 * explosion - this expands it in the different directions.
349 * At least that is what I think this does. 347 * At least that is what I think this does.
350 */ 348 */
351void 349void
352explosion (object *op) 350explosion (object *op)
353{ 351{
… …
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 == NULL) 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 (); 402 op->destroy ();
405 return; 403 return;
406 } 404 }
407 405
408 if (op->env) 406 if (op->env)
409 { 407 {
410 object *env = object_get_env_recursive (op); 408 object *env = op->outer_env ();
409
411 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 410 if (!env->map || out_of_map (env->map, env->x, env->y))
412 { 411 {
413 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 412 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
414 op->destroy (); 413 op->destroy ();
415 return; 414 return;
416 } 415 }
… …
434 } 433 }
435 434
436 if (op->attacktype) 435 if (op->attacktype)
437 { 436 {
438 hit_map (op, 0, op->attacktype, 1); 437 hit_map (op, 0, op->attacktype, 1);
438
439 if (op->destroyed ()) 439 if (op->destroyed ())
440 return; 440 return;
441 } 441 }
442 442
443 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
… …
446 tmp->set_owner (op); 446 tmp->set_owner (op);
447 tmp->skill = op->skill; 447 tmp->skill = op->skill;
448 448
449 owner = op->owner; 449 owner = op->owner;
450 450
451 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 451 if ((tmp->attacktype & AT_HOLYWORD
452 || tmp->attacktype & AT_GODPOWER)
453 && owner
454 && !tailor_god_spell (tmp, owner))
452 { 455 {
453 op->destroy (); 456 op->destroy ();
454 return; 457 return;
455 } 458 }
456 459
… …
483 486
484 /* Prevent recursion */ 487 /* Prevent recursion */
485 op->move_on = 0; 488 op->move_on = 0;
486 489
487 tmp->insert_at (op, op); 490 tmp->insert_at (op, op);
491 tmp->play_sound (tmp->sound);
492
488 /* remove the firebullet */ 493 /* remove the firebullet */
489 op->destroy (); 494 op->destroy ();
490} 495}
491 496
492/* 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
… …
519 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
520 { 525 {
521 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (QUERY_FLAG (tmp, FLAG_ALIVE))
522 { 527 {
523 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
529
530 // TODO: can't understand the following if's
524 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
525 { 532 {
526 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!QUERY_FLAG (op, FLAG_REMOVED))
527 { 534 {
528 op->destroy (); 535 op->destroy ();
… …
539 * fired arches (eg, bolts). 546 * fired arches (eg, bolts).
540 */ 547 */
541void 548void
542move_bullet (object *op) 549move_bullet (object *op)
543{ 550{
544 sint16 new_x, new_y;
545 int mflags;
546 maptile *m;
547
548#if 0 551#if 0
549 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
550 553
551 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
552 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
… …
567 op->destroy (); 570 op->destroy ();
568 571
569 return; 572 return;
570 } 573 }
571 574
572 new_x = op->x + DIRX (op); 575 mapxy pos (op);
573 new_y = op->y + DIRY (op); 576 pos.move (op->direction);
574 m = op->map;
575 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
576 577
577 if (mflags & P_OUT_OF_MAP) 578 if (!pos.normalise ())
578 { 579 {
579 op->destroy (); 580 op->destroy ();
580 return; 581 return;
581 } 582 }
582 583
583 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))
584 { 589 {
585 if (op->other_arch) 590 if (op->other_arch)
586 explode_bullet (op); 591 explode_bullet (op);
587 else 592 else
588 op->destroy (); 593 op->destroy ();
589 594
590 return; 595 return;
591 } 596 }
592 597
593 if (!(op = m->insert (op, new_x, new_y, op))) 598 if (!(op = pos.insert (op, op)))
594 return; 599 return;
595 600
596 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
597 { 602 {
598 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
… …
617 int mflags; 622 int mflags;
618 623
619 if (!spob->other_arch) 624 if (!spob->other_arch)
620 return 0; 625 return 0;
621 626
622 tmp = arch_to_object (spob->other_arch); 627 tmp = spob->other_arch->instance ();
623 if (tmp == NULL) 628 if (!tmp)
624 return 0; 629 return 0;
625 630
626 /* peterm: level dependency for bolts */ 631 /* peterm: level dependency for bolts */
627 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 632 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
628 tmp->attacktype = spob->attacktype; 633 tmp->attacktype = spob->attacktype;
629 if (spob->slaying) 634 if (spob->slaying)
630 tmp->slaying = spob->slaying; 635 tmp->slaying = spob->slaying;
631 636
… …
641 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
642 647
643 tmp->set_owner (op); 648 tmp->set_owner (op);
644 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
645 650
646 tmp->x = op->x + freearr_x[dir]; 651 tmp->x = op->x + freearr_x[dir];
647 tmp->y = op->y + freearr_y[dir]; 652 tmp->y = op->y + freearr_y[dir];
648 tmp->map = op->map; 653 tmp->map = op->map;
649 654
650 maptile *newmap; 655 maptile *newmap;
651 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);
652 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
… …
682 * CONE RELATED FUNCTIONS 687 * CONE RELATED FUNCTIONS
683 * 688 *
684 *****************************************************************************/ 689 *****************************************************************************/
685 690
686/* drops an object based on what is in the cone's "other_arch" */ 691/* drops an object based on what is in the cone's "other_arch" */
687void 692static void
688cone_drop (object *op) 693cone_drop (object *op)
689{ 694{
690 object *new_ob = arch_to_object (op->other_arch); 695 object *new_ob = arch_to_object (op->other_arch);
691 696
692 new_ob->level = op->level; 697 new_ob->level = op->level;
… …
702/* move_cone: causes cone object 'op' to move a space/hit creatures */ 707/* move_cone: causes cone object 'op' to move a space/hit creatures */
703 708
704void 709void
705move_cone (object *op) 710move_cone (object *op)
706{ 711{
707 int i;
708
709 /* if no map then hit_map will crash so just ignore object */ 712 /* if no map then hit_map will crash so just ignore object */
710 if (!op->map) 713 if (!op->map)
711 { 714 {
712 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 715 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
713 op->set_speed (0); 716 op->set_speed (0);
… …
733 } 736 }
734#endif 737#endif
735 738
736 hit_map (op, 0, op->attacktype, 0); 739 hit_map (op, 0, op->attacktype, 0);
737 740
741 if (!op->is_on_map ())
742 return;
743
738 /* Check to see if we should push anything. 744 /* Check to see if we should push anything.
739 * Spell objects with weight push whatever they encounter to some 745 * Spell objects with weight push whatever they encounter to some
740 * degree. 746 * degree.
741 */ 747 */
742 if (op->weight) 748 if (op->weight)
749 {
743 check_spell_knockback (op); 750 check_spell_knockback (op);
744 751
745 if (op->destroyed ()) 752 if (!op->is_on_map ())
746 return; 753 return;
754 }
747 755
748 if ((op->duration--) < 0) 756 if (op->duration-- < 0)
749 { 757 {
750 op->destroy (); 758 op->destroy ();
751 return; 759 return;
752 } 760 }
753 /* Object has hit maximum range, so don't have it move 761 /* Object has hit maximum range, so don't have it move
… …
758 { 766 {
759 op->range = 0; /* just so it doesn't wrap */ 767 op->range = 0; /* just so it doesn't wrap */
760 return; 768 return;
761 } 769 }
762 770
763 for (i = -1; i < 2; i++) 771 for (int i = -1; i <= 1; i++)
764 { 772 {
765 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 773 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
766 774
767 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 775 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
768 { 776 {
… …
819 */ 827 */
820 movetype = spell->other_arch->move_type; 828 movetype = spell->other_arch->move_type;
821 829
822 for (i = range_min; i <= range_max; i++) 830 for (i = range_min; i <= range_max; i++)
823 { 831 {
824 sint16 x, y, d; 832 sint16 x, y;
825 833
826 /* We can't use absdir here, because it never returns 834 /* We can't use absdir here, because it never returns
827 * 0. If this is a rune, we want to hit the person on top 835 * 0. If this is a rune, we want to hit the person on top
828 * of the trap (d==0). If it is not a rune, then we don't want 836 * of the trap (d==0). If it is not a rune, then we don't want
829 * to hit that person. 837 * to hit that person.
830 */ 838 */
831 d = dir + i; 839 int d = dir ? absdir (dir + i) : i;
832 while (d < 0)
833 d += 8;
834 while (d > 8)
835 d -= 8;
836 840
837 /* If it's not a rune, we don't want to blast the caster. 841 /* If it's not a rune, we don't want to blast the caster.
838 * In that case, we have to see - if dir is specified, 842 * In that case, we have to see - if dir is specified,
839 * turn this into direction 8. If dir is not specified (all 843 * turn this into direction 8. If dir is not specified (all
840 * direction) skip - otherwise, one line would do more damage 844 * direction) skip - otherwise, one line would do more damage
… …
860 864
861 success = 1; 865 success = 1;
862 tmp = arch_to_object (spell->other_arch); 866 tmp = arch_to_object (spell->other_arch);
863 tmp->set_owner (op); 867 tmp->set_owner (op);
864 set_spell_skill (op, caster, spell, tmp); 868 set_spell_skill (op, caster, spell, tmp);
865 tmp->level = caster_level (caster, spell); 869 tmp->level = casting_level (caster, spell);
866 tmp->attacktype = spell->attacktype; 870 tmp->attacktype = spell->attacktype;
867 871
868 /* holy word stuff */ 872 /* holy word stuff */
869 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 873 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
870 if (!tailor_god_spell (tmp, op)) 874 if (!tailor_god_spell (tmp, op))
… …
935 * op is the original bomb object. 939 * op is the original bomb object.
936 */ 940 */
937void 941void
938animate_bomb (object *op) 942animate_bomb (object *op)
939{ 943{
940 int i;
941 object *env, *tmp;
942
943 if (op->state != NUM_ANIMATIONS (op) - 1) 944 if (op->state != NUM_ANIMATIONS (op) - 1)
944 return; 945 return;
945 946
946 env = object_get_env_recursive (op); 947 object *env = op->outer_env ();
947 948
948 if (op->env) 949 if (op->env)
949 { 950 {
950 if (env->map == NULL) 951 if (!env->map)
951 return; 952 return;
952
953 if (env->type == PLAYER)
954 esrv_del_item (env->contr, op->count);
955 953
956 if (!(op = op->insert_at (env, op))) 954 if (!(op = op->insert_at (env, op)))
957 return; 955 return;
958 } 956 }
959 957
960 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 958 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
961 // on a safe map. I don't like this special casing, but it seems to be neccessary 959 // on a safe map. I don't like this special casing, but it seems to be neccessary
962 // as bombs can be carried. 960 // as bombs can be carried.
963 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 961 if (op->ms ().flags () & P_SAFE)
964 { 962 {
965 op->destroy (); 963 op->destroy ();
966 return; 964 return;
967 } 965 }
968 966
… …
970 * but using the cast_bullet isn't really feasible, 968 * but using the cast_bullet isn't really feasible,
971 * so just set up the appropriate values. 969 * so just set up the appropriate values.
972 */ 970 */
973 if (archetype *at = archetype::find (SPLINT)) 971 if (archetype *at = archetype::find (SPLINT))
974 { 972 {
975 for (i = 1; i < 9; i++) 973 for (int i = 1; i < 9; i++)
976 { 974 {
977 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 975 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
978 continue; 976 continue;
979 977
980 tmp = arch_to_object (at); 978 object *tmp = arch_to_object (at);
981 tmp->direction = i; 979 tmp->direction = i;
982 tmp->range = op->range; 980 tmp->range = op->range;
983 tmp->stats.dam = op->stats.dam; 981 tmp->stats.dam = op->stats.dam;
984 tmp->duration = op->duration; 982 tmp->duration = op->duration;
985 tmp->attacktype = op->attacktype; 983 tmp->attacktype = op->attacktype;
… …
999} 997}
1000 998
1001int 999int
1002create_bomb (object *op, object *caster, int dir, object *spell) 1000create_bomb (object *op, object *caster, int dir, object *spell)
1003{ 1001{
1004
1005 object *tmp; 1002 object *tmp;
1006 int mflags; 1003 int mflags;
1007 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1004 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1008 maptile *m; 1005 maptile *m;
1009 1006
1010 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1007 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1008
1009 // when creating a bomb below ourself it should always work, even
1010 // when movement is blocked (somehow we got here, somehow we are here,
1011 // so we should also be able to make a bomb here). (originally added
1012 // to fix create bomb traps in doors, which cast with dir=0).
1013 if (dir)
1014 {
1011 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1015 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1012 { 1016 {
1013 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1017 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1014 return 0; 1018 return 0;
1019 }
1015 } 1020 }
1021
1016 tmp = arch_to_object (spell->other_arch); 1022 tmp = arch_to_object (spell->other_arch);
1017 1023
1018 /* level dependencies for bomb */ 1024 /* level dependencies for bomb */
1019 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1025 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1020 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1026 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
… …
1041 * dir is the direction to look in. 1047 * dir is the direction to look in.
1042 * range is how far out to look. 1048 * range is how far out to look.
1043 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1049 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1044 * this info is used for blocked magic/unholy spaces. 1050 * this info is used for blocked magic/unholy spaces.
1045 */ 1051 */
1046object * 1052static object *
1047get_pointed_target (object *op, int dir, int range, int type) 1053get_pointed_target (object *op, int dir, int range, int type)
1048{ 1054{
1049 object *target; 1055 object *target;
1050 sint16 x, y; 1056 sint16 x, y;
1051 int dist, mflags; 1057 int dist, mflags;
… …
1085 * op = player 1091 * op = player
1086 * caster = object casting the spell. 1092 * caster = object casting the spell.
1087 * dir = direction being cast 1093 * dir = direction being cast
1088 * spell = spell object 1094 * spell = spell object
1089 */ 1095 */
1090
1091int 1096int
1092cast_smite_spell (object *op, object *caster, int dir, object *spell) 1097cast_smite_spell (object *op, object *caster, int dir, object *spell)
1093{ 1098{
1094 object *effect, *target; 1099 object *effect, *target;
1095 object *god = find_god (determine_god (op)); 1100 object *god = find_god (determine_god (op));
… …
1105 * interesting spell. 1110 * interesting spell.
1106 * if it is a cleric spell, you need a god, and the creature 1111 * if it is a cleric spell, you need a god, and the creature
1107 * can't be friendly to your god. 1112 * can't be friendly to your god.
1108 */ 1113 */
1109 1114
1110 if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL) 1115 if (!target
1116 || target->flag [FLAG_REFL_SPELL]
1111 || (!god && spell->stats.grace) 1117 || (!god && spell->stats.grace)
1112 || (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race))) 1118 || (god && target->title == god->name)
1119 || (god && target->race.contains (god->race)))
1113 { 1120 {
1114 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1121 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1115 return 0; 1122 return 0;
1116 } 1123 }
1117 1124
… …
1119 effect = arch_to_object (spell->other_arch); 1126 effect = arch_to_object (spell->other_arch);
1120 else 1127 else
1121 return 0; 1128 return 0;
1122 1129
1123 /* tailor the effect by priest level and worshipped God */ 1130 /* tailor the effect by priest level and worshipped God */
1124 effect->level = caster_level (caster, spell); 1131 effect->level = casting_level (caster, spell);
1125 effect->attacktype = spell->attacktype; 1132 effect->attacktype = spell->attacktype;
1126 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1133 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1127 { 1134 {
1128 if (tailor_god_spell (effect, op)) 1135 if (tailor_god_spell (effect, op))
1129 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1136 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1130 else 1137 else
1131 { 1138 {
1132 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1139 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");
1133 return 0; 1140 return 0;
1134 } 1141 }
… …
1173 effect->insert_at (target, op); 1180 effect->insert_at (target, op);
1174 1181
1175 return 1; 1182 return 1;
1176} 1183}
1177 1184
1178
1179/**************************************************************************** 1185/****************************************************************************
1180 * 1186 *
1181 * MAGIC MISSILE code. 1187 * MAGIC MISSILE code.
1182 * note that the fire_bullet is used to fire the missile. The 1188 * note that the fire_bullet is used to fire the missile. The
1183 * code here is just to move the missile. 1189 * code here is just to move the missile.
… …
1185 1191
1186/* op is a missile that needs to be moved */ 1192/* op is a missile that needs to be moved */
1187void 1193void
1188move_missile (object *op) 1194move_missile (object *op)
1189{ 1195{
1190 int i, mflags;
1191 object *owner;
1192 sint16 new_x, new_y;
1193 maptile *m;
1194
1195 if (op->range-- <= 0) 1196 if (op->range-- <= 0)
1196 { 1197 {
1198 op->drop_and_destroy ();
1199 return;
1200 }
1201
1202 mapxy pos (op);
1203 pos.move (op->direction);
1204
1205 if (!pos.normalise ())
1206 {
1197 op->destroy (); 1207 op->destroy ();
1198 return; 1208 return;
1199 } 1209 }
1200 1210
1201 owner = op->owner; 1211 mapspace &ms = pos.ms ();
1202#if 0
1203 /* It'd make things nastier if this wasn't here - spells cast by
1204 * monster that are then killed would continue to survive
1205 */
1206 if (owner == NULL)
1207 {
1208 op->destroy ();
1209 return;
1210 }
1211#endif
1212 1212
1213 new_x = op->x + DIRX (op); 1213 if (ms.flags () & P_IS_ALIVE || ms.blocks (op))
1214 new_y = op->y + DIRY (op);
1215
1216 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1217
1218 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1219 { 1214 {
1220 hit_map (op, op->direction, AT_MAGIC, 1); 1215 hit_map (op, op->direction, AT_MAGIC, 1);
1221 /* Basically, missile only hits one thing then goes away. 1216 /* Basically, missile only hits one thing then goes away.
1222 * we need to remove it if someone hasn't already done so. 1217 * we need to remove it if someone hasn't already done so.
1223 */ 1218 */
1224 if (!op->destroyed ())
1225 op->destroy ();
1226
1227 return;
1228 }
1229
1230 op->remove ();
1231
1232 if (!op->direction || (mflags & P_OUT_OF_MAP))
1233 {
1234 op->destroy (); 1219 op->destroy ();
1235 return; 1220 return;
1236 } 1221 }
1237 1222
1223 if (!op->direction)
1224 {
1225 op->destroy ();
1226 return;
1227 }
1228
1238 i = spell_find_dir (m, new_x, new_y, op->owner); 1229 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1239 if (i > 0 && i != op->direction) 1230 if (i > 0 && i != op->direction)
1240 { 1231 {
1241 op->direction = i; 1232 op->direction = i;
1242 SET_ANIMATION (op, op->direction); 1233 SET_ANIMATION (op, op->direction);
1243 } 1234 }
1244 1235
1245 m->insert (op, new_x, new_y, op); 1236 pos.insert (op, op);
1246} 1237}
1247 1238
1248/**************************************************************************** 1239/****************************************************************************
1249 * Destruction 1240 * Destruction
1250 ****************************************************************************/ 1241 ****************************************************************************/
… …
1253 * we do this by creating a force and inserting it in the 1244 * we do this by creating a force and inserting it in the
1254 * object. if time is 0, the object glows permanently. To truely 1245 * object. if time is 0, the object glows permanently. To truely
1255 * make this work for non-living objects, we would have to 1246 * make this work for non-living objects, we would have to
1256 * give them the capability to have an inventory. b.t. 1247 * give them the capability to have an inventory. b.t.
1257 */ 1248 */
1258int 1249static int
1259make_object_glow (object *op, int radius, int time) 1250make_object_glow (object *op, int radius, int time)
1260{ 1251{
1261 /* some things are unaffected... */ 1252 /* some things are unaffected... */
1262 if (op->path_denied & PATH_LIGHT) 1253 if (op->path_denied & PATH_LIGHT)
1263 return 0; 1254 return 0;
1264 1255
1265 object *tmp = get_archetype (FORCE_NAME); 1256 object *tmp = get_archetype (FORCE_NAME);
1266 tmp->speed = 0.01; 1257 tmp->speed = 0.01;
1267 tmp->stats.food = time; 1258 tmp->stats.food = time;
1268 SET_FLAG (tmp, FLAG_IS_USED_UP); 1259 SET_FLAG (tmp, FLAG_IS_USED_UP);
1269 tmp->glow_radius = radius; 1260 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1270 if (tmp->glow_radius > MAX_LIGHT_RADII)
1271 tmp->glow_radius = MAX_LIGHT_RADII;
1272
1273 tmp = insert_ob_in_ob (tmp, op); 1261 tmp = insert_ob_in_ob (tmp, op);
1274 1262
1275 if (tmp->glow_radius > op->glow_radius) 1263 if (tmp->glow_radius > op->glow_radius)
1276 op->glow_radius = tmp->glow_radius; 1264 op->set_glow_radius (tmp->glow_radius);
1277 1265
1278 return 1; 1266 return 1;
1279} 1267}
1280 1268
1281int 1269int
1282cast_destruction (object *op, object *caster, object *spell_ob) 1270cast_destruction (object *op, object *caster, object *spell_ob)
1283{ 1271{
1284 int i, j, range, mflags, friendly = 0, dam, dur;
1285 sint16 sx, sy;
1286 maptile *m;
1287 object *tmp;
1288 const char *skill;
1289
1290 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1272 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1291 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1273 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1292 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1274 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1293 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER) 1275
1294 friendly = 1; 1276 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1295 1277
1296 /* destruction doesn't use another spell object, so we need 1278 /* destruction doesn't use another spell object, so we need
1297 * update op's skill pointer so that exp is properly awarded. 1279 * update op's skill pointer so that exp is properly awarded.
1298 * We do some shortcuts here - since this is just temporary
1299 * and we'll reset the values back, we don't need to go through
1300 * the full share string/free_string route.
1301 */ 1280 */
1302 skill = op->skill; 1281 const shstr skill = op->skill;
1282
1303 if (caster == op) 1283 if (caster == op)
1304 op->skill = spell_ob->skill; 1284 op->skill = spell_ob->skill;
1305 else if (caster->skill) 1285 else if (caster->skill)
1306 op->skill = caster->skill; 1286 op->skill = caster->skill;
1307 else 1287 else
1308 op->skill = NULL; 1288 op->skill = 0;
1309 1289
1310 op->change_skill (find_skill_by_name (op, op->skill)); 1290 op->change_skill (find_skill_by_name (op, op->skill));
1311 1291
1312 for (i = -range; i < range; i++) 1292 unordered_mapwalk (op, -range, -range, range, range)
1313 { 1293 {
1314 for (j = -range; j < range; j++) 1294 mapspace &ms = m->at (nx, ny);
1315 {
1316 m = op->map;
1317 sx = op->x + i;
1318 sy = op->y + j;
1319 1295
1320 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1321 if (mflags & P_OUT_OF_MAP)
1322 continue;
1323
1324 if (mflags & P_IS_ALIVE) 1296 if (ms.flags () & P_IS_ALIVE)
1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1298 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1325 { 1299 {
1326 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1300 tmp = tmp->head_ ();
1327 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1328 break;
1329 1301
1330 if (tmp) 1302 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1303 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1331 { 1304 {
1332 if (tmp->head) 1305 if (spell_ob->subtype == SP_DESTRUCTION)
1333 tmp = tmp->head;
1334
1335 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||
1336 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
1337 { 1306 {
1338 if (spell_ob->subtype == SP_DESTRUCTION)
1339 {
1340 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1307 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1308
1341 if (spell_ob->other_arch) 1309 if (spell_ob->other_arch)
1342 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1310 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1343 } 1311 }
1344 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1312 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1345 { 1313 {
1346 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1314 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1347 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1315 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1348 }
1349 } 1316 }
1350 } 1317 }
1351 } 1318 }
1352 }
1353 } 1319 }
1354 1320
1355 op->skill = skill; 1321 op->skill = skill;
1356 return 1; 1322 return 1;
1357} 1323}
… …
1359/*************************************************************************** 1325/***************************************************************************
1360 * 1326 *
1361 * CURSE 1327 * CURSE
1362 * 1328 *
1363 ***************************************************************************/ 1329 ***************************************************************************/
1364
1365int 1330int
1366cast_curse (object *op, object *caster, object *spell_ob, int dir) 1331cast_curse (object *op, object *caster, object *spell_ob, int dir)
1367{ 1332{
1368 object *god = find_god (determine_god (op)); 1333 object *god = find_god (determine_god (op));
1369 object *tmp, *force; 1334 object *tmp, *force;
… …
1373 { 1338 {
1374 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1339 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1375 return 0; 1340 return 0;
1376 } 1341 }
1377 1342
1343 tmp = tmp->head_ ();
1344
1378 /* If we've already got a force of this type, don't add a new one. */ 1345 /* If we've already got a force of this type, don't add a new one. */
1379 for (force = tmp->inv; force != NULL; force = force->below) 1346 for (force = tmp->inv; force; force = force->below)
1380 { 1347 {
1381 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1348 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1382 { 1349 {
1383 if (force->name == spell_ob->name) 1350 if (force->name == spell_ob->name)
1384 { 1351 {
… …
1390 return 0; 1357 return 0;
1391 } 1358 }
1392 } 1359 }
1393 } 1360 }
1394 1361
1395 if (force == NULL) 1362 if (!force)
1396 { 1363 {
1397 force = get_archetype (FORCE_NAME); 1364 force = get_archetype (FORCE_NAME);
1398 force->subtype = FORCE_CHANGE_ABILITY; 1365 force->subtype = FORCE_CHANGE_ABILITY;
1366
1399 if (spell_ob->race) 1367 if (spell_ob->race)
1400 force->name = spell_ob->race; 1368 force->name = spell_ob->race;
1401 else 1369 else
1402 force->name = spell_ob->name; 1370 force->name = spell_ob->name;
1403 1371
… …
1413 { 1381 {
1414 force->duration = duration; 1382 force->duration = duration;
1415 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1383 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1416 } 1384 }
1417 else 1385 else
1418 {
1419 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1386 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1420 } 1387
1421 return 1; 1388 return 1;
1422 } 1389 }
1390
1423 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1391 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1424 force->speed = 1.f; 1392 force->speed = 1.f;
1425 force->speed_left = -1.f; 1393 force->speed_left = -1.f;
1426 SET_FLAG (force, FLAG_APPLIED); 1394 SET_FLAG (force, FLAG_APPLIED);
1427 1395
… …
1444 force->stats.wc = spell_ob->stats.wc; 1412 force->stats.wc = spell_ob->stats.wc;
1445 1413
1446 change_abil (tmp, force); /* Mostly to display any messages */ 1414 change_abil (tmp, force); /* Mostly to display any messages */
1447 insert_ob_in_ob (force, tmp); 1415 insert_ob_in_ob (force, tmp);
1448 tmp->update_stats (); 1416 tmp->update_stats ();
1417
1449 return 1; 1418 return 1;
1450
1451} 1419}
1452 1420
1453/********************************************************************** 1421/**********************************************************************
1454 * mood change 1422 * mood change
1455 * Arguably, this may or may not be an attack spell. But since it 1423 * Arguably, this may or may not be an attack spell. But since it
… …
1461 */ 1429 */
1462int 1430int
1463mood_change (object *op, object *caster, object *spell) 1431mood_change (object *op, object *caster, object *spell)
1464{ 1432{
1465 object *tmp, *god, *head; 1433 object *tmp, *god, *head;
1466 int done_one, range, mflags, level, at, best_at; 1434 int done_one, range, level, at, best_at;
1467 sint16 x, y, nx, ny;
1468 maptile *m;
1469 const char *race; 1435 const char *race;
1470 1436
1471 /* We precompute some values here so that we don't have to keep 1437 /* We precompute some values here so that we don't have to keep
1472 * doing it over and over again. 1438 * doing it over and over again.
1473 */ 1439 */
1474 god = find_god (determine_god (op)); 1440 god = find_god (determine_god (op));
1475 level = caster_level (caster, spell); 1441 level = casting_level (caster, spell);
1476 range = spell->range + SP_level_range_adjust (caster, spell); 1442 range = spell->range + SP_level_range_adjust (caster, spell);
1477 1443
1478 /* On the bright side, no monster should ever have a race of GOD_... 1444 /* On the bright side, no monster should ever have a race of GOD_...
1479 * so even if the player doesn't worship a god, if race=GOD_.., it 1445 * so even if the player doesn't worship a god, if race=GOD_.., it
1480 * won't ever match anything. 1446 * won't ever match anything.
1481 */ 1447 */
1482 if (!spell->race) 1448 if (!spell->race)
1483 race = NULL; 1449 race = NULL;
1484 else if (god && !strcmp (spell->race, "GOD_SLAYING")) 1450 else if (god && spell->race == shstr_GOD_SLAYING)
1485 race = god->slaying; 1451 race = god->slaying;
1486 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1452 else if (god && spell->race == shstr_GOD_FRIEND)
1487 race = god->race; 1453 race = god->race;
1488 else 1454 else
1489 race = spell->race; 1455 race = spell->race;
1490 1456
1491 for (x = op->x - range; x <= op->x + range; x++) 1457 unordered_mapwalk (op, -range, -range, range, range)
1492 for (y = op->y - range; y <= op->y + range; y++)
1493 { 1458 {
1494 done_one = 0; 1459 mapspace &ms = m->at (nx, ny);
1495 m = op->map;
1496 nx = x;
1497 ny = y;
1498 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1499 if (mflags & P_OUT_OF_MAP)
1500 continue;
1501 1460
1502 /* If there is nothing living on this space, no need to go further */ 1461 /* If there is nothing living on this space, no need to go further */
1503 if (!(mflags & P_IS_ALIVE)) 1462 if (!ms.flags () & P_IS_ALIVE)
1504 continue; 1463 continue;
1505 1464
1506 // players can only affect spaces that they can actually see 1465 // players can only affect spaces that they can actually see
1466 if (caster
1507 if (caster && caster->contr 1467 && caster->contr
1508 && caster->contr->visibility_at (m, nx, ny) < 70) 1468 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1509 continue; 1469 continue;
1510 1470
1511 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below) 1471 for (tmp = ms.top; tmp; tmp = tmp->below)
1512 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1472 if (tmp->flag [FLAG_MONSTER])
1513 break; 1473 break;
1514 1474
1515 /* There can be living objects that are not monsters */ 1475 /* There can be living objects that are not monsters */
1516 if (!tmp || tmp->type == PLAYER) 1476 if (!tmp)
1517 continue; 1477 continue;
1518 1478
1519 /* Only the head has meaningful data, so resolve to that */ 1479 /* Only the head has meaningful data, so resolve to that */
1520 if (tmp->head)
1521 head = tmp->head; 1480 head = tmp->head_ ();
1522 else
1523 head = tmp;
1524 1481
1525 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1482 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1526 if (race && head->race && !strstr (race, head->race)) 1483 if (race && head->race && !strstr (race, head->race))
1527 continue; 1484 continue;
1528 1485
1529 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1486 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1530 continue; 1487 continue;
1531 1488
1532 /* Now do a bunch of stuff related to saving throws */ 1489 /* Now do a bunch of stuff related to saving throws */
1533 best_at = -1; 1490 best_at = -1;
1534 if (spell->attacktype) 1491 if (spell->attacktype)
1535 { 1492 {
1536 for (at = 0; at < NROFATTACKS; at++) 1493 for (at = 0; at < NROFATTACKS; at++)
1537 if (spell->attacktype & (1 << at)) 1494 if (spell->attacktype & (1 << at))
1538 if (best_at == -1 || head->resist[at] > head->resist[best_at]) 1495 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1539 best_at = at; 1496 best_at = at;
1540 1497
1541 if (best_at == -1) 1498 if (best_at == -1)
1542 at = 0; 1499 at = 0;
1543 else 1500 else
1544 { 1501 {
1545 if (head->resist[best_at] == 100) 1502 if (head->resist[best_at] == 100)
1546 continue; 1503 continue;
1547 else 1504 else
1548 at = head->resist[best_at] / 5; 1505 at = head->resist[best_at] / 5;
1549 } 1506 }
1507
1550 at -= level / 5; 1508 at -= level / 5;
1551 if (did_make_save (head, head->level, at)) 1509 if (did_make_save (head, head->level, at))
1552 continue; 1510 continue;
1553 } 1511 }
1554 else /* spell->attacktype */ 1512 else /* spell->attacktype */
1555 { 1513 {
1556 /* 1514 /*
1557 Spell has no attacktype (charm & such), so we'll have a specific saving: 1515 Spell has no attacktype (charm & such), so we'll have a specific saving:
1558 * if spell level < monster level, no go 1516 * if spell level < monster level, no go
1559 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1517 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1560 1518
1561 The chance will then be in the range [20-70] percent, not too bad. 1519 The chance will then be in the range [20-70] percent, not too bad.
1562 1520
1563 This is required to fix the 'charm monster' abuse, where a player level 1 can 1521 This is required to fix the 'charm monster' abuse, where a player level 1 can
1564 charm a level 125 monster... 1522 charm a level 125 monster...
1565 1523
1566 Ryo, august 14th 1524 Ryo, august 14th
1567 */ 1525 */
1568 if (head->level > level) 1526 if (head->level > level)
1569 continue; 1527 continue;
1570 1528
1571 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1529 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1572 /* Failed, no effect */ 1530 /* Failed, no effect */
1573 continue; 1531 continue;
1574 } 1532 }
1575 1533
1576 /* Done with saving throw. Now start affecting the monster */ 1534 /* Done with saving throw. Now start affecting the monster */
1535 done_one = 0;
1577 1536
1578 /* aggravation */ 1537 /* aggravation */
1579 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1538 if (QUERY_FLAG (spell, FLAG_MONSTER))
1580 { 1539 {
1581 CLEAR_FLAG (head, FLAG_SLEEP); 1540 CLEAR_FLAG (head, FLAG_SLEEP);
1582 remove_friendly_object (head); 1541 remove_friendly_object (head);
1583 done_one = 1; 1542 done_one = 1;
1584 head->enemy = op; 1543 head->enemy = op;
1585 } 1544 }
1586 1545
1587 /* calm monsters */ 1546 /* calm monsters */
1588 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1547 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
1589 { 1548 {
1590 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1549 SET_FLAG (head, FLAG_UNAGGRESSIVE);
1591 head->enemy = NULL; 1550 head->enemy = NULL;
1592 done_one = 1; 1551 done_one = 1;
1593 } 1552 }
1594 1553
1595 /* berserk monsters */ 1554 /* berserk monsters */
1596 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1555 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1597 { 1556 {
1598 SET_FLAG (head, FLAG_BERSERK); 1557 SET_FLAG (head, FLAG_BERSERK);
1599 done_one = 1; 1558 done_one = 1;
1600 } 1559 }
1601 1560
1602 /* charm */ 1561 /* charm */
1603 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1562 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1604 { 1563 {
1564 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1565
1605 /* Prevent uncontolled outbreaks of self replicating monsters. 1566 /* Prevent uncontrolled outbreaks of self replicating monsters.
1606 Typical use case is charm, go somwhere, use aggravation to make hostile. 1567 Typical use case is charm, go somwhere, use aggravation to make hostile.
1607 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1568 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1608 CLEAR_FLAG (head, FLAG_GENERATOR); 1569 CLEAR_FLAG (head, FLAG_GENERATOR);
1609 head->set_owner (op); 1570 head->set_owner (op);
1610 set_spell_skill (op, caster, spell, head); 1571 set_spell_skill (op, caster, spell, head);
1611 add_friendly_object (head); 1572 add_friendly_object (head);
1612 head->attack_movement = PETMOVE; 1573 head->attack_movement = PETMOVE;
1613 done_one = 1; 1574 done_one = 1;
1614 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1575 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1615 head->stats.exp = 0; 1576 head->stats.exp = 0;
1616 } 1577 }
1617 1578
1618 /* If a monster was effected, put an effect in */ 1579 /* If a monster was effected, put an effect in */
1619 if (done_one && spell->other_arch) 1580 if (done_one && spell->other_arch)
1620 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1581 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1621 } /* for y */ 1582 }
1622 1583
1623 return 1; 1584 return 1;
1624} 1585}
1625
1626 1586
1627/* Move_ball_spell: This handles ball type spells that just sort of wander 1587/* Move_ball_spell: This handles ball type spells that just sort of wander
1628 * about. was called move_ball_lightning, but since more than the ball 1588 * about. was called move_ball_lightning, but since more than the ball
1629 * lightning spell used it, that seemed misnamed. 1589 * lightning spell used it, that seemed misnamed.
1630 * op is the spell effect. 1590 * op is the spell effect.
1631 * note that duration is handled by process_object() in time.c 1591 * note that duration is handled by process_object() in time.c
1632 */ 1592 */
1633
1634void 1593void
1635move_ball_spell (object *op) 1594move_ball_spell (object *op)
1636{ 1595{
1637 int i, j, dam_save, dir, mflags; 1596 int i, j, dam_save, dir, mflags;
1638 sint16 nx, ny, hx, hy; 1597 sint16 nx, ny, hx, hy;
… …
1657 for (i = 1; i < 9; i++) 1616 for (i = 1; i < 9; i++)
1658 { 1617 {
1659 /* i bit 0: alters sign of offset 1618 /* i bit 0: alters sign of offset
1660 * other bits (i / 2): absolute value of offset 1619 * other bits (i / 2): absolute value of offset
1661 */ 1620 */
1662
1663 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1621 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1664 int tmpdir = absdir (op->direction + offset); 1622 int tmpdir = absdir (op->direction + offset);
1665 1623
1666 nx = op->x + freearr_x[tmpdir]; 1624 nx = op->x + freearr_x[tmpdir];
1667 ny = op->y + freearr_y[tmpdir]; 1625 ny = op->y + freearr_y[tmpdir];
… …
1669 { 1627 {
1670 dir = tmpdir; 1628 dir = tmpdir;
1671 break; 1629 break;
1672 } 1630 }
1673 } 1631 }
1632
1674 if (dir == 0) 1633 if (dir == 0)
1675 { 1634 {
1676 nx = op->x; 1635 nx = op->x;
1677 ny = op->y; 1636 ny = op->y;
1678 m = op->map; 1637 m = op->map;
… …
1704 1663
1705 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op))) 1664 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op)))
1706 { 1665 {
1707 if (j) 1666 if (j)
1708 op->stats.dam = dam_save / 2; 1667 op->stats.dam = dam_save / 2;
1668
1709 hit_map (op, j, op->attacktype, 1); 1669 hit_map (op, j, op->attacktype, 1);
1710
1711 } 1670 }
1712 1671
1713 /* insert the other arch */ 1672 /* insert the other arch */
1714 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1673 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1715 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1674 m->insert (arch_to_object (op->other_arch), hx, hy, op);
… …
1729 1688
1730 op->direction = i; 1689 op->direction = i;
1731 } 1690 }
1732} 1691}
1733 1692
1734
1735/* move_swarm_spell: peterm 1693/* move_swarm_spell: peterm
1736 * This is an implementation of the swarm spell. It was written for 1694 * This is an implementation of the swarm spell. It was written for
1737 * meteor swarm, but it could be used for any swarm. A swarm spell 1695 * meteor swarm, but it could be used for any swarm. A swarm spell
1738 * is a special type of object that casts swarms of other types 1696 * is a special type of object that casts swarms of other types
1739 * of spells. Which spell it casts is flexible. It fires the spells 1697 * of spells. Which spell it casts is flexible. It fires the spells
1740 * from a set of squares surrounding the caster, in a given direction. 1698 * from a set of squares surrounding the caster, in a given direction.
1741 */ 1699 */
1742
1743void 1700void
1744move_swarm_spell (object *op) 1701move_swarm_spell (object *op)
1745{ 1702{
1746#if 0 1703#if 0
1747 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1704 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1748 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1705 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1749 sint16 target_x, target_y, origin_x, origin_y; 1706 sint16 target_x, target_y, origin_x, origin_y;
1750 int adjustdir; 1707 int adjustdir;
1751 maptile *m; 1708 maptile *m;
1752#endif 1709#endif
1753 int basedir;
1754 object *owner; 1710 object *owner = op->env;
1755 1711
1756 owner = op->owner; 1712 if (!owner) // MUST not happen, remove when true TODO
1757 if (op->duration == 0 || owner == NULL)
1758 { 1713 {
1714 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1759 op->destroy (); 1715 op->destroy ();
1760 return; 1716 return;
1761 } 1717 }
1762 1718
1719 if (!op->duration || !owner->is_on_map ())
1720 {
1721 op->drop_and_destroy ();
1722 return;
1723 }
1724
1763 op->duration--; 1725 op->duration--;
1764 1726
1765 basedir = op->direction; 1727 int basedir = op->direction;
1766 if (basedir == 0) 1728 if (!basedir)
1767 { 1729 {
1768 /* spray in all directions! 8) */ 1730 /* spray in all directions! 8) */
1769 basedir = rndm (1, 8); 1731 op->facing = (op->facing + op->state) & 7;
1732 basedir = op->facing + 1;
1770 } 1733 }
1771 1734
1772#if 0 1735#if 0
1773 // this is bogus: it causes wrong places to be checked below 1736 // this is bogus: it causes wrong places to be checked below
1774 // (a wall 2 cells away will block the effect...) and 1737 // (a wall 2 cells away will block the effect...) and
… …
1835 { 1798 {
1836 /* Bullet spells have a bunch more customization that needs to be done */ 1799 /* Bullet spells have a bunch more customization that needs to be done */
1837 if (op->spell->subtype == SP_BULLET) 1800 if (op->spell->subtype == SP_BULLET)
1838 fire_bullet (owner, op, basedir, op->spell); 1801 fire_bullet (owner, op, basedir, op->spell);
1839 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1802 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1840 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1803 fire_arch_from_position (owner, op, owner->x, owner->y, basedir, op->spell);
1841 } 1804 }
1842} 1805}
1843
1844
1845
1846 1806
1847/* fire_swarm: 1807/* fire_swarm:
1848 * The following routine creates a swarm of objects. It actually 1808 * The following routine creates a swarm of objects. It actually
1849 * sets up a specific swarm object, which then fires off all 1809 * sets up a specific swarm object, which then fires off all
1850 * the parts of the swarm. 1810 * the parts of the swarm.
… …
1853 * caster: the caster (owner, wand, rod, scroll) 1813 * caster: the caster (owner, wand, rod, scroll)
1854 * dir: the direction everything will be fired in 1814 * dir: the direction everything will be fired in
1855 * spell - the spell that is this spell. 1815 * spell - the spell that is this spell.
1856 * n: the number to be fired. 1816 * n: the number to be fired.
1857 */ 1817 */
1858
1859int 1818int
1860fire_swarm (object *op, object *caster, object *spell, int dir) 1819fire_swarm (object *op, object *caster, object *spell, int dir)
1861{ 1820{
1862 object *tmp;
1863 int i;
1864
1865 if (!spell->other_arch) 1821 if (!spell->other_arch)
1866 return 0; 1822 return 0;
1867 1823
1868 tmp = get_archetype (SWARM_SPELL); 1824 object *tmp = archetype::get (SWARM_SPELL);
1869 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */ 1825
1870 set_spell_skill (op, caster, spell, tmp); 1826 set_spell_skill (op, caster, spell, tmp);
1871
1872 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1827 tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */
1873 tmp->spell = arch_to_object (spell->other_arch); 1828 tmp->spell = spell->other_arch->instance ();
1874
1875 tmp->attacktype = tmp->spell->attacktype; 1829 tmp->attacktype = tmp->spell->attacktype;
1876 1830
1877 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1831 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1878 if (!tailor_god_spell (tmp, op)) 1832 if (!tailor_god_spell (tmp, op))
1879 return 1; 1833 return 1;
1880 1834
1881 tmp->duration = SP_level_duration_adjust (caster, spell); 1835 tmp->duration = SP_level_duration_adjust (caster, spell);
1882 for (i = 0; i < spell->duration; i++) 1836 for (int i = 0; i < spell->duration; i++)
1883 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1837 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1884 1838
1839 tmp->invisible = 1;
1840 tmp->flag [FLAG_NO_DROP] = 1; // make sure it stays in inv, or else
1885 tmp->direction = dir; 1841 tmp->direction = dir;
1886 tmp->invisible = 1; 1842 tmp->facing = rndm (1, 8); // initial firing direction
1843 tmp->state = rndm (4) * 2 + 1; // direction increment
1887 1844
1888 tmp->insert_at (op, op); 1845 op->insert (tmp);
1846
1889 return 1; 1847 return 1;
1890} 1848}
1891
1892 1849
1893/* See the spells documentation file for why this is its own 1850/* See the spells documentation file for why this is its own
1894 * function. 1851 * function.
1895 */ 1852 */
1896int 1853int
… …
1901 int dam, mflags; 1858 int dam, mflags;
1902 maptile *m; 1859 maptile *m;
1903 1860
1904 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1861 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1905 1862
1906 if (!dir) 1863 if (dir)
1907 {
1908 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1909 return 0;
1910 } 1864 {
1911
1912 x = op->x + freearr_x[dir]; 1865 x = op->x + freearr_x[dir];
1913 y = op->y + freearr_y[dir]; 1866 y = op->y + freearr_y[dir];
1914 m = op->map; 1867 m = op->map;
1915 1868
1916 mflags = get_map_flags (m, &m, x, y, &x, &y); 1869 mflags = get_map_flags (m, &m, x, y, &x, &y);
1917 1870
1918 if (mflags & P_OUT_OF_MAP) 1871 if (mflags & P_OUT_OF_MAP)
1919 { 1872 {
1920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1873 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1921 return 0; 1874 return 0;
1922 } 1875 }
1923 1876
1924 if (mflags & P_IS_ALIVE && spell->attacktype) 1877 if (mflags & P_IS_ALIVE && spell->attacktype)
1925 { 1878 {
1926 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1879 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1927 if (QUERY_FLAG (target, FLAG_MONSTER)) 1880 if (QUERY_FLAG (target, FLAG_MONSTER))
1928 { 1881 {
1929 /* oky doky. got a target monster. Lets make a blinding attack */ 1882 /* oky doky. got a target monster. Lets make a blinding attack */
1930 if (target->head) 1883 if (target->head)
1931 target = target->head; 1884 target = target->head;
1885
1932 (void) hit_player (target, dam, op, spell->attacktype, 1); 1886 hit_player (target, dam, op, spell->attacktype, 1);
1933 return 1; /* one success only! */ 1887 return 1; /* one success only! */
1888 }
1934 } 1889 }
1935 }
1936 1890
1937 /* no live target, perhaps a wall is in the way? */ 1891 /* no live target, perhaps a wall is in the way? */
1938 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1892 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1939 { 1893 {
1940 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1894 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1941 return 0; 1895 return 0;
1896 }
1942 } 1897 }
1943 1898
1944 /* ok, looks groovy to just insert a new light on the map */ 1899 /* ok, looks groovy to just insert a new light on the map */
1945 tmp = arch_to_object (spell->other_arch); 1900 tmp = arch_to_object (spell->other_arch);
1946 if (!tmp) 1901 if (!tmp)
1947 { 1902 {
1948 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1903 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1949 return 0; 1904 return 0;
1950 } 1905 }
1906
1951 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1907 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1908
1952 if (tmp->glow_radius) 1909 if (tmp->glow_radius)
1953 { 1910 tmp->set_glow_radius (
1954 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1911 clamp (spell->range + SP_level_range_adjust (caster, spell), 1, MAX_LIGHT_RADIUS)
1955 if (tmp->glow_radius > MAX_LIGHT_RADII) 1912 );
1956 tmp->glow_radius = MAX_LIGHT_RADII;
1957 }
1958 1913
1914 if (dir)
1959 m->insert (tmp, x, y, op); 1915 m->insert (tmp, x, y, op);
1916 else
1917 caster->outer_env_or_self ()->insert (tmp);
1918
1960 return 1; 1919 return 1;
1961} 1920}
1962
1963
1964
1965 1921
1966/* cast_cause_disease: this spell looks along <dir> from the 1922/* cast_cause_disease: this spell looks along <dir> from the
1967 * player and infects someone. 1923 * player and infects someone.
1968 * op is the player/monster, caster is the object, dir is the direction 1924 * op is the player/monster, caster is the object, dir is the direction
1969 * to cast, disease_arch is the specific disease, and type is the spell number 1925 * to cast, disease_arch is the specific disease, and type is the spell number
1970 * perhaps this should actually be in disease.c? 1926 * perhaps this should actually be in disease.c?
1971 */ 1927 */
1972
1973int 1928int
1974cast_cause_disease (object *op, object *caster, object *spell, int dir) 1929cast_cause_disease (object *op, object *caster, object *spell, int dir)
1975{ 1930{
1976 sint16 x, y; 1931 sint16 x, y;
1977 int i, mflags, range, dam_mod, dur_mod; 1932 int i, mflags, range, dam_mod, dur_mod;
… …
1984 /* If casting from a scroll, no direction will be available, so refer to the 1939 /* If casting from a scroll, no direction will be available, so refer to the
1985 * direction the player is pointing. 1940 * direction the player is pointing.
1986 */ 1941 */
1987 if (!dir) 1942 if (!dir)
1988 dir = op->facing; 1943 dir = op->facing;
1944
1989 if (!dir) 1945 if (!dir)
1990 return 0; /* won't find anything if casting on ourself, so just return */ 1946 return 0; /* won't find anything if casting on ourself, so just return */
1991 1947
1992 /* Calculate these once here */ 1948 /* Calculate these once here */
1993 range = spell->range + SP_level_range_adjust (caster, spell); 1949 range = spell->range + SP_level_range_adjust (caster, spell);
… …
2020 object *disease = arch_to_object (spell->other_arch); 1976 object *disease = arch_to_object (spell->other_arch);
2021 1977
2022 disease->set_owner (op); 1978 disease->set_owner (op);
2023 set_spell_skill (op, caster, spell, disease); 1979 set_spell_skill (op, caster, spell, disease);
2024 disease->stats.exp = 0; 1980 disease->stats.exp = 0;
2025 disease->level = caster_level (caster, spell); 1981 disease->level = casting_level (caster, spell);
2026 1982
2027 /* do level adjustments */ 1983 /* do level adjustments */
2028 if (disease->stats.wc) 1984 if (disease->stats.wc)
2029 disease->stats.wc += dur_mod / 2; 1985 disease->stats.wc += dur_mod / 2;
2030 1986
2031 if (disease->magic > 0) 1987 if (disease->magic > 0)
2032 disease->magic += dur_mod / 4; 1988 disease->magic += dur_mod / 8;
2033 1989
2034 if (disease->stats.maxhp > 0) 1990 if (disease->stats.maxhp > 0)
2035 disease->stats.maxhp += dur_mod; 1991 disease->stats.maxhp += dur_mod;
2036 1992
2037 if (disease->stats.maxgrace > 0) 1993 if (disease->stats.maxgrace > 0)
… …
2075 if (infect_object (walk, disease, 1)) 2031 if (infect_object (walk, disease, 1))
2076 { 2032 {
2077 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2033 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2078 2034
2079 disease->destroy (); /* don't need this one anymore */ 2035 disease->destroy (); /* don't need this one anymore */
2080 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2036 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
2081 return 1; 2037 return 1;
2082 } 2038 }
2083 2039
2084 disease->destroy (); 2040 disease->destroy ();
2085 } 2041 }

Diff Legend

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