ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_attack.C
(Generate patch)

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.17 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.41 by root, Sat Jun 9 21:16:12 2007 UTC

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

Diff Legend

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