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

Diff Legend

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