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.42 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.67 by root, Mon Sep 29 10:32:50 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* This file contains all the spell attack code. Grouping this code 24/* This file contains all the spell attack code. Grouping this code
25 * together should hopefully make it easier to find the relevent bits 25 * together should hopefully make it easier to find the relevent bits
26 * of code 26 * of code
… …
36/* this function checks to see if a spell pushes objects as well 36/* 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) 37 * as flies over and damages them (only used for cones for now)
38 * but moved here so it could be applied to bolts too 38 * but moved here so it could be applied to bolts too
39 * op is the spell object. 39 * op is the spell object.
40 */ 40 */
41
42void 41void
43check_spell_knockback (object *op) 42check_spell_knockback (object *op)
44{ 43{
45 object *tmp, *tmp2; /* object on the map */
46 int weight_move; 44 int weight_move;
47 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */ 45 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
48 46
49 if (!op->weight) 47 if (!op->weight)
50 { /*shouldn't happen but if cone object has no weight drop out */ 48 { /*shouldn't happen but if cone object has no weight drop out */
… …
55 { 53 {
56 weight_move = op->weight + (op->weight * op->level) / 3; 54 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); */ 55 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
58 } 56 }
59 57
60 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 58 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
61 { 59 {
62 int num_sections = 1; 60 int num_sections = 1;
63 61
64 /* don't move DM */ 62 /* don't move DM */
65 if (QUERY_FLAG (tmp, FLAG_WIZ)) 63 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
72 /* don't move floors or immobile objects */ 70 /* 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))) 71 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))
74 continue; 72 continue;
75 73
76 /* count the object's sections */ 74 /* count the object's sections */
77 for (tmp2 = tmp; tmp2 != NULL; tmp2 = tmp2->more) 75 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
78 num_sections++; 76 num_sections++;
79 77
80 /* I'm not sure if it makes sense to divide by num_sections - bigger 78 /* 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 79 * 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. 80 * object, not just the head, so the total weight should be relevant.
… …
106 * 104 *
107 * BOLT CODE 105 * BOLT CODE
108 * 106 *
109 ***************************************************************************/ 107 ***************************************************************************/
110 108
111/* Causes op to fork. op is the original bolt, tmp 109/* Causes op to fork. op is the original bolt, tmp
112 * is the first piece of the fork. 110 * is the first piece of the fork.
113 */ 111 */
114
115void 112void
116forklightning (object *op, object *tmp) 113forklightning (object *op, object *tmp)
117{ 114{
118 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 115 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 */ 116 int t_dir; /* stores temporary dir calculation */
… …
151 new_bolt->duration++; 148 new_bolt->duration++;
152 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 149 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
153 new_bolt->stats.dam++; 150 new_bolt->stats.dam++;
154 tmp->stats.dam /= 2; /* reduce father bolt damage */ 151 tmp->stats.dam /= 2; /* reduce father bolt damage */
155 tmp->stats.dam++; 152 tmp->stats.dam++;
153
156 if ((new_bolt = m->insert (new_bolt, sx, sy, op))) 154 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
157 update_turn_face (new_bolt); 155 update_turn_face (new_bolt);
158} 156}
159 157
160/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 158/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
161 * and checks for various things that may stop it. 159 * and checks for various things that may stop it.
162 */ 160 */
163
164void 161void
165move_bolt (object *op) 162move_bolt (object *op)
166{ 163{
167 int mflags; 164 int mflags;
168 sint16 x, y; 165 sint16 x, y;
169 maptile *m; 166 maptile *m;
170 167
171 if (--op->duration < 0) 168 if (--op->duration < 0)
172 { 169 {
173 op->destroy (); 170 op->drop_and_destroy ();
174 return; 171 return;
175 } 172 }
176 173
177 hit_map (op, 0, op->attacktype, 1); 174 hit_map (op, 0, op->attacktype, 1);
178 175
… …
251 tmp->duration++; 248 tmp->duration++;
252 249
253 /* New forking code. Possibly create forks of this object 250 /* New forking code. Possibly create forks of this object
254 * going off in other directions. 251 * going off in other directions.
255 */ 252 */
256 if (rndm (0, 99) < tmp->stats.Dex) 253 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
257 { /* stats.Dex % of forking */ 254 forklightning (op, tmp); /* stats.Dex % of forking */
258 forklightning (op, tmp);
259 }
260 255
261 /* In this way, the object left behind sticks on the space, but 256 /* In this way, the object left behind sticks on the space, but
262 * doesn't create any bolts that continue to move onward. 257 * doesn't create any bolts that continue to move onward.
263 */ 258 */
264 op->range = 0; 259 op->range = 0;
… …
288 return 0; 283 return 0;
289 284
290 /* peterm: level dependency for bolts */ 285 /* peterm: level dependency for bolts */
291 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 286 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
292 tmp->attacktype = spob->attacktype; 287 tmp->attacktype = spob->attacktype;
288
293 if (spob->slaying) 289 if (spob->slaying)
294 tmp->slaying = spob->slaying; 290 tmp->slaying = spob->slaying;
291
295 tmp->range = spob->range + SP_level_range_adjust (caster, spob); 292 tmp->range = spob->range + SP_level_range_adjust (caster, spob);
296 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 293 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
297 tmp->stats.Dex = spob->stats.Dex; 294 tmp->stats.Dex = spob->stats.Dex;
298 tmp->stats.Con = spob->stats.Con; 295 tmp->stats.Con = spob->stats.Con;
299 296
… …
310 307
311 maptile *newmap; 308 maptile *newmap;
312 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 309 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
313 if (mflags & P_OUT_OF_MAP) 310 if (mflags & P_OUT_OF_MAP)
314 { 311 {
315 tmp->destroy (); 312 tmp->drop_and_destroy ();
316 return 0; 313 return 0;
317 } 314 }
318 315
319 tmp->map = newmap; 316 tmp->map = newmap;
320 317
321 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 318 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
322 { 319 {
323 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
324 { 321 {
325 tmp->destroy (); 322 tmp->drop_and_destroy ();
326 return 0; 323 return 0;
327 } 324 }
328 325
329 tmp->x = op->x; 326 tmp->x = op->x;
330 tmp->y = op->y; 327 tmp->y = op->y;
… …
343 * BULLET/BALL CODE 340 * BULLET/BALL CODE
344 * 341 *
345 ***************************************************************************/ 342 ***************************************************************************/
346 343
347/* expands an explosion. op is a piece of the 344/* expands an explosion. op is a piece of the
348 * explosion - this expans it in the different directions. 345 * explosion - this expands it in the different directions.
349 * At least that is what I think this does. 346 * At least that is what I think this does.
350 */ 347 */
351void 348void
352explosion (object *op) 349explosion (object *op)
353{ 350{
… …
396void 393void
397explode_bullet (object *op) 394explode_bullet (object *op)
398{ 395{
399 object *tmp, *owner; 396 object *tmp, *owner;
400 397
401 if (op->other_arch == NULL) 398 if (!op->other_arch)
402 { 399 {
403 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 400 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
404 op->destroy (); 401 op->destroy ();
405 return; 402 return;
406 } 403 }
407 404
408 if (op->env) 405 if (op->env)
409 { 406 {
410 object *env = object_get_env_recursive (op); 407 object *env = op->outer_env ();
408
411 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 409 if (!env->map || out_of_map (env->map, env->x, env->y))
412 { 410 {
413 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 411 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
414 op->destroy (); 412 op->destroy ();
415 return; 413 return;
416 } 414 }
… …
434 } 432 }
435 433
436 if (op->attacktype) 434 if (op->attacktype)
437 { 435 {
438 hit_map (op, 0, op->attacktype, 1); 436 hit_map (op, 0, op->attacktype, 1);
437
439 if (op->destroyed ()) 438 if (op->destroyed ())
440 return; 439 return;
441 } 440 }
442 441
443 /* other_arch contains what this explodes into */ 442 /* other_arch contains what this explodes into */
… …
446 tmp->set_owner (op); 445 tmp->set_owner (op);
447 tmp->skill = op->skill; 446 tmp->skill = op->skill;
448 447
449 owner = op->owner; 448 owner = op->owner;
450 449
451 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 450 if ((tmp->attacktype & AT_HOLYWORD
451 || tmp->attacktype & AT_GODPOWER)
452 && owner
453 && !tailor_god_spell (tmp, owner))
452 { 454 {
453 op->destroy (); 455 op->destroy ();
454 return; 456 return;
455 } 457 }
456 458
… …
483 485
484 /* Prevent recursion */ 486 /* Prevent recursion */
485 op->move_on = 0; 487 op->move_on = 0;
486 488
487 tmp->insert_at (op, op); 489 tmp->insert_at (op, op);
490 tmp->play_sound (tmp->sound);
491
488 /* remove the firebullet */ 492 /* remove the firebullet */
489 op->destroy (); 493 op->destroy ();
490} 494}
491 495
492/* checks to see what op should do, given the space it is on 496/* checks to see what op should do, given the space it is on
… …
519 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 523 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
520 { 524 {
521 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
522 { 526 {
523 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
528
529 // TODO: can't understand the following if's
524 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
525 { 531 {
526 if (!QUERY_FLAG (op, FLAG_REMOVED)) 532 if (!QUERY_FLAG (op, FLAG_REMOVED))
527 { 533 {
528 op->destroy (); 534 op->destroy ();
… …
617 int mflags; 623 int mflags;
618 624
619 if (!spob->other_arch) 625 if (!spob->other_arch)
620 return 0; 626 return 0;
621 627
622 tmp = arch_to_object (spob->other_arch); 628 tmp = spob->other_arch->instance ();
623 if (tmp == NULL) 629 if (!tmp)
624 return 0; 630 return 0;
625 631
626 /* peterm: level dependency for bolts */ 632 /* peterm: level dependency for bolts */
627 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 633 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
628 tmp->attacktype = spob->attacktype; 634 tmp->attacktype = spob->attacktype;
629 if (spob->slaying) 635 if (spob->slaying)
630 tmp->slaying = spob->slaying; 636 tmp->slaying = spob->slaying;
631 637
… …
641 SET_ANIMATION (tmp, dir); 647 SET_ANIMATION (tmp, dir);
642 648
643 tmp->set_owner (op); 649 tmp->set_owner (op);
644 set_spell_skill (op, caster, spob, tmp); 650 set_spell_skill (op, caster, spob, tmp);
645 651
646 tmp->x = op->x + freearr_x[dir]; 652 tmp->x = op->x + freearr_x[dir];
647 tmp->y = op->y + freearr_y[dir]; 653 tmp->y = op->y + freearr_y[dir];
648 tmp->map = op->map; 654 tmp->map = op->map;
649 655
650 maptile *newmap; 656 maptile *newmap;
651 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 657 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
652 if (mflags & P_OUT_OF_MAP) 658 if (mflags & P_OUT_OF_MAP)
… …
702/* move_cone: causes cone object 'op' to move a space/hit creatures */ 708/* move_cone: causes cone object 'op' to move a space/hit creatures */
703 709
704void 710void
705move_cone (object *op) 711move_cone (object *op)
706{ 712{
707 int i;
708
709 /* if no map then hit_map will crash so just ignore object */ 713 /* if no map then hit_map will crash so just ignore object */
710 if (!op->map) 714 if (!op->map)
711 { 715 {
712 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 716 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
713 op->set_speed (0); 717 op->set_speed (0);
… …
743 check_spell_knockback (op); 747 check_spell_knockback (op);
744 748
745 if (op->destroyed ()) 749 if (op->destroyed ())
746 return; 750 return;
747 751
748 if ((op->duration--) < 0) 752 if (op->duration-- < 0)
749 { 753 {
750 op->destroy (); 754 op->destroy ();
751 return; 755 return;
752 } 756 }
753 /* Object has hit maximum range, so don't have it move 757 /* Object has hit maximum range, so don't have it move
… …
758 { 762 {
759 op->range = 0; /* just so it doesn't wrap */ 763 op->range = 0; /* just so it doesn't wrap */
760 return; 764 return;
761 } 765 }
762 766
763 for (i = -1; i < 2; i++) 767 for (int i = -1; i <= 1; i++)
764 { 768 {
765 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 769 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
766 770
767 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 771 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
768 { 772 {
… …
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 == NULL)
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
… …
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
… …
1011 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1008 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1012 { 1009 {
1013 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1010 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1014 return 0; 1011 return 0;
1015 } 1012 }
1013
1016 tmp = arch_to_object (spell->other_arch); 1014 tmp = arch_to_object (spell->other_arch);
1017 1015
1018 /* level dependencies for bomb */ 1016 /* level dependencies for bomb */
1019 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1017 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1020 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1018 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
… …
1085 * op = player 1083 * op = player
1086 * caster = object casting the spell. 1084 * caster = object casting the spell.
1087 * dir = direction being cast 1085 * dir = direction being cast
1088 * spell = spell object 1086 * spell = spell object
1089 */ 1087 */
1090
1091int 1088int
1092cast_smite_spell (object *op, object *caster, int dir, object *spell) 1089cast_smite_spell (object *op, object *caster, int dir, object *spell)
1093{ 1090{
1094 object *effect, *target; 1091 object *effect, *target;
1095 object *god = find_god (determine_god (op)); 1092 object *god = find_god (determine_god (op));
… …
1119 effect = arch_to_object (spell->other_arch); 1116 effect = arch_to_object (spell->other_arch);
1120 else 1117 else
1121 return 0; 1118 return 0;
1122 1119
1123 /* tailor the effect by priest level and worshipped God */ 1120 /* tailor the effect by priest level and worshipped God */
1124 effect->level = caster_level (caster, spell); 1121 effect->level = casting_level (caster, spell);
1125 effect->attacktype = spell->attacktype; 1122 effect->attacktype = spell->attacktype;
1126 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1123 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1127 { 1124 {
1128 if (tailor_god_spell (effect, op)) 1125 if (tailor_god_spell (effect, op))
1129 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1126 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op));
… …
1173 effect->insert_at (target, op); 1170 effect->insert_at (target, op);
1174 1171
1175 return 1; 1172 return 1;
1176} 1173}
1177 1174
1178
1179/**************************************************************************** 1175/****************************************************************************
1180 * 1176 *
1181 * MAGIC MISSILE code. 1177 * MAGIC MISSILE code.
1182 * note that the fire_bullet is used to fire the missile. The 1178 * note that the fire_bullet is used to fire the missile. The
1183 * code here is just to move the missile. 1179 * code here is just to move the missile.
… …
1185 1181
1186/* op is a missile that needs to be moved */ 1182/* op is a missile that needs to be moved */
1187void 1183void
1188move_missile (object *op) 1184move_missile (object *op)
1189{ 1185{
1190 int i, mflags;
1191 object *owner;
1192 sint16 new_x, new_y;
1193 maptile *m;
1194
1195 if (op->range-- <= 0) 1186 if (op->range-- <= 0)
1196 { 1187 {
1188 op->drop_and_destroy ();
1189 return;
1190 }
1191
1192 mapxy pos (op);
1193 pos.move (op->direction);
1194
1195 if (!pos.normalise ())
1196 {
1197 op->destroy (); 1197 op->destroy ();
1198 return; 1198 return;
1199 } 1199 }
1200 1200
1201 owner = op->owner; 1201 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 1202
1213 new_x = op->x + DIRX (op); 1203 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 { 1204 {
1220 hit_map (op, op->direction, AT_MAGIC, 1); 1205 hit_map (op, op->direction, AT_MAGIC, 1);
1221 /* Basically, missile only hits one thing then goes away. 1206 /* Basically, missile only hits one thing then goes away.
1222 * we need to remove it if someone hasn't already done so. 1207 * we need to remove it if someone hasn't already done so.
1223 */ 1208 */
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 (); 1209 op->destroy ();
1235 return; 1210 return;
1236 } 1211 }
1237 1212
1213 if (!op->direction)
1214 {
1215 op->destroy ();
1216 return;
1217 }
1218
1238 i = spell_find_dir (m, new_x, new_y, op->owner); 1219 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1239 if (i > 0 && i != op->direction) 1220 if (i > 0 && i != op->direction)
1240 { 1221 {
1241 op->direction = i; 1222 op->direction = i;
1242 SET_ANIMATION (op, op->direction); 1223 SET_ANIMATION (op, op->direction);
1243 } 1224 }
1244 1225
1245 m->insert (op, new_x, new_y, op); 1226 pos.insert (op, op);
1246} 1227}
1247 1228
1248/**************************************************************************** 1229/****************************************************************************
1249 * Destruction 1230 * Destruction
1250 ****************************************************************************/ 1231 ****************************************************************************/
… …
1253 * we do this by creating a force and inserting it in the 1234 * we do this by creating a force and inserting it in the
1254 * object. if time is 0, the object glows permanently. To truely 1235 * object. if time is 0, the object glows permanently. To truely
1255 * make this work for non-living objects, we would have to 1236 * make this work for non-living objects, we would have to
1256 * give them the capability to have an inventory. b.t. 1237 * give them the capability to have an inventory. b.t.
1257 */ 1238 */
1258
1259int 1239int
1260make_object_glow (object *op, int radius, int time) 1240make_object_glow (object *op, int radius, int time)
1261{ 1241{
1262 object *tmp;
1263
1264 /* some things are unaffected... */ 1242 /* some things are unaffected... */
1265 if (op->path_denied & PATH_LIGHT) 1243 if (op->path_denied & PATH_LIGHT)
1266 return 0; 1244 return 0;
1267 1245
1268 tmp = get_archetype (FORCE_NAME); 1246 object *tmp = get_archetype (FORCE_NAME);
1269 tmp->speed = 0.01; 1247 tmp->speed = 0.01;
1270 tmp->stats.food = time; 1248 tmp->stats.food = time;
1271 SET_FLAG (tmp, FLAG_IS_USED_UP); 1249 SET_FLAG (tmp, FLAG_IS_USED_UP);
1272 tmp->glow_radius = radius; 1250 tmp->glow_radius = radius;
1273 if (tmp->glow_radius > MAX_LIGHT_RADII) 1251 if (tmp->glow_radius > MAX_LIGHT_RADII)
1274 tmp->glow_radius = MAX_LIGHT_RADII; 1252 tmp->glow_radius = MAX_LIGHT_RADII;
1275 1253
1276 tmp->x = op->x;
1277 tmp->y = op->y;
1278 if (tmp->speed < MIN_ACTIVE_SPEED)
1279 tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1280 tmp = insert_ob_in_ob (tmp, op); 1254 tmp = insert_ob_in_ob (tmp, op);
1255
1281 if (tmp->glow_radius > op->glow_radius) 1256 if (tmp->glow_radius > op->glow_radius)
1282 op->glow_radius = tmp->glow_radius; 1257 op->glow_radius = tmp->glow_radius;
1283 1258
1284 if (!tmp->env || op != tmp->env)
1285 {
1286 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1287 return 0;
1288 }
1289 return 1; 1259 return 1;
1290} 1260}
1291 1261
1292int 1262int
1293cast_destruction (object *op, object *caster, object *spell_ob) 1263cast_destruction (object *op, object *caster, object *spell_ob)
… …
1318 else 1288 else
1319 op->skill = NULL; 1289 op->skill = NULL;
1320 1290
1321 op->change_skill (find_skill_by_name (op, op->skill)); 1291 op->change_skill (find_skill_by_name (op, op->skill));
1322 1292
1323 for (i = -range; i < range; i++) 1293 for (i = -range; i <= range; i++)
1324 { 1294 {
1325 for (j = -range; j < range; j++) 1295 for (j = -range; j <= range; j++)
1326 { 1296 {
1327 m = op->map; 1297 m = op->map;
1328 sx = op->x + i; 1298 sx = op->x + i;
1329 sy = op->y + j; 1299 sy = op->y + j;
1330 1300
… …
1347 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER))) 1317 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
1348 { 1318 {
1349 if (spell_ob->subtype == SP_DESTRUCTION) 1319 if (spell_ob->subtype == SP_DESTRUCTION)
1350 { 1320 {
1351 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1321 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1322
1352 if (spell_ob->other_arch) 1323 if (spell_ob->other_arch)
1353 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1324 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1354 } 1325 }
1355 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1326 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1356 { 1327 {
… …
1384 { 1355 {
1385 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1356 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1386 return 0; 1357 return 0;
1387 } 1358 }
1388 1359
1360 tmp = tmp->head_ ();
1361
1389 /* If we've already got a force of this type, don't add a new one. */ 1362 /* If we've already got a force of this type, don't add a new one. */
1390 for (force = tmp->inv; force != NULL; force = force->below) 1363 for (force = tmp->inv; force; force = force->below)
1391 { 1364 {
1392 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1365 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1393 { 1366 {
1394 if (force->name == spell_ob->name) 1367 if (force->name == spell_ob->name)
1395 { 1368 {
… …
1401 return 0; 1374 return 0;
1402 } 1375 }
1403 } 1376 }
1404 } 1377 }
1405 1378
1406 if (force == NULL) 1379 if (!force)
1407 { 1380 {
1408 force = get_archetype (FORCE_NAME); 1381 force = get_archetype (FORCE_NAME);
1409 force->subtype = FORCE_CHANGE_ABILITY; 1382 force->subtype = FORCE_CHANGE_ABILITY;
1383
1410 if (spell_ob->race) 1384 if (spell_ob->race)
1411 force->name = spell_ob->race; 1385 force->name = spell_ob->race;
1412 else 1386 else
1413 force->name = spell_ob->name; 1387 force->name = spell_ob->name;
1414 1388
… …
1424 { 1398 {
1425 force->duration = duration; 1399 force->duration = duration;
1426 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1400 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1427 } 1401 }
1428 else 1402 else
1429 {
1430 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1403 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1431 } 1404
1432 return 1; 1405 return 1;
1433 } 1406 }
1407
1434 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1408 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1435 force->speed = 1.f; 1409 force->speed = 1.f;
1436 force->speed_left = -1.f; 1410 force->speed_left = -1.f;
1437 SET_FLAG (force, FLAG_APPLIED); 1411 SET_FLAG (force, FLAG_APPLIED);
1438 1412
… …
1481 1455
1482 /* We precompute some values here so that we don't have to keep 1456 /* We precompute some values here so that we don't have to keep
1483 * doing it over and over again. 1457 * doing it over and over again.
1484 */ 1458 */
1485 god = find_god (determine_god (op)); 1459 god = find_god (determine_god (op));
1486 level = caster_level (caster, spell); 1460 level = casting_level (caster, spell);
1487 range = spell->range + SP_level_range_adjust (caster, spell); 1461 range = spell->range + SP_level_range_adjust (caster, spell);
1488 1462
1489 /* On the bright side, no monster should ever have a race of GOD_... 1463 /* On the bright side, no monster should ever have a race of GOD_...
1490 * so even if the player doesn't worship a god, if race=GOD_.., it 1464 * so even if the player doesn't worship a god, if race=GOD_.., it
1491 * won't ever match anything. 1465 * won't ever match anything.
… …
1611 } 1585 }
1612 1586
1613 /* charm */ 1587 /* charm */
1614 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1588 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1615 { 1589 {
1590 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1591
1616 /* Prevent uncontolled outbreaks of self replicating monsters. 1592 /* Prevent uncontrolled outbreaks of self replicating monsters.
1617 Typical use case is charm, go somwhere, use aggravation to make hostile. 1593 Typical use case is charm, go somwhere, use aggravation to make hostile.
1618 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1594 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1619 CLEAR_FLAG (head, FLAG_GENERATOR); 1595 CLEAR_FLAG (head, FLAG_GENERATOR);
1620 head->set_owner (op); 1596 head->set_owner (op);
1621 set_spell_skill (op, caster, spell, head); 1597 set_spell_skill (op, caster, spell, head);
… …
1639 * about. was called move_ball_lightning, but since more than the ball 1615 * about. was called move_ball_lightning, but since more than the ball
1640 * lightning spell used it, that seemed misnamed. 1616 * lightning spell used it, that seemed misnamed.
1641 * op is the spell effect. 1617 * op is the spell effect.
1642 * note that duration is handled by process_object() in time.c 1618 * note that duration is handled by process_object() in time.c
1643 */ 1619 */
1644
1645void 1620void
1646move_ball_spell (object *op) 1621move_ball_spell (object *op)
1647{ 1622{
1648 int i, j, dam_save, dir, mflags; 1623 int i, j, dam_save, dir, mflags;
1649 sint16 nx, ny, hx, hy; 1624 sint16 nx, ny, hx, hy;
… …
1715 1690
1716 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op))) 1691 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op)))
1717 { 1692 {
1718 if (j) 1693 if (j)
1719 op->stats.dam = dam_save / 2; 1694 op->stats.dam = dam_save / 2;
1695
1720 hit_map (op, j, op->attacktype, 1); 1696 hit_map (op, j, op->attacktype, 1);
1721
1722 } 1697 }
1723 1698
1724 /* insert the other arch */ 1699 /* insert the other arch */
1725 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1700 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1726 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1701 m->insert (arch_to_object (op->other_arch), hx, hy, op);
… …
1740 1715
1741 op->direction = i; 1716 op->direction = i;
1742 } 1717 }
1743} 1718}
1744 1719
1745
1746/* move_swarm_spell: peterm 1720/* move_swarm_spell: peterm
1747 * This is an implementation of the swarm spell. It was written for 1721 * This is an implementation of the swarm spell. It was written for
1748 * meteor swarm, but it could be used for any swarm. A swarm spell 1722 * meteor swarm, but it could be used for any swarm. A swarm spell
1749 * is a special type of object that casts swarms of other types 1723 * is a special type of object that casts swarms of other types
1750 * of spells. Which spell it casts is flexible. It fires the spells 1724 * of spells. Which spell it casts is flexible. It fires the spells
1751 * from a set of squares surrounding the caster, in a given direction. 1725 * from a set of squares surrounding the caster, in a given direction.
1752 */ 1726 */
1753
1754void 1727void
1755move_swarm_spell (object *op) 1728move_swarm_spell (object *op)
1756{ 1729{
1757#if 0 1730#if 0
1758 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1731 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1759 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1732 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1760 sint16 target_x, target_y, origin_x, origin_y; 1733 sint16 target_x, target_y, origin_x, origin_y;
1761 int adjustdir; 1734 int adjustdir;
1762 maptile *m; 1735 maptile *m;
1763#endif 1736#endif
1764 int basedir;
1765 object *owner; 1737 object *owner = op->env;
1766 1738
1767 owner = op->owner; 1739 if (!owner) // MUST not happen, remove when true TODO
1768 if (op->duration == 0 || owner == NULL)
1769 { 1740 {
1741 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1770 op->destroy (); 1742 op->destroy ();
1771 return; 1743 return;
1772 } 1744 }
1773 1745
1746 if (!op->duration || !owner->is_on_map ())
1747 {
1748 op->drop_and_destroy ();
1749 return;
1750 }
1751
1774 op->duration--; 1752 op->duration--;
1775 1753
1776 basedir = op->direction; 1754 int basedir = op->direction;
1777 if (basedir == 0) 1755 if (!basedir)
1778 { 1756 {
1779 /* spray in all directions! 8) */ 1757 /* spray in all directions! 8) */
1780 basedir = rndm (1, 8); 1758 op->facing = (op->facing + op->state) & 7;
1759 basedir = op->facing + 1;
1781 } 1760 }
1782 1761
1783#if 0 1762#if 0
1784 // this is bogus: it causes wrong places to be checked below 1763 // this is bogus: it causes wrong places to be checked below
1785 // (a wall 2 cells away will block the effect...) and 1764 // (a wall 2 cells away will block the effect...) and
… …
1846 { 1825 {
1847 /* Bullet spells have a bunch more customization that needs to be done */ 1826 /* Bullet spells have a bunch more customization that needs to be done */
1848 if (op->spell->subtype == SP_BULLET) 1827 if (op->spell->subtype == SP_BULLET)
1849 fire_bullet (owner, op, basedir, op->spell); 1828 fire_bullet (owner, op, basedir, op->spell);
1850 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1829 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1851 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1830 fire_arch_from_position (owner, op, owner->x, owner->y, basedir, op->spell);
1852 } 1831 }
1853} 1832}
1854
1855
1856
1857 1833
1858/* fire_swarm: 1834/* fire_swarm:
1859 * The following routine creates a swarm of objects. It actually 1835 * The following routine creates a swarm of objects. It actually
1860 * sets up a specific swarm object, which then fires off all 1836 * sets up a specific swarm object, which then fires off all
1861 * the parts of the swarm. 1837 * the parts of the swarm.
… …
1864 * caster: the caster (owner, wand, rod, scroll) 1840 * caster: the caster (owner, wand, rod, scroll)
1865 * dir: the direction everything will be fired in 1841 * dir: the direction everything will be fired in
1866 * spell - the spell that is this spell. 1842 * spell - the spell that is this spell.
1867 * n: the number to be fired. 1843 * n: the number to be fired.
1868 */ 1844 */
1869
1870int 1845int
1871fire_swarm (object *op, object *caster, object *spell, int dir) 1846fire_swarm (object *op, object *caster, object *spell, int dir)
1872{ 1847{
1873 object *tmp;
1874 int i;
1875
1876 if (!spell->other_arch) 1848 if (!spell->other_arch)
1877 return 0; 1849 return 0;
1878 1850
1879 tmp = get_archetype (SWARM_SPELL); 1851 object *tmp = archetype::get (SWARM_SPELL);
1880 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */ 1852
1881 set_spell_skill (op, caster, spell, tmp); 1853 set_spell_skill (op, caster, spell, tmp);
1882
1883 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1854 tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */
1884 tmp->spell = arch_to_object (spell->other_arch); 1855 tmp->spell = spell->other_arch->instance ();
1885
1886 tmp->attacktype = tmp->spell->attacktype; 1856 tmp->attacktype = tmp->spell->attacktype;
1887 1857
1888 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1858 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1889 if (!tailor_god_spell (tmp, op)) 1859 if (!tailor_god_spell (tmp, op))
1890 return 1; 1860 return 1;
1891 1861
1892 tmp->duration = SP_level_duration_adjust (caster, spell); 1862 tmp->duration = SP_level_duration_adjust (caster, spell);
1893 for (i = 0; i < spell->duration; i++) 1863 for (int i = 0; i < spell->duration; i++)
1894 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1864 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1895 1865
1866 tmp->invisible = 1;
1867 tmp->flag [FLAG_NO_DROP] = 1; // make sure it stays in inv, or else
1896 tmp->direction = dir; 1868 tmp->direction = dir;
1897 tmp->invisible = 1; 1869 tmp->facing = rndm (1, 8); // initial firing direction
1870 tmp->state = rndm (4) * 2 + 1; // direction increment
1898 1871
1899 tmp->insert_at (op, op); 1872 op->insert (tmp);
1873
1900 return 1; 1874 return 1;
1901} 1875}
1902
1903 1876
1904/* See the spells documentation file for why this is its own 1877/* See the spells documentation file for why this is its own
1905 * function. 1878 * function.
1906 */ 1879 */
1907int 1880int
… …
1938 if (QUERY_FLAG (target, FLAG_MONSTER)) 1911 if (QUERY_FLAG (target, FLAG_MONSTER))
1939 { 1912 {
1940 /* oky doky. got a target monster. Lets make a blinding attack */ 1913 /* oky doky. got a target monster. Lets make a blinding attack */
1941 if (target->head) 1914 if (target->head)
1942 target = target->head; 1915 target = target->head;
1916
1943 (void) hit_player (target, dam, op, spell->attacktype, 1); 1917 hit_player (target, dam, op, spell->attacktype, 1);
1944 return 1; /* one success only! */ 1918 return 1; /* one success only! */
1945 } 1919 }
1946 } 1920 }
1947 1921
1948 /* no live target, perhaps a wall is in the way? */ 1922 /* no live target, perhaps a wall is in the way? */
… …
1968 } 1942 }
1969 1943
1970 m->insert (tmp, x, y, op); 1944 m->insert (tmp, x, y, op);
1971 return 1; 1945 return 1;
1972} 1946}
1973
1974
1975
1976 1947
1977/* cast_cause_disease: this spell looks along <dir> from the 1948/* cast_cause_disease: this spell looks along <dir> from the
1978 * player and infects someone. 1949 * player and infects someone.
1979 * op is the player/monster, caster is the object, dir is the direction 1950 * op is the player/monster, caster is the object, dir is the direction
1980 * to cast, disease_arch is the specific disease, and type is the spell number 1951 * to cast, disease_arch is the specific disease, and type is the spell number
1981 * perhaps this should actually be in disease.c? 1952 * perhaps this should actually be in disease.c?
1982 */ 1953 */
1983
1984int 1954int
1985cast_cause_disease (object *op, object *caster, object *spell, int dir) 1955cast_cause_disease (object *op, object *caster, object *spell, int dir)
1986{ 1956{
1987 sint16 x, y; 1957 sint16 x, y;
1988 int i, mflags, range, dam_mod, dur_mod; 1958 int i, mflags, range, dam_mod, dur_mod;
… …
1995 /* If casting from a scroll, no direction will be available, so refer to the 1965 /* If casting from a scroll, no direction will be available, so refer to the
1996 * direction the player is pointing. 1966 * direction the player is pointing.
1997 */ 1967 */
1998 if (!dir) 1968 if (!dir)
1999 dir = op->facing; 1969 dir = op->facing;
1970
2000 if (!dir) 1971 if (!dir)
2001 return 0; /* won't find anything if casting on ourself, so just return */ 1972 return 0; /* won't find anything if casting on ourself, so just return */
2002 1973
2003 /* Calculate these once here */ 1974 /* Calculate these once here */
2004 range = spell->range + SP_level_range_adjust (caster, spell); 1975 range = spell->range + SP_level_range_adjust (caster, spell);
… …
2031 object *disease = arch_to_object (spell->other_arch); 2002 object *disease = arch_to_object (spell->other_arch);
2032 2003
2033 disease->set_owner (op); 2004 disease->set_owner (op);
2034 set_spell_skill (op, caster, spell, disease); 2005 set_spell_skill (op, caster, spell, disease);
2035 disease->stats.exp = 0; 2006 disease->stats.exp = 0;
2036 disease->level = caster_level (caster, spell); 2007 disease->level = casting_level (caster, spell);
2037 2008
2038 /* do level adjustments */ 2009 /* do level adjustments */
2039 if (disease->stats.wc) 2010 if (disease->stats.wc)
2040 disease->stats.wc += dur_mod / 2; 2011 disease->stats.wc += dur_mod / 2;
2041 2012
2042 if (disease->magic > 0) 2013 if (disease->magic > 0)
2043 disease->magic += dur_mod / 4; 2014 disease->magic += dur_mod / 8;
2044 2015
2045 if (disease->stats.maxhp > 0) 2016 if (disease->stats.maxhp > 0)
2046 disease->stats.maxhp += dur_mod; 2017 disease->stats.maxhp += dur_mod;
2047 2018
2048 if (disease->stats.maxgrace > 0) 2019 if (disease->stats.maxgrace > 0)

Diff Legend

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