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.13 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.95 by elmex, Tue Jan 19 16:13:05 2010 UTC

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

Diff Legend

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