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.12 by root, Thu Sep 14 21:16:13 2006 UTC vs.
Revision 1.51 by root, Sun Apr 20 23:25:43 2008 UTC

1
2/* 1/*
3 * static char *rcsid_spell_attack_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: spell_attack.C,v 1.12 2006/09/14 21:16:13 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7
8/*
9 CrossFire, A Multiplayer game for X-windows
10
11 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
12 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
13 7 *
14 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
15 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
16 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
17 (at your option) any later version. 11 * (at your option) any later version.
18 12 *
19 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,
20 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22 GNU General Public License for more details. 16 * GNU General Public License for more details.
23 17 *
24 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
25 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
27 21 * The authors can be reached via e-mail to <support@deliantra.net>
28 The authors can be reached via e-mail at crossfire-devel@real-time.com
29*/ 22 */
30 23
31/* This file contains all the spell attack code. Grouping this code 24/* This file contains all the spell attack code. Grouping this code
32 * together should hopefully make it easier to find the relevent bits 25 * together should hopefully make it easier to find the relevent bits
33 * of code 26 * of code
34 */ 27 */
35 28
36#include <global.h> 29#include <global.h>
37#include <object.h> 30#include <object.h>
38#include <living.h> 31#include <living.h>
39#ifndef __CEXTRACT__
40# include <sproto.h> 32#include <sproto.h>
41#endif
42#include <spells.h> 33#include <spells.h>
43#include <sounds.h> 34#include <sounds.h>
44 35
45/* this function checks to see if a spell pushes objects as well 36/* this function checks to see if a spell pushes objects as well
46 * as flies over and damages them (only used for cones for now) 37 * as flies over and damages them (only used for cones for now)
… …
64 { 55 {
65 weight_move = op->weight + (op->weight * op->level) / 3; 56 weight_move = op->weight + (op->weight * op->level) / 3;
66 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 57 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
67 } 58 }
68 59
69 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 60 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
70 { 61 {
71 int num_sections = 1; 62 int num_sections = 1;
72 63
73 /* don't move DM */ 64 /* don't move DM */
74 if (QUERY_FLAG (tmp, FLAG_WIZ)) 65 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
124void 115void
125forklightning (object *op, object *tmp) 116forklightning (object *op, object *tmp)
126{ 117{
127 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 118 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
128 int t_dir; /* stores temporary dir calculation */ 119 int t_dir; /* stores temporary dir calculation */
129 mapstruct *m; 120 maptile *m;
130 sint16 sx, sy; 121 sint16 sx, sy;
131 object *new_bolt; 122 object *new_bolt;
132 123
133 /* pick a fork direction. tmp->stats.Con is the left bias 124 /* pick a fork direction. tmp->stats.Con is the left bias
134 * i.e., the chance in 100 of forking LEFT 125 * i.e., the chance in 100 of forking LEFT
… …
147 138
148 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 139 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
149 return; 140 return;
150 141
151 /* OK, we made a fork */ 142 /* OK, we made a fork */
152 new_bolt = get_object (); 143 new_bolt = tmp->clone ();
153 copy_object (tmp, new_bolt);
154 144
155 /* reduce chances of subsequent forking */ 145 /* reduce chances of subsequent forking */
156 new_bolt->stats.Dex -= 10; 146 new_bolt->stats.Dex -= 10;
157 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 147 tmp->stats.Dex -= 10; /* less forks from main bolt too */
158 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 148 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
159 new_bolt->speed_left = -0.1; 149 new_bolt->speed_left = -0.1f;
160 new_bolt->direction = t_dir; 150 new_bolt->direction = t_dir;
161 new_bolt->duration++; 151 new_bolt->duration++;
162 new_bolt->x = sx;
163 new_bolt->y = sy;
164 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 152 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
165 new_bolt->stats.dam++; 153 new_bolt->stats.dam++;
166 tmp->stats.dam /= 2; /* reduce father bolt damage */ 154 tmp->stats.dam /= 2; /* reduce father bolt damage */
167 tmp->stats.dam++; 155 tmp->stats.dam++;
168 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 156 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
169 update_turn_face (new_bolt); 157 update_turn_face (new_bolt);
170} 158}
171 159
172/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 160/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
173 * and checks for various things that may stop it. 161 * and checks for various things that may stop it.
174 */ 162 */
175 163
176void 164void
177move_bolt (object *op) 165move_bolt (object *op)
178{ 166{
179 object *tmp;
180 int mflags; 167 int mflags;
181 sint16 x, y; 168 sint16 x, y;
182 mapstruct *m; 169 maptile *m;
183 170
184 if (--(op->duration) < 0) 171 if (--op->duration < 0)
185 { 172 {
186 remove_ob (op); 173 op->destroy ();
187 free_object (op);
188 return; 174 return;
189 } 175 }
190 176
191 hit_map (op, 0, op->attacktype, 1); 177 hit_map (op, 0, op->attacktype, 1);
192 178
193 if (!op->direction) 179 if (!op->direction)
194 return; 180 return;
195 181
196 if (--op->range < 0) 182 if (--op->range < 0)
197 {
198 op->range = 0; 183 op->range = 0;
199 }
200 else 184 else
201 { 185 {
202 x = op->x + DIRX (op); 186 x = op->x + DIRX (op);
203 y = op->y + DIRY (op); 187 y = op->y + DIRY (op);
204 m = op->map; 188 m = op->map;
… …
212 * on the space. So only call reflwall if we think the data it returns 196 * on the space. So only call reflwall if we think the data it returns
213 * will be useful. 197 * will be useful.
214 */ 198 */
215 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 199 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
216 { 200 {
217
218 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 201 if (!QUERY_FLAG (op, FLAG_REFLECTING))
219 return; 202 return;
220 203
221 /* Since walls don't run diagonal, if the bolt is in 204 /* Since walls don't run diagonal, if the bolt is in
222 * one of 4 main directions, it just reflects back in the 205 * one of 4 main directions, it just reflects back in the
… …
252 else if (left) 235 else if (left)
253 op->direction = absdir (op->direction + 2); 236 op->direction = absdir (op->direction + 2);
254 else if (right) 237 else if (right)
255 op->direction = absdir (op->direction - 2); 238 op->direction = absdir (op->direction - 2);
256 } 239 }
240
257 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 241 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
258 return; 242 return;
259 } 243 }
260 else 244 else
261 { /* Create a copy of this object and put it ahead */ 245 { /* Create a copy of this object and put it ahead */
262 tmp = get_object (); 246 object *tmp = op->clone ();
263 copy_object (op, tmp); 247
248 m->insert (tmp, x, y, op);
264 tmp->speed_left = -0.1; 249 tmp->speed_left = -0.1f;
265 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
266 tmp = insert_ob_in_map (tmp, op->map, op, 0);
267 /* To make up for the decrease at the top of the function */ 250 /* To make up for the decrease at the top of the function */
268 tmp->duration++; 251 tmp->duration++;
269 252
270 /* New forking code. Possibly create forks of this object 253 /* New forking code. Possibly create forks of this object
271 * going off in other directions. 254 * going off in other directions.
272 */ 255 */
273
274 if (rndm (0, 99) < tmp->stats.Dex) 256 if (rndm (0, 99) < tmp->stats.Dex)
275 { /* stats.Dex % of forking */ 257 { /* stats.Dex % of forking */
276 forklightning (op, tmp); 258 forklightning (op, tmp);
277 } 259 }
260
278 /* In this way, the object left behind sticks on the space, but 261 /* In this way, the object left behind sticks on the space, but
279 * doesn't create any bolts that continue to move onward. 262 * doesn't create any bolts that continue to move onward.
280 */ 263 */
281 op->range = 0; 264 op->range = 0;
282 } /* copy object and move it along */ 265 } /* copy object and move it along */
… …
289 * we remove the magic flag - that can be derived from 272 * we remove the magic flag - that can be derived from
290 * spob->attacktype. 273 * spob->attacktype.
291 * This function sets up the appropriate owner and skill 274 * This function sets up the appropriate owner and skill
292 * pointers. 275 * pointers.
293 */ 276 */
294
295int 277int
296fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 278fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
297{ 279{
298 object *tmp = NULL; 280 object *tmp = NULL;
299 int mflags; 281 int mflags;
… …
317 299
318 tmp->direction = dir; 300 tmp->direction = dir;
319 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 301 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
320 SET_ANIMATION (tmp, dir); 302 SET_ANIMATION (tmp, dir);
321 303
322 set_owner (tmp, op); 304 tmp->set_owner (op);
323 set_spell_skill (op, caster, spob, tmp); 305 set_spell_skill (op, caster, spob, tmp);
324 306
325 tmp->x = op->x + DIRX (tmp); 307 tmp->x = op->x + DIRX (tmp);
326 tmp->y = op->y + DIRY (tmp); 308 tmp->y = op->y + DIRY (tmp);
327 tmp->map = op->map; 309 tmp->map = op->map;
328 310
311 maptile *newmap;
329 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 312 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
330 if (mflags & P_OUT_OF_MAP) 313 if (mflags & P_OUT_OF_MAP)
331 { 314 {
332 free_object (tmp); 315 tmp->destroy ();
333 return 0; 316 return 0;
334 } 317 }
318
319 tmp->map = newmap;
320
335 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 321 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
336 { 322 {
337 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 323 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
338 { 324 {
339 free_object (tmp); 325 tmp->destroy ();
340 return 0; 326 return 0;
341 } 327 }
328
342 tmp->x = op->x; 329 tmp->x = op->x;
343 tmp->y = op->y; 330 tmp->y = op->y;
344 tmp->direction = absdir (tmp->direction + 4); 331 tmp->direction = absdir (tmp->direction + 4);
345 tmp->map = op->map; 332 tmp->map = op->map;
346 } 333 }
347 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 334
335 if ((tmp = tmp->insert_at (tmp, op)))
348 move_bolt (tmp); 336 move_bolt (tmp);
337
349 return 1; 338 return 1;
350} 339}
351
352
353 340
354/*************************************************************************** 341/***************************************************************************
355 * 342 *
356 * BULLET/BALL CODE 343 * BULLET/BALL CODE
357 * 344 *
358 ***************************************************************************/ 345 ***************************************************************************/
359 346
360/* expands an explosion. op is a piece of the 347/* expands an explosion. op is a piece of the
361 * explosion - this expans it in the different directions. 348 * explosion - this expands it in the different directions.
362 * At least that is what I think this does. 349 * At least that is what I think this does.
363 */ 350 */
364void 351void
365explosion (object *op) 352explosion (object *op)
366{ 353{
367 object *tmp;
368 mapstruct *m = op->map; 354 maptile *m = op->map;
369 int i; 355 int i;
370 356
371 if (--(op->duration) < 0) 357 if (--op->duration < 0)
372 {
373 remove_ob (op);
374 free_object (op);
375 return;
376 } 358 {
359 op->destroy ();
360 return;
361 }
362
377 hit_map (op, 0, op->attacktype, 0); 363 hit_map (op, 0, op->attacktype, 0);
378 364
379 if (op->range > 0) 365 if (op->range > 0)
380 { 366 {
381 for (i = 1; i < 9; i++) 367 for (i = 1; i < 9; i++)
382 { 368 {
383 sint16 dx, dy; 369 sint16 dx, dy;
384 370
385 dx = op->x + freearr_x[i]; 371 dx = op->x + freearr_x[i];
386 dy = op->y + freearr_y[i]; 372 dy = op->y + freearr_y[i];
373
387 /* ok_to_put_more already does things like checks for walls, 374 /* ok_to_put_more already does things like checks for walls,
388 * out of map, etc. 375 * out of map, etc.
389 */ 376 */
390 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 377 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
391 { 378 {
392 tmp = get_object (); 379 object *tmp = op->clone ();
393 copy_object (op, tmp); 380
394 tmp->state = 0; 381 tmp->state = 0;
395 tmp->speed_left = -0.21; 382 tmp->speed_left = -0.21f;
396 tmp->range--; 383 tmp->range--;
397 tmp->value = 0; 384 tmp->value = 0;
398 tmp->x = dx; 385
399 tmp->y = dy; 386 m->insert (tmp, dx, dy, op);
400 insert_ob_in_map (tmp, m, op, 0);
401 } 387 }
402 } 388 }
403 } 389 }
404} 390}
405
406 391
407/* Causes an object to explode, eg, a firebullet, 392/* Causes an object to explode, eg, a firebullet,
408 * poison cloud ball, etc. op is the object to 393 * poison cloud ball, etc. op is the object to
409 * explode. 394 * explode.
410 */ 395 */
411void 396void
412explode_bullet (object *op) 397explode_bullet (object *op)
413{ 398{
414 tag_t op_tag = op->count;
415 object *tmp, *owner; 399 object *tmp, *owner;
416 400
417 if (op->other_arch == NULL) 401 if (op->other_arch == NULL)
418 { 402 {
419 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 403 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
420 remove_ob (op); 404 op->destroy ();
421 free_object (op);
422 return; 405 return;
423 } 406 }
424 407
425 if (op->env) 408 if (op->env)
426 { 409 {
427 object *env; 410 object *env = op->outer_env ();
428 411
429 env = object_get_env_recursive (op);
430 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 412 if (!env->map || out_of_map (env->map, env->x, env->y))
431 { 413 {
432 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 414 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
433 remove_ob (op); 415 op->destroy ();
434 free_object (op);
435 return; 416 return;
436 } 417 }
437 remove_ob (op); 418
438 op->x = env->x; 419 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
439 op->y = env->y;
440 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
441 } 420 }
442 else if (out_of_map (op->map, op->x, op->y)) 421 else if (out_of_map (op->map, op->x, op->y))
443 { 422 {
444 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 423 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
445 remove_ob (op); 424 op->destroy ();
446 free_object (op);
447 return; 425 return;
448 } 426 }
449 427
450 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 428 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
451 // NOTE: If this breaks something important: remove this. I can't think of anything 429 // NOTE: If this breaks something important: remove this. I can't think of anything
452 // bad at the moment that might happen from this. 430 // bad at the moment that might happen from this.
453 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 431 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
454 { 432 {
455 remove_ob (op); 433 op->destroy ();
456 free_object (op);
457 return; 434 return;
458 } 435 }
459 436
460 if (op->attacktype) 437 if (op->attacktype)
461 { 438 {
462 hit_map (op, 0, op->attacktype, 1); 439 hit_map (op, 0, op->attacktype, 1);
463 if (was_destroyed (op, op_tag)) 440 if (op->destroyed ())
464 return; 441 return;
465 } 442 }
466 443
467 /* other_arch contains what this explodes into */ 444 /* other_arch contains what this explodes into */
468 tmp = arch_to_object (op->other_arch); 445 tmp = arch_to_object (op->other_arch);
469 446
470 copy_owner (tmp, op); 447 tmp->set_owner (op);
471 tmp->skill = op->skill; 448 tmp->skill = op->skill;
472 449
473 owner = get_owner (op); 450 owner = op->owner;
474 451
475 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))
476 { 453 {
477 remove_ob (op); 454 op->destroy ();
478 free_object (op);
479 return; 455 return;
480 } 456 }
481
482 tmp->x = op->x;
483 tmp->y = op->y;
484 457
485 /* special for bombs - it actually has sane values for these */ 458 /* special for bombs - it actually has sane values for these */
486 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 459 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
487 { 460 {
488 tmp->attacktype = op->attacktype; 461 tmp->attacktype = op->attacktype;
… …
492 } 465 }
493 else 466 else
494 { 467 {
495 if (op->attacktype & AT_MAGIC) 468 if (op->attacktype & AT_MAGIC)
496 tmp->attacktype |= AT_MAGIC; 469 tmp->attacktype |= AT_MAGIC;
470
497 /* Spell doc describes what is going on here */ 471 /* Spell doc describes what is going on here */
498 tmp->stats.dam = op->dam_modifier; 472 tmp->stats.dam = op->dam_modifier;
499 tmp->range = op->stats.maxhp; 473 tmp->range = op->stats.maxhp;
500 tmp->duration = op->stats.hp; 474 tmp->duration = op->stats.hp;
501 /* 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 -
… …
509 tmp->stats.sp = op->direction; 483 tmp->stats.sp = op->direction;
510 484
511 /* Prevent recursion */ 485 /* Prevent recursion */
512 op->move_on = 0; 486 op->move_on = 0;
513 487
514 insert_ob_in_map (tmp, op->map, op, 0); 488 tmp->insert_at (op, op);
489 tmp->play_sound (tmp->sound);
490
515 /* remove the firebullet */ 491 /* remove the firebullet */
516 if (!was_destroyed (op, op_tag)) 492 op->destroy ();
517 {
518 remove_ob (op);
519 free_object (op);
520 }
521} 493}
522
523
524 494
525/* checks to see what op should do, given the space it is on 495/* checks to see what op should do, given the space it is on
526 * (eg, explode, damage player, etc) 496 * (eg, explode, damage player, etc)
527 */ 497 */
528
529void 498void
530check_bullet (object *op) 499check_bullet (object *op)
531{ 500{
532 tag_t op_tag = op->count, tmp_tag;
533 object *tmp; 501 object *tmp;
534 int dam, mflags; 502 int dam, mflags;
535 mapstruct *m; 503 maptile *m;
536 sint16 sx, sy; 504 sint16 sx, sy;
537 505
538 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy); 506 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
539 507
540 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 508 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
… …
549 517
550 /* If nothing alive on this space, no reason to do anything further */ 518 /* If nothing alive on this space, no reason to do anything further */
551 if (!(mflags & P_IS_ALIVE)) 519 if (!(mflags & P_IS_ALIVE))
552 return; 520 return;
553 521
554 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 522 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
555 { 523 {
556 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 524 if (QUERY_FLAG (tmp, FLAG_ALIVE))
557 { 525 {
558 tmp_tag = tmp->count;
559 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 526 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
560 if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0) 527 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
561 { 528 {
562 if (!QUERY_FLAG (op, FLAG_REMOVED)) 529 if (!QUERY_FLAG (op, FLAG_REMOVED))
563 { 530 {
564 remove_ob (op); 531 op->destroy ();
565 free_object (op);
566 return; 532 return;
567 } 533 }
568 } 534 }
569 } 535 }
570 } 536 }
571} 537}
572
573 538
574/* Basically, we move 'op' one square, and if it hits something, 539/* Basically, we move 'op' one square, and if it hits something,
575 * call check_bullet. 540 * call check_bullet.
576 * This function is only applicable to bullets, but not to all 541 * This function is only applicable to bullets, but not to all
577 * fired arches (eg, bolts). 542 * fired arches (eg, bolts).
578 */ 543 */
579
580void 544void
581move_bullet (object *op) 545move_bullet (object *op)
582{ 546{
583 sint16 new_x, new_y; 547 sint16 new_x, new_y;
584 int mflags; 548 int mflags;
585 mapstruct *m; 549 maptile *m;
586 550
587#if 0 551#if 0
588 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
589 553
590 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
591 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
592 if (op->stats.sp == SP_METEOR) 556 if (op->stats.sp == SP_METEOR)
593 { 557 {
594 replace_insert_ob_in_map ("fire_trail", op); 558 replace_insert_ob_in_map ("fire_trail", op);
595 if (was_destroyed (op, op_tag)) 559 if (op->destroyed ())
596 return; 560 return;
597 } /* end addition. */ 561 } /* end addition. */
598#endif 562#endif
599 563
600 /* Reached the end of its life - remove it */ 564 /* Reached the end of its life - remove it */
601 if (--op->range <= 0) 565 if (--op->range <= 0)
602 { 566 {
603 if (op->other_arch) 567 if (op->other_arch)
604 {
605 explode_bullet (op); 568 explode_bullet (op);
606 }
607 else 569 else
608 { 570 op->destroy ();
609 remove_ob (op); 571
610 free_object (op);
611 }
612 return; 572 return;
613 } 573 }
614 574
615 new_x = op->x + DIRX (op); 575 new_x = op->x + DIRX (op);
616 new_y = op->y + DIRY (op); 576 new_y = op->y + DIRY (op);
617 m = op->map; 577 m = op->map;
618 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 578 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
619 579
620 if (mflags & P_OUT_OF_MAP) 580 if (mflags & P_OUT_OF_MAP)
621 { 581 {
622 remove_ob (op); 582 op->destroy ();
623 free_object (op);
624 return; 583 return;
625 } 584 }
626 585
627 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 586 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
628 { 587 {
629 if (op->other_arch) 588 if (op->other_arch)
630 {
631 explode_bullet (op); 589 explode_bullet (op);
632 }
633 else 590 else
634 { 591 op->destroy ();
635 remove_ob (op);
636 free_object (op);
637 }
638 return;
639 }
640 592
641 remove_ob (op); 593 return;
642 op->x = new_x; 594 }
643 op->y = new_y; 595
644 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL) 596 if (!(op = m->insert (op, new_x, new_y, op)))
645 return; 597 return;
646 598
647 if (reflwall (op->map, op->x, op->y, op)) 599 if (reflwall (op->map, op->x, op->y, op))
648 { 600 {
649 op->direction = absdir (op->direction + 4); 601 op->direction = absdir (op->direction + 4);
650 update_turn_face (op); 602 update_turn_face (op);
651 } 603 }
652 else 604 else
653 {
654 check_bullet (op); 605 check_bullet (op);
655 }
656} 606}
657
658
659
660 607
661/* fire_bullet 608/* fire_bullet
662 * object op (cast from caster) files a bolt in dir. 609 * object op (cast from caster) files a bolt in dir.
663 * spob is the spell object for the bolt. 610 * spob is the spell object for the bolt.
664 * we remove the magic flag - that can be derived from 611 * we remove the magic flag - that can be derived from
665 * spob->attacktype. 612 * spob->attacktype.
666 * This function sets up the appropriate owner and skill 613 * This function sets up the appropriate owner and skill
667 * pointers. 614 * pointers.
668 */ 615 */
669
670int 616int
671fire_bullet (object *op, object *caster, int dir, object *spob) 617fire_bullet (object *op, object *caster, int dir, object *spob)
672{ 618{
673 object *tmp = NULL; 619 object *tmp = NULL;
674 int mflags; 620 int mflags;
… …
695 641
696 tmp->direction = dir; 642 tmp->direction = dir;
697 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 643 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
698 SET_ANIMATION (tmp, dir); 644 SET_ANIMATION (tmp, dir);
699 645
700 set_owner (tmp, op); 646 tmp->set_owner (op);
701 set_spell_skill (op, caster, spob, tmp); 647 set_spell_skill (op, caster, spob, tmp);
702 648
703 tmp->x = op->x + freearr_x[dir]; 649 tmp->x = op->x + freearr_x[dir];
704 tmp->y = op->y + freearr_y[dir]; 650 tmp->y = op->y + freearr_y[dir];
705 tmp->map = op->map; 651 tmp->map = op->map;
706 652
653 maptile *newmap;
707 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 654 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
708 if (mflags & P_OUT_OF_MAP) 655 if (mflags & P_OUT_OF_MAP)
709 { 656 {
710 free_object (tmp); 657 tmp->destroy ();
711 return 0; 658 return 0;
712 } 659 }
660
661 tmp->map = newmap;
662
713 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 663 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
714 { 664 {
715 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 665 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
716 { 666 {
717 free_object (tmp); 667 tmp->destroy ();
718 return 0; 668 return 0;
719 } 669 }
670
720 tmp->x = op->x; 671 tmp->x = op->x;
721 tmp->y = op->y; 672 tmp->y = op->y;
722 tmp->direction = absdir (tmp->direction + 4); 673 tmp->direction = absdir (tmp->direction + 4);
723 tmp->map = op->map; 674 tmp->map = op->map;
724 } 675 }
725 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 676
726 { 677 if ((tmp = tmp->insert_at (tmp, op)))
727 check_bullet (tmp); 678 check_bullet (tmp);
728 } 679
729 return 1; 680 return 1;
730} 681}
731
732
733
734 682
735/***************************************************************************** 683/*****************************************************************************
736 * 684 *
737 * CONE RELATED FUNCTIONS 685 * CONE RELATED FUNCTIONS
738 * 686 *
739 *****************************************************************************/ 687 *****************************************************************************/
740 688
741
742/* drops an object based on what is in the cone's "other_arch" */ 689/* drops an object based on what is in the cone's "other_arch" */
743void 690void
744cone_drop (object *op) 691cone_drop (object *op)
745{ 692{
746 object *new_ob = arch_to_object (op->other_arch); 693 object *new_ob = arch_to_object (op->other_arch);
747 694
748 new_ob->x = op->x;
749 new_ob->y = op->y;
750 new_ob->level = op->level; 695 new_ob->level = op->level;
751 set_owner (new_ob, op->owner); 696 new_ob->set_owner (op->owner);
752 697
753 /* preserve skill ownership */ 698 /* preserve skill ownership */
754 if (op->skill && op->skill != new_ob->skill) 699 if (op->skill && op->skill != new_ob->skill)
755 {
756 new_ob->skill = op->skill; 700 new_ob->skill = op->skill;
757 }
758 insert_ob_in_map (new_ob, op->map, op, 0);
759 701
702 new_ob->insert_at (op, op);
760} 703}
761 704
762/* move_cone: causes cone object 'op' to move a space/hit creatures */ 705/* move_cone: causes cone object 'op' to move a space/hit creatures */
763 706
764void 707void
765move_cone (object *op) 708move_cone (object *op)
766{ 709{
767 int i; 710 int i;
768 tag_t tag;
769 711
770 /* if no map then hit_map will crash so just ignore object */ 712 /* if no map then hit_map will crash so just ignore object */
771 if (!op->map) 713 if (!op->map)
772 { 714 {
773 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 715 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
774 op->speed = 0; 716 op->set_speed (0);
775 update_ob_speed (op);
776 return; 717 return;
777 } 718 }
778 719
779 /* lava saves it's life, but not yours :) */ 720 /* lava saves it's life, but not yours :) */
780 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 721 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
786#if 0 727#if 0
787 /* Disable this - enabling it makes monsters easier, as 728 /* Disable this - enabling it makes monsters easier, as
788 * when their cone dies when they die. 729 * when their cone dies when they die.
789 */ 730 */
790 /* If no owner left, the spell dies out. */ 731 /* If no owner left, the spell dies out. */
791 if (get_owner (op) == NULL) 732 if (op->owner == NULL)
792 { 733 {
793 remove_ob (op); 734 op->destroy ();
794 free_object (op);
795 return; 735 return;
796 } 736 }
797#endif 737#endif
798 738
799 tag = op->count;
800 hit_map (op, 0, op->attacktype, 0); 739 hit_map (op, 0, op->attacktype, 0);
801 740
802 /* Check to see if we should push anything. 741 /* Check to see if we should push anything.
803 * Spell objects with weight push whatever they encounter to some 742 * Spell objects with weight push whatever they encounter to some
804 * degree. 743 * degree.
805 */ 744 */
806 if (op->weight) 745 if (op->weight)
807 check_spell_knockback (op); 746 check_spell_knockback (op);
808 747
809 if (was_destroyed (op, tag)) 748 if (op->destroyed ())
810 return; 749 return;
811 750
812 if ((op->duration--) < 0) 751 if ((op->duration--) < 0)
813 { 752 {
814 remove_ob (op); 753 op->destroy ();
815 free_object (op);
816 return; 754 return;
817 } 755 }
818 /* Object has hit maximum range, so don't have it move 756 /* Object has hit maximum range, so don't have it move
819 * any further. When the duration above expires, 757 * any further. When the duration above expires,
820 * then the object will get removed. 758 * then the object will get removed.
… …
829 { 767 {
830 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 768 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
831 769
832 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 770 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
833 { 771 {
834 object *tmp = get_object (); 772 object *tmp = op->clone ();
835
836 copy_object (op, tmp);
837 tmp->x = x;
838 tmp->y = y;
839 773
840 tmp->duration = op->duration + 1; 774 tmp->duration = op->duration + 1;
841 775
842 /* Use for spell tracking - see ok_to_put_more() */ 776 /* Use for spell tracking - see ok_to_put_more() */
843 tmp->stats.maxhp = op->stats.maxhp; 777 tmp->stats.maxhp = op->stats.maxhp;
844 insert_ob_in_map (tmp, op->map, op, 0); 778
779 op->map->insert (tmp, x, y, op);
780
845 if (tmp->other_arch) 781 if (tmp->other_arch)
846 cone_drop (tmp); 782 cone_drop (tmp);
847 } 783 }
848 } 784 }
849} 785}
… …
859int 795int
860cast_cone (object *op, object *caster, int dir, object *spell) 796cast_cone (object *op, object *caster, int dir, object *spell)
861{ 797{
862 object *tmp; 798 object *tmp;
863 int i, success = 0, range_min = -1, range_max = 1; 799 int i, success = 0, range_min = -1, range_max = 1;
864 mapstruct *m; 800 maptile *m;
865 sint16 sx, sy; 801 sint16 sx, sy;
866 MoveType movetype; 802 MoveType movetype;
867 803
868 if (!spell->other_arch) 804 if (!spell->other_arch)
869 return 0; 805 return 0;
… …
882 818
883 /* Need to know what the movetype of the object we are about 819 /* Need to know what the movetype of the object we are about
884 * to create is, so we can know if the space we are about to 820 * to create is, so we can know if the space we are about to
885 * insert it into is blocked. 821 * insert it into is blocked.
886 */ 822 */
887 movetype = spell->other_arch->clone.move_type; 823 movetype = spell->other_arch->move_type;
888 824
889 for (i = range_min; i <= range_max; i++) 825 for (i = range_min; i <= range_max; i++)
890 { 826 {
891 sint16 x, y, d; 827 sint16 x, y, d;
892 828
… …
925 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 861 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
926 continue; 862 continue;
927 863
928 success = 1; 864 success = 1;
929 tmp = arch_to_object (spell->other_arch); 865 tmp = arch_to_object (spell->other_arch);
930 set_owner (tmp, op); 866 tmp->set_owner (op);
931 set_spell_skill (op, caster, spell, tmp); 867 set_spell_skill (op, caster, spell, tmp);
932 tmp->level = caster_level (caster, spell); 868 tmp->level = caster_level (caster, spell);
933 tmp->x = sx;
934 tmp->y = sy;
935 tmp->attacktype = spell->attacktype; 869 tmp->attacktype = spell->attacktype;
936 870
937 /* holy word stuff */ 871 /* holy word stuff */
938 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 872 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
939 if (!tailor_god_spell (tmp, op)) 873 if (!tailor_god_spell (tmp, op))
… …
973 else 907 else
974 tmp->duration += caster->level / 3; 908 tmp->duration += caster->level / 3;
975 } 909 }
976 910
977 if (!(tmp->move_type & MOVE_FLY_LOW)) 911 if (!(tmp->move_type & MOVE_FLY_LOW))
978 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 912 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
979 913
980 if (!tmp->move_on && tmp->stats.dam) 914 if (!tmp->move_on && tmp->stats.dam)
981 {
982 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 915 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
983 }
984 916
985 insert_ob_in_map (tmp, m, op, 0); 917 m->insert (tmp, sx, sy, op);
986 918
987 /* This is used for tracking spells so that one effect doesn't hit 919 /* This is used for tracking spells so that one effect doesn't hit
988 * a single space too many times. 920 * a single space too many times.
989 */ 921 */
990 tmp->stats.maxhp = tmp->count; 922 tmp->stats.maxhp = tmp->count;
… …
1000 * 932 *
1001 * BOMB related code 933 * BOMB related code
1002 * 934 *
1003 ****************************************************************************/ 935 ****************************************************************************/
1004 936
1005
1006/* This handles an exploding bomb. 937/* This handles an exploding bomb.
1007 * op is the original bomb object. 938 * op is the original bomb object.
1008 */ 939 */
1009void 940void
1010animate_bomb (object *op) 941animate_bomb (object *op)
1011{ 942{
1012 int i;
1013 object *env, *tmp;
1014 archetype *at;
1015
1016 if (op->state != NUM_ANIMATIONS (op) - 1) 943 if (op->state != NUM_ANIMATIONS (op) - 1)
1017 return; 944 return;
1018 945
1019 env = object_get_env_recursive (op); 946 object *env = op->outer_env ();
1020 947
1021 if (op->env) 948 if (op->env)
1022 { 949 {
1023 if (env->map == NULL) 950 if (env->map == NULL)
1024 return; 951 return;
1025 952
1026 if (env->type == PLAYER) 953 if (env->type == PLAYER)
1027 esrv_del_item (env->contr, op->count); 954 esrv_del_item (env->contr, op->count);
1028 955
1029 remove_ob (op); 956 if (!(op = op->insert_at (env, op)))
1030 op->x = env->x;
1031 op->y = env->y;
1032 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1033 return; 957 return;
1034 } 958 }
1035 959
1036 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 960 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1037 // on a safe map. I don't like this special casing, but it seems to be neccessary 961 // on a safe map. I don't like this special casing, but it seems to be neccessary
1038 // as bombs can be carried. 962 // as bombs can be carried.
1039 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 963 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1040 { 964 {
1041 remove_ob (op); 965 op->destroy ();
1042 free_object (op);
1043 return; 966 return;
1044 } 967 }
1045 968
1046 /* This copies a lot of the code from the fire bullet, 969 /* This copies a lot of the code from the fire bullet,
1047 * but using the cast_bullet isn't really feasible, 970 * but using the cast_bullet isn't really feasible,
1048 * so just set up the appropriate values. 971 * so just set up the appropriate values.
1049 */ 972 */
1050 at = archetype::find (SPLINT); 973 if (archetype *at = archetype::find (SPLINT))
1051 if (at)
1052 { 974 {
1053 for (i = 1; i < 9; i++) 975 for (int i = 1; i < 9; i++)
1054 { 976 {
1055 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 977 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1056 continue; 978 continue;
979
1057 tmp = arch_to_object (at); 980 object *tmp = arch_to_object (at);
1058 tmp->direction = i; 981 tmp->direction = i;
1059 tmp->range = op->range; 982 tmp->range = op->range;
1060 tmp->stats.dam = op->stats.dam; 983 tmp->stats.dam = op->stats.dam;
1061 tmp->duration = op->duration; 984 tmp->duration = op->duration;
1062 tmp->attacktype = op->attacktype; 985 tmp->attacktype = op->attacktype;
1063 copy_owner (tmp, op); 986 tmp->set_owner (op);
1064 if (op->skill && op->skill != tmp->skill) 987 if (op->skill && op->skill != tmp->skill)
1065 {
1066 tmp->skill = op->skill; 988 tmp->skill = op->skill;
1067 } 989
1068 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 990 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1069 SET_ANIMATION (tmp, i); 991 SET_ANIMATION (tmp, i);
1070 tmp->x = op->x + freearr_x[i]; 992
1071 tmp->y = op->y + freearr_x[i]; 993 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1072 insert_ob_in_map (tmp, op->map, op, 0);
1073 move_bullet (tmp); 994 move_bullet (tmp);
1074 } 995 }
1075 } 996 }
1076 997
1077 explode_bullet (op); 998 explode_bullet (op);
1078} 999}
1079 1000
1080int 1001int
1081create_bomb (object *op, object *caster, int dir, object *spell) 1002create_bomb (object *op, object *caster, int dir, object *spell)
1082{ 1003{
1083
1084 object *tmp; 1004 object *tmp;
1085 int mflags; 1005 int mflags;
1086 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1006 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1087 mapstruct *m; 1007 maptile *m;
1088 1008
1089 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1009 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1090 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1010 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1091 { 1011 {
1092 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1012 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1093 return 0; 1013 return 0;
1094 } 1014 }
1015
1095 tmp = arch_to_object (spell->other_arch); 1016 tmp = arch_to_object (spell->other_arch);
1096 1017
1097 /* level dependencies for bomb */ 1018 /* level dependencies for bomb */
1098 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1019 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1099 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1020 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1100 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1021 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1101 tmp->attacktype = spell->attacktype; 1022 tmp->attacktype = spell->attacktype;
1102 1023
1103 set_owner (tmp, op); 1024 tmp->set_owner (op);
1104 set_spell_skill (op, caster, spell, tmp); 1025 set_spell_skill (op, caster, spell, tmp);
1105 tmp->x = dx; 1026
1106 tmp->y = dy; 1027 m->insert (tmp, dx, dy, op);
1107 insert_ob_in_map (tmp, m, op, 0);
1108 return 1; 1028 return 1;
1109} 1029}
1110 1030
1111/**************************************************************************** 1031/****************************************************************************
1112 * 1032 *
… …
1121 * dir is the direction to look in. 1041 * dir is the direction to look in.
1122 * range is how far out to look. 1042 * range is how far out to look.
1123 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1043 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1124 * this info is used for blocked magic/unholy spaces. 1044 * this info is used for blocked magic/unholy spaces.
1125 */ 1045 */
1126
1127object * 1046object *
1128get_pointed_target (object *op, int dir, int range, int type) 1047get_pointed_target (object *op, int dir, int range, int type)
1129{ 1048{
1130 object *target; 1049 object *target;
1131 sint16 x, y; 1050 sint16 x, y;
1132 int dist, mflags; 1051 int dist, mflags;
1133 mapstruct *mp; 1052 maptile *mp;
1134 1053
1135 if (dir == 0) 1054 if (dir == 0)
1136 return NULL; 1055 return NULL;
1137 1056
1138 for (dist = 1; dist < range; dist++) 1057 for (dist = 1; dist < range; dist++)
… …
1150 return NULL; 1069 return NULL;
1151 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1070 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1152 return NULL; 1071 return NULL;
1153 1072
1154 if (mflags & P_IS_ALIVE) 1073 if (mflags & P_IS_ALIVE)
1155 {
1156 for (target = get_map_ob (mp, x, y); target; target = target->above) 1074 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1157 { 1075 if (QUERY_FLAG (target, FLAG_MONSTER))
1158 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1159 {
1160 return target; 1076 return target;
1161 }
1162 }
1163 }
1164 } 1077 }
1078
1165 return NULL; 1079 return NULL;
1166} 1080}
1167
1168 1081
1169/* cast_smite_arch() - the priest points to a creature and causes 1082/* cast_smite_arch() - the priest points to a creature and causes
1170 * a 'godly curse' to decend. 1083 * a 'godly curse' to decend.
1171 * usual params - 1084 * usual params -
1172 * op = player 1085 * op = player
1173 * caster = object casting the spell. 1086 * caster = object casting the spell.
1174 * dir = direction being cast 1087 * dir = direction being cast
1175 * spell = spell object 1088 * spell = spell object
1176 */ 1089 */
1177
1178int 1090int
1179cast_smite_spell (object *op, object *caster, int dir, object *spell) 1091cast_smite_spell (object *op, object *caster, int dir, object *spell)
1180{ 1092{
1181 object *effect, *target; 1093 object *effect, *target;
1182 object *god = find_god (determine_god (op)); 1094 object *god = find_god (determine_god (op));
… …
1228 if (effect->attacktype & AT_DEATH) 1140 if (effect->attacktype & AT_DEATH)
1229 { 1141 {
1230 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1142 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1231 1143
1232 /* casting death spells at undead isn't a good thing */ 1144 /* casting death spells at undead isn't a good thing */
1233 if QUERY_FLAG
1234 (target, FLAG_UNDEAD) 1145 if (QUERY_FLAG (target, FLAG_UNDEAD))
1235 { 1146 {
1236 if (random_roll (0, 2, op, PREFER_LOW)) 1147 if (random_roll (0, 2, op, PREFER_LOW))
1237 { 1148 {
1238 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1149 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1239 effect->x = op->x; 1150 effect->x = op->x;
… …
1241 } 1152 }
1242 else 1153 else
1243 { 1154 {
1244 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1155 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1245 target->stats.hp = target->stats.maxhp * 2; 1156 target->stats.hp = target->stats.maxhp * 2;
1246 free_object (effect); 1157 effect->destroy ();
1247 return 0; 1158 return 0;
1248 } 1159 }
1249 } 1160 }
1250 } 1161 }
1251 else 1162 else
1252 { 1163 {
1253 /* how much woe to inflict :) */ 1164 /* how much woe to inflict :) */
1254 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1165 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1255 } 1166 }
1256 1167
1257 set_owner (effect, op); 1168 effect->set_owner (op);
1258 set_spell_skill (op, caster, spell, effect); 1169 set_spell_skill (op, caster, spell, effect);
1259 1170
1260 /* ok, tell it where to be, and insert! */ 1171 /* ok, tell it where to be, and insert! */
1261 effect->x = target->x; 1172 effect->insert_at (target, op);
1262 effect->y = target->y;
1263 insert_ob_in_map (effect, target->map, op, 0);
1264 1173
1265 return 1; 1174 return 1;
1266} 1175}
1267
1268 1176
1269/**************************************************************************** 1177/****************************************************************************
1270 * 1178 *
1271 * MAGIC MISSILE code. 1179 * MAGIC MISSILE code.
1272 * note that the fire_bullet is used to fire the missile. The 1180 * note that the fire_bullet is used to fire the missile. The
… …
1278move_missile (object *op) 1186move_missile (object *op)
1279{ 1187{
1280 int i, mflags; 1188 int i, mflags;
1281 object *owner; 1189 object *owner;
1282 sint16 new_x, new_y; 1190 sint16 new_x, new_y;
1283 mapstruct *m; 1191 maptile *m;
1284 1192
1285 if (op->range-- <= 0) 1193 if (op->range-- <= 0)
1286 { 1194 {
1287 remove_ob (op); 1195 op->destroy ();
1288 free_object (op);
1289 return; 1196 return;
1290 } 1197 }
1291 1198
1292 owner = get_owner (op); 1199 owner = op->owner;
1293#if 0 1200#if 0
1294 /* It'd make things nastier if this wasn't here - spells cast by 1201 /* It'd make things nastier if this wasn't here - spells cast by
1295 * monster that are then killed would continue to survive 1202 * monster that are then killed would continue to survive
1296 */ 1203 */
1297 if (owner == NULL) 1204 if (owner == NULL)
1298 { 1205 {
1299 remove_ob (op); 1206 op->destroy ();
1300 free_object (op);
1301 return; 1207 return;
1302 } 1208 }
1303#endif 1209#endif
1304 1210
1305 new_x = op->x + DIRX (op); 1211 new_x = op->x + DIRX (op);
… …
1307 1213
1308 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1214 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1309 1215
1310 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))) 1216 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1311 { 1217 {
1312 tag_t tag = op->count;
1313
1314 hit_map (op, op->direction, AT_MAGIC, 1); 1218 hit_map (op, op->direction, AT_MAGIC, 1);
1315 /* Basically, missile only hits one thing then goes away. 1219 /* Basically, missile only hits one thing then goes away.
1316 * we need to remove it if someone hasn't already done so. 1220 * we need to remove it if someone hasn't already done so.
1317 */ 1221 */
1318 if (!was_destroyed (op, tag)) 1222 if (!op->destroyed ())
1319 { 1223 op->destroy ();
1320 remove_ob (op);
1321 free_object (op);
1322 }
1323 return;
1324 }
1325 1224
1326 remove_ob (op); 1225 return;
1226 }
1227
1228 op->remove ();
1229
1327 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1230 if (!op->direction || (mflags & P_OUT_OF_MAP))
1328 { 1231 {
1329 free_object (op); 1232 op->destroy ();
1330 return; 1233 return;
1331 } 1234 }
1332 op->x = new_x; 1235
1333 op->y = new_y; 1236 i = spell_find_dir (m, new_x, new_y, op->owner);
1334 op->map = m;
1335 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1336 if (i > 0 && i != op->direction) 1237 if (i > 0 && i != op->direction)
1337 { 1238 {
1338 op->direction = i; 1239 op->direction = i;
1339 SET_ANIMATION (op, op->direction); 1240 SET_ANIMATION (op, op->direction);
1340 } 1241 }
1341 insert_ob_in_map (op, op->map, op, 0); 1242
1243 m->insert (op, new_x, new_y, op);
1342} 1244}
1343 1245
1344/**************************************************************************** 1246/****************************************************************************
1345 * Destruction 1247 * Destruction
1346 ****************************************************************************/ 1248 ****************************************************************************/
… …
1349 * we do this by creating a force and inserting it in the 1251 * we do this by creating a force and inserting it in the
1350 * object. if time is 0, the object glows permanently. To truely 1252 * object. if time is 0, the object glows permanently. To truely
1351 * make this work for non-living objects, we would have to 1253 * make this work for non-living objects, we would have to
1352 * give them the capability to have an inventory. b.t. 1254 * give them the capability to have an inventory. b.t.
1353 */ 1255 */
1354
1355int 1256int
1356make_object_glow (object *op, int radius, int time) 1257make_object_glow (object *op, int radius, int time)
1357{ 1258{
1358 object *tmp;
1359
1360 /* some things are unaffected... */ 1259 /* some things are unaffected... */
1361 if (op->path_denied & PATH_LIGHT) 1260 if (op->path_denied & PATH_LIGHT)
1362 return 0; 1261 return 0;
1363 1262
1364 tmp = get_archetype (FORCE_NAME); 1263 object *tmp = get_archetype (FORCE_NAME);
1365 tmp->speed = 0.01; 1264 tmp->speed = 0.01;
1366 tmp->stats.food = time; 1265 tmp->stats.food = time;
1367 SET_FLAG (tmp, FLAG_IS_USED_UP); 1266 SET_FLAG (tmp, FLAG_IS_USED_UP);
1368 tmp->glow_radius = radius; 1267 tmp->glow_radius = radius;
1369 if (tmp->glow_radius > MAX_LIGHT_RADII) 1268 if (tmp->glow_radius > MAX_LIGHT_RADII)
1370 tmp->glow_radius = MAX_LIGHT_RADII; 1269 tmp->glow_radius = MAX_LIGHT_RADII;
1371 1270
1372 tmp->x = op->x;
1373 tmp->y = op->y;
1374 if (tmp->speed < MIN_ACTIVE_SPEED)
1375 tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1376 tmp = insert_ob_in_ob (tmp, op); 1271 tmp = insert_ob_in_ob (tmp, op);
1272
1377 if (tmp->glow_radius > op->glow_radius) 1273 if (tmp->glow_radius > op->glow_radius)
1378 op->glow_radius = tmp->glow_radius; 1274 op->glow_radius = tmp->glow_radius;
1379 1275
1380 if (!tmp->env || op != tmp->env)
1381 {
1382 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1383 return 0;
1384 }
1385 return 1; 1276 return 1;
1386} 1277}
1387
1388
1389
1390 1278
1391int 1279int
1392cast_destruction (object *op, object *caster, object *spell_ob) 1280cast_destruction (object *op, object *caster, object *spell_ob)
1393{ 1281{
1394 int i, j, range, mflags, friendly = 0, dam, dur; 1282 int i, j, range, mflags, friendly = 0, dam, dur;
1395 sint16 sx, sy; 1283 sint16 sx, sy;
1396 mapstruct *m; 1284 maptile *m;
1397 object *tmp; 1285 object *tmp;
1398 const char *skill; 1286 const char *skill;
1399 1287
1400 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1288 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1401 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1289 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1415 else if (caster->skill) 1303 else if (caster->skill)
1416 op->skill = caster->skill; 1304 op->skill = caster->skill;
1417 else 1305 else
1418 op->skill = NULL; 1306 op->skill = NULL;
1419 1307
1420 change_skill (op, find_skill_by_name (op, op->skill), 1); 1308 op->change_skill (find_skill_by_name (op, op->skill));
1421 1309
1422 for (i = -range; i < range; i++) 1310 for (i = -range; i < range; i++)
1423 { 1311 {
1424 for (j = -range; j < range; j++) 1312 for (j = -range; j < range; j++)
1425 { 1313 {
1426 m = op->map; 1314 m = op->map;
1427 sx = op->x + i; 1315 sx = op->x + i;
1428 sy = op->y + j; 1316 sy = op->y + j;
1317
1429 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1318 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1430 if (mflags & P_OUT_OF_MAP) 1319 if (mflags & P_OUT_OF_MAP)
1431 continue; 1320 continue;
1321
1432 if (mflags & P_IS_ALIVE) 1322 if (mflags & P_IS_ALIVE)
1433 { 1323 {
1434 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1324 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1435 {
1436 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1325 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1437 break; 1326 break;
1438 } 1327
1439 if (tmp) 1328 if (tmp)
1440 { 1329 {
1441 if (tmp->head) 1330 if (tmp->head)
1442 tmp = tmp->head; 1331 tmp = tmp->head;
1443 1332
… …
1446 { 1335 {
1447 if (spell_ob->subtype == SP_DESTRUCTION) 1336 if (spell_ob->subtype == SP_DESTRUCTION)
1448 { 1337 {
1449 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1338 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1450 if (spell_ob->other_arch) 1339 if (spell_ob->other_arch)
1451 {
1452 tmp = arch_to_object (spell_ob->other_arch); 1340 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1453 tmp->x = sx;
1454 tmp->y = sy;
1455 insert_ob_in_map (tmp, m, op, 0);
1456 }
1457 } 1341 }
1458 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1342 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1459 { 1343 {
1460 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1344 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1461 {
1462 object *effect = arch_to_object (spell_ob->other_arch); 1345 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1463
1464 effect->x = sx;
1465 effect->y = sy;
1466 insert_ob_in_map (effect, m, op, 0);
1467 }
1468 } 1346 }
1469 } 1347 }
1470 } 1348 }
1471 } 1349 }
1472 } 1350 }
1473 } 1351 }
1352
1474 op->skill = skill; 1353 op->skill = skill;
1475 return 1; 1354 return 1;
1476} 1355}
1477 1356
1478/*************************************************************************** 1357/***************************************************************************
… …
1492 { 1371 {
1493 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1372 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1494 return 0; 1373 return 0;
1495 } 1374 }
1496 1375
1376 tmp = tmp->head_ ();
1377
1497 /* If we've already got a force of this type, don't add a new one. */ 1378 /* If we've already got a force of this type, don't add a new one. */
1498 for (force = tmp->inv; force != NULL; force = force->below) 1379 for (force = tmp->inv; force; force = force->below)
1499 { 1380 {
1500 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1381 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1501 { 1382 {
1502 if (force->name == spell_ob->name) 1383 if (force->name == spell_ob->name)
1503 { 1384 {
… …
1509 return 0; 1390 return 0;
1510 } 1391 }
1511 } 1392 }
1512 } 1393 }
1513 1394
1514 if (force == NULL) 1395 if (!force)
1515 { 1396 {
1516 force = get_archetype (FORCE_NAME); 1397 force = get_archetype (FORCE_NAME);
1517 force->subtype = FORCE_CHANGE_ABILITY; 1398 force->subtype = FORCE_CHANGE_ABILITY;
1399
1518 if (spell_ob->race) 1400 if (spell_ob->race)
1519 force->name = spell_ob->race; 1401 force->name = spell_ob->race;
1520 else 1402 else
1521 force->name = spell_ob->name; 1403 force->name = spell_ob->name;
1522 1404
… …
1532 { 1414 {
1533 force->duration = duration; 1415 force->duration = duration;
1534 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1416 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1535 } 1417 }
1536 else 1418 else
1537 {
1538 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1419 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1539 } 1420
1540 return 1; 1421 return 1;
1541 } 1422 }
1423
1542 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1424 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1543 force->speed = 1.0; 1425 force->speed = 1.f;
1544 force->speed_left = -1.0; 1426 force->speed_left = -1.f;
1545 SET_FLAG (force, FLAG_APPLIED); 1427 SET_FLAG (force, FLAG_APPLIED);
1546 1428
1547 if (god) 1429 if (god)
1548 { 1430 {
1549 if (spell_ob->last_grace) 1431 if (spell_ob->last_grace)
… …
1562 force->stats.ac = spell_ob->stats.ac; 1444 force->stats.ac = spell_ob->stats.ac;
1563 force->stats.wc = spell_ob->stats.wc; 1445 force->stats.wc = spell_ob->stats.wc;
1564 1446
1565 change_abil (tmp, force); /* Mostly to display any messages */ 1447 change_abil (tmp, force); /* Mostly to display any messages */
1566 insert_ob_in_ob (force, tmp); 1448 insert_ob_in_ob (force, tmp);
1567 fix_player (tmp); 1449 tmp->update_stats ();
1568 return 1; 1450 return 1;
1569 1451
1570} 1452}
1571
1572 1453
1573/********************************************************************** 1454/**********************************************************************
1574 * mood change 1455 * mood change
1575 * Arguably, this may or may not be an attack spell. But since it 1456 * Arguably, this may or may not be an attack spell. But since it
1576 * effects monsters, it seems best to put it into this file 1457 * effects monsters, it seems best to put it into this file
… …
1583mood_change (object *op, object *caster, object *spell) 1464mood_change (object *op, object *caster, object *spell)
1584{ 1465{
1585 object *tmp, *god, *head; 1466 object *tmp, *god, *head;
1586 int done_one, range, mflags, level, at, best_at; 1467 int done_one, range, mflags, level, at, best_at;
1587 sint16 x, y, nx, ny; 1468 sint16 x, y, nx, ny;
1588 mapstruct *m; 1469 maptile *m;
1589 const char *race; 1470 const char *race;
1590 1471
1591 /* We precompute some values here so that we don't have to keep 1472 /* We precompute some values here so that we don't have to keep
1592 * doing it over and over again. 1473 * doing it over and over again.
1593 */ 1474 */
… …
1606 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1487 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1607 race = god->race; 1488 race = god->race;
1608 else 1489 else
1609 race = spell->race; 1490 race = spell->race;
1610 1491
1611
1612 for (x = op->x - range; x <= op->x + range; x++) 1492 for (x = op->x - range; x <= op->x + range; x++)
1613 for (y = op->y - range; y <= op->y + range; y++) 1493 for (y = op->y - range; y <= op->y + range; y++)
1614 { 1494 {
1615
1616 done_one = 0; 1495 done_one = 0;
1617 m = op->map; 1496 m = op->map;
1618 nx = x; 1497 nx = x;
1619 ny = y; 1498 ny = y;
1620 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1499 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1623 1502
1624 /* If there is nothing living on this space, no need to go further */ 1503 /* If there is nothing living on this space, no need to go further */
1625 if (!(mflags & P_IS_ALIVE)) 1504 if (!(mflags & P_IS_ALIVE))
1626 continue; 1505 continue;
1627 1506
1507 // players can only affect spaces that they can actually see
1508 if (caster && caster->contr
1509 && caster->contr->visibility_at (m, nx, ny) < 70)
1510 continue;
1511
1628 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1512 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1629 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1513 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1630 break; 1514 break;
1631 1515
1632 /* There can be living objects that are not monsters */ 1516 /* There can be living objects that are not monsters */
1633 if (!tmp || tmp->type == PLAYER) 1517 if (!tmp || tmp->type == PLAYER)
… …
1640 head = tmp; 1524 head = tmp;
1641 1525
1642 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1526 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1643 if (race && head->race && !strstr (race, head->race)) 1527 if (race && head->race && !strstr (race, head->race))
1644 continue; 1528 continue;
1529
1645 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1530 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1646 continue; 1531 continue;
1647 1532
1648 /* Now do a bunch of stuff related to saving throws */ 1533 /* Now do a bunch of stuff related to saving throws */
1649 best_at = -1; 1534 best_at = -1;
… …
1666 at -= level / 5; 1551 at -= level / 5;
1667 if (did_make_save (head, head->level, at)) 1552 if (did_make_save (head, head->level, at))
1668 continue; 1553 continue;
1669 } 1554 }
1670 else /* spell->attacktype */ 1555 else /* spell->attacktype */
1671 /*
1672 Spell has no attacktype (charm & such), so we'll have a specific saving:
1673 * if spell level < monster level, no go
1674 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1675
1676 The chance will then be in the range [20-70] percent, not too bad.
1677
1678 This is required to fix the 'charm monster' abuse, where a player level 1 can
1679 charm a level 125 monster...
1680
1681 Ryo, august 14th
1682 */
1683 { 1556 {
1557 /*
1558 Spell has no attacktype (charm & such), so we'll have a specific saving:
1559 * if spell level < monster level, no go
1560 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1561
1562 The chance will then be in the range [20-70] percent, not too bad.
1563
1564 This is required to fix the 'charm monster' abuse, where a player level 1 can
1565 charm a level 125 monster...
1566
1567 Ryo, august 14th
1568 */
1684 if (head->level > level) 1569 if (head->level > level)
1685 continue; 1570 continue;
1571
1686 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1572 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1687 /* Failed, no effect */ 1573 /* Failed, no effect */
1688 continue; 1574 continue;
1689 } 1575 }
1690 1576
1691 /* Done with saving throw. Now start effecting the monster */ 1577 /* Done with saving throw. Now start affecting the monster */
1692 1578
1693 /* aggravation */ 1579 /* aggravation */
1694 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1580 if (QUERY_FLAG (spell, FLAG_MONSTER))
1695 { 1581 {
1696 CLEAR_FLAG (head, FLAG_SLEEP); 1582 CLEAR_FLAG (head, FLAG_SLEEP);
1697 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1698 remove_friendly_object (head); 1583 remove_friendly_object (head);
1699
1700 done_one = 1; 1584 done_one = 1;
1701 head->enemy = op; 1585 head->enemy = op;
1702 } 1586 }
1703 1587
1704 /* calm monsters */ 1588 /* calm monsters */
… …
1713 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1597 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1714 { 1598 {
1715 SET_FLAG (head, FLAG_BERSERK); 1599 SET_FLAG (head, FLAG_BERSERK);
1716 done_one = 1; 1600 done_one = 1;
1717 } 1601 }
1602
1718 /* charm */ 1603 /* charm */
1719 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1604 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1720 { 1605 {
1721 SET_FLAG (head, FLAG_FRIENDLY);
1722 /* Prevent uncontolled outbreaks of self replicating monsters. 1606 /* Prevent uncontolled outbreaks of self replicating monsters.
1723 Typical use case is charm, go somwhere, use aggravation to make hostile. 1607 Typical use case is charm, go somwhere, use aggravation to make hostile.
1724 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1608 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1725 CLEAR_FLAG (head, FLAG_GENERATOR); 1609 CLEAR_FLAG (head, FLAG_GENERATOR);
1726 set_owner (head, op); 1610 head->set_owner (op);
1727 set_spell_skill (op, caster, spell, head); 1611 set_spell_skill (op, caster, spell, head);
1728 add_friendly_object (head); 1612 add_friendly_object (head);
1729 head->attack_movement = PETMOVE; 1613 head->attack_movement = PETMOVE;
1730 done_one = 1; 1614 done_one = 1;
1731 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1615 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1732 head->stats.exp = 0; 1616 head->stats.exp = 0;
1733 } 1617 }
1734 1618
1735 /* If a monster was effected, put an effect in */ 1619 /* If a monster was effected, put an effect in */
1736 if (done_one && spell->other_arch) 1620 if (done_one && spell->other_arch)
1737 {
1738 tmp = arch_to_object (spell->other_arch); 1621 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1739 tmp->x = nx;
1740 tmp->y = ny;
1741 insert_ob_in_map (tmp, m, op, 0);
1742 }
1743 } /* for y */ 1622 } /* for y */
1744 1623
1745 return 1; 1624 return 1;
1746} 1625}
1747 1626
… …
1757move_ball_spell (object *op) 1636move_ball_spell (object *op)
1758{ 1637{
1759 int i, j, dam_save, dir, mflags; 1638 int i, j, dam_save, dir, mflags;
1760 sint16 nx, ny, hx, hy; 1639 sint16 nx, ny, hx, hy;
1761 object *owner; 1640 object *owner;
1762 mapstruct *m; 1641 maptile *m;
1763 1642
1764 owner = get_owner (op); 1643 owner = op->owner;
1765 1644
1766 /* the following logic makes sure that the ball doesn't move into a wall, 1645 /* the following logic makes sure that the ball doesn't move into a wall,
1767 * and makes sure that it will move along a wall to try and get at it's 1646 * and makes sure that it will move along a wall to try and get at it's
1768 * victim. The block immediately below more or less chooses a random 1647 * victim. The block immediately below more or less chooses a random
1769 * offset to move the ball, eg, keep it mostly on course, with some 1648 * offset to move the ball, eg, keep it mostly on course, with some
… …
1798 nx = op->x; 1677 nx = op->x;
1799 ny = op->y; 1678 ny = op->y;
1800 m = op->map; 1679 m = op->map;
1801 } 1680 }
1802 1681
1803 remove_ob (op); 1682 m->insert (op, nx, ny, op);
1804 op->y = ny;
1805 op->x = nx;
1806 insert_ob_in_map (op, m, op, 0);
1807 1683
1808 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1684 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1809 surrounding squares */ 1685 surrounding squares */
1810 1686
1811 /* loop over current square and neighbors to hit. 1687 /* loop over current square and neighbors to hit.
1812 * if this has an other_arch field, we insert that in 1688 * if this has an other_arch field, we insert that in
1813 * the surround spaces. 1689 * the surround spaces.
1814 */ 1690 */
1815 for (j = 0; j < 9; j++) 1691 for (j = 0; j < 9; j++)
1816 { 1692 {
1817 object *new_ob;
1818
1819 hx = nx + freearr_x[j]; 1693 hx = nx + freearr_x[j];
1820 hy = ny + freearr_y[j]; 1694 hy = ny + freearr_y[j];
1821 1695
1822 m = op->map; 1696 m = op->map;
1823 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1697 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1837 1711
1838 } 1712 }
1839 1713
1840 /* insert the other arch */ 1714 /* insert the other arch */
1841 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1715 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1842 { 1716 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1843 new_ob = arch_to_object (op->other_arch);
1844 new_ob->x = hx;
1845 new_ob->y = hy;
1846 insert_ob_in_map (new_ob, m, op, 0);
1847 }
1848 } 1717 }
1849 1718
1850 /* restore to the center location and damage */ 1719 /* restore to the center location and damage */
1851 op->stats.dam = dam_save; 1720 op->stats.dam = dam_save;
1852 1721
1853 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1722 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1854 1723
1855 if (i >= 0) 1724 if (i >= 0)
1856 { /* we have a preferred direction! */ 1725 { /* we have a preferred direction! */
1857 /* pick another direction if the preferred dir is blocked. */ 1726 /* pick another direction if the preferred dir is blocked. */
1858 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1727 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1859 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1728 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1860 {
1861 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1729 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1862 } 1730
1863 op->direction = i; 1731 op->direction = i;
1864 } 1732 }
1865} 1733}
1866 1734
1867 1735
… …
1879#if 0 1747#if 0
1880 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1748 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1881 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1749 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1882 sint16 target_x, target_y, origin_x, origin_y; 1750 sint16 target_x, target_y, origin_x, origin_y;
1883 int adjustdir; 1751 int adjustdir;
1884 mapstruct *m; 1752 maptile *m;
1885#endif 1753#endif
1886 int basedir; 1754 int basedir;
1887 object *owner; 1755 object *owner;
1888 1756
1889 owner = get_owner (op); 1757 owner = op->owner;
1890 if (op->duration == 0 || owner == NULL) 1758 if (op->duration == 0 || owner == NULL)
1891 { 1759 {
1892 remove_ob (op); 1760 op->destroy ();
1893 free_object (op);
1894 return; 1761 return;
1895 } 1762 }
1763
1896 op->duration--; 1764 op->duration--;
1897 1765
1898 basedir = op->direction; 1766 basedir = op->direction;
1899 if (basedir == 0) 1767 if (basedir == 0)
1900 { 1768 {
… …
1905#if 0 1773#if 0
1906 // this is bogus: it causes wrong places to be checked below 1774 // this is bogus: it causes wrong places to be checked below
1907 // (a wall 2 cells away will block the effect...) and 1775 // (a wall 2 cells away will block the effect...) and
1908 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1776 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1909 // space. 1777 // space.
1910 // should be fixed later, but correctness before featurs... 1778 // should be fixed later, but correctness before features...
1911 // (schmorp) 1779 // (schmorp)
1912 1780
1913 /* new offset calculation to make swarm element distribution 1781 /* new offset calculation to make swarm element distribution
1914 * more uniform 1782 * more uniform
1915 */ 1783 */
… …
1997 1865
1998 if (!spell->other_arch) 1866 if (!spell->other_arch)
1999 return 0; 1867 return 0;
2000 1868
2001 tmp = get_archetype (SWARM_SPELL); 1869 tmp = get_archetype (SWARM_SPELL);
2002 tmp->x = op->x;
2003 tmp->y = op->y;
2004 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1870 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
2005 set_spell_skill (op, caster, spell, tmp); 1871 set_spell_skill (op, caster, spell, tmp);
2006 1872
2007 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1873 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
2008 tmp->spell = arch_to_object (spell->other_arch); 1874 tmp->spell = arch_to_object (spell->other_arch);
2009 1875
2010 tmp->attacktype = tmp->spell->attacktype; 1876 tmp->attacktype = tmp->spell->attacktype;
2011 1877
2012 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1878 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2013 {
2014 if (!tailor_god_spell (tmp, op)) 1879 if (!tailor_god_spell (tmp, op))
2015 return 1; 1880 return 1;
2016 } 1881
2017 tmp->duration = SP_level_duration_adjust (caster, spell); 1882 tmp->duration = SP_level_duration_adjust (caster, spell);
2018 for (i = 0; i < spell->duration; i++) 1883 for (i = 0; i < spell->duration; i++)
2019 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1884 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2020 1885
2021 tmp->direction = dir; 1886 tmp->direction = dir;
2022 tmp->invisible = 1; 1887 tmp->invisible = 1;
2023 insert_ob_in_map (tmp, op->map, op, 0); 1888
1889 tmp->insert_at (op, op);
2024 return 1; 1890 return 1;
2025} 1891}
2026 1892
2027 1893
2028/* See the spells documentation file for why this is its own 1894/* See the spells documentation file for why this is its own
… …
2032cast_light (object *op, object *caster, object *spell, int dir) 1898cast_light (object *op, object *caster, object *spell, int dir)
2033{ 1899{
2034 object *target = NULL, *tmp = NULL; 1900 object *target = NULL, *tmp = NULL;
2035 sint16 x, y; 1901 sint16 x, y;
2036 int dam, mflags; 1902 int dam, mflags;
2037 mapstruct *m; 1903 maptile *m;
2038 1904
2039 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1905 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2040 1906
2041 if (!dir) 1907 if (!dir)
2042 { 1908 {
… …
2056 return 0; 1922 return 0;
2057 } 1923 }
2058 1924
2059 if (mflags & P_IS_ALIVE && spell->attacktype) 1925 if (mflags & P_IS_ALIVE && spell->attacktype)
2060 { 1926 {
2061 for (target = get_map_ob (m, x, y); target; target = target->above) 1927 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2062 if (QUERY_FLAG (target, FLAG_MONSTER)) 1928 if (QUERY_FLAG (target, FLAG_MONSTER))
2063 { 1929 {
2064 /* oky doky. got a target monster. Lets make a blinding attack */ 1930 /* oky doky. got a target monster. Lets make a blinding attack */
2065 if (target->head) 1931 if (target->head)
2066 target = target->head; 1932 target = target->head;
… …
2088 { 1954 {
2089 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1955 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2090 if (tmp->glow_radius > MAX_LIGHT_RADII) 1956 if (tmp->glow_radius > MAX_LIGHT_RADII)
2091 tmp->glow_radius = MAX_LIGHT_RADII; 1957 tmp->glow_radius = MAX_LIGHT_RADII;
2092 } 1958 }
2093 tmp->x = x; 1959
2094 tmp->y = y; 1960 m->insert (tmp, x, y, op);
2095 insert_ob_in_map (tmp, m, op, 0);
2096 return 1; 1961 return 1;
2097} 1962}
2098
2099
2100
2101 1963
2102/* cast_cause_disease: this spell looks along <dir> from the 1964/* cast_cause_disease: this spell looks along <dir> from the
2103 * player and infects someone. 1965 * player and infects someone.
2104 * op is the player/monster, caster is the object, dir is the direction 1966 * op is the player/monster, caster is the object, dir is the direction
2105 * to cast, disease_arch is the specific disease, and type is the spell number 1967 * to cast, disease_arch is the specific disease, and type is the spell number
2106 * perhaps this should actually be in disease.c? 1968 * perhaps this should actually be in disease.c?
2107 */ 1969 */
2108
2109int 1970int
2110cast_cause_disease (object *op, object *caster, object *spell, int dir) 1971cast_cause_disease (object *op, object *caster, object *spell, int dir)
2111{ 1972{
2112 sint16 x, y; 1973 sint16 x, y;
2113 int i, mflags, range, dam_mod, dur_mod; 1974 int i, mflags, range, dam_mod, dur_mod;
2114 object *walk; 1975 object *walk;
2115 mapstruct *m; 1976 maptile *m;
2116 1977
2117 x = op->x; 1978 x = op->x;
2118 y = op->y; 1979 y = op->y;
2119 1980
2120 /* If casting from a scroll, no direction will be available, so refer to the 1981 /* If casting from a scroll, no direction will be available, so refer to the
2121 * direction the player is pointing. 1982 * direction the player is pointing.
2122 */ 1983 */
2123 if (!dir) 1984 if (!dir)
2124 dir = op->facing; 1985 dir = op->facing;
1986
2125 if (!dir) 1987 if (!dir)
2126 return 0; /* won't find anything if casting on ourself, so just return */ 1988 return 0; /* won't find anything if casting on ourself, so just return */
2127 1989
2128 /* Calculate these once here */ 1990 /* Calculate these once here */
2129 range = spell->range + SP_level_range_adjust (caster, spell); 1991 range = spell->range + SP_level_range_adjust (caster, spell);
… …
2148 2010
2149 /* Only bother looking on this space if there is something living here */ 2011 /* Only bother looking on this space if there is something living here */
2150 if (mflags & P_IS_ALIVE) 2012 if (mflags & P_IS_ALIVE)
2151 { 2013 {
2152 /* search this square for a victim */ 2014 /* search this square for a victim */
2153 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2015 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2154 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2016 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2155 { /* found a victim */ 2017 { /* found a victim */
2156 object *disease = arch_to_object (spell->other_arch); 2018 object *disease = arch_to_object (spell->other_arch);
2157 2019
2158 set_owner (disease, op); 2020 disease->set_owner (op);
2159 set_spell_skill (op, caster, spell, disease); 2021 set_spell_skill (op, caster, spell, disease);
2160 disease->stats.exp = 0; 2022 disease->stats.exp = 0;
2161 disease->level = caster_level (caster, spell); 2023 disease->level = caster_level (caster, spell);
2162 2024
2163 /* do level adjustments */ 2025 /* do level adjustments */
2164 if (disease->stats.wc) 2026 if (disease->stats.wc)
2165 disease->stats.wc += dur_mod / 2; 2027 disease->stats.wc += dur_mod / 2;
2166 2028
2167 if (disease->magic > 0) 2029 if (disease->magic > 0)
2168 disease->magic += dur_mod / 4; 2030 disease->magic += dur_mod / 8;
2169 2031
2170 if (disease->stats.maxhp > 0) 2032 if (disease->stats.maxhp > 0)
2171 disease->stats.maxhp += dur_mod; 2033 disease->stats.maxhp += dur_mod;
2172 2034
2173 if (disease->stats.maxgrace > 0) 2035 if (disease->stats.maxgrace > 0)
… …
2208 if (disease->stats.sp) 2070 if (disease->stats.sp)
2209 disease->stats.sp -= dam_mod; 2071 disease->stats.sp -= dam_mod;
2210 2072
2211 if (infect_object (walk, disease, 1)) 2073 if (infect_object (walk, disease, 1))
2212 { 2074 {
2213 object *flash; /* visual effect for inflicting disease */
2214
2215 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2075 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2216 2076
2217 free_object (disease); /* don't need this one anymore */ 2077 disease->destroy (); /* don't need this one anymore */
2218 flash = get_archetype (ARCH_DETECT_MAGIC); 2078 walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2219 flash->x = x;
2220 flash->y = y;
2221 flash->map = walk->map;
2222 insert_ob_in_map (flash, walk->map, op, 0);
2223 return 1; 2079 return 1;
2224 } 2080 }
2225 free_object (disease); 2081
2082 disease->destroy ();
2226 } 2083 }
2227 } /* if living creature */ 2084 } /* if living creature */
2228 } /* for range of spaces */ 2085 } /* for range of spaces */
2086
2229 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2087 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2230 return 1; 2088 return 1;
2231} 2089}

Diff Legend

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