ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_attack.C
(Generate patch)

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

Diff Legend

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