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.2 by elmex, Tue Aug 15 15:00:20 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.2 2006/08/15 15:00:20 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
410 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
411 // NOTE: If this breaks something important: remove this. I can't think of anything
412 // bad at the moment that might happen from this.
411 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)
412 { 414 {
413 remove_ob (op); 415 remove_ob (op);
414 free_object (op); 416 free_object (op);
415 return; 417 return;
416 } 418 }
417 419
418 if (op->attacktype) { 420 if (op->attacktype) {
419 hit_map (op, 0, op->attacktype, 1); 421 hit_map (op, 0, op->attacktype, 1);
420 if (was_destroyed (op, op_tag)) 422 if (was_destroyed (op, op_tag))
421 return; 423 return;
422 } 424 }
423 425
424 /* other_arch contains what this explodes into */ 426 /* other_arch contains what this explodes into */
425 tmp = arch_to_object (op->other_arch); 427 tmp = arch_to_object (op->other_arch);
426 428
… …
429 if (op->skill) tmp->skill = add_refcount(op->skill); 431 if (op->skill) tmp->skill = add_refcount(op->skill);
430 432
431 owner = get_owner(op); 433 owner = get_owner(op);
432 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && 434 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner &&
433 !tailor_god_spell(tmp, owner)) { 435 !tailor_god_spell(tmp, owner)) {
434 remove_ob (op); 436 remove_ob (op);
435 free_object (op); 437 free_object (op);
436 return; 438 return;
437 } 439 }
438 tmp->x = op->x; 440 tmp->x = op->x;
439 tmp->y = op->y; 441 tmp->y = op->y;
440 442
441 /* special for bombs - it actually has sane values for these */ 443 /* special for bombs - it actually has sane values for these */
442 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) { 444 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) {
443 tmp->attacktype = op->attacktype; 445 tmp->attacktype = op->attacktype;
444 tmp->range = op->range; 446 tmp->range = op->range;
445 tmp->stats.dam = op->stats.dam; 447 tmp->stats.dam = op->stats.dam;
446 tmp->duration = op->duration; 448 tmp->duration = op->duration;
447 } else { 449 } else {
448 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC; 450 if (op->attacktype & AT_MAGIC) tmp->attacktype|=AT_MAGIC;
449 /* Spell doc describes what is going on here */ 451 /* Spell doc describes what is going on here */
450 tmp->stats.dam = op->dam_modifier; 452 tmp->stats.dam = op->dam_modifier;
451 tmp->range = op->stats.maxhp; 453 tmp->range = op->stats.maxhp;
452 tmp->duration = op->stats.hp; 454 tmp->duration = op->stats.hp;
453 /* 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 -
454 * the count of the parent should work fine. 456 * the count of the parent should work fine.
455 */ 457 */
456 tmp->stats.maxhp = op->count; 458 tmp->stats.maxhp = op->count;
457 } 459 }
458 460
459 /* Set direction of cone explosion */ 461 /* Set direction of cone explosion */
460 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE) 462 if (tmp->type == SPELL_EFFECT && tmp->subtype == SP_CONE)
461 tmp->stats.sp = op->direction; 463 tmp->stats.sp = op->direction;
462 464
463 /* Prevent recursion */ 465 /* Prevent recursion */
464 op->move_on = 0; 466 op->move_on = 0;
465 467
466 insert_ob_in_map(tmp, op->map, op, 0); 468 insert_ob_in_map(tmp, op->map, op, 0);
467 /* remove the firebullet */ 469 /* remove the firebullet */
468 if ( ! was_destroyed (op, op_tag)) { 470 if ( ! was_destroyed (op, op_tag)) {
469 remove_ob (op); 471 remove_ob (op);
470 free_object (op); 472 free_object (op);
471 } 473 }
472} 474}
473 475
474 476
475 477
… …
489 491
490 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)))
491 return; 493 return;
492 494
493 if (op->other_arch) { 495 if (op->other_arch) {
494 /* explode object will also remove op */ 496 /* explode object will also remove op */
495 explode_bullet (op); 497 explode_bullet (op);
496 return; 498 return;
497 } 499 }
498 500
499 /* 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 */
… …
505 tmp_tag = tmp->count; 507 tmp_tag = tmp->count;
506 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 508 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
507 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag) 509 if (was_destroyed (op, op_tag) || ! was_destroyed (tmp, tmp_tag)
508 || (op->stats.dam -= dam) < 0) 510 || (op->stats.dam -= dam) < 0)
509 { 511 {
510 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 512 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
511 remove_ob (op); 513 remove_ob (op);
512 free_object(op); 514 free_object(op);
513 return; 515 return;
514 } 516 }
515 } 517 }
516 } 518 }
517 } 519 }
518} 520}
519 521
… …
532 534
533#if 0 535#if 0
534 /* We need a better general purpose way to do this */ 536 /* We need a better general purpose way to do this */
535 537
536 /* peterm: added to make comet leave a trail of burnouts 538 /* peterm: added to make comet leave a trail of burnouts
537 it's an unadulterated hack, but the effect is cool. */ 539 it's an unadulterated hack, but the effect is cool. */
538 if(op->stats.sp == SP_METEOR) { 540 if(op->stats.sp == SP_METEOR) {
539 replace_insert_ob_in_map("fire_trail",op); 541 replace_insert_ob_in_map("fire_trail",op);
540 if (was_destroyed (op, op_tag)) 542 if (was_destroyed (op, op_tag))
541 return; 543 return;
542 } /* end addition. */ 544 } /* end addition. */
… …
544 546
545 /* Reached the end of its life - remove it */ 547 /* Reached the end of its life - remove it */
546 if (--op->range <=0) { 548 if (--op->range <=0) {
547 if (op->other_arch) { 549 if (op->other_arch) {
548 explode_bullet (op); 550 explode_bullet (op);
549 } else { 551 } else {
550 remove_ob (op); 552 remove_ob (op);
551 free_object (op); 553 free_object (op);
552 } 554 }
553 return; 555 return;
554 } 556 }
555 557
556 new_x = op->x + DIRX(op); 558 new_x = op->x + DIRX(op);
557 new_y = op->y + DIRY(op); 559 new_y = op->y + DIRY(op);
… …
603int fire_bullet(object *op,object *caster,int dir,object *spob) { 605int fire_bullet(object *op,object *caster,int dir,object *spob) {
604 object *tmp=NULL; 606 object *tmp=NULL;
605 int mflags; 607 int mflags;
606 608
607 if (!spob->other_arch) 609 if (!spob->other_arch)
608 return 0; 610 return 0;
609 611
610 tmp=arch_to_object(spob->other_arch); 612 tmp=arch_to_object(spob->other_arch);
611 if(tmp==NULL) 613 if(tmp==NULL)
612 return 0; 614 return 0;
613 615
614 /* peterm: level dependency for bolts */ 616 /* peterm: level dependency for bolts */
615 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);
616 tmp->attacktype = spob->attacktype; 618 tmp->attacktype = spob->attacktype;
617 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying); 619 if (spob->slaying) tmp->slaying = add_refcount(spob->slaying);
… …
623 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob); 625 tmp->stats.maxhp = spob->range + SP_level_range_adjust(caster,spob);
624 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);
625 627
626 tmp->direction=dir; 628 tmp->direction=dir;
627 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 629 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
628 SET_ANIMATION(tmp, dir); 630 SET_ANIMATION(tmp, dir);
629 631
630 set_owner(tmp,op); 632 set_owner(tmp,op);
631 set_spell_skill(op, caster, spob, tmp); 633 set_spell_skill(op, caster, spob, tmp);
632 634
633 tmp->x=op->x + freearr_x[dir]; 635 tmp->x=op->x + freearr_x[dir];
634 tmp->y=op->y + freearr_y[dir]; 636 tmp->y=op->y + freearr_y[dir];
635 tmp->map = op->map; 637 tmp->map = op->map;
636 638
637 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);
638 if (mflags & P_OUT_OF_MAP) { 640 if (mflags & P_OUT_OF_MAP) {
639 free_object(tmp); 641 free_object(tmp);
640 return 0; 642 return 0;
641 } 643 }
642 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))) {
643 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) { 645 if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
644 free_object(tmp); 646 free_object(tmp);
645 return 0; 647 return 0;
646 } 648 }
647 tmp->x=op->x; 649 tmp->x=op->x;
648 tmp->y=op->y; 650 tmp->y=op->y;
649 tmp->direction=absdir(tmp->direction+4); 651 tmp->direction=absdir(tmp->direction+4);
650 tmp->map = op->map; 652 tmp->map = op->map;
651 } 653 }
652 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) {
653 check_bullet (tmp); 655 check_bullet (tmp);
654 } 656 }
655 return 1; 657 return 1;
656} 658}
657 659
658 660
… …
674 new_ob->level = op->level; 676 new_ob->level = op->level;
675 set_owner(new_ob,op->owner); 677 set_owner(new_ob,op->owner);
676 678
677 /* preserve skill ownership */ 679 /* preserve skill ownership */
678 if(op->skill && op->skill != new_ob->skill) { 680 if(op->skill && op->skill != new_ob->skill) {
679 if (new_ob->skill) free_string(new_ob->skill); 681 if (new_ob->skill) free_string(new_ob->skill);
680 new_ob->skill = add_refcount(op->skill); 682 new_ob->skill = add_refcount(op->skill);
681 } 683 }
682 insert_ob_in_map(new_ob,op->map,op,0); 684 insert_ob_in_map(new_ob,op->map,op,0);
683 685
684} 686}
685 687
… …
689 int i; 691 int i;
690 tag_t tag; 692 tag_t tag;
691 693
692 /* 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 */
693 if (! op->map) { 695 if (! op->map) {
694 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",
695 op->name ? op->name : "unknown"); 697 op->name ? op->name : "unknown");
696 op->speed = 0; 698 op->speed = 0;
697 update_ob_speed (op); 699 update_ob_speed (op);
698 return; 700 return;
699 } 701 }
700 702
701 /* lava saves it's life, but not yours :) */ 703 /* lava saves it's life, but not yours :) */
702 if (QUERY_FLAG(op, FLAG_LIFESAVE)) { 704 if (QUERY_FLAG(op, FLAG_LIFESAVE)) {
703 hit_map(op,0,op->attacktype,0); 705 hit_map(op,0,op->attacktype,0);
704 return; 706 return;
705 } 707 }
706 708
707#if 0 709#if 0
708 /* Disable this - enabling it makes monsters easier, as 710 /* Disable this - enabling it makes monsters easier, as
709 * when their cone dies when they die. 711 * when their cone dies when they die.
710 */ 712 */
711 /* If no owner left, the spell dies out. */ 713 /* If no owner left, the spell dies out. */
712 if(get_owner(op)==NULL) { 714 if(get_owner(op)==NULL) {
713 remove_ob(op); 715 remove_ob(op);
714 free_object(op); 716 free_object(op);
715 return; 717 return;
716 } 718 }
717#endif 719#endif
718 720
719 tag = op->count; 721 tag = op->count;
720 hit_map(op,0,op->attacktype,0); 722 hit_map(op,0,op->attacktype,0);
… …
727 729
728 if (was_destroyed (op, tag)) 730 if (was_destroyed (op, tag))
729 return; 731 return;
730 732
731 if((op->duration--)<0) { 733 if((op->duration--)<0) {
732 remove_ob(op); 734 remove_ob(op);
733 free_object(op); 735 free_object(op);
734 return; 736 return;
735 } 737 }
736 /* Object has hit maximum range, so don't have it move 738 /* Object has hit maximum range, so don't have it move
737 * any further. When the duration above expires, 739 * any further. When the duration above expires,
738 * then the object will get removed. 740 * then the object will get removed.
739 */ 741 */
740 if (--op->range < 0) { 742 if (--op->range < 0) {
741 op->range=0; /* just so it doesn't wrap */ 743 op->range=0; /* just so it doesn't wrap */
742 return; 744 return;
743 } 745 }
744 746
745 for(i= -1;i<2;i++) { 747 for(i= -1;i<2;i++) {
746 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)], 748 sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)],
747 y=op->y+freearr_y[absdir(op->stats.sp+i)]; 749 y=op->y+freearr_y[absdir(op->stats.sp+i)];
748 750
749 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)) {
750 object *tmp=get_object(); 752 object *tmp=get_object();
751 copy_object(op, tmp); 753 copy_object(op, tmp);
752 tmp->x=x; 754 tmp->x=x;
753 tmp->y=y; 755 tmp->y=y;
754 756
755 tmp->duration = op->duration + 1; 757 tmp->duration = op->duration + 1;
756 758
757 /* Use for spell tracking - see ok_to_put_more() */ 759 /* Use for spell tracking - see ok_to_put_more() */
758 tmp->stats.maxhp = op->stats.maxhp; 760 tmp->stats.maxhp = op->stats.maxhp;
759 insert_ob_in_map(tmp,op->map,op,0); 761 insert_ob_in_map(tmp,op->map,op,0);
760 if (tmp->other_arch) cone_drop(tmp); 762 if (tmp->other_arch) cone_drop(tmp);
761 } 763 }
762 } 764 }
763} 765}
764 766
765/* cast_cone: casts a cone spell. 767/* cast_cone: casts a cone spell.
766 * op: person firing the object. 768 * op: person firing the object.
… …
780 782
781 if (!spell->other_arch) return 0; 783 if (!spell->other_arch) return 0;
782 784
783 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) && 785 if (op->type == PLAYER && QUERY_FLAG(op, FLAG_UNDEAD) &&
784 op->attacktype & AT_TURN_UNDEAD) { 786 op->attacktype & AT_TURN_UNDEAD) {
785 new_draw_info(NDI_UNIQUE, 0,op, 787 new_draw_info(NDI_UNIQUE, 0,op,
786 "Your undead nature prevents you from turning undead!"); 788 "Your undead nature prevents you from turning undead!");
787 return 0; 789 return 0;
788 } 790 }
789 791
790 if(!dir) { 792 if(!dir) {
791 range_min= 0; 793 range_min= 0;
792 range_max=8; 794 range_max=8;
793 } 795 }
794 796
795 /* 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
796 * 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
797 * insert it into is blocked. 799 * insert it into is blocked.
798 */ 800 */
799 movetype = spell->other_arch->clone.move_type; 801 movetype = spell->other_arch->clone.move_type;
800 802
801 for(i=range_min;i<=range_max;i++) { 803 for(i=range_min;i<=range_max;i++) {
802 sint16 x,y, d; 804 sint16 x,y, d;
803 805
804 /* We can't use absdir here, because it never returns 806 /* We can't use absdir here, because it never returns
805 * 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
806 * 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
807 * to hit that person. 809 * to hit that person.
808 */ 810 */
809 d = dir + i; 811 d = dir + i;
810 while (d < 0) d+=8; 812 while (d < 0) d+=8;
811 while (d > 8) d-=8; 813 while (d > 8) d-=8;
812 814
813 /* 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.
814 * In that case, we have to see - if dir is specified, 816 * In that case, we have to see - if dir is specified,
815 * turn this into direction 8. If dir is not specified (all 817 * turn this into direction 8. If dir is not specified (all
816 * direction) skip - otherwise, one line would do more damage 818 * direction) skip - otherwise, one line would do more damage
817 * becase 0 direction will go through 9 directions - necessary 819 * becase 0 direction will go through 9 directions - necessary
818 * for the rune code. 820 * for the rune code.
819 */ 821 */
820 if (caster->type != RUNE && d==0) { 822 if (caster->type != RUNE && d==0) {
821 if (dir!=0) d=8; 823 if (dir!=0) d=8;
822 else continue; 824 else continue;
823 } 825 }
824 826
825 x = op->x+freearr_x[d]; 827 x = op->x+freearr_x[d];
826 y = op->y+freearr_y[d]; 828 y = op->y+freearr_y[d];
827 829
828 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)
829 continue; 831 continue;
830 832
831 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype) 833 if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype)
832 continue; 834 continue;
833 835
834 success=1; 836 success=1;
835 tmp=arch_to_object(spell->other_arch); 837 tmp=arch_to_object(spell->other_arch);
836 set_owner(tmp,op); 838 set_owner(tmp,op);
837 set_spell_skill(op, caster, spell, tmp); 839 set_spell_skill(op, caster, spell, tmp);
838 tmp->level = caster_level (caster, spell); 840 tmp->level = caster_level (caster, spell);
839 tmp->x = sx; 841 tmp->x = sx;
840 tmp->y = sy; 842 tmp->y = sy;
841 tmp->attacktype=spell->attacktype; 843 tmp->attacktype=spell->attacktype;
842 844
843 /* holy word stuff */ 845 /* holy word stuff */
844 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) { 846 if((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) {
845 if(!tailor_god_spell(tmp,op)) return 0; 847 if(!tailor_god_spell(tmp,op)) return 0;
846 } 848 }
847 849
848 if(dir) 850 if(dir)
849 tmp->stats.sp=dir; 851 tmp->stats.sp=dir;
850 else 852 else
851 tmp->stats.sp=i; 853 tmp->stats.sp=i;
852 854
853 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 855 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
854 856
855 /* 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 */
856 if (dir == 0) { 858 if (dir == 0) {
857 tmp->range /= 4; 859 tmp->range /= 4;
858 if (tmp->range < 2 && spell->range >=2) tmp->range = 2; 860 if (tmp->range < 2 && spell->range >=2) tmp->range = 2;
859 } 861 }
860 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);
861 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell); 863 tmp->duration=spell->duration + SP_level_duration_adjust(caster,spell);
862 864
863 /* Special bonus for fear attacks */ 865 /* Special bonus for fear attacks */
864 if (tmp->attacktype & AT_FEAR) { 866 if (tmp->attacktype & AT_FEAR) {
865 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha]; 867 if (caster->type == PLAYER) tmp->duration += fear_bonus[caster->stats.Cha];
866 else 868 else
867 tmp->duration += caster->level/3; 869 tmp->duration += caster->level/3;
868 } 870 }
869 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) { 871 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) {
870 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;
871 else 873 else
872 tmp->duration += caster->level/3; 874 tmp->duration += caster->level/3;
873 } 875 }
874 876
875 877
876 if ( !(tmp->move_type & MOVE_FLY_LOW)) 878 if ( !(tmp->move_type & MOVE_FLY_LOW))
877 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",
878 spell->other_arch->name); 880 spell->other_arch->name);
879 881
880 if (!tmp->move_on && tmp->stats.dam) { 882 if (!tmp->move_on && tmp->stats.dam) {
881 LOG (llevDebug, 883 LOG (llevDebug,
882 "cast_cone(): arch %s doesn't have move_on set\n", 884 "cast_cone(): arch %s doesn't have move_on set\n",
883 spell->other_arch->name); 885 spell->other_arch->name);
884 } 886 }
885 insert_ob_in_map(tmp,m,op,0); 887 insert_ob_in_map(tmp,m,op,0);
886 888
887 /* 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
888 * a single space too many times. 890 * a single space too many times.
889 */ 891 */
890 tmp->stats.maxhp = tmp->count; 892 tmp->stats.maxhp = tmp->count;
891 893
892 if(tmp->other_arch) cone_drop(tmp); 894 if(tmp->other_arch) cone_drop(tmp);
893 } 895 }
894 return success; 896 return success;
895} 897}
896 898
897/**************************************************************************** 899/****************************************************************************
… …
908 int i; 910 int i;
909 object *env, *tmp; 911 object *env, *tmp;
910 archetype *at; 912 archetype *at;
911 913
912 if(op->state!=NUM_ANIMATIONS(op)-1) 914 if(op->state!=NUM_ANIMATIONS(op)-1)
913 return; 915 return;
916
914 917
915 env = object_get_env_recursive(op); 918 env = object_get_env_recursive(op);
916 919
917 if (op->env) { 920 if (op->env) {
918 if (env->map == NULL) 921 if (env->map == NULL)
919 return; 922 return;
920 923
921 if (env->type == PLAYER) 924 if (env->type == PLAYER)
922 esrv_del_item(env->contr, op->count); 925 esrv_del_item(env->contr, op->count);
923 926
924 remove_ob(op); 927 remove_ob(op);
925 op->x = env->x; 928 op->x = env->x;
926 op->y = env->y; 929 op->y = env->y;
927 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;
932 }
933
934 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
935 // on a safe map. I don't like this special casing, but it seems to be neccessary
936 // as bombs can be carried.
937 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
938 {
939 remove_ob (op);
940 free_object (op);
928 return; 941 return;
929 } 942 }
930 943
931 /* This copies a lot of the code from the fire bullet, 944 /* This copies a lot of the code from the fire bullet,
932 * but using the cast_bullet isn't really feasible, 945 * but using the cast_bullet isn't really feasible,
933 * so just set up the appropriate values. 946 * so just set up the appropriate values.
934 */ 947 */
935 at = find_archetype(SPLINT); 948 at = find_archetype(SPLINT);
936 if (at) { 949 if (at) {
937 for(i=1;i<9;i++) { 950 for(i=1;i<9;i++) {
938 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]))
939 continue; 952 continue;
940 tmp = arch_to_object(at); 953 tmp = arch_to_object(at);
941 tmp->direction = i; 954 tmp->direction = i;
942 tmp->range = op->range; 955 tmp->range = op->range;
943 tmp->stats.dam = op->stats.dam; 956 tmp->stats.dam = op->stats.dam;
944 tmp->duration = op->duration; 957 tmp->duration = op->duration;
945 tmp->attacktype = op->attacktype; 958 tmp->attacktype = op->attacktype;
946 copy_owner (tmp, op); 959 copy_owner (tmp, op);
947 if(op->skill && op->skill != tmp->skill) { 960 if(op->skill && op->skill != tmp->skill) {
948 if (tmp->skill) free_string(tmp->skill); 961 if (tmp->skill) free_string(tmp->skill);
949 tmp->skill = add_refcount(op->skill); 962 tmp->skill = add_refcount(op->skill);
950 } 963 }
951 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE)) 964 if(QUERY_FLAG(tmp, FLAG_IS_TURNABLE))
952 SET_ANIMATION(tmp, i); 965 SET_ANIMATION(tmp, i);
953 tmp->x = op->x + freearr_x[i]; 966 tmp->x = op->x + freearr_x[i];
954 tmp->y = op->y + freearr_x[i]; 967 tmp->y = op->y + freearr_x[i];
955 insert_ob_in_map(tmp, op->map, op, 0); 968 insert_ob_in_map(tmp, op->map, op, 0);
956 move_bullet(tmp); 969 move_bullet(tmp);
957 } 970 }
958 } 971 }
959 972
960 explode_bullet(op); 973 explode_bullet(op);
961} 974}
962 975
… …
967 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];
968 mapstruct *m; 981 mapstruct *m;
969 982
970 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy); 983 mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy);
971 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)) {
972 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.");
973 return 0; 986 return 0;
974 } 987 }
975 tmp=arch_to_object(spell->other_arch); 988 tmp=arch_to_object(spell->other_arch);
976 989
977 /* level dependencies for bomb */ 990 /* level dependencies for bomb */
978 tmp->range=spell->range + SP_level_range_adjust(caster,spell); 991 tmp->range=spell->range + SP_level_range_adjust(caster,spell);
… …
1011 mapstruct *mp; 1024 mapstruct *mp;
1012 1025
1013 if (dir==0) return NULL; 1026 if (dir==0) return NULL;
1014 1027
1015 for (dist=1; dist<range; dist++) { 1028 for (dist=1; dist<range; dist++) {
1016 x = op->x + freearr_x[dir] * dist; 1029 x = op->x + freearr_x[dir] * dist;
1017 y = op->y + freearr_y[dir] * dist; 1030 y = op->y + freearr_y[dir] * dist;
1018 mp = op->map; 1031 mp = op->map;
1019 mflags = get_map_flags(op->map, &mp, x, y, &x, &y); 1032 mflags = get_map_flags(op->map, &mp, x, y, &x, &y);
1020 1033
1021 if (mflags & P_OUT_OF_MAP) return NULL; 1034 if (mflags & P_OUT_OF_MAP) return NULL;
1022 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL; 1035 if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL;
1023 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL; 1036 if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL;
1024 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;
1025 1038
1026 if (mflags & P_IS_ALIVE) { 1039 if (mflags & P_IS_ALIVE) {
1027 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) {
1028 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) { 1041 if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) {
1029 return target; 1042 return target;
1030 } 1043 }
1031 } 1044 }
1032 } 1045 }
1033 } 1046 }
1034 return NULL; 1047 return NULL;
1035} 1048}
1036 1049
1037 1050
… …
1068 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded."); 1081 new_draw_info(NDI_UNIQUE,0,op,"Your request is unheeded.");
1069 return 0; 1082 return 0;
1070 } 1083 }
1071 1084
1072 if (spell->other_arch) 1085 if (spell->other_arch)
1073 effect = arch_to_object(spell->other_arch); 1086 effect = arch_to_object(spell->other_arch);
1074 else 1087 else
1075 return 0; 1088 return 0;
1076 1089
1077 /* tailor the effect by priest level and worshipped God */ 1090 /* tailor the effect by priest level and worshipped God */
1078 effect->level = caster_level (caster, spell); 1091 effect->level = caster_level (caster, spell);
1079 effect->attacktype = spell->attacktype; 1092 effect->attacktype = spell->attacktype;
1080 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) { 1093 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) {
… …
1082 new_draw_info_format(NDI_UNIQUE,0,op, 1095 new_draw_info_format(NDI_UNIQUE,0,op,
1083 "%s answers your call!",determine_god(op)); 1096 "%s answers your call!",determine_god(op));
1084 else { 1097 else {
1085 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored."); 1098 new_draw_info(NDI_UNIQUE,0,op,"Your request is ignored.");
1086 return 0; 1099 return 0;
1087 } 1100 }
1088 } 1101 }
1089 1102
1090 /* size of the area of destruction */ 1103 /* size of the area of destruction */
1091 effect->range=spell->range + 1104 effect->range=spell->range +
1092 SP_level_range_adjust(caster,spell); 1105 SP_level_range_adjust(caster,spell);
1093 effect->duration=spell->duration + 1106 effect->duration=spell->duration +
1094 SP_level_range_adjust(caster,spell); 1107 SP_level_range_adjust(caster,spell);
1095 1108
1096 if (effect->attacktype & AT_DEATH) { 1109 if (effect->attacktype & AT_DEATH) {
1097 effect->level=spell->stats.dam + 1110 effect->level=spell->stats.dam +
1098 SP_level_dam_adjust(caster,spell); 1111 SP_level_dam_adjust(caster,spell);
1099 1112
1100 /* casting death spells at undead isn't a good thing */ 1113 /* casting death spells at undead isn't a good thing */
1101 if QUERY_FLAG(target, FLAG_UNDEAD) { 1114 if QUERY_FLAG(target, FLAG_UNDEAD) {
1102 if(random_roll(0, 2, op, PREFER_LOW)) { 1115 if(random_roll(0, 2, op, PREFER_LOW)) {
1103 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!"); 1116 new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!");
1104 effect->x=op->x; 1117 effect->x=op->x;
1105 effect->y=op->y; 1118 effect->y=op->y;
1106 } else { 1119 } else {
1107 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!",
1108 query_name(target)); 1121 query_name(target));
1109 target->stats.hp = target->stats.maxhp*2; 1122 target->stats.hp = target->stats.maxhp*2;
1110 free_object(effect); 1123 free_object(effect);
1111 return 0; 1124 return 0;
1112 } 1125 }
1113 } 1126 }
1114 } else { 1127 } else {
1115 /* how much woe to inflict :) */ 1128 /* how much woe to inflict :) */
1116 effect->stats.dam=spell->stats.dam + 1129 effect->stats.dam=spell->stats.dam +
1117 SP_level_dam_adjust(caster,spell); 1130 SP_level_dam_adjust(caster,spell);
1118 } 1131 }
1119 1132
1120 set_owner(effect,op); 1133 set_owner(effect,op);
1121 set_spell_skill(op, caster, spell, effect); 1134 set_spell_skill(op, caster, spell, effect);
… …
1142 object *owner; 1155 object *owner;
1143 sint16 new_x, new_y; 1156 sint16 new_x, new_y;
1144 mapstruct *m; 1157 mapstruct *m;
1145 1158
1146 if (op->range-- <=0) { 1159 if (op->range-- <=0) {
1147 remove_ob(op); 1160 remove_ob(op);
1148 free_object(op); 1161 free_object(op);
1149 return; 1162 return;
1150 } 1163 }
1151 1164
1152 owner = get_owner(op); 1165 owner = get_owner(op);
1153#if 0 1166#if 0
1154 /* 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
1155 * monster that are then killed would continue to survive 1168 * monster that are then killed would continue to survive
1156 */ 1169 */
1157 if (owner == NULL) { 1170 if (owner == NULL) {
1158 remove_ob(op); 1171 remove_ob(op);
1159 free_object(op); 1172 free_object(op);
1160 return; 1173 return;
1161 } 1174 }
1162#endif 1175#endif
1163 1176
1164 new_x = op->x + DIRX(op); 1177 new_x = op->x + DIRX(op);
1165 new_y = op->y + DIRY(op); 1178 new_y = op->y + DIRY(op);
1166 1179
1167 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);
1168 1181
1169 if (!(mflags & P_OUT_OF_MAP) && 1182 if (!(mflags & P_OUT_OF_MAP) &&
1170 ((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)))) {
1171 tag_t tag = op->count; 1184 tag_t tag = op->count;
1172 hit_map (op, op->direction, AT_MAGIC, 1); 1185 hit_map (op, op->direction, AT_MAGIC, 1);
1173 /* Basically, missile only hits one thing then goes away. 1186 /* Basically, missile only hits one thing then goes away.
1174 * 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.
1175 */ 1188 */
1176 if ( ! was_destroyed (op, tag)) { 1189 if ( ! was_destroyed (op, tag)) {
1177 remove_ob (op); 1190 remove_ob (op);
1178 free_object(op); 1191 free_object(op);
1179 } 1192 }
1180 return; 1193 return;
1181 } 1194 }
1182 1195
1183 remove_ob(op); 1196 remove_ob(op);
1184 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) { 1197 if ( ! op->direction || (mflags & P_OUT_OF_MAP)) {
1185 free_object(op); 1198 free_object(op);
1186 return; 1199 return;
1187 } 1200 }
1188 op->x = new_x; 1201 op->x = new_x;
1189 op->y = new_y; 1202 op->y = new_y;
1190 op->map = m; 1203 op->map = m;
1191 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));
1192 if(i > 0 && i != op->direction){ 1205 if(i > 0 && i != op->direction){
1193 op->direction=i; 1206 op->direction=i;
1194 SET_ANIMATION(op, op->direction); 1207 SET_ANIMATION(op, op->direction);
1195 } 1208 }
1196 insert_ob_in_map(op,op->map,op,0); 1209 insert_ob_in_map(op,op->map,op,0);
1197} 1210}
1198 1211
1199/**************************************************************************** 1212/****************************************************************************
… …
1209int make_object_glow(object *op, int radius, int time) { 1222int make_object_glow(object *op, int radius, int time) {
1210 object *tmp; 1223 object *tmp;
1211 1224
1212 /* some things are unaffected... */ 1225 /* some things are unaffected... */
1213 if(op->path_denied&PATH_LIGHT) 1226 if(op->path_denied&PATH_LIGHT)
1214 return 0; 1227 return 0;
1215 1228
1216 tmp=get_archetype(FORCE_NAME); 1229 tmp=get_archetype(FORCE_NAME);
1217 tmp->speed = 0.01; 1230 tmp->speed = 0.01;
1218 tmp->stats.food = time; 1231 tmp->stats.food = time;
1219 SET_FLAG(tmp, FLAG_IS_USED_UP); 1232 SET_FLAG(tmp, FLAG_IS_USED_UP);
1220 tmp->glow_radius=radius; 1233 tmp->glow_radius=radius;
1221 if (tmp->glow_radius > MAX_LIGHT_RADII) 1234 if (tmp->glow_radius > MAX_LIGHT_RADII)
1222 tmp->glow_radius = MAX_LIGHT_RADII; 1235 tmp->glow_radius = MAX_LIGHT_RADII;
1223 1236
1224 tmp->x=op->x; 1237 tmp->x=op->x;
1225 tmp->y=op->y; 1238 tmp->y=op->y;
1226 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 */
1227 tmp=insert_ob_in_ob(tmp,op); 1240 tmp=insert_ob_in_ob(tmp,op);
1228 if (tmp->glow_radius > op->glow_radius) 1241 if (tmp->glow_radius > op->glow_radius)
1229 op->glow_radius = tmp->glow_radius; 1242 op->glow_radius = tmp->glow_radius;
1230 1243
1231 if(!tmp->env||op!=tmp->env) { 1244 if(!tmp->env||op!=tmp->env) {
1232 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",
1233 op->name); 1246 op->name);
1234 return 0; 1247 return 0;
1235 } 1248 }
1236 return 1; 1249 return 1;
1237} 1250}
1238 1251
1239 1252
… …
1263 else op->skill = NULL; 1276 else op->skill = NULL;
1264 1277
1265 change_skill(op, find_skill_by_name(op, op->skill), 1); 1278 change_skill(op, find_skill_by_name(op, op->skill), 1);
1266 1279
1267 for(i= -range; i<range; i++) { 1280 for(i= -range; i<range; i++) {
1268 for(j=-range; j<range ; j++) { 1281 for(j=-range; j<range ; j++) {
1269 m = op->map; 1282 m = op->map;
1270 sx = op->x + i; 1283 sx = op->x + i;
1271 sy = op->y + j; 1284 sy = op->y + j;
1272 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy); 1285 mflags = get_map_flags(m, &m, sx, sy, &sx, &sy);
1273 if (mflags & P_OUT_OF_MAP) continue; 1286 if (mflags & P_OUT_OF_MAP) continue;
1274 if (mflags & P_IS_ALIVE) { 1287 if (mflags & P_IS_ALIVE) {
1275 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) {
1276 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break; 1289 if (QUERY_FLAG(tmp, FLAG_ALIVE) || tmp->type==PLAYER) break;
1277 } 1290 }
1278 if (tmp) { 1291 if (tmp) {
1279 if (tmp->head) tmp=tmp->head; 1292 if (tmp->head) tmp=tmp->head;
1280 1293
1281 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) || 1294 if ((friendly && !QUERY_FLAG(tmp, FLAG_FRIENDLY) && tmp->type!=PLAYER) ||
1282 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) { 1295 (!friendly && (QUERY_FLAG(tmp, FLAG_FRIENDLY) || tmp->type==PLAYER))) {
1283 if (spell_ob->subtype == SP_DESTRUCTION) { 1296 if (spell_ob->subtype == SP_DESTRUCTION) {
1284 hit_player(tmp,dam,op,spell_ob->attacktype,0); 1297 hit_player(tmp,dam,op,spell_ob->attacktype,0);
1285 if (spell_ob->other_arch) { 1298 if (spell_ob->other_arch) {
1286 tmp = arch_to_object(spell_ob->other_arch); 1299 tmp = arch_to_object(spell_ob->other_arch);
1287 tmp->x = sx; 1300 tmp->x = sx;
1288 tmp->y = sy; 1301 tmp->y = sy;
1289 insert_ob_in_map(tmp, m, op, 0); 1302 insert_ob_in_map(tmp, m, op, 0);
1290 } 1303 }
1291 } 1304 }
1292 else if (spell_ob->subtype == SP_FAERY_FIRE && 1305 else if (spell_ob->subtype == SP_FAERY_FIRE &&
1293 tmp->resist[ATNR_MAGIC]!=100) { 1306 tmp->resist[ATNR_MAGIC]!=100) {
1294 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) { 1307 if (make_object_glow(tmp, 1, dur) && spell_ob->other_arch) {
1295 object *effect = arch_to_object(spell_ob->other_arch); 1308 object *effect = arch_to_object(spell_ob->other_arch);
1296 effect->x = sx; 1309 effect->x = sx;
1297 effect->y = sy; 1310 effect->y = sy;
1298 insert_ob_in_map(effect, m, op, 0); 1311 insert_ob_in_map(effect, m, op, 0);
1299 } 1312 }
1300 } 1313 }
1301 } 1314 }
1302 } 1315 }
1303 } 1316 }
1304 } 1317 }
1305 } 1318 }
1306 op->skill = skill; 1319 op->skill = skill;
1307 return 1; 1320 return 1;
1308} 1321}
1309 1322
… …
1316int cast_curse(object *op, object *caster, object *spell_ob, int dir) { 1329int cast_curse(object *op, object *caster, object *spell_ob, int dir) {
1317 object *god = find_god(determine_god(op)); 1330 object *god = find_god(determine_god(op));
1318 object *tmp, *force; 1331 object *tmp, *force;
1319 1332
1320 tmp = get_pointed_target(op, (dir==0)?op->direction:dir, 1333 tmp = get_pointed_target(op, (dir==0)?op->direction:dir,
1321 spell_ob->range, SPELL_GRACE); 1334 spell_ob->range, SPELL_GRACE);
1322 if (!tmp) { 1335 if (!tmp) {
1323 new_draw_info(NDI_UNIQUE, 0, op, 1336 new_draw_info(NDI_UNIQUE, 0, op,
1324 "There is no one in that direction to curse."); 1337 "There is no one in that direction to curse.");
1325 return 0; 1338 return 0;
1326 } 1339 }
1327 1340
1328 /* 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. */
1329 for(force=tmp->inv; force!=NULL; force=force->below) { 1342 for(force=tmp->inv; force!=NULL; force=force->below) {
1330 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) { 1343 if (force->type==FORCE && force->subtype == FORCE_CHANGE_ABILITY) {
1331 if (force->name == spell_ob->name) { 1344 if (force->name == spell_ob->name) {
1332 break; 1345 break;
1333 } 1346 }
1334 else if (spell_ob->race && spell_ob->race == force->name) { 1347 else if (spell_ob->race && spell_ob->race == force->name) {
1335 new_draw_info_format(NDI_UNIQUE, 0, op, 1348 new_draw_info_format(NDI_UNIQUE, 0, op,
1336 "You can not cast %s while %s is in effect", 1349 "You can not cast %s while %s is in effect",
1337 spell_ob->name, force->name_pl); 1350 spell_ob->name, force->name_pl);
1338 return 0; 1351 return 0;
1339 } 1352 }
1340 } 1353 }
1341 } 1354 }
1342 1355
1343 if(force==NULL) { 1356 if(force==NULL) {
1344 force=get_archetype(FORCE_NAME); 1357 force=get_archetype(FORCE_NAME);
1345 force->subtype = FORCE_CHANGE_ABILITY; 1358 force->subtype = FORCE_CHANGE_ABILITY;
1346 free_string(force->name); 1359 free_string(force->name);
1347 if (spell_ob->race) 1360 if (spell_ob->race)
1348 force->name = add_refcount(spell_ob->race); 1361 force->name = add_refcount(spell_ob->race);
1349 else 1362 else
1363 force->name = add_refcount(spell_ob->name);
1364 free_string(force->name_pl);
1350 force->name = add_refcount(spell_ob->name); 1365 force->name_pl = add_refcount(spell_ob->name);
1351 free_string(force->name_pl);
1352 force->name_pl = add_refcount(spell_ob->name);
1353 1366
1354 } else { 1367 } else {
1355 int duration; 1368 int duration;
1356 1369
1357 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;
1358 if (duration > force->duration) { 1371 if (duration > force->duration) {
1359 force->duration = duration; 1372 force->duration = duration;
1360 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.");
1361 } else { 1374 } else {
1362 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.");
1363 } 1376 }
1364 return 1; 1377 return 1;
1365 } 1378 }
1366 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;
1367 force->speed = 1.0; 1380 force->speed = 1.0;
1368 force->speed_left = -1.0; 1381 force->speed_left = -1.0;
1369 SET_FLAG(force, FLAG_APPLIED); 1382 SET_FLAG(force, FLAG_APPLIED);
1370 1383
1371 if(god) { 1384 if(god) {
1372 if (spell_ob->last_grace) 1385 if (spell_ob->last_grace)
1373 force->path_repelled=god->path_repelled; 1386 force->path_repelled=god->path_repelled;
1374 if (spell_ob->last_grace) 1387 if (spell_ob->last_grace)
1375 force->path_denied=god->path_denied; 1388 force->path_denied=god->path_denied;
1376 new_draw_info_format(NDI_UNIQUE, 0,tmp, 1389 new_draw_info_format(NDI_UNIQUE, 0,tmp,
1377 "You are a victim of %s's curse!",god->name); 1390 "You are a victim of %s's curse!",god->name);
1378 } else 1391 } else
1379 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty."); 1392 new_draw_info(NDI_UNIQUE, 0,op,"Your curse seems empty.");
1380 1393
1381 1394
1382 if(tmp!=op && op->type==PLAYER) 1395 if(tmp!=op && op->type==PLAYER)
1383 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);
1384 1397
1385 force->stats.ac = spell_ob->stats.ac; 1398 force->stats.ac = spell_ob->stats.ac;
1386 force->stats.wc = spell_ob->stats.wc; 1399 force->stats.wc = spell_ob->stats.wc;
1387 1400
1388 change_abil(tmp,force); /* Mostly to display any messages */ 1401 change_abil(tmp,force); /* Mostly to display any messages */
… …
1425 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race; 1438 else if (god && !strcmp(spell->race, "GOD_FRIEND")) race = god->race;
1426 else race = spell->race; 1439 else race = spell->race;
1427 1440
1428 1441
1429 for (x = op->x - range; x <= op->x + range; x++) 1442 for (x = op->x - range; x <= op->x + range; x++)
1430 for (y = op->y - range; y <= op->y + range; y++) { 1443 for (y = op->y - range; y <= op->y + range; y++) {
1431 1444
1432 done_one=0; 1445 done_one=0;
1433 m = op->map; 1446 m = op->map;
1434 nx = x; 1447 nx = x;
1435 ny = y; 1448 ny = y;
1436 mflags = get_map_flags(m, &m, x, y, &nx, &ny); 1449 mflags = get_map_flags(m, &m, x, y, &nx, &ny);
1437 if (mflags & P_OUT_OF_MAP) continue; 1450 if (mflags & P_OUT_OF_MAP) continue;
1438 1451
1439 /* 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 */
1440 if (!(mflags & P_IS_ALIVE)) continue; 1453 if (!(mflags & P_IS_ALIVE)) continue;
1441 1454
1442 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)
1443 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break; 1456 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break;
1444 1457
1445 /* There can be living objects that are not monsters */ 1458 /* There can be living objects that are not monsters */
1446 if (!tmp || tmp->type==PLAYER) continue; 1459 if (!tmp || tmp->type==PLAYER) continue;
1447 1460
1448 /* Only the head has meaningful data, so resolve to that */ 1461 /* Only the head has meaningful data, so resolve to that */
1449 if (tmp->head) head=tmp->head; 1462 if (tmp->head) head=tmp->head;
1450 else head=tmp; 1463 else head=tmp;
1451 1464
1452 /* 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 */
1453 if (race && head->race && !strstr(race, head->race)) continue; 1466 if (race && head->race && !strstr(race, head->race)) continue;
1454 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;
1455 1468
1456 /* Now do a bunch of stuff related to saving throws */ 1469 /* Now do a bunch of stuff related to saving throws */
1457 best_at = -1; 1470 best_at = -1;
1458 if (spell->attacktype) { 1471 if (spell->attacktype) {
1459 for (at=0; at < NROFATTACKS; at++) 1472 for (at=0; at < NROFATTACKS; at++)
1460 if (spell->attacktype & (1 << at)) 1473 if (spell->attacktype & (1 << at))
1461 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;
1462 1475
1463 if (best_at == -1) at=0; 1476 if (best_at == -1) at=0;
1464 else { 1477 else {
1465 if (head->resist[best_at] == 100) continue; 1478 if (head->resist[best_at] == 100) continue;
1466 else at = head->resist[best_at] / 5; 1479 else at = head->resist[best_at] / 5;
1467 } 1480 }
1468 at -= level / 5; 1481 at -= level / 5;
1469 if (did_make_save(head, head->level, at)) continue; 1482 if (did_make_save(head, head->level, at)) continue;
1470 } 1483 }
1471 else /* spell->attacktype */ 1484 else /* spell->attacktype */
1472 /* 1485 /*
1473 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:
1474 * if spell level < monster level, no go 1487 * if spell level < monster level, no go
1475 * 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 ) )
… …
1486 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 ) ) ) )
1487 /* Failed, no effect */ 1500 /* Failed, no effect */
1488 continue; 1501 continue;
1489 } 1502 }
1490 1503
1491 /* Done with saving throw. Now start effecting the monster */ 1504 /* Done with saving throw. Now start effecting the monster */
1492 1505
1493 /* aggravation */ 1506 /* aggravation */
1494 if (QUERY_FLAG(spell, FLAG_MONSTER)) { 1507 if (QUERY_FLAG(spell, FLAG_MONSTER)) {
1495 CLEAR_FLAG(head, FLAG_SLEEP); 1508 CLEAR_FLAG(head, FLAG_SLEEP);
1496 if (QUERY_FLAG(head, FLAG_FRIENDLY)) 1509 if (QUERY_FLAG(head, FLAG_FRIENDLY))
1497 remove_friendly_object(head); 1510 remove_friendly_object(head);
1498 1511
1499 done_one = 1; 1512 done_one = 1;
1500 head->enemy = op; 1513 head->enemy = op;
1501 } 1514 }
1502 1515
1503 /* calm monsters */ 1516 /* calm monsters */
1504 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) { 1517 if (QUERY_FLAG(spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG(head, FLAG_UNAGGRESSIVE)) {
1505 SET_FLAG(head, FLAG_UNAGGRESSIVE); 1518 SET_FLAG(head, FLAG_UNAGGRESSIVE);
1506 head->enemy = NULL; 1519 head->enemy = NULL;
1507 done_one = 1; 1520 done_one = 1;
1508 } 1521 }
1509 1522
1510 /* berserk monsters */ 1523 /* berserk monsters */
1511 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) { 1524 if (QUERY_FLAG(spell, FLAG_BERSERK) && !QUERY_FLAG(head, FLAG_BERSERK)) {
1512 SET_FLAG(head, FLAG_BERSERK); 1525 SET_FLAG(head, FLAG_BERSERK);
1513 done_one = 1; 1526 done_one = 1;
1514 } 1527 }
1515 /* charm */ 1528 /* charm */
1516 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)) {
1517 SET_FLAG(head, FLAG_FRIENDLY); 1530 SET_FLAG(head, FLAG_FRIENDLY);
1518 /* Prevent uncontolled outbreaks of self replicating monsters. 1531 /* Prevent uncontolled outbreaks of self replicating monsters.
1519 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.
1520 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. */
1521 CLEAR_FLAG(head, FLAG_GENERATOR); 1534 CLEAR_FLAG(head, FLAG_GENERATOR);
1522 set_owner(head, op); 1535 set_owner(head, op);
1523 set_spell_skill(op, caster, spell, head); 1536 set_spell_skill(op, caster, spell, head);
1524 add_friendly_object(head); 1537 add_friendly_object(head);
1525 head->attack_movement = PETMOVE; 1538 head->attack_movement = PETMOVE;
1526 done_one = 1; 1539 done_one = 1;
1527 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);
1528 head->stats.exp = 0; 1541 head->stats.exp = 0;
1529 } 1542 }
1530 1543
1531 /* If a monster was effected, put an effect in */ 1544 /* If a monster was effected, put an effect in */
1532 if (done_one && spell->other_arch) { 1545 if (done_one && spell->other_arch) {
1533 tmp = arch_to_object(spell->other_arch); 1546 tmp = arch_to_object(spell->other_arch);
1534 tmp->x = nx; 1547 tmp->x = nx;
1535 tmp->y = ny; 1548 tmp->y = ny;
1536 insert_ob_in_map(tmp, m, op, 0); 1549 insert_ob_in_map(tmp, m, op, 0);
1537 } 1550 }
1538 } /* for y */ 1551 } /* for y */
1539 1552
1540 return 1; 1553 return 1;
1541} 1554}
1542 1555
1543 1556
… …
1563 * deviations. 1576 * deviations.
1564 */ 1577 */
1565 1578
1566 dir = 0; 1579 dir = 0;
1567 if(!(rndm(0, 3))) 1580 if(!(rndm(0, 3)))
1568 j = rndm(0, 1); 1581 j = rndm(0, 1);
1569 else j=0; 1582 else j=0;
1570 1583
1571 for(i = 1; i < 9; i++) { 1584 for(i = 1; i < 9; i++) {
1572 /* i bit 0: alters sign of offset 1585 /* i bit 0: alters sign of offset
1573 * other bits (i / 2): absolute value of offset 1586 * other bits (i / 2): absolute value of offset
1574 */ 1587 */
1575 1588
1576 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2); 1589 int offset = ((i ^ j) & 1) ? (i / 2) : - (i / 2);
1577 int tmpdir = absdir (op->direction + offset); 1590 int tmpdir = absdir (op->direction + offset);
1578 1591
1579 nx = op->x + freearr_x[tmpdir]; 1592 nx = op->x + freearr_x[tmpdir];
1580 ny = op->y + freearr_y[tmpdir]; 1593 ny = op->y + freearr_y[tmpdir];
1581 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) &&
1582 !(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)))) {
1583 dir = tmpdir; 1596 dir = tmpdir;
1584 break; 1597 break;
1585 } 1598 }
1586 } 1599 }
1587 if (dir == 0) { 1600 if (dir == 0) {
1588 nx = op->x; 1601 nx = op->x;
1589 ny = op->y; 1602 ny = op->y;
1590 m = op->map; 1603 m = op->map;
1591 } 1604 }
1592 1605
1593 remove_ob(op); 1606 remove_ob(op);
1594 op->y=ny; 1607 op->y=ny;
1595 op->x=nx; 1608 op->x=nx;
1596 insert_ob_in_map(op,m,op,0); 1609 insert_ob_in_map(op,m,op,0);
1597 1610
1598 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
1599 surrounding squares */ 1612 surrounding squares */
1600 1613
1601 /* loop over current square and neighbors to hit. 1614 /* loop over current square and neighbors to hit.
1602 * if this has an other_arch field, we insert that in 1615 * if this has an other_arch field, we insert that in
1603 * the surround spaces. 1616 * the surround spaces.
1604 */ 1617 */
1605 for(j=0;j<9;j++) { 1618 for(j=0;j<9;j++) {
1606 object *new_ob; 1619 object *new_ob;
1607 1620
1608 hx = nx+freearr_x[j]; 1621 hx = nx+freearr_x[j];
1609 hy = ny+freearr_y[j]; 1622 hy = ny+freearr_y[j];
1610 1623
1611 m = op->map; 1624 m = op->map;
1612 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy); 1625 mflags = get_map_flags(m, &m, hx, hy, &hx, &hy);
1613 1626
1614 if (mflags & P_OUT_OF_MAP) continue; 1627 if (mflags & P_OUT_OF_MAP) continue;
1615 1628
1616 /* 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
1617 * of the map either. 1630 * of the map either.
1618 */ 1631 */
1619 1632
1620 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))) {
1621 if(j) op->stats.dam = dam_save/2; 1634 if(j) op->stats.dam = dam_save/2;
1622 hit_map(op,j,op->attacktype,1); 1635 hit_map(op,j,op->attacktype,1);
1623 1636
1624 } 1637 }
1625 1638
1626 /* insert the other arch */ 1639 /* insert the other arch */
1627 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)))) {
1628 new_ob = arch_to_object(op->other_arch); 1641 new_ob = arch_to_object(op->other_arch);
1629 new_ob->x = hx; 1642 new_ob->x = hx;
1630 new_ob->y = hy; 1643 new_ob->y = hy;
1631 insert_ob_in_map(new_ob,m,op,0); 1644 insert_ob_in_map(new_ob,m,op,0);
1632 } 1645 }
1633 } 1646 }
1634 1647
1635 /* restore to the center location and damage*/ 1648 /* restore to the center location and damage*/
1636 op->stats.dam = dam_save; 1649 op->stats.dam = dam_save;
1637 1650
1638 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));
1639 1652
1640 if(i>=0) { /* we have a preferred direction! */ 1653 if(i>=0) { /* we have a preferred direction! */
1641 /* pick another direction if the preferred dir is blocked. */ 1654 /* pick another direction if the preferred dir is blocked. */
1642 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 ||
1643 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))) {
1644 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */ 1657 i= absdir(i + rndm(0, 2) -1); /* -1, 0, +1 */
1645 } 1658 }
1646 op->direction=i; 1659 op->direction=i;
1647 } 1660 }
1648} 1661}
1649 1662
1650 1663
1651/* move_swarm_spell: peterm 1664/* move_swarm_spell: peterm
… …
1665 mapstruct *m; 1678 mapstruct *m;
1666 object *owner; 1679 object *owner;
1667 1680
1668 owner = get_owner(op); 1681 owner = get_owner(op);
1669 if(op->duration == 0 || owner == NULL) { 1682 if(op->duration == 0 || owner == NULL) {
1670 remove_ob(op); 1683 remove_ob(op);
1671 free_object(op); 1684 free_object(op);
1672 return; 1685 return;
1673 } 1686 }
1674 op->duration--; 1687 op->duration--;
1675 1688
1676 basedir = op->direction; 1689 basedir = op->direction;
1677 if(basedir == 0) { 1690 if(basedir == 0) {
… …
1715 * 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,
1716 * do some sanity checking anyways. 1729 * do some sanity checking anyways.
1717 */ 1730 */
1718 1731
1719 if (op->spell && op->spell->type == SPELL && 1732 if (op->spell && op->spell->type == SPELL &&
1720 !(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) &&
1721 !(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)))) {
1722 1735
1723 /* 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 */
1724 if (op->spell->subtype == SP_BULLET) 1737 if (op->spell->subtype == SP_BULLET)
1725 fire_bullet(owner, op, basedir, op->spell); 1738 fire_bullet(owner, op, basedir, op->spell);
1726 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1739 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1727 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);
1728 } 1741 }
1729#endif 1742#endif
1730 1743
1731 /* 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
1732 * should just be a pointer to the spell in some inventory, 1745 * should just be a pointer to the spell in some inventory,
… …
1734 * do some sanity checking anyways. 1747 * do some sanity checking anyways.
1735 */ 1748 */
1736 1749
1737 if (op->spell && op->spell->type == SPELL) 1750 if (op->spell && op->spell->type == SPELL)
1738 { 1751 {
1739 /* 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 */
1740 if (op->spell->subtype == SP_BULLET) 1753 if (op->spell->subtype == SP_BULLET)
1741 fire_bullet(owner, op, basedir, op->spell); 1754 fire_bullet(owner, op, basedir, op->spell);
1742 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1755 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1743 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);
1744 } 1757 }
1745} 1758}
1746 1759
1747 1760
1748 1761
… …
1776 tmp->spell = arch_to_object(spell->other_arch); 1789 tmp->spell = arch_to_object(spell->other_arch);
1777 1790
1778 tmp->attacktype = tmp->spell->attacktype; 1791 tmp->attacktype = tmp->spell->attacktype;
1779 1792
1780 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) { 1793 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) {
1781 if ( ! tailor_god_spell (tmp, op)) 1794 if ( ! tailor_god_spell (tmp, op))
1782 return 1; 1795 return 1;
1783 } 1796 }
1784 tmp->duration = SP_level_duration_adjust(caster, spell); 1797 tmp->duration = SP_level_duration_adjust(caster, spell);
1785 for (i=0; i< spell->duration; i++) 1798 for (i=0; i< spell->duration; i++)
1786 tmp->duration += die_roll(1, 3, op, PREFER_HIGH); 1799 tmp->duration += die_roll(1, 3, op, PREFER_HIGH);
1787 1800
1788 tmp->direction=dir; 1801 tmp->direction=dir;
1789 tmp->invisible=1; 1802 tmp->invisible=1;
1790 insert_ob_in_map(tmp,op->map,op,0); 1803 insert_ob_in_map(tmp,op->map,op,0);
1791 return 1; 1804 return 1;
… …
1802 mapstruct *m; 1815 mapstruct *m;
1803 1816
1804 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell); 1817 dam = spell->stats.dam + SP_level_dam_adjust(caster,spell);
1805 1818
1806 if(!dir) { 1819 if(!dir) {
1807 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?"); 1820 new_draw_info(NDI_UNIQUE, 0,op,"In what direction?");
1808 return 0; 1821 return 0;
1809 } 1822 }
1810 1823
1811 x=op->x+freearr_x[dir]; 1824 x=op->x+freearr_x[dir];
1812 y=op->y+freearr_y[dir]; 1825 y=op->y+freearr_y[dir];
1813 m = op->map; 1826 m = op->map;
1814 1827
1815 mflags = get_map_flags(m, &m, x, y, &x, &y); 1828 mflags = get_map_flags(m, &m, x, y, &x, &y);
1816 1829
1817 if (mflags & P_OUT_OF_MAP) { 1830 if (mflags & P_OUT_OF_MAP) {
1818 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there."); 1831 new_draw_info(NDI_UNIQUE, 0,op,"Nothing is there.");
1819 return 0; 1832 return 0;
1820 } 1833 }
1821 1834
1822 if (mflags & P_IS_ALIVE && spell->attacktype) { 1835 if (mflags & P_IS_ALIVE && spell->attacktype) {
1823 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)
1824 if(QUERY_FLAG(target,FLAG_MONSTER)) { 1837 if(QUERY_FLAG(target,FLAG_MONSTER)) {
1825 /* oky doky. got a target monster. Lets make a blinding attack */ 1838 /* oky doky. got a target monster. Lets make a blinding attack */
1826 if(target->head) target = target->head; 1839 if(target->head) target = target->head;
1827 (void) hit_player(target,dam,op,spell->attacktype,1); 1840 (void) hit_player(target,dam,op,spell->attacktype,1);
1828 return 1; /* one success only! */ 1841 return 1; /* one success only! */
1829 } 1842 }
1830 } 1843 }
1831 1844
1832 /* no live target, perhaps a wall is in the way? */ 1845 /* no live target, perhaps a wall is in the way? */
1833 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))) {
1834 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.");
1835 return 0; 1848 return 0;
1836 } 1849 }
1837 1850
1838 /* 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 */
1839 tmp=arch_to_object(spell->other_arch); 1852 tmp=arch_to_object(spell->other_arch);
1840 if(!tmp) { 1853 if(!tmp) {
1841 LOG(llevError,"Error: spell arch for cast_light() missing.\n"); 1854 LOG(llevError,"Error: spell arch for cast_light() missing.\n");
1842 return 0; 1855 return 0;
1843 } 1856 }
1844 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell); 1857 tmp->stats.food = spell->duration + SP_level_duration_adjust(caster,spell);
1845 if (tmp->glow_radius) { 1858 if (tmp->glow_radius) {
1846 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell); 1859 tmp->glow_radius= spell->range + SP_level_range_adjust(caster,spell);
1847 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;
1848 } 1861 }
1849 tmp->x=x; 1862 tmp->x=x;
1850 tmp->y=y; 1863 tmp->y=y;
1851 insert_ob_in_map(tmp,m,op,0); 1864 insert_ob_in_map(tmp,m,op,0);
1852 return 1; 1865 return 1;
… …
1882 dam_mod = SP_level_dam_adjust(caster, spell); 1895 dam_mod = SP_level_dam_adjust(caster, spell);
1883 dur_mod = SP_level_duration_adjust(caster, spell); 1896 dur_mod = SP_level_duration_adjust(caster, spell);
1884 1897
1885 /* search in a line for a victim */ 1898 /* search in a line for a victim */
1886 for(i=1; i<range; i++) { 1899 for(i=1; i<range; i++) {
1887 x = op->x + i * freearr_x[dir]; 1900 x = op->x + i * freearr_x[dir];
1888 y = op->y + i * freearr_y[dir]; 1901 y = op->y + i * freearr_y[dir];
1889 m = op->map; 1902 m = op->map;
1890 1903
1891 mflags = get_map_flags(m, &m, x, y, &x, &y); 1904 mflags = get_map_flags(m, &m, x, y, &x, &y);
1892 1905
1893 if (mflags & P_OUT_OF_MAP) return 0; 1906 if (mflags & P_OUT_OF_MAP) return 0;
1894 1907
1895 /* don't go through walls - presume diseases are airborne */ 1908 /* don't go through walls - presume diseases are airborne */
1896 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;
1897 1910
1898 /* 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 */
1899 if (mflags & P_IS_ALIVE) { 1912 if (mflags & P_IS_ALIVE) {
1900 /* search this square for a victim */ 1913 /* search this square for a victim */
1901 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)
1902 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 */
1903 object *disease = arch_to_object(spell->other_arch); 1916 object *disease = arch_to_object(spell->other_arch);
1904 1917
1905 set_owner(disease,op); 1918 set_owner(disease,op);
1906 set_spell_skill(op, caster, spell, disease); 1919 set_spell_skill(op, caster, spell, disease);
1907 disease->stats.exp = 0; 1920 disease->stats.exp = 0;
1908 disease->level = caster_level(caster, spell); 1921 disease->level = caster_level(caster, spell);
1909 1922
1910 /* do level adjustments */ 1923 /* do level adjustments */
1911 if(disease->stats.wc) 1924 if(disease->stats.wc)
1912 disease->stats.wc += dur_mod/2; 1925 disease->stats.wc += dur_mod/2;
1913 1926
1914 if(disease->magic> 0) 1927 if(disease->magic> 0)
1915 disease->magic += dur_mod/4; 1928 disease->magic += dur_mod/4;
1916 1929
1917 if(disease->stats.maxhp>0) 1930 if(disease->stats.maxhp>0)
1918 disease->stats.maxhp += dur_mod; 1931 disease->stats.maxhp += dur_mod;
1919 1932
1920 if(disease->stats.maxgrace>0) 1933 if(disease->stats.maxgrace>0)
1921 disease->stats.maxgrace += dur_mod; 1934 disease->stats.maxgrace += dur_mod;
1922 1935
1923 if(disease->stats.dam) { 1936 if(disease->stats.dam) {
1924 if(disease->stats.dam > 0) 1937 if(disease->stats.dam > 0)
1925 disease->stats.dam += dam_mod; 1938 disease->stats.dam += dam_mod;
1926 else disease->stats.dam -= dam_mod; 1939 else disease->stats.dam -= dam_mod;
1927 } 1940 }
1928 1941
1929 if(disease->last_sp) { 1942 if(disease->last_sp) {
1930 disease->last_sp -= 2*dam_mod; 1943 disease->last_sp -= 2*dam_mod;
1931 if(disease->last_sp <1) disease->last_sp = 1; 1944 if(disease->last_sp <1) disease->last_sp = 1;
1932 } 1945 }
1933 1946
1934 if(disease->stats.maxsp) { 1947 if(disease->stats.maxsp) {
1935 if(disease->stats.maxsp > 0) 1948 if(disease->stats.maxsp > 0)
1936 disease->stats.maxsp += dam_mod; 1949 disease->stats.maxsp += dam_mod;
1937 else disease->stats.maxsp -= dam_mod; 1950 else disease->stats.maxsp -= dam_mod;
1938 } 1951 }
1939 1952
1940 if(disease->stats.ac) 1953 if(disease->stats.ac)
1941 disease->stats.ac += dam_mod; 1954 disease->stats.ac += dam_mod;
1942 1955
1943 if(disease->last_eat) 1956 if(disease->last_eat)
1944 disease->last_eat -= dam_mod; 1957 disease->last_eat -= dam_mod;
1945 1958
1946 if(disease->stats.hp) 1959 if(disease->stats.hp)
1947 disease->stats.hp -= dam_mod; 1960 disease->stats.hp -= dam_mod;
1948 1961
1949 if(disease->stats.sp) 1962 if(disease->stats.sp)
1950 disease->stats.sp -= dam_mod; 1963 disease->stats.sp -= dam_mod;
1951 1964
1952 if(infect_object(walk,disease,1)) { 1965 if(infect_object(walk,disease,1)) {
1953 object *flash; /* visual effect for inflicting disease */ 1966 object *flash; /* visual effect for inflicting disease */
1954 1967
1955 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);
1956 1969
1957 free_object(disease); /* don't need this one anymore */ 1970 free_object(disease); /* don't need this one anymore */
1958 flash=get_archetype(ARCH_DETECT_MAGIC); 1971 flash=get_archetype(ARCH_DETECT_MAGIC);
1959 flash->x = x; 1972 flash->x = x;
1960 flash->y = y; 1973 flash->y = y;
1961 flash->map = walk->map; 1974 flash->map = walk->map;
1962 insert_ob_in_map(flash,walk->map,op,0); 1975 insert_ob_in_map(flash,walk->map,op,0);
1963 return 1; 1976 return 1;
1964 } 1977 }
1965 free_object(disease); 1978 free_object(disease);
1966 } 1979 }
1967 } /* if living creature */ 1980 } /* if living creature */
1968 } /* for range of spaces */ 1981 } /* for range of spaces */
1969 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!"); 1982 new_draw_info(NDI_UNIQUE,0,op,"No one caught anything!");
1970 return 1; 1983 return 1;
1971} 1984}

Diff Legend

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