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

Diff Legend

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