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.5 by root, Sat Aug 26 23:36:34 2006 UTC vs.
Revision 1.6 by root, Tue Aug 29 08:01:38 2006 UTC

1/* 1/*
2 * static char *rcsid_spell_attack_c = 2 * static char *rcsid_spell_attack_c =
3 * "$Id: spell_attack.C,v 1.5 2006/08/26 23:36:34 root Exp $"; 3 * "$Id: spell_attack.C,v 1.6 2006/08/29 08:01:38 root Exp $";
4 */ 4 */
5 5
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
… …
48 */ 48 */
49 49
50void check_spell_knockback(object *op) { 50void check_spell_knockback(object *op) {
51 object *tmp, *tmp2; /* object on the map */ 51 object *tmp, *tmp2; /* object on the map */
52 int weight_move; 52 int weight_move;
53 int frictionmod=2; /*poor man's physics - multipy targets weight by this amount */ 53 int frictionmod=2; /*poor man's physics - multipy targets weight by this amount */
54 54
55 if(! op->weight) { /*shouldn't happen but if cone object has no weight drop out*/ 55 if(! op->weight) { /*shouldn't happen but if cone object has no weight drop out*/
56 /*LOG (llevDebug, "DEBUG: arch weighs nothing\n");*/ 56 /*LOG (llevDebug, "DEBUG: arch weighs nothing\n");*/
57 return; 57 return;
58 }else{ 58 }else{
59 weight_move = op->weight +(op->weight * op->level) / 3; 59 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);*/ 60 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level);*/
61 } 61 }
62 62
63 for(tmp=get_map_ob(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) 63 for(tmp=get_map_ob(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above)
64 { 64 {
65 int num_sections = 1; 65 int num_sections = 1;
66 66
67 /* don't move DM */ 67 /* don't move DM */
68 if(QUERY_FLAG(tmp, FLAG_WIZ)) 68 if(QUERY_FLAG(tmp, FLAG_WIZ))
69 return; 69 return;
70 70
71 /* don't move parts of objects */ 71 /* don't move parts of objects */
72 if(tmp->head) continue; 72 if(tmp->head) continue;
73 73
74 /* don't move floors or immobile objects */ 74 /* 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; 75 if(QUERY_FLAG(tmp,FLAG_IS_FLOOR)||(!QUERY_FLAG(tmp,FLAG_ALIVE)&&QUERY_FLAG(tmp,FLAG_NO_PICK))) continue;
76 76
77 /* count the object's sections */ 77 /* count the object's sections */
78 for(tmp2 = tmp; tmp2!=NULL;tmp2=tmp2->more) num_sections++; 78 for(tmp2 = tmp; tmp2!=NULL;tmp2=tmp2->more) num_sections++;
79 79
80 /* I'm not sure if it makes sense to divide by num_sections - bigger 80 /* 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 81 * 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. 82 * object, not just the head, so the total weight should be relevant.
83 */ 83 */
84 84
85 /* surface area? -tm */ 85 /* surface area? -tm */
86 86
87 if (tmp->move_type & MOVE_FLYING) 87 if (tmp->move_type & MOVE_FLYING)
88 frictionmod = 1 ; /* flying objects loose the friction modifier */ 88 frictionmod = 1 ; /* flying objects loose the friction modifier */
89 89
90 if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) { /* move it. */ 90 if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) { /* move it. */
91 /* move_object is really for monsters, but looking at 91 /* move_object is really for monsters, but looking at
92 * the move_object function, it appears that it should 92 * the move_object function, it appears that it should
93 * also be safe for objects. 93 * also be safe for objects.
94 * This does return if successful or not, but 94 * This does return if successful or not, but
95 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
96 * right now. 96 * right now.
97 */ 97 */
98 move_object(tmp, absdir(op->stats.sp)); 98 move_object(tmp, absdir(op->stats.sp));
99 } 99 }
100 100
101 } 101 }
102} 102}
103 103
104/*************************************************************************** 104/***************************************************************************
… …
121 /* pick a fork direction. tmp->stats.Con is the left bias 121 /* pick a fork direction. tmp->stats.Con is the left bias
122 * i.e., the chance in 100 of forking LEFT 122 * i.e., the chance in 100 of forking LEFT
123 * Should start out at 50, down to 25 for one already going left 123 * Should start out at 50, down to 25 for one already going left
124 * down to 0 for one going 90 degrees left off original path 124 * down to 0 for one going 90 degrees left off original path
125 */ 125 */
126 126
127 if(rndm(0, 99) < tmp->stats.Con) /* fork left */ 127 if(rndm(0, 99) < tmp->stats.Con) /* fork left */
128 new_dir = -1; 128 new_dir = -1;
129 129
130 /* check the new dir for a wall and in the map*/ 130 /* check the new dir for a wall and in the map*/
131 t_dir = absdir(tmp->direction + new_dir); 131 t_dir = absdir(tmp->direction + new_dir);
132 132
133 if(get_map_flags(tmp->map,&m, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir], 133 if(get_map_flags(tmp->map,&m, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir],
134 &sx, &sy) & P_OUT_OF_MAP) 134 &sx, &sy) & P_OUT_OF_MAP)
135 return; 135 return;
136 136
137 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(m, sx, sy))) 137 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(m, sx, sy)))
138 return; 138 return;
139 139
140 /* OK, we made a fork */ 140 /* OK, we made a fork */
141 new_bolt = get_object(); 141 new_bolt = get_object();
142 copy_object(tmp,new_bolt); 142 copy_object(tmp,new_bolt);
143 143
… …
167 int mflags; 167 int mflags;
168 sint16 x, y; 168 sint16 x, y;
169 mapstruct *m; 169 mapstruct *m;
170 170
171 if(--(op->duration)<0) { 171 if(--(op->duration)<0) {
172 remove_ob(op); 172 remove_ob(op);
173 free_object(op); 173 free_object(op);
174 return; 174 return;
175 } 175 }
176 hit_map(op,0,op->attacktype,1); 176 hit_map(op,0,op->attacktype,1);
177 177
178 if(!op->direction) 178 if(!op->direction)
179 return; 179 return;
180 180
181 if (--op->range<0) { 181 if (--op->range<0) {
182 op->range=0; 182 op->range=0;
183 } else { 183 } else {
184 x = op->x+DIRX(op); 184 x = op->x+DIRX(op);
185 y = op->y+DIRY(op); 185 y = op->y+DIRY(op);
186 m = op->map; 186 m = op->map;
187 mflags = get_map_flags(m, &m, x, y, &x, &y); 187 mflags = get_map_flags(m, &m, x, y, &x, &y);
188 188
189 if (mflags & P_OUT_OF_MAP) return; 189 if (mflags & P_OUT_OF_MAP) return;
190 190
191 /* We are about to run into something - we may bounce */ 191 /* 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 192 /* 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 193 * on the space. So only call reflwall if we think the data it returns
194 * will be useful. 194 * will be useful.
195 */ 195 */
196 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)) || 196 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)) ||
197 ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) { 197 ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) {
198 198
199 if(!QUERY_FLAG(op, FLAG_REFLECTING)) 199 if(!QUERY_FLAG(op, FLAG_REFLECTING))
200 return; 200 return;
201 201
202 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
203 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
204 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
205 * on the diagonal, it is trickier - eg, a bolt travelling 205 * on the diagonal, it is trickier - eg, a bolt travelling
206 * northwest bounces different if it hits a north/south 206 * northwest bounces different if it hits a north/south
207 * wall (bounces to northeast) vs an east/west (bounces 207 * wall (bounces to northeast) vs an east/west (bounces
208 * to the southwest. 208 * to the southwest.
209 */ 209 */
210 if(op->direction&1) 210 if(op->direction&1)
211 op->direction=absdir(op->direction+4); 211 op->direction=absdir(op->direction+4);
212 else { 212 else {
213 int left, right; 213 int left, right;
214 int mflags; 214 int mflags;
215 215
216 /* Need to check for P_OUT_OF_MAP: if the bolt is tavelling 216 /* 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 217 * over a corner in a tiled map, it is possible that
218 * op->direction is within an adjacent map but either 218 * op->direction is within an adjacent map but either
219 * op->direction-1 or op->direction+1 does not exist. 219 * op->direction-1 or op->direction+1 does not exist.
220 */ 220 */
221 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction-1)], 221 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); 222 op->y+freearr_y[absdir(op->direction-1)], &x, &y);
223 223
224 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)); 224 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y));
225 225
226 mflags = get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction+1)], 226 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); 227 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)); 228 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y));
229 229
230 if(left==right) 230 if(left==right)
231 op->direction=absdir(op->direction+4); 231 op->direction=absdir(op->direction+4);
232 else if(left) 232 else if(left)
233 op->direction=absdir(op->direction+2); 233 op->direction=absdir(op->direction+2);
234 else if(right) 234 else if(right)
235 op->direction=absdir(op->direction-2); 235 op->direction=absdir(op->direction-2);
236 } 236 }
237 update_turn_face(op); /* A bolt *must* be IS_TURNABLE */ 237 update_turn_face(op); /* A bolt *must* be IS_TURNABLE */
238 return; 238 return;
239 } 239 }
240 else { /* Create a copy of this object and put it ahead */ 240 else { /* Create a copy of this object and put it ahead */
241 tmp=get_object(); 241 tmp=get_object();
242 copy_object(op,tmp); 242 copy_object(op,tmp);
243 tmp->speed_left= -0.1; 243 tmp->speed_left= -0.1;
244 tmp->x+=DIRX(tmp),tmp->y+=DIRY(tmp); 244 tmp->x+=DIRX(tmp),tmp->y+=DIRY(tmp);
245 tmp = insert_ob_in_map(tmp,op->map,op,0); 245 tmp = insert_ob_in_map(tmp,op->map,op,0);
246 /* To make up for the decrease at the top of the function */ 246 /* To make up for the decrease at the top of the function */
247 tmp->duration++; 247 tmp->duration++;
248 248
249 /* New forking code. Possibly create forks of this object 249 /* New forking code. Possibly create forks of this object
250 * going off in other directions. 250 * going off in other directions.
251 */ 251 */
252 252
253 if(rndm(0, 99)< tmp->stats.Dex) { /* stats.Dex % of forking */ 253 if(rndm(0, 99)< tmp->stats.Dex) { /* stats.Dex % of forking */
254 forklightning(op,tmp); 254 forklightning(op,tmp);
255 } 255 }
256 /* In this way, the object left behind sticks on the space, but 256 /* In this way, the object left behind sticks on the space, but
257 * doesn't create any bolts that continue to move onward. 257 * doesn't create any bolts that continue to move onward.
258 */ 258 */
259 op->range = 0; 259 op->range = 0;
260 } /* copy object and move it along */ 260 } /* copy object and move it along */
261 } /* if move bolt along */ 261 } /* if move bolt along */
262} 262}
263 263
264/* fire_bolt 264/* fire_bolt
265 * object op (cast from caster) files a bolt in dir. 265 * object op (cast from caster) files a bolt in dir.
… …
273int fire_bolt(object *op,object *caster,int dir,object *spob, object *skill) { 273int fire_bolt(object *op,object *caster,int dir,object *spob, object *skill) {
274 object *tmp=NULL; 274 object *tmp=NULL;
275 int mflags; 275 int mflags;
276 276
277 if (!spob->other_arch) 277 if (!spob->other_arch)
278 return 0; 278 return 0;
279 279
280 tmp=arch_to_object(spob->other_arch); 280 tmp=arch_to_object(spob->other_arch);
281 if(tmp==NULL) 281 if(tmp==NULL)
282 return 0; 282 return 0;
283 283
284 /* peterm: level dependency for bolts */ 284 /* peterm: level dependency for bolts */
285 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob); 285 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob);
286 tmp->attacktype = spob->attacktype; 286 tmp->attacktype = spob->attacktype;
287 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying); 287 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying);
… …
290 tmp->stats.Dex = spob->stats.Dex; 290 tmp->stats.Dex = spob->stats.Dex;
291 tmp->stats.Con = spob->stats.Con; 291 tmp->stats.Con = spob->stats.Con;
292 292
293 tmp->direction=dir; 293 tmp->direction=dir;
294 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 294 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
295 SET_ANIMATION(tmp, dir); 295 SET_ANIMATION(tmp, dir);
296 296
297 set_owner(tmp,op); 297 set_owner(tmp,op);
298 set_spell_skill(op, caster, spob, tmp); 298 set_spell_skill(op, caster, spob, tmp);
299 299
300 tmp->x=op->x + DIRX(tmp); 300 tmp->x=op->x + DIRX(tmp);
301 tmp->y=op->y + DIRY(tmp); 301 tmp->y=op->y + DIRY(tmp);
302 tmp->map = op->map; 302 tmp->map = op->map;
303 303
304 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 304 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
305 if (mflags & P_OUT_OF_MAP) { 305 if (mflags & P_OUT_OF_MAP) {
306 free_object(tmp); 306 free_object(tmp);
307 return 0; 307 return 0;
308 } 308 }
309 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) { 309 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) {
310 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 310 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
311 free_object(tmp); 311 free_object(tmp);
312 return 0; 312 return 0;
313 } 313 }
314 tmp->x=op->x; 314 tmp->x=op->x;
315 tmp->y=op->y; 315 tmp->y=op->y;
316 tmp->direction=absdir(tmp->direction+4); 316 tmp->direction=absdir(tmp->direction+4);
317 tmp->map = op->map; 317 tmp->map = op->map;
318 } 318 }
319 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) 319 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL)
320 move_bolt (tmp); 320 move_bolt (tmp);
321 return 1; 321 return 1;
322} 322}
… …
337 object *tmp; 337 object *tmp;
338 mapstruct *m=op->map; 338 mapstruct *m=op->map;
339 int i; 339 int i;
340 340
341 if(--(op->duration)<0) { 341 if(--(op->duration)<0) {
342 remove_ob(op); 342 remove_ob(op);
343 free_object(op); 343 free_object(op);
344 return; 344 return;
345 } 345 }
346 hit_map(op,0,op->attacktype,0); 346 hit_map(op,0,op->attacktype,0);
347 347
348 if(op->range>0) { 348 if(op->range>0) {
349 for(i=1;i<9;i++) { 349 for(i=1;i<9;i++) {
350 sint16 dx,dy; 350 sint16 dx,dy;
351 351
352 dx=op->x+freearr_x[i]; 352 dx=op->x+freearr_x[i];
353 dy=op->y+freearr_y[i]; 353 dy=op->y+freearr_y[i];
354 /* ok_to_put_more already does things like checks for walls, 354 /* ok_to_put_more already does things like checks for walls,
355 * out of map, etc. 355 * out of map, etc.
356 */ 356 */
357 if(ok_to_put_more(op->map,dx,dy,op,op->attacktype)) { 357 if(ok_to_put_more(op->map,dx,dy,op,op->attacktype)) {
358 tmp=get_object(); 358 tmp=get_object();
359 copy_object(op,tmp); 359 copy_object(op,tmp);
360 tmp->state=0; 360 tmp->state=0;
361 tmp->speed_left= -0.21; 361 tmp->speed_left= -0.21;
362 tmp->range--; 362 tmp->range--;
363 tmp->value=0; 363 tmp->value=0;
364 tmp->x=dx; 364 tmp->x=dx;
365 tmp->y=dy; 365 tmp->y=dy;
366 insert_ob_in_map(tmp,m,op,0); 366 insert_ob_in_map(tmp,m,op,0);
367 } 367 }
368 } 368 }
369 } 369 }
370} 370}
371 371
372 372
373/* Causes an object to explode, eg, a firebullet, 373/* Causes an object to explode, eg, a firebullet,
… …
378{ 378{
379 tag_t op_tag = op->count; 379 tag_t op_tag = op->count;
380 object *tmp, *owner; 380 object *tmp, *owner;
381 381
382 if (op->other_arch == NULL) { 382 if (op->other_arch == NULL) {
383 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 383 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
384 remove_ob (op); 384 remove_ob (op);
385 free_object (op); 385 free_object (op);
386 return; 386 return;
387 } 387 }
388 388
389 if (op->env) { 389 if (op->env) {
390 object *env; 390 object *env;
391 391
392 env = object_get_env_recursive(op); 392 env = object_get_env_recursive(op);
393 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) { 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"); 394 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
395 remove_ob (op);
396 free_object (op);
397 return;
398 }
395 remove_ob (op); 399 remove_ob (op);
396 free_object (op);
397 return;
398 }
399 remove_ob (op);
400 op->x = env->x; 400 op->x = env->x;
401 op->y = env->y; 401 op->y = env->y;
402 insert_ob_in_map(op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 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)) { 403 } else if (out_of_map (op->map, op->x, op->y)) {
404 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 404 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
405 remove_ob (op); 405 remove_ob (op);
406 free_object (op); 406 free_object (op);
407 return; 407 return;
408 } 408 }
409 409
410 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 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 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. 412 // bad at the moment that might happen from this.
… …
416 free_object (op); 416 free_object (op);
417 return; 417 return;
418 } 418 }
419 419
420 if (op->attacktype) { 420 if (op->attacktype) {
421 hit_map (op, 0, op->attacktype, 1); 421 hit_map (op, 0, op->attacktype, 1);
422 if (was_destroyed (op, op_tag)) 422 if (was_destroyed (op, op_tag))
423 return; 423 return;
424 } 424 }
425 425
426 /* other_arch contains what this explodes into */ 426 /* other_arch contains what this explodes into */
427 tmp = arch_to_object (op->other_arch); 427 tmp = arch_to_object (op->other_arch);
428 428
… …
431 if (op->skill) tmp->skill = add_refcount(op->skill); 431 if (op->skill) tmp->skill = add_refcount(op->skill);
432 432
433 owner = get_owner(op); 433 owner = get_owner(op);
434 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && 434 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner &&
435 !tailor_god_spell(tmp, owner)) { 435 !tailor_god_spell(tmp, owner)) {
436 remove_ob (op); 436 remove_ob (op);
437 free_object (op); 437 free_object (op);
438 return; 438 return;
439 } 439 }
440 tmp->x = op->x; 440 tmp->x = op->x;
441 tmp->y = op->y; 441 tmp->y = op->y;
442 442
443 /* special for bombs - it actually has sane values for these */ 443 /* special for bombs - it actually has sane values for these */
444 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) { 444 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) {
445 tmp->attacktype = op->attacktype; 445 tmp->attacktype = op->attacktype;
446 tmp->range = op->range; 446 tmp->range = op->range;
447 tmp->stats.dam = op->stats.dam; 447 tmp->stats.dam = op->stats.dam;
448 tmp->duration = op->duration; 448 tmp->duration = op->duration;
449 } else { 449 } else {
450 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC; 450 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC;
451 /* Spell doc describes what is going on here */ 451 /* Spell doc describes what is going on here */
452 tmp->stats.dam = op->dam_modifier; 452 tmp->stats.dam = op->dam_modifier;
453 tmp->range = op->stats.maxhp; 453 tmp->range = op->stats.maxhp;
454 tmp->duration = op->stats.hp; 454 tmp->duration = op->stats.hp;
455 /* Used for spell tracking - just need a unique val for this spell - 455 /* Used for spell tracking - just need a unique val for this spell -
456 * the count of the parent should work fine. 456 * the count of the parent should work fine.
457 */ 457 */
458 tmp->stats.maxhp = op->count; 458 tmp->stats.maxhp = op->count;
459 } 459 }
460 460
461 /* Set direction of cone explosion */ 461 /* Set direction of cone explosion */
462 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE) 462 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE)
463 tmp->stats.sp = op->direction; 463 tmp->stats.sp = op->direction;
464 464
465 /* Prevent recursion */ 465 /* Prevent recursion */
466 op->move_on = 0; 466 op->move_on = 0;
467 467
468 insert_ob_in_map(tmp, op->map, op, 0); 468 insert_ob_in_map(tmp, op->map, op, 0);
469 /* remove the firebullet */ 469 /* remove the firebullet */
470 if ( ! was_destroyed (op, op_tag)) { 470 if ( ! was_destroyed (op, op_tag)) {
471 remove_ob (op); 471 remove_ob (op);
472 free_object (op); 472 free_object (op);
473 } 473 }
474} 474}
475 475
476 476
477 477
… …
491 491
492 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, sx, sy))) 492 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, sx, sy)))
493 return; 493 return;
494 494
495 if (op->other_arch) { 495 if (op->other_arch) {
496 /* explode object will also remove op */ 496 /* explode object will also remove op */
497 explode_bullet (op); 497 explode_bullet (op);
498 return; 498 return;
499 } 499 }
500 500
501 /* If nothing alive on this space, no reason to do anything further */ 501 /* If nothing alive on this space, no reason to do anything further */
… …
507 tmp_tag = tmp->count; 507 tmp_tag = tmp->count;
508 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 508 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
509 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag) 509 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag)
510 || (op->stats.dam -= dam) < 0) 510 || (op->stats.dam -= dam) < 0)
511 { 511 {
512 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 512 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
513 remove_ob (op); 513 remove_ob (op);
514 free_object(op); 514 free_object(op);
515 return; 515 return;
516 } 516 }
517 } 517 }
518 } 518 }
519 } 519 }
520} 520}
521 521
… …
534 534
535#if 0 535#if 0
536 /* We need a better general purpose way to do this */ 536 /* We need a better general purpose way to do this */
537 537
538 /* peterm: added to make comet leave a trail of burnouts 538 /* peterm: added to make comet leave a trail of burnouts
539 it's an unadulterated hack, but the effect is cool. */ 539 it's an unadulterated hack, but the effect is cool. */
540 if(op->stats.sp == SP_METEOR) { 540 if(op->stats.sp == SP_METEOR) {
541 replace_insert_ob_in_map("fire_trail",op); 541 replace_insert_ob_in_map("fire_trail",op);
542 if (was_destroyed (op, op_tag)) 542 if (was_destroyed (op, op_tag))
543 return; 543 return;
544 } /* end addition. */ 544 } /* end addition. */
… …
546 546
547 /* Reached the end of its life - remove it */ 547 /* Reached the end of its life - remove it */
548 if (--op->range <=0) { 548 if (--op->range <=0) {
549 if (op->other_arch) { 549 if (op->other_arch) {
550 explode_bullet (op); 550 explode_bullet (op);
551 } else { 551 } else {
552 remove_ob (op); 552 remove_ob (op);
553 free_object (op); 553 free_object (op);
554 } 554 }
555 return; 555 return;
556 } 556 }
557 557
558 new_x = op->x + DIRX(op); 558 new_x = op->x + DIRX(op);
559 new_y = op->y + DIRY(op); 559 new_y = op->y + DIRY(op);
… …
605int fire_bullet(object *op,object *caster,int dir,object *spob) { 605int fire_bullet(object *op,object *caster,int dir,object *spob) {
606 object *tmp=NULL; 606 object *tmp=NULL;
607 int mflags; 607 int mflags;
608 608
609 if (!spob->other_arch) 609 if (!spob->other_arch)
610 return 0; 610 return 0;
611 611
612 tmp=arch_to_object(spob->other_arch); 612 tmp=arch_to_object(spob->other_arch);
613 if(tmp==NULL) 613 if(tmp==NULL)
614 return 0; 614 return 0;
615 615
616 /* peterm: level dependency for bolts */ 616 /* peterm: level dependency for bolts */
617 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob); 617 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust(caster,spob);
618 tmp->attacktype = spob->attacktype; 618 tmp->attacktype = spob->attacktype;
619 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying); 619 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying);
… …
625 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob); 625 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob);
626 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust(caster,spob); 626 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust(caster,spob);
627 627
628 tmp->direction=dir; 628 tmp->direction=dir;
629 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 629 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
630 SET_ANIMATION(tmp, dir); 630 SET_ANIMATION(tmp, dir);
631 631
632 set_owner(tmp,op); 632 set_owner(tmp,op);
633 set_spell_skill(op, caster, spob, tmp); 633 set_spell_skill(op, caster, spob, tmp);
634 634
635 tmp->x=op->x + freearr_x[dir]; 635 tmp->x=op->x + freearr_x[dir];
636 tmp->y=op->y + freearr_y[dir]; 636 tmp->y=op->y + freearr_y[dir];
637 tmp->map = op->map; 637 tmp->map = op->map;
638 638
639 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 639 mflags = get_map_flags(tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
640 if (mflags & P_OUT_OF_MAP) { 640 if (mflags & P_OUT_OF_MAP) {
641 free_object(tmp); 641 free_object(tmp);
642 return 0; 642 return 0;
643 } 643 }
644 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) { 644 if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) {
645 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 645 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
646 free_object(tmp); 646 free_object(tmp);
647 return 0; 647 return 0;
648 } 648 }
649 tmp->x=op->x; 649 tmp->x=op->x;
650 tmp->y=op->y; 650 tmp->y=op->y;
651 tmp->direction=absdir(tmp->direction+4); 651 tmp->direction=absdir(tmp->direction+4);
652 tmp->map = op->map; 652 tmp->map = op->map;
653 } 653 }
654 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) { 654 if ((tmp = insert_ob_in_map(tmp,tmp->map,op,0)) != NULL) {
655 check_bullet (tmp); 655 check_bullet (tmp);
656 } 656 }
657 return 1; 657 return 1;
658} 658}
659 659
660 660
… …
676 new_ob->level = op->level; 676 new_ob->level = op->level;
677 set_owner(new_ob,op->owner); 677 set_owner(new_ob,op->owner);
678 678
679 /* preserve skill ownership */ 679 /* preserve skill ownership */
680 if(op->skill && op->skill != new_ob->skill) { 680 if(op->skill && op->skill != new_ob->skill) {
681 if (new_ob->skill) free_string(new_ob->skill); 681 if (new_ob->skill) free_string(new_ob->skill);
682 new_ob->skill = add_refcount(op->skill); 682 new_ob->skill = add_refcount(op->skill);
683 } 683 }
684 insert_ob_in_map(new_ob,op->map,op,0); 684 insert_ob_in_map(new_ob,op->map,op,0);
685 685
686} 686}
687 687
… …
691 int i; 691 int i;
692 tag_t tag; 692 tag_t tag;
693 693
694 /* if no map then hit_map will crash so just ignore object */ 694 /* if no map then hit_map will crash so just ignore object */
695 if (! op->map) { 695 if (! op->map) {
696 LOG(llevError,"Tried to move_cone object %s without a map.\n", 696 LOG(llevError,"Tried to move_cone object %s without a map.\n",
697 op->name ? op->name : "unknown"); 697 op->name ? op->name : "unknown");
698 op->speed = 0; 698 op->speed = 0;
699 update_ob_speed (op); 699 update_ob_speed (op);
700 return; 700 return;
701 } 701 }
702 702
703 /* lava saves it's life, but not yours :) */ 703 /* lava saves it's life, but not yours :) */
704 if (QUERY_FLAG(op, FLAG_LIFESAVE)) { 704 if (QUERY_FLAG(op, FLAG_LIFESAVE)) {
705 hit_map(op,0,op->attacktype,0); 705 hit_map(op,0,op->attacktype,0);
706 return; 706 return;
707 } 707 }
708 708
709#if 0 709#if 0
710 /* Disable this - enabling it makes monsters easier, as 710 /* Disable this - enabling it makes monsters easier, as
711 * when their cone dies when they die. 711 * when their cone dies when they die.
712 */ 712 */
713 /* If no owner left, the spell dies out. */ 713 /* If no owner left, the spell dies out. */
714 if(get_owner(op)==NULL) { 714 if(get_owner(op)==NULL) {
715 remove_ob(op); 715 remove_ob(op);
716 free_object(op); 716 free_object(op);
717 return; 717 return;
718 } 718 }
719#endif 719#endif
720 720
721 tag = op->count; 721 tag = op->count;
722 hit_map(op,0,op->attacktype,0); 722 hit_map(op,0,op->attacktype,0);
… …
729 729
730 if (was_destroyed (op, tag)) 730 if (was_destroyed (op, tag))
731 return; 731 return;
732 732
733 if((op->duration--)<0) { 733 if((op->duration--)<0) {
734 remove_ob(op); 734 remove_ob(op);
735 free_object(op); 735 free_object(op);
736 return; 736 return;
737 } 737 }
738 /* Object has hit maximum range, so don't have it move 738 /* Object has hit maximum range, so don't have it move
739 * any further. When the duration above expires, 739 * any further. When the duration above expires,
740 * then the object will get removed. 740 * then the object will get removed.
741 */ 741 */
742 if (--op->range < 0) { 742 if (--op->range < 0) {
743 op->range=0; /* just so it doesn't wrap */ 743 op->range=0; /* just so it doesn't wrap */
744 return; 744 return;
745 } 745 }
746 746
747 for(i= -1;i<2;i++) { 747 for(i= -1;i<2;i++) {
748 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)], 748 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)],
749 y=op->y+freearr_y[absdir(op->stats.sp+i)]; 749 y=op->y+freearr_y[absdir(op->stats.sp+i)];
750 750
751 if(ok_to_put_more(op->map,x,y,op,op->attacktype)) { 751 if(ok_to_put_more(op->map,x,y,op,op->attacktype)) {
752 object *tmp=get_object(); 752 object *tmp=get_object();
753 copy_object(op, tmp); 753 copy_object(op, tmp);
754 tmp->x=x; 754 tmp->x=x;
755 tmp->y=y; 755 tmp->y=y;
756 756
757 tmp->duration = op->duration + 1; 757 tmp->duration = op->duration + 1;
758 758
759 /* Use for spell tracking - see ok_to_put_more() */ 759 /* Use for spell tracking - see ok_to_put_more() */
760 tmp->stats.maxhp = op->stats.maxhp; 760 tmp->stats.maxhp = op->stats.maxhp;
761 insert_ob_in_map(tmp,op->map,op,0); 761 insert_ob_in_map(tmp,op->map,op,0);
762 if (tmp->other_arch) cone_drop(tmp); 762 if (tmp->other_arch) cone_drop(tmp);
763 } 763 }
764 } 764 }
765} 765}
766 766
767/* cast_cone: casts a cone spell. 767/* cast_cone: casts a cone spell.
768 * op: person firing the object. 768 * op: person firing the object.
… …
782 782
783 if (!spell->other_arch) return 0; 783 if (!spell->other_arch) return 0;
784 784
785 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) && 785 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) &&
786 op->attacktype & AT_TURN_UNDEAD) { 786 op->attacktype & AT_TURN_UNDEAD) {
787 new_draw_info(NDI_UNIQUE, 0,op, 787 new_draw_info(NDI_UNIQUE, 0,op,
788 "Your undead nature prevents you from turning undead!"); 788 "Your undead nature prevents you from turning undead!");
789 return 0; 789 return 0;
790 } 790 }
791 791
792 if(!dir) { 792 if(!dir) {
793 range_min= 0; 793 range_min= 0;
794 range_max=8; 794 range_max=8;
795 } 795 }
796 796
797 /* Need to know what the movetype of the object we are about 797 /* 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 798 * to create is, so we can know if the space we are about to
799 * insert it into is blocked. 799 * insert it into is blocked.
800 */ 800 */
801 movetype = spell->other_arch->clone.move_type; 801 movetype = spell->other_arch->clone.move_type;
802 802
803 for(i=range_min;i<=range_max;i++) { 803 for(i=range_min;i<=range_max;i++) {
804 sint16 x,y, d; 804 sint16 x,y, d;
805 805
806 /* We can't use absdir here, because it never returns 806 /* 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 807 * 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 808 * of the trap (d==0). If it is not a rune, then we don't want
809 * to hit that person. 809 * to hit that person.
810 */ 810 */
811 d = dir + i; 811 d = dir + i;
812 while (d < 0) d+=8; 812 while (d < 0) d+=8;
813 while (d > 8) d-=8; 813 while (d > 8) d-=8;
814 814
815 /* If it's not a rune, we don't want to blast the caster. 815 /* 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, 816 * In that case, we have to see - if dir is specified,
817 * turn this into direction 8. If dir is not specified (all 817 * turn this into direction 8. If dir is not specified (all
818 * direction) skip - otherwise, one line would do more damage 818 * direction) skip - otherwise, one line would do more damage
819 * becase 0 direction will go through 9 directions - necessary 819 * becase 0 direction will go through 9 directions - necessary
820 * for the rune code. 820 * for the rune code.
821 */ 821 */
822 if (caster->type != RUNE && d==0) { 822 if (caster->type != RUNE && d==0) {
823 if (dir!=0) d=8; 823 if (dir!=0) d=8;
824 else continue; 824 else continue;
825 } 825 }
826 826
827 x = op->x+freearr_x[d]; 827 x = op->x+freearr_x[d];
828 y = op->y+freearr_y[d]; 828 y = op->y+freearr_y[d];
829 829
830 if(get_map_flags(op->map, &m, x,y, &sx, &sy) & P_OUT_OF_MAP) 830 if(get_map_flags(op->map, &m, x,y, &sx, &sy) & P_OUT_OF_MAP)
831 continue; 831 continue;
832 832
833 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype) 833 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype)
834 continue; 834 continue;
835 835
836 success=1; 836 success=1;
837 tmp=arch_to_object(spell->other_arch); 837 tmp=arch_to_object(spell->other_arch);
838 set_owner(tmp,op); 838 set_owner(tmp,op);
839 set_spell_skill(op, caster, spell, tmp); 839 set_spell_skill(op, caster, spell, tmp);
840 tmp->level = caster_level (caster, spell); 840 tmp->level = caster_level (caster, spell);
841 tmp->x = sx; 841 tmp->x = sx;
842 tmp->y = sy; 842 tmp->y = sy;
843 tmp->attacktype=spell->attacktype; 843 tmp->attacktype=spell->attacktype;
844 844
845 /* holy word stuff */ 845 /* holy word stuff */
846 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) { 846 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) {
847 if(!tailor_god_spell(tmp,op)) return 0; 847 if(!tailor_god_spell(tmp,op)) return 0;
848 } 848 }
849 849
850 if(dir) 850 if(dir)
851 tmp->stats.sp=dir; 851 tmp->stats.sp=dir;
852 else 852 else
853 tmp->stats.sp=i; 853 tmp->stats.sp=i;
854 854
855 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 855 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
856 856
857 /* If casting it in all directions, it doesn't go as far */ 857 /* If casting it in all directions, it doesn't go as far */
858 if (dir == 0) { 858 if (dir == 0) {
859 tmp->range /= 4; 859 tmp->range /= 4;
860 if (tmp->range < 2 && spell->range >=2) tmp->range = 2; 860 if (tmp->range < 2 && spell->range >=2) tmp->range = 2;
861 } 861 }
862 tmp->stats.dam=spell->stats.dam + SP_level_dam_adjust(caster,spell); 862 tmp->stats.dam=spell->stats.dam + SP_level_dam_adjust(caster,spell);
863 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell); 863 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell);
864 864
865 /* Special bonus for fear attacks */ 865 /* Special bonus for fear attacks */
866 if (tmp->attacktype & AT_FEAR) { 866 if (tmp->attacktype & AT_FEAR) {
867 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha]; 867 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha];
868 else 868 else
869 tmp->duration += caster->level/3; 869 tmp->duration += caster->level/3;
870 } 870 }
871 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) { 871 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) {
872 if (caster->type == PLAYER) tmp->duration += turn_bonus[caster->stats.Wis]/5; 872 if (caster->type == PLAYER) tmp->duration += turn_bonus[caster->stats.Wis]/5;
873 else 873 else
874 tmp->duration += caster->level/3; 874 tmp->duration += caster->level/3;
875 } 875 }
876 876
877 877
878 if ( !(tmp->move_type & MOVE_FLY_LOW)) 878 if ( !(tmp->move_type & MOVE_FLY_LOW))
879 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", 879 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n",
880 spell->other_arch->name); 880 spell->other_arch->name);
881 881
882 if (!tmp->move_on && tmp->stats.dam) { 882 if (!tmp->move_on && tmp->stats.dam) {
883 LOG (llevDebug, 883 LOG (llevDebug,
884 "cast_cone(): arch %s doesn't have move_on set\n", 884 "cast_cone(): arch %s doesn't have move_on set\n",
885 spell->other_arch->name); 885 spell->other_arch->name);
886 } 886 }
887 insert_ob_in_map(tmp,m,op,0); 887 insert_ob_in_map(tmp,m,op,0);
888 888
889 /* This is used for tracking spells so that one effect doesn't hit 889 /* This is used for tracking spells so that one effect doesn't hit
890 * a single space too many times. 890 * a single space too many times.
891 */ 891 */
892 tmp->stats.maxhp = tmp->count; 892 tmp->stats.maxhp = tmp->count;
893 893
894 if(tmp->other_arch) cone_drop(tmp); 894 if(tmp->other_arch) cone_drop(tmp);
895 } 895 }
896 return success; 896 return success;
897} 897}
898 898
899/**************************************************************************** 899/****************************************************************************
… …
910 int i; 910 int i;
911 object *env, *tmp; 911 object *env, *tmp;
912 archetype *at; 912 archetype *at;
913 913
914 if(op->state!=NUM_ANIMATIONS(op)-1) 914 if(op->state!=NUM_ANIMATIONS(op)-1)
915 return; 915 return;
916 916
917 917
918 env = object_get_env_recursive(op); 918 env = object_get_env_recursive(op);
919 919
920 if (op->env) { 920 if (op->env) {
921 if (env->map == NULL) 921 if (env->map == NULL)
922 return; 922 return;
923 923
924 if (env->type == PLAYER) 924 if (env->type == PLAYER)
925 esrv_del_item(env->contr, op->count); 925 esrv_del_item(env->contr, op->count);
926 926
927 remove_ob(op); 927 remove_ob(op);
928 op->x = env->x; 928 op->x = env->x;
929 op->y = env->y; 929 op->y = env->y;
930 if ((op = insert_ob_in_map (op, env->map, op,0)) == NULL) 930 if ((op = insert_ob_in_map (op, env->map, op,0)) == NULL)
931 return; 931 return;
932 } 932 }
933 933
934 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 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 935 // on a safe map. I don't like this special casing, but it seems to be neccessary
936 // as bombs can be carried. 936 // as bombs can be carried.
… …
945 * but using the cast_bullet isn't really feasible, 945 * but using the cast_bullet isn't really feasible,
946 * so just set up the appropriate values. 946 * so just set up the appropriate values.
947 */ 947 */
948 at = find_archetype(SPLINT); 948 at = find_archetype(SPLINT);
949 if (at) { 949 if (at) {
950 for(i=1;i<9;i++) { 950 for(i=1;i<9;i++) {
951 if (out_of_map(op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 951 if (out_of_map(op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
952 continue; 952 continue;
953 tmp = arch_to_object(at); 953 tmp = arch_to_object(at);
954 tmp->direction = i; 954 tmp->direction = i;
955 tmp->range = op->range; 955 tmp->range = op->range;
956 tmp->stats.dam = op->stats.dam; 956 tmp->stats.dam = op->stats.dam;
957 tmp->duration = op->duration; 957 tmp->duration = op->duration;
958 tmp->attacktype = op->attacktype; 958 tmp->attacktype = op->attacktype;
959 copy_owner (tmp, op); 959 copy_owner (tmp, op);
960 if(op->skill && op->skill != tmp->skill) { 960 if(op->skill && op->skill != tmp->skill) {
961 if (tmp->skill) free_string(tmp->skill); 961 if (tmp->skill) free_string(tmp->skill);
962 tmp->skill = add_refcount(op->skill); 962 tmp->skill = add_refcount(op->skill);
963 } 963 }
964 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 964 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
965 SET_ANIMATION(tmp, i); 965 SET_ANIMATION(tmp, i);
966 tmp->x = op->x + freearr_x[i]; 966 tmp->x = op->x + freearr_x[i];
967 tmp->y = op->y + freearr_x[i]; 967 tmp->y = op->y + freearr_x[i];
968 insert_ob_in_map(tmp, op->map, op, 0); 968 insert_ob_in_map(tmp, op->map, op, 0);
969 move_bullet(tmp); 969 move_bullet(tmp);
970 } 970 }
971 } 971 }
972 972
973 explode_bullet(op); 973 explode_bullet(op);
974} 974}
975 975
… …
980 sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir]; 980 sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir];
981 mapstruct *m; 981 mapstruct *m;
982 982
983 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy); 983 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)) { 984 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK(m, dx, dy) & MOVE_WALK)) {
985 new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way."); 985 new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way.");
986 return 0; 986 return 0;
987 } 987 }
988 tmp=arch_to_object(spell->other_arch); 988 tmp=arch_to_object(spell->other_arch);
989 989
990 /* level dependencies for bomb */ 990 /* level dependencies for bomb */
991 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 991 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
… …
1024 mapstruct *mp; 1024 mapstruct *mp;
1025 1025
1026 if (dir==0) return NULL; 1026 if (dir==0) return NULL;
1027 1027
1028 for (dist=1; dist<range; dist++) { 1028 for (dist=1; dist<range; dist++) {
1029 x = op->x + freearr_x[dir] * dist; 1029 x = op->x + freearr_x[dir] * dist;
1030 y = op->y + freearr_y[dir] * dist; 1030 y = op->y + freearr_y[dir] * dist;
1031 mp = op->map; 1031 mp = op->map;
1032 mflags = get_map_flags(op->map, &mp, x, y, &x, &y); 1032 mflags = get_map_flags(op->map, &mp, x, y, &x, &y);
1033 1033
1034 if (mflags & P_OUT_OF_MAP) return NULL; 1034 if (mflags & P_OUT_OF_MAP) return NULL;
1035 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL; 1035 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL;
1036 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL; 1036 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL;
1037 if (GET_MAP_MOVE_BLOCK(mp, x, y) & MOVE_FLY_LOW) return NULL; 1037 if (GET_MAP_MOVE_BLOCK(mp, x, y) & MOVE_FLY_LOW) return NULL;
1038 1038
1039 if (mflags & P_IS_ALIVE) { 1039 if (mflags & P_IS_ALIVE) {
1040 for(target=get_map_ob(mp,x,y); target; target=target->above) { 1040 for(target=get_map_ob(mp,x,y); target; target=target->above) {
1041 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) { 1041 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) {
1042 return target; 1042 return target;
1043 } 1043 }
1044 } 1044 }
1045 } 1045 }
1046 } 1046 }
1047 return NULL; 1047 return NULL;
1048} 1048}
1049 1049
1050 1050
… …
1081 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded."); 1081 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded.");
1082 return 0; 1082 return 0;
1083 } 1083 }
1084 1084
1085 if (spell->other_arch) 1085 if (spell->other_arch)
1086 effect = arch_to_object(spell->other_arch); 1086 effect = arch_to_object(spell->other_arch);
1087 else 1087 else
1088 return 0; 1088 return 0;
1089 1089
1090 /* tailor the effect by priest level and worshipped God */ 1090 /* tailor the effect by priest level and worshipped God */
1091 effect->level = caster_level (caster, spell); 1091 effect->level = caster_level (caster, spell);
1092 effect->attacktype = spell->attacktype; 1092 effect->attacktype = spell->attacktype;
1093 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) { 1093 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) {
… …
1095 new_draw_info_format(NDI_UNIQUE,0,op, 1095 new_draw_info_format(NDI_UNIQUE,0,op,
1096 "%s answers your call!",determine_god(op)); 1096 "%s answers your call!",determine_god(op));
1097 else { 1097 else {
1098 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored."); 1098 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored.");
1099 return 0; 1099 return 0;
1100 } 1100 }
1101 } 1101 }
1102 1102
1103 /* size of the area of destruction */ 1103 /* size of the area of destruction */
1104 effect->range=spell->range + 1104 effect->range=spell->range +
1105 SP_level_range_adjust(caster,spell); 1105 SP_level_range_adjust(caster,spell);
1106 effect->duration=spell->duration + 1106 effect->duration=spell->duration +
1107 SP_level_range_adjust(caster,spell); 1107 SP_level_range_adjust(caster,spell);
1108 1108
1109 if (effect->attacktype & AT_DEATH) { 1109 if (effect->attacktype & AT_DEATH) {
1110 effect->level=spell->stats.dam + 1110 effect->level=spell->stats.dam +
1111 SP_level_dam_adjust(caster,spell); 1111 SP_level_dam_adjust(caster,spell);
1112 1112
1113 /* casting death spells at undead isn't a good thing */ 1113 /* casting death spells at undead isn't a good thing */
1114 if QUERY_FLAG(target, FLAG_UNDEAD) { 1114 if QUERY_FLAG(target, FLAG_UNDEAD) {
1115 if(random_roll(0, 2, op, PREFER_LOW)) { 1115 if(random_roll(0, 2, op, PREFER_LOW)) {
1116 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!"); 1116 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!");
1117 effect->x=op->x; 1117 effect->x=op->x;
1118 effect->y=op->y; 1118 effect->y=op->y;
1119 } else { 1119 } else {
1120 new_draw_info_format(NDI_UNIQUE,0,op,"The %s looks stronger!", 1120 new_draw_info_format(NDI_UNIQUE,0,op,"The %s looks stronger!",
1121 query_name(target)); 1121 query_name(target));
1122 target->stats.hp = target->stats.maxhp*2; 1122 target->stats.hp = target->stats.maxhp*2;
1123 free_object(effect); 1123 free_object(effect);
1124 return 0; 1124 return 0;
1125 } 1125 }
1126 } 1126 }
1127 } else { 1127 } else {
1128 /* how much woe to inflict :) */ 1128 /* how much woe to inflict :) */
1129 effect->stats.dam=spell->stats.dam + 1129 effect->stats.dam=spell->stats.dam +
1130 SP_level_dam_adjust(caster,spell); 1130 SP_level_dam_adjust(caster,spell);
1131 } 1131 }
1132 1132
1133 set_owner(effect,op); 1133 set_owner(effect,op);
1134 set_spell_skill(op, caster, spell, effect); 1134 set_spell_skill(op, caster, spell, effect);
… …
1155 object *owner; 1155 object *owner;
1156 sint16 new_x, new_y; 1156 sint16 new_x, new_y;
1157 mapstruct *m; 1157 mapstruct *m;
1158 1158
1159 if (op->range-- <=0) { 1159 if (op->range-- <=0) {
1160 remove_ob(op); 1160 remove_ob(op);
1161 free_object(op); 1161 free_object(op);
1162 return; 1162 return;
1163 } 1163 }
1164 1164
1165 owner = get_owner(op); 1165 owner = get_owner(op);
1166#if 0 1166#if 0
1167 /* It'd make things nastier if this wasn't here - spells cast by 1167 /* It'd make things nastier if this wasn't here - spells cast by
1168 * monster that are then killed would continue to survive 1168 * monster that are then killed would continue to survive
1169 */ 1169 */
1170 if (owner == NULL) { 1170 if (owner == NULL) {
1171 remove_ob(op); 1171 remove_ob(op);
1172 free_object(op); 1172 free_object(op);
1173 return; 1173 return;
1174 } 1174 }
1175#endif 1175#endif
1176 1176
1177 new_x = op->x + DIRX(op); 1177 new_x = op->x + DIRX(op);
1178 new_y = op->y + DIRY(op); 1178 new_y = op->y + DIRY(op);
1179 1179
1180 mflags = get_map_flags(op->map, &m, new_x, new_y, &new_x, &new_y); 1180 mflags = get_map_flags(op->map, &m, new_x, new_y, &new_x, &new_y);
1181 1181
1182 if (!(mflags & P_OUT_OF_MAP) && 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)))) { 1183 ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y)))) {
1184 tag_t tag = op->count; 1184 tag_t tag = op->count;
1185 hit_map (op, op->direction, AT_MAGIC, 1); 1185 hit_map (op, op->direction, AT_MAGIC, 1);
1186 /* Basically, missile only hits one thing then goes away. 1186 /* Basically, missile only hits one thing then goes away.
1187 * we need to remove it if someone hasn't already done so. 1187 * we need to remove it if someone hasn't already done so.
1188 */ 1188 */
1189 if ( ! was_destroyed (op, tag)) { 1189 if ( ! was_destroyed (op, tag)) {
1190 remove_ob (op); 1190 remove_ob (op);
1191 free_object(op); 1191 free_object(op);
1192 } 1192 }
1193 return; 1193 return;
1194 } 1194 }
1195 1195
1196 remove_ob(op); 1196 remove_ob(op);
1197 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) { 1197 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) {
1198 free_object(op); 1198 free_object(op);
1199 return; 1199 return;
1200 } 1200 }
1201 op->x = new_x; 1201 op->x = new_x;
1202 op->y = new_y; 1202 op->y = new_y;
1203 op->map = m; 1203 op->map = m;
1204 i=spell_find_dir(op->map, op->x, op->y, get_owner(op)); 1204 i=spell_find_dir(op->map, op->x, op->y, get_owner(op));
1205 if(i > 0 && i != op->direction){ 1205 if(i > 0 && i != op->direction){
1206 op->direction=i; 1206 op->direction=i;
1207 SET_ANIMATION(op, op->direction); 1207 SET_ANIMATION(op, op->direction);
1208 } 1208 }
1209 insert_ob_in_map(op,op->map,op,0); 1209 insert_ob_in_map(op,op->map,op,0);
1210} 1210}
1211 1211
1212/**************************************************************************** 1212/****************************************************************************
… …
1222int make_object_glow(object *op, int radius, int time) { 1222int make_object_glow(object *op, int radius, int time) {
1223 object *tmp; 1223 object *tmp;
1224 1224
1225 /* some things are unaffected... */ 1225 /* some things are unaffected... */
1226 if(op->path_denied&PATH_LIGHT) 1226 if(op->path_denied&PATH_LIGHT)
1227 return 0; 1227 return 0;
1228 1228
1229 tmp=get_archetype(FORCE_NAME); 1229 tmp=get_archetype(FORCE_NAME);
1230 tmp->speed = 0.01; 1230 tmp->speed = 0.01;
1231 tmp->stats.food = time; 1231 tmp->stats.food = time;
1232 SET_FLAG(tmp, FLAG_IS_USED_UP); 1232 SET_FLAG(tmp, FLAG_IS_USED_UP);
1233 tmp->glow_radius=radius; 1233 tmp->glow_radius=radius;
1234 if (tmp->glow_radius > MAX_LIGHT_RADII) 1234 if (tmp->glow_radius > MAX_LIGHT_RADII)
1235 tmp->glow_radius = MAX_LIGHT_RADII; 1235 tmp->glow_radius = MAX_LIGHT_RADII;
1236 1236
1237 tmp->x=op->x; 1237 tmp->x=op->x;
1238 tmp->y=op->y; 1238 tmp->y=op->y;
1239 if(tmp->speed<MIN_ACTIVE_SPEED) tmp->speed = MIN_ACTIVE_SPEED; /* safety */ 1239 if(tmp->speed<MIN_ACTIVE_SPEED) tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1240 tmp=insert_ob_in_ob(tmp,op); 1240 tmp=insert_ob_in_ob(tmp,op);
1241 if (tmp->glow_radius > op->glow_radius) 1241 if (tmp->glow_radius > op->glow_radius)
1242 op->glow_radius = tmp->glow_radius; 1242 op->glow_radius = tmp->glow_radius;
1243 1243
1244 if(!tmp->env||op!=tmp->env) { 1244 if(!tmp->env||op!=tmp->env) {
1245 LOG(llevError,"make_object_glow() failed to insert glowing force in %s\n", 1245 LOG(llevError,"make_object_glow() failed to insert glowing force in %s\n",
1246 op->name); 1246 op->name);
1247 return 0; 1247 return 0;
1248 } 1248 }
1249 return 1; 1249 return 1;
1250} 1250}
1251 1251
1252 1252
… …
1276 else op->skill = NULL; 1276 else op->skill = NULL;
1277 1277
1278 change_skill(op, find_skill_by_name(op, op->skill), 1); 1278 change_skill(op, find_skill_by_name(op, op->skill), 1);
1279 1279
1280 for(i= -range; i<range; i++) { 1280 for(i= -range; i<range; i++) {
1281 for(j=-range; j<range ; j++) { 1281 for(j=-range; j<range ; j++) {
1282 m = op->map; 1282 m = op->map;
1283 sx = op->x + i; 1283 sx = op->x + i;
1284 sy = op->y + j; 1284 sy = op->y + j;
1285 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy); 1285 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy);
1286 if (mflags & P_OUT_OF_MAP) continue; 1286 if (mflags & P_OUT_OF_MAP) continue;
1287 if (mflags & P_IS_ALIVE) { 1287 if (mflags & P_IS_ALIVE) {
1288 for (tmp=get_map_ob(m, sx, sy); tmp; tmp=tmp->above) { 1288 for (tmp=get_map_ob(m, sx, sy); tmp; tmp=tmp->above) {
1289 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break; 1289 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break;
1290 } 1290 }
1291 if (tmp) { 1291 if (tmp) {
1292 if (tmp->head) tmp=tmp->head; 1292 if (tmp->head) tmp=tmp->head;
1293 1293
1294 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) || 1294 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) ||
1295 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) { 1295 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) {
1296 if (spell_ob->subtype == SP_DESTRUCTION) { 1296 if (spell_ob->subtype == SP_DESTRUCTION) {
1297 hit_player(tmp,dam,op,spell_ob->attacktype,0); 1297 hit_player(tmp,dam,op,spell_ob->attacktype,0);
1298 if (spell_ob->other_arch) { 1298 if (spell_ob->other_arch) {
1299 tmp = arch_to_object(spell_ob->other_arch); 1299 tmp = arch_to_object(spell_ob->other_arch);
1300 tmp->x = sx; 1300 tmp->x = sx;
1301 tmp->y = sy; 1301 tmp->y = sy;
1302 insert_ob_in_map(tmp, m, op, 0); 1302 insert_ob_in_map(tmp, m, op, 0);
1303 } 1303 }
1304 } 1304 }
1305 else if (spell_ob->subtype == SP_FAERY_FIRE && 1305 else if (spell_ob->subtype == SP_FAERY_FIRE &&
1306 tmp->resist[ATNR_MAGIC]!=100) { 1306 tmp->resist[ATNR_MAGIC]!=100) {
1307 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) { 1307 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) {
1308 object *effect = arch_to_object(spell_ob->other_arch); 1308 object *effect = arch_to_object(spell_ob->other_arch);
1309 effect->x = sx; 1309 effect->x = sx;
1310 effect->y = sy; 1310 effect->y = sy;
1311 insert_ob_in_map(effect, m, op, 0); 1311 insert_ob_in_map(effect, m, op, 0);
1312 } 1312 }
1313 } 1313 }
1314 } 1314 }
1315 } 1315 }
1316 } 1316 }
1317 } 1317 }
1318 } 1318 }
1319 op->skill = skill; 1319 op->skill = skill;
1320 return 1; 1320 return 1;
1321} 1321}
1322 1322
… …
1329int cast_curse(object *op, object *caster, object *spell_ob, int dir) { 1329int cast_curse(object *op, object *caster, object *spell_ob, int dir) {
1330 object *god = find_god(determine_god(op)); 1330 object *god = find_god(determine_god(op));
1331 object *tmp, *force; 1331 object *tmp, *force;
1332 1332
1333 tmp = get_pointed_target(op, (dir==0)?op->direction:dir, 1333 tmp = get_pointed_target(op, (dir==0)?op->direction:dir,
1334 spell_ob->range, SPELL_GRACE); 1334 spell_ob->range, SPELL_GRACE);
1335 if (!tmp) { 1335 if (!tmp) {
1336 new_draw_info(NDI_UNIQUE, 0, op, 1336 new_draw_info(NDI_UNIQUE, 0, op,
1337 "There is no one in that direction to curse."); 1337 "There is no one in that direction to curse.");
1338 return 0; 1338 return 0;
1339 } 1339 }
1340 1340
1341 /* If we've already got a force of this type, don't add a new one. */ 1341 /* 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) { 1342 for(force=tmp->inv; force!=NULL; force=force->below) {
1343 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) { 1343 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) {
1344 if (force->name == spell_ob->name) { 1344 if (force->name == spell_ob->name) {
1345 break; 1345 break;
1346 } 1346 }
1347 else if (spell_ob->race && spell_ob->race == force->name) { 1347 else if (spell_ob->race && spell_ob->race == force->name) {
1348 new_draw_info_format(NDI_UNIQUE, 0, op, 1348 new_draw_info_format(NDI_UNIQUE, 0, op,
1349 "You can not cast %s while %s is in effect", 1349 "You can not cast %s while %s is in effect",
1350 spell_ob->name, force->name_pl); 1350 spell_ob->name, force->name_pl);
1351 return 0; 1351 return 0;
1352 } 1352 }
1353 } 1353 }
1354 } 1354 }
1355 1355
1356 if(force==NULL) { 1356 if(force==NULL) {
1357 force=get_archetype(FORCE_NAME); 1357 force=get_archetype(FORCE_NAME);
1358 force->subtype = FORCE_CHANGE_ABILITY; 1358 force->subtype = FORCE_CHANGE_ABILITY;
1359 free_string(force->name); 1359 free_string(force->name);
1360 if (spell_ob->race) 1360 if (spell_ob->race)
1361 force->name = add_refcount(spell_ob->race); 1361 force->name = add_refcount(spell_ob->race);
1362 else 1362 else
1363 force->name = add_refcount(spell_ob->name);
1364 free_string(force->name_pl);
1363 force->name = add_refcount(spell_ob->name); 1365 force->name_pl = add_refcount(spell_ob->name);
1364 free_string(force->name_pl);
1365 force->name_pl = add_refcount(spell_ob->name);
1366 1366
1367 } else { 1367 } else {
1368 int duration; 1368 int duration;
1369 1369
1370 duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50; 1370 duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50;
1371 if (duration > force->duration) { 1371 if (duration > force->duration) {
1372 force->duration = duration; 1372 force->duration = duration;
1373 new_draw_info(NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1373 new_draw_info(NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1374 } else { 1374 } else {
1375 new_draw_info(NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1375 new_draw_info(NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1376 } 1376 }
1377 return 1; 1377 return 1;
1378 } 1378 }
1379 force->duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50; 1379 force->duration = spell_ob->duration + SP_level_duration_adjust(caster, spell_ob) * 50;
1380 force->speed = 1.0; 1380 force->speed = 1.0;
1381 force->speed_left = -1.0; 1381 force->speed_left = -1.0;
1382 SET_FLAG(force, FLAG_APPLIED); 1382 SET_FLAG(force, FLAG_APPLIED);
1383 1383
1384 if(god) { 1384 if(god) {
1385 if (spell_ob->last_grace) 1385 if (spell_ob->last_grace)
1386 force->path_repelled=god->path_repelled; 1386 force->path_repelled=god->path_repelled;
1387 if (spell_ob->last_grace) 1387 if (spell_ob->last_grace)
1388 force->path_denied=god->path_denied; 1388 force->path_denied=god->path_denied;
1389 new_draw_info_format(NDI_UNIQUE, 0,tmp, 1389 new_draw_info_format(NDI_UNIQUE, 0,tmp,
1390 "You are a victim of %s's curse!",god->name); 1390 "You are a victim of %s's curse!",god->name);
1391 } else 1391 } else
1392 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty."); 1392 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty.");
1393 1393
1394 1394
1395 if(tmp!=op && op->type==PLAYER) 1395 if(tmp!=op && op->type==PLAYER)
1396 new_draw_info_format(NDI_UNIQUE, 0, op, "You curse %s!",tmp->name); 1396 new_draw_info_format(NDI_UNIQUE, 0, op, "You curse %s!",tmp->name);
1397 1397
1398 force->stats.ac = spell_ob->stats.ac; 1398 force->stats.ac = spell_ob->stats.ac;
1399 force->stats.wc = spell_ob->stats.wc; 1399 force->stats.wc = spell_ob->stats.wc;
1400 1400
1401 change_abil(tmp,force); /* Mostly to display any messages */ 1401 change_abil(tmp,force); /* Mostly to display any messages */
… …
1438 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race; 1438 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race;
1439 else race = spell->race; 1439 else race = spell->race;
1440 1440
1441 1441
1442 for (x = op->x - range; x <= op->x + range; x++) 1442 for (x = op->x - range; x <= op->x + range; x++)
1443 for (y = op->y - range; y <= op->y + range; y++) { 1443 for (y = op->y - range; y <= op->y + range; y++) {
1444 1444
1445 done_one=0; 1445 done_one=0;
1446 m = op->map; 1446 m = op->map;
1447 nx = x; 1447 nx = x;
1448 ny = y; 1448 ny = y;
1449 mflags = get_map_flags(m, &m, x, y, &nx, &ny); 1449 mflags = get_map_flags(m, &m, x, y, &nx, &ny);
1450 if (mflags & P_OUT_OF_MAP) continue; 1450 if (mflags & P_OUT_OF_MAP) continue;
1451 1451
1452 /* If there is nothing living on this space, no need to go further */ 1452 /* If there is nothing living on this space, no need to go further */
1453 if (!(mflags & P_IS_ALIVE)) continue; 1453 if (!(mflags & P_IS_ALIVE)) continue;
1454 1454
1455 for (tmp = get_map_ob(m, nx, ny); tmp; tmp = tmp->above) 1455 for (tmp = get_map_ob(m, nx, ny); tmp; tmp = tmp->above)
1456 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break; 1456 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break;
1457 1457
1458 /* There can be living objects that are not monsters */ 1458 /* There can be living objects that are not monsters */
1459 if (!tmp || tmp->type==PLAYER) continue; 1459 if (!tmp || tmp->type==PLAYER) continue;
1460 1460
1461 /* Only the head has meaningful data, so resolve to that */ 1461 /* Only the head has meaningful data, so resolve to that */
1462 if (tmp->head) head=tmp->head; 1462 if (tmp->head) head=tmp->head;
1463 else head=tmp; 1463 else head=tmp;
1464 1464
1465 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1465 /* 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; 1466 if (race && head->race && !strstr(race, head->race)) continue;
1467 if (QUERY_FLAG(head, FLAG_UNDEAD) && !QUERY_FLAG(spell, FLAG_UNDEAD)) continue; 1467 if (QUERY_FLAG(head, FLAG_UNDEAD) && !QUERY_FLAG(spell, FLAG_UNDEAD)) continue;
1468 1468
1469 /* Now do a bunch of stuff related to saving throws */ 1469 /* Now do a bunch of stuff related to saving throws */
1470 best_at = -1; 1470 best_at = -1;
1471 if (spell->attacktype) { 1471 if (spell->attacktype) {
1472 for (at=0; at < NROFATTACKS; at++) 1472 for (at=0; at < NROFATTACKS; at++)
1473 if (spell->attacktype & (1 << at)) 1473 if (spell->attacktype & (1 << at))
1474 if (best_at == -1 || head->resist[at] > head->resist[best_at]) best_at = at; 1474 if (best_at == -1 || head->resist[at] > head->resist[best_at]) best_at = at;
1475 1475
1476 if (best_at == -1) at=0; 1476 if (best_at == -1) at=0;
1477 else { 1477 else {
1478 if (head->resist[best_at] == 100) continue; 1478 if (head->resist[best_at] == 100) continue;
1479 else at = head->resist[best_at] / 5; 1479 else at = head->resist[best_at] / 5;
1480 } 1480 }
1481 at -= level / 5; 1481 at -= level / 5;
1482 if (did_make_save(head, head->level, at)) continue; 1482 if (did_make_save(head, head->level, at)) continue;
1483 } 1483 }
1484 else /* spell->attacktype */ 1484 else /* spell->attacktype */
1485 /* 1485 /*
1486 Spell has no attacktype (charm & such), so we'll have a specific saving: 1486 Spell has no attacktype (charm & such), so we'll have a specific saving:
1487 * if spell level < monster level, no go 1487 * if spell level < monster level, no go
1488 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) ) 1488 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
… …
1499 if ( random_roll( 0, 100, caster, PREFER_LOW ) >= ( 20 + MIN( 50, 2 * ( level - head->level ) ) ) ) 1499 if ( random_roll( 0, 100, caster, PREFER_LOW ) >= ( 20 + MIN( 50, 2 * ( level - head->level ) ) ) )
1500 /* Failed, no effect */ 1500 /* Failed, no effect */
1501 continue; 1501 continue;
1502 } 1502 }
1503 1503
1504 /* Done with saving throw. Now start effecting the monster */ 1504 /* Done with saving throw. Now start effecting the monster */
1505 1505
1506 /* aggravation */ 1506 /* aggravation */
1507 if (QUERY_FLAG(spell, FLAG_MONSTER)) { 1507 if (QUERY_FLAG(spell, FLAG_MONSTER)) {
1508 CLEAR_FLAG(head, FLAG_SLEEP); 1508 CLEAR_FLAG(head, FLAG_SLEEP);
1509 if (QUERY_FLAG(head, FLAG_FRIENDLY)) 1509 if (QUERY_FLAG(head, FLAG_FRIENDLY))
1510 remove_friendly_object(head); 1510 remove_friendly_object(head);
1511 1511
1512 done_one = 1; 1512 done_one = 1;
1513 head->enemy = op; 1513 head->enemy = op;
1514 } 1514 }
1515 1515
1516 /* calm monsters */ 1516 /* calm monsters */
1517 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) { 1517 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) {
1518 SET_FLAG(head, FLAG_UNAGGRESSIVE); 1518 SET_FLAG(head, FLAG_UNAGGRESSIVE);
1519 head->enemy = NULL; 1519 head->enemy = NULL;
1520 done_one = 1; 1520 done_one = 1;
1521 } 1521 }
1522 1522
1523 /* berserk monsters */ 1523 /* berserk monsters */
1524 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) { 1524 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) {
1525 SET_FLAG(head, FLAG_BERSERK); 1525 SET_FLAG(head, FLAG_BERSERK);
1526 done_one = 1; 1526 done_one = 1;
1527 } 1527 }
1528 /* charm */ 1528 /* charm */
1529 if (QUERY_FLAG(spell, FLAG_NO_ATTACK) && !QUERY_FLAG(head, FLAG_FRIENDLY)) { 1529 if (QUERY_FLAG(spell, FLAG_NO_ATTACK) && !QUERY_FLAG(head, FLAG_FRIENDLY)) {
1530 SET_FLAG(head, FLAG_FRIENDLY); 1530 SET_FLAG(head, FLAG_FRIENDLY);
1531 /* Prevent uncontolled outbreaks of self replicating monsters. 1531 /* Prevent uncontolled outbreaks of self replicating monsters.
1532 Typical use case is charm, go somwhere, use aggravation to make hostile. 1532 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. */ 1533 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1534 CLEAR_FLAG(head, FLAG_GENERATOR); 1534 CLEAR_FLAG(head, FLAG_GENERATOR);
1535 set_owner(head, op); 1535 set_owner(head, op);
1536 set_spell_skill(op, caster, spell, head); 1536 set_spell_skill(op, caster, spell, head);
1537 add_friendly_object(head); 1537 add_friendly_object(head);
1538 head->attack_movement = PETMOVE; 1538 head->attack_movement = PETMOVE;
1539 done_one = 1; 1539 done_one = 1;
1540 change_exp(op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1540 change_exp(op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1541 head->stats.exp = 0; 1541 head->stats.exp = 0;
1542 } 1542 }
1543 1543
1544 /* If a monster was effected, put an effect in */ 1544 /* If a monster was effected, put an effect in */
1545 if (done_one && spell->other_arch) { 1545 if (done_one && spell->other_arch) {
1546 tmp = arch_to_object(spell->other_arch); 1546 tmp = arch_to_object(spell->other_arch);
1547 tmp->x = nx; 1547 tmp->x = nx;
1548 tmp->y = ny; 1548 tmp->y = ny;
1549 insert_ob_in_map(tmp, m, op, 0); 1549 insert_ob_in_map(tmp, m, op, 0);
1550 } 1550 }
1551 } /* for y */ 1551 } /* for y */
1552 1552
1553 return 1; 1553 return 1;
1554} 1554}
1555 1555
1556 1556
… …
1576 * deviations. 1576 * deviations.
1577 */ 1577 */
1578 1578
1579 dir = 0; 1579 dir = 0;
1580 if(!(rndm(0, 3))) 1580 if(!(rndm(0, 3)))
1581 j = rndm(0, 1); 1581 j = rndm(0, 1);
1582 else j=0; 1582 else j=0;
1583 1583
1584 for(i = 1; i < 9; i++) { 1584 for(i = 1; i < 9; i++) {
1585 /* i bit 0: alters sign of offset 1585 /* i bit 0: alters sign of offset
1586 * other bits (i / 2): absolute value of offset 1586 * other bits (i / 2): absolute value of offset
1587 */ 1587 */
1588 1588
1589 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2); 1589 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2);
1590 int tmpdir = absdir (op->direction + offset); 1590 int tmpdir = absdir (op->direction + offset);
1591 1591
1592 nx = op->x + freearr_x[tmpdir]; 1592 nx = op->x + freearr_x[tmpdir];
1593 ny = op->y + freearr_y[tmpdir]; 1593 ny = op->y + freearr_y[tmpdir];
1594 if ( ! (get_map_flags(op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) && 1594 if ( ! (get_map_flags(op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) &&
1595 !(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)))) {
1596 dir = tmpdir; 1596 dir = tmpdir;
1597 break; 1597 break;
1598 } 1598 }
1599 } 1599 }
1600 if (dir == 0) { 1600 if (dir == 0) {
1601 nx = op->x; 1601 nx = op->x;
1602 ny = op->y; 1602 ny = op->y;
1603 m = op->map; 1603 m = op->map;
1604 } 1604 }
1605 1605
1606 remove_ob(op); 1606 remove_ob(op);
1607 op->y=ny; 1607 op->y=ny;
1608 op->x=nx; 1608 op->x=nx;
1609 insert_ob_in_map(op,m,op,0); 1609 insert_ob_in_map(op,m,op,0);
1610 1610
1611 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1611 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1612 surrounding squares */ 1612 surrounding squares */
1613 1613
1614 /* loop over current square and neighbors to hit. 1614 /* loop over current square and neighbors to hit.
1615 * if this has an other_arch field, we insert that in 1615 * if this has an other_arch field, we insert that in
1616 * the surround spaces. 1616 * the surround spaces.
1617 */ 1617 */
1618 for(j=0;j<9;j++) { 1618 for(j=0;j<9;j++) {
1619 object *new_ob; 1619 object *new_ob;
1620 1620
1621 hx = nx+freearr_x[j]; 1621 hx = nx+freearr_x[j];
1622 hy = ny+freearr_y[j]; 1622 hy = ny+freearr_y[j];
1623 1623
1624 m = op->map; 1624 m = op->map;
1625 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy); 1625 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy);
1626 1626
1627 if (mflags & P_OUT_OF_MAP) continue; 1627 if (mflags & P_OUT_OF_MAP) continue;
1628 1628
1629 /* first, don't ever, ever hit the owner. Don't hit out 1629 /* first, don't ever, ever hit the owner. Don't hit out
1630 * of the map either. 1630 * of the map either.
1631 */ 1631 */
1632 1632
1633 if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || !on_same_map(owner,op))) { 1633 if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || !on_same_map(owner,op))) {
1634 if(j) op->stats.dam = dam_save/2; 1634 if(j) op->stats.dam = dam_save/2;
1635 hit_map(op,j,op->attacktype,1); 1635 hit_map(op,j,op->attacktype,1);
1636 1636
1637 } 1637 }
1638 1638
1639 /* insert the other arch */ 1639 /* insert the other arch */
1640 if(op->other_arch && !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy)))) { 1640 if(op->other_arch && !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy)))) {
1641 new_ob = arch_to_object(op->other_arch); 1641 new_ob = arch_to_object(op->other_arch);
1642 new_ob->x = hx; 1642 new_ob->x = hx;
1643 new_ob->y = hy; 1643 new_ob->y = hy;
1644 insert_ob_in_map(new_ob,m,op,0); 1644 insert_ob_in_map(new_ob,m,op,0);
1645 } 1645 }
1646 } 1646 }
1647 1647
1648 /* restore to the center location and damage*/ 1648 /* restore to the center location and damage*/
1649 op->stats.dam = dam_save; 1649 op->stats.dam = dam_save;
1650 1650
1651 i=spell_find_dir(op->map,op->x,op->y,get_owner(op)); 1651 i=spell_find_dir(op->map,op->x,op->y,get_owner(op));
1652 1652
1653 if(i>=0) { /* we have a preferred direction! */ 1653 if(i>=0) { /* we have a preferred direction! */
1654 /* pick another direction if the preferred dir is blocked. */ 1654 /* 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 || 1655 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))) { 1656 OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy))) {
1657 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */ 1657 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */
1658 } 1658 }
1659 op->direction=i; 1659 op->direction=i;
1660 } 1660 }
1661} 1661}
1662 1662
1663 1663
1664/* move_swarm_spell: peterm 1664/* move_swarm_spell: peterm
… …
1678 mapstruct *m; 1678 mapstruct *m;
1679 object *owner; 1679 object *owner;
1680 1680
1681 owner = get_owner(op); 1681 owner = get_owner(op);
1682 if(op->duration == 0 || owner == NULL) { 1682 if(op->duration == 0 || owner == NULL) {
1683 remove_ob(op); 1683 remove_ob(op);
1684 free_object(op); 1684 free_object(op);
1685 return; 1685 return;
1686 } 1686 }
1687 op->duration--; 1687 op->duration--;
1688 1688
1689 basedir = op->direction; 1689 basedir = op->direction;
1690 if(basedir == 0) { 1690 if(basedir == 0) {
… …
1728 * it is unlikely to disappear by the time we need it. However, 1728 * it is unlikely to disappear by the time we need it. However,
1729 * do some sanity checking anyways. 1729 * do some sanity checking anyways.
1730 */ 1730 */
1731 1731
1732 if (op->spell && op->spell->type == SPELL && 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) && 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)))) { 1734 !(OB_TYPE_MOVE_BLOCK(op->spell, GET_MAP_MOVE_BLOCK(m, target_x, target_y)))) {
1735 1735
1736 /* Bullet spells have a bunch more customization that needs to be done */ 1736 /* Bullet spells have a bunch more customization that needs to be done */
1737 if (op->spell->subtype == SP_BULLET) 1737 if (op->spell->subtype == SP_BULLET)
1738 fire_bullet(owner, op, basedir, op->spell); 1738 fire_bullet(owner, op, basedir, op->spell);
1739 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1739 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1740 fire_arch_from_position (owner, op, origin_x, origin_y, basedir, op->spell); 1740 fire_arch_from_position (owner, op, origin_x, origin_y, basedir, op->spell);
1741 } 1741 }
1742#endif 1742#endif
1743 1743
1744 /* spell pointer is set up for the spell this casts. Since this 1744 /* spell pointer is set up for the spell this casts. Since this
1745 * should just be a pointer to the spell in some inventory, 1745 * should just be a pointer to the spell in some inventory,
… …
1747 * do some sanity checking anyways. 1747 * do some sanity checking anyways.
1748 */ 1748 */
1749 1749
1750 if (op->spell && op->spell->type == SPELL) 1750 if (op->spell && op->spell->type == SPELL)
1751 { 1751 {
1752 /* Bullet spells have a bunch more customization that needs to be done */ 1752 /* Bullet spells have a bunch more customization that needs to be done */
1753 if (op->spell->subtype == SP_BULLET) 1753 if (op->spell->subtype == SP_BULLET)
1754 fire_bullet(owner, op, basedir, op->spell); 1754 fire_bullet(owner, op, basedir, op->spell);
1755 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1755 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1756 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1756 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell);
1757 } 1757 }
1758} 1758}
1759 1759
1760 1760
1761 1761
… …
1789 tmp->spell = arch_to_object(spell->other_arch); 1789 tmp->spell = arch_to_object(spell->other_arch);
1790 1790
1791 tmp->attacktype = tmp->spell->attacktype; 1791 tmp->attacktype = tmp->spell->attacktype;
1792 1792
1793 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) { 1793 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) {
1794 if ( ! tailor_god_spell (tmp, op)) 1794 if ( ! tailor_god_spell (tmp, op))
1795 return 1; 1795 return 1;
1796 } 1796 }
1797 tmp->duration = SP_level_duration_adjust(caster, spell); 1797 tmp->duration = SP_level_duration_adjust(caster, spell);
1798 for (i=0; i< spell->duration; i++) 1798 for (i=0; i< spell->duration; i++)
1799 tmp->duration += die_roll(1, 3, op, PREFER_HIGH); 1799 tmp->duration += die_roll(1, 3, op, PREFER_HIGH);
1800 1800
1801 tmp->direction=dir; 1801 tmp->direction=dir;
1802 tmp->invisible=1; 1802 tmp->invisible=1;
1803 insert_ob_in_map(tmp,op->map,op,0); 1803 insert_ob_in_map(tmp,op->map,op,0);
1804 return 1; 1804 return 1;
… …
1815 mapstruct *m; 1815 mapstruct *m;
1816 1816
1817 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell); 1817 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell);
1818 1818
1819 if(!dir) { 1819 if(!dir) {
1820 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?"); 1820 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?");
1821 return 0; 1821 return 0;
1822 } 1822 }
1823 1823
1824 x=op->x+freearr_x[dir]; 1824 x=op->x+freearr_x[dir];
1825 y=op->y+freearr_y[dir]; 1825 y=op->y+freearr_y[dir];
1826 m = op->map; 1826 m = op->map;
1827 1827
1828 mflags = get_map_flags(m, &m, x, y, &x, &y); 1828 mflags = get_map_flags(m, &m, x, y, &x, &y);
1829 1829
1830 if (mflags & P_OUT_OF_MAP) { 1830 if (mflags & P_OUT_OF_MAP) {
1831 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there."); 1831 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there.");
1832 return 0; 1832 return 0;
1833 } 1833 }
1834 1834
1835 if (mflags & P_IS_ALIVE && spell->attacktype) { 1835 if (mflags & P_IS_ALIVE && spell->attacktype) {
1836 for(target=get_map_ob(m,x,y);target;target=target->above) 1836 for(target=get_map_ob(m,x,y);target;target=target->above)
1837 if(QUERY_FLAG(target,FLAG_MONSTER)) { 1837 if(QUERY_FLAG(target,FLAG_MONSTER)) {
1838 /* oky doky. got a target monster. Lets make a blinding attack */ 1838 /* oky doky. got a target monster. Lets make a blinding attack */
1839 if(target->head) target = target->head; 1839 if(target->head) target = target->head;
1840 (void) hit_player(target,dam,op,spell->attacktype,1); 1840 (void) hit_player(target,dam,op,spell->attacktype,1);
1841 return 1; /* one success only! */ 1841 return 1; /* one success only! */
1842 } 1842 }
1843 } 1843 }
1844 1844
1845 /* no live target, perhaps a wall is in the way? */ 1845 /* no live target, perhaps a wall is in the way? */
1846 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y))) { 1846 if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y))) {
1847 new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way."); 1847 new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way.");
1848 return 0; 1848 return 0;
1849 } 1849 }
1850 1850
1851 /* ok, looks groovy to just insert a new light on the map */ 1851 /* ok, looks groovy to just insert a new light on the map */
1852 tmp=arch_to_object(spell->other_arch); 1852 tmp=arch_to_object(spell->other_arch);
1853 if(!tmp) { 1853 if(!tmp) {
1854 LOG(llevError,"Error: spell arch for cast_light() missing.\n"); 1854 LOG(llevError,"Error: spell arch for cast_light() missing.\n");
1855 return 0; 1855 return 0;
1856 } 1856 }
1857 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell); 1857 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell);
1858 if (tmp->glow_radius) { 1858 if (tmp->glow_radius) {
1859 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell); 1859 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; 1860 if (tmp->glow_radius > MAX_LIGHT_RADII) tmp->glow_radius = MAX_LIGHT_RADII;
1861 } 1861 }
1862 tmp->x=x; 1862 tmp->x=x;
1863 tmp->y=y; 1863 tmp->y=y;
1864 insert_ob_in_map(tmp,m,op,0); 1864 insert_ob_in_map(tmp,m,op,0);
1865 return 1; 1865 return 1;
… …
1895 dam_mod = SP_level_dam_adjust(caster, spell); 1895 dam_mod = SP_level_dam_adjust(caster, spell);
1896 dur_mod = SP_level_duration_adjust(caster, spell); 1896 dur_mod = SP_level_duration_adjust(caster, spell);
1897 1897
1898 /* search in a line for a victim */ 1898 /* search in a line for a victim */
1899 for(i=1; i<range; i++) { 1899 for(i=1; i<range; i++) {
1900 x = op->x + i * freearr_x[dir]; 1900 x = op->x + i * freearr_x[dir];
1901 y = op->y + i * freearr_y[dir]; 1901 y = op->y + i * freearr_y[dir];
1902 m = op->map; 1902 m = op->map;
1903 1903
1904 mflags = get_map_flags(m, &m, x, y, &x, &y); 1904 mflags = get_map_flags(m, &m, x, y, &x, &y);
1905 1905
1906 if (mflags & P_OUT_OF_MAP) return 0; 1906 if (mflags & P_OUT_OF_MAP) return 0;
1907 1907
1908 /* don't go through walls - presume diseases are airborne */ 1908 /* don't go through walls - presume diseases are airborne */
1909 if (GET_MAP_MOVE_BLOCK(m, x, y) & MOVE_FLY_LOW) return 0; 1909 if (GET_MAP_MOVE_BLOCK(m, x, y) & MOVE_FLY_LOW) return 0;
1910 1910
1911 /* Only bother looking on this space if there is something living here */ 1911 /* Only bother looking on this space if there is something living here */
1912 if (mflags & P_IS_ALIVE) { 1912 if (mflags & P_IS_ALIVE) {
1913 /* search this square for a victim */ 1913 /* search this square for a victim */
1914 for(walk=get_map_ob(m,x,y);walk;walk=walk->above) 1914 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 */ 1915 if (QUERY_FLAG(walk,FLAG_MONSTER) || (walk->type==PLAYER)) { /* found a victim */
1916 object *disease = arch_to_object(spell->other_arch); 1916 object *disease = arch_to_object(spell->other_arch);
1917 1917
1918 set_owner(disease,op); 1918 set_owner(disease,op);
1919 set_spell_skill(op, caster, spell, disease); 1919 set_spell_skill(op, caster, spell, disease);
1920 disease->stats.exp = 0; 1920 disease->stats.exp = 0;
1921 disease->level = caster_level(caster, spell); 1921 disease->level = caster_level(caster, spell);
1922 1922
1923 /* do level adjustments */ 1923 /* do level adjustments */
1924 if(disease->stats.wc) 1924 if(disease->stats.wc)
1925 disease->stats.wc += dur_mod/2; 1925 disease->stats.wc += dur_mod/2;
1926 1926
1927 if(disease->magic> 0) 1927 if(disease->magic> 0)
1928 disease->magic += dur_mod/4; 1928 disease->magic += dur_mod/4;
1929 1929
1930 if(disease->stats.maxhp>0) 1930 if(disease->stats.maxhp>0)
1931 disease->stats.maxhp += dur_mod; 1931 disease->stats.maxhp += dur_mod;
1932 1932
1933 if(disease->stats.maxgrace>0) 1933 if(disease->stats.maxgrace>0)
1934 disease->stats.maxgrace += dur_mod; 1934 disease->stats.maxgrace += dur_mod;
1935 1935
1936 if(disease->stats.dam) { 1936 if(disease->stats.dam) {
1937 if(disease->stats.dam > 0) 1937 if(disease->stats.dam > 0)
1938 disease->stats.dam += dam_mod; 1938 disease->stats.dam += dam_mod;
1939 else disease->stats.dam -= dam_mod; 1939 else disease->stats.dam -= dam_mod;
1940 } 1940 }
1941 1941
1942 if(disease->last_sp) { 1942 if(disease->last_sp) {
1943 disease->last_sp -= 2*dam_mod; 1943 disease->last_sp -= 2*dam_mod;
1944 if(disease->last_sp <1) disease->last_sp = 1; 1944 if(disease->last_sp <1) disease->last_sp = 1;
1945 } 1945 }
1946 1946
1947 if(disease->stats.maxsp) { 1947 if(disease->stats.maxsp) {
1948 if(disease->stats.maxsp > 0) 1948 if(disease->stats.maxsp > 0)
1949 disease->stats.maxsp += dam_mod; 1949 disease->stats.maxsp += dam_mod;
1950 else disease->stats.maxsp -= dam_mod; 1950 else disease->stats.maxsp -= dam_mod;
1951 } 1951 }
1952 1952
1953 if(disease->stats.ac) 1953 if(disease->stats.ac)
1954 disease->stats.ac += dam_mod; 1954 disease->stats.ac += dam_mod;
1955 1955
1956 if(disease->last_eat) 1956 if(disease->last_eat)
1957 disease->last_eat -= dam_mod; 1957 disease->last_eat -= dam_mod;
1958 1958
1959 if(disease->stats.hp) 1959 if(disease->stats.hp)
1960 disease->stats.hp -= dam_mod; 1960 disease->stats.hp -= dam_mod;
1961 1961
1962 if(disease->stats.sp) 1962 if(disease->stats.sp)
1963 disease->stats.sp -= dam_mod; 1963 disease->stats.sp -= dam_mod;
1964 1964
1965 if(infect_object(walk,disease,1)) { 1965 if(infect_object(walk,disease,1)) {
1966 object *flash; /* visual effect for inflicting disease */ 1966 object *flash; /* visual effect for inflicting disease */
1967 1967
1968 new_draw_info_format(NDI_UNIQUE, 0, op, "You inflict %s on %s!",disease->name,walk->name); 1968 new_draw_info_format(NDI_UNIQUE, 0, op, "You inflict %s on %s!",disease->name,walk->name);
1969 1969
1970 free_object(disease); /* don't need this one anymore */ 1970 free_object(disease); /* don't need this one anymore */
1971 flash=get_archetype(ARCH_DETECT_MAGIC); 1971 flash=get_archetype(ARCH_DETECT_MAGIC);
1972 flash->x = x; 1972 flash->x = x;
1973 flash->y = y; 1973 flash->y = y;
1974 flash->map = walk->map; 1974 flash->map = walk->map;
1975 insert_ob_in_map(flash,walk->map,op,0); 1975 insert_ob_in_map(flash,walk->map,op,0);
1976 return 1; 1976 return 1;
1977 } 1977 }
1978 free_object(disease); 1978 free_object(disease);
1979 } 1979 }
1980 } /* if living creature */ 1980 } /* if living creature */
1981 } /* for range of spaces */ 1981 } /* for range of spaces */
1982 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!"); 1982 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!");
1983 return 1; 1983 return 1;
1984} 1984}

Diff Legend

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