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

Diff Legend

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