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.6 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.11 by root, Mon Sep 11 20:26:41 2006 UTC

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

Diff Legend

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