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.24 by root, Tue Dec 26 08:55:00 2006 UTC vs.
Revision 1.51 by root, Sun Apr 20 23:25:43 2008 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 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
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your 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 GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* This file contains all the spell attack code. Grouping this code 24/* This file contains all the spell attack code. Grouping this code
25 * together should hopefully make it easier to find the relevent bits 25 * together should hopefully make it easier to find the relevent bits
26 * of code 26 * of code
27 */ 27 */
… …
144 144
145 /* reduce chances of subsequent forking */ 145 /* reduce chances of subsequent forking */
146 new_bolt->stats.Dex -= 10; 146 new_bolt->stats.Dex -= 10;
147 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 147 tmp->stats.Dex -= 10; /* less forks from main bolt too */
148 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 148 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
149 new_bolt->speed_left = -0.1; 149 new_bolt->speed_left = -0.1f;
150 new_bolt->direction = t_dir; 150 new_bolt->direction = t_dir;
151 new_bolt->duration++; 151 new_bolt->duration++;
152 new_bolt->x = sx;
153 new_bolt->y = sy;
154 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 152 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
155 new_bolt->stats.dam++; 153 new_bolt->stats.dam++;
156 tmp->stats.dam /= 2; /* reduce father bolt damage */ 154 tmp->stats.dam /= 2; /* reduce father bolt damage */
157 tmp->stats.dam++; 155 tmp->stats.dam++;
158 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 156 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
159 update_turn_face (new_bolt); 157 update_turn_face (new_bolt);
160} 158}
161 159
162/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 160/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
163 * and checks for various things that may stop it. 161 * and checks for various things that may stop it.
164 */ 162 */
165 163
166void 164void
167move_bolt (object *op) 165move_bolt (object *op)
168{ 166{
169 object *tmp;
170 int mflags; 167 int mflags;
171 sint16 x, y; 168 sint16 x, y;
172 maptile *m; 169 maptile *m;
173 170
174 if (--(op->duration) < 0) 171 if (--op->duration < 0)
175 { 172 {
176 op->destroy (); 173 op->destroy ();
177 return; 174 return;
178 } 175 }
179 176
… …
181 178
182 if (!op->direction) 179 if (!op->direction)
183 return; 180 return;
184 181
185 if (--op->range < 0) 182 if (--op->range < 0)
186 {
187 op->range = 0; 183 op->range = 0;
188 }
189 else 184 else
190 { 185 {
191 x = op->x + DIRX (op); 186 x = op->x + DIRX (op);
192 y = op->y + DIRY (op); 187 y = op->y + DIRY (op);
193 m = op->map; 188 m = op->map;
… …
201 * on the space. So only call reflwall if we think the data it returns 196 * on the space. So only call reflwall if we think the data it returns
202 * will be useful. 197 * will be useful.
203 */ 198 */
204 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 199 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
205 { 200 {
206
207 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 201 if (!QUERY_FLAG (op, FLAG_REFLECTING))
208 return; 202 return;
209 203
210 /* Since walls don't run diagonal, if the bolt is in 204 /* Since walls don't run diagonal, if the bolt is in
211 * one of 4 main directions, it just reflects back in the 205 * one of 4 main directions, it just reflects back in the
… …
241 else if (left) 235 else if (left)
242 op->direction = absdir (op->direction + 2); 236 op->direction = absdir (op->direction + 2);
243 else if (right) 237 else if (right)
244 op->direction = absdir (op->direction - 2); 238 op->direction = absdir (op->direction - 2);
245 } 239 }
240
246 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 241 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
247 return; 242 return;
248 } 243 }
249 else 244 else
250 { /* Create a copy of this object and put it ahead */ 245 { /* Create a copy of this object and put it ahead */
251 tmp = op->clone (); 246 object *tmp = op->clone ();
252 247
248 m->insert (tmp, x, y, op);
253 tmp->speed_left = -0.1; 249 tmp->speed_left = -0.1f;
254 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
255 tmp = insert_ob_in_map (tmp, op->map, op, 0);
256 /* To make up for the decrease at the top of the function */ 250 /* To make up for the decrease at the top of the function */
257 tmp->duration++; 251 tmp->duration++;
258 252
259 /* New forking code. Possibly create forks of this object 253 /* New forking code. Possibly create forks of this object
260 * going off in other directions. 254 * going off in other directions.
261 */ 255 */
262
263 if (rndm (0, 99) < tmp->stats.Dex) 256 if (rndm (0, 99) < tmp->stats.Dex)
264 { /* stats.Dex % of forking */ 257 { /* stats.Dex % of forking */
265 forklightning (op, tmp); 258 forklightning (op, tmp);
266 } 259 }
260
267 /* In this way, the object left behind sticks on the space, but 261 /* In this way, the object left behind sticks on the space, but
268 * doesn't create any bolts that continue to move onward. 262 * doesn't create any bolts that continue to move onward.
269 */ 263 */
270 op->range = 0; 264 op->range = 0;
271 } /* copy object and move it along */ 265 } /* copy object and move it along */
… …
336 tmp->y = op->y; 330 tmp->y = op->y;
337 tmp->direction = absdir (tmp->direction + 4); 331 tmp->direction = absdir (tmp->direction + 4);
338 tmp->map = op->map; 332 tmp->map = op->map;
339 } 333 }
340 334
341 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 335 if ((tmp = tmp->insert_at (tmp, op)))
342 move_bolt (tmp); 336 move_bolt (tmp);
343 337
344 return 1; 338 return 1;
345} 339}
346
347
348 340
349/*************************************************************************** 341/***************************************************************************
350 * 342 *
351 * BULLET/BALL CODE 343 * BULLET/BALL CODE
352 * 344 *
353 ***************************************************************************/ 345 ***************************************************************************/
354 346
355/* expands an explosion. op is a piece of the 347/* expands an explosion. op is a piece of the
356 * explosion - this expans it in the different directions. 348 * explosion - this expands it in the different directions.
357 * At least that is what I think this does. 349 * At least that is what I think this does.
358 */ 350 */
359void 351void
360explosion (object *op) 352explosion (object *op)
361{ 353{
362 object *tmp;
363 maptile *m = op->map; 354 maptile *m = op->map;
364 int i; 355 int i;
365 356
366 if (--(op->duration) < 0) 357 if (--op->duration < 0)
367 { 358 {
368 op->destroy (); 359 op->destroy ();
369 return; 360 return;
370 } 361 }
371 362
… …
377 { 368 {
378 sint16 dx, dy; 369 sint16 dx, dy;
379 370
380 dx = op->x + freearr_x[i]; 371 dx = op->x + freearr_x[i];
381 dy = op->y + freearr_y[i]; 372 dy = op->y + freearr_y[i];
373
382 /* ok_to_put_more already does things like checks for walls, 374 /* ok_to_put_more already does things like checks for walls,
383 * out of map, etc. 375 * out of map, etc.
384 */ 376 */
385 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 377 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
386 { 378 {
387 tmp = op->clone (); 379 object *tmp = op->clone ();
380
388 tmp->state = 0; 381 tmp->state = 0;
389 tmp->speed_left = -0.21; 382 tmp->speed_left = -0.21f;
390 tmp->range--; 383 tmp->range--;
391 tmp->value = 0; 384 tmp->value = 0;
392 tmp->x = dx; 385
393 tmp->y = dy; 386 m->insert (tmp, dx, dy, op);
394 insert_ob_in_map (tmp, m, op, 0);
395 } 387 }
396 } 388 }
397 } 389 }
398} 390}
399
400 391
401/* Causes an object to explode, eg, a firebullet, 392/* Causes an object to explode, eg, a firebullet,
402 * poison cloud ball, etc. op is the object to 393 * poison cloud ball, etc. op is the object to
403 * explode. 394 * explode.
404 */ 395 */
… …
414 return; 405 return;
415 } 406 }
416 407
417 if (op->env) 408 if (op->env)
418 { 409 {
419 object *env; 410 object *env = op->outer_env ();
420 411
421 env = object_get_env_recursive (op);
422 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 412 if (!env->map || out_of_map (env->map, env->x, env->y))
423 { 413 {
424 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 414 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
425 op->destroy (); 415 op->destroy ();
426 return; 416 return;
427 } 417 }
428 418
429 op->remove (); 419 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
430 op->x = env->x;
431 op->y = env->y;
432 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
433 } 420 }
434 else if (out_of_map (op->map, op->x, op->y)) 421 else if (out_of_map (op->map, op->x, op->y))
435 { 422 {
436 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 423 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
437 op->destroy (); 424 op->destroy ();
… …
466 { 453 {
467 op->destroy (); 454 op->destroy ();
468 return; 455 return;
469 } 456 }
470 457
471 tmp->x = op->x;
472 tmp->y = op->y;
473
474 /* special for bombs - it actually has sane values for these */ 458 /* special for bombs - it actually has sane values for these */
475 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 459 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
476 { 460 {
477 tmp->attacktype = op->attacktype; 461 tmp->attacktype = op->attacktype;
478 tmp->range = op->range; 462 tmp->range = op->range;
… …
481 } 465 }
482 else 466 else
483 { 467 {
484 if (op->attacktype & AT_MAGIC) 468 if (op->attacktype & AT_MAGIC)
485 tmp->attacktype |= AT_MAGIC; 469 tmp->attacktype |= AT_MAGIC;
470
486 /* Spell doc describes what is going on here */ 471 /* Spell doc describes what is going on here */
487 tmp->stats.dam = op->dam_modifier; 472 tmp->stats.dam = op->dam_modifier;
488 tmp->range = op->stats.maxhp; 473 tmp->range = op->stats.maxhp;
489 tmp->duration = op->stats.hp; 474 tmp->duration = op->stats.hp;
490 /* Used for spell tracking - just need a unique val for this spell - 475 /* Used for spell tracking - just need a unique val for this spell -
… …
498 tmp->stats.sp = op->direction; 483 tmp->stats.sp = op->direction;
499 484
500 /* Prevent recursion */ 485 /* Prevent recursion */
501 op->move_on = 0; 486 op->move_on = 0;
502 487
503 insert_ob_in_map (tmp, op->map, op, 0); 488 tmp->insert_at (op, op);
489 tmp->play_sound (tmp->sound);
490
504 /* remove the firebullet */ 491 /* remove the firebullet */
505 if (!op->destroyed ())
506 {
507 op->destroy (); 492 op->destroy ();
508 }
509} 493}
510
511
512 494
513/* checks to see what op should do, given the space it is on 495/* checks to see what op should do, given the space it is on
514 * (eg, explode, damage player, etc) 496 * (eg, explode, damage player, etc)
515 */ 497 */
516
517void 498void
518check_bullet (object *op) 499check_bullet (object *op)
519{ 500{
520 object *tmp; 501 object *tmp;
521 int dam, mflags; 502 int dam, mflags;
… …
536 517
537 /* If nothing alive on this space, no reason to do anything further */ 518 /* If nothing alive on this space, no reason to do anything further */
538 if (!(mflags & P_IS_ALIVE)) 519 if (!(mflags & P_IS_ALIVE))
539 return; 520 return;
540 521
541 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 522 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
542 { 523 {
543 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 524 if (QUERY_FLAG (tmp, FLAG_ALIVE))
544 { 525 {
545 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 526 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
546 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 527 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
… …
610 op->destroy (); 591 op->destroy ();
611 592
612 return; 593 return;
613 } 594 }
614 595
615 op->remove (); 596 if (!(op = m->insert (op, new_x, new_y, op)))
616 op->x = new_x;
617 op->y = new_y;
618 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
619 return; 597 return;
620 598
621 if (reflwall (op->map, op->x, op->y, op)) 599 if (reflwall (op->map, op->x, op->y, op))
622 { 600 {
623 op->direction = absdir (op->direction + 4); 601 op->direction = absdir (op->direction + 4);
624 update_turn_face (op); 602 update_turn_face (op);
625 } 603 }
626 else 604 else
627 check_bullet (op); 605 check_bullet (op);
628} 606}
629
630
631
632 607
633/* fire_bullet 608/* fire_bullet
634 * object op (cast from caster) files a bolt in dir. 609 * object op (cast from caster) files a bolt in dir.
635 * spob is the spell object for the bolt. 610 * spob is the spell object for the bolt.
636 * we remove the magic flag - that can be derived from 611 * we remove the magic flag - that can be derived from
637 * spob->attacktype. 612 * spob->attacktype.
638 * This function sets up the appropriate owner and skill 613 * This function sets up the appropriate owner and skill
639 * pointers. 614 * pointers.
640 */ 615 */
641
642int 616int
643fire_bullet (object *op, object *caster, int dir, object *spob) 617fire_bullet (object *op, object *caster, int dir, object *spob)
644{ 618{
645 object *tmp = NULL; 619 object *tmp = NULL;
646 int mflags; 620 int mflags;
… …
698 tmp->y = op->y; 672 tmp->y = op->y;
699 tmp->direction = absdir (tmp->direction + 4); 673 tmp->direction = absdir (tmp->direction + 4);
700 tmp->map = op->map; 674 tmp->map = op->map;
701 } 675 }
702 676
703 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0))) 677 if ((tmp = tmp->insert_at (tmp, op)))
704 check_bullet (tmp); 678 check_bullet (tmp);
705 679
706 return 1; 680 return 1;
707} 681}
708
709
710
711 682
712/***************************************************************************** 683/*****************************************************************************
713 * 684 *
714 * CONE RELATED FUNCTIONS 685 * CONE RELATED FUNCTIONS
715 * 686 *
716 *****************************************************************************/ 687 *****************************************************************************/
717 688
718
719/* drops an object based on what is in the cone's "other_arch" */ 689/* drops an object based on what is in the cone's "other_arch" */
720void 690void
721cone_drop (object *op) 691cone_drop (object *op)
722{ 692{
723 object *new_ob = arch_to_object (op->other_arch); 693 object *new_ob = arch_to_object (op->other_arch);
724 694
725 new_ob->x = op->x;
726 new_ob->y = op->y;
727 new_ob->level = op->level; 695 new_ob->level = op->level;
728 new_ob->set_owner (op->owner); 696 new_ob->set_owner (op->owner);
729 697
730 /* preserve skill ownership */ 698 /* preserve skill ownership */
731 if (op->skill && op->skill != new_ob->skill) 699 if (op->skill && op->skill != new_ob->skill)
732 {
733 new_ob->skill = op->skill; 700 new_ob->skill = op->skill;
734 }
735 insert_ob_in_map (new_ob, op->map, op, 0);
736 701
702 new_ob->insert_at (op, op);
737} 703}
738 704
739/* move_cone: causes cone object 'op' to move a space/hit creatures */ 705/* move_cone: causes cone object 'op' to move a space/hit creatures */
740 706
741void 707void
… …
803 769
804 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 770 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
805 { 771 {
806 object *tmp = op->clone (); 772 object *tmp = op->clone ();
807 773
808 tmp->x = x;
809 tmp->y = y;
810
811 tmp->duration = op->duration + 1; 774 tmp->duration = op->duration + 1;
812 775
813 /* Use for spell tracking - see ok_to_put_more() */ 776 /* Use for spell tracking - see ok_to_put_more() */
814 tmp->stats.maxhp = op->stats.maxhp; 777 tmp->stats.maxhp = op->stats.maxhp;
815 insert_ob_in_map (tmp, op->map, op, 0); 778
779 op->map->insert (tmp, x, y, op);
780
816 if (tmp->other_arch) 781 if (tmp->other_arch)
817 cone_drop (tmp); 782 cone_drop (tmp);
818 } 783 }
819 } 784 }
820} 785}
… …
853 818
854 /* Need to know what the movetype of the object we are about 819 /* Need to know what the movetype of the object we are about
855 * to create is, so we can know if the space we are about to 820 * to create is, so we can know if the space we are about to
856 * insert it into is blocked. 821 * insert it into is blocked.
857 */ 822 */
858 movetype = spell->other_arch->clone.move_type; 823 movetype = spell->other_arch->move_type;
859 824
860 for (i = range_min; i <= range_max; i++) 825 for (i = range_min; i <= range_max; i++)
861 { 826 {
862 sint16 x, y, d; 827 sint16 x, y, d;
863 828
… …
899 success = 1; 864 success = 1;
900 tmp = arch_to_object (spell->other_arch); 865 tmp = arch_to_object (spell->other_arch);
901 tmp->set_owner (op); 866 tmp->set_owner (op);
902 set_spell_skill (op, caster, spell, tmp); 867 set_spell_skill (op, caster, spell, tmp);
903 tmp->level = caster_level (caster, spell); 868 tmp->level = caster_level (caster, spell);
904 tmp->x = sx;
905 tmp->y = sy;
906 tmp->attacktype = spell->attacktype; 869 tmp->attacktype = spell->attacktype;
907 870
908 /* holy word stuff */ 871 /* holy word stuff */
909 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 872 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
910 if (!tailor_god_spell (tmp, op)) 873 if (!tailor_god_spell (tmp, op))
… …
944 else 907 else
945 tmp->duration += caster->level / 3; 908 tmp->duration += caster->level / 3;
946 } 909 }
947 910
948 if (!(tmp->move_type & MOVE_FLY_LOW)) 911 if (!(tmp->move_type & MOVE_FLY_LOW))
949 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 912 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
950 913
951 if (!tmp->move_on && tmp->stats.dam) 914 if (!tmp->move_on && tmp->stats.dam)
952 {
953 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 915 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
954 }
955 916
956 insert_ob_in_map (tmp, m, op, 0); 917 m->insert (tmp, sx, sy, op);
957 918
958 /* This is used for tracking spells so that one effect doesn't hit 919 /* This is used for tracking spells so that one effect doesn't hit
959 * a single space too many times. 920 * a single space too many times.
960 */ 921 */
961 tmp->stats.maxhp = tmp->count; 922 tmp->stats.maxhp = tmp->count;
… …
971 * 932 *
972 * BOMB related code 933 * BOMB related code
973 * 934 *
974 ****************************************************************************/ 935 ****************************************************************************/
975 936
976
977/* This handles an exploding bomb. 937/* This handles an exploding bomb.
978 * op is the original bomb object. 938 * op is the original bomb object.
979 */ 939 */
980void 940void
981animate_bomb (object *op) 941animate_bomb (object *op)
982{ 942{
983 int i;
984 object *env, *tmp;
985 archetype *at;
986
987 if (op->state != NUM_ANIMATIONS (op) - 1) 943 if (op->state != NUM_ANIMATIONS (op) - 1)
988 return; 944 return;
989 945
990 env = object_get_env_recursive (op); 946 object *env = op->outer_env ();
991 947
992 if (op->env) 948 if (op->env)
993 { 949 {
994 if (env->map == NULL) 950 if (env->map == NULL)
995 return; 951 return;
996 952
997 if (env->type == PLAYER) 953 if (env->type == PLAYER)
998 esrv_del_item (env->contr, op->count); 954 esrv_del_item (env->contr, op->count);
999 955
1000 op->remove (); 956 if (!(op = op->insert_at (env, op)))
1001 op->x = env->x;
1002 op->y = env->y;
1003 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1004 return; 957 return;
1005 } 958 }
1006 959
1007 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 960 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1008 // on a safe map. I don't like this special casing, but it seems to be neccessary 961 // on a safe map. I don't like this special casing, but it seems to be neccessary
… …
1015 968
1016 /* This copies a lot of the code from the fire bullet, 969 /* This copies a lot of the code from the fire bullet,
1017 * but using the cast_bullet isn't really feasible, 970 * but using the cast_bullet isn't really feasible,
1018 * so just set up the appropriate values. 971 * so just set up the appropriate values.
1019 */ 972 */
1020 at = archetype::find (SPLINT); 973 if (archetype *at = archetype::find (SPLINT))
1021 if (at)
1022 { 974 {
1023 for (i = 1; i < 9; i++) 975 for (int i = 1; i < 9; i++)
1024 { 976 {
1025 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 977 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1026 continue; 978 continue;
979
1027 tmp = arch_to_object (at); 980 object *tmp = arch_to_object (at);
1028 tmp->direction = i; 981 tmp->direction = i;
1029 tmp->range = op->range; 982 tmp->range = op->range;
1030 tmp->stats.dam = op->stats.dam; 983 tmp->stats.dam = op->stats.dam;
1031 tmp->duration = op->duration; 984 tmp->duration = op->duration;
1032 tmp->attacktype = op->attacktype; 985 tmp->attacktype = op->attacktype;
1033 tmp->set_owner (op); 986 tmp->set_owner (op);
1034 if (op->skill && op->skill != tmp->skill) 987 if (op->skill && op->skill != tmp->skill)
1035 {
1036 tmp->skill = op->skill; 988 tmp->skill = op->skill;
1037 } 989
1038 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 990 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1039 SET_ANIMATION (tmp, i); 991 SET_ANIMATION (tmp, i);
1040 tmp->x = op->x + freearr_x[i]; 992
1041 tmp->y = op->y + freearr_x[i]; 993 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1042 insert_ob_in_map (tmp, op->map, op, 0);
1043 move_bullet (tmp); 994 move_bullet (tmp);
1044 } 995 }
1045 } 996 }
1046 997
1047 explode_bullet (op); 998 explode_bullet (op);
1048} 999}
1049 1000
1050int 1001int
1051create_bomb (object *op, object *caster, int dir, object *spell) 1002create_bomb (object *op, object *caster, int dir, object *spell)
1052{ 1003{
1053
1054 object *tmp; 1004 object *tmp;
1055 int mflags; 1005 int mflags;
1056 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1006 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1057 maptile *m; 1007 maptile *m;
1058 1008
… …
1060 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1010 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1061 { 1011 {
1062 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1012 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1063 return 0; 1013 return 0;
1064 } 1014 }
1015
1065 tmp = arch_to_object (spell->other_arch); 1016 tmp = arch_to_object (spell->other_arch);
1066 1017
1067 /* level dependencies for bomb */ 1018 /* level dependencies for bomb */
1068 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1019 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1069 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1020 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1070 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1021 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1071 tmp->attacktype = spell->attacktype; 1022 tmp->attacktype = spell->attacktype;
1072 1023
1073 tmp->set_owner (op); 1024 tmp->set_owner (op);
1074 set_spell_skill (op, caster, spell, tmp); 1025 set_spell_skill (op, caster, spell, tmp);
1075 tmp->x = dx; 1026
1076 tmp->y = dy; 1027 m->insert (tmp, dx, dy, op);
1077 insert_ob_in_map (tmp, m, op, 0);
1078 return 1; 1028 return 1;
1079} 1029}
1080 1030
1081/**************************************************************************** 1031/****************************************************************************
1082 * 1032 *
… …
1091 * dir is the direction to look in. 1041 * dir is the direction to look in.
1092 * range is how far out to look. 1042 * range is how far out to look.
1093 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1043 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1094 * this info is used for blocked magic/unholy spaces. 1044 * this info is used for blocked magic/unholy spaces.
1095 */ 1045 */
1096
1097object * 1046object *
1098get_pointed_target (object *op, int dir, int range, int type) 1047get_pointed_target (object *op, int dir, int range, int type)
1099{ 1048{
1100 object *target; 1049 object *target;
1101 sint16 x, y; 1050 sint16 x, y;
… …
1120 return NULL; 1069 return NULL;
1121 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1070 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1122 return NULL; 1071 return NULL;
1123 1072
1124 if (mflags & P_IS_ALIVE) 1073 if (mflags & P_IS_ALIVE)
1125 {
1126 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1074 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1127 { 1075 if (QUERY_FLAG (target, FLAG_MONSTER))
1128 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1129 {
1130 return target; 1076 return target;
1131 }
1132 }
1133 }
1134 } 1077 }
1078
1135 return NULL; 1079 return NULL;
1136} 1080}
1137
1138 1081
1139/* cast_smite_arch() - the priest points to a creature and causes 1082/* cast_smite_arch() - the priest points to a creature and causes
1140 * a 'godly curse' to decend. 1083 * a 'godly curse' to decend.
1141 * usual params - 1084 * usual params -
1142 * op = player 1085 * op = player
1143 * caster = object casting the spell. 1086 * caster = object casting the spell.
1144 * dir = direction being cast 1087 * dir = direction being cast
1145 * spell = spell object 1088 * spell = spell object
1146 */ 1089 */
1147
1148int 1090int
1149cast_smite_spell (object *op, object *caster, int dir, object *spell) 1091cast_smite_spell (object *op, object *caster, int dir, object *spell)
1150{ 1092{
1151 object *effect, *target; 1093 object *effect, *target;
1152 object *god = find_god (determine_god (op)); 1094 object *god = find_god (determine_god (op));
… …
1225 1167
1226 effect->set_owner (op); 1168 effect->set_owner (op);
1227 set_spell_skill (op, caster, spell, effect); 1169 set_spell_skill (op, caster, spell, effect);
1228 1170
1229 /* ok, tell it where to be, and insert! */ 1171 /* ok, tell it where to be, and insert! */
1230 effect->x = target->x; 1172 effect->insert_at (target, op);
1231 effect->y = target->y;
1232 insert_ob_in_map (effect, target->map, op, 0);
1233 1173
1234 return 1; 1174 return 1;
1235} 1175}
1236
1237 1176
1238/**************************************************************************** 1177/****************************************************************************
1239 * 1178 *
1240 * MAGIC MISSILE code. 1179 * MAGIC MISSILE code.
1241 * note that the fire_bullet is used to fire the missile. The 1180 * note that the fire_bullet is used to fire the missile. The
… …
1292 { 1231 {
1293 op->destroy (); 1232 op->destroy ();
1294 return; 1233 return;
1295 } 1234 }
1296 1235
1297 op->x = new_x;
1298 op->y = new_y;
1299 op->map = m;
1300 i = spell_find_dir (op->map, op->x, op->y, op->owner); 1236 i = spell_find_dir (m, new_x, new_y, op->owner);
1301 if (i > 0 && i != op->direction) 1237 if (i > 0 && i != op->direction)
1302 { 1238 {
1303 op->direction = i; 1239 op->direction = i;
1304 SET_ANIMATION (op, op->direction); 1240 SET_ANIMATION (op, op->direction);
1305 } 1241 }
1306 1242
1307 insert_ob_in_map (op, op->map, op, 0); 1243 m->insert (op, new_x, new_y, op);
1308} 1244}
1309 1245
1310/**************************************************************************** 1246/****************************************************************************
1311 * Destruction 1247 * Destruction
1312 ****************************************************************************/ 1248 ****************************************************************************/
… …
1315 * we do this by creating a force and inserting it in the 1251 * we do this by creating a force and inserting it in the
1316 * object. if time is 0, the object glows permanently. To truely 1252 * object. if time is 0, the object glows permanently. To truely
1317 * make this work for non-living objects, we would have to 1253 * make this work for non-living objects, we would have to
1318 * give them the capability to have an inventory. b.t. 1254 * give them the capability to have an inventory. b.t.
1319 */ 1255 */
1320
1321int 1256int
1322make_object_glow (object *op, int radius, int time) 1257make_object_glow (object *op, int radius, int time)
1323{ 1258{
1324 object *tmp;
1325
1326 /* some things are unaffected... */ 1259 /* some things are unaffected... */
1327 if (op->path_denied & PATH_LIGHT) 1260 if (op->path_denied & PATH_LIGHT)
1328 return 0; 1261 return 0;
1329 1262
1330 tmp = get_archetype (FORCE_NAME); 1263 object *tmp = get_archetype (FORCE_NAME);
1331 tmp->speed = 0.01; 1264 tmp->speed = 0.01;
1332 tmp->stats.food = time; 1265 tmp->stats.food = time;
1333 SET_FLAG (tmp, FLAG_IS_USED_UP); 1266 SET_FLAG (tmp, FLAG_IS_USED_UP);
1334 tmp->glow_radius = radius; 1267 tmp->glow_radius = radius;
1335 if (tmp->glow_radius > MAX_LIGHT_RADII) 1268 if (tmp->glow_radius > MAX_LIGHT_RADII)
1336 tmp->glow_radius = MAX_LIGHT_RADII; 1269 tmp->glow_radius = MAX_LIGHT_RADII;
1337 1270
1338 tmp->x = op->x;
1339 tmp->y = op->y;
1340 if (tmp->speed < MIN_ACTIVE_SPEED)
1341 tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1342 tmp = insert_ob_in_ob (tmp, op); 1271 tmp = insert_ob_in_ob (tmp, op);
1272
1343 if (tmp->glow_radius > op->glow_radius) 1273 if (tmp->glow_radius > op->glow_radius)
1344 op->glow_radius = tmp->glow_radius; 1274 op->glow_radius = tmp->glow_radius;
1345 1275
1346 if (!tmp->env || op != tmp->env)
1347 {
1348 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1349 return 0;
1350 }
1351 return 1; 1276 return 1;
1352} 1277}
1353
1354
1355
1356 1278
1357int 1279int
1358cast_destruction (object *op, object *caster, object *spell_ob) 1280cast_destruction (object *op, object *caster, object *spell_ob)
1359{ 1281{
1360 int i, j, range, mflags, friendly = 0, dam, dur; 1282 int i, j, range, mflags, friendly = 0, dam, dur;
… …
1381 else if (caster->skill) 1303 else if (caster->skill)
1382 op->skill = caster->skill; 1304 op->skill = caster->skill;
1383 else 1305 else
1384 op->skill = NULL; 1306 op->skill = NULL;
1385 1307
1386 change_skill (op, find_skill_by_name (op, op->skill), 1); 1308 op->change_skill (find_skill_by_name (op, op->skill));
1387 1309
1388 for (i = -range; i < range; i++) 1310 for (i = -range; i < range; i++)
1389 { 1311 {
1390 for (j = -range; j < range; j++) 1312 for (j = -range; j < range; j++)
1391 { 1313 {
1392 m = op->map; 1314 m = op->map;
1393 sx = op->x + i; 1315 sx = op->x + i;
1394 sy = op->y + j; 1316 sy = op->y + j;
1317
1395 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1318 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1396 if (mflags & P_OUT_OF_MAP) 1319 if (mflags & P_OUT_OF_MAP)
1397 continue; 1320 continue;
1321
1398 if (mflags & P_IS_ALIVE) 1322 if (mflags & P_IS_ALIVE)
1399 { 1323 {
1400 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1324 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1401 {
1402 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1325 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1403 break; 1326 break;
1404 } 1327
1405 if (tmp) 1328 if (tmp)
1406 { 1329 {
1407 if (tmp->head) 1330 if (tmp->head)
1408 tmp = tmp->head; 1331 tmp = tmp->head;
1409 1332
… …
1412 { 1335 {
1413 if (spell_ob->subtype == SP_DESTRUCTION) 1336 if (spell_ob->subtype == SP_DESTRUCTION)
1414 { 1337 {
1415 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1338 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1416 if (spell_ob->other_arch) 1339 if (spell_ob->other_arch)
1417 {
1418 tmp = arch_to_object (spell_ob->other_arch); 1340 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1419 tmp->x = sx;
1420 tmp->y = sy;
1421 insert_ob_in_map (tmp, m, op, 0);
1422 }
1423 } 1341 }
1424 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1342 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1425 { 1343 {
1426 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1344 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1427 {
1428 object *effect = arch_to_object (spell_ob->other_arch); 1345 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1429
1430 effect->x = sx;
1431 effect->y = sy;
1432 insert_ob_in_map (effect, m, op, 0);
1433 }
1434 } 1346 }
1435 } 1347 }
1436 } 1348 }
1437 } 1349 }
1438 } 1350 }
1439 } 1351 }
1352
1440 op->skill = skill; 1353 op->skill = skill;
1441 return 1; 1354 return 1;
1442} 1355}
1443 1356
1444/*************************************************************************** 1357/***************************************************************************
… …
1458 { 1371 {
1459 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1372 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1460 return 0; 1373 return 0;
1461 } 1374 }
1462 1375
1376 tmp = tmp->head_ ();
1377
1463 /* If we've already got a force of this type, don't add a new one. */ 1378 /* If we've already got a force of this type, don't add a new one. */
1464 for (force = tmp->inv; force != NULL; force = force->below) 1379 for (force = tmp->inv; force; force = force->below)
1465 { 1380 {
1466 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1381 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1467 { 1382 {
1468 if (force->name == spell_ob->name) 1383 if (force->name == spell_ob->name)
1469 { 1384 {
… …
1475 return 0; 1390 return 0;
1476 } 1391 }
1477 } 1392 }
1478 } 1393 }
1479 1394
1480 if (force == NULL) 1395 if (!force)
1481 { 1396 {
1482 force = get_archetype (FORCE_NAME); 1397 force = get_archetype (FORCE_NAME);
1483 force->subtype = FORCE_CHANGE_ABILITY; 1398 force->subtype = FORCE_CHANGE_ABILITY;
1399
1484 if (spell_ob->race) 1400 if (spell_ob->race)
1485 force->name = spell_ob->race; 1401 force->name = spell_ob->race;
1486 else 1402 else
1487 force->name = spell_ob->name; 1403 force->name = spell_ob->name;
1488 1404
… …
1498 { 1414 {
1499 force->duration = duration; 1415 force->duration = duration;
1500 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1416 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1501 } 1417 }
1502 else 1418 else
1503 {
1504 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1419 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1505 } 1420
1506 return 1; 1421 return 1;
1507 } 1422 }
1423
1508 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1424 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1509 force->speed = 1.0; 1425 force->speed = 1.f;
1510 force->speed_left = -1.0; 1426 force->speed_left = -1.f;
1511 SET_FLAG (force, FLAG_APPLIED); 1427 SET_FLAG (force, FLAG_APPLIED);
1512 1428
1513 if (god) 1429 if (god)
1514 { 1430 {
1515 if (spell_ob->last_grace) 1431 if (spell_ob->last_grace)
… …
1532 insert_ob_in_ob (force, tmp); 1448 insert_ob_in_ob (force, tmp);
1533 tmp->update_stats (); 1449 tmp->update_stats ();
1534 return 1; 1450 return 1;
1535 1451
1536} 1452}
1537
1538 1453
1539/********************************************************************** 1454/**********************************************************************
1540 * mood change 1455 * mood change
1541 * Arguably, this may or may not be an attack spell. But since it 1456 * Arguably, this may or may not be an attack spell. But since it
1542 * effects monsters, it seems best to put it into this file 1457 * effects monsters, it seems best to put it into this file
… …
1572 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1487 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1573 race = god->race; 1488 race = god->race;
1574 else 1489 else
1575 race = spell->race; 1490 race = spell->race;
1576 1491
1577
1578 for (x = op->x - range; x <= op->x + range; x++) 1492 for (x = op->x - range; x <= op->x + range; x++)
1579 for (y = op->y - range; y <= op->y + range; y++) 1493 for (y = op->y - range; y <= op->y + range; y++)
1580 { 1494 {
1581
1582 done_one = 0; 1495 done_one = 0;
1583 m = op->map; 1496 m = op->map;
1584 nx = x; 1497 nx = x;
1585 ny = y; 1498 ny = y;
1586 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1499 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1589 1502
1590 /* If there is nothing living on this space, no need to go further */ 1503 /* If there is nothing living on this space, no need to go further */
1591 if (!(mflags & P_IS_ALIVE)) 1504 if (!(mflags & P_IS_ALIVE))
1592 continue; 1505 continue;
1593 1506
1507 // players can only affect spaces that they can actually see
1508 if (caster && caster->contr
1509 && caster->contr->visibility_at (m, nx, ny) < 70)
1510 continue;
1511
1594 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above) 1512 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1595 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1513 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1596 break; 1514 break;
1597 1515
1598 /* There can be living objects that are not monsters */ 1516 /* There can be living objects that are not monsters */
1599 if (!tmp || tmp->type == PLAYER) 1517 if (!tmp || tmp->type == PLAYER)
… …
1606 head = tmp; 1524 head = tmp;
1607 1525
1608 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1526 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1609 if (race && head->race && !strstr (race, head->race)) 1527 if (race && head->race && !strstr (race, head->race))
1610 continue; 1528 continue;
1529
1611 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1530 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1612 continue; 1531 continue;
1613 1532
1614 /* Now do a bunch of stuff related to saving throws */ 1533 /* Now do a bunch of stuff related to saving throws */
1615 best_at = -1; 1534 best_at = -1;
… …
1632 at -= level / 5; 1551 at -= level / 5;
1633 if (did_make_save (head, head->level, at)) 1552 if (did_make_save (head, head->level, at))
1634 continue; 1553 continue;
1635 } 1554 }
1636 else /* spell->attacktype */ 1555 else /* spell->attacktype */
1637 /*
1638 Spell has no attacktype (charm & such), so we'll have a specific saving:
1639 * if spell level < monster level, no go
1640 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1641
1642 The chance will then be in the range [20-70] percent, not too bad.
1643
1644 This is required to fix the 'charm monster' abuse, where a player level 1 can
1645 charm a level 125 monster...
1646
1647 Ryo, august 14th
1648 */
1649 { 1556 {
1557 /*
1558 Spell has no attacktype (charm & such), so we'll have a specific saving:
1559 * if spell level < monster level, no go
1560 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1561
1562 The chance will then be in the range [20-70] percent, not too bad.
1563
1564 This is required to fix the 'charm monster' abuse, where a player level 1 can
1565 charm a level 125 monster...
1566
1567 Ryo, august 14th
1568 */
1650 if (head->level > level) 1569 if (head->level > level)
1651 continue; 1570 continue;
1571
1652 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1572 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1653 /* Failed, no effect */ 1573 /* Failed, no effect */
1654 continue; 1574 continue;
1655 } 1575 }
1656 1576
1657 /* Done with saving throw. Now start effecting the monster */ 1577 /* Done with saving throw. Now start affecting the monster */
1658 1578
1659 /* aggravation */ 1579 /* aggravation */
1660 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1580 if (QUERY_FLAG (spell, FLAG_MONSTER))
1661 { 1581 {
1662 CLEAR_FLAG (head, FLAG_SLEEP); 1582 CLEAR_FLAG (head, FLAG_SLEEP);
1663 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1664 remove_friendly_object (head); 1583 remove_friendly_object (head);
1665
1666 done_one = 1; 1584 done_one = 1;
1667 head->enemy = op; 1585 head->enemy = op;
1668 } 1586 }
1669 1587
1670 /* calm monsters */ 1588 /* calm monsters */
… …
1679 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1597 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1680 { 1598 {
1681 SET_FLAG (head, FLAG_BERSERK); 1599 SET_FLAG (head, FLAG_BERSERK);
1682 done_one = 1; 1600 done_one = 1;
1683 } 1601 }
1602
1684 /* charm */ 1603 /* charm */
1685 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1604 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1686 { 1605 {
1687 SET_FLAG (head, FLAG_FRIENDLY);
1688 /* Prevent uncontolled outbreaks of self replicating monsters. 1606 /* Prevent uncontolled outbreaks of self replicating monsters.
1689 Typical use case is charm, go somwhere, use aggravation to make hostile. 1607 Typical use case is charm, go somwhere, use aggravation to make hostile.
1690 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1608 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1691 CLEAR_FLAG (head, FLAG_GENERATOR); 1609 CLEAR_FLAG (head, FLAG_GENERATOR);
1692 head->set_owner (op); 1610 head->set_owner (op);
… …
1698 head->stats.exp = 0; 1616 head->stats.exp = 0;
1699 } 1617 }
1700 1618
1701 /* If a monster was effected, put an effect in */ 1619 /* If a monster was effected, put an effect in */
1702 if (done_one && spell->other_arch) 1620 if (done_one && spell->other_arch)
1703 {
1704 tmp = arch_to_object (spell->other_arch); 1621 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1705 tmp->x = nx;
1706 tmp->y = ny;
1707 insert_ob_in_map (tmp, m, op, 0);
1708 }
1709 } /* for y */ 1622 } /* for y */
1710 1623
1711 return 1; 1624 return 1;
1712} 1625}
1713 1626
… …
1764 nx = op->x; 1677 nx = op->x;
1765 ny = op->y; 1678 ny = op->y;
1766 m = op->map; 1679 m = op->map;
1767 } 1680 }
1768 1681
1769 op->remove (); 1682 m->insert (op, nx, ny, op);
1770 op->y = ny;
1771 op->x = nx;
1772 insert_ob_in_map (op, m, op, 0);
1773 1683
1774 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1684 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1775 surrounding squares */ 1685 surrounding squares */
1776 1686
1777 /* loop over current square and neighbors to hit. 1687 /* loop over current square and neighbors to hit.
1778 * if this has an other_arch field, we insert that in 1688 * if this has an other_arch field, we insert that in
1779 * the surround spaces. 1689 * the surround spaces.
1780 */ 1690 */
1781 for (j = 0; j < 9; j++) 1691 for (j = 0; j < 9; j++)
1782 { 1692 {
1783 object *new_ob;
1784
1785 hx = nx + freearr_x[j]; 1693 hx = nx + freearr_x[j];
1786 hy = ny + freearr_y[j]; 1694 hy = ny + freearr_y[j];
1787 1695
1788 m = op->map; 1696 m = op->map;
1789 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1697 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1803 1711
1804 } 1712 }
1805 1713
1806 /* insert the other arch */ 1714 /* insert the other arch */
1807 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1715 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1808 { 1716 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1809 new_ob = arch_to_object (op->other_arch);
1810 new_ob->x = hx;
1811 new_ob->y = hy;
1812 insert_ob_in_map (new_ob, m, op, 0);
1813 }
1814 } 1717 }
1815 1718
1816 /* restore to the center location and damage */ 1719 /* restore to the center location and damage */
1817 op->stats.dam = dam_save; 1720 op->stats.dam = dam_save;
1818 1721
… …
1821 if (i >= 0) 1724 if (i >= 0)
1822 { /* we have a preferred direction! */ 1725 { /* we have a preferred direction! */
1823 /* pick another direction if the preferred dir is blocked. */ 1726 /* pick another direction if the preferred dir is blocked. */
1824 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1727 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1825 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1728 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1826 {
1827 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1729 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1828 } 1730
1829 op->direction = i; 1731 op->direction = i;
1830 } 1732 }
1831} 1733}
1832 1734
1833 1735
… …
1871#if 0 1773#if 0
1872 // this is bogus: it causes wrong places to be checked below 1774 // this is bogus: it causes wrong places to be checked below
1873 // (a wall 2 cells away will block the effect...) and 1775 // (a wall 2 cells away will block the effect...) and
1874 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1776 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1875 // space. 1777 // space.
1876 // should be fixed later, but correctness before featurs... 1778 // should be fixed later, but correctness before features...
1877 // (schmorp) 1779 // (schmorp)
1878 1780
1879 /* new offset calculation to make swarm element distribution 1781 /* new offset calculation to make swarm element distribution
1880 * more uniform 1782 * more uniform
1881 */ 1783 */
… …
1963 1865
1964 if (!spell->other_arch) 1866 if (!spell->other_arch)
1965 return 0; 1867 return 0;
1966 1868
1967 tmp = get_archetype (SWARM_SPELL); 1869 tmp = get_archetype (SWARM_SPELL);
1968 tmp->x = op->x;
1969 tmp->y = op->y;
1970 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */ 1870 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1971 set_spell_skill (op, caster, spell, tmp); 1871 set_spell_skill (op, caster, spell, tmp);
1972 1872
1973 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1873 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
1974 tmp->spell = arch_to_object (spell->other_arch); 1874 tmp->spell = arch_to_object (spell->other_arch);
1975 1875
1976 tmp->attacktype = tmp->spell->attacktype; 1876 tmp->attacktype = tmp->spell->attacktype;
1977 1877
1978 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1878 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1979 {
1980 if (!tailor_god_spell (tmp, op)) 1879 if (!tailor_god_spell (tmp, op))
1981 return 1; 1880 return 1;
1982 } 1881
1983 tmp->duration = SP_level_duration_adjust (caster, spell); 1882 tmp->duration = SP_level_duration_adjust (caster, spell);
1984 for (i = 0; i < spell->duration; i++) 1883 for (i = 0; i < spell->duration; i++)
1985 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1884 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1986 1885
1987 tmp->direction = dir; 1886 tmp->direction = dir;
1988 tmp->invisible = 1; 1887 tmp->invisible = 1;
1989 insert_ob_in_map (tmp, op->map, op, 0); 1888
1889 tmp->insert_at (op, op);
1990 return 1; 1890 return 1;
1991} 1891}
1992 1892
1993 1893
1994/* See the spells documentation file for why this is its own 1894/* See the spells documentation file for why this is its own
… …
2054 { 1954 {
2055 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1955 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2056 if (tmp->glow_radius > MAX_LIGHT_RADII) 1956 if (tmp->glow_radius > MAX_LIGHT_RADII)
2057 tmp->glow_radius = MAX_LIGHT_RADII; 1957 tmp->glow_radius = MAX_LIGHT_RADII;
2058 } 1958 }
2059 tmp->x = x; 1959
2060 tmp->y = y; 1960 m->insert (tmp, x, y, op);
2061 insert_ob_in_map (tmp, m, op, 0);
2062 return 1; 1961 return 1;
2063} 1962}
2064
2065
2066
2067 1963
2068/* cast_cause_disease: this spell looks along <dir> from the 1964/* cast_cause_disease: this spell looks along <dir> from the
2069 * player and infects someone. 1965 * player and infects someone.
2070 * op is the player/monster, caster is the object, dir is the direction 1966 * op is the player/monster, caster is the object, dir is the direction
2071 * to cast, disease_arch is the specific disease, and type is the spell number 1967 * to cast, disease_arch is the specific disease, and type is the spell number
2072 * perhaps this should actually be in disease.c? 1968 * perhaps this should actually be in disease.c?
2073 */ 1969 */
2074
2075int 1970int
2076cast_cause_disease (object *op, object *caster, object *spell, int dir) 1971cast_cause_disease (object *op, object *caster, object *spell, int dir)
2077{ 1972{
2078 sint16 x, y; 1973 sint16 x, y;
2079 int i, mflags, range, dam_mod, dur_mod; 1974 int i, mflags, range, dam_mod, dur_mod;
… …
2086 /* If casting from a scroll, no direction will be available, so refer to the 1981 /* If casting from a scroll, no direction will be available, so refer to the
2087 * direction the player is pointing. 1982 * direction the player is pointing.
2088 */ 1983 */
2089 if (!dir) 1984 if (!dir)
2090 dir = op->facing; 1985 dir = op->facing;
1986
2091 if (!dir) 1987 if (!dir)
2092 return 0; /* won't find anything if casting on ourself, so just return */ 1988 return 0; /* won't find anything if casting on ourself, so just return */
2093 1989
2094 /* Calculate these once here */ 1990 /* Calculate these once here */
2095 range = spell->range + SP_level_range_adjust (caster, spell); 1991 range = spell->range + SP_level_range_adjust (caster, spell);
… …
2129 /* do level adjustments */ 2025 /* do level adjustments */
2130 if (disease->stats.wc) 2026 if (disease->stats.wc)
2131 disease->stats.wc += dur_mod / 2; 2027 disease->stats.wc += dur_mod / 2;
2132 2028
2133 if (disease->magic > 0) 2029 if (disease->magic > 0)
2134 disease->magic += dur_mod / 4; 2030 disease->magic += dur_mod / 8;
2135 2031
2136 if (disease->stats.maxhp > 0) 2032 if (disease->stats.maxhp > 0)
2137 disease->stats.maxhp += dur_mod; 2033 disease->stats.maxhp += dur_mod;
2138 2034
2139 if (disease->stats.maxgrace > 0) 2035 if (disease->stats.maxgrace > 0)
… …
2174 if (disease->stats.sp) 2070 if (disease->stats.sp)
2175 disease->stats.sp -= dam_mod; 2071 disease->stats.sp -= dam_mod;
2176 2072
2177 if (infect_object (walk, disease, 1)) 2073 if (infect_object (walk, disease, 1))
2178 { 2074 {
2179 object *flash; /* visual effect for inflicting disease */
2180
2181 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2075 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2182 2076
2183 disease->destroy (); /* don't need this one anymore */ 2077 disease->destroy (); /* don't need this one anymore */
2184 flash = get_archetype (ARCH_DETECT_MAGIC); 2078 walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2185 flash->x = x;
2186 flash->y = y;
2187 flash->map = walk->map;
2188 insert_ob_in_map (flash, walk->map, op, 0);
2189 return 1; 2079 return 1;
2190 } 2080 }
2191 2081
2192 disease->destroy (); 2082 disease->destroy ();
2193 } 2083 }
2194 } /* if living creature */ 2084 } /* if living creature */
2195 } /* for range of spaces */ 2085 } /* for range of spaces */
2086
2196 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2087 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2197 return 1; 2088 return 1;
2198} 2089}

Diff Legend

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