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.17 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.37 by root, Mon May 28 21:28:36 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 GNU General Public License along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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 <crossfire@schmorp.de>
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)
… …
57 { 56 {
58 weight_move = op->weight + (op->weight * op->level) / 3; 57 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); */ 58 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
60 } 59 }
61 60
62 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 61 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
63 { 62 {
64 int num_sections = 1; 63 int num_sections = 1;
65 64
66 /* don't move DM */ 65 /* don't move DM */
67 if (QUERY_FLAG (tmp, FLAG_WIZ)) 66 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
140 139
141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 140 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
142 return; 141 return;
143 142
144 /* OK, we made a fork */ 143 /* OK, we made a fork */
145 new_bolt = object::create (); 144 new_bolt = tmp->clone ();
146 tmp->copy_to (new_bolt);
147 145
148 /* reduce chances of subsequent forking */ 146 /* reduce chances of subsequent forking */
149 new_bolt->stats.Dex -= 10; 147 new_bolt->stats.Dex -= 10;
150 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 148 tmp->stats.Dex -= 10; /* less forks from main bolt too */
151 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
152 new_bolt->speed_left = -0.1; 150 new_bolt->speed_left = -0.1f;
153 new_bolt->direction = t_dir; 151 new_bolt->direction = t_dir;
154 new_bolt->duration++; 152 new_bolt->duration++;
155 new_bolt->x = sx;
156 new_bolt->y = sy;
157 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
158 new_bolt->stats.dam++; 154 new_bolt->stats.dam++;
159 tmp->stats.dam /= 2; /* reduce father bolt damage */ 155 tmp->stats.dam /= 2; /* reduce father bolt damage */
160 tmp->stats.dam++; 156 tmp->stats.dam++;
161 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 157 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
162 update_turn_face (new_bolt); 158 update_turn_face (new_bolt);
163} 159}
164 160
165/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 161/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
166 * and checks for various things that may stop it. 162 * and checks for various things that may stop it.
167 */ 163 */
168 164
169void 165void
170move_bolt (object *op) 166move_bolt (object *op)
171{ 167{
172 object *tmp;
173 int mflags; 168 int mflags;
174 sint16 x, y; 169 sint16 x, y;
175 maptile *m; 170 maptile *m;
176 171
177 if (--(op->duration) < 0) 172 if (--op->duration < 0)
178 { 173 {
179 op->destroy (); 174 op->destroy ();
180 return; 175 return;
181 } 176 }
182 177
… …
184 179
185 if (!op->direction) 180 if (!op->direction)
186 return; 181 return;
187 182
188 if (--op->range < 0) 183 if (--op->range < 0)
189 {
190 op->range = 0; 184 op->range = 0;
191 }
192 else 185 else
193 { 186 {
194 x = op->x + DIRX (op); 187 x = op->x + DIRX (op);
195 y = op->y + DIRY (op); 188 y = op->y + DIRY (op);
196 m = op->map; 189 m = op->map;
… …
204 * on the space. So only call reflwall if we think the data it returns 197 * on the space. So only call reflwall if we think the data it returns
205 * will be useful. 198 * will be useful.
206 */ 199 */
207 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 200 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
208 { 201 {
209
210 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 202 if (!QUERY_FLAG (op, FLAG_REFLECTING))
211 return; 203 return;
212 204
213 /* Since walls don't run diagonal, if the bolt is in 205 /* Since walls don't run diagonal, if the bolt is in
214 * one of 4 main directions, it just reflects back in the 206 * one of 4 main directions, it just reflects back in the
… …
244 else if (left) 236 else if (left)
245 op->direction = absdir (op->direction + 2); 237 op->direction = absdir (op->direction + 2);
246 else if (right) 238 else if (right)
247 op->direction = absdir (op->direction - 2); 239 op->direction = absdir (op->direction - 2);
248 } 240 }
241
249 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 242 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
250 return; 243 return;
251 } 244 }
252 else 245 else
253 { /* Create a copy of this object and put it ahead */ 246 { /* Create a copy of this object and put it ahead */
254 tmp = object::create (); 247 object *tmp = op->clone ();
255 op->copy_to (tmp); 248
249 m->insert (tmp, x, y, op);
256 tmp->speed_left = -0.1; 250 tmp->speed_left = -0.1f;
257 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
258 tmp = insert_ob_in_map (tmp, op->map, op, 0);
259 /* To make up for the decrease at the top of the function */ 251 /* To make up for the decrease at the top of the function */
260 tmp->duration++; 252 tmp->duration++;
261 253
262 /* New forking code. Possibly create forks of this object 254 /* New forking code. Possibly create forks of this object
263 * going off in other directions. 255 * going off in other directions.
264 */ 256 */
265
266 if (rndm (0, 99) < tmp->stats.Dex) 257 if (rndm (0, 99) < tmp->stats.Dex)
267 { /* stats.Dex % of forking */ 258 { /* stats.Dex % of forking */
268 forklightning (op, tmp); 259 forklightning (op, tmp);
269 } 260 }
261
270 /* In this way, the object left behind sticks on the space, but 262 /* In this way, the object left behind sticks on the space, but
271 * doesn't create any bolts that continue to move onward. 263 * doesn't create any bolts that continue to move onward.
272 */ 264 */
273 op->range = 0; 265 op->range = 0;
274 } /* copy object and move it along */ 266 } /* copy object and move it along */
… …
281 * we remove the magic flag - that can be derived from 273 * we remove the magic flag - that can be derived from
282 * spob->attacktype. 274 * spob->attacktype.
283 * This function sets up the appropriate owner and skill 275 * This function sets up the appropriate owner and skill
284 * pointers. 276 * pointers.
285 */ 277 */
286
287int 278int
288fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 279fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
289{ 280{
290 object *tmp = NULL; 281 object *tmp = NULL;
291 int mflags; 282 int mflags;
… …
309 300
310 tmp->direction = dir; 301 tmp->direction = dir;
311 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 302 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
312 SET_ANIMATION (tmp, dir); 303 SET_ANIMATION (tmp, dir);
313 304
314 set_owner (tmp, op); 305 tmp->set_owner (op);
315 set_spell_skill (op, caster, spob, tmp); 306 set_spell_skill (op, caster, spob, tmp);
316 307
317 tmp->x = op->x + DIRX (tmp); 308 tmp->x = op->x + DIRX (tmp);
318 tmp->y = op->y + DIRY (tmp); 309 tmp->y = op->y + DIRY (tmp);
319 tmp->map = op->map; 310 tmp->map = op->map;
320 311
312 maptile *newmap;
321 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 313 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
322 if (mflags & P_OUT_OF_MAP) 314 if (mflags & P_OUT_OF_MAP)
323 { 315 {
324 tmp->destroy (); 316 tmp->destroy ();
325 return 0; 317 return 0;
326 } 318 }
319
320 tmp->map = newmap;
327 321
328 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 322 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
329 { 323 {
330 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 324 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
331 { 325 {
… …
337 tmp->y = op->y; 331 tmp->y = op->y;
338 tmp->direction = absdir (tmp->direction + 4); 332 tmp->direction = absdir (tmp->direction + 4);
339 tmp->map = op->map; 333 tmp->map = op->map;
340 } 334 }
341 335
342 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 336 if ((tmp = tmp->insert_at (tmp, op)))
343 move_bolt (tmp); 337 move_bolt (tmp);
344 338
345 return 1; 339 return 1;
346} 340}
347 341
… …
358 * At least that is what I think this does. 352 * At least that is what I think this does.
359 */ 353 */
360void 354void
361explosion (object *op) 355explosion (object *op)
362{ 356{
363 object *tmp;
364 maptile *m = op->map; 357 maptile *m = op->map;
365 int i; 358 int i;
366 359
367 if (--(op->duration) < 0) 360 if (--op->duration < 0)
368 { 361 {
369 op->destroy (); 362 op->destroy ();
370 return; 363 return;
371 } 364 }
372 365
… …
378 { 371 {
379 sint16 dx, dy; 372 sint16 dx, dy;
380 373
381 dx = op->x + freearr_x[i]; 374 dx = op->x + freearr_x[i];
382 dy = op->y + freearr_y[i]; 375 dy = op->y + freearr_y[i];
376
383 /* ok_to_put_more already does things like checks for walls, 377 /* ok_to_put_more already does things like checks for walls,
384 * out of map, etc. 378 * out of map, etc.
385 */ 379 */
386 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 380 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
387 { 381 {
388 tmp = object::create (); 382 object *tmp = op->clone ();
389 op->copy_to (tmp); 383
390 tmp->state = 0; 384 tmp->state = 0;
391 tmp->speed_left = -0.21; 385 tmp->speed_left = -0.21f;
392 tmp->range--; 386 tmp->range--;
393 tmp->value = 0; 387 tmp->value = 0;
394 tmp->x = dx; 388
395 tmp->y = dy; 389 m->insert (tmp, dx, dy, op);
396 insert_ob_in_map (tmp, m, op, 0);
397 } 390 }
398 } 391 }
399 } 392 }
400} 393}
401 394
… …
416 return; 409 return;
417 } 410 }
418 411
419 if (op->env) 412 if (op->env)
420 { 413 {
421 object *env;
422
423 env = object_get_env_recursive (op); 414 object *env = object_get_env_recursive (op);
424 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 415 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
425 { 416 {
426 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 417 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
427 op->destroy (); 418 op->destroy ();
428 return; 419 return;
429 } 420 }
430 421
431 op->remove (); 422 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 } 423 }
436 else if (out_of_map (op->map, op->x, op->y)) 424 else if (out_of_map (op->map, op->x, op->y))
437 { 425 {
438 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 426 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
439 op->destroy (); 427 op->destroy ();
… …
457 } 445 }
458 446
459 /* other_arch contains what this explodes into */ 447 /* other_arch contains what this explodes into */
460 tmp = arch_to_object (op->other_arch); 448 tmp = arch_to_object (op->other_arch);
461 449
462 copy_owner (tmp, op); 450 tmp->set_owner (op);
463 tmp->skill = op->skill; 451 tmp->skill = op->skill;
464 452
465 owner = get_owner (op); 453 owner = op->owner;
466 454
467 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 455 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
468 { 456 {
469 op->destroy (); 457 op->destroy ();
470 return; 458 return;
471 } 459 }
472
473 tmp->x = op->x;
474 tmp->y = op->y;
475 460
476 /* special for bombs - it actually has sane values for these */ 461 /* special for bombs - it actually has sane values for these */
477 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 462 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
478 { 463 {
479 tmp->attacktype = op->attacktype; 464 tmp->attacktype = op->attacktype;
… …
483 } 468 }
484 else 469 else
485 { 470 {
486 if (op->attacktype & AT_MAGIC) 471 if (op->attacktype & AT_MAGIC)
487 tmp->attacktype |= AT_MAGIC; 472 tmp->attacktype |= AT_MAGIC;
473
488 /* Spell doc describes what is going on here */ 474 /* Spell doc describes what is going on here */
489 tmp->stats.dam = op->dam_modifier; 475 tmp->stats.dam = op->dam_modifier;
490 tmp->range = op->stats.maxhp; 476 tmp->range = op->stats.maxhp;
491 tmp->duration = op->stats.hp; 477 tmp->duration = op->stats.hp;
492 /* Used for spell tracking - just need a unique val for this spell - 478 /* Used for spell tracking - just need a unique val for this spell -
… …
500 tmp->stats.sp = op->direction; 486 tmp->stats.sp = op->direction;
501 487
502 /* Prevent recursion */ 488 /* Prevent recursion */
503 op->move_on = 0; 489 op->move_on = 0;
504 490
505 insert_ob_in_map (tmp, op->map, op, 0); 491 tmp->insert_at (op, op);
506 /* remove the firebullet */ 492 /* remove the firebullet */
507 if (!op->destroyed ())
508 {
509 op->destroy (); 493 op->destroy ();
510 }
511} 494}
512
513
514 495
515/* checks to see what op should do, given the space it is on 496/* checks to see what op should do, given the space it is on
516 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
517 */ 498 */
518
519void 499void
520check_bullet (object *op) 500check_bullet (object *op)
521{ 501{
522 object *tmp; 502 object *tmp;
523 int dam, mflags; 503 int dam, mflags;
… …
538 518
539 /* If nothing alive on this space, no reason to do anything further */ 519 /* If nothing alive on this space, no reason to do anything further */
540 if (!(mflags & P_IS_ALIVE)) 520 if (!(mflags & P_IS_ALIVE))
541 return; 521 return;
542 522
543 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 523 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
544 { 524 {
545 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
546 { 526 {
547 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
548 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 528 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
… …
555 } 535 }
556 } 536 }
557 } 537 }
558} 538}
559 539
560
561/* Basically, we move 'op' one square, and if it hits something, 540/* Basically, we move 'op' one square, and if it hits something,
562 * call check_bullet. 541 * call check_bullet.
563 * This function is only applicable to bullets, but not to all 542 * This function is only applicable to bullets, but not to all
564 * fired arches (eg, bolts). 543 * fired arches (eg, bolts).
565 */ 544 */
566
567void 545void
568move_bullet (object *op) 546move_bullet (object *op)
569{ 547{
570 sint16 new_x, new_y; 548 sint16 new_x, new_y;
571 int mflags; 549 int mflags;
… …
614 op->destroy (); 592 op->destroy ();
615 593
616 return; 594 return;
617 } 595 }
618 596
619 op->remove (); 597 if (!(op = m->insert (op, new_x, new_y, op)))
620 op->x = new_x;
621 op->y = new_y;
622 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
623 return; 598 return;
624 599
625 if (reflwall (op->map, op->x, op->y, op)) 600 if (reflwall (op->map, op->x, op->y, op))
626 { 601 {
627 op->direction = absdir (op->direction + 4); 602 op->direction = absdir (op->direction + 4);
628 update_turn_face (op); 603 update_turn_face (op);
629 } 604 }
630 else 605 else
631 {
632 check_bullet (op); 606 check_bullet (op);
633 }
634} 607}
635
636
637
638 608
639/* fire_bullet 609/* fire_bullet
640 * object op (cast from caster) files a bolt in dir. 610 * object op (cast from caster) files a bolt in dir.
641 * spob is the spell object for the bolt. 611 * spob is the spell object for the bolt.
642 * we remove the magic flag - that can be derived from 612 * we remove the magic flag - that can be derived from
… …
673 643
674 tmp->direction = dir; 644 tmp->direction = dir;
675 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
676 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
677 647
678 set_owner (tmp, op); 648 tmp->set_owner (op);
679 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
680 650
681 tmp->x = op->x + freearr_x[dir]; 651 tmp->x = op->x + freearr_x[dir];
682 tmp->y = op->y + freearr_y[dir]; 652 tmp->y = op->y + freearr_y[dir];
683 tmp->map = op->map; 653 tmp->map = op->map;
684 654
655 maptile *newmap;
685 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 656 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
686 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
687 { 658 {
688 tmp->destroy (); 659 tmp->destroy ();
689 return 0; 660 return 0;
690 } 661 }
662
663 tmp->map = newmap;
691 664
692 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 665 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
693 { 666 {
694 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 667 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
695 { 668 {
… …
701 tmp->y = op->y; 674 tmp->y = op->y;
702 tmp->direction = absdir (tmp->direction + 4); 675 tmp->direction = absdir (tmp->direction + 4);
703 tmp->map = op->map; 676 tmp->map = op->map;
704 } 677 }
705 678
706 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 679 if ((tmp = tmp->insert_at (tmp, op)))
707 check_bullet (tmp); 680 check_bullet (tmp);
708 681
709 return 1; 682 return 1;
710} 683}
711
712
713
714 684
715/***************************************************************************** 685/*****************************************************************************
716 * 686 *
717 * CONE RELATED FUNCTIONS 687 * CONE RELATED FUNCTIONS
718 * 688 *
719 *****************************************************************************/ 689 *****************************************************************************/
720 690
721
722/* 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" */
723void 692void
724cone_drop (object *op) 693cone_drop (object *op)
725{ 694{
726 object *new_ob = arch_to_object (op->other_arch); 695 object *new_ob = arch_to_object (op->other_arch);
727 696
728 new_ob->x = op->x;
729 new_ob->y = op->y;
730 new_ob->level = op->level; 697 new_ob->level = op->level;
731 set_owner (new_ob, op->owner); 698 new_ob->set_owner (op->owner);
732 699
733 /* preserve skill ownership */ 700 /* preserve skill ownership */
734 if (op->skill && op->skill != new_ob->skill) 701 if (op->skill && op->skill != new_ob->skill)
735 {
736 new_ob->skill = op->skill; 702 new_ob->skill = op->skill;
737 }
738 insert_ob_in_map (new_ob, op->map, op, 0);
739 703
704 new_ob->insert_at (op, op);
740} 705}
741 706
742/* 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 */
743 708
744void 709void
… …
748 713
749 /* if no map then hit_map will crash so just ignore object */ 714 /* if no map then hit_map will crash so just ignore object */
750 if (!op->map) 715 if (!op->map)
751 { 716 {
752 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 717 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
753 op->speed = 0; 718 op->set_speed (0);
754 update_ob_speed (op);
755 return; 719 return;
756 } 720 }
757 721
758 /* lava saves it's life, but not yours :) */ 722 /* lava saves it's life, but not yours :) */
759 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 723 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
765#if 0 729#if 0
766 /* Disable this - enabling it makes monsters easier, as 730 /* Disable this - enabling it makes monsters easier, as
767 * when their cone dies when they die. 731 * when their cone dies when they die.
768 */ 732 */
769 /* If no owner left, the spell dies out. */ 733 /* If no owner left, the spell dies out. */
770 if (get_owner (op) == NULL) 734 if (op->owner == NULL)
771 { 735 {
772 op->destroy (); 736 op->destroy ();
773 return; 737 return;
774 } 738 }
775#endif 739#endif
… …
805 { 769 {
806 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 770 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
807 771
808 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 772 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
809 { 773 {
810 object *tmp = object::create (); 774 object *tmp = op->clone ();
811
812 op->copy_to (tmp);
813 tmp->x = x;
814 tmp->y = y;
815 775
816 tmp->duration = op->duration + 1; 776 tmp->duration = op->duration + 1;
817 777
818 /* Use for spell tracking - see ok_to_put_more() */ 778 /* Use for spell tracking - see ok_to_put_more() */
819 tmp->stats.maxhp = op->stats.maxhp; 779 tmp->stats.maxhp = op->stats.maxhp;
820 insert_ob_in_map (tmp, op->map, op, 0); 780
781 op->map->insert (tmp, x, y, op);
782
821 if (tmp->other_arch) 783 if (tmp->other_arch)
822 cone_drop (tmp); 784 cone_drop (tmp);
823 } 785 }
824 } 786 }
825} 787}
… …
901 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 863 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
902 continue; 864 continue;
903 865
904 success = 1; 866 success = 1;
905 tmp = arch_to_object (spell->other_arch); 867 tmp = arch_to_object (spell->other_arch);
906 set_owner (tmp, op); 868 tmp->set_owner (op);
907 set_spell_skill (op, caster, spell, tmp); 869 set_spell_skill (op, caster, spell, tmp);
908 tmp->level = caster_level (caster, spell); 870 tmp->level = caster_level (caster, spell);
909 tmp->x = sx;
910 tmp->y = sy;
911 tmp->attacktype = spell->attacktype; 871 tmp->attacktype = spell->attacktype;
912 872
913 /* holy word stuff */ 873 /* holy word stuff */
914 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 874 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
915 if (!tailor_god_spell (tmp, op)) 875 if (!tailor_god_spell (tmp, op))
… …
952 912
953 if (!(tmp->move_type & MOVE_FLY_LOW)) 913 if (!(tmp->move_type & MOVE_FLY_LOW))
954 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 914 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
955 915
956 if (!tmp->move_on && tmp->stats.dam) 916 if (!tmp->move_on && tmp->stats.dam)
957 {
958 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 917 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
959 }
960 918
961 insert_ob_in_map (tmp, m, op, 0); 919 m->insert (tmp, sx, sy, op);
962 920
963 /* This is used for tracking spells so that one effect doesn't hit 921 /* This is used for tracking spells so that one effect doesn't hit
964 * a single space too many times. 922 * a single space too many times.
965 */ 923 */
966 tmp->stats.maxhp = tmp->count; 924 tmp->stats.maxhp = tmp->count;
… …
985void 943void
986animate_bomb (object *op) 944animate_bomb (object *op)
987{ 945{
988 int i; 946 int i;
989 object *env, *tmp; 947 object *env, *tmp;
990 archetype *at;
991 948
992 if (op->state != NUM_ANIMATIONS (op) - 1) 949 if (op->state != NUM_ANIMATIONS (op) - 1)
993 return; 950 return;
994 951
995 env = object_get_env_recursive (op); 952 env = object_get_env_recursive (op);
… …
1000 return; 957 return;
1001 958
1002 if (env->type == PLAYER) 959 if (env->type == PLAYER)
1003 esrv_del_item (env->contr, op->count); 960 esrv_del_item (env->contr, op->count);
1004 961
1005 op->remove (); 962 if (!(op = op->insert_at (env, op)))
1006 op->x = env->x;
1007 op->y = env->y;
1008 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1009 return; 963 return;
1010 } 964 }
1011 965
1012 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 966 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1013 // on a safe map. I don't like this special casing, but it seems to be neccessary 967 // on a safe map. I don't like this special casing, but it seems to be neccessary
… …
1020 974
1021 /* This copies a lot of the code from the fire bullet, 975 /* This copies a lot of the code from the fire bullet,
1022 * but using the cast_bullet isn't really feasible, 976 * but using the cast_bullet isn't really feasible,
1023 * so just set up the appropriate values. 977 * so just set up the appropriate values.
1024 */ 978 */
1025 at = archetype::find (SPLINT); 979 if (archetype *at = archetype::find (SPLINT))
1026 if (at)
1027 { 980 {
1028 for (i = 1; i < 9; i++) 981 for (i = 1; i < 9; i++)
1029 { 982 {
1030 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 983 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1031 continue; 984 continue;
985
1032 tmp = arch_to_object (at); 986 tmp = arch_to_object (at);
1033 tmp->direction = i; 987 tmp->direction = i;
1034 tmp->range = op->range; 988 tmp->range = op->range;
1035 tmp->stats.dam = op->stats.dam; 989 tmp->stats.dam = op->stats.dam;
1036 tmp->duration = op->duration; 990 tmp->duration = op->duration;
1037 tmp->attacktype = op->attacktype; 991 tmp->attacktype = op->attacktype;
1038 copy_owner (tmp, op); 992 tmp->set_owner (op);
1039 if (op->skill && op->skill != tmp->skill) 993 if (op->skill && op->skill != tmp->skill)
1040 {
1041 tmp->skill = op->skill; 994 tmp->skill = op->skill;
1042 } 995
1043 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 996 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1044 SET_ANIMATION (tmp, i); 997 SET_ANIMATION (tmp, i);
1045 tmp->x = op->x + freearr_x[i]; 998
1046 tmp->y = op->y + freearr_x[i]; 999 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1047 insert_ob_in_map (tmp, op->map, op, 0);
1048 move_bullet (tmp); 1000 move_bullet (tmp);
1049 } 1001 }
1050 } 1002 }
1051 1003
1052 explode_bullet (op); 1004 explode_bullet (op);
… …
1073 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1025 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1074 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);
1075 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1027 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1076 tmp->attacktype = spell->attacktype; 1028 tmp->attacktype = spell->attacktype;
1077 1029
1078 set_owner (tmp, op); 1030 tmp->set_owner (op);
1079 set_spell_skill (op, caster, spell, tmp); 1031 set_spell_skill (op, caster, spell, tmp);
1080 tmp->x = dx; 1032
1081 tmp->y = dy; 1033 m->insert (tmp, dx, dy, op);
1082 insert_ob_in_map (tmp, m, op, 0);
1083 return 1; 1034 return 1;
1084} 1035}
1085 1036
1086/**************************************************************************** 1037/****************************************************************************
1087 * 1038 *
… …
1126 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1077 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1127 return NULL; 1078 return NULL;
1128 1079
1129 if (mflags & P_IS_ALIVE) 1080 if (mflags & P_IS_ALIVE)
1130 { 1081 {
1131 for (target = get_map_ob (mp, x, y); target; target = target->above) 1082 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1132 { 1083 {
1133 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1084 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1134 { 1085 {
1135 return target; 1086 return target;
1136 } 1087 }
… …
1203 if (effect->attacktype & AT_DEATH) 1154 if (effect->attacktype & AT_DEATH)
1204 { 1155 {
1205 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1156 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1206 1157
1207 /* casting death spells at undead isn't a good thing */ 1158 /* casting death spells at undead isn't a good thing */
1208 if QUERY_FLAG
1209 (target, FLAG_UNDEAD) 1159 if (QUERY_FLAG (target, FLAG_UNDEAD))
1210 { 1160 {
1211 if (random_roll (0, 2, op, PREFER_LOW)) 1161 if (random_roll (0, 2, op, PREFER_LOW))
1212 { 1162 {
1213 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1163 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1214 effect->x = op->x; 1164 effect->x = op->x;
… …
1227 { 1177 {
1228 /* how much woe to inflict :) */ 1178 /* how much woe to inflict :) */
1229 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1179 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1230 } 1180 }
1231 1181
1232 set_owner (effect, op); 1182 effect->set_owner (op);
1233 set_spell_skill (op, caster, spell, effect); 1183 set_spell_skill (op, caster, spell, effect);
1234 1184
1235 /* ok, tell it where to be, and insert! */ 1185 /* ok, tell it where to be, and insert! */
1236 effect->x = target->x; 1186 effect->insert_at (target, op);
1237 effect->y = target->y;
1238 insert_ob_in_map (effect, target->map, op, 0);
1239 1187
1240 return 1; 1188 return 1;
1241} 1189}
1242 1190
1243 1191
… …
1261 { 1209 {
1262 op->destroy (); 1210 op->destroy ();
1263 return; 1211 return;
1264 } 1212 }
1265 1213
1266 owner = get_owner (op); 1214 owner = op->owner;
1267#if 0 1215#if 0
1268 /* It'd make things nastier if this wasn't here - spells cast by 1216 /* It'd make things nastier if this wasn't here - spells cast by
1269 * monster that are then killed would continue to survive 1217 * monster that are then killed would continue to survive
1270 */ 1218 */
1271 if (owner == NULL) 1219 if (owner == NULL)
… …
1298 { 1246 {
1299 op->destroy (); 1247 op->destroy ();
1300 return; 1248 return;
1301 } 1249 }
1302 1250
1303 op->x = new_x; 1251 i = spell_find_dir (m, new_x, new_y, op->owner);
1304 op->y = new_y;
1305 op->map = m;
1306 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1307 if (i > 0 && i != op->direction) 1252 if (i > 0 && i != op->direction)
1308 { 1253 {
1309 op->direction = i; 1254 op->direction = i;
1310 SET_ANIMATION (op, op->direction); 1255 SET_ANIMATION (op, op->direction);
1311 } 1256 }
1312 1257
1313 insert_ob_in_map (op, op->map, op, 0); 1258 m->insert (op, new_x, new_y, op);
1314} 1259}
1315 1260
1316/**************************************************************************** 1261/****************************************************************************
1317 * Destruction 1262 * Destruction
1318 ****************************************************************************/ 1263 ****************************************************************************/
… …
1354 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name); 1299 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1355 return 0; 1300 return 0;
1356 } 1301 }
1357 return 1; 1302 return 1;
1358} 1303}
1359
1360
1361
1362 1304
1363int 1305int
1364cast_destruction (object *op, object *caster, object *spell_ob) 1306cast_destruction (object *op, object *caster, object *spell_ob)
1365{ 1307{
1366 int i, j, range, mflags, friendly = 0, dam, dur; 1308 int i, j, range, mflags, friendly = 0, dam, dur;
… …
1387 else if (caster->skill) 1329 else if (caster->skill)
1388 op->skill = caster->skill; 1330 op->skill = caster->skill;
1389 else 1331 else
1390 op->skill = NULL; 1332 op->skill = NULL;
1391 1333
1392 change_skill (op, find_skill_by_name (op, op->skill), 1); 1334 op->change_skill (find_skill_by_name (op, op->skill));
1393 1335
1394 for (i = -range; i < range; i++) 1336 for (i = -range; i < range; i++)
1395 { 1337 {
1396 for (j = -range; j < range; j++) 1338 for (j = -range; j < range; j++)
1397 { 1339 {
1398 m = op->map; 1340 m = op->map;
1399 sx = op->x + i; 1341 sx = op->x + i;
1400 sy = op->y + j; 1342 sy = op->y + j;
1343
1401 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1344 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1402 if (mflags & P_OUT_OF_MAP) 1345 if (mflags & P_OUT_OF_MAP)
1403 continue; 1346 continue;
1347
1404 if (mflags & P_IS_ALIVE) 1348 if (mflags & P_IS_ALIVE)
1405 { 1349 {
1406 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1350 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1407 {
1408 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1351 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1409 break; 1352 break;
1410 } 1353
1411 if (tmp) 1354 if (tmp)
1412 { 1355 {
1413 if (tmp->head) 1356 if (tmp->head)
1414 tmp = tmp->head; 1357 tmp = tmp->head;
1415 1358
… …
1418 { 1361 {
1419 if (spell_ob->subtype == SP_DESTRUCTION) 1362 if (spell_ob->subtype == SP_DESTRUCTION)
1420 { 1363 {
1421 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1364 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1422 if (spell_ob->other_arch) 1365 if (spell_ob->other_arch)
1423 {
1424 tmp = arch_to_object (spell_ob->other_arch); 1366 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1425 tmp->x = sx;
1426 tmp->y = sy;
1427 insert_ob_in_map (tmp, m, op, 0);
1428 }
1429 } 1367 }
1430 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1368 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1431 { 1369 {
1432 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1370 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1433 {
1434 object *effect = arch_to_object (spell_ob->other_arch); 1371 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1435
1436 effect->x = sx;
1437 effect->y = sy;
1438 insert_ob_in_map (effect, m, op, 0);
1439 }
1440 } 1372 }
1441 } 1373 }
1442 } 1374 }
1443 } 1375 }
1444 } 1376 }
1445 } 1377 }
1378
1446 op->skill = skill; 1379 op->skill = skill;
1447 return 1; 1380 return 1;
1448} 1381}
1449 1382
1450/*************************************************************************** 1383/***************************************************************************
… …
1510 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1443 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1511 } 1444 }
1512 return 1; 1445 return 1;
1513 } 1446 }
1514 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1447 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1515 force->speed = 1.0; 1448 force->speed = 1.f;
1516 force->speed_left = -1.0; 1449 force->speed_left = -1.f;
1517 SET_FLAG (force, FLAG_APPLIED); 1450 SET_FLAG (force, FLAG_APPLIED);
1518 1451
1519 if (god) 1452 if (god)
1520 { 1453 {
1521 if (spell_ob->last_grace) 1454 if (spell_ob->last_grace)
… …
1534 force->stats.ac = spell_ob->stats.ac; 1467 force->stats.ac = spell_ob->stats.ac;
1535 force->stats.wc = spell_ob->stats.wc; 1468 force->stats.wc = spell_ob->stats.wc;
1536 1469
1537 change_abil (tmp, force); /* Mostly to display any messages */ 1470 change_abil (tmp, force); /* Mostly to display any messages */
1538 insert_ob_in_ob (force, tmp); 1471 insert_ob_in_ob (force, tmp);
1539 fix_player (tmp); 1472 tmp->update_stats ();
1540 return 1; 1473 return 1;
1541 1474
1542} 1475}
1543
1544 1476
1545/********************************************************************** 1477/**********************************************************************
1546 * mood change 1478 * mood change
1547 * Arguably, this may or may not be an attack spell. But since it 1479 * Arguably, this may or may not be an attack spell. But since it
1548 * effects monsters, it seems best to put it into this file 1480 * effects monsters, it seems best to put it into this file
… …
1578 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1510 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1579 race = god->race; 1511 race = god->race;
1580 else 1512 else
1581 race = spell->race; 1513 race = spell->race;
1582 1514
1583
1584 for (x = op->x - range; x <= op->x + range; x++) 1515 for (x = op->x - range; x <= op->x + range; x++)
1585 for (y = op->y - range; y <= op->y + range; y++) 1516 for (y = op->y - range; y <= op->y + range; y++)
1586 { 1517 {
1587
1588 done_one = 0; 1518 done_one = 0;
1589 m = op->map; 1519 m = op->map;
1590 nx = x; 1520 nx = x;
1591 ny = y; 1521 ny = y;
1592 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1522 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1595 1525
1596 /* If there is nothing living on this space, no need to go further */ 1526 /* If there is nothing living on this space, no need to go further */
1597 if (!(mflags & P_IS_ALIVE)) 1527 if (!(mflags & P_IS_ALIVE))
1598 continue; 1528 continue;
1599 1529
1530 // players can only affect spaces that they can actually see
1531 if (caster && caster->contr
1532 && caster->contr->visibility_at (m, nx, ny) < 70)
1533 continue;
1534
1600 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1535 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1601 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1536 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1602 break; 1537 break;
1603 1538
1604 /* There can be living objects that are not monsters */ 1539 /* There can be living objects that are not monsters */
1605 if (!tmp || tmp->type == PLAYER) 1540 if (!tmp || tmp->type == PLAYER)
… …
1612 head = tmp; 1547 head = tmp;
1613 1548
1614 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1549 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1615 if (race && head->race && !strstr (race, head->race)) 1550 if (race && head->race && !strstr (race, head->race))
1616 continue; 1551 continue;
1552
1617 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1553 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1618 continue; 1554 continue;
1619 1555
1620 /* Now do a bunch of stuff related to saving throws */ 1556 /* Now do a bunch of stuff related to saving throws */
1621 best_at = -1; 1557 best_at = -1;
… …
1638 at -= level / 5; 1574 at -= level / 5;
1639 if (did_make_save (head, head->level, at)) 1575 if (did_make_save (head, head->level, at))
1640 continue; 1576 continue;
1641 } 1577 }
1642 else /* spell->attacktype */ 1578 else /* spell->attacktype */
1643 /*
1644 Spell has no attacktype (charm & such), so we'll have a specific saving:
1645 * if spell level < monster level, no go
1646 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1647
1648 The chance will then be in the range [20-70] percent, not too bad.
1649
1650 This is required to fix the 'charm monster' abuse, where a player level 1 can
1651 charm a level 125 monster...
1652
1653 Ryo, august 14th
1654 */
1655 { 1579 {
1580 /*
1581 Spell has no attacktype (charm & such), so we'll have a specific saving:
1582 * if spell level < monster level, no go
1583 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1584
1585 The chance will then be in the range [20-70] percent, not too bad.
1586
1587 This is required to fix the 'charm monster' abuse, where a player level 1 can
1588 charm a level 125 monster...
1589
1590 Ryo, august 14th
1591 */
1656 if (head->level > level) 1592 if (head->level > level)
1657 continue; 1593 continue;
1594
1658 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1595 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1659 /* Failed, no effect */ 1596 /* Failed, no effect */
1660 continue; 1597 continue;
1661 } 1598 }
1662 1599
1663 /* Done with saving throw. Now start effecting the monster */ 1600 /* Done with saving throw. Now start affecting the monster */
1664 1601
1665 /* aggravation */ 1602 /* aggravation */
1666 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1603 if (QUERY_FLAG (spell, FLAG_MONSTER))
1667 { 1604 {
1668 CLEAR_FLAG (head, FLAG_SLEEP); 1605 CLEAR_FLAG (head, FLAG_SLEEP);
1669 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1670 remove_friendly_object (head); 1606 remove_friendly_object (head);
1671
1672 done_one = 1; 1607 done_one = 1;
1673 head->enemy = op; 1608 head->enemy = op;
1674 } 1609 }
1675 1610
1676 /* calm monsters */ 1611 /* calm monsters */
… …
1685 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1620 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1686 { 1621 {
1687 SET_FLAG (head, FLAG_BERSERK); 1622 SET_FLAG (head, FLAG_BERSERK);
1688 done_one = 1; 1623 done_one = 1;
1689 } 1624 }
1625
1690 /* charm */ 1626 /* charm */
1691 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1627 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1692 { 1628 {
1693 SET_FLAG (head, FLAG_FRIENDLY);
1694 /* Prevent uncontolled outbreaks of self replicating monsters. 1629 /* Prevent uncontolled outbreaks of self replicating monsters.
1695 Typical use case is charm, go somwhere, use aggravation to make hostile. 1630 Typical use case is charm, go somwhere, use aggravation to make hostile.
1696 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1631 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1697 CLEAR_FLAG (head, FLAG_GENERATOR); 1632 CLEAR_FLAG (head, FLAG_GENERATOR);
1698 set_owner (head, op); 1633 head->set_owner (op);
1699 set_spell_skill (op, caster, spell, head); 1634 set_spell_skill (op, caster, spell, head);
1700 add_friendly_object (head); 1635 add_friendly_object (head);
1701 head->attack_movement = PETMOVE; 1636 head->attack_movement = PETMOVE;
1702 done_one = 1; 1637 done_one = 1;
1703 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1638 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1704 head->stats.exp = 0; 1639 head->stats.exp = 0;
1705 } 1640 }
1706 1641
1707 /* If a monster was effected, put an effect in */ 1642 /* If a monster was effected, put an effect in */
1708 if (done_one && spell->other_arch) 1643 if (done_one && spell->other_arch)
1709 {
1710 tmp = arch_to_object (spell->other_arch); 1644 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1711 tmp->x = nx;
1712 tmp->y = ny;
1713 insert_ob_in_map (tmp, m, op, 0);
1714 }
1715 } /* for y */ 1645 } /* for y */
1716 1646
1717 return 1; 1647 return 1;
1718} 1648}
1719 1649
… …
1731 int i, j, dam_save, dir, mflags; 1661 int i, j, dam_save, dir, mflags;
1732 sint16 nx, ny, hx, hy; 1662 sint16 nx, ny, hx, hy;
1733 object *owner; 1663 object *owner;
1734 maptile *m; 1664 maptile *m;
1735 1665
1736 owner = get_owner (op); 1666 owner = op->owner;
1737 1667
1738 /* the following logic makes sure that the ball doesn't move into a wall, 1668 /* the following logic makes sure that the ball doesn't move into a wall,
1739 * and makes sure that it will move along a wall to try and get at it's 1669 * and makes sure that it will move along a wall to try and get at it's
1740 * victim. The block immediately below more or less chooses a random 1670 * victim. The block immediately below more or less chooses a random
1741 * offset to move the ball, eg, keep it mostly on course, with some 1671 * offset to move the ball, eg, keep it mostly on course, with some
… …
1770 nx = op->x; 1700 nx = op->x;
1771 ny = op->y; 1701 ny = op->y;
1772 m = op->map; 1702 m = op->map;
1773 } 1703 }
1774 1704
1775 op->remove (); 1705 m->insert (op, nx, ny, op);
1776 op->y = ny;
1777 op->x = nx;
1778 insert_ob_in_map (op, m, op, 0);
1779 1706
1780 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1707 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1781 surrounding squares */ 1708 surrounding squares */
1782 1709
1783 /* loop over current square and neighbors to hit. 1710 /* loop over current square and neighbors to hit.
1784 * if this has an other_arch field, we insert that in 1711 * if this has an other_arch field, we insert that in
1785 * the surround spaces. 1712 * the surround spaces.
1786 */ 1713 */
1787 for (j = 0; j < 9; j++) 1714 for (j = 0; j < 9; j++)
1788 { 1715 {
1789 object *new_ob;
1790
1791 hx = nx + freearr_x[j]; 1716 hx = nx + freearr_x[j];
1792 hy = ny + freearr_y[j]; 1717 hy = ny + freearr_y[j];
1793 1718
1794 m = op->map; 1719 m = op->map;
1795 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1720 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1809 1734
1810 } 1735 }
1811 1736
1812 /* insert the other arch */ 1737 /* insert the other arch */
1813 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1738 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1814 { 1739 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1815 new_ob = arch_to_object (op->other_arch);
1816 new_ob->x = hx;
1817 new_ob->y = hy;
1818 insert_ob_in_map (new_ob, m, op, 0);
1819 }
1820 } 1740 }
1821 1741
1822 /* restore to the center location and damage */ 1742 /* restore to the center location and damage */
1823 op->stats.dam = dam_save; 1743 op->stats.dam = dam_save;
1824 1744
1825 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1745 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1826 1746
1827 if (i >= 0) 1747 if (i >= 0)
1828 { /* we have a preferred direction! */ 1748 { /* we have a preferred direction! */
1829 /* pick another direction if the preferred dir is blocked. */ 1749 /* pick another direction if the preferred dir is blocked. */
1830 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1750 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1831 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1751 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1832 {
1833 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1752 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1834 } 1753
1835 op->direction = i; 1754 op->direction = i;
1836 } 1755 }
1837} 1756}
1838 1757
1839 1758
… …
1856 maptile *m; 1775 maptile *m;
1857#endif 1776#endif
1858 int basedir; 1777 int basedir;
1859 object *owner; 1778 object *owner;
1860 1779
1861 owner = get_owner (op); 1780 owner = op->owner;
1862 if (op->duration == 0 || owner == NULL) 1781 if (op->duration == 0 || owner == NULL)
1863 { 1782 {
1864 op->destroy (); 1783 op->destroy ();
1865 return; 1784 return;
1866 } 1785 }
… …
1877#if 0 1796#if 0
1878 // this is bogus: it causes wrong places to be checked below 1797 // this is bogus: it causes wrong places to be checked below
1879 // (a wall 2 cells away will block the effect...) and 1798 // (a wall 2 cells away will block the effect...) and
1880 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1799 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1881 // space. 1800 // space.
1882 // should be fixed later, but correctness before featurs... 1801 // should be fixed later, but correctness before features...
1883 // (schmorp) 1802 // (schmorp)
1884 1803
1885 /* new offset calculation to make swarm element distribution 1804 /* new offset calculation to make swarm element distribution
1886 * more uniform 1805 * more uniform
1887 */ 1806 */
… …
1969 1888
1970 if (!spell->other_arch) 1889 if (!spell->other_arch)
1971 return 0; 1890 return 0;
1972 1891
1973 tmp = get_archetype (SWARM_SPELL); 1892 tmp = get_archetype (SWARM_SPELL);
1974 tmp->x = op->x;
1975 tmp->y = op->y;
1976 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1893 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1977 set_spell_skill (op, caster, spell, tmp); 1894 set_spell_skill (op, caster, spell, tmp);
1978 1895
1979 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1896 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
1980 tmp->spell = arch_to_object (spell->other_arch); 1897 tmp->spell = arch_to_object (spell->other_arch);
1981 1898
1982 tmp->attacktype = tmp->spell->attacktype; 1899 tmp->attacktype = tmp->spell->attacktype;
1983 1900
1984 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1901 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1985 {
1986 if (!tailor_god_spell (tmp, op)) 1902 if (!tailor_god_spell (tmp, op))
1987 return 1; 1903 return 1;
1988 } 1904
1989 tmp->duration = SP_level_duration_adjust (caster, spell); 1905 tmp->duration = SP_level_duration_adjust (caster, spell);
1990 for (i = 0; i < spell->duration; i++) 1906 for (i = 0; i < spell->duration; i++)
1991 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1907 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1992 1908
1993 tmp->direction = dir; 1909 tmp->direction = dir;
1994 tmp->invisible = 1; 1910 tmp->invisible = 1;
1995 insert_ob_in_map (tmp, op->map, op, 0); 1911
1912 tmp->insert_at (op, op);
1996 return 1; 1913 return 1;
1997} 1914}
1998 1915
1999 1916
2000/* See the spells documentation file for why this is its own 1917/* See the spells documentation file for why this is its own
… …
2028 return 0; 1945 return 0;
2029 } 1946 }
2030 1947
2031 if (mflags & P_IS_ALIVE && spell->attacktype) 1948 if (mflags & P_IS_ALIVE && spell->attacktype)
2032 { 1949 {
2033 for (target = get_map_ob (m, x, y); target; target = target->above) 1950 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2034 if (QUERY_FLAG (target, FLAG_MONSTER)) 1951 if (QUERY_FLAG (target, FLAG_MONSTER))
2035 { 1952 {
2036 /* oky doky. got a target monster. Lets make a blinding attack */ 1953 /* oky doky. got a target monster. Lets make a blinding attack */
2037 if (target->head) 1954 if (target->head)
2038 target = target->head; 1955 target = target->head;
… …
2060 { 1977 {
2061 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1978 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2062 if (tmp->glow_radius > MAX_LIGHT_RADII) 1979 if (tmp->glow_radius > MAX_LIGHT_RADII)
2063 tmp->glow_radius = MAX_LIGHT_RADII; 1980 tmp->glow_radius = MAX_LIGHT_RADII;
2064 } 1981 }
2065 tmp->x = x; 1982
2066 tmp->y = y; 1983 m->insert (tmp, x, y, op);
2067 insert_ob_in_map (tmp, m, op, 0);
2068 return 1; 1984 return 1;
2069} 1985}
2070 1986
2071 1987
2072 1988
… …
2120 2036
2121 /* Only bother looking on this space if there is something living here */ 2037 /* Only bother looking on this space if there is something living here */
2122 if (mflags & P_IS_ALIVE) 2038 if (mflags & P_IS_ALIVE)
2123 { 2039 {
2124 /* search this square for a victim */ 2040 /* search this square for a victim */
2125 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2041 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2126 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2042 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2127 { /* found a victim */ 2043 { /* found a victim */
2128 object *disease = arch_to_object (spell->other_arch); 2044 object *disease = arch_to_object (spell->other_arch);
2129 2045
2130 set_owner (disease, op); 2046 disease->set_owner (op);
2131 set_spell_skill (op, caster, spell, disease); 2047 set_spell_skill (op, caster, spell, disease);
2132 disease->stats.exp = 0; 2048 disease->stats.exp = 0;
2133 disease->level = caster_level (caster, spell); 2049 disease->level = caster_level (caster, spell);
2134 2050
2135 /* do level adjustments */ 2051 /* do level adjustments */
… …
2180 if (disease->stats.sp) 2096 if (disease->stats.sp)
2181 disease->stats.sp -= dam_mod; 2097 disease->stats.sp -= dam_mod;
2182 2098
2183 if (infect_object (walk, disease, 1)) 2099 if (infect_object (walk, disease, 1))
2184 { 2100 {
2185 object *flash; /* visual effect for inflicting disease */
2186
2187 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2101 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2188 2102
2189 disease->destroy (); /* don't need this one anymore */ 2103 disease->destroy (); /* don't need this one anymore */
2190 flash = get_archetype (ARCH_DETECT_MAGIC); 2104 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2191 flash->x = x;
2192 flash->y = y;
2193 flash->map = walk->map;
2194 insert_ob_in_map (flash, walk->map, op, 0);
2195 return 1; 2105 return 1;
2196 } 2106 }
2197 2107
2198 disease->destroy (); 2108 disease->destroy ();
2199 } 2109 }
2200 } /* if living creature */ 2110 } /* if living creature */
2201 } /* for range of spaces */ 2111 } /* for range of spaces */
2112
2202 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2113 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2203 return 1; 2114 return 1;
2204} 2115}

Diff Legend

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