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.23 by root, Mon Dec 25 11:25:50 2006 UTC vs.
Revision 1.89 by root, Fri Nov 6 12:49:19 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
25 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
26 * of code 27 * of code
27 */ 28 */
28 29
29#include <global.h> 30#include <global.h>
30#include <object.h> 31#include <object.h>
31#include <living.h> 32#include <living.h>
32#ifndef __CEXTRACT__
33# include <sproto.h> 33#include <sproto.h>
34#endif
35#include <spells.h> 34#include <spells.h>
36#include <sounds.h> 35#include <sounds.h>
37 36
38/* 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
39 * 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)
40 * but moved here so it could be applied to bolts too 39 * but moved here so it could be applied to bolts too
41 * op is the spell object. 40 * op is the spell object.
42 */ 41 */
43 42static void
44void
45check_spell_knockback (object *op) 43check_spell_knockback (object *op)
46{ 44{
47 object *tmp, *tmp2; /* object on the map */
48 int weight_move; 45 int weight_move;
49 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 */
50 47
51 if (!op->weight) 48 if (!op->weight)
52 { /*shouldn't happen but if cone object has no weight drop out */ 49 { /*shouldn't happen but if cone object has no weight drop out */
… …
57 { 54 {
58 weight_move = op->weight + (op->weight * op->level) / 3; 55 weight_move = op->weight + (op->weight * op->level) / 3;
59 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 56 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
60 } 57 }
61 58
62 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
63 { 60 {
64 int num_sections = 1; 61 int num_sections = 1;
65 62
66 /* don't move DM */ 63 /* don't move DM */
67 if (QUERY_FLAG (tmp, FLAG_WIZ)) 64 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
74 /* don't move floors or immobile objects */ 71 /* don't move floors or immobile objects */
75 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 72 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))
76 continue; 73 continue;
77 74
78 /* count the object's sections */ 75 /* count the object's sections */
79 for (tmp2 = tmp; tmp2 != NULL; tmp2 = tmp2->more) 76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
80 num_sections++; 77 num_sections++;
81 78
82 /* I'm not sure if it makes sense to divide by num_sections - bigger 79 /* I'm not sure if it makes sense to divide by num_sections - bigger
83 * objects should be harder to move, and we are moving the entire 80 * objects should be harder to move, and we are moving the entire
84 * object, not just the head, so the total weight should be relevant. 81 * object, not just the head, so the total weight should be relevant.
… …
108 * 105 *
109 * BOLT CODE 106 * BOLT CODE
110 * 107 *
111 ***************************************************************************/ 108 ***************************************************************************/
112 109
113/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
114 * is the first piece of the fork. 111 * is the first piece of the fork.
115 */ 112 */
116
117void 113void
118forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
119{ 115{
120 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 */
121 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
… …
146 142
147 /* reduce chances of subsequent forking */ 143 /* reduce chances of subsequent forking */
148 new_bolt->stats.Dex -= 10; 144 new_bolt->stats.Dex -= 10;
149 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 145 tmp->stats.Dex -= 10; /* less forks from main bolt too */
150 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 146 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
151 new_bolt->speed_left = -0.1; 147 new_bolt->speed_left = -0.1f;
152 new_bolt->direction = t_dir; 148 new_bolt->direction = t_dir;
153 new_bolt->duration++; 149 new_bolt->duration++;
154 new_bolt->x = sx;
155 new_bolt->y = sy;
156 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 150 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
157 new_bolt->stats.dam++; 151 new_bolt->stats.dam++;
158 tmp->stats.dam /= 2; /* reduce father bolt damage */ 152 tmp->stats.dam /= 2; /* reduce father bolt damage */
159 tmp->stats.dam++; 153 tmp->stats.dam++;
160 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 154
155 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
161 update_turn_face (new_bolt); 156 update_turn_face (new_bolt);
162} 157}
163 158
164/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 159/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
165 * and checks for various things that may stop it. 160 * and checks for various things that may stop it.
166 */ 161 */
167
168void 162void
169move_bolt (object *op) 163move_bolt (object *op)
170{ 164{
171 object *tmp;
172 int mflags; 165 int mflags;
173 sint16 x, y; 166 sint16 x, y;
174 maptile *m; 167 maptile *m;
175 168
176 if (--(op->duration) < 0) 169 if (--op->duration < 0)
177 { 170 {
178 op->destroy (); 171 op->drop_and_destroy ();
179 return; 172 return;
180 } 173 }
181 174
182 hit_map (op, 0, op->attacktype, 1); 175 hit_map (op, 0, op->attacktype, 1);
183 176
184 if (!op->direction) 177 if (!op->direction)
185 return; 178 return;
186 179
187 if (--op->range < 0) 180 if (--op->range < 0)
188 {
189 op->range = 0; 181 op->range = 0;
190 }
191 else 182 else
192 { 183 {
193 x = op->x + DIRX (op); 184 x = op->x + DIRX (op);
194 y = op->y + DIRY (op); 185 y = op->y + DIRY (op);
195 m = op->map; 186 m = op->map;
… …
203 * 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
204 * will be useful. 195 * will be useful.
205 */ 196 */
206 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)))
207 { 198 {
208
209 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 199 if (!QUERY_FLAG (op, FLAG_REFLECTING))
210 return; 200 return;
211 201
212 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
213 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
… …
243 else if (left) 233 else if (left)
244 op->direction = absdir (op->direction + 2); 234 op->direction = absdir (op->direction + 2);
245 else if (right) 235 else if (right)
246 op->direction = absdir (op->direction - 2); 236 op->direction = absdir (op->direction - 2);
247 } 237 }
238
248 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 239 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
249 return; 240 return;
250 } 241 }
251 else 242 else
252 { /* Create a copy of this object and put it ahead */ 243 { /* Create a copy of this object and put it ahead */
253 tmp = op->clone (); 244 object *tmp = op->clone ();
254 245
246 m->insert (tmp, x, y, op);
255 tmp->speed_left = -0.1; 247 tmp->speed_left = -0.1f;
256 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
257 tmp = insert_ob_in_map (tmp, op->map, op, 0);
258 /* 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 */
259 tmp->duration++; 249 tmp->duration++;
260 250
261 /* New forking code. Possibly create forks of this object 251 /* New forking code. Possibly create forks of this object
262 * going off in other directions. 252 * going off in other directions.
263 */ 253 */
264
265 if (rndm (0, 99) < tmp->stats.Dex) 254 if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
266 { /* stats.Dex % of forking */ 255 forklightning (op, tmp); /* stats.Dex % of forking */
267 forklightning (op, tmp); 256
268 }
269 /* 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
270 * doesn't create any bolts that continue to move onward. 258 * doesn't create any bolts that continue to move onward.
271 */ 259 */
272 op->range = 0; 260 op->range = 0;
273 } /* copy object and move it along */ 261 } /* copy object and move it along */
… …
296 return 0; 284 return 0;
297 285
298 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
299 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);
300 tmp->attacktype = spob->attacktype; 288 tmp->attacktype = spob->attacktype;
289
301 if (spob->slaying) 290 if (spob->slaying)
302 tmp->slaying = spob->slaying; 291 tmp->slaying = spob->slaying;
292
303 tmp->range = spob->range + SP_level_range_adjust (caster, spob); 293 tmp->range = spob->range + SP_level_range_adjust (caster, spob);
304 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
305 tmp->stats.Dex = spob->stats.Dex; 295 tmp->stats.Dex = spob->stats.Dex;
306 tmp->stats.Con = spob->stats.Con; 296 tmp->stats.Con = spob->stats.Con;
307 297
… …
318 308
319 maptile *newmap; 309 maptile *newmap;
320 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);
321 if (mflags & P_OUT_OF_MAP) 311 if (mflags & P_OUT_OF_MAP)
322 { 312 {
323 tmp->destroy (); 313 tmp->drop_and_destroy ();
324 return 0; 314 return 0;
325 } 315 }
326 316
327 tmp->map = newmap; 317 tmp->map = newmap;
328 318
329 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)))
330 { 320 {
331 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 321 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
332 { 322 {
333 tmp->destroy (); 323 tmp->drop_and_destroy ();
334 return 0; 324 return 0;
335 } 325 }
336 326
337 tmp->x = op->x; 327 tmp->x = op->x;
338 tmp->y = op->y; 328 tmp->y = op->y;
339 tmp->direction = absdir (tmp->direction + 4); 329 tmp->direction = absdir (tmp->direction + 4);
340 tmp->map = op->map; 330 tmp->map = op->map;
341 } 331 }
342 332
343 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 333 if ((tmp = tmp->insert_at (tmp, op)))
344 move_bolt (tmp); 334 move_bolt (tmp);
345 335
346 return 1; 336 return 1;
347} 337}
348
349
350 338
351/*************************************************************************** 339/***************************************************************************
352 * 340 *
353 * BULLET/BALL CODE 341 * BULLET/BALL CODE
354 * 342 *
355 ***************************************************************************/ 343 ***************************************************************************/
356 344
357/* expands an explosion. op is a piece of the 345/* expands an explosion. op is a piece of the
358 * explosion - this expans it in the different directions. 346 * explosion - this expands it in the different directions.
359 * At least that is what I think this does. 347 * At least that is what I think this does.
360 */ 348 */
361void 349void
362explosion (object *op) 350explosion (object *op)
363{ 351{
364 object *tmp;
365 maptile *m = op->map; 352 maptile *m = op->map;
366 int i; 353 int i;
367 354
368 if (--(op->duration) < 0) 355 if (--op->duration < 0)
369 { 356 {
370 op->destroy (); 357 op->destroy ();
371 return; 358 return;
372 } 359 }
373 360
… …
379 { 366 {
380 sint16 dx, dy; 367 sint16 dx, dy;
381 368
382 dx = op->x + freearr_x[i]; 369 dx = op->x + freearr_x[i];
383 dy = op->y + freearr_y[i]; 370 dy = op->y + freearr_y[i];
371
384 /* ok_to_put_more already does things like checks for walls, 372 /* ok_to_put_more already does things like checks for walls,
385 * out of map, etc. 373 * out of map, etc.
386 */ 374 */
387 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))
388 { 376 {
389 tmp = op->clone (); 377 object *tmp = op->clone ();
378
390 tmp->state = 0; 379 tmp->state = 0;
391 tmp->speed_left = -0.21; 380 tmp->speed_left = -0.21f;
392 tmp->range--; 381 tmp->range--;
393 tmp->value = 0; 382 tmp->value = 0;
394 tmp->x = dx; 383
395 tmp->y = dy; 384 m->insert (tmp, dx, dy, op);
396 insert_ob_in_map (tmp, m, op, 0);
397 } 385 }
398 } 386 }
399 } 387 }
400} 388}
401
402 389
403/* Causes an object to explode, eg, a firebullet, 390/* Causes an object to explode, eg, a firebullet,
404 * poison cloud ball, etc. op is the object to 391 * poison cloud ball, etc. op is the object to
405 * explode. 392 * explode.
406 */ 393 */
407void 394static void
408explode_bullet (object *op) 395explode_bullet (object *op)
409{ 396{
410 object *tmp, *owner; 397 object *tmp, *owner;
411 398
412 if (op->other_arch == NULL) 399 if (!op->other_arch)
413 { 400 {
414 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 401 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
415 op->destroy (); 402 op->destroy ();
416 return; 403 return;
417 } 404 }
418 405
419 if (op->env) 406 if (op->env)
420 { 407 {
421 object *env; 408 object *env = op->outer_env ();
422 409
423 env = object_get_env_recursive (op);
424 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 410 if (!env->map || out_of_map (env->map, env->x, env->y))
425 { 411 {
426 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 412 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
427 op->destroy (); 413 op->destroy ();
428 return; 414 return;
429 } 415 }
430 416
431 op->remove (); 417 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
432 op->x = env->x;
433 op->y = env->y;
434 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
435 } 418 }
436 else if (out_of_map (op->map, op->x, op->y)) 419 else if (out_of_map (op->map, op->x, op->y))
437 { 420 {
438 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 421 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
439 op->destroy (); 422 op->destroy ();
… …
450 } 433 }
451 434
452 if (op->attacktype) 435 if (op->attacktype)
453 { 436 {
454 hit_map (op, 0, op->attacktype, 1); 437 hit_map (op, 0, op->attacktype, 1);
438
455 if (op->destroyed ()) 439 if (op->destroyed ())
456 return; 440 return;
457 } 441 }
458 442
459 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
… …
462 tmp->set_owner (op); 446 tmp->set_owner (op);
463 tmp->skill = op->skill; 447 tmp->skill = op->skill;
464 448
465 owner = op->owner; 449 owner = op->owner;
466 450
467 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 451 if ((tmp->attacktype & AT_HOLYWORD
452 || tmp->attacktype & AT_GODPOWER)
453 && owner
454 && !tailor_god_spell (tmp, owner))
468 { 455 {
469 op->destroy (); 456 op->destroy ();
470 return; 457 return;
471 } 458 }
472
473 tmp->x = op->x;
474 tmp->y = op->y;
475 459
476 /* special for bombs - it actually has sane values for these */ 460 /* special for bombs - it actually has sane values for these */
477 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 461 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
478 { 462 {
479 tmp->attacktype = op->attacktype; 463 tmp->attacktype = op->attacktype;
… …
483 } 467 }
484 else 468 else
485 { 469 {
486 if (op->attacktype & AT_MAGIC) 470 if (op->attacktype & AT_MAGIC)
487 tmp->attacktype |= AT_MAGIC; 471 tmp->attacktype |= AT_MAGIC;
472
488 /* Spell doc describes what is going on here */ 473 /* Spell doc describes what is going on here */
489 tmp->stats.dam = op->dam_modifier; 474 tmp->stats.dam = op->dam_modifier;
490 tmp->range = op->stats.maxhp; 475 tmp->range = op->stats.maxhp;
491 tmp->duration = op->stats.hp; 476 tmp->duration = op->stats.hp;
492 /* Used for spell tracking - just need a unique val for this spell - 477 /* Used for spell tracking - just need a unique val for this spell -
… …
500 tmp->stats.sp = op->direction; 485 tmp->stats.sp = op->direction;
501 486
502 /* Prevent recursion */ 487 /* Prevent recursion */
503 op->move_on = 0; 488 op->move_on = 0;
504 489
505 insert_ob_in_map (tmp, op->map, op, 0); 490 tmp->insert_at (op, op);
491 tmp->play_sound (tmp->sound);
492
506 /* remove the firebullet */ 493 /* remove the firebullet */
507 if (!op->destroyed ())
508 {
509 op->destroy (); 494 op->destroy ();
510 }
511} 495}
512
513
514 496
515/* checks to see what op should do, given the space it is on 497/* checks to see what op should do, given the space it is on
516 * (eg, explode, damage player, etc) 498 * (eg, explode, damage player, etc)
517 */ 499 */
518
519void 500void
520check_bullet (object *op) 501check_bullet (object *op)
521{ 502{
522 object *tmp; 503 object *tmp;
523 int dam, mflags; 504 int dam, mflags;
… …
538 519
539 /* If nothing alive on this space, no reason to do anything further */ 520 /* If nothing alive on this space, no reason to do anything further */
540 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
541 return; 522 return;
542 523
543 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
544 { 525 {
545 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (QUERY_FLAG (tmp, FLAG_ALIVE))
546 { 527 {
547 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
529
530 // TODO: can't understand the following if's
548 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
549 { 532 {
550 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!QUERY_FLAG (op, FLAG_REMOVED))
551 { 534 {
552 op->destroy (); 535 op->destroy ();
… …
563 * fired arches (eg, bolts). 546 * fired arches (eg, bolts).
564 */ 547 */
565void 548void
566move_bullet (object *op) 549move_bullet (object *op)
567{ 550{
568 sint16 new_x, new_y;
569 int mflags;
570 maptile *m;
571
572#if 0 551#if 0
573 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
574 553
575 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
576 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
… …
591 op->destroy (); 570 op->destroy ();
592 571
593 return; 572 return;
594 } 573 }
595 574
596 new_x = op->x + DIRX (op); 575 mapxy pos (op);
597 new_y = op->y + DIRY (op); 576 pos.move (op->direction);
598 m = op->map;
599 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
600 577
601 if (mflags & P_OUT_OF_MAP) 578 if (!pos.normalise ())
602 { 579 {
603 op->destroy (); 580 op->destroy ();
604 return; 581 return;
605 } 582 }
606 583
607 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))
608 { 589 {
609 if (op->other_arch) 590 if (op->other_arch)
610 explode_bullet (op); 591 explode_bullet (op);
611 else 592 else
612 op->destroy (); 593 op->destroy ();
613 594
614 return; 595 return;
615 } 596 }
616 597
617 op->remove (); 598 if (!(op = pos.insert (op, op)))
618 op->x = new_x;
619 op->y = new_y;
620 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
621 return; 599 return;
622 600
623 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
624 { 602 {
625 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
626 update_turn_face (op); 604 update_turn_face (op);
627 } 605 }
628 else 606 else
629 check_bullet (op); 607 check_bullet (op);
630} 608}
631
632
633
634 609
635/* fire_bullet 610/* fire_bullet
636 * object op (cast from caster) files a bolt in dir. 611 * object op (cast from caster) files a bolt in dir.
637 * spob is the spell object for the bolt. 612 * spob is the spell object for the bolt.
638 * we remove the magic flag - that can be derived from 613 * we remove the magic flag - that can be derived from
639 * spob->attacktype. 614 * spob->attacktype.
640 * This function sets up the appropriate owner and skill 615 * This function sets up the appropriate owner and skill
641 * pointers. 616 * pointers.
642 */ 617 */
643
644int 618int
645fire_bullet (object *op, object *caster, int dir, object *spob) 619fire_bullet (object *op, object *caster, int dir, object *spob)
646{ 620{
647 object *tmp = NULL; 621 object *tmp = NULL;
648 int mflags; 622 int mflags;
649 623
650 if (!spob->other_arch) 624 if (!spob->other_arch)
651 return 0; 625 return 0;
652 626
653 tmp = arch_to_object (spob->other_arch); 627 tmp = spob->other_arch->instance ();
654 if (tmp == NULL) 628 if (!tmp)
655 return 0; 629 return 0;
656 630
657 /* peterm: level dependency for bolts */ 631 /* peterm: level dependency for bolts */
658 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 632 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
659 tmp->attacktype = spob->attacktype; 633 tmp->attacktype = spob->attacktype;
660 if (spob->slaying) 634 if (spob->slaying)
661 tmp->slaying = spob->slaying; 635 tmp->slaying = spob->slaying;
662 636
… …
672 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
673 647
674 tmp->set_owner (op); 648 tmp->set_owner (op);
675 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
676 650
677 tmp->x = op->x + freearr_x[dir]; 651 tmp->x = op->x + freearr_x[dir];
678 tmp->y = op->y + freearr_y[dir]; 652 tmp->y = op->y + freearr_y[dir];
679 tmp->map = op->map; 653 tmp->map = op->map;
680 654
681 maptile *newmap; 655 maptile *newmap;
682 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);
683 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
… …
700 tmp->y = op->y; 674 tmp->y = op->y;
701 tmp->direction = absdir (tmp->direction + 4); 675 tmp->direction = absdir (tmp->direction + 4);
702 tmp->map = op->map; 676 tmp->map = op->map;
703 } 677 }
704 678
705 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0))) 679 if ((tmp = tmp->insert_at (tmp, op)))
706 check_bullet (tmp); 680 check_bullet (tmp);
707 681
708 return 1; 682 return 1;
709} 683}
710
711
712
713 684
714/***************************************************************************** 685/*****************************************************************************
715 * 686 *
716 * CONE RELATED FUNCTIONS 687 * CONE RELATED FUNCTIONS
717 * 688 *
718 *****************************************************************************/ 689 *****************************************************************************/
719 690
720
721/* drops an object based on what is in the cone's "other_arch" */ 691/* drops an object based on what is in the cone's "other_arch" */
722void 692static void
723cone_drop (object *op) 693cone_drop (object *op)
724{ 694{
725 object *new_ob = arch_to_object (op->other_arch); 695 object *new_ob = arch_to_object (op->other_arch);
726 696
727 new_ob->x = op->x;
728 new_ob->y = op->y;
729 new_ob->level = op->level; 697 new_ob->level = op->level;
730 new_ob->set_owner (op->owner); 698 new_ob->set_owner (op->owner);
731 699
732 /* preserve skill ownership */ 700 /* preserve skill ownership */
733 if (op->skill && op->skill != new_ob->skill) 701 if (op->skill && op->skill != new_ob->skill)
734 {
735 new_ob->skill = op->skill; 702 new_ob->skill = op->skill;
736 }
737 insert_ob_in_map (new_ob, op->map, op, 0);
738 703
704 new_ob->insert_at (op, op);
739} 705}
740 706
741/* move_cone: causes cone object 'op' to move a space/hit creatures */ 707/* move_cone: causes cone object 'op' to move a space/hit creatures */
742 708
743void 709void
744move_cone (object *op) 710move_cone (object *op)
745{ 711{
746 int i;
747
748 /* if no map then hit_map will crash so just ignore object */ 712 /* if no map then hit_map will crash so just ignore object */
749 if (!op->map) 713 if (!op->map)
750 { 714 {
751 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 715 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
752 op->speed = 0; 716 op->set_speed (0);
753 update_ob_speed (op);
754 return; 717 return;
755 } 718 }
756 719
757 /* lava saves it's life, but not yours :) */ 720 /* lava saves it's life, but not yours :) */
758 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 721 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
773 } 736 }
774#endif 737#endif
775 738
776 hit_map (op, 0, op->attacktype, 0); 739 hit_map (op, 0, op->attacktype, 0);
777 740
741 if (!op->is_on_map ())
742 return;
743
778 /* Check to see if we should push anything. 744 /* Check to see if we should push anything.
779 * Spell objects with weight push whatever they encounter to some 745 * Spell objects with weight push whatever they encounter to some
780 * degree. 746 * degree.
781 */ 747 */
782 if (op->weight) 748 if (op->weight)
749 {
783 check_spell_knockback (op); 750 check_spell_knockback (op);
784 751
785 if (op->destroyed ()) 752 if (!op->is_on_map ())
786 return; 753 return;
754 }
787 755
788 if ((op->duration--) < 0) 756 if (op->duration-- < 0)
789 { 757 {
790 op->destroy (); 758 op->destroy ();
791 return; 759 return;
792 } 760 }
793 /* Object has hit maximum range, so don't have it move 761 /* Object has hit maximum range, so don't have it move
… …
798 { 766 {
799 op->range = 0; /* just so it doesn't wrap */ 767 op->range = 0; /* just so it doesn't wrap */
800 return; 768 return;
801 } 769 }
802 770
803 for (i = -1; i < 2; i++) 771 for (int i = -1; i <= 1; i++)
804 { 772 {
805 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 773 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
806 774
807 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 775 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
808 { 776 {
809 object *tmp = op->clone (); 777 object *tmp = op->clone ();
810
811 tmp->x = x;
812 tmp->y = y;
813 778
814 tmp->duration = op->duration + 1; 779 tmp->duration = op->duration + 1;
815 780
816 /* Use for spell tracking - see ok_to_put_more() */ 781 /* Use for spell tracking - see ok_to_put_more() */
817 tmp->stats.maxhp = op->stats.maxhp; 782 tmp->stats.maxhp = op->stats.maxhp;
818 insert_ob_in_map (tmp, op->map, op, 0); 783
784 op->map->insert (tmp, x, y, op);
785
819 if (tmp->other_arch) 786 if (tmp->other_arch)
820 cone_drop (tmp); 787 cone_drop (tmp);
821 } 788 }
822 } 789 }
823} 790}
… …
856 823
857 /* Need to know what the movetype of the object we are about 824 /* Need to know what the movetype of the object we are about
858 * to create is, so we can know if the space we are about to 825 * to create is, so we can know if the space we are about to
859 * insert it into is blocked. 826 * insert it into is blocked.
860 */ 827 */
861 movetype = spell->other_arch->clone.move_type; 828 movetype = spell->other_arch->move_type;
862 829
863 for (i = range_min; i <= range_max; i++) 830 for (i = range_min; i <= range_max; i++)
864 { 831 {
865 sint16 x, y, d; 832 sint16 x, y;
866 833
867 /* We can't use absdir here, because it never returns 834 /* We can't use absdir here, because it never returns
868 * 0. If this is a rune, we want to hit the person on top 835 * 0. If this is a rune, we want to hit the person on top
869 * of the trap (d==0). If it is not a rune, then we don't want 836 * of the trap (d==0). If it is not a rune, then we don't want
870 * to hit that person. 837 * to hit that person.
871 */ 838 */
872 d = dir + i; 839 int d = dir ? absdir (dir + i) : i;
873 while (d < 0)
874 d += 8;
875 while (d > 8)
876 d -= 8;
877 840
878 /* If it's not a rune, we don't want to blast the caster. 841 /* If it's not a rune, we don't want to blast the caster.
879 * In that case, we have to see - if dir is specified, 842 * In that case, we have to see - if dir is specified,
880 * turn this into direction 8. If dir is not specified (all 843 * turn this into direction 8. If dir is not specified (all
881 * direction) skip - otherwise, one line would do more damage 844 * direction) skip - otherwise, one line would do more damage
… …
901 864
902 success = 1; 865 success = 1;
903 tmp = arch_to_object (spell->other_arch); 866 tmp = arch_to_object (spell->other_arch);
904 tmp->set_owner (op); 867 tmp->set_owner (op);
905 set_spell_skill (op, caster, spell, tmp); 868 set_spell_skill (op, caster, spell, tmp);
906 tmp->level = caster_level (caster, spell); 869 tmp->level = casting_level (caster, spell);
907 tmp->x = sx;
908 tmp->y = sy;
909 tmp->attacktype = spell->attacktype; 870 tmp->attacktype = spell->attacktype;
910 871
911 /* holy word stuff */ 872 /* holy word stuff */
912 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 873 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
913 if (!tailor_god_spell (tmp, op)) 874 if (!tailor_god_spell (tmp, op))
… …
947 else 908 else
948 tmp->duration += caster->level / 3; 909 tmp->duration += caster->level / 3;
949 } 910 }
950 911
951 if (!(tmp->move_type & MOVE_FLY_LOW)) 912 if (!(tmp->move_type & MOVE_FLY_LOW))
952 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 913 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
953 914
954 if (!tmp->move_on && tmp->stats.dam) 915 if (!tmp->move_on && tmp->stats.dam)
955 {
956 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 916 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
957 }
958 917
959 insert_ob_in_map (tmp, m, op, 0); 918 m->insert (tmp, sx, sy, op);
960 919
961 /* This is used for tracking spells so that one effect doesn't hit 920 /* This is used for tracking spells so that one effect doesn't hit
962 * a single space too many times. 921 * a single space too many times.
963 */ 922 */
964 tmp->stats.maxhp = tmp->count; 923 tmp->stats.maxhp = tmp->count;
… …
974 * 933 *
975 * BOMB related code 934 * BOMB related code
976 * 935 *
977 ****************************************************************************/ 936 ****************************************************************************/
978 937
979
980/* This handles an exploding bomb. 938/* This handles an exploding bomb.
981 * op is the original bomb object. 939 * op is the original bomb object.
982 */ 940 */
983void 941void
984animate_bomb (object *op) 942animate_bomb (object *op)
985{ 943{
986 int i;
987 object *env, *tmp;
988 archetype *at;
989
990 if (op->state != NUM_ANIMATIONS (op) - 1) 944 if (op->state != NUM_ANIMATIONS (op) - 1)
991 return; 945 return;
992 946
993 env = object_get_env_recursive (op); 947 object *env = op->outer_env ();
994 948
995 if (op->env) 949 if (op->env)
996 { 950 {
997 if (env->map == NULL) 951 if (!env->map)
998 return; 952 return;
999 953
1000 if (env->type == PLAYER) 954 if (!(op = op->insert_at (env, op)))
1001 esrv_del_item (env->contr, op->count);
1002
1003 op->remove ();
1004 op->x = env->x;
1005 op->y = env->y;
1006 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1007 return; 955 return;
1008 } 956 }
1009 957
1010 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 958 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1011 // on a safe map. I don't like this special casing, but it seems to be neccessary 959 // on a safe map. I don't like this special casing, but it seems to be neccessary
1012 // as bombs can be carried. 960 // as bombs can be carried.
1013 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 961 if (op->ms ().flags () & P_SAFE)
1014 { 962 {
1015 op->destroy (); 963 op->destroy ();
1016 return; 964 return;
1017 } 965 }
1018 966
1019 /* This copies a lot of the code from the fire bullet, 967 /* This copies a lot of the code from the fire bullet,
1020 * but using the cast_bullet isn't really feasible, 968 * but using the cast_bullet isn't really feasible,
1021 * so just set up the appropriate values. 969 * so just set up the appropriate values.
1022 */ 970 */
1023 at = archetype::find (SPLINT); 971 if (archetype *at = archetype::find (SPLINT))
1024 if (at)
1025 { 972 {
1026 for (i = 1; i < 9; i++) 973 for (int i = 1; i < 9; i++)
1027 { 974 {
1028 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]))
1029 continue; 976 continue;
977
1030 tmp = arch_to_object (at); 978 object *tmp = arch_to_object (at);
1031 tmp->direction = i; 979 tmp->direction = i;
1032 tmp->range = op->range; 980 tmp->range = op->range;
1033 tmp->stats.dam = op->stats.dam; 981 tmp->stats.dam = op->stats.dam;
1034 tmp->duration = op->duration; 982 tmp->duration = op->duration;
1035 tmp->attacktype = op->attacktype; 983 tmp->attacktype = op->attacktype;
1036 tmp->set_owner (op); 984 tmp->set_owner (op);
1037 if (op->skill && op->skill != tmp->skill) 985 if (op->skill && op->skill != tmp->skill)
1038 {
1039 tmp->skill = op->skill; 986 tmp->skill = op->skill;
1040 } 987
1041 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 988 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1042 SET_ANIMATION (tmp, i); 989 SET_ANIMATION (tmp, i);
1043 tmp->x = op->x + freearr_x[i]; 990
1044 tmp->y = op->y + freearr_x[i]; 991 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1045 insert_ob_in_map (tmp, op->map, op, 0);
1046 move_bullet (tmp); 992 move_bullet (tmp);
1047 } 993 }
1048 } 994 }
1049 995
1050 explode_bullet (op); 996 explode_bullet (op);
1051} 997}
1052 998
1053int 999int
1054create_bomb (object *op, object *caster, int dir, object *spell) 1000create_bomb (object *op, object *caster, int dir, object *spell)
1055{ 1001{
1056
1057 object *tmp; 1002 object *tmp;
1058 int mflags; 1003 int mflags;
1059 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];
1060 maptile *m; 1005 maptile *m;
1061 1006
1062 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1007 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1008
1009 // when creating a bomb below ourself it should always work, even
1010 // when movement is blocked (somehow we got here, somehow we are here,
1011 // so we should also be able to make a bomb here). (originally added
1012 // to fix create bomb traps in doors, which cast with dir=0).
1013 if (dir)
1014 {
1063 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1015 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1064 { 1016 {
1065 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1017 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1066 return 0; 1018 return 0;
1019 }
1067 } 1020 }
1021
1068 tmp = arch_to_object (spell->other_arch); 1022 tmp = arch_to_object (spell->other_arch);
1069 1023
1070 /* level dependencies for bomb */ 1024 /* level dependencies for bomb */
1071 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1025 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1072 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1026 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1073 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1027 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1074 tmp->attacktype = spell->attacktype; 1028 tmp->attacktype = spell->attacktype;
1075 1029
1076 tmp->set_owner (op); 1030 tmp->set_owner (op);
1077 set_spell_skill (op, caster, spell, tmp); 1031 set_spell_skill (op, caster, spell, tmp);
1078 tmp->x = dx; 1032
1079 tmp->y = dy; 1033 m->insert (tmp, dx, dy, op);
1080 insert_ob_in_map (tmp, m, op, 0);
1081 return 1; 1034 return 1;
1082} 1035}
1083 1036
1084/**************************************************************************** 1037/****************************************************************************
1085 * 1038 *
… …
1094 * dir is the direction to look in. 1047 * dir is the direction to look in.
1095 * range is how far out to look. 1048 * range is how far out to look.
1096 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1049 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1097 * this info is used for blocked magic/unholy spaces. 1050 * this info is used for blocked magic/unholy spaces.
1098 */ 1051 */
1099
1100object * 1052object *
1101get_pointed_target (object *op, int dir, int range, int type) 1053get_pointed_target (object *op, int dir, int range, int type)
1102{ 1054{
1103 object *target; 1055 object *target;
1104 sint16 x, y; 1056 sint16 x, y;
… …
1123 return NULL; 1075 return NULL;
1124 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1076 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1125 return NULL; 1077 return NULL;
1126 1078
1127 if (mflags & P_IS_ALIVE) 1079 if (mflags & P_IS_ALIVE)
1128 {
1129 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1080 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1130 { 1081 if (QUERY_FLAG (target, FLAG_MONSTER))
1131 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1132 {
1133 return target; 1082 return target;
1134 }
1135 }
1136 }
1137 } 1083 }
1084
1138 return NULL; 1085 return NULL;
1139} 1086}
1140
1141 1087
1142/* cast_smite_arch() - the priest points to a creature and causes 1088/* cast_smite_arch() - the priest points to a creature and causes
1143 * a 'godly curse' to decend. 1089 * a 'godly curse' to decend.
1144 * usual params - 1090 * usual params -
1145 * op = player 1091 * op = player
1146 * caster = object casting the spell. 1092 * caster = object casting the spell.
1147 * dir = direction being cast 1093 * dir = direction being cast
1148 * spell = spell object 1094 * spell = spell object
1149 */ 1095 */
1150
1151int 1096int
1152cast_smite_spell (object *op, object *caster, int dir, object *spell) 1097cast_smite_spell (object *op, object *caster, int dir, object *spell)
1153{ 1098{
1154 object *effect, *target; 1099 object *effect, *target;
1155 object *god = find_god (determine_god (op)); 1100 object *god = find_god (determine_god (op));
… …
1165 * interesting spell. 1110 * interesting spell.
1166 * if it is a cleric spell, you need a god, and the creature 1111 * if it is a cleric spell, you need a god, and the creature
1167 * can't be friendly to your god. 1112 * can't be friendly to your god.
1168 */ 1113 */
1169 1114
1170 if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL) 1115 if (!target
1116 || target->flag [FLAG_REFL_SPELL]
1171 || (!god && spell->stats.grace) 1117 || (!god && spell->stats.grace)
1172 || (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race))) 1118 || (god && target->title == god->name)
1119 || (god && target->race.contains (god->race)))
1173 { 1120 {
1174 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1121 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1175 return 0; 1122 return 0;
1176 } 1123 }
1177 1124
… …
1179 effect = arch_to_object (spell->other_arch); 1126 effect = arch_to_object (spell->other_arch);
1180 else 1127 else
1181 return 0; 1128 return 0;
1182 1129
1183 /* tailor the effect by priest level and worshipped God */ 1130 /* tailor the effect by priest level and worshipped God */
1184 effect->level = caster_level (caster, spell); 1131 effect->level = casting_level (caster, spell);
1185 effect->attacktype = spell->attacktype; 1132 effect->attacktype = spell->attacktype;
1186 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1133 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1187 { 1134 {
1188 if (tailor_god_spell (effect, op)) 1135 if (tailor_god_spell (effect, op))
1189 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1136 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1190 else 1137 else
1191 { 1138 {
1192 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1139 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");
1193 return 0; 1140 return 0;
1194 } 1141 }
… …
1228 1175
1229 effect->set_owner (op); 1176 effect->set_owner (op);
1230 set_spell_skill (op, caster, spell, effect); 1177 set_spell_skill (op, caster, spell, effect);
1231 1178
1232 /* ok, tell it where to be, and insert! */ 1179 /* ok, tell it where to be, and insert! */
1233 effect->x = target->x; 1180 effect->insert_at (target, op);
1234 effect->y = target->y;
1235 insert_ob_in_map (effect, target->map, op, 0);
1236 1181
1237 return 1; 1182 return 1;
1238} 1183}
1239
1240 1184
1241/**************************************************************************** 1185/****************************************************************************
1242 * 1186 *
1243 * MAGIC MISSILE code. 1187 * MAGIC MISSILE code.
1244 * note that the fire_bullet is used to fire the missile. The 1188 * note that the fire_bullet is used to fire the missile. The
… …
1247 1191
1248/* op is a missile that needs to be moved */ 1192/* op is a missile that needs to be moved */
1249void 1193void
1250move_missile (object *op) 1194move_missile (object *op)
1251{ 1195{
1252 int i, mflags;
1253 object *owner;
1254 sint16 new_x, new_y;
1255 maptile *m;
1256
1257 if (op->range-- <= 0) 1196 if (op->range-- <= 0)
1258 { 1197 {
1198 op->drop_and_destroy ();
1199 return;
1200 }
1201
1202 mapxy pos (op);
1203 pos.move (op->direction);
1204
1205 if (!pos.normalise ())
1206 {
1259 op->destroy (); 1207 op->destroy ();
1260 return; 1208 return;
1261 } 1209 }
1262 1210
1263 owner = op->owner; 1211 mapspace &ms = pos.ms ();
1264#if 0
1265 /* It'd make things nastier if this wasn't here - spells cast by
1266 * monster that are then killed would continue to survive
1267 */
1268 if (owner == NULL)
1269 {
1270 op->destroy ();
1271 return;
1272 }
1273#endif
1274 1212
1275 new_x = op->x + DIRX (op); 1213 if (ms.flags () & P_IS_ALIVE || ms.blocks (op))
1276 new_y = op->y + DIRY (op);
1277
1278 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1279
1280 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1281 { 1214 {
1282 hit_map (op, op->direction, AT_MAGIC, 1); 1215 hit_map (op, op->direction, AT_MAGIC, 1);
1283 /* Basically, missile only hits one thing then goes away. 1216 /* Basically, missile only hits one thing then goes away.
1284 * we need to remove it if someone hasn't already done so. 1217 * we need to remove it if someone hasn't already done so.
1285 */ 1218 */
1286 if (!op->destroyed ())
1287 op->destroy ();
1288
1289 return;
1290 }
1291
1292 op->remove ();
1293
1294 if (!op->direction || (mflags & P_OUT_OF_MAP))
1295 {
1296 op->destroy (); 1219 op->destroy ();
1297 return; 1220 return;
1298 } 1221 }
1299 1222
1300 op->x = new_x; 1223 if (!op->direction)
1301 op->y = new_y; 1224 {
1302 op->map = m; 1225 op->destroy ();
1226 return;
1227 }
1228
1303 i = spell_find_dir (op->map, op->x, op->y, op->owner); 1229 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1304 if (i > 0 && i != op->direction) 1230 if (i > 0 && i != op->direction)
1305 { 1231 {
1306 op->direction = i; 1232 op->direction = i;
1307 SET_ANIMATION (op, op->direction); 1233 SET_ANIMATION (op, op->direction);
1308 } 1234 }
1309 1235
1310 insert_ob_in_map (op, op->map, op, 0); 1236 pos.insert (op, op);
1311} 1237}
1312 1238
1313/**************************************************************************** 1239/****************************************************************************
1314 * Destruction 1240 * Destruction
1315 ****************************************************************************/ 1241 ****************************************************************************/
… …
1318 * we do this by creating a force and inserting it in the 1244 * we do this by creating a force and inserting it in the
1319 * object. if time is 0, the object glows permanently. To truely 1245 * object. if time is 0, the object glows permanently. To truely
1320 * make this work for non-living objects, we would have to 1246 * make this work for non-living objects, we would have to
1321 * give them the capability to have an inventory. b.t. 1247 * give them the capability to have an inventory. b.t.
1322 */ 1248 */
1323
1324int 1249int
1325make_object_glow (object *op, int radius, int time) 1250make_object_glow (object *op, int radius, int time)
1326{ 1251{
1327 object *tmp;
1328
1329 /* some things are unaffected... */ 1252 /* some things are unaffected... */
1330 if (op->path_denied & PATH_LIGHT) 1253 if (op->path_denied & PATH_LIGHT)
1331 return 0; 1254 return 0;
1332 1255
1333 tmp = get_archetype (FORCE_NAME); 1256 object *tmp = get_archetype (FORCE_NAME);
1334 tmp->speed = 0.01; 1257 tmp->speed = 0.01;
1335 tmp->stats.food = time; 1258 tmp->stats.food = time;
1336 SET_FLAG (tmp, FLAG_IS_USED_UP); 1259 SET_FLAG (tmp, FLAG_IS_USED_UP);
1337 tmp->glow_radius = radius; 1260 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1338 if (tmp->glow_radius > MAX_LIGHT_RADII)
1339 tmp->glow_radius = MAX_LIGHT_RADII;
1340
1341 tmp->x = op->x;
1342 tmp->y = op->y;
1343 if (tmp->speed < MIN_ACTIVE_SPEED)
1344 tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1345 tmp = insert_ob_in_ob (tmp, op); 1261 tmp = insert_ob_in_ob (tmp, op);
1262
1346 if (tmp->glow_radius > op->glow_radius) 1263 if (tmp->glow_radius > op->glow_radius)
1347 op->glow_radius = tmp->glow_radius; 1264 op->set_glow_radius (tmp->glow_radius);
1348 1265
1349 if (!tmp->env || op != tmp->env)
1350 {
1351 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1352 return 0;
1353 }
1354 return 1; 1266 return 1;
1355} 1267}
1356
1357
1358
1359 1268
1360int 1269int
1361cast_destruction (object *op, object *caster, object *spell_ob) 1270cast_destruction (object *op, object *caster, object *spell_ob)
1362{ 1271{
1363 int i, j, range, mflags, friendly = 0, dam, dur;
1364 sint16 sx, sy;
1365 maptile *m;
1366 object *tmp;
1367 const char *skill;
1368
1369 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1272 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1370 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1273 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1371 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1274 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1372 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER) 1275
1373 friendly = 1; 1276 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1374 1277
1375 /* destruction doesn't use another spell object, so we need 1278 /* destruction doesn't use another spell object, so we need
1376 * update op's skill pointer so that exp is properly awarded. 1279 * update op's skill pointer so that exp is properly awarded.
1377 * We do some shortcuts here - since this is just temporary
1378 * and we'll reset the values back, we don't need to go through
1379 * the full share string/free_string route.
1380 */ 1280 */
1381 skill = op->skill; 1281 const shstr skill = op->skill;
1282
1382 if (caster == op) 1283 if (caster == op)
1383 op->skill = spell_ob->skill; 1284 op->skill = spell_ob->skill;
1384 else if (caster->skill) 1285 else if (caster->skill)
1385 op->skill = caster->skill; 1286 op->skill = caster->skill;
1386 else 1287 else
1387 op->skill = NULL; 1288 op->skill = 0;
1388 1289
1389 change_skill (op, find_skill_by_name (op, op->skill), 1); 1290 op->change_skill (find_skill_by_name (op, op->skill));
1390 1291
1391 for (i = -range; i < range; i++) 1292 unordered_mapwalk (op, -range, -range, range, range)
1392 { 1293 {
1393 for (j = -range; j < range; j++) 1294 mapspace &ms = m->at (nx, ny);
1394 { 1295
1395 m = op->map;
1396 sx = op->x + i;
1397 sy = op->y + j;
1398 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1399 if (mflags & P_OUT_OF_MAP)
1400 continue;
1401 if (mflags & P_IS_ALIVE) 1296 if (ms.flags () & P_IS_ALIVE)
1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1298 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1402 { 1299 {
1403 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1300 tmp = tmp->head_ ();
1301
1302 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1303 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1404 { 1304 {
1405 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1305 if (spell_ob->subtype == SP_DESTRUCTION)
1406 break;
1407 }
1408 if (tmp)
1409 {
1410 if (tmp->head)
1411 tmp = tmp->head;
1412
1413 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||
1414 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
1415 { 1306 {
1416 if (spell_ob->subtype == SP_DESTRUCTION)
1417 {
1418 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1307 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1308
1419 if (spell_ob->other_arch) 1309 if (spell_ob->other_arch)
1420 {
1421 tmp = arch_to_object (spell_ob->other_arch); 1310 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1422 tmp->x = sx;
1423 tmp->y = sy;
1424 insert_ob_in_map (tmp, m, op, 0);
1425 }
1426 } 1311 }
1427 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1312 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1428 { 1313 {
1429 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1314 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1430 {
1431 object *effect = arch_to_object (spell_ob->other_arch); 1315 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1432
1433 effect->x = sx;
1434 effect->y = sy;
1435 insert_ob_in_map (effect, m, op, 0);
1436 }
1437 }
1438 } 1316 }
1439 } 1317 }
1440 } 1318 }
1441 }
1442 } 1319 }
1320
1443 op->skill = skill; 1321 op->skill = skill;
1444 return 1; 1322 return 1;
1445} 1323}
1446 1324
1447/*************************************************************************** 1325/***************************************************************************
… …
1461 { 1339 {
1462 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1340 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1463 return 0; 1341 return 0;
1464 } 1342 }
1465 1343
1344 tmp = tmp->head_ ();
1345
1466 /* If we've already got a force of this type, don't add a new one. */ 1346 /* If we've already got a force of this type, don't add a new one. */
1467 for (force = tmp->inv; force != NULL; force = force->below) 1347 for (force = tmp->inv; force; force = force->below)
1468 { 1348 {
1469 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1349 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1470 { 1350 {
1471 if (force->name == spell_ob->name) 1351 if (force->name == spell_ob->name)
1472 { 1352 {
… …
1478 return 0; 1358 return 0;
1479 } 1359 }
1480 } 1360 }
1481 } 1361 }
1482 1362
1483 if (force == NULL) 1363 if (!force)
1484 { 1364 {
1485 force = get_archetype (FORCE_NAME); 1365 force = get_archetype (FORCE_NAME);
1486 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1367
1487 if (spell_ob->race) 1368 if (spell_ob->race)
1488 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1489 else 1370 else
1490 force->name = spell_ob->name; 1371 force->name = spell_ob->name;
1491 1372
… …
1501 { 1382 {
1502 force->duration = duration; 1383 force->duration = duration;
1503 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1384 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1504 } 1385 }
1505 else 1386 else
1506 {
1507 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1387 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1508 } 1388
1509 return 1; 1389 return 1;
1510 } 1390 }
1391
1511 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;
1512 force->speed = 1.0; 1393 force->speed = 1.f;
1513 force->speed_left = -1.0; 1394 force->speed_left = -1.f;
1514 SET_FLAG (force, FLAG_APPLIED); 1395 SET_FLAG (force, FLAG_APPLIED);
1515 1396
1516 if (god) 1397 if (god)
1517 { 1398 {
1518 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
… …
1536 tmp->update_stats (); 1417 tmp->update_stats ();
1537 return 1; 1418 return 1;
1538 1419
1539} 1420}
1540 1421
1541
1542/********************************************************************** 1422/**********************************************************************
1543 * mood change 1423 * mood change
1544 * 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
1545 * effects monsters, it seems best to put it into this file 1425 * effects monsters, it seems best to put it into this file
1546 ***********************************************************************/ 1426 ***********************************************************************/
… …
1550 */ 1430 */
1551int 1431int
1552mood_change (object *op, object *caster, object *spell) 1432mood_change (object *op, object *caster, object *spell)
1553{ 1433{
1554 object *tmp, *god, *head; 1434 object *tmp, *god, *head;
1555 int done_one, range, mflags, level, at, best_at; 1435 int done_one, range, level, at, best_at;
1556 sint16 x, y, nx, ny;
1557 maptile *m;
1558 const char *race; 1436 const char *race;
1559 1437
1560 /* We precompute some values here so that we don't have to keep 1438 /* We precompute some values here so that we don't have to keep
1561 * doing it over and over again. 1439 * doing it over and over again.
1562 */ 1440 */
1563 god = find_god (determine_god (op)); 1441 god = find_god (determine_god (op));
1564 level = caster_level (caster, spell); 1442 level = casting_level (caster, spell);
1565 range = spell->range + SP_level_range_adjust (caster, spell); 1443 range = spell->range + SP_level_range_adjust (caster, spell);
1566 1444
1567 /* On the bright side, no monster should ever have a race of GOD_... 1445 /* On the bright side, no monster should ever have a race of GOD_...
1568 * 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
1569 * won't ever match anything. 1447 * won't ever match anything.
1570 */ 1448 */
1571 if (!spell->race) 1449 if (!spell->race)
1572 race = NULL; 1450 race = NULL;
1573 else if (god && !strcmp (spell->race, "GOD_SLAYING")) 1451 else if (god && spell->race == shstr_GOD_SLAYING)
1574 race = god->slaying; 1452 race = god->slaying;
1575 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1576 race = god->race; 1454 race = god->race;
1577 else 1455 else
1578 race = spell->race; 1456 race = spell->race;
1579 1457
1580 1458 unordered_mapwalk (op, -range, -range, range, range)
1581 for (x = op->x - range; x <= op->x + range; x++)
1582 for (y = op->y - range; y <= op->y + range; y++)
1583 { 1459 {
1460 mapspace &ms = m->at (nx, ny);
1584 1461
1585 done_one = 0;
1586 m = op->map;
1587 nx = x;
1588 ny = y;
1589 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1590 if (mflags & P_OUT_OF_MAP)
1591 continue;
1592
1593 /* If there is nothing living on this space, no need to go further */ 1462 /* If there is nothing living on this space, no need to go further */
1594 if (!(mflags & P_IS_ALIVE)) 1463 if (!ms.flags () & P_IS_ALIVE)
1595 continue; 1464 continue;
1596 1465
1597 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above) 1466 // players can only affect spaces that they can actually see
1598 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1467 if (caster
1468 && caster->contr
1469 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1470 continue;
1471
1472 for (tmp = ms.top; tmp; tmp = tmp->below)
1473 if (tmp->flag [FLAG_MONSTER])
1599 break; 1474 break;
1600 1475
1601 /* There can be living objects that are not monsters */ 1476 /* There can be living objects that are not monsters */
1602 if (!tmp || tmp->type == PLAYER) 1477 if (!tmp)
1603 continue; 1478 continue;
1604 1479
1605 /* Only the head has meaningful data, so resolve to that */ 1480 /* Only the head has meaningful data, so resolve to that */
1606 if (tmp->head)
1607 head = tmp->head; 1481 head = tmp->head_ ();
1608 else
1609 head = tmp;
1610 1482
1611 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1483 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1612 if (race && head->race && !strstr (race, head->race)) 1484 if (race && head->race && !strstr (race, head->race))
1613 continue; 1485 continue;
1486
1614 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1487 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1615 continue; 1488 continue;
1616 1489
1617 /* Now do a bunch of stuff related to saving throws */ 1490 /* Now do a bunch of stuff related to saving throws */
1618 best_at = -1; 1491 best_at = -1;
1619 if (spell->attacktype) 1492 if (spell->attacktype)
1620 { 1493 {
1621 for (at = 0; at < NROFATTACKS; at++) 1494 for (at = 0; at < NROFATTACKS; at++)
1622 if (spell->attacktype & (1 << at)) 1495 if (spell->attacktype & (1 << at))
1623 if (best_at == -1 || head->resist[at] > head->resist[best_at]) 1496 if (best_at == -1 || head->resist[at] > head->resist[best_at])
1624 best_at = at; 1497 best_at = at;
1625 1498
1626 if (best_at == -1) 1499 if (best_at == -1)
1627 at = 0; 1500 at = 0;
1628 else 1501 else
1629 { 1502 {
1630 if (head->resist[best_at] == 100) 1503 if (head->resist[best_at] == 100)
1631 continue; 1504 continue;
1632 else 1505 else
1633 at = head->resist[best_at] / 5; 1506 at = head->resist[best_at] / 5;
1634 } 1507 }
1508
1635 at -= level / 5; 1509 at -= level / 5;
1636 if (did_make_save (head, head->level, at)) 1510 if (did_make_save (head, head->level, at))
1637 continue; 1511 continue;
1638 } 1512 }
1639 else /* spell->attacktype */ 1513 else /* spell->attacktype */
1514 {
1640 /* 1515 /*
1641 Spell has no attacktype (charm & such), so we'll have a specific saving: 1516 Spell has no attacktype (charm & such), so we'll have a specific saving:
1642 * if spell level < monster level, no go 1517 * if spell level < monster level, no go
1643 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1518 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1644 1519
… …
1646 1521
1647 This is required to fix the 'charm monster' abuse, where a player level 1 can 1522 This is required to fix the 'charm monster' abuse, where a player level 1 can
1648 charm a level 125 monster... 1523 charm a level 125 monster...
1649 1524
1650 Ryo, august 14th 1525 Ryo, august 14th
1651 */ 1526 */
1652 {
1653 if (head->level > level) 1527 if (head->level > level)
1654 continue; 1528 continue;
1529
1655 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1530 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1656 /* Failed, no effect */ 1531 /* Failed, no effect */
1657 continue; 1532 continue;
1658 } 1533 }
1659 1534
1660 /* Done with saving throw. Now start effecting the monster */ 1535 /* Done with saving throw. Now start affecting the monster */
1536 done_one = 0;
1661 1537
1662 /* aggravation */ 1538 /* aggravation */
1663 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1539 if (QUERY_FLAG (spell, FLAG_MONSTER))
1664 { 1540 {
1665 CLEAR_FLAG (head, FLAG_SLEEP); 1541 CLEAR_FLAG (head, FLAG_SLEEP);
1666 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1667 remove_friendly_object (head); 1542 remove_friendly_object (head);
1668
1669 done_one = 1; 1543 done_one = 1;
1670 head->enemy = op; 1544 head->enemy = op;
1671 } 1545 }
1672 1546
1673 /* calm monsters */ 1547 /* calm monsters */
1674 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1548 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
1675 { 1549 {
1676 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1550 SET_FLAG (head, FLAG_UNAGGRESSIVE);
1677 head->enemy = NULL; 1551 head->enemy = NULL;
1678 done_one = 1; 1552 done_one = 1;
1679 } 1553 }
1680 1554
1681 /* berserk monsters */ 1555 /* berserk monsters */
1682 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1556 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1683 { 1557 {
1684 SET_FLAG (head, FLAG_BERSERK); 1558 SET_FLAG (head, FLAG_BERSERK);
1685 done_one = 1; 1559 done_one = 1;
1686 } 1560 }
1561
1687 /* charm */ 1562 /* charm */
1688 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1563 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1689 { 1564 {
1690 SET_FLAG (head, FLAG_FRIENDLY); 1565 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1566
1691 /* Prevent uncontolled outbreaks of self replicating monsters. 1567 /* Prevent uncontrolled outbreaks of self replicating monsters.
1692 Typical use case is charm, go somwhere, use aggravation to make hostile. 1568 Typical use case is charm, go somwhere, use aggravation to make hostile.
1693 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1569 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1694 CLEAR_FLAG (head, FLAG_GENERATOR); 1570 CLEAR_FLAG (head, FLAG_GENERATOR);
1695 head->set_owner (op); 1571 head->set_owner (op);
1696 set_spell_skill (op, caster, spell, head); 1572 set_spell_skill (op, caster, spell, head);
1697 add_friendly_object (head); 1573 add_friendly_object (head);
1698 head->attack_movement = PETMOVE; 1574 head->attack_movement = PETMOVE;
1699 done_one = 1; 1575 done_one = 1;
1700 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1576 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1701 head->stats.exp = 0; 1577 head->stats.exp = 0;
1702 } 1578 }
1703 1579
1704 /* If a monster was effected, put an effect in */ 1580 /* If a monster was effected, put an effect in */
1705 if (done_one && spell->other_arch) 1581 if (done_one && spell->other_arch)
1706 { 1582 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1707 tmp = arch_to_object (spell->other_arch); 1583 }
1708 tmp->x = nx;
1709 tmp->y = ny;
1710 insert_ob_in_map (tmp, m, op, 0);
1711 }
1712 } /* for y */
1713 1584
1714 return 1; 1585 return 1;
1715} 1586}
1716
1717 1587
1718/* Move_ball_spell: This handles ball type spells that just sort of wander 1588/* Move_ball_spell: This handles ball type spells that just sort of wander
1719 * about. was called move_ball_lightning, but since more than the ball 1589 * about. was called move_ball_lightning, but since more than the ball
1720 * lightning spell used it, that seemed misnamed. 1590 * lightning spell used it, that seemed misnamed.
1721 * op is the spell effect. 1591 * op is the spell effect.
1722 * note that duration is handled by process_object() in time.c 1592 * note that duration is handled by process_object() in time.c
1723 */ 1593 */
1724
1725void 1594void
1726move_ball_spell (object *op) 1595move_ball_spell (object *op)
1727{ 1596{
1728 int i, j, dam_save, dir, mflags; 1597 int i, j, dam_save, dir, mflags;
1729 sint16 nx, ny, hx, hy; 1598 sint16 nx, ny, hx, hy;
… …
1748 for (i = 1; i < 9; i++) 1617 for (i = 1; i < 9; i++)
1749 { 1618 {
1750 /* i bit 0: alters sign of offset 1619 /* i bit 0: alters sign of offset
1751 * other bits (i / 2): absolute value of offset 1620 * other bits (i / 2): absolute value of offset
1752 */ 1621 */
1753
1754 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1622 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1755 int tmpdir = absdir (op->direction + offset); 1623 int tmpdir = absdir (op->direction + offset);
1756 1624
1757 nx = op->x + freearr_x[tmpdir]; 1625 nx = op->x + freearr_x[tmpdir];
1758 ny = op->y + freearr_y[tmpdir]; 1626 ny = op->y + freearr_y[tmpdir];
… …
1760 { 1628 {
1761 dir = tmpdir; 1629 dir = tmpdir;
1762 break; 1630 break;
1763 } 1631 }
1764 } 1632 }
1633
1765 if (dir == 0) 1634 if (dir == 0)
1766 { 1635 {
1767 nx = op->x; 1636 nx = op->x;
1768 ny = op->y; 1637 ny = op->y;
1769 m = op->map; 1638 m = op->map;
1770 } 1639 }
1771 1640
1772 op->remove (); 1641 m->insert (op, nx, ny, op);
1773 op->y = ny;
1774 op->x = nx;
1775 insert_ob_in_map (op, m, op, 0);
1776 1642
1777 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1643 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1778 surrounding squares */ 1644 surrounding squares */
1779 1645
1780 /* loop over current square and neighbors to hit. 1646 /* loop over current square and neighbors to hit.
1781 * if this has an other_arch field, we insert that in 1647 * if this has an other_arch field, we insert that in
1782 * the surround spaces. 1648 * the surround spaces.
1783 */ 1649 */
1784 for (j = 0; j < 9; j++) 1650 for (j = 0; j < 9; j++)
1785 { 1651 {
1786 object *new_ob;
1787
1788 hx = nx + freearr_x[j]; 1652 hx = nx + freearr_x[j];
1789 hy = ny + freearr_y[j]; 1653 hy = ny + freearr_y[j];
1790 1654
1791 m = op->map; 1655 m = op->map;
1792 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1656 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1800 1664
1801 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op))) 1665 if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op)))
1802 { 1666 {
1803 if (j) 1667 if (j)
1804 op->stats.dam = dam_save / 2; 1668 op->stats.dam = dam_save / 2;
1669
1805 hit_map (op, j, op->attacktype, 1); 1670 hit_map (op, j, op->attacktype, 1);
1806
1807 } 1671 }
1808 1672
1809 /* insert the other arch */ 1673 /* insert the other arch */
1810 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1674 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1811 { 1675 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1812 new_ob = arch_to_object (op->other_arch);
1813 new_ob->x = hx;
1814 new_ob->y = hy;
1815 insert_ob_in_map (new_ob, m, op, 0);
1816 }
1817 } 1676 }
1818 1677
1819 /* restore to the center location and damage */ 1678 /* restore to the center location and damage */
1820 op->stats.dam = dam_save; 1679 op->stats.dam = dam_save;
1821 1680
… …
1824 if (i >= 0) 1683 if (i >= 0)
1825 { /* we have a preferred direction! */ 1684 { /* we have a preferred direction! */
1826 /* pick another direction if the preferred dir is blocked. */ 1685 /* pick another direction if the preferred dir is blocked. */
1827 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1686 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1828 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1687 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1829 {
1830 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1688 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1831 } 1689
1832 op->direction = i; 1690 op->direction = i;
1833 } 1691 }
1834} 1692}
1835 1693
1836
1837/* move_swarm_spell: peterm 1694/* move_swarm_spell: peterm
1838 * This is an implementation of the swarm spell. It was written for 1695 * This is an implementation of the swarm spell. It was written for
1839 * meteor swarm, but it could be used for any swarm. A swarm spell 1696 * meteor swarm, but it could be used for any swarm. A swarm spell
1840 * is a special type of object that casts swarms of other types 1697 * is a special type of object that casts swarms of other types
1841 * of spells. Which spell it casts is flexible. It fires the spells 1698 * of spells. Which spell it casts is flexible. It fires the spells
1842 * from a set of squares surrounding the caster, in a given direction. 1699 * from a set of squares surrounding the caster, in a given direction.
1843 */ 1700 */
1844
1845void 1701void
1846move_swarm_spell (object *op) 1702move_swarm_spell (object *op)
1847{ 1703{
1848#if 0 1704#if 0
1849 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1705 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1850 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1706 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1851 sint16 target_x, target_y, origin_x, origin_y; 1707 sint16 target_x, target_y, origin_x, origin_y;
1852 int adjustdir; 1708 int adjustdir;
1853 maptile *m; 1709 maptile *m;
1854#endif 1710#endif
1855 int basedir;
1856 object *owner; 1711 object *owner = op->env;
1857 1712
1858 owner = op->owner; 1713 if (!owner) // MUST not happen, remove when true TODO
1859 if (op->duration == 0 || owner == NULL)
1860 { 1714 {
1715 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1861 op->destroy (); 1716 op->destroy ();
1862 return; 1717 return;
1863 } 1718 }
1864 1719
1720 if (!op->duration || !owner->is_on_map ())
1721 {
1722 op->drop_and_destroy ();
1723 return;
1724 }
1725
1865 op->duration--; 1726 op->duration--;
1866 1727
1867 basedir = op->direction; 1728 int basedir = op->direction;
1868 if (basedir == 0) 1729 if (!basedir)
1869 { 1730 {
1870 /* spray in all directions! 8) */ 1731 /* spray in all directions! 8) */
1871 basedir = rndm (1, 8); 1732 op->facing = (op->facing + op->state) & 7;
1733 basedir = op->facing + 1;
1872 } 1734 }
1873 1735
1874#if 0 1736#if 0
1875 // this is bogus: it causes wrong places to be checked below 1737 // this is bogus: it causes wrong places to be checked below
1876 // (a wall 2 cells away will block the effect...) and 1738 // (a wall 2 cells away will block the effect...) and
1877 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1739 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1878 // space. 1740 // space.
1879 // should be fixed later, but correctness before featurs... 1741 // should be fixed later, but correctness before features...
1880 // (schmorp) 1742 // (schmorp)
1881 1743
1882 /* new offset calculation to make swarm element distribution 1744 /* new offset calculation to make swarm element distribution
1883 * more uniform 1745 * more uniform
1884 */ 1746 */
… …
1937 { 1799 {
1938 /* Bullet spells have a bunch more customization that needs to be done */ 1800 /* Bullet spells have a bunch more customization that needs to be done */
1939 if (op->spell->subtype == SP_BULLET) 1801 if (op->spell->subtype == SP_BULLET)
1940 fire_bullet (owner, op, basedir, op->spell); 1802 fire_bullet (owner, op, basedir, op->spell);
1941 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1803 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1942 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1804 fire_arch_from_position (owner, op, owner->x, owner->y, basedir, op->spell);
1943 } 1805 }
1944} 1806}
1945
1946
1947
1948 1807
1949/* fire_swarm: 1808/* fire_swarm:
1950 * The following routine creates a swarm of objects. It actually 1809 * The following routine creates a swarm of objects. It actually
1951 * sets up a specific swarm object, which then fires off all 1810 * sets up a specific swarm object, which then fires off all
1952 * the parts of the swarm. 1811 * the parts of the swarm.
… …
1955 * caster: the caster (owner, wand, rod, scroll) 1814 * caster: the caster (owner, wand, rod, scroll)
1956 * dir: the direction everything will be fired in 1815 * dir: the direction everything will be fired in
1957 * spell - the spell that is this spell. 1816 * spell - the spell that is this spell.
1958 * n: the number to be fired. 1817 * n: the number to be fired.
1959 */ 1818 */
1960
1961int 1819int
1962fire_swarm (object *op, object *caster, object *spell, int dir) 1820fire_swarm (object *op, object *caster, object *spell, int dir)
1963{ 1821{
1964 object *tmp;
1965 int i;
1966
1967 if (!spell->other_arch) 1822 if (!spell->other_arch)
1968 return 0; 1823 return 0;
1969 1824
1970 tmp = get_archetype (SWARM_SPELL); 1825 object *tmp = archetype::get (SWARM_SPELL);
1971 tmp->x = op->x; 1826
1972 tmp->y = op->y;
1973 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1974 set_spell_skill (op, caster, spell, tmp); 1827 set_spell_skill (op, caster, spell, tmp);
1975
1976 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1828 tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */
1977 tmp->spell = arch_to_object (spell->other_arch); 1829 tmp->spell = spell->other_arch->instance ();
1978
1979 tmp->attacktype = tmp->spell->attacktype; 1830 tmp->attacktype = tmp->spell->attacktype;
1980 1831
1981 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1832 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1982 {
1983 if (!tailor_god_spell (tmp, op)) 1833 if (!tailor_god_spell (tmp, op))
1984 return 1; 1834 return 1;
1985 } 1835
1986 tmp->duration = SP_level_duration_adjust (caster, spell); 1836 tmp->duration = SP_level_duration_adjust (caster, spell);
1987 for (i = 0; i < spell->duration; i++) 1837 for (int i = 0; i < spell->duration; i++)
1988 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1838 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1989 1839
1840 tmp->invisible = 1;
1841 tmp->flag [FLAG_NO_DROP] = 1; // make sure it stays in inv, or else
1990 tmp->direction = dir; 1842 tmp->direction = dir;
1991 tmp->invisible = 1; 1843 tmp->facing = rndm (1, 8); // initial firing direction
1992 insert_ob_in_map (tmp, op->map, op, 0); 1844 tmp->state = rndm (4) * 2 + 1; // direction increment
1845
1846 op->insert (tmp);
1847
1993 return 1; 1848 return 1;
1994} 1849}
1995
1996 1850
1997/* See the spells documentation file for why this is its own 1851/* See the spells documentation file for why this is its own
1998 * function. 1852 * function.
1999 */ 1853 */
2000int 1854int
… …
2005 int dam, mflags; 1859 int dam, mflags;
2006 maptile *m; 1860 maptile *m;
2007 1861
2008 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1862 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2009 1863
2010 if (!dir) 1864 if (dir)
2011 {
2012 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
2013 return 0;
2014 } 1865 {
2015
2016 x = op->x + freearr_x[dir]; 1866 x = op->x + freearr_x[dir];
2017 y = op->y + freearr_y[dir]; 1867 y = op->y + freearr_y[dir];
2018 m = op->map; 1868 m = op->map;
2019 1869
2020 mflags = get_map_flags (m, &m, x, y, &x, &y); 1870 mflags = get_map_flags (m, &m, x, y, &x, &y);
2021 1871
2022 if (mflags & P_OUT_OF_MAP) 1872 if (mflags & P_OUT_OF_MAP)
2023 { 1873 {
2024 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1874 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
2025 return 0; 1875 return 0;
2026 } 1876 }
2027 1877
2028 if (mflags & P_IS_ALIVE && spell->attacktype) 1878 if (mflags & P_IS_ALIVE && spell->attacktype)
2029 { 1879 {
2030 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1880 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2031 if (QUERY_FLAG (target, FLAG_MONSTER)) 1881 if (QUERY_FLAG (target, FLAG_MONSTER))
2032 { 1882 {
2033 /* oky doky. got a target monster. Lets make a blinding attack */ 1883 /* oky doky. got a target monster. Lets make a blinding attack */
2034 if (target->head) 1884 if (target->head)
2035 target = target->head; 1885 target = target->head;
1886
2036 (void) hit_player (target, dam, op, spell->attacktype, 1); 1887 hit_player (target, dam, op, spell->attacktype, 1);
2037 return 1; /* one success only! */ 1888 return 1; /* one success only! */
1889 }
2038 } 1890 }
2039 }
2040 1891
2041 /* no live target, perhaps a wall is in the way? */ 1892 /* no live target, perhaps a wall is in the way? */
2042 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1893 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
2043 { 1894 {
2044 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1895 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
2045 return 0; 1896 return 0;
1897 }
2046 } 1898 }
2047 1899
2048 /* ok, looks groovy to just insert a new light on the map */ 1900 /* ok, looks groovy to just insert a new light on the map */
2049 tmp = arch_to_object (spell->other_arch); 1901 tmp = arch_to_object (spell->other_arch);
2050 if (!tmp) 1902 if (!tmp)
2051 { 1903 {
2052 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1904 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
2053 return 0; 1905 return 0;
2054 } 1906 }
1907
2055 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1908 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1909
2056 if (tmp->glow_radius) 1910 if (tmp->glow_radius)
2057 { 1911 tmp->set_glow_radius (
2058 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1912 clamp (spell->range + SP_level_range_adjust (caster, spell), 1, MAX_LIGHT_RADIUS)
2059 if (tmp->glow_radius > MAX_LIGHT_RADII) 1913 );
2060 tmp->glow_radius = MAX_LIGHT_RADII; 1914
2061 } 1915 if (dir)
2062 tmp->x = x; 1916 m->insert (tmp, x, y, op);
2063 tmp->y = y; 1917 else
2064 insert_ob_in_map (tmp, m, op, 0); 1918 caster->outer_env_or_self ()->insert (tmp);
1919
2065 return 1; 1920 return 1;
2066} 1921}
2067
2068
2069
2070 1922
2071/* cast_cause_disease: this spell looks along <dir> from the 1923/* cast_cause_disease: this spell looks along <dir> from the
2072 * player and infects someone. 1924 * player and infects someone.
2073 * op is the player/monster, caster is the object, dir is the direction 1925 * op is the player/monster, caster is the object, dir is the direction
2074 * to cast, disease_arch is the specific disease, and type is the spell number 1926 * to cast, disease_arch is the specific disease, and type is the spell number
2075 * perhaps this should actually be in disease.c? 1927 * perhaps this should actually be in disease.c?
2076 */ 1928 */
2077
2078int 1929int
2079cast_cause_disease (object *op, object *caster, object *spell, int dir) 1930cast_cause_disease (object *op, object *caster, object *spell, int dir)
2080{ 1931{
2081 sint16 x, y; 1932 sint16 x, y;
2082 int i, mflags, range, dam_mod, dur_mod; 1933 int i, mflags, range, dam_mod, dur_mod;
… …
2089 /* If casting from a scroll, no direction will be available, so refer to the 1940 /* If casting from a scroll, no direction will be available, so refer to the
2090 * direction the player is pointing. 1941 * direction the player is pointing.
2091 */ 1942 */
2092 if (!dir) 1943 if (!dir)
2093 dir = op->facing; 1944 dir = op->facing;
1945
2094 if (!dir) 1946 if (!dir)
2095 return 0; /* won't find anything if casting on ourself, so just return */ 1947 return 0; /* won't find anything if casting on ourself, so just return */
2096 1948
2097 /* Calculate these once here */ 1949 /* Calculate these once here */
2098 range = spell->range + SP_level_range_adjust (caster, spell); 1950 range = spell->range + SP_level_range_adjust (caster, spell);
… …
2125 object *disease = arch_to_object (spell->other_arch); 1977 object *disease = arch_to_object (spell->other_arch);
2126 1978
2127 disease->set_owner (op); 1979 disease->set_owner (op);
2128 set_spell_skill (op, caster, spell, disease); 1980 set_spell_skill (op, caster, spell, disease);
2129 disease->stats.exp = 0; 1981 disease->stats.exp = 0;
2130 disease->level = caster_level (caster, spell); 1982 disease->level = casting_level (caster, spell);
2131 1983
2132 /* do level adjustments */ 1984 /* do level adjustments */
2133 if (disease->stats.wc) 1985 if (disease->stats.wc)
2134 disease->stats.wc += dur_mod / 2; 1986 disease->stats.wc += dur_mod / 2;
2135 1987
2136 if (disease->magic > 0) 1988 if (disease->magic > 0)
2137 disease->magic += dur_mod / 4; 1989 disease->magic += dur_mod / 8;
2138 1990
2139 if (disease->stats.maxhp > 0) 1991 if (disease->stats.maxhp > 0)
2140 disease->stats.maxhp += dur_mod; 1992 disease->stats.maxhp += dur_mod;
2141 1993
2142 if (disease->stats.maxgrace > 0) 1994 if (disease->stats.maxgrace > 0)
… …
2177 if (disease->stats.sp) 2029 if (disease->stats.sp)
2178 disease->stats.sp -= dam_mod; 2030 disease->stats.sp -= dam_mod;
2179 2031
2180 if (infect_object (walk, disease, 1)) 2032 if (infect_object (walk, disease, 1))
2181 { 2033 {
2182 object *flash; /* visual effect for inflicting disease */
2183
2184 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2034 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2185 2035
2186 disease->destroy (); /* don't need this one anymore */ 2036 disease->destroy (); /* don't need this one anymore */
2187 flash = get_archetype (ARCH_DETECT_MAGIC); 2037 walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2188 flash->x = x;
2189 flash->y = y;
2190 flash->map = walk->map;
2191 insert_ob_in_map (flash, walk->map, op, 0);
2192 return 1; 2038 return 1;
2193 } 2039 }
2194 2040
2195 disease->destroy (); 2041 disease->destroy ();
2196 } 2042 }
2197 } /* if living creature */ 2043 } /* if living creature */
2198 } /* for range of spaces */ 2044 } /* for range of spaces */
2045
2199 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2046 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2200 return 1; 2047 return 1;
2201} 2048}

Diff Legend

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