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.22 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.116 by root, Sat Sep 16 22:17:42 2017 UTC

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

Diff Legend

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