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.1 by elmex, Sun Aug 13 17:16:04 2006 UTC vs.
Revision 1.65 by root, Mon Sep 29 10:20:49 2008 UTC

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

Diff Legend

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