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.10 by root, Sun Sep 10 23:24:12 2006 UTC vs.
Revision 1.108 by root, Tue Jan 3 11:25:37 2012 UTC

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

Diff Legend

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