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.76 by root, Sun Dec 28 08:09:49 2008 UTC vs.
Revision 1.116 by root, Sat Sep 16 22:17:42 2017 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
25 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
… …
36/* this function checks to see if a spell pushes objects as well 37/* this function checks to see if a spell pushes objects as well
37 * as flies over and damages them (only used for cones for now) 38 * as flies over and damages them (only used for cones for now)
38 * but moved here so it could be applied to bolts too 39 * but moved here so it could be applied to bolts too
39 * op is the spell object. 40 * op is the spell object.
40 */ 41 */
41void 42static void
42check_spell_knockback (object *op) 43check_spell_knockback (object *op)
43{ 44{
44 int weight_move; 45 int weight_move;
45 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */ 46 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
46 47
… …
58 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
59 { 60 {
60 int num_sections = 1; 61 int num_sections = 1;
61 62
62 /* don't move DM */ 63 /* don't move DM */
63 if (QUERY_FLAG (tmp, FLAG_WIZ)) 64 if (tmp->flag [FLAG_WIZ])
64 return; 65 return;
65 66
66 /* don't move parts of objects */ 67 /* don't move parts of objects */
67 if (tmp->head) 68 if (tmp->head)
68 continue; 69 continue;
69 70
70 /* don't move floors or immobile objects */ 71 /* don't move floors or immobile objects */
71 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 72 if (tmp->flag [FLAG_IS_FLOOR] || (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
72 continue; 73 continue;
73 74
74 /* count the object's sections */ 75 /* count the object's sections */
75 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more) 76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
76 num_sections++; 77 num_sections++;
… …
85 if (tmp->move_type & MOVE_FLYING) 86 if (tmp->move_type & MOVE_FLYING)
86 frictionmod = 1; /* flying objects loose the friction modifier */ 87 frictionmod = 1; /* flying objects loose the friction modifier */
87 88
88 if (rndm (0, weight_move - 1) > ((tmp->weight / num_sections) * frictionmod)) 89 if (rndm (0, weight_move - 1) > ((tmp->weight / num_sections) * frictionmod))
89 { /* move it. */ 90 { /* move it. */
90 /* move_object is really for monsters, but looking at 91 /* move_object is really for monsters, but looking at
91 * the move_object function, it appears that it should 92 * the move_object function, it appears that it should
92 * also be safe for objects. 93 * also be safe for objects.
93 * This does return if successful or not, but 94 * This does return if successful or not, but
94 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
95 * right now. 96 * right now.
96 */ 97 */
97 move_object (tmp, absdir (op->stats.sp)); 98 tmp->move (absdir (op->stats.sp));
98 } 99 }
99 100
100 } 101 }
101} 102}
102 103
… …
107 ***************************************************************************/ 108 ***************************************************************************/
108 109
109/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
110 * is the first piece of the fork. 111 * is the first piece of the fork.
111 */ 112 */
112void 113static void
113forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
114{ 115{
115 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 116 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
116 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
117 maptile *m; 118 maptile *m;
… …
128 new_dir = -1; 129 new_dir = -1;
129 130
130 /* check the new dir for a wall and in the map */ 131 /* check the new dir for a wall and in the map */
131 t_dir = absdir (tmp->direction + new_dir); 132 t_dir = absdir (tmp->direction + new_dir);
132 133
133 if (get_map_flags (tmp->map, &m, tmp->x + freearr_x[t_dir], tmp->y + freearr_y[t_dir], &sx, &sy) & P_OUT_OF_MAP) 134 if (get_map_flags (tmp->map, &m, tmp->x + DIRX (t_dir), tmp->y + DIRY (t_dir), &sx, &sy) & P_OUT_OF_MAP)
134 return; 135 return;
135 136
136 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 137 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
137 return; 138 return;
138 139
… …
178 179
179 if (--op->range < 0) 180 if (--op->range < 0)
180 op->range = 0; 181 op->range = 0;
181 else 182 else
182 { 183 {
183 x = op->x + DIRX (op); 184 x = op->x + DIRX (op->direction);
184 y = op->y + DIRY (op); 185 y = op->y + DIRY (op->direction);
185 m = op->map; 186 m = op->map;
186 mflags = get_map_flags (m, &m, x, y, &x, &y); 187 mflags = get_map_flags (m, &m, x, y, &x, &y);
187 188
188 if (mflags & P_OUT_OF_MAP) 189 if (mflags & P_OUT_OF_MAP)
189 return; 190 return;
… …
193 * on the space. So only call reflwall if we think the data it returns 194 * on the space. So only call reflwall if we think the data it returns
194 * will be useful. 195 * will be useful.
195 */ 196 */
196 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
197 { 198 {
198 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 199 if (!op->flag [FLAG_REFLECTING])
199 return; 200 return;
200 201
201 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
202 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
203 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
… …
216 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling 217 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling
217 * over a corner in a tiled map, it is possible that 218 * over a corner in a tiled map, it is possible that
218 * op->direction is within an adjacent map but either 219 * op->direction is within an adjacent map but either
219 * op->direction-1 or op->direction+1 does not exist. 220 * op->direction-1 or op->direction+1 does not exist.
220 */ 221 */
221 mflags = get_map_flags (op->map, &m, op->x + freearr_x[absdir (op->direction - 1)], 222 mflags = get_map_flags (op->map, &m, op->x + DIRX (absdir (op->direction - 1)),
222 op->y + freearr_y[absdir (op->direction - 1)], &x, &y); 223 op->y + DIRY (absdir (op->direction - 1)), &x, &y);
223 224
224 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)); 225 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y));
225 226
226 mflags = get_map_flags (op->map, &m, op->x + freearr_x[absdir (op->direction + 1)], 227 mflags = get_map_flags (op->map, &m, op->x + DIRX (absdir (op->direction + 1)),
227 op->y + freearr_y[absdir (op->direction + 1)], &x, &y); 228 op->y + DIRY (absdir (op->direction + 1)), &x, &y);
228 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)); 229 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y));
229 230
230 if (left == right) 231 if (left == right)
231 op->direction = absdir (op->direction + 4); 232 op->direction = absdir (op->direction + 4);
232 else if (left) 233 else if (left)
… …
246 tmp->speed_left = -0.1f; 247 tmp->speed_left = -0.1f;
247 /* To make up for the decrease at the top of the function */ 248 /* To make up for the decrease at the top of the function */
248 tmp->duration++; 249 tmp->duration++;
249 250
250 /* New forking code. Possibly create forks of this object 251 /* New forking code. Possibly create forks of this object
251 * going off in other directions. 252 * going off in other directions.
252 */ 253 */
253 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex) 254 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
254 forklightning (op, tmp); /* stats.Dex % of forking */ 255 forklightning (op, tmp); /* stats.Dex % of forking */
255 256
256 /* 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
… …
276 int mflags; 277 int mflags;
277 278
278 if (!spob->other_arch) 279 if (!spob->other_arch)
279 return 0; 280 return 0;
280 281
281 tmp = arch_to_object (spob->other_arch); 282 tmp = spob->other_arch->instance ();
282 if (tmp == NULL) 283 if (tmp == NULL)
283 return 0; 284 return 0;
284 285
285 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
286 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);
… …
293 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
294 tmp->stats.Dex = spob->stats.Dex; 295 tmp->stats.Dex = spob->stats.Dex;
295 tmp->stats.Con = spob->stats.Con; 296 tmp->stats.Con = spob->stats.Con;
296 297
297 tmp->direction = dir; 298 tmp->direction = dir;
298 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 299 if (tmp->flag [FLAG_IS_TURNABLE])
299 SET_ANIMATION (tmp, dir); 300 SET_ANIMATION (tmp, dir);
300 301
301 tmp->set_owner (op); 302 tmp->set_owner (op);
302 set_spell_skill (op, caster, spob, tmp); 303 set_spell_skill (op, caster, spob, tmp);
303 304
304 tmp->x = op->x + DIRX (tmp); 305 tmp->x = op->x + DIRX (tmp->direction);
305 tmp->y = op->y + DIRY (tmp); 306 tmp->y = op->y + DIRY (tmp->direction);
306 tmp->map = op->map; 307 tmp->map = op->map;
307 308
308 maptile *newmap; 309 maptile *newmap;
309 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);
310 if (mflags & P_OUT_OF_MAP) 311 if (mflags & P_OUT_OF_MAP)
… …
315 316
316 tmp->map = newmap; 317 tmp->map = newmap;
317 318
318 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)))
319 { 320 {
320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 321 if (!tmp->flag [FLAG_REFLECTING])
321 { 322 {
322 tmp->drop_and_destroy (); 323 tmp->drop_and_destroy ();
323 return 0; 324 return 0;
324 } 325 }
325 326
… …
363 { 364 {
364 for (i = 1; i < 9; i++) 365 for (i = 1; i < 9; i++)
365 { 366 {
366 sint16 dx, dy; 367 sint16 dx, dy;
367 368
368 dx = op->x + freearr_x[i]; 369 dx = op->x + DIRX (i);
369 dy = op->y + freearr_y[i]; 370 dy = op->y + DIRY (i);
370 371
371 /* ok_to_put_more already does things like checks for walls, 372 /* ok_to_put_more already does things like checks for walls,
372 * out of map, etc. 373 * out of map, etc.
373 */ 374 */
374 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 375 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
375 { 376 {
376 object *tmp = op->clone (); 377 object *tmp = op->clone ();
… …
388 389
389/* Causes an object to explode, eg, a firebullet, 390/* Causes an object to explode, eg, a firebullet,
390 * poison cloud ball, etc. op is the object to 391 * poison cloud ball, etc. op is the object to
391 * explode. 392 * explode.
392 */ 393 */
393void 394static void
394explode_bullet (object *op) 395explode_bullet (object *op)
395{ 396{
396 object *tmp, *owner; 397 object *tmp, *owner;
397 398
398 if (!op->other_arch) 399 if (!op->other_arch)
… …
438 if (op->destroyed ()) 439 if (op->destroyed ())
439 return; 440 return;
440 } 441 }
441 442
442 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
443 tmp = arch_to_object (op->other_arch); 444 tmp = op->other_arch->instance ();
444 445
445 tmp->set_owner (op); 446 tmp->set_owner (op);
446 tmp->skill = op->skill; 447 tmp->skill = op->skill;
447 448
448 owner = op->owner; 449 owner = op->owner;
… …
520 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
521 return; 522 return;
522 523
523 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
524 { 525 {
525 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (tmp->flag [FLAG_ALIVE])
526 { 527 {
527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
528 529
529 // TODO: can't understand the following if's 530 // TODO: can't understand the following if's
530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
531 { 532 {
532 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!op->flag [FLAG_REMOVED])
533 { 534 {
534 op->destroy (); 535 op->destroy ();
535 return; 536 return;
536 } 537 }
537 } 538 }
… …
545 * fired arches (eg, bolts). 546 * fired arches (eg, bolts).
546 */ 547 */
547void 548void
548move_bullet (object *op) 549move_bullet (object *op)
549{ 550{
550 sint16 new_x, new_y;
551 int mflags;
552 maptile *m;
553
554#if 0 551#if 0
555 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
556 553
557 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
558 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
559 if (op->stats.sp == SP_METEOR) 556 if (op->stats.sp == SP_METEOR)
560 { 557 {
561 replace_insert_ob_in_map ("fire_trail", op); 558 replace_insert_ob_in_map ("fire_trail", op);
562 if (op->destroyed ()) 559 if (op->destroyed ())
… …
573 op->destroy (); 570 op->destroy ();
574 571
575 return; 572 return;
576 } 573 }
577 574
578 new_x = op->x + DIRX (op); 575 mapxy pos (op);
579 new_y = op->y + DIRY (op); 576 pos.move (op->direction);
580 m = op->map;
581 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
582 577
583 if (mflags & P_OUT_OF_MAP) 578 if (!pos.normalise ())
584 { 579 {
585 op->destroy (); 580 op->destroy ();
586 return; 581 return;
587 } 582 }
588 583
589 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))
590 { 589 {
591 if (op->other_arch) 590 if (op->other_arch)
592 explode_bullet (op); 591 explode_bullet (op);
593 else 592 else
594 op->destroy (); 593 op->destroy ();
595 594
596 return; 595 return;
597 } 596 }
598 597
599 if (!(op = m->insert (op, new_x, new_y, op))) 598 if (!(op = pos.insert (op, op)))
600 return; 599 return;
601 600
602 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
603 { 602 {
604 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
… …
641 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob); 640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
642 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob); 641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
643 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob); 642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
644 643
645 tmp->direction = dir; 644 tmp->direction = dir;
646 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (tmp->flag [FLAG_IS_TURNABLE])
647 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
648 647
649 tmp->set_owner (op); 648 tmp->set_owner (op);
650 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
651 650
652 tmp->x = op->x + freearr_x[dir]; 651 tmp->x = op->x + DIRX (dir);
653 tmp->y = op->y + freearr_y[dir]; 652 tmp->y = op->y + DIRY (dir);
654 tmp->map = op->map; 653 tmp->map = op->map;
655 654
656 maptile *newmap; 655 maptile *newmap;
657 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);
658 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
… …
661 return 0; 660 return 0;
662 } 661 }
663 662
664 tmp->map = newmap; 663 tmp->map = newmap;
665 664
665 // in case the bullet has direction 0 we explode it in place.
666 // direction 0 is possible for instance when a poison cloud trap springs.
667 if (tmp->direction == 0)
668 {
669 if (tmp->other_arch
670 && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
671 explode_bullet (tmp); // explode object will/should remove tmp
672 else
673 tmp->destroy ();
674
675 return 0;
676 }
677
666 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 678 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
667 { 679 {
668 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!tmp->flag [FLAG_REFLECTING])
669 { 681 {
670 tmp->destroy (); 682 tmp->destroy ();
671 return 0; 683 return 0;
672 } 684 }
673 685
… …
688 * CONE RELATED FUNCTIONS 700 * CONE RELATED FUNCTIONS
689 * 701 *
690 *****************************************************************************/ 702 *****************************************************************************/
691 703
692/* drops an object based on what is in the cone's "other_arch" */ 704/* drops an object based on what is in the cone's "other_arch" */
693void 705static void
694cone_drop (object *op) 706cone_drop (object *op)
695{ 707{
696 object *new_ob = arch_to_object (op->other_arch); 708 object *new_ob = op->other_arch->instance ();
697 709
698 new_ob->level = op->level; 710 new_ob->level = op->level;
699 new_ob->set_owner (op->owner); 711 new_ob->set_owner (op->owner);
700 712
701 /* preserve skill ownership */ 713 /* preserve skill ownership */
… …
717 op->set_speed (0); 729 op->set_speed (0);
718 return; 730 return;
719 } 731 }
720 732
721 /* lava saves it's life, but not yours :) */ 733 /* lava saves it's life, but not yours :) */
722 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 734 if (op->flag [FLAG_LIFESAVE])
723 { 735 {
724 hit_map (op, 0, op->attacktype, 0); 736 hit_map (op, 0, op->attacktype, 0);
725 return; 737 return;
726 } 738 }
727 739
… …
742 if (!op->is_on_map ()) 754 if (!op->is_on_map ())
743 return; 755 return;
744 756
745 /* Check to see if we should push anything. 757 /* Check to see if we should push anything.
746 * Spell objects with weight push whatever they encounter to some 758 * Spell objects with weight push whatever they encounter to some
747 * degree. 759 * degree.
748 */ 760 */
749 if (op->weight) 761 if (op->weight)
750 { 762 {
751 check_spell_knockback (op); 763 check_spell_knockback (op);
752 764
… …
769 return; 781 return;
770 } 782 }
771 783
772 for (int i = -1; i <= 1; i++) 784 for (int i = -1; i <= 1; i++)
773 { 785 {
774 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 786 sint16 x = op->x + DIRX (absdir (op->stats.sp + i)), y = op->y + DIRY (absdir (op->stats.sp + i));
775 787
776 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 788 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
777 { 789 {
778 object *tmp = op->clone (); 790 object *tmp = op->clone ();
779 791
… …
808 MoveType movetype; 820 MoveType movetype;
809 821
810 if (!spell->other_arch) 822 if (!spell->other_arch)
811 return 0; 823 return 0;
812 824
813 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD) 825 if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
814 { 826 {
815 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!"); 827 op->failmsg ("Your undead nature prevents you from turning undead!");
816 return 0; 828 return 0;
817 } 829 }
818 830
819 if (!dir) 831 if (!dir)
820 { 832 {
… …
828 */ 840 */
829 movetype = spell->other_arch->move_type; 841 movetype = spell->other_arch->move_type;
830 842
831 for (i = range_min; i <= range_max; i++) 843 for (i = range_min; i <= range_max; i++)
832 { 844 {
833 sint16 x, y, d; 845 sint16 x, y;
834 846
835 /* We can't use absdir here, because it never returns 847 /* We can't use absdir here, because it never returns
836 * 0. If this is a rune, we want to hit the person on top 848 * 0. If this is a rune, we want to hit the person on top
837 * of the trap (d==0). If it is not a rune, then we don't want 849 * of the trap (d==0). If it is not a rune, then we don't want
838 * to hit that person. 850 * to hit that person.
839 */ 851 */
840 d = (dir + i) % 9; 852 int d = dir ? absdir (dir + i) : i;
841 853
842 /* If it's not a rune, we don't want to blast the caster. 854 /* If it's not a rune, we don't want to blast the caster.
843 * In that case, we have to see - if dir is specified, 855 * In that case, we have to see - if dir is specified,
844 * turn this into direction 8. If dir is not specified (all 856 * turn this into direction 8. If dir is not specified (all
845 * direction) skip - otherwise, one line would do more damage 857 * direction) skip - otherwise, one line would do more damage
… …
852 d = 8; 864 d = 8;
853 else 865 else
854 continue; 866 continue;
855 } 867 }
856 868
857 x = op->x + freearr_x[d]; 869 x = op->x + DIRX (d);
858 y = op->y + freearr_y[d]; 870 y = op->y + DIRY (d);
859 871
860 if (get_map_flags (op->map, &m, x, y, &sx, &sy) & P_OUT_OF_MAP) 872 if (get_map_flags (op->map, &m, x, y, &sx, &sy) & P_OUT_OF_MAP)
861 continue; 873 continue;
862 874
863 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
864 continue; 876 continue;
865 877
866 success = 1; 878 success = 1;
867 tmp = arch_to_object (spell->other_arch); 879 tmp = spell->other_arch->instance ();
868 tmp->set_owner (op); 880 tmp->set_owner (op);
869 set_spell_skill (op, caster, spell, tmp); 881 set_spell_skill (op, caster, spell, tmp);
870 tmp->level = casting_level (caster, spell); 882 tmp->level = casting_level (caster, spell);
871 tmp->attacktype = spell->attacktype; 883 tmp->attacktype = spell->attacktype;
872 884
… …
947 959
948 object *env = op->outer_env (); 960 object *env = op->outer_env ();
949 961
950 if (op->env) 962 if (op->env)
951 { 963 {
952 if (env->map == NULL) 964 if (!env->map)
953 return; 965 return;
954 966
955 if (!(op = op->insert_at (env, op))) 967 if (!(op = op->insert_at (env, op)))
956 return; 968 return;
957 } 969 }
958 970
959 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 971 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
960 // on a safe map. I don't like this special casing, but it seems to be neccessary 972 // on a safe map. I don't like this special casing, but it seems to be neccessary
961 // as bombs can be carried. 973 // as bombs can be carried.
962 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 974 if (op->ms ().flags () & P_SAFE)
963 { 975 {
964 op->destroy (); 976 op->destroy ();
965 return; 977 return;
966 } 978 }
967 979
… …
971 */ 983 */
972 if (archetype *at = archetype::find (SPLINT)) 984 if (archetype *at = archetype::find (SPLINT))
973 { 985 {
974 for (int i = 1; i < 9; i++) 986 for (int i = 1; i < 9; i++)
975 { 987 {
976 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 988 if (out_of_map (op->map, op->x + DIRX (i), op->y + DIRX (i)))
977 continue; 989 continue;
978 990
979 object *tmp = arch_to_object (at); 991 object *tmp = at->instance ();
980 tmp->direction = i; 992 tmp->direction = i;
981 tmp->range = op->range; 993 tmp->range = op->range;
982 tmp->stats.dam = op->stats.dam; 994 tmp->stats.dam = op->stats.dam;
983 tmp->duration = op->duration; 995 tmp->duration = op->duration;
984 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
985 tmp->set_owner (op); 997 tmp->set_owner (op);
986 if (op->skill && op->skill != tmp->skill) 998 if (op->skill && op->skill != tmp->skill)
987 tmp->skill = op->skill; 999 tmp->skill = op->skill;
988 1000
989 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1001 if (tmp->flag [FLAG_IS_TURNABLE])
990 SET_ANIMATION (tmp, i); 1002 SET_ANIMATION (tmp, i);
991 1003
992 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op); 1004 op->map->insert (tmp, op->x + DIRX (i), op->y + DIRX (i), op);
993 move_bullet (tmp); 1005 move_bullet (tmp);
994 } 1006 }
995 } 1007 }
996 1008
997 explode_bullet (op); 1009 explode_bullet (op);
… …
1000int 1012int
1001create_bomb (object *op, object *caster, int dir, object *spell) 1013create_bomb (object *op, object *caster, int dir, object *spell)
1002{ 1014{
1003 object *tmp; 1015 object *tmp;
1004 int mflags; 1016 int mflags;
1005 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1017 sint16 dx = op->x + DIRX (dir), dy = op->y + DIRY (dir);
1006 maptile *m; 1018 maptile *m;
1007 1019
1008 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1020 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1009 1021
1010 // when creating a bomb below ourself it should always work, even 1022 // when creating a bomb below ourself it should always work, even
… …
1013 // to fix create bomb traps in doors, which cast with dir=0). 1025 // to fix create bomb traps in doors, which cast with dir=0).
1014 if (dir) 1026 if (dir)
1015 { 1027 {
1016 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1028 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1017 { 1029 {
1018 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 op->failmsg ("There is something in the way.");
1019 return 0; 1031 return 0;
1020 } 1032 }
1021 } 1033 }
1022 1034
1023 tmp = arch_to_object (spell->other_arch); 1035 tmp = spell->other_arch->instance ();
1024 1036
1025 /* level dependencies for bomb */ 1037 /* level dependencies for bomb */
1026 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1038 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1027 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1039 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1028 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1040 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
… …
1048 * dir is the direction to look in. 1060 * dir is the direction to look in.
1049 * range is how far out to look. 1061 * range is how far out to look.
1050 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1062 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1051 * this info is used for blocked magic/unholy spaces. 1063 * this info is used for blocked magic/unholy spaces.
1052 */ 1064 */
1053object * 1065static object *
1054get_pointed_target (object *op, int dir, int range, int type) 1066get_pointed_target (object *op, int dir, int range, int type)
1055{ 1067{
1056 object *target; 1068 object *target;
1057 sint16 x, y; 1069 sint16 x, y;
1058 int dist, mflags; 1070 int dist, mflags;
… …
1061 if (dir == 0) 1073 if (dir == 0)
1062 return NULL; 1074 return NULL;
1063 1075
1064 for (dist = 1; dist < range; dist++) 1076 for (dist = 1; dist < range; dist++)
1065 { 1077 {
1066 x = op->x + freearr_x[dir] * dist; 1078 x = op->x + DIRX (dir) * dist;
1067 y = op->y + freearr_y[dir] * dist; 1079 y = op->y + DIRY (dir) * dist;
1068 mp = op->map; 1080 mp = op->map;
1069 mflags = get_map_flags (op->map, &mp, x, y, &x, &y); 1081 mflags = get_map_flags (op->map, &mp, x, y, &x, &y);
1070 1082
1071 if (mflags & P_OUT_OF_MAP) 1083 if (mflags & P_OUT_OF_MAP)
1072 return NULL; 1084 return NULL;
… …
1077 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1078 return NULL; 1090 return NULL;
1079 1091
1080 if (mflags & P_IS_ALIVE) 1092 if (mflags & P_IS_ALIVE)
1081 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1093 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1082 if (QUERY_FLAG (target, FLAG_MONSTER)) 1094 if (target->flag [FLAG_MONSTER])
1083 return target; 1095 return target;
1084 } 1096 }
1085 1097
1086 return NULL; 1098 return NULL;
1087} 1099}
1088 1100
1089/* cast_smite_arch() - the priest points to a creature and causes 1101/* cast_smite_spell() - the priest points to a creature and causes
1090 * a 'godly curse' to decend. 1102 * a 'godly curse' to decend.
1091 * usual params - 1103 * usual params -
1092 * op = player 1104 * op = player
1093 * caster = object casting the spell. 1105 * caster = object casting the spell.
1094 * dir = direction being cast 1106 * dir = direction being cast
1095 * spell = spell object 1107 * spell = spell object
… …
1097int 1109int
1098cast_smite_spell (object *op, object *caster, int dir, object *spell) 1110cast_smite_spell (object *op, object *caster, int dir, object *spell)
1099{ 1111{
1100 object *effect, *target; 1112 object *effect, *target;
1101 object *god = find_god (determine_god (op)); 1113 object *god = find_god (determine_god (op));
1102 int range;
1103 1114
1104 range = spell->range + SP_level_range_adjust (caster, spell);
1105 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA); 1115 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA);
1106 1116
1107 /* Bunch of conditions for casting this spell. Note that only 1117 /* Bunch of conditions for casting this spell. Note that only
1108 * require a god if this is a cleric spell (requires grace). 1118 * require a god if this is a cleric spell (requires grace).
1109 * This makes this spell much more general purpose - it can be used 1119 * This makes this spell much more general purpose - it can be used
1110 * by wizards also, which is good, because I think this is a very 1120 * by wizards also, which is good, because I think this is a very
1111 * interesting spell. 1121 * interesting spell.
1112 * if it is a cleric spell, you need a god, and the creature 1122 * if it is a cleric spell, you need a god, and the creature
1113 * can't be friendly to your god. 1123 * can't be friendly to your god.
1114 */ 1124 */
1115 1125
1116 if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL) 1126 if (!target
1127 || target->flag [FLAG_REFL_SPELL]
1117 || (!god && spell->stats.grace) 1128 || (!god && spell->stats.grace)
1118 || (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race))) 1129 || (god && target->title == god->name)
1130 || (god && target->race.contains (god->race)))
1119 { 1131 {
1120 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1132 op->failmsg ("Your request is unheeded.");
1121 return 0; 1133 return 0;
1122 } 1134 }
1123 1135
1124 if (spell->other_arch) 1136 if (spell->other_arch)
1125 effect = arch_to_object (spell->other_arch); 1137 effect = spell->other_arch->instance ();
1126 else 1138 else
1127 return 0; 1139 return 0;
1128 1140
1129 /* tailor the effect by priest level and worshipped God */ 1141 /* tailor the effect by priest level and worshipped God */
1130 effect->level = casting_level (caster, spell); 1142 effect->level = casting_level (caster, spell);
1131 effect->attacktype = spell->attacktype; 1143 effect->attacktype = spell->attacktype;
1132 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1144 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1133 { 1145 {
1134 if (tailor_god_spell (effect, op)) 1146 if (tailor_god_spell (effect, op))
1135 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1147 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1136 else 1148 else
1137 { 1149 {
1138 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1150 op->failmsg ("Your request is ignored.");
1139 return 0; 1151 return 0;
1140 } 1152 }
1141 } 1153 }
1142 1154
1143 /* size of the area of destruction */ 1155 /* size of the area of destruction */
… …
1147 if (effect->attacktype & AT_DEATH) 1159 if (effect->attacktype & AT_DEATH)
1148 { 1160 {
1149 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1161 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1150 1162
1151 /* casting death spells at undead isn't a good thing */ 1163 /* casting death spells at undead isn't a good thing */
1152 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1164 if (target->flag [FLAG_UNDEAD])
1153 { 1165 {
1154 if (random_roll (0, 2, op, PREFER_LOW)) 1166 if (random_roll (0, 2, op, PREFER_LOW))
1155 { 1167 {
1156 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1168 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1157 effect->x = op->x; 1169 effect->x = op->x;
… …
1238/**************************************************************************** 1250/****************************************************************************
1239 * Destruction 1251 * Destruction
1240 ****************************************************************************/ 1252 ****************************************************************************/
1241 1253
1242/* make_object_glow() - currently only makes living objects glow. 1254/* make_object_glow() - currently only makes living objects glow.
1243 * we do this by creating a force and inserting it in the 1255 * we do this by creating a force and inserting it in the
1244 * object. if time is 0, the object glows permanently. To truely 1256 * object. if time is 0, the object glows permanently. To truely
1245 * make this work for non-living objects, we would have to 1257 * make this work for non-living objects, we would have to
1246 * give them the capability to have an inventory. b.t. 1258 * give them the capability to have an inventory. b.t.
1247 */ 1259 */
1248int 1260static int
1249make_object_glow (object *op, int radius, int time) 1261make_object_glow (object *op, int radius, int time)
1250{ 1262{
1251 /* some things are unaffected... */ 1263 /* some things are unaffected... */
1252 if (op->path_denied & PATH_LIGHT) 1264 if (op->path_denied & PATH_LIGHT)
1253 return 0; 1265 return 0;
1254 1266
1255 object *tmp = get_archetype (FORCE_NAME); 1267 object *tmp = archetype::get (FORCE_NAME);
1256 tmp->speed = 0.01; 1268 tmp->set_speed (0.01);
1257 tmp->stats.food = time; 1269 tmp->stats.food = time;
1258 SET_FLAG (tmp, FLAG_IS_USED_UP); 1270 tmp->set_flag (FLAG_IS_USED_UP);
1259 tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius); 1271 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1260 tmp = insert_ob_in_ob (tmp, op); 1272 tmp = insert_ob_in_ob (tmp, op);
1261 1273
1262 if (tmp->glow_radius > op->glow_radius) 1274 if (tmp->glow_radius > op->glow_radius)
1263 op->glow_radius = tmp->glow_radius; 1275 op->set_glow_radius (tmp->glow_radius);
1264 1276
1265 return 1; 1277 return 1;
1266} 1278}
1267 1279
1268int 1280int
… …
1272 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1284 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1273 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1285 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1274 1286
1275 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1287 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1276 1288
1277 /* destruction doesn't use another spell object, so we need 1289 dynbuf buf;
1278 * update op's skill pointer so that exp is properly awarded.
1279 */
1280 const shstr skill = op->skill;
1281
1282 if (caster == op)
1283 op->skill = spell_ob->skill;
1284 else if (caster->skill)
1285 op->skill = caster->skill;
1286 else
1287 op->skill = 0;
1288
1289 op->change_skill (find_skill_by_name (op, op->skill));
1290
1291 unordered_mapwalk (op, -range, -range, range, range) 1290 unordered_mapwalk (buf, op, -range, -range, range, range)
1292 { 1291 {
1293 mapspace &ms = m->at (nx, ny); 1292 mapspace &ms = m->at (nx, ny);
1294 1293
1295 if (ms.flags () & P_IS_ALIVE) 1294 if (ms.flags () & P_IS_ALIVE)
1296 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1295 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1296 {
1297 next = tmp->above;
1298
1297 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ()) 1299 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1298 { 1300 {
1299 tmp = tmp->head_ (); 1301 tmp = tmp->head_ ();
1300 1302
1301 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ()) 1303 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1302 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ()))) 1304 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1303 { 1305 {
1304 if (spell_ob->subtype == SP_DESTRUCTION) 1306 if (spell_ob->subtype == SP_DESTRUCTION)
1305 { 1307 {
1306 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1308 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1307 1309
1308 if (spell_ob->other_arch) 1310 if (spell_ob->other_arch)
1309 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1311 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1310 } 1312 }
1311 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100) 1313 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1312 { 1314 {
1313 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1315 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1314 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1316 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1315 } 1317 }
1316 } 1318 }
1317 } 1319 }
1320 }
1318 } 1321 }
1319 1322
1320 op->skill = skill;
1321 return 1; 1323 return 1;
1322} 1324}
1323 1325
1324/*************************************************************************** 1326/***************************************************************************
1325 * 1327 *
1326 * CURSE 1328 * CURSE
1327 * 1329 *
1328 ***************************************************************************/ 1330 ***************************************************************************/
1329
1330int 1331int
1331cast_curse (object *op, object *caster, object *spell_ob, int dir) 1332cast_curse (object *op, object *caster, object *spell_ob, int dir)
1332{ 1333{
1333 object *god = find_god (determine_god (op)); 1334 object *god = find_god (determine_god (op));
1334 object *tmp, *force; 1335 object *tmp, *force;
1335 1336
1336 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE); 1337 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1337 if (!tmp) 1338 if (!tmp)
1338 { 1339 {
1339 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1340 op->failmsg ("There is no one in that direction to curse.");
1340 return 0; 1341 return 0;
1341 } 1342 }
1342 1343
1343 tmp = tmp->head_ (); 1344 tmp = tmp->head_ ();
1344 1345
… …
1359 } 1360 }
1360 } 1361 }
1361 1362
1362 if (!force) 1363 if (!force)
1363 { 1364 {
1364 force = get_archetype (FORCE_NAME); 1365 force = archetype::get (FORCE_NAME);
1365 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1366 1367
1367 if (spell_ob->race) 1368 if (spell_ob->race)
1368 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1369 else 1370 else
… …
1387 1388
1388 return 1; 1389 return 1;
1389 } 1390 }
1390 1391
1391 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1392 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1392 force->speed = 1.f;
1393 force->speed_left = -1.f; 1393 force->speed_left = -1.f;
1394 SET_FLAG (force, FLAG_APPLIED); 1394 force->set_speed (1.f);
1395 force->set_flag (FLAG_APPLIED);
1395 1396
1396 if (god) 1397 if (god)
1397 { 1398 {
1398 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
1399 force->path_repelled = god->path_repelled; 1400 force->path_repelled = god->path_repelled;
… …
1412 force->stats.wc = spell_ob->stats.wc; 1413 force->stats.wc = spell_ob->stats.wc;
1413 1414
1414 change_abil (tmp, force); /* Mostly to display any messages */ 1415 change_abil (tmp, force); /* Mostly to display any messages */
1415 insert_ob_in_ob (force, tmp); 1416 insert_ob_in_ob (force, tmp);
1416 tmp->update_stats (); 1417 tmp->update_stats ();
1418
1417 return 1; 1419 return 1;
1418
1419} 1420}
1420 1421
1421/********************************************************************** 1422/**********************************************************************
1422 * mood change 1423 * mood change
1423 * Arguably, this may or may not be an attack spell. But since it 1424 * Arguably, this may or may not be an attack spell. But since it
… …
1445 * so even if the player doesn't worship a god, if race=GOD_.., it 1446 * so even if the player doesn't worship a god, if race=GOD_.., it
1446 * won't ever match anything. 1447 * won't ever match anything.
1447 */ 1448 */
1448 if (!spell->race) 1449 if (!spell->race)
1449 race = NULL; 1450 race = NULL;
1450 else if (god && !strcmp (spell->race, "GOD_SLAYING")) 1451 else if (god && spell->race == shstr_GOD_SLAYING)
1451 race = god->slaying; 1452 race = god->slaying;
1452 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1453 race = god->race; 1454 race = god->race;
1454 else 1455 else
1455 race = spell->race; 1456 race = spell->race;
1456 1457
1458 dynbuf buf;
1457 unordered_mapwalk (op, -range, -range, range, range) 1459 unordered_mapwalk (buf, op, -range, -range, range, range)
1458 { 1460 {
1459 mapspace &ms = m->at (nx, ny); 1461 mapspace &ms = m->at (nx, ny);
1460 1462
1461 /* If there is nothing living on this space, no need to go further */ 1463 /* If there is nothing living on this space, no need to go further */
1462 if (!ms.flags () & P_IS_ALIVE) 1464 if (!(ms.flags () & P_IS_ALIVE))
1463 continue; 1465 continue;
1464 1466
1465 // players can only affect spaces that they can actually see 1467 // players can only affect spaces that they can actually see
1466 if (caster 1468 if (caster
1467 && caster->contr 1469 && caster->contr
… …
1481 1483
1482 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1484 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1483 if (race && head->race && !strstr (race, head->race)) 1485 if (race && head->race && !strstr (race, head->race))
1484 continue; 1486 continue;
1485 1487
1486 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1488 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1487 continue; 1489 continue;
1488 1490
1489 /* Now do a bunch of stuff related to saving throws */ 1491 /* Now do a bunch of stuff related to saving throws */
1490 best_at = -1; 1492 best_at = -1;
1491 if (spell->attacktype) 1493 if (spell->attacktype)
… …
1524 Ryo, august 14th 1526 Ryo, august 14th
1525 */ 1527 */
1526 if (head->level > level) 1528 if (head->level > level)
1527 continue; 1529 continue;
1528 1530
1529 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1531 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1530 /* Failed, no effect */ 1532 /* Failed, no effect */
1531 continue; 1533 continue;
1532 } 1534 }
1533 1535
1534 /* Done with saving throw. Now start affecting the monster */ 1536 /* Done with saving throw. Now start affecting the monster */
1535 done_one = 0; 1537 done_one = 0;
1536 1538
1537 /* aggravation */ 1539 /* aggravation */
1538 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1540 if (spell->flag [FLAG_MONSTER])
1539 { 1541 {
1540 CLEAR_FLAG (head, FLAG_SLEEP); 1542 head->clr_flag (FLAG_SLEEP);
1541 remove_friendly_object (head); 1543 remove_friendly_object (head);
1542 done_one = 1; 1544 done_one = 1;
1543 head->enemy = op; 1545 head->enemy = op;
1544 } 1546 }
1545 1547
1546 /* calm monsters */ 1548 /* calm monsters */
1547 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1549 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1548 { 1550 {
1549 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1551 head->set_flag (FLAG_UNAGGRESSIVE);
1550 head->enemy = NULL; 1552 head->enemy = NULL;
1551 done_one = 1; 1553 done_one = 1;
1552 } 1554 }
1553 1555
1554 /* berserk monsters */ 1556 /* berserk monsters */
1555 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1557 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1556 { 1558 {
1557 SET_FLAG (head, FLAG_BERSERK); 1559 head->set_flag (FLAG_BERSERK);
1558 done_one = 1; 1560 done_one = 1;
1559 } 1561 }
1560 1562
1561 /* charm */ 1563 /* charm */
1562 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1564 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1563 { 1565 {
1564 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1565 1567
1566 /* Prevent uncontrolled outbreaks of self replicating monsters. 1568 /* Prevent uncontrolled outbreaks of self replicating monsters.
1567 Typical use case is charm, go somwhere, use aggravation to make hostile. 1569 Typical use case is charm, go somwhere, use aggravation to make hostile.
1568 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1570 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1569 CLEAR_FLAG (head, FLAG_GENERATOR); 1571 head->clr_flag (FLAG_GENERATOR);
1570 head->set_owner (op); 1572 head->set_owner (op);
1571 set_spell_skill (op, caster, spell, head); 1573 set_spell_skill (op, caster, spell, head);
1572 add_friendly_object (head); 1574 add_friendly_object (head);
1573 head->attack_movement = PETMOVE; 1575 head->attack_movement = PETMOVE;
1574 done_one = 1; 1576 done_one = 1;
… …
1576 head->stats.exp = 0; 1578 head->stats.exp = 0;
1577 } 1579 }
1578 1580
1579 /* If a monster was effected, put an effect in */ 1581 /* If a monster was effected, put an effect in */
1580 if (done_one && spell->other_arch) 1582 if (done_one && spell->other_arch)
1581 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1583 m->insert (spell->other_arch->instance (), nx, ny, op);
1582 } 1584 }
1583 1585
1584 return 1; 1586 return 1;
1585} 1587}
1586 1588
… …
1619 * other bits (i / 2): absolute value of offset 1621 * other bits (i / 2): absolute value of offset
1620 */ 1622 */
1621 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1623 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1622 int tmpdir = absdir (op->direction + offset); 1624 int tmpdir = absdir (op->direction + offset);
1623 1625
1624 nx = op->x + freearr_x[tmpdir]; 1626 nx = op->x + DIRX (tmpdir);
1625 ny = op->y + freearr_y[tmpdir]; 1627 ny = op->y + DIRY (tmpdir);
1626 if (!(get_map_flags (op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, nx, ny)))) 1628 if (!(get_map_flags (op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, nx, ny))))
1627 { 1629 {
1628 dir = tmpdir; 1630 dir = tmpdir;
1629 break; 1631 break;
1630 } 1632 }
… …
1637 m = op->map; 1639 m = op->map;
1638 } 1640 }
1639 1641
1640 m->insert (op, nx, ny, op); 1642 m->insert (op, nx, ny, op);
1641 1643
1642 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1644 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1643 surrounding squares */ 1645 surrounding squares */
1644 1646
1645 /* loop over current square and neighbors to hit. 1647 /* loop over current square and neighbors to hit.
1646 * if this has an other_arch field, we insert that in 1648 * if this has an other_arch field, we insert that in
1647 * the surround spaces. 1649 * the surround spaces.
1648 */ 1650 */
1649 for (j = 0; j < 9; j++) 1651 for (j = 0; j < 9; j++)
1650 { 1652 {
1651 hx = nx + freearr_x[j]; 1653 hx = nx + DIRX (j);
1652 hy = ny + freearr_y[j]; 1654 hy = ny + DIRY (j);
1653 1655
1654 m = op->map; 1656 m = op->map;
1655 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1657 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
1656 1658
1657 if (mflags & P_OUT_OF_MAP) 1659 if (mflags & P_OUT_OF_MAP)
… …
1669 hit_map (op, j, op->attacktype, 1); 1671 hit_map (op, j, op->attacktype, 1);
1670 } 1672 }
1671 1673
1672 /* insert the other arch */ 1674 /* insert the other arch */
1673 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1675 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1674 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1676 m->insert (op->other_arch->instance (), hx, hy, op);
1675 } 1677 }
1676 1678
1677 /* restore to the center location and damage */ 1679 /* restore to the center location and damage */
1678 op->stats.dam = dam_save; 1680 op->stats.dam = dam_save;
1679 1681
1680 i = spell_find_dir (op->map, op->x, op->y, op->owner); 1682 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1681 1683
1682 if (i >= 0) 1684 if (i >= 0)
1683 { /* we have a preferred direction! */ 1685 { /* we have a preferred direction! */
1684 /* pick another direction if the preferred dir is blocked. */ 1686 /* pick another direction if the preferred dir is blocked. */
1685 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1687 if (get_map_flags (op->map, &m, nx + DIRX (i), ny + DIRY (i), &hx, &hy) & P_OUT_OF_MAP ||
1686 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1688 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1687 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1689 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1688 1690
1689 op->direction = i; 1691 op->direction = i;
1690 } 1692 }
1691} 1693}
1692 1694
1693/* move_swarm_spell: peterm 1695/* move_swarm_spell: peterm
1694 * This is an implementation of the swarm spell. It was written for 1696 * This is an implementation of the swarm spell. It was written for
1695 * meteor swarm, but it could be used for any swarm. A swarm spell 1697 * meteor swarm, but it could be used for any swarm. A swarm spell
1696 * is a special type of object that casts swarms of other types 1698 * is a special type of object that casts swarms of other types
1697 * of spells. Which spell it casts is flexible. It fires the spells 1699 * of spells. Which spell it casts is flexible. It fires the spells
1698 * from a set of squares surrounding the caster, in a given direction. 1700 * from a set of squares surrounding the caster, in a given direction.
1699 */ 1701 */
1700void 1702void
1701move_swarm_spell (object *op) 1703move_swarm_spell (object *op)
1702{ 1704{
1703#if 0 1705#if 0
… …
1739 // space. 1741 // space.
1740 // should be fixed later, but correctness before features... 1742 // should be fixed later, but correctness before features...
1741 // (schmorp) 1743 // (schmorp)
1742 1744
1743 /* new offset calculation to make swarm element distribution 1745 /* new offset calculation to make swarm element distribution
1744 * more uniform 1746 * more uniform
1745 */ 1747 */
1746 if (op->duration) 1748 if (op->duration)
1747 { 1749 {
1748 if (basedir & 1) 1750 if (basedir & 1)
1749 { 1751 {
… …
1757 else 1759 else
1758 { 1760 {
1759 adjustdir = 0; /* fire the last one from forward. */ 1761 adjustdir = 0; /* fire the last one from forward. */
1760 } 1762 }
1761 1763
1762 target_x = op->x + freearr_x[absdir (basedir + adjustdir)]; 1764 target_x = op->x + DIRX (absdir (basedir + adjustdir));
1763 target_y = op->y + freearr_y[absdir (basedir + adjustdir)]; 1765 target_y = op->y + DIRY (absdir (basedir + adjustdir));
1764 1766
1765 /* back up one space so we can hit point-blank targets, but this 1767 /* back up one space so we can hit point-blank targets, but this
1766 * necessitates extra out_of_map check below 1768 * necessitates extra out_of_map check below
1767 */ 1769 */
1768 origin_x = target_x - freearr_x[basedir]; 1770 origin_x = target_x - DIRX (basedir);
1769 origin_y = target_y - freearr_y[basedir]; 1771 origin_y = target_y - DIRY (basedir);
1770 1772
1771 1773
1772 /* spell pointer is set up for the spell this casts. Since this 1774 /* spell pointer is set up for the spell this casts. Since this
1773 * should just be a pointer to the spell in some inventory, 1775 * should just be a pointer to the spell in some inventory,
1774 * it is unlikely to disappear by the time we need it. However, 1776 * it is unlikely to disappear by the time we need it. However,
… …
1805} 1807}
1806 1808
1807/* fire_swarm: 1809/* fire_swarm:
1808 * The following routine creates a swarm of objects. It actually 1810 * The following routine creates a swarm of objects. It actually
1809 * sets up a specific swarm object, which then fires off all 1811 * sets up a specific swarm object, which then fires off all
1810 * the parts of the swarm. 1812 * the parts of the swarm.
1811 * 1813 *
1812 * op: the owner 1814 * op: the owner
1813 * caster: the caster (owner, wand, rod, scroll) 1815 * caster: the caster (owner, wand, rod, scroll)
1814 * dir: the direction everything will be fired in 1816 * dir: the direction everything will be fired in
1815 * spell - the spell that is this spell. 1817 * spell - the spell that is this spell.
… …
1860 1862
1861 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1863 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1862 1864
1863 if (dir) 1865 if (dir)
1864 { 1866 {
1865 x = op->x + freearr_x[dir]; 1867 x = op->x + DIRX (dir);
1866 y = op->y + freearr_y[dir]; 1868 y = op->y + DIRY (dir);
1867 m = op->map; 1869 m = op->map;
1868 1870
1869 mflags = get_map_flags (m, &m, x, y, &x, &y); 1871 mflags = get_map_flags (m, &m, x, y, &x, &y);
1870 1872
1871 if (mflags & P_OUT_OF_MAP) 1873 if (mflags & P_OUT_OF_MAP)
1872 { 1874 {
1873 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1875 op->failmsg ("Nothing is there.");
1874 return 0; 1876 return 0;
1875 } 1877 }
1876 1878
1877 if (mflags & P_IS_ALIVE && spell->attacktype) 1879 if (mflags & P_IS_ALIVE && spell->attacktype)
1878 { 1880 {
1879 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1881 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1880 if (QUERY_FLAG (target, FLAG_MONSTER)) 1882 if (target->flag [FLAG_MONSTER])
1881 { 1883 {
1882 /* oky doky. got a target monster. Lets make a blinding attack */ 1884 /* oky doky. got a target monster. Lets make a blinding attack */
1883 if (target->head) 1885 if (target->head)
1884 target = target->head; 1886 target = target->head;
1885 1887
… …
1889 } 1891 }
1890 1892
1891 /* no live target, perhaps a wall is in the way? */ 1893 /* no live target, perhaps a wall is in the way? */
1892 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1894 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1893 { 1895 {
1894 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1896 op->failmsg ("Something is in the way.");
1895 return 0; 1897 return 0;
1896 } 1898 }
1897 } 1899 }
1898 1900
1899 /* ok, looks groovy to just insert a new light on the map */ 1901 /* ok, looks groovy to just insert a new light on the map */
1900 tmp = arch_to_object (spell->other_arch); 1902 tmp = spell->other_arch->instance ();
1901 if (!tmp) 1903 if (!tmp)
1902 { 1904 {
1903 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1905 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1904 return 0; 1906 return 0;
1905 } 1907 }
1906 1908
1907 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1909 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1908 1910
1909 if (tmp->glow_radius) 1911 if (tmp->glow_radius)
1910 tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell)); 1912 tmp->set_glow_radius (
1913 clamp (spell->range + SP_level_range_adjust (caster, spell), 1, MAX_LIGHT_RADIUS)
1914 );
1911 1915
1912 if (dir) 1916 if (dir)
1913 m->insert (tmp, x, y, op); 1917 m->insert (tmp, x, y, op);
1914 else 1918 else
1915 caster->outer_env ()->insert (tmp); 1919 caster->outer_env_or_self ()->insert (tmp);
1916 1920
1917 return 1; 1921 return 1;
1918} 1922}
1919 1923
1920/* cast_cause_disease: this spell looks along <dir> from the 1924/* cast_cause_disease: this spell looks along <dir> from the
1921 * player and infects someone. 1925 * player and infects someone.
1922 * op is the player/monster, caster is the object, dir is the direction 1926 * op is the player/monster, caster is the object, dir is the direction
1923 * to cast, disease_arch is the specific disease, and type is the spell number 1927 * to cast, disease_arch is the specific disease, and type is the spell number
1924 * perhaps this should actually be in disease.c? 1928 * perhaps this should actually be in disease.c?
1925 */ 1929 */
1926int 1930int
… …
1932 maptile *m; 1936 maptile *m;
1933 1937
1934 x = op->x; 1938 x = op->x;
1935 y = op->y; 1939 y = op->y;
1936 1940
1937 /* If casting from a scroll, no direction will be available, so refer to the 1941 /* If casting from a scroll, no direction will be available, so refer to the
1938 * direction the player is pointing. 1942 * direction the player is pointing.
1939 */ 1943 */
1940 if (!dir) 1944 if (!dir)
1941 dir = op->facing; 1945 dir = op->facing;
1942 1946
… …
1949 dur_mod = SP_level_duration_adjust (caster, spell); 1953 dur_mod = SP_level_duration_adjust (caster, spell);
1950 1954
1951 /* search in a line for a victim */ 1955 /* search in a line for a victim */
1952 for (i = 1; i < range; i++) 1956 for (i = 1; i < range; i++)
1953 { 1957 {
1954 x = op->x + i * freearr_x[dir]; 1958 x = op->x + i * DIRX (dir);
1955 y = op->y + i * freearr_y[dir]; 1959 y = op->y + i * DIRY (dir);
1956 m = op->map; 1960 m = op->map;
1957 1961
1958 mflags = get_map_flags (m, &m, x, y, &x, &y); 1962 mflags = get_map_flags (m, &m, x, y, &x, &y);
1959 1963
1960 if (mflags & P_OUT_OF_MAP) 1964 if (mflags & P_OUT_OF_MAP)
… …
1967 /* Only bother looking on this space if there is something living here */ 1971 /* Only bother looking on this space if there is something living here */
1968 if (mflags & P_IS_ALIVE) 1972 if (mflags & P_IS_ALIVE)
1969 { 1973 {
1970 /* search this square for a victim */ 1974 /* search this square for a victim */
1971 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1975 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1972 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1976 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1973 { /* found a victim */ 1977 { /* found a victim */
1974 object *disease = arch_to_object (spell->other_arch); 1978 object *disease = spell->other_arch->instance ();
1975 1979
1976 disease->set_owner (op); 1980 disease->set_owner (op);
1977 set_spell_skill (op, caster, spell, disease); 1981 set_spell_skill (op, caster, spell, disease);
1978 disease->stats.exp = 0; 1982 disease->stats.exp = 0;
1979 disease->level = casting_level (caster, spell); 1983 disease->level = casting_level (caster, spell);
1980 1984
1981 /* do level adjustments */ 1985 /* do level adjustments */
1982 if (disease->stats.wc) 1986 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
1983 disease->stats.wc += dur_mod / 2; 1987 if (disease->magic > 0) disease->magic += dur_mod / 8;
1984 1988 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
1985 if (disease->magic > 0) 1989 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
1986 disease->magic += dur_mod / 8;
1987
1988 if (disease->stats.maxhp > 0)
1989 disease->stats.maxhp += dur_mod;
1990
1991 if (disease->stats.maxgrace > 0)
1992 disease->stats.maxgrace += dur_mod;
1993
1994 if (disease->stats.dam)
1995 {
1996 if (disease->stats.dam > 0)
1997 disease->stats.dam += dam_mod;
1998 else
1999 disease->stats.dam -= dam_mod;
2000 }
2001 1990
2002 if (disease->last_sp) 1991 if (disease->last_sp)
2003 { 1992 {
2004 disease->last_sp -= 2 * dam_mod; 1993 disease->last_sp -= 2 * dam_mod;
1994
2005 if (disease->last_sp < 1) 1995 if (disease->last_sp < 1)
2006 disease->last_sp = 1; 1996 disease->last_sp = 1;
2007 } 1997 }
2008 1998
2009 if (disease->stats.maxsp) 1999 if (disease->stats.dam ) disease->stats.dam += copysignl (disease->stats.dam , dam_mod);
2010 { 2000 if (disease->stats.maxsp) disease->stats.maxsp += copysignl (disease->stats.maxsp, dam_mod);
2011 if (disease->stats.maxsp > 0) 2001 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2012 disease->stats.maxsp += dam_mod; 2002 if (disease->last_eat ) disease->last_eat -= dam_mod;
2013 else 2003 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2014 disease->stats.maxsp -= dam_mod; 2004 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2015 }
2016
2017 if (disease->stats.ac)
2018 disease->stats.ac += dam_mod;
2019
2020 if (disease->last_eat)
2021 disease->last_eat -= dam_mod;
2022
2023 if (disease->stats.hp)
2024 disease->stats.hp -= dam_mod;
2025
2026 if (disease->stats.sp)
2027 disease->stats.sp -= dam_mod;
2028 2005
2029 if (infect_object (walk, disease, 1)) 2006 if (infect_object (walk, disease, 1))
2030 { 2007 {
2031 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2008 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2032 2009
2033 disease->destroy (); /* don't need this one anymore */ 2010 disease->destroy (); /* don't need this one anymore */
2034 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2011 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2035 return 1; 2012 return 1;
2036 } 2013 }
2037 2014
2038 disease->destroy (); 2015 disease->destroy ();
2039 } 2016 }

Diff Legend

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